diff --git a/CODEOWNERS b/CODEOWNERS index 88802410520..50f5b524719 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -8,16 +8,15 @@ erpnext/assets/ @khushi8112 erpnext/regional @ruthra-kumar erpnext/selling @ruthra-kumar erpnext/support/ @ruthra-kumar -pos* -erpnext/buying/ @rohitwaghchaure +erpnext/buying/ @rohitwaghchaure @mihir-kandoi erpnext/maintenance/ @rohitwaghchaure -erpnext/manufacturing/ @rohitwaghchaure +erpnext/manufacturing/ @rohitwaghchaure @mihir-kandoi erpnext/quality_management/ @rohitwaghchaure -erpnext/stock/ @rohitwaghchaure -erpnext/subcontracting @rohitwaghchaure +erpnext/stock/ @rohitwaghchaure @mihir-kandoi +erpnext/subcontracting @mihir-kandoi -erpnext/controllers/ @ruthra-kumar @rohitwaghchaure +erpnext/controllers/ @ruthra-kumar @rohitwaghchaure @mihir-kandoi erpnext/patches/ @ruthra-kumar .github/ @ruthra-kumar diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py index 0de00681487..0db982ad426 100644 --- a/erpnext/accounts/doctype/account/account.py +++ b/erpnext/accounts/doctype/account/account.py @@ -302,7 +302,9 @@ class Account(NestedSet): self.account_currency = frappe.get_cached_value("Company", self.company, "default_currency") self.currency_explicitly_specified = False - gl_currency = frappe.db.get_value("GL Entry", {"account": self.name}, "account_currency") + gl_currency = frappe.db.get_value( + "GL Entry", {"account": self.name, "is_cancelled": 0}, "account_currency" + ) if gl_currency and self.account_currency != gl_currency: if frappe.db.get_value("GL Entry", {"account": self.name}): diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py index efb93874226..3513464fa77 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py +++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py @@ -18,6 +18,7 @@ def create_charts( accounts = [] def _import_accounts(children, parent, root_type, root_account=False): + nonlocal custom_chart for account_name, child in children.items(): if root_account: root_type = child.get("root_type") @@ -55,7 +56,8 @@ def create_charts( "account_number": account_number, "account_type": child.get("account_type"), "account_currency": child.get("account_currency") - or frappe.get_cached_value("Company", company, "default_currency"), + if custom_chart + else frappe.get_cached_value("Company", company, "default_currency"), "tax_rate": child.get("tax_rate"), } ) diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py index dabb9fde35d..c1d0aea7ae1 100644 --- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py +++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py @@ -111,17 +111,15 @@ class AccountingDimension(Document): def make_dimension_in_accounting_doctypes(doc, doclist=None): if not doclist: doclist = get_doctypes_with_dimensions() - doc_count = len(get_accounting_dimensions()) count = 0 - repostable_doctypes = get_allowed_types_from_settings() + repostable_doctypes = get_allowed_types_from_settings(child_doc=True) for doctype in doclist: if (doc_count + 1) % 2 == 0: insert_after_field = "dimension_col_break" else: insert_after_field = "accounting_dimensions_section" - df = { "fieldname": doc.fieldname, "label": doc.label, diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index dcf6f24fae0..ad20c8ae2e7 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -42,6 +42,7 @@ "show_payment_schedule_in_print", "item_price_settings_section", "maintain_same_internal_transaction_rate", + "fetch_valuation_rate_for_internal_transaction", "column_break_feyo", "maintain_same_rate_action", "role_to_override_stop_action", @@ -644,6 +645,12 @@ "fieldname": "drop_ar_procedures", "fieldtype": "Button", "label": "Drop Procedures" + }, + { + "default": "0", + "fieldname": "fetch_valuation_rate_for_internal_transaction", + "fieldtype": "Check", + "label": "Fetch Valuation Rate for Internal Transaction" } ], "grid_page_length": 50, @@ -652,7 +659,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-06-23 15:55:33.346398", + "modified": "2025-07-18 13:56:47.192437", "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Settings", diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py index 8475e54f465..f7c5dfa396f 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py @@ -49,6 +49,7 @@ class AccountsSettings(Document): enable_immutable_ledger: DF.Check enable_party_matching: DF.Check exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"] + fetch_valuation_rate_for_internal_transaction: DF.Check frozen_accounts_modifier: DF.Link | None general_ledger_remarks_length: DF.Int ignore_account_closing_balance: DF.Check diff --git a/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json b/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json index 290ed11c98e..5ad2479e858 100644 --- a/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json +++ b/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json @@ -12,7 +12,8 @@ "against_voucher_no", "amount", "currency", - "event" + "event", + "delinked" ], "fields": [ { @@ -68,12 +69,20 @@ "label": "Company", "options": "Company", "read_only": 1 + }, + { + "default": "0", + "fieldname": "delinked", + "fieldtype": "Check", + "label": "DeLinked", + "read_only": 1 } ], + "grid_page_length": 50, "in_create": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2024-11-05 10:31:28.736671", + "modified": "2025-07-29 11:37:42.678556", "modified_by": "Administrator", "module": "Accounts", "name": "Advance Payment Ledger Entry", @@ -107,7 +116,8 @@ "share": 1 } ], + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.py b/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.py index 0ec2d411761..a9392fc9367 100644 --- a/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.py +++ b/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.py @@ -1,9 +1,11 @@ # Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors # For license information, please see license.txt -# import frappe +import frappe from frappe.model.document import Document +from erpnext.accounts.utils import update_voucher_outstanding + class AdvancePaymentLedgerEntry(Document): # begin: auto-generated types @@ -19,9 +21,16 @@ class AdvancePaymentLedgerEntry(Document): amount: DF.Currency company: DF.Link | None currency: DF.Link | None + delinked: DF.Check event: DF.Data | None voucher_no: DF.DynamicLink | None voucher_type: DF.Link | None # end: auto-generated types - pass + def on_update(self): + if ( + self.against_voucher_type in ["Purchase Order", "Sales Order"] + and self.flags.update_outstanding == "Yes" + and not frappe.flags.is_reverse_depr_entry + ): + update_voucher_outstanding(self.against_voucher_type, self.against_voucher_no, None, None, None) diff --git a/erpnext/accounts/doctype/bank_account/bank_account.py b/erpnext/accounts/doctype/bank_account/bank_account.py index cda01ed4871..623d62491b4 100644 --- a/erpnext/accounts/doctype/bank_account/bank_account.py +++ b/erpnext/accounts/doctype/bank_account/bank_account.py @@ -109,6 +109,7 @@ class BankAccount(Document): "party_type": self.party_type, "party": self.party, "is_company_account": self.is_company_account, + "company": self.company, "is_default": 1, "disabled": 0, }, diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js index 0f01e2dfb65..6412971898c 100644 --- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js +++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js @@ -252,7 +252,7 @@ frappe.ui.form.on("Bank Statement Import", { open_url_post(method, { doctype: "Bank Transaction", - export_records: "5_records", + export_records: "blank_template", export_fields: { "Bank Transaction": [ "date", diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index 89b184e89d0..c6f35168c0c 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -18,7 +18,7 @@ from erpnext.accounts.party import ( validate_party_frozen_disabled, validate_party_gle_currency, ) -from erpnext.accounts.utils import get_account_currency, get_fiscal_year +from erpnext.accounts.utils import OUTSTANDING_DOCTYPES, get_account_currency, get_fiscal_year from erpnext.exceptions import InvalidAccountCurrency exclude_from_linked_with = True @@ -224,26 +224,23 @@ class GLEntry(Document): def validate_account_details(self, adv_adj): """Account must be ledger, active and not freezed""" - ret = frappe.db.sql( - """select is_group, docstatus, company - from tabAccount where name=%s""", - self.account, - as_dict=1, - )[0] + account = frappe.get_cached_value( + "Account", self.account, fieldname=["is_group", "docstatus", "company"], as_dict=True + ) - if ret.is_group == 1: + if account.is_group == 1: frappe.throw( _( """{0} {1}: Account {2} is a Group Account and group accounts cannot be used in transactions""" ).format(self.voucher_type, self.voucher_no, self.account) ) - if ret.docstatus == 2: + if account.docstatus == 2: frappe.throw( _("{0} {1}: Account {2} is inactive").format(self.voucher_type, self.voucher_no, self.account) ) - if ret.company != self.company: + if account.company != self.company: frappe.throw( _("{0} {1}: Account {2} does not belong to Company {3}").format( self.voucher_type, self.voucher_no, self.account, self.company @@ -385,7 +382,7 @@ def update_outstanding_amt( ) ) - if against_voucher_type in ["Sales Invoice", "Purchase Invoice", "Fees"]: + if against_voucher_type in OUTSTANDING_DOCTYPES: ref_doc = frappe.get_doc(against_voucher_type, against_voucher) # Didn't use db_set for optimization purpose @@ -462,4 +459,9 @@ def rename_temporarily_named_docs(doctype): f"UPDATE `tab{doctype}` SET name = %s, to_rename = 0, modified = %s where name = %s", (newname, now(), oldname), ) + + for hook_type in ("on_gle_rename", "on_sle_rename"): + for hook in frappe.get_hooks(hook_type): + frappe.call(hook, newname=newname, oldname=oldname) + frappe.db.commit() diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index 25b09583d57..eea54a69d89 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -196,6 +196,7 @@ frappe.ui.form.on("Journal Entry", { }); erpnext.accounts.dimensions.update_dimension(frm, frm.doctype); + erpnext.utils.set_letter_head(frm); }, voucher_type: function (frm) { diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 9d30c3b39e5..15def2d3df2 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -195,8 +195,6 @@ class JournalEntry(AccountsController): self.validate_cheque_info() self.check_credit_limit() self.make_gl_entries() - self.make_advance_payment_ledger_entries() - self.update_advance_paid() self.update_asset_value() self.update_inter_company_jv() self.update_invoice_discounting() @@ -298,8 +296,6 @@ class JournalEntry(AccountsController): "Advance Payment Ledger Entry", ) self.make_gl_entries(1) - self.make_advance_payment_ledger_entries() - self.update_advance_paid() self.unlink_advance_entry_reference() self.unlink_asset_reference() self.unlink_inter_company_jv() @@ -309,18 +305,6 @@ class JournalEntry(AccountsController): def get_title(self): return self.pay_to_recd_from or self.accounts[0].account - def update_advance_paid(self): - advance_paid = frappe._dict() - advance_payment_doctypes = get_advance_payment_doctypes() - for d in self.get("accounts"): - if d.is_advance: - if d.reference_type in advance_payment_doctypes: - advance_paid.setdefault(d.reference_type, []).append(d.reference_name) - - for voucher_type, order_list in advance_paid.items(): - for voucher_no in list(set(order_list)): - frappe.get_doc(voucher_type, voucher_no).set_total_advance_paid() - def validate_inter_company_accounts(self): if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference: doc = frappe.db.get_value( @@ -1145,9 +1129,7 @@ class JournalEntry(AccountsController): def set_print_format_fields(self): bank_amount = party_amount = total_amount = 0.0 - currency = ( - bank_account_currency - ) = party_account_currency = pay_to_recd_from = self.pay_to_recd_from = None + currency = bank_account_currency = party_account_currency = pay_to_recd_from = None party_type = None for d in self.get("accounts"): if d.party_type in ["Customer", "Supplier"] and d.party: @@ -1197,49 +1179,65 @@ class JournalEntry(AccountsController): self.transaction_exchange_rate = row.exchange_rate break + advance_doctypes = get_advance_payment_doctypes() + for d in self.get("accounts"): if d.debit or d.credit or (self.voucher_type == "Exchange Gain Or Loss"): r = [d.user_remark, self.remark] r = [x for x in r if x] remarks = "\n".join(r) + row = { + "account": d.account, + "party_type": d.party_type, + "due_date": self.due_date, + "party": d.party, + "against": d.against_account, + "debit": flt(d.debit, d.precision("debit")), + "credit": flt(d.credit, d.precision("credit")), + "account_currency": d.account_currency, + "debit_in_account_currency": flt( + d.debit_in_account_currency, d.precision("debit_in_account_currency") + ), + "credit_in_account_currency": flt( + d.credit_in_account_currency, d.precision("credit_in_account_currency") + ), + "transaction_currency": self.transaction_currency, + "transaction_exchange_rate": self.transaction_exchange_rate, + "debit_in_transaction_currency": flt( + d.debit_in_account_currency, d.precision("debit_in_account_currency") + ) + if self.transaction_currency == d.account_currency + else flt(d.debit, d.precision("debit")) / self.transaction_exchange_rate, + "credit_in_transaction_currency": flt( + d.credit_in_account_currency, d.precision("credit_in_account_currency") + ) + if self.transaction_currency == d.account_currency + else flt(d.credit, d.precision("credit")) / self.transaction_exchange_rate, + "against_voucher_type": d.reference_type, + "against_voucher": d.reference_name, + "remarks": remarks, + "voucher_detail_no": d.reference_detail_no, + "cost_center": d.cost_center, + "project": d.project, + "finance_book": self.finance_book, + "advance_voucher_type": d.advance_voucher_type, + "advance_voucher_no": d.advance_voucher_no, + } + + if d.reference_type in advance_doctypes: + row.update( + { + "against_voucher_type": self.doctype, + "against_voucher": self.name, + "advance_voucher_type": d.reference_type, + "advance_voucher_no": d.reference_name, + } + ) + gl_map.append( self.get_gl_dict( - { - "account": d.account, - "party_type": d.party_type, - "due_date": self.due_date, - "party": d.party, - "against": d.against_account, - "debit": flt(d.debit, d.precision("debit")), - "credit": flt(d.credit, d.precision("credit")), - "account_currency": d.account_currency, - "debit_in_account_currency": flt( - d.debit_in_account_currency, d.precision("debit_in_account_currency") - ), - "credit_in_account_currency": flt( - d.credit_in_account_currency, d.precision("credit_in_account_currency") - ), - "transaction_currency": self.transaction_currency, - "transaction_exchange_rate": self.transaction_exchange_rate, - "debit_in_transaction_currency": flt( - d.debit_in_account_currency, d.precision("debit_in_account_currency") - ) - if self.transaction_currency == d.account_currency - else flt(d.debit, d.precision("debit")) / self.transaction_exchange_rate, - "credit_in_transaction_currency": flt( - d.credit_in_account_currency, d.precision("credit_in_account_currency") - ) - if self.transaction_currency == d.account_currency - else flt(d.credit, d.precision("credit")) / self.transaction_exchange_rate, - "against_voucher_type": d.reference_type, - "against_voucher": d.reference_name, - "remarks": remarks, - "voucher_detail_no": d.reference_detail_no, - "cost_center": d.cost_center, - "project": d.project, - "finance_book": self.finance_book, - }, + row, item=d, ) ) diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py index c5d7f2920fd..b617ed3069f 100644 --- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py @@ -579,6 +579,18 @@ class TestJournalEntry(IntegrationTestCase): ] self.assertEqual(expected, actual) + def test_pay_to_recd_from(self): + jv = make_journal_entry("_Test Cash - _TC", "_Test Bank - _TC", 100, save=False) + jv.pay_to_recd_from = "_Test Receiver" + jv.save() + self.assertEqual(jv.pay_to_recd_from, "_Test Receiver") + + jv.pay_to_recd_from = "_Test Receiver 2" + jv.save() + jv.submit() + + self.assertEqual(jv.pay_to_recd_from, "_Test Receiver 2") + def make_journal_entry( account1, diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json index e3dbcf51fa1..45dc903c068 100644 --- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json +++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json @@ -32,6 +32,8 @@ "reference_name", "reference_due_date", "reference_detail_no", + "advance_voucher_type", + "advance_voucher_no", "col_break3", "is_advance", "user_remark", @@ -262,20 +264,37 @@ "hidden": 1, "label": "Reference Detail No", "no_copy": 1 + }, + { + "fieldname": "advance_voucher_type", + "fieldtype": "Link", + "label": "Advance Voucher Type", + "no_copy": 1, + "options": "DocType", + "read_only": 1 + }, + { + "fieldname": "advance_voucher_no", + "fieldtype": "Dynamic Link", + "label": "Advance Voucher No", + "no_copy": 1, + "options": "advance_voucher_type", + "read_only": 1 } ], "idx": 1, "istable": 1, "links": [], - "modified": "2024-03-27 13:09:58.647732", + "modified": "2025-07-25 04:45:28.117715", "modified_by": "Administrator", "module": "Accounts", "name": "Journal Entry Account", "naming_rule": "Random", "owner": "Administrator", "permissions": [], + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.py b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.py index 00c9dcb374b..b801ac8c9a5 100644 --- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.py +++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.py @@ -17,8 +17,9 @@ class JournalEntryAccount(Document): account: DF.Link account_currency: DF.Link | None account_type: DF.Data | None + advance_voucher_no: DF.DynamicLink | None + advance_voucher_type: DF.Link | None against_account: DF.Text | None - balance: DF.Currency bank_account: DF.Link | None cost_center: DF.Link | None credit: DF.Currency @@ -31,7 +32,6 @@ class JournalEntryAccount(Document): parentfield: DF.Data parenttype: DF.Data party: DF.DynamicLink | None - party_balance: DF.Currency party_type: DF.Link | None project: DF.Link | None reference_detail_no: DF.Data | None diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 983e3bebb13..852c1ed5fd8 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -273,6 +273,7 @@ frappe.ui.form.on("Payment Entry", { frm.events.hide_unhide_fields(frm); frm.events.set_dynamic_labels(frm); erpnext.accounts.dimensions.update_dimension(frm, frm.doctype); + erpnext.utils.set_letter_head(frm); }, contact_person: function (frm) { diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 8a0bd527e1c..e2bd7e82886 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -199,12 +199,10 @@ class PaymentEntry(AccountsController): def on_submit(self): if self.difference_amount: frappe.throw(_("Difference Amount must be zero")) + self.update_payment_requests() self.make_gl_entries() self.update_outstanding_amounts() self.update_payment_schedule() - self.update_payment_requests() - self.make_advance_payment_ledger_entries() - self.update_advance_paid() # advance_paid_status depends on the payment request amount self.set_status() def validate_for_repost(self): @@ -304,13 +302,11 @@ class PaymentEntry(AccountsController): "Advance Payment Ledger Entry", ) super().on_cancel() + self.update_payment_requests(cancel=True) self.make_gl_entries(cancel=1) self.update_outstanding_amounts() self.delink_advance_entry_references() self.update_payment_schedule(cancel=1) - self.update_payment_requests(cancel=True) - self.make_advance_payment_ledger_entries() - self.update_advance_paid() # advance_paid_status depends on the payment request amount self.set_status() def update_payment_requests(self, cancel=False): @@ -1439,23 +1435,27 @@ class PaymentEntry(AccountsController): dr_or_cr + "_in_transaction_currency": d.allocated_amount if self.transaction_currency == self.party_account_currency else allocated_amount_in_company_currency / self.transaction_exchange_rate, + "advance_voucher_type": d.advance_voucher_type, + "advance_voucher_no": d.advance_voucher_no, }, item=self, ) ) - if self.book_advance_payments_in_separate_party_account: - if d.reference_doctype in advance_payment_doctypes: - # Upon reconciliation, whole ledger will be reposted. So, reference to SO/PO is fine - gle.update( - { - "against_voucher_type": d.reference_doctype, - "against_voucher": d.reference_name, - } - ) - else: - # Do not reference Invoices while Advance is in separate party account - gle.update({"against_voucher_type": self.doctype, "against_voucher": self.name}) + if d.reference_doctype in advance_payment_doctypes: + # advance reference + gle.update( + { + "against_voucher_type": self.doctype, + "against_voucher": self.name, + "advance_voucher_type": d.reference_doctype, + "advance_voucher_no": d.reference_name, + } + ) + + elif self.book_advance_payments_in_separate_party_account: + # Do not reference Invoices while Advance is in separate party account + gle.update({"against_voucher_type": self.doctype, "against_voucher": self.name}) else: gle.update( { @@ -1560,13 +1560,14 @@ class PaymentEntry(AccountsController): "voucher_no": self.name, "voucher_detail_no": invoice.name, } - if invoice.reconcile_effect_on: posting_date = invoice.reconcile_effect_on else: # For backwards compatibility # Supporting reposting on payment entries reconciled before select field introduction - posting_date = get_reconciliation_effect_date(invoice, self.company, self.posting_date) + posting_date = get_reconciliation_effect_date( + invoice.reference_doctype, invoice.reference_name, self.company, self.posting_date + ) frappe.db.set_value("Payment Entry Reference", invoice.name, "reconcile_effect_on", posting_date) dr_or_cr, account = self.get_dr_and_account_for_advances(invoice) @@ -1584,6 +1585,8 @@ class PaymentEntry(AccountsController): { "against_voucher_type": invoice.reference_doctype, "against_voucher": invoice.reference_name, + "advance_voucher_type": invoice.advance_voucher_type, + "advance_voucher_no": invoice.advance_voucher_no, "posting_date": posting_date, } ) @@ -1608,6 +1611,8 @@ class PaymentEntry(AccountsController): { "against_voucher_type": "Payment Entry", "against_voucher": self.name, + "advance_voucher_type": invoice.advance_voucher_type, + "advance_voucher_no": invoice.advance_voucher_no, } ) gle = self.get_gl_dict( @@ -1756,17 +1761,6 @@ class PaymentEntry(AccountsController): return flt(gl_dict.get(field, 0) / (conversion_rate or 1)) - def update_advance_paid(self): - if self.payment_type not in ("Receive", "Pay") or not self.party: - return - - advance_payment_doctypes = get_advance_payment_doctypes() - for d in self.get("references"): - if d.allocated_amount and d.reference_doctype in advance_payment_doctypes: - frappe.get_lazy_doc( - d.reference_doctype, d.reference_name, for_update=True - ).set_total_advance_paid() - def on_recurring(self, reference_doc, auto_repeat_doc): self.reference_no = reference_doc.name self.reference_date = nowdate() diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py index ff653ec8971..355aa46ea05 100644 --- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py @@ -52,7 +52,7 @@ class TestPaymentEntry(IntegrationTestCase): self.assertEqual(pe.paid_to_account_type, "Cash") expected_gle = dict( - (d[0], d) for d in [["Debtors - _TC", 0, 1000, so.name], ["_Test Cash - _TC", 1000.0, 0, None]] + (d[0], d) for d in [["Debtors - _TC", 0, 1000, pe.name], ["_Test Cash - _TC", 1000.0, 0, None]] ) self.validate_gl_entries(pe.name, expected_gle) @@ -84,7 +84,7 @@ class TestPaymentEntry(IntegrationTestCase): expected_gle = dict( (d[0], d) - for d in [["_Test Receivable USD - _TC", 0, 5500, so.name], [pe.paid_to, 5500.0, 0, None]] + for d in [["_Test Receivable USD - _TC", 0, 5500, pe.name], [pe.paid_to, 5500.0, 0, None]] ) self.validate_gl_entries(pe.name, expected_gle) diff --git a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json index fccbbb72f3c..77abc195ebc 100644 --- a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json +++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json @@ -22,7 +22,9 @@ "exchange_gain_loss", "account", "payment_request", - "payment_request_outstanding" + "payment_request_outstanding", + "advance_voucher_type", + "advance_voucher_no" ], "fields": [ { @@ -151,20 +153,37 @@ "fieldtype": "Date", "label": "Reconcile Effect On", "read_only": 1 + }, + { + "columns": 2, + "fieldname": "advance_voucher_type", + "fieldtype": "Link", + "label": "Advance Voucher Type", + "options": "DocType", + "read_only": 1 + }, + { + "columns": 2, + "fieldname": "advance_voucher_no", + "fieldtype": "Dynamic Link", + "label": "Advance Voucher No", + "options": "advance_voucher_type", + "read_only": 1 } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-01-13 15:56:18.895082", + "modified": "2025-07-25 04:32:11.040025", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Entry Reference", "owner": "Administrator", "permissions": [], "quick_entry": 1, + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py index 1d869b92715..a5e0b21a9af 100644 --- a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py +++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.py @@ -16,6 +16,8 @@ class PaymentEntryReference(Document): account: DF.Link | None account_type: DF.Data | None + advance_voucher_no: DF.DynamicLink | None + advance_voucher_type: DF.Link | None allocated_amount: DF.Float bill_no: DF.Data | None due_date: DF.Date | None @@ -26,7 +28,6 @@ class PaymentEntryReference(Document): parentfield: DF.Data parenttype: DF.Data payment_request: DF.Link | None - payment_request_outstanding: DF.Float payment_term: DF.Link | None payment_term_outstanding: DF.Float payment_type: DF.Data | None diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js index f15c2bdab21..ab9a50f8285 100644 --- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js +++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js @@ -8,4 +8,14 @@ frappe.ui.form.on("Payment Gateway Account", { frm.set_df_property("payment_gateway", "read_only", 1); } }, + + setup(frm) { + frm.set_query("payment_account", function () { + return { + filters: { + company: frm.doc.company, + }, + }; + }); + }, }); diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json index cc0f3d1b52b..cb258a89741 100644 --- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json +++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json @@ -7,6 +7,7 @@ "field_order": [ "payment_gateway", "payment_channel", + "company", "is_default", "column_break_4", "payment_account", @@ -71,11 +72,21 @@ "fieldtype": "Select", "label": "Payment Channel", "options": "\nEmail\nPhone\nOther" + }, + { + "fieldname": "company", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Company", + "options": "Company", + "print_hide": 1, + "remember_last_selected_value": 1, + "reqd": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-03-29 18:53:09.836254", + "modified": "2025-07-14 16:49:55.210352", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Gateway Account", @@ -94,6 +105,7 @@ "write": 1 } ], + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py index f1bf363eca0..7c58949be8b 100644 --- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py +++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.py @@ -15,6 +15,7 @@ class PaymentGatewayAccount(Document): if TYPE_CHECKING: from frappe.types import DF + company: DF.Link currency: DF.ReadOnly | None is_default: DF.Check message: DF.SmallText | None @@ -24,7 +25,8 @@ class PaymentGatewayAccount(Document): # end: auto-generated types def autoname(self): - self.name = self.payment_gateway + " - " + self.currency + abbr = frappe.db.get_value("Company", self.company, "abbr") + self.name = self.payment_gateway + " - " + self.currency + " - " + abbr def validate(self): self.currency = frappe.get_cached_value("Account", self.payment_account, "account_currency") @@ -34,13 +36,15 @@ class PaymentGatewayAccount(Document): def update_default_payment_gateway(self): if self.is_default: - frappe.db.sql( - """update `tabPayment Gateway Account` set is_default = 0 - where is_default = 1 """ + frappe.db.set_value( + "Payment Gateway Account", + {"is_default": 1, "name": ["!=", self.name], "company": self.company}, + "is_default", + 0, ) def set_as_default_if_not_set(self): - if not frappe.db.get_value( - "Payment Gateway Account", {"is_default": 1, "name": ("!=", self.name)}, "name" + if not frappe.db.exists( + "Payment Gateway Account", {"is_default": 1, "name": ("!=", self.name), "company": self.company} ): self.is_default = 1 diff --git a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json index 9f882ce4542..c03439cb157 100644 --- a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json +++ b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json @@ -197,4 +197,4 @@ "sort_field": "creation", "sort_order": "DESC", "states": [] -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py index 2bc44893c20..30e885adacc 100644 --- a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py +++ b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py @@ -16,7 +16,7 @@ from erpnext.accounts.doctype.gl_entry.gl_entry import ( validate_balance_type, validate_frozen_account, ) -from erpnext.accounts.utils import update_voucher_outstanding +from erpnext.accounts.utils import OUTSTANDING_DOCTYPES, update_voucher_outstanding from erpnext.exceptions import InvalidAccountDimensionError, MandatoryAccountDimensionError @@ -51,38 +51,36 @@ class PaymentLedgerEntry(Document): # end: auto-generated types def validate_account(self): - valid_account = frappe.db.get_list( - "Account", - "name", - filters={"name": self.account, "account_type": self.account_type, "company": self.company}, - ignore_permissions=True, + account = frappe.get_cached_value( + "Account", self.account, fieldname=["account_type", "company"], as_dict=True ) - if not valid_account: + + if account.company != self.company: + frappe.throw(_("{0} account is not of company {1}").format(self.account, self.company)) + + if account.account_type != self.account_type: frappe.throw(_("{0} account is not of type {1}").format(self.account, self.account_type)) def validate_account_details(self): """Account must be ledger, active and not freezed""" - ret = frappe.db.sql( - """select is_group, docstatus, company - from tabAccount where name=%s""", - self.account, - as_dict=1, - )[0] + account = frappe.get_cached_value( + "Account", self.account, fieldname=["is_group", "docstatus", "company"], as_dict=True + ) - if ret.is_group == 1: + if account.is_group == 1: frappe.throw( _( """{0} {1}: Account {2} is a Group Account and group accounts cannot be used in transactions""" ).format(self.voucher_type, self.voucher_no, self.account) ) - if ret.docstatus == 2: + if account.docstatus == 2: frappe.throw( _("{0} {1}: Account {2} is inactive").format(self.voucher_type, self.voucher_no, self.account) ) - if ret.company != self.company: + if account.company != self.company: frappe.throw( _("{0} {1}: Account {2} does not belong to Company {3}").format( self.voucher_type, self.voucher_no, self.account, self.company @@ -170,7 +168,7 @@ class PaymentLedgerEntry(Document): # update outstanding amount if ( - self.against_voucher_type in ["Journal Entry", "Sales Invoice", "Purchase Invoice", "Fees"] + self.against_voucher_type in OUTSTANDING_DOCTYPES and self.flags.update_outstanding == "Yes" and not frappe.flags.is_reverse_depr_entry ): diff --git a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py index 57231ec5bdd..cb23d27df44 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py @@ -1714,6 +1714,67 @@ class TestPaymentReconciliation(IntegrationTestCase): ) self.assertEqual(len(pl_entries), 3) + def test_advance_payment_reconciliation_date_for_older_date(self): + old_settings = frappe.db.get_value( + "Company", + self.company, + [ + "reconciliation_takes_effect_on", + "default_advance_paid_account", + "book_advance_payments_in_separate_party_account", + ], + as_dict=True, + ) + frappe.db.set_value( + "Company", + self.company, + { + "book_advance_payments_in_separate_party_account": 1, + "default_advance_paid_account": self.advance_payable_account, + "reconciliation_takes_effect_on": "Oldest Of Invoice Or Advance", + }, + ) + + self.supplier = "_Test Supplier" + + pi1 = self.create_purchase_invoice(qty=10, rate=100) + po = self.create_purchase_order(qty=10, rate=100) + + pay = get_payment_entry(po.doctype, po.name) + pay.paid_amount = 1000 + pay.save().submit() + + pr = frappe.new_doc("Payment Reconciliation") + pr.company = self.company + pr.party_type = "Supplier" + pr.party = self.supplier + pr.receivable_payable_account = get_party_account(pr.party_type, pr.party, pr.company) + pr.default_advance_account = self.advance_payable_account + pr.get_unreconciled_entries() + invoices = [x.as_dict() for x in pr.invoices] + payments = [x.as_dict() for x in pr.payments] + pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments})) + pr.allocation[0].allocated_amount = 100 + pr.reconcile() + + pay.reload() + self.assertEqual(getdate(pay.references[0].reconcile_effect_on), getdate(pi1.posting_date)) + + # test setting of date if not available + frappe.db.set_value("Payment Entry Reference", pay.references[1].name, "reconcile_effect_on", None) + pay.reload() + pay.cancel() + + pay.reload() + pi1.reload() + po.reload() + + self.assertEqual(getdate(pay.references[0].reconcile_effect_on), getdate(pi1.posting_date)) + pi1.cancel() + po.cancel() + + frappe.db.set_value("Company", self.company, old_settings) + def test_advance_payment_reconciliation_against_journal_for_customer(self): frappe.db.set_value( "Company", @@ -2147,6 +2208,138 @@ class TestPaymentReconciliation(IntegrationTestCase): self.assertEqual(len(pr.get("payments")), 0) self.assertEqual(pr.get("invoices")[0].get("outstanding_amount"), 200) + def test_partial_advance_payment_with_closed_fiscal_year(self): + """ + Test Advance Payment partial reconciliation before period closing and partial after period closing + """ + default_settings = frappe.db.get_value( + "Company", + self.company, + [ + "book_advance_payments_in_separate_party_account", + "default_advance_paid_account", + "reconciliation_takes_effect_on", + ], + as_dict=True, + ) + first_fy_start_date = frappe.db.get_value( + "Fiscal Year", {"disabled": 0}, [{"MIN": "year_start_date"}] + ) + prev_fy_start_date = add_years(first_fy_start_date, -1) + prev_fy_end_date = add_days(first_fy_start_date, -1) + + create_fiscal_year( + company=self.company, year_start_date=prev_fy_start_date, year_end_date=prev_fy_end_date + ) + + frappe.db.set_value( + "Company", + self.company, + { + "book_advance_payments_in_separate_party_account": 1, + "default_advance_paid_account": self.advance_payable_account, + "reconciliation_takes_effect_on": "Oldest Of Invoice Or Advance", + }, + ) + + self.supplier = "_Test Supplier" + + # Create advance payment of 1000 (previous FY) + pe = self.create_payment_entry(amount=1000, posting_date=prev_fy_start_date) + pe.party_type = "Supplier" + pe.party = self.supplier + pe.payment_type = "Pay" + pe.paid_from = self.cash + pe.paid_to = self.advance_payable_account + pe.save().submit() + + # Create purchase invoice of 600 (previous FY) + pi1 = self.create_purchase_invoice(qty=1, rate=600, do_not_submit=True) + pi1.posting_date = prev_fy_start_date + pi1.set_posting_time = 1 + pi1.supplier = self.supplier + pi1.credit_to = self.creditors + pi1.save().submit() + + # Reconcile advance payment + pr = self.create_payment_reconciliation(party_is_customer=False) + pr.party = self.supplier + pr.receivable_payable_account = self.creditors + pr.default_advance_account = self.advance_payable_account + pr.from_invoice_date = pr.to_invoice_date = pi1.posting_date + pr.from_payment_date = pr.to_payment_date = pe.posting_date + pr.get_unreconciled_entries() + invoices = [x.as_dict() for x in pr.invoices if x.invoice_number == pi1.name] + payments = [x.as_dict() for x in pr.payments if x.reference_name == pe.name] + pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments})) + pr.reconcile() + + # Verify partial reconciliation + pe.reload() + pi1.reload() + + self.assertEqual(len(pe.references), 1) + self.assertEqual(pe.references[0].allocated_amount, 600) + self.assertEqual(flt(pe.unallocated_amount), 400) + + self.assertEqual(pi1.outstanding_amount, 0) + self.assertEqual(pi1.status, "Paid") + + # Close accounting period for March (previous FY) + pcv = make_period_closing_voucher( + company=self.company, cost_center=self.cost_center, posting_date=prev_fy_end_date + ) + pcv.reload() + self.assertEqual(pcv.gle_processing_status, "Completed") + + # Change reconciliation setting to "Reconciliation Date" + frappe.db.set_value( + "Company", + self.company, + "reconciliation_takes_effect_on", + "Reconciliation Date", + ) + + # Create new purchase invoice for 400 in new fiscal year + pi2 = self.create_purchase_invoice(qty=1, rate=400, do_not_submit=True) + pi2.posting_date = today() + pi2.set_posting_time = 1 + pi2.supplier = self.supplier + pi2.currency = "INR" + pi2.credit_to = self.creditors + pi2.save() + pi2.submit() + + # Allocate 600 from advance payment to purchase invoice + pr = self.create_payment_reconciliation(party_is_customer=False) + pr.party = self.supplier + pr.receivable_payable_account = self.creditors + pr.default_advance_account = self.advance_payable_account + pr.from_invoice_date = pr.to_invoice_date = pi2.posting_date + pr.from_payment_date = pr.to_payment_date = pe.posting_date + pr.get_unreconciled_entries() + invoices = [x.as_dict() for x in pr.invoices if x.invoice_number == pi2.name] + payments = [x.as_dict() for x in pr.payments if x.reference_name == pe.name] + pr.allocate_entries(frappe._dict({"invoices": invoices, "payments": payments})) + pr.reconcile() + + pe.reload() + pi2.reload() + + # Assert advance payment is fully allocated + self.assertEqual(len(pe.references), 2) + self.assertEqual(flt(pe.unallocated_amount), 0) + + # Assert new invoice is fully paid + self.assertEqual(pi2.outstanding_amount, 0) + self.assertEqual(pi2.status, "Paid") + + # Verify reconciliation dates are correct based on company setting + self.assertEqual(getdate(pe.references[0].reconcile_effect_on), getdate(pi1.posting_date)) + self.assertEqual(getdate(pe.references[1].reconcile_effect_on), getdate(pi2.posting_date)) + + frappe.db.set_value("Company", self.company, default_settings) + def make_customer(customer_name, currency=None): if not frappe.db.exists("Customer", customer_name): diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js index 44313e5c0d2..1d4c8d5280d 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.js +++ b/erpnext/accounts/doctype/payment_request/payment_request.js @@ -9,6 +9,14 @@ frappe.ui.form.on("Payment Request", { query: "erpnext.setup.doctype.party_type.party_type.get_party_type", }; }); + + frm.set_query("payment_gateway_account", function () { + return { + filters: { + company: frm.doc.company, + }, + }; + }); }, }); diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py index db0992014a7..cafd2e4b721 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.py +++ b/erpnext/accounts/doctype/payment_request/payment_request.py @@ -534,7 +534,8 @@ def make_payment_request(**args): frappe.throw(_("Payment Requests cannot be created against: {0}").format(frappe.bold(args.dt))) ref_doc = args.ref_doc or frappe.get_doc(args.dt, args.dn) - + if not args.get("company"): + args.company = ref_doc.company gateway_account = get_gateway_details(args) or frappe._dict() grand_total = get_amount(ref_doc, gateway_account.get("payment_account")) @@ -781,7 +782,7 @@ def get_gateway_details(args): # nosemgrep """ Return gateway and payment account of default payment gateway """ - gateway_account = args.get("payment_gateway_account", {"is_default": 1}) + gateway_account = args.get("payment_gateway_account", {"is_default": 1, "company": args.company}) return get_payment_gateway_account(gateway_account) diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py index fe12c100940..1f97b8b5784 100644 --- a/erpnext/accounts/doctype/payment_request/test_payment_request.py +++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py @@ -34,12 +34,14 @@ payment_method = [ "payment_gateway": "_Test Gateway", "payment_account": "_Test Bank - _TC", "currency": "INR", + "company": "_Test Company", }, { "doctype": "Payment Gateway Account", "payment_gateway": "_Test Gateway", "payment_account": "_Test Bank USD - _TC", "currency": "USD", + "company": "_Test Company", }, { "doctype": "Payment Gateway Account", @@ -47,6 +49,7 @@ payment_method = [ "payment_account": "_Test Bank USD - _TC", "payment_channel": "Other", "currency": "USD", + "company": "_Test Company", }, { "doctype": "Payment Gateway Account", @@ -54,6 +57,7 @@ payment_method = [ "payment_account": "_Test Bank USD - _TC", "payment_channel": "Phone", "currency": "USD", + "company": "_Test Company", }, ] @@ -67,7 +71,11 @@ class TestPaymentRequest(IntegrationTestCase): for method in payment_method: if not frappe.db.get_value( "Payment Gateway Account", - {"payment_gateway": method["payment_gateway"], "currency": method["currency"]}, + { + "payment_gateway": method["payment_gateway"], + "currency": method["currency"], + "company": method["company"], + }, "name", ): frappe.get_doc(method).insert(ignore_permissions=True) @@ -103,7 +111,7 @@ class TestPaymentRequest(IntegrationTestCase): dt="Sales Order", dn=so_inr.name, recipient_id="saurabh@erpnext.com", - payment_gateway_account="_Test Gateway - INR", + payment_gateway_account="_Test Gateway - INR - _TC", ) self.assertEqual(pr.reference_doctype, "Sales Order") @@ -117,7 +125,7 @@ class TestPaymentRequest(IntegrationTestCase): dt="Sales Invoice", dn=si_usd.name, recipient_id="saurabh@erpnext.com", - payment_gateway_account="_Test Gateway - USD", + payment_gateway_account="_Test Gateway - USD - _TC", ) self.assertEqual(pr.reference_doctype, "Sales Invoice") @@ -130,7 +138,7 @@ class TestPaymentRequest(IntegrationTestCase): pr = make_payment_request( dt="Sales Order", dn=so.name, - payment_gateway_account="_Test Gateway Other - USD", + payment_gateway_account="_Test Gateway Other - USD - _TC", submit_doc=True, return_doc=True, ) @@ -145,7 +153,7 @@ class TestPaymentRequest(IntegrationTestCase): pr = make_payment_request( dt="Sales Order", dn=so.name, - payment_gateway_account="_Test Gateway - USD", # email channel + payment_gateway_account="_Test Gateway - USD - _TC", # email channel submit_doc=False, return_doc=True, ) @@ -163,7 +171,7 @@ class TestPaymentRequest(IntegrationTestCase): pr = make_payment_request( dt="Sales Order", dn=so.name, - payment_gateway_account="_Test Gateway Phone - USD", + payment_gateway_account="_Test Gateway Phone - USD - _TC", submit_doc=True, return_doc=True, ) @@ -180,7 +188,7 @@ class TestPaymentRequest(IntegrationTestCase): pr = make_payment_request( dt="Sales Order", dn=so.name, - payment_gateway_account="_Test Gateway - USD", # email channel + payment_gateway_account="_Test Gateway - USD - _TC", # email channel submit_doc=True, return_doc=True, ) @@ -201,7 +209,7 @@ class TestPaymentRequest(IntegrationTestCase): pr = make_payment_request( dt="Sales Order", dn=so.name, - payment_gateway_account="_Test Gateway - USD", # email channel + payment_gateway_account="_Test Gateway - USD - _TC", # email channel make_sales_invoice=True, mute_email=True, submit_doc=True, @@ -232,7 +240,7 @@ class TestPaymentRequest(IntegrationTestCase): party="_Test Supplier USD", recipient_id="user@example.com", mute_email=1, - payment_gateway_account="_Test Gateway - USD", + payment_gateway_account="_Test Gateway - USD - _TC", submit_doc=1, return_doc=1, ) @@ -257,7 +265,7 @@ class TestPaymentRequest(IntegrationTestCase): dn=purchase_invoice.name, recipient_id="user@example.com", mute_email=1, - payment_gateway_account="_Test Gateway - USD", + payment_gateway_account="_Test Gateway - USD - _TC", return_doc=1, ) @@ -276,7 +284,7 @@ class TestPaymentRequest(IntegrationTestCase): dn=purchase_invoice.name, recipient_id="user@example.com", mute_email=1, - payment_gateway_account="_Test Gateway - USD", + payment_gateway_account="_Test Gateway - USD - _TC", return_doc=1, ) @@ -300,7 +308,7 @@ class TestPaymentRequest(IntegrationTestCase): dn=so_inr.name, recipient_id="saurabh@erpnext.com", mute_email=1, - payment_gateway_account="_Test Gateway - INR", + payment_gateway_account="_Test Gateway - INR - _TC", submit_doc=1, return_doc=1, ) @@ -322,7 +330,7 @@ class TestPaymentRequest(IntegrationTestCase): dn=si_usd.name, recipient_id="saurabh@erpnext.com", mute_email=1, - payment_gateway_account="_Test Gateway - USD", + payment_gateway_account="_Test Gateway - USD - _TC", submit_doc=1, return_doc=1, ) @@ -366,7 +374,7 @@ class TestPaymentRequest(IntegrationTestCase): dn=si_usd.name, recipient_id="saurabh@erpnext.com", mute_email=1, - payment_gateway_account="_Test Gateway - USD", + payment_gateway_account="_Test Gateway - USD - _TC", submit_doc=1, return_doc=1, ) @@ -471,7 +479,7 @@ class TestPaymentRequest(IntegrationTestCase): self.assertEqual(pe.paid_amount, 800) # paid amount set from pr's outstanding amount self.assertEqual(pe.references[0].allocated_amount, 800) - self.assertEqual(pe.references[0].outstanding_amount, 800) # for Orders it is not zero + self.assertEqual(pe.references[0].outstanding_amount, 0) # Also for orders it will zero self.assertEqual(pe.references[0].payment_request, pr.name) so.load_from_db() diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js index 17024e249c1..f740befd5d3 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js @@ -14,6 +14,7 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex } company() { + erpnext.utils.set_letter_head(this.frm); erpnext.accounts.dimensions.update_dimension(this.frm, this.frm.doctype); this.frm.set_value("set_warehouse", ""); this.frm.set_value("taxes_and_charges", ""); diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json index b7114d920a7..94ee5a6c07b 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json @@ -296,6 +296,7 @@ "search_index": 1 }, { + "default": "Now", "fieldname": "posting_time", "fieldtype": "Time", "label": "Posting Time", @@ -1598,7 +1599,7 @@ "icon": "fa fa-file-text", "is_submittable": 1, "links": [], - "modified": "2025-07-18 16:50:30.516162", + "modified": "2025-08-04 22:22:31.471752", "modified_by": "Administrator", "module": "Accounts", "name": "POS Invoice", diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.js b/erpnext/accounts/doctype/pos_profile/pos_profile.js index 31f0f0725a6..2a5290e3f45 100755 --- a/erpnext/accounts/doctype/pos_profile/pos_profile.js +++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js @@ -135,6 +135,7 @@ frappe.ui.form.on("POS Profile", { company: function (frm) { frm.trigger("toggle_display_account_head"); erpnext.accounts.dimensions.update_dimension(frm, frm.doctype); + erpnext.utils.set_letter_head(frm); }, toggle_display_account_head: function (frm) { diff --git a/erpnext/accounts/doctype/pos_search_fields/pos_search_fields.json b/erpnext/accounts/doctype/pos_search_fields/pos_search_fields.json index 44555b562a2..9f6b95ffef5 100644 --- a/erpnext/accounts/doctype/pos_search_fields/pos_search_fields.json +++ b/erpnext/accounts/doctype/pos_search_fields/pos_search_fields.json @@ -19,13 +19,14 @@ "fieldname": "field", "fieldtype": "Select", "in_list_view": 1, - "label": "Field" + "label": "Field", + "reqd": 1 } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-03-27 13:10:16.969895", + "modified": "2025-07-29 18:08:40.323579", "modified_by": "Administrator", "module": "Accounts", "name": "POS Search Fields", @@ -35,4 +36,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js index 57d0c59329c..f52d9eea0ac 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js @@ -92,6 +92,7 @@ frappe.ui.form.on("Process Statement Of Accounts", { frm.set_value("account", ""); frm.set_value("cost_center", ""); frm.set_value("project", ""); + erpnext.utils.set_letter_head(frm); }, report: function (frm) { let filters = { diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 5b91c709e13..91b1ee1ffb4 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -63,6 +63,7 @@ "column_break_50", "base_total", "base_net_total", + "claimed_landed_cost_amount", "column_break_28", "total", "net_total", @@ -321,6 +322,7 @@ "search_index": 1 }, { + "default": "Now", "fieldname": "posting_time", "fieldtype": "Time", "label": "Posting Time", @@ -1651,6 +1653,15 @@ "label": "Select Dispatch Address ", "options": "Address", "print_hide": 1 + }, + { + "fieldname": "claimed_landed_cost_amount", + "fieldtype": "Currency", + "label": "Claimed Landed Cost Amount (Company Currency)", + "no_copy": 1, + "options": "Company:company:default_currency", + "print_hide": 1, + "read_only": 1 } ], "grid_page_length": 50, @@ -1658,7 +1669,7 @@ "idx": 204, "is_submittable": 1, "links": [], - "modified": "2025-04-09 16:49:22.175081", + "modified": "2025-08-04 19:19:11.380664", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", @@ -1723,4 +1734,4 @@ "timeline_field": "supplier", "title_field": "title", "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 7f857a8877f..e3c7849e77e 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -104,6 +104,7 @@ class PurchaseInvoice(BuyingController): billing_address_display: DF.TextEditor | None buying_price_list: DF.Link | None cash_bank_account: DF.Link | None + claimed_landed_cost_amount: DF.Currency clearance_date: DF.Date | None company: DF.Link | None contact_display: DF.SmallText | None @@ -972,7 +973,7 @@ class PurchaseInvoice(BuyingController): self.get_provisional_accounts() for item in self.get("items"): - if flt(item.base_net_amount): + if flt(item.base_net_amount) or (self.get("update_stock") and item.valuation_rate): if item.item_code: frappe.get_cached_value("Item", item.item_code, "asset_category") diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py index 800f1647471..37863036492 100644 --- a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py +++ b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py @@ -5,6 +5,7 @@ import inspect import frappe from frappe import _, qb +from frappe.desk.form.linked_with import get_child_tables_of_doctypes from frappe.model.document import Document from frappe.utils.data import comma_and @@ -169,6 +170,10 @@ def start_repost(account_repost_doc=str) -> None: frappe.db.delete( "Payment Ledger Entry", filters={"voucher_type": doc.doctype, "voucher_no": doc.name} ) + frappe.db.delete( + "Advance Payment Ledger Entry", + filters={"voucher_type": doc.doctype, "voucher_no": doc.name}, + ) if doc.doctype in ["Sales Invoice", "Purchase Invoice"]: if not repost_doc.delete_cancelled_entries: @@ -204,13 +209,29 @@ def start_repost(account_repost_doc=str) -> None: doc.make_gl_entries() -def get_allowed_types_from_settings(): - return [ +def get_allowed_types_from_settings(child_doc: bool = False): + repost_docs = [ x.document_type for x in frappe.db.get_all( "Repost Allowed Types", filters={"allowed": True}, fields=["distinct(document_type)"] ) ] + result = repost_docs + + if repost_docs and child_doc: + result.extend(get_child_docs(repost_docs)) + + return result + + +def get_child_docs(doc: list) -> list: + child_doc = [] + doc = get_child_tables_of_doctypes(doc) + for child_list in doc.values(): + for child in child_list: + if child.get("child_table"): + child_doc.append(child["child_table"]) + return child_doc def validate_docs_for_deferred_accounting(sales_docs, purchase_docs): diff --git a/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.py b/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.py index 14a070dc464..637234fea1e 100644 --- a/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.py +++ b/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.py @@ -1,9 +1,14 @@ # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors # For license information, please see license.txt -# import frappe +import frappe from frappe.model.document import Document +from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( + get_accounting_dimensions, +) +from erpnext.accounts.doctype.repost_accounting_ledger.repost_accounting_ledger import get_child_docs + class RepostAccountingLedgerSettings(Document): # begin: auto-generated types @@ -17,6 +22,24 @@ class RepostAccountingLedgerSettings(Document): from erpnext.accounts.doctype.repost_allowed_types.repost_allowed_types import RepostAllowedTypes allowed_types: DF.Table[RepostAllowedTypes] - # end: auto-generated types - pass + # end: auto-generated types + def validate(self): + self.update_property_for_accounting_dimension() + + def update_property_for_accounting_dimension(self): + doctypes = [entry.document_type for entry in self.allowed_types if entry.allowed] + if not doctypes: + return + doctypes += get_child_docs(doctypes) + + set_allow_on_submit_for_dimension_fields(doctypes) + + +def set_allow_on_submit_for_dimension_fields(doctypes): + for dt in doctypes: + meta = frappe.get_meta(dt) + for dimension in get_accounting_dimensions(): + df = meta.get_field(dimension) + if df and not df.allow_on_submit: + frappe.db.set_value("Custom Field", dt + "-" + dimension, "allow_on_submit", 1) diff --git a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.py b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.py index 6b90300a899..6fd1b0f2bf2 100644 --- a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.py +++ b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.py @@ -8,7 +8,7 @@ from frappe import _, qb from frappe.model.document import Document from frappe.query_builder.custom import ConstantColumn -from erpnext.accounts.utils import _delete_pl_entries, create_payment_ledger_entry +from erpnext.accounts.utils import _delete_adv_pl_entries, _delete_pl_entries, create_payment_ledger_entry VOUCHER_TYPES = ["Sales Invoice", "Purchase Invoice", "Payment Entry", "Journal Entry"] @@ -16,6 +16,7 @@ VOUCHER_TYPES = ["Sales Invoice", "Purchase Invoice", "Payment Entry", "Journal def repost_ple_for_voucher(voucher_type, voucher_no, gle_map=None): if voucher_type and voucher_no and gle_map: _delete_pl_entries(voucher_type, voucher_no) + _delete_adv_pl_entries(voucher_type, voucher_no) create_payment_ledger_entry(gle_map, cancel=0) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 45f0fc3c418..b925bcd2a44 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -373,6 +373,7 @@ "search_index": 1 }, { + "default": "Now", "fieldname": "posting_time", "fieldtype": "Time", "hide_days": 1, @@ -2232,7 +2233,7 @@ "link_fieldname": "consolidated_invoice" } ], - "modified": "2025-06-26 14:06:56.773552", + "modified": "2025-08-04 19:20:28.732039", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py b/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py index 3466b2733ac..acd30cc47b7 100644 --- a/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py +++ b/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py @@ -9,6 +9,7 @@ from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_pay from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice from erpnext.accounts.party import get_party_account from erpnext.accounts.test.accounts_mixin import AccountsTestMixin +from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order @@ -17,6 +18,7 @@ class TestUnreconcilePayment(AccountsTestMixin, IntegrationTestCase): def setUp(self): self.create_company() self.create_customer() + self.create_supplier() self.create_usd_receivable_account() self.create_item() self.clear_old_entries() @@ -364,13 +366,13 @@ class TestUnreconcilePayment(AccountsTestMixin, IntegrationTestCase): # Assert 'Advance Paid' so.reload() pe.reload() - self.assertEqual(so.advance_paid, 100) + self.assertEqual(so.advance_paid, 0) self.assertEqual(len(pe.references), 0) self.assertEqual(pe.unallocated_amount, 100) pe.cancel() so.reload() - self.assertEqual(so.advance_paid, 100) + self.assertEqual(so.advance_paid, 0) def test_06_unreconcile_advance_from_payment_entry(self): self.enable_advance_as_liability() @@ -417,7 +419,7 @@ class TestUnreconcilePayment(AccountsTestMixin, IntegrationTestCase): so2.reload() pe.reload() self.assertEqual(so1.advance_paid, 150) - self.assertEqual(so2.advance_paid, 110) + self.assertEqual(so2.advance_paid, 0) self.assertEqual(len(pe.references), 1) self.assertEqual(pe.unallocated_amount, 110) @@ -463,8 +465,77 @@ class TestUnreconcilePayment(AccountsTestMixin, IntegrationTestCase): self.assertEqual(len(pr.get("invoices")), 0) self.assertEqual(len(pr.get("payments")), 0) - # Assert 'Advance Paid' so.reload() self.assertEqual(so.advance_paid, 1000) + unreconcile = frappe.get_doc( + { + "doctype": "Unreconcile Payment", + "company": self.company, + "voucher_type": pe.doctype, + "voucher_no": pe.name, + } + ) + unreconcile.add_references() + unreconcile.allocations = [x for x in unreconcile.allocations if x.reference_name == si.name] + unreconcile.save().submit() + + # after unreconcilaition advance paid will be reduced + # Assert 'Advance Paid' + so.reload() + self.assertEqual(so.advance_paid, 0) + self.disable_advance_as_liability() + + def test_unreconcile_advance_from_journal_entry(self): + po = create_purchase_order( + company=self.company, + supplier=self.supplier, + item=self.item, + qty=1, + rate=100, + transaction_date=today(), + do_not_submit=False, + ) + + je = frappe.get_doc( + { + "doctype": "Journal Entry", + "company": self.company, + "voucher_type": "Journal Entry", + "posting_date": po.transaction_date, + "multi_currency": True, + "accounts": [ + { + "account": "Creditors - _TC", + "party_type": "Supplier", + "party": po.supplier, + "debit_in_account_currency": 100, + "is_advance": "Yes", + "reference_type": po.doctype, + "reference_name": po.name, + }, + {"account": "Cash - _TC", "credit_in_account_currency": 100}, + ], + } + ) + je.save().submit() + po.reload() + self.assertEqual(po.advance_paid, 100) + + unreconcile = frappe.get_doc( + { + "doctype": "Unreconcile Payment", + "company": self.company, + "voucher_type": je.doctype, + "voucher_no": je.name, + } + ) + unreconcile.add_references() + self.assertEqual(len(unreconcile.allocations), 1) + allocations = [x.reference_name for x in unreconcile.allocations] + self.assertEqual([po.name], allocations) + unreconcile.save().submit() + + po.reload() + self.assertEqual(po.advance_paid, 0) diff --git a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py index e57b90f11f7..02cad39de8f 100644 --- a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py +++ b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py @@ -12,7 +12,6 @@ from frappe.utils.data import comma_and from erpnext.accounts.utils import ( cancel_exchange_gain_loss_journal, - get_advance_payment_doctypes, unlink_ref_doc_from_payment_entries, update_voucher_outstanding, ) @@ -45,31 +44,12 @@ class UnreconcilePayment(Document): @frappe.whitelist() def get_allocations_from_payment(self): - allocated_references = [] - ple = qb.DocType("Payment Ledger Entry") - allocated_references = ( - qb.from_(ple) - .select( - ple.account, - ple.party_type, - ple.party, - ple.against_voucher_type.as_("reference_doctype"), - ple.against_voucher_no.as_("reference_name"), - Abs(Sum(ple.amount_in_account_currency)).as_("allocated_amount"), - ple.account_currency, - ) - .where( - (ple.docstatus == 1) - & (ple.voucher_type == self.voucher_type) - & (ple.voucher_no == self.voucher_no) - & (ple.voucher_no != ple.against_voucher_no) - ) - .groupby(ple.against_voucher_type, ple.against_voucher_no) - .run(as_dict=True) + return get_linked_payments_for_doc( + company=self.company, + doctype=self.voucher_type, + docname=self.voucher_no, ) - return allocated_references - def add_references(self): allocations = self.get_allocations_from_payment() @@ -82,27 +62,43 @@ class UnreconcilePayment(Document): doc = frappe.get_doc(alloc.reference_doctype, alloc.reference_name) unlink_ref_doc_from_payment_entries(doc, self.voucher_no) cancel_exchange_gain_loss_journal(doc, self.voucher_type, self.voucher_no) + + # update outstanding amounts update_voucher_outstanding( - alloc.reference_doctype, alloc.reference_name, alloc.account, alloc.party_type, alloc.party + alloc.reference_doctype, + alloc.reference_name, + alloc.account, + alloc.party_type, + alloc.party, ) - if doc.doctype in get_advance_payment_doctypes(): - doc.set_total_advance_paid() frappe.db.set_value("Unreconcile Payment Entries", alloc.name, "unlinked", True) @frappe.whitelist() def doc_has_references(doctype: str | None = None, docname: str | None = None): + count = 0 if doctype in ["Sales Invoice", "Purchase Invoice"]: - return frappe.db.count( + count = frappe.db.count( "Payment Ledger Entry", filters={"delinked": 0, "against_voucher_no": docname, "amount": ["<", 0]}, ) else: - return frappe.db.count( + count = frappe.db.count( "Payment Ledger Entry", filters={"delinked": 0, "voucher_no": docname, "against_voucher_no": ["!=", docname]}, ) + count += frappe.db.count( + "Advance Payment Ledger Entry", + filters={ + "delinked": 0, + "voucher_no": docname, + "voucher_type": doctype, + "event": ["=", "Submit"], + }, + ) + + return count @frappe.whitelist() @@ -124,9 +120,12 @@ def get_linked_payments_for_doc( res = ( qb.from_(ple) .select( + ple.account, + ple.party_type, + ple.party, ple.company, - ple.voucher_type, - ple.voucher_no, + ple.voucher_type.as_("reference_doctype"), + ple.voucher_no.as_("reference_name"), Abs(Sum(ple.amount_in_account_currency)).as_("allocated_amount"), ple.account_currency, ) @@ -148,19 +147,52 @@ def get_linked_payments_for_doc( qb.from_(ple) .select( ple.company, - ple.against_voucher_type.as_("voucher_type"), - ple.against_voucher_no.as_("voucher_no"), + ple.account, + ple.party_type, + ple.party, + ple.against_voucher_type.as_("reference_doctype"), + ple.against_voucher_no.as_("reference_name"), Abs(Sum(ple.amount_in_account_currency)).as_("allocated_amount"), ple.account_currency, ) .where(Criterion.all(criteria)) .groupby(ple.against_voucher_no) ) + res = query.run(as_dict=True) + + res += get_linked_advances(company, _dn) + return res + return [] +def get_linked_advances(company, docname): + adv = qb.DocType("Advance Payment Ledger Entry") + criteria = [ + (adv.company == company), + (adv.delinked == 0), + (adv.voucher_no == docname), + (adv.event == "Submit"), + ] + + return ( + qb.from_(adv) + .select( + adv.company, + adv.against_voucher_type.as_("reference_doctype"), + adv.against_voucher_no.as_("reference_name"), + Abs(Sum(adv.amount)).as_("allocated_amount"), + adv.currency, + ) + .where(Criterion.all(criteria)) + .having(qb.Field("allocated_amount") > 0) + .groupby(adv.against_voucher_no) + .run(as_dict=True) + ) + + @frappe.whitelist() def create_unreconcile_doc_for_selection(selections=None): if selections: diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py index 8c7ec2795e0..57c8b964c23 100644 --- a/erpnext/accounts/general_ledger.py +++ b/erpnext/accounts/general_ledger.py @@ -316,6 +316,8 @@ def get_merge_properties(dimensions=None): "project", "finance_book", "voucher_no", + "advance_voucher_type", + "advance_voucher_no", ] if dimensions: merge_properties.extend(dimensions) diff --git a/erpnext/accounts/report/cash_flow/cash_flow.js b/erpnext/accounts/report/cash_flow/cash_flow.js index bc76ee0a114..6c44c07a508 100644 --- a/erpnext/accounts/report/cash_flow/cash_flow.js +++ b/erpnext/accounts/report/cash_flow/cash_flow.js @@ -14,9 +14,16 @@ erpnext.utils.add_dimensions("Cash Flow", 10); frappe.query_reports["Cash Flow"]["filters"].splice(8, 1); -frappe.query_reports["Cash Flow"]["filters"].push({ - fieldname: "include_default_book_entries", - label: __("Include Default FB Entries"), - fieldtype: "Check", - default: 1, -}); +frappe.query_reports["Cash Flow"]["filters"].push( + { + fieldname: "include_default_book_entries", + label: __("Include Default FB Entries"), + fieldtype: "Check", + default: 1, + }, + { + fieldname: "show_opening_and_closing_balance", + label: __("Show Opening and Closing Balance"), + fieldtype: "Check", + } +); diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py index 4cdeceac93b..1d53ac6b680 100644 --- a/erpnext/accounts/report/cash_flow/cash_flow.py +++ b/erpnext/accounts/report/cash_flow/cash_flow.py @@ -2,9 +2,13 @@ # For license information, please see license.txt +from datetime import timedelta + import frappe from frappe import _ -from frappe.utils import cstr +from frappe.query_builder import DocType +from frappe.utils import cstr, flt +from pypika import Order from erpnext.accounts.report.financial_statements import ( get_columns, @@ -12,6 +16,7 @@ from erpnext.accounts.report.financial_statements import ( get_data, get_filtered_list_for_consolidated_report, get_period_list, + set_gl_entries_by_account, ) from erpnext.accounts.report.profit_and_loss_statement.profit_and_loss_statement import ( get_net_profit_loss, @@ -119,10 +124,20 @@ def execute(filters=None): filters, ) - add_total_row_account( + net_change_in_cash = add_total_row_account( data, data, _("Net Change in Cash"), period_list, company_currency, summary_data, filters ) - columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company, True) + + if filters.show_opening_and_closing_balance: + show_opening_and_closing_balance(data, period_list, company_currency, net_change_in_cash, filters) + + columns = get_columns( + filters.periodicity, + period_list, + filters.accumulated_values, + filters.company, + True, + ) chart = get_chart_data(columns, data, company_currency) @@ -255,6 +270,137 @@ def add_total_row_account(out, data, label, period_list, currency, summary_data, out.append(total_row) out.append({}) + return total_row + + +def show_opening_and_closing_balance(out, period_list, currency, net_change_in_cash, filters): + opening_balance = { + "section_name": "Opening", + "section": "Opening", + "currency": currency, + } + closing_balance = { + "section_name": "Closing (Opening + Total)", + "section": "Closing (Opening + Total)", + "currency": currency, + } + + opening_amount = get_opening_balance(filters.company, period_list, filters) or 0.0 + running_total = opening_amount + + for i, period in enumerate(period_list): + key = period["key"] + change = net_change_in_cash.get(key, 0.0) + + opening_balance[key] = opening_amount if i == 0 else running_total + running_total += change + closing_balance[key] = running_total + + opening_balance["total"] = opening_balance[period_list[0]["key"]] + closing_balance["total"] = closing_balance[period_list[-1]["key"]] + + out.extend([opening_balance, net_change_in_cash, closing_balance, {}]) + + +def get_opening_balance(company, period_list, filters): + from copy import deepcopy + + cash_value = {} + account_types = get_cash_flow_accounts() + net_profit_loss = 0.0 + + local_filters = deepcopy(filters) + local_filters.start_date, local_filters.end_date = get_opening_range_using_fiscal_year( + company, period_list + ) + + for section in account_types: + section_name = section.get("section_name") + cash_value.setdefault(section_name, 0.0) + + if section_name == "Operations": + net_profit_loss += get_net_income(company, period_list, local_filters) + + for account in section.get("account_types", []): + account_type = account.get("account_type") + local_filters.account_type = account_type + + amount = get_account_type_based_gl_data(company, local_filters) or 0.0 + + if account_type == "Depreciation": + cash_value[section_name] += amount * -1 + else: + cash_value[section_name] += amount + + return sum(cash_value.values()) + net_profit_loss + + +def get_net_income(company, period_list, filters): + gl_entries_by_account_for_income, gl_entries_by_account_for_expense = {}, {} + income, expense = 0.0, 0.0 + from_date, to_date = get_opening_range_using_fiscal_year(company, period_list) + + for root_type in ["Income", "Expense"]: + for root in frappe.db.sql( + """select lft, rgt from tabAccount + where root_type=%s and ifnull(parent_account, '') = ''""", + root_type, + as_dict=1, + ): + set_gl_entries_by_account( + company, + from_date, + to_date, + filters, + gl_entries_by_account_for_income + if root_type == "Income" + else gl_entries_by_account_for_expense, + root.lft, + root.rgt, + root_type=root_type, + ignore_closing_entries=True, + ) + + for entries in gl_entries_by_account_for_income.values(): + for entry in entries: + if entry.posting_date <= to_date: + amount = (entry.debit - entry.credit) * -1 + income = flt((income + amount), 2) + + for entries in gl_entries_by_account_for_expense.values(): + for entry in entries: + if entry.posting_date <= to_date: + amount = entry.debit - entry.credit + expense = flt((expense + amount), 2) + + return income - expense + + +def get_opening_range_using_fiscal_year(company, period_list): + first_from_date = period_list[0]["from_date"] + previous_day = first_from_date - timedelta(days=1) + + # Get the earliest fiscal year for the company + + FiscalYear = DocType("Fiscal Year") + FiscalYearCompany = DocType("Fiscal Year Company") + + earliest_fy = ( + frappe.qb.from_(FiscalYear) + .join(FiscalYearCompany) + .on(FiscalYearCompany.parent == FiscalYear.name) + .select(FiscalYear.year_start_date) + .where(FiscalYearCompany.company == company) + .orderby(FiscalYear.year_start_date, order=Order.asc) + .limit(1) + ).run(as_dict=True) + + if not earliest_fy: + frappe.throw(_("Not able to find the earliest Fiscal Year for the given company.")) + + company_start_date = earliest_fy[0]["year_start_date"] + return company_start_date, previous_day + def get_report_summary(summary_data, currency): report_summary = [] @@ -275,7 +421,7 @@ def get_chart_data(columns, data, currency): for section in data if section.get("parent_section") is None and section.get("currency") ] - datasets = datasets[:-1] + datasets = datasets[:-2] chart = {"data": {"labels": labels, "datasets": datasets}, "type": "bar"} diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py index 16cea462652..6762d6d9cf3 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py @@ -277,12 +277,25 @@ class PartyLedgerSummaryReport: if gle.posting_date < self.filters.from_date or gle.is_opening == "Yes": self.party_data[gle.party].opening_balance += amount else: - if amount > 0: - self.party_data[gle.party].invoiced_amount += amount - elif gle.voucher_no in self.return_invoices: - self.party_data[gle.party].return_amount -= amount + # Cache the party data reference to avoid repeated dictionary lookups + party_data = self.party_data[gle.party] + + # Check if this is a direct return invoice (most specific condition first) + if gle.voucher_no in self.return_invoices: + party_data.return_amount -= amount + # Check if this entry is against a return invoice + elif gle.against_voucher in self.return_invoices: + # For entries against return invoices, positive amounts are payments + if amount > 0: + party_data.paid_amount -= amount + else: + party_data.invoiced_amount += amount + # Normal transaction logic else: - self.party_data[gle.party].paid_amount -= amount + if amount > 0: + party_data.invoiced_amount += amount + else: + party_data.paid_amount -= amount out = [] for party, row in self.party_data.items(): @@ -291,7 +304,7 @@ class PartyLedgerSummaryReport: or row.invoiced_amount or row.paid_amount or row.return_amount - or row.closing_amount + or row.closing_balance # Fixed typo from closing_amount to closing_balance ): total_party_adjustment = sum( amount for amount in self.party_adjustment_details.get(party, {}).values() @@ -322,6 +335,7 @@ class PartyLedgerSummaryReport: gle.party, gle.voucher_type, gle.voucher_no, + gle.against_voucher, # For handling returned invoices (Credit/Debit Notes) gle.debit, gle.credit, gle.is_opening, diff --git a/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py index 76e06f8b8df..78174b097bd 100644 --- a/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py +++ b/erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py @@ -188,8 +188,8 @@ class TestCustomerLedgerSummary(AccountsTestMixin, IntegrationTestCase): "customer_name": "_Test Customer", "party_name": "_Test Customer", "opening_balance": 0, - "invoiced_amount": 200.0, - "paid_amount": 100.0, + "invoiced_amount": 100.0, + "paid_amount": 0.0, "return_amount": 100.0, "closing_balance": 0.0, "currency": "INR", @@ -234,3 +234,157 @@ class TestCustomerLedgerSummary(AccountsTestMixin, IntegrationTestCase): ) self.assertEqual(len(data), 1) self.assertEqual(expected, data[0]) + + def test_journal_voucher_against_return_invoice(self): + filters = {"company": self.company, "from_date": today(), "to_date": today()} + + # Create Sales Invoice of 10 qty at rate 100 (Amount: 1000.0) + si1 = self.create_sales_invoice(do_not_submit=True) + si1.save().submit() + + expected = { + "party": "_Test Customer", + "party_name": "_Test Customer", + "opening_balance": 0, + "invoiced_amount": 1000.0, + "paid_amount": 0, + "return_amount": 0, + "closing_balance": 1000.0, + "currency": "INR", + "customer_name": "_Test Customer", + } + + report = execute(filters)[1] + self.assertEqual(len(report), 1) + for field in expected: + with self.subTest(field=field): + actual_value = report[0].get(field) + expected_value = expected.get(field) + self.assertEqual( + actual_value, + expected_value, + f"Field {field} does not match expected value. " + f"Expected: {expected_value}, Got: {actual_value}", + ) + + # Create Payment Entry (Receive) for the first invoice + pe1 = self.create_payment_entry(si1.name, True) + pe1.paid_amount = 1000 # Full payment 1000.0 + pe1.save().submit() + + expected_after_payment = { + "party": "_Test Customer", + "party_name": "_Test Customer", + "opening_balance": 0, + "invoiced_amount": 1000.0, + "paid_amount": 1000.0, + "return_amount": 0, + "closing_balance": 0.0, + "currency": "INR", + "customer_name": "_Test Customer", + } + + report = execute(filters)[1] + self.assertEqual(len(report), 1) + for field in expected_after_payment: + with self.subTest(field=field): + actual_value = report[0].get(field) + expected_value = expected_after_payment.get(field) + self.assertEqual( + actual_value, + expected_value, + f"Field {field} does not match expected value. " + f"Expected: {expected_value}, Got: {actual_value}", + ) + + # Create Credit Note (return invoice) for first invoice (1000.0) + cr_note = self.create_credit_note(si1.name, do_not_submit=True) + cr_note.items[0].qty = -10 # 1 item of qty 10 at rate 100 (Amount: 1000.0) + cr_note.save().submit() + + expected_after_cr_note = { + "party": "_Test Customer", + "party_name": "_Test Customer", + "opening_balance": 0, + "invoiced_amount": 1000.0, + "paid_amount": 1000.0, + "return_amount": 1000.0, + "closing_balance": -1000.0, + "currency": "INR", + "customer_name": "_Test Customer", + } + + report = execute(filters)[1] + self.assertEqual(len(report), 1) + for field in expected_after_cr_note: + with self.subTest(field=field): + actual_value = report[0].get(field) + expected_value = expected_after_cr_note.get(field) + self.assertEqual( + actual_value, + expected_value, + f"Field {field} does not match expected value. " + f"Expected: {expected_value}, Got: {actual_value}", + ) + + # Create Payment Entry for the returned amount (1000.0) - Pay the customer back + pe2 = get_payment_entry("Sales Invoice", cr_note.name, bank_account=self.cash) + pe2.insert().submit() + + expected_after_cr_and_return_payment = { + "party": "_Test Customer", + "party_name": "_Test Customer", + "opening_balance": 0, + "invoiced_amount": 1000.0, + "paid_amount": 0, + "return_amount": 1000.0, + "closing_balance": 0, + "currency": "INR", + } + + report = execute(filters)[1] + self.assertEqual(len(report), 1) + for field in expected_after_cr_and_return_payment: + with self.subTest(field=field): + actual_value = report[0].get(field) + expected_value = expected_after_cr_and_return_payment.get(field) + self.assertEqual( + actual_value, + expected_value, + f"Field {field} does not match expected value. " + f"Expected: {expected_value}, Got: {actual_value}", + ) + + # Create second Sales Invoice of 10 qty at rate 100 (Amount: 1000.0) + si2 = self.create_sales_invoice(do_not_submit=True) + si2.save().submit() + + # Create Payment Entry (Receive) for the second invoice - payment (500.0) + pe3 = self.create_payment_entry(si2.name, True) + pe3.paid_amount = 500 # Partial payment 500.0 + pe3.save().submit() + + expected_after_cr_and_payment = { + "party": "_Test Customer", + "party_name": "_Test Customer", + "opening_balance": 0.0, + "invoiced_amount": 2000.0, + "paid_amount": 500.0, + "return_amount": 1000.0, + "closing_balance": 500.0, + "currency": "INR", + "customer_name": "_Test Customer", + } + + report = execute(filters)[1] + self.assertEqual(len(report), 1) + for field in expected_after_cr_and_payment: + with self.subTest(field=field): + actual_value = report[0].get(field) + expected_value = expected_after_cr_and_payment.get(field) + self.assertEqual( + actual_value, + expected_value, + f"Field {field} does not match expected value. " + f"Expected: {expected_value}, Got: {actual_value}", + ) diff --git a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py index 084ea9b80ea..ed30ad415d0 100644 --- a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py +++ b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py @@ -86,7 +86,7 @@ def set_gl_entries_by_account(dimension_list, filters, account, gl_entries_by_ac "finance_book": cstr(filters.get("finance_book")), } - gl_filters["dimensions"] = set(dimension_list) + gl_filters["dimensions"] = tuple(set(dimension_list)) if filters.get("include_default_book_entries"): gl_filters["company_fb"] = frappe.get_cached_value("Company", filters.company, "default_finance_book") @@ -179,7 +179,7 @@ def accumulate_values_into_parents(accounts, accounts_by_name, dimension_list): def get_condition(dimension): conditions = [] - conditions.append(f"{frappe.scrub(dimension)} in (%(dimensions)s)") + conditions.append(f"{frappe.scrub(dimension)} in %(dimensions)s") return " and {}".format(" and ".join(conditions)) if conditions else "" diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 71fa184b914..8b98ee9499b 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -210,7 +210,7 @@ def get_gl_entries(filters, accounting_dimensions): ) if filters.get("presentation_currency"): - return convert_to_presentation_currency(gl_entries, currency_map) + return convert_to_presentation_currency(gl_entries, currency_map, filters) else: return gl_entries diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py index ae822c5b413..c9d37b9ad1a 100644 --- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py +++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py @@ -178,7 +178,7 @@ def get_columns(additional_table_columns, filters): "fieldname": "invoice", "fieldtype": "Link", "options": "Purchase Invoice", - "width": 120, + "width": 150, }, {"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 120}, ] @@ -310,8 +310,8 @@ def apply_conditions(query, pi, pii, filters): def get_items(filters, additional_table_columns): doctype = "Purchase Invoice" - pi = frappe.qb.DocType(doctype) - pii = frappe.qb.DocType(f"{doctype} Item") + pi = frappe.qb.DocType("Purchase Invoice") + pii = frappe.qb.DocType("Purchase Invoice Item") Item = frappe.qb.DocType("Item") query = ( frappe.qb.from_(pi) @@ -331,6 +331,7 @@ def get_items(filters, additional_table_columns): pi.unrealized_profit_loss_account, pii.item_code, pii.description, + pii.item_name, pii.item_group, pii.item_name.as_("pi_item_name"), pii.item_group.as_("pi_item_group"), @@ -374,7 +375,7 @@ def get_items(filters, additional_table_columns): if match_conditions: query += " and " + match_conditions - query = apply_order_by_conditions(query, pi, pii, filters) + query = apply_order_by_conditions(doctype, query, filters) return frappe.db.sql(query, params, as_dict=True) diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py index 7f34948a671..b1f01832865 100644 --- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py @@ -199,7 +199,7 @@ def get_columns(additional_table_columns, filters): "fieldname": "invoice", "fieldtype": "Link", "options": "Sales Invoice", - "width": 120, + "width": 150, }, {"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 120}, ] @@ -395,15 +395,18 @@ def apply_conditions(query, si, sii, sip, filters, additional_conditions=None): return query -def apply_order_by_conditions(query, si, ii, filters): +def apply_order_by_conditions(doctype, query, filters): + invoice = f"`tab{doctype}`" + invoice_item = f"`tab{doctype} Item`" + if not filters.get("group_by"): - query += f" order by {si.posting_date} desc, {ii.item_group} desc" + query += f" order by {invoice}.posting_date desc, {invoice_item}.item_group desc" elif filters.get("group_by") == "Invoice": - query += f" order by {ii.parent} desc" + query += f" order by {invoice_item}.parent desc" elif filters.get("group_by") == "Item": - query += f" order by {ii.item_code}" + query += f" order by {invoice_item}.item_code" elif filters.get("group_by") == "Item Group": - query += f" order by {ii.item_group}" + query += f" order by {invoice_item}.item_group" elif filters.get("group_by") in ("Customer", "Customer Group", "Territory", "Supplier"): filter_field = frappe.scrub(filters.get("group_by")) query += f" order by {filter_field} desc" @@ -413,9 +416,9 @@ def apply_order_by_conditions(query, si, ii, filters): def get_items(filters, additional_query_columns, additional_conditions=None): doctype = "Sales Invoice" - si = frappe.qb.DocType(doctype) - sip = frappe.qb.DocType(f"{doctype} Payment") - sii = frappe.qb.DocType(f"{doctype} Item") + si = frappe.qb.DocType("Sales Invoice") + sii = frappe.qb.DocType("Sales Invoice Item") + sip = frappe.qb.DocType("Sales Invoice Payment") item = frappe.qb.DocType("Item") query = ( @@ -488,12 +491,12 @@ def get_items(filters, additional_query_columns, additional_conditions=None): from frappe.desk.reportview import build_match_conditions query, params = query.walk() - match_conditions = build_match_conditions("Sales Invoice") + match_conditions = build_match_conditions(doctype) if match_conditions: query += " and " + match_conditions - query = apply_order_by_conditions(query, si, sii, filters) + query = apply_order_by_conditions(doctype, query, filters) return frappe.db.sql(query, params, as_dict=True) @@ -763,25 +766,13 @@ def add_total_row( def get_display_value(filters, group_by_field, item): if filters.get("group_by") == "Item": if item.get("item_code") != item.get("item_name"): - value = ( - cstr(item.get("item_code")) - + "

" - + "" - + cstr(item.get("item_name")) - + "" - ) + value = f"{item.get('item_code')}: {item.get('item_name')}" else: value = item.get("item_code", "") elif filters.get("group_by") in ("Customer", "Supplier"): party = frappe.scrub(filters.get("group_by")) if item.get(party) != item.get(party + "_name"): - value = ( - item.get(party) - + "

" - + "" - + item.get(party + "_name") - + "" - ) + value = f"{item.get(party)}: {item.get(party + '_name')}" else: value = item.get(party) else: diff --git a/erpnext/accounts/report/non_billed_report.py b/erpnext/accounts/report/non_billed_report.py index c0ca604cc6d..6a6f58c74bb 100644 --- a/erpnext/accounts/report/non_billed_report.py +++ b/erpnext/accounts/report/non_billed_report.py @@ -46,6 +46,7 @@ def get_ordered_to_be_billed_data(args, filters=None): child_doctype.item_name, child_doctype.description, project_field, + doctype.company, ) .where( (doctype.docstatus == 1) diff --git a/erpnext/accounts/report/payment_ledger/payment_ledger.py b/erpnext/accounts/report/payment_ledger/payment_ledger.py index 9dd5ae5c400..7a2fdc4c925 100644 --- a/erpnext/accounts/report/payment_ledger/payment_ledger.py +++ b/erpnext/accounts/report/payment_ledger/payment_ledger.py @@ -46,6 +46,7 @@ class PaymentLedger: against_voucher_no=ple.against_voucher_no, amount=ple.amount, currency=ple.account_currency, + company=ple.company, ) if self.filters.include_account_currency: @@ -77,6 +78,7 @@ class PaymentLedger: against_voucher_no="Outstanding:", amount=total, currency=voucher_data[0].currency, + company=voucher_data[0].company, ) if self.filters.include_account_currency: @@ -85,7 +87,12 @@ class PaymentLedger: voucher_data.append(entry) # empty row - voucher_data.append(frappe._dict()) + voucher_data.append( + frappe._dict( + currency=voucher_data[0].currency, + company=voucher_data[0].company, + ) + ) self.data.extend(voucher_data) def build_conditions(self): @@ -130,7 +137,6 @@ class PaymentLedger: ) def get_columns(self): - company_currency = frappe.get_cached_value("Company", self.filters.get("company"), "default_currency") options = None self.columns.append( dict( @@ -195,7 +201,7 @@ class PaymentLedger: label=_("Amount"), fieldname="amount", fieldtype="Currency", - options=company_currency, + options="Company:company:default_currency", width="100", ) ) diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py index 2a72b10e4eb..136a0acbbb0 100644 --- a/erpnext/accounts/report/utils.py +++ b/erpnext/accounts/report/utils.py @@ -86,7 +86,7 @@ def get_rate_as_at(date, from_currency, to_currency): return rate -def convert_to_presentation_currency(gl_entries, currency_info): +def convert_to_presentation_currency(gl_entries, currency_info, filters=None): """ Take a list of GL Entries and change the 'debit' and 'credit' values to currencies in `currency_info`. @@ -99,6 +99,13 @@ def convert_to_presentation_currency(gl_entries, currency_info): company_currency = currency_info["company_currency"] account_currencies = list(set(entry["account_currency"] for entry in gl_entries)) + exchange_gain_or_loss = False + + if filters and isinstance(filters.get("account"), list): + account_filter = filters.get("account") + gain_loss_account = frappe.db.get_value("Company", filters.company, "exchange_gain_loss_account") + + exchange_gain_or_loss = len(account_filter) == 1 and account_filter[0] == gain_loss_account for entry in gl_entries: debit = flt(entry["debit"]) @@ -107,7 +114,11 @@ def convert_to_presentation_currency(gl_entries, currency_info): credit_in_account_currency = flt(entry["credit_in_account_currency"]) account_currency = entry["account_currency"] - if len(account_currencies) == 1 and account_currency == presentation_currency: + if ( + len(account_currencies) == 1 + and account_currency == presentation_currency + and not exchange_gain_or_loss + ): entry["debit"] = debit_in_account_currency entry["credit"] = credit_in_account_currency else: diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 9e1579bb0a7..9c97f6e7187 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -2,6 +2,7 @@ # License: GNU General Public License v3. See license.txt +from collections import defaultdict from json import loads from typing import TYPE_CHECKING, Optional @@ -27,6 +28,7 @@ from frappe.utils import ( nowdate, ) from pypika import Order +from pypika.functions import Coalesce from pypika.terms import ExistsCriterion import erpnext @@ -50,6 +52,7 @@ class PaymentEntryUnlinkError(frappe.ValidationError): GL_REPOSTING_CHUNK = 100 +OUTSTANDING_DOCTYPES = frozenset(["Sales Invoice", "Purchase Invoice", "Fees"]) @frappe.whitelist() @@ -480,63 +483,45 @@ def reconcile_against_document( reconciled_entries[(row.voucher_type, row.voucher_no)].append(row) for key, entries in reconciled_entries.items(): - voucher_type = key[0] - voucher_no = key[1] + voucher_type, voucher_no = key - # cancel advance entry doc = frappe.get_doc(voucher_type, voucher_no) frappe.flags.ignore_party_validation = True - # When Advance is allocated from an Order to an Invoice - # whole ledger must be reposted - repost_whole_ledger = any([x.voucher_detail_no for x in entries]) - if voucher_type == "Payment Entry" and doc.book_advance_payments_in_separate_party_account: - if repost_whole_ledger: - doc.make_gl_entries(cancel=1) - else: - doc.make_advance_gl_entries(cancel=1) - else: - _delete_pl_entries(voucher_type, voucher_no) - + reposting_rows = [] for entry in entries: check_if_advance_entry_modified(entry) validate_allocated_amount(entry) dimensions_dict = _build_dimensions_dict_for_exc_gain_loss(entry, active_dimensions) - # update ref in advance entry if voucher_type == "Journal Entry": - referenced_row, update_advance_paid = update_reference_in_journal_entry( - entry, doc, do_not_save=False - ) + referenced_row = update_reference_in_journal_entry(entry, doc, do_not_save=False) # advance section in sales/purchase invoice and reconciliation tool,both pass on exchange gain/loss # amount and account in args # referenced_row is used to deduplicate gain/loss journal - entry.update({"referenced_row": referenced_row}) + entry.update({"referenced_row": referenced_row.name}) doc.make_exchange_gain_loss_journal([entry], dimensions_dict) else: - referenced_row, update_advance_paid = update_reference_in_payment_entry( + referenced_row = update_reference_in_payment_entry( entry, doc, do_not_save=True, skip_ref_details_update_for_pe=skip_ref_details_update_for_pe, dimensions_dict=dimensions_dict, ) + if referenced_row.get("outstanding_amount"): + referenced_row.outstanding_amount -= flt(entry.allocated_amount) + + reposting_rows.append(referenced_row) doc.save(ignore_permissions=True) - # re-submit advance entry - doc = frappe.get_doc(entry.voucher_type, entry.voucher_no) if voucher_type == "Payment Entry" and doc.book_advance_payments_in_separate_party_account: - # When Advance is allocated from an Order to an Invoice - # whole ledger must be reposted - if repost_whole_ledger: - doc.make_gl_entries() - else: - # both ledgers must be posted to for `Advance` in separate account feature - # TODO: find a more efficient way post only for the new linked vouchers - doc.make_advance_gl_entries() + for row in reposting_rows: + doc.make_advance_gl_entries(entry=row) else: + _delete_pl_entries(voucher_type, voucher_no) gl_map = doc.build_gl_map() # Make sure there is no overallocation from erpnext.accounts.general_ledger import process_debit_credit_difference @@ -553,11 +538,6 @@ def reconcile_against_document( entry.party_type, entry.party, ) - # update advance paid in Advance Receivable/Payable doctypes - if update_advance_paid: - for t, n in update_advance_paid: - frappe.get_lazy_doc(t, n).set_total_advance_paid() - frappe.flags.ignore_party_validation = False @@ -643,12 +623,6 @@ def update_reference_in_journal_entry(d, journal_entry, do_not_save=False): """ jv_detail = journal_entry.get("accounts", {"name": d["voucher_detail_no"]})[0] - # Update Advance Paid in SO/PO since they might be getting unlinked - update_advance_paid = [] - - if jv_detail.get("reference_type") in get_advance_payment_doctypes(): - update_advance_paid.append((jv_detail.reference_type, jv_detail.reference_name)) - rev_dr_or_cr = ( "debit_in_account_currency" if d["dr_or_cr"] == "credit_in_account_currency" @@ -701,6 +675,10 @@ def update_reference_in_journal_entry(d, journal_entry, do_not_save=False): new_row.is_advance = cstr(jv_detail.is_advance) new_row.docstatus = 1 + if jv_detail.get("reference_type") in get_advance_payment_doctypes(): + new_row.advance_voucher_type = jv_detail.get("reference_type") + new_row.advance_voucher_no = jv_detail.get("reference_name") + # will work as update after submit journal_entry.flags.ignore_validate_update_after_submit = True # Ledgers will be reposted by Reconciliation tool @@ -708,7 +686,7 @@ def update_reference_in_journal_entry(d, journal_entry, do_not_save=False): if not do_not_save: journal_entry.save(ignore_permissions=True) - return new_row.name, update_advance_paid + return new_row def update_reference_in_payment_entry( @@ -727,20 +705,19 @@ def update_reference_in_payment_entry( "account": d.account, "dimensions": d.dimensions, } - update_advance_paid = [] + + advance_payment_doctypes = get_advance_payment_doctypes() # Update Reconciliation effect date in reference if payment_entry.book_advance_payments_in_separate_party_account: - reconcile_on = get_reconciliation_effect_date(d, payment_entry.company, payment_entry.posting_date) + reconcile_on = get_reconciliation_effect_date( + d.against_voucher_type, d.against_voucher, payment_entry.company, payment_entry.posting_date + ) reference_details.update({"reconcile_effect_on": reconcile_on}) if d.voucher_detail_no: existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0] - # Update Advance Paid in SO/PO since they are getting unlinked - if existing_row.get("reference_doctype") in get_advance_payment_doctypes(): - update_advance_paid.append((existing_row.reference_doctype, existing_row.reference_name)) - if d.allocated_amount <= existing_row.allocated_amount: existing_row.allocated_amount -= d.allocated_amount @@ -748,7 +725,13 @@ def update_reference_in_payment_entry( new_row.docstatus = 1 for field in list(reference_details): new_row.set(field, reference_details[field]) + + if existing_row.reference_doctype in advance_payment_doctypes: + new_row.advance_voucher_type = existing_row.reference_doctype + new_row.advance_voucher_no = existing_row.reference_name + row = new_row + else: new_row = payment_entry.append("references") new_row.docstatus = 1 @@ -783,23 +766,25 @@ def update_reference_in_payment_entry( payment_entry.flags.ignore_reposting_on_reconciliation = True if not do_not_save: payment_entry.save(ignore_permissions=True) - return row, update_advance_paid + + return row -def get_reconciliation_effect_date(reference, company, posting_date): +def get_reconciliation_effect_date(against_voucher_type, against_voucher, company, posting_date): reconciliation_takes_effect_on = frappe.get_cached_value( "Company", company, "reconciliation_takes_effect_on" ) + # default + reconcile_on = posting_date + if reconciliation_takes_effect_on == "Advance Payment Date": reconcile_on = posting_date elif reconciliation_takes_effect_on == "Oldest Of Invoice Or Advance": date_field = "posting_date" - if reference.against_voucher_type in ["Sales Order", "Purchase Order"]: + if against_voucher_type in ["Sales Order", "Purchase Order"]: date_field = "transaction_date" - reconcile_on = frappe.db.get_value( - reference.against_voucher_type, reference.against_voucher, date_field - ) + reconcile_on = frappe.db.get_value(against_voucher_type, against_voucher, date_field) if getdate(reconcile_on) < getdate(posting_date): reconcile_on = posting_date elif reconciliation_takes_effect_on == "Reconciliation Date": @@ -960,6 +945,24 @@ def update_accounting_ledgers_after_reference_removal( ple_update_query = ple_update_query.where(ple.voucher_no == payment_name) ple_update_query.run() + # Advance Payment + adv = qb.DocType("Advance Payment Ledger Entry") + adv_ple = ( + qb.update(adv) + .set(adv.delinked, 1) + .set(adv.modified, now()) + .set(adv.modified_by, frappe.session.user) + .where(adv.delinked == 0) + .where( + ((adv.against_voucher_type == ref_type) & (adv.against_voucher_no == ref_no)) + | ((adv.voucher_type == ref_type) & (adv.voucher_no == ref_no)) + ) + ) + if payment_name: + adv_ple = adv_ple.where(adv.voucher_no == payment_name) + + adv_ple.run() + def remove_ref_from_advance_section(ref_doc: object = None): # TODO: this might need some testing @@ -996,6 +999,8 @@ def remove_ref_doc_link_from_jv( qb.update(jea) .set(jea.reference_type, None) .set(jea.reference_name, None) + .set(jea.advance_voucher_type, None) + .set(jea.advance_voucher_no, None) .set(jea.modified, now()) .set(jea.modified_by, frappe.session.user) .where((jea.reference_type == ref_type) & (jea.reference_name == ref_no)) @@ -1357,6 +1362,7 @@ def create_payment_gateway_account(gateway, payment_channel="Email", company=Non "payment_account": bank_account.name, "currency": bank_account.account_currency, "payment_channel": payment_channel, + "company": company, } ).insert(ignore_permissions=True, ignore_if_duplicate=True) @@ -1519,6 +1525,11 @@ def _delete_pl_entries(voucher_type, voucher_no): qb.from_(ple).delete().where((ple.voucher_type == voucher_type) & (ple.voucher_no == voucher_no)).run() +def _delete_adv_pl_entries(voucher_type, voucher_no): + adv = qb.DocType("Advance Payment Ledger Entry") + qb.from_(adv).delete().where((adv.voucher_type == voucher_type) & (adv.voucher_no == voucher_no)).run() + + def _delete_gl_entries(voucher_type, voucher_no): gle = qb.DocType("GL Entry") qb.from_(gle).delete().where((gle.voucher_type == voucher_type) & (gle.voucher_no == voucher_no)).run() @@ -1838,6 +1849,11 @@ def get_payment_ledger_entries(gl_entries, cancel=0): dr_or_cr *= -1 dr_or_cr_account_currency *= -1 + against_voucher_type = ( + gle.against_voucher_type if gle.against_voucher_type else gle.voucher_type + ) + against_voucher_no = gle.against_voucher if gle.against_voucher else gle.voucher_no + ple = frappe._dict( doctype="Payment Ledger Entry", posting_date=gle.posting_date, @@ -1852,14 +1868,12 @@ def get_payment_ledger_entries(gl_entries, cancel=0): voucher_type=gle.voucher_type, voucher_no=gle.voucher_no, voucher_detail_no=gle.voucher_detail_no, - against_voucher_type=gle.against_voucher_type - if gle.against_voucher_type - else gle.voucher_type, - against_voucher_no=gle.against_voucher if gle.against_voucher else gle.voucher_no, + against_voucher_type=against_voucher_type, + against_voucher_no=against_voucher_no, account_currency=gle.account_currency, amount=dr_or_cr, amount_in_account_currency=dr_or_cr_account_currency, - delinked=True if cancel else False, + delinked=cancel, remarks=gle.remarks, ) @@ -1868,10 +1882,40 @@ def get_payment_ledger_entries(gl_entries, cancel=0): for dimension in dimensions_and_defaults[0]: ple[dimension.fieldname] = gle.get(dimension.fieldname) + if gle.advance_voucher_no: + # create advance entry + adv = get_advance_ledger_entry( + gle, against_voucher_type, against_voucher_no, dr_or_cr_account_currency, cancel + ) + + ple_map.append(adv) + ple_map.append(ple) + return ple_map +def get_advance_ledger_entry(gle, against_voucher_type, against_voucher_no, amount, cancel): + event = ( + "Submit" + if (against_voucher_type == gle.voucher_type and against_voucher_no == gle.voucher_no) + else "Adjustment" + ) + return frappe._dict( + doctype="Advance Payment Ledger Entry", + company=gle.company, + voucher_type=gle.voucher_type, + voucher_no=gle.voucher_no, + voucher_detail_no=gle.voucher_detail_no, + against_voucher_type=gle.advance_voucher_type, + against_voucher_no=gle.advance_voucher_no, + amount=amount, + currency=gle.account_currency, + event=event, + delinked=cancel, + ) + + def create_payment_ledger_entry( gl_entries, cancel=0, adv_adj=0, update_outstanding="Yes", from_repost=0, partial_cancel=False ): @@ -1892,49 +1936,74 @@ def create_payment_ledger_entry( def update_voucher_outstanding(voucher_type, voucher_no, account, party_type, party): + if not voucher_type or not voucher_no: + return + + if voucher_type in ["Purchase Order", "Sales Order"]: + ref_doc = frappe.get_lazy_doc(voucher_type, voucher_no) + ref_doc.set_total_advance_paid() + return + + if not (voucher_type in OUTSTANDING_DOCTYPES and party_type and party): + return + ple = frappe.qb.DocType("Payment Ledger Entry") vouchers = [frappe._dict({"voucher_type": voucher_type, "voucher_no": voucher_no})] common_filter = [] + common_filter.append(ple.party_type == party_type) + common_filter.append(ple.party == party) + if account: common_filter.append(ple.account == account) - if party_type: - common_filter.append(ple.party_type == party_type) - - if party: - common_filter.append(ple.party == party) - ple_query = QueryPaymentLedger() # on cancellation outstanding can be an empty list voucher_outstanding = ple_query.get_voucher_outstandings(vouchers, common_filter=common_filter) - if ( - voucher_type in ["Sales Invoice", "Purchase Invoice", "Fees"] - and party_type - and party - and voucher_outstanding - ): - outstanding = voucher_outstanding[0] - ref_doc = frappe.get_lazy_doc(voucher_type, voucher_no) - outstanding_amount = flt( - outstanding["outstanding_in_account_currency"], ref_doc.precision("outstanding_amount") - ) + if not voucher_outstanding: + return - # Didn't use db_set for optimisation purpose - ref_doc.outstanding_amount = outstanding_amount - frappe.db.set_value( - voucher_type, - voucher_no, - "outstanding_amount", - outstanding_amount, - ) + outstanding = voucher_outstanding[0] + ref_doc = frappe.get_lazy_doc(voucher_type, voucher_no) + outstanding_amount = flt( + outstanding["outstanding_in_account_currency"], ref_doc.precision("outstanding_amount") + ) - ref_doc.set_status(update=True) - ref_doc.notify_update() + # Didn't use db_set for optimisation purpose + ref_doc.outstanding_amount = outstanding_amount + frappe.db.set_value( + voucher_type, + voucher_no, + "outstanding_amount", + outstanding_amount, + ) + + ref_doc.set_status(update=True) + ref_doc.notify_update() def delink_original_entry(pl_entry, partial_cancel=False): - if pl_entry: + if not pl_entry: + return + + if pl_entry.doctype == "Advance Payment Ledger Entry": + adv = qb.DocType("Advance Payment Ledger Entry") + + ( + qb.update(adv) + .set(adv.delinked, 1) + .set(adv.event, "Cancel") + .set(adv.modified, now()) + .set(adv.modified_by, frappe.session.user) + .where(adv.voucher_type == pl_entry.voucher_type) + .where(adv.voucher_no == pl_entry.voucher_no) + .where(adv.against_voucher_type == pl_entry.against_voucher_type) + .where(adv.against_voucher_no == pl_entry.against_voucher_no) + .where(adv.event == pl_entry.event) + .run() + ) + + else: ple = qb.DocType("Payment Ledger Entry") query = ( qb.update(ple) @@ -2383,17 +2452,37 @@ def sync_auto_reconcile_config(auto_reconciliation_job_trigger: int = 15): ).save() +def get_link_fields_grouped_by_option(doctype): + meta = frappe.get_meta(doctype) + link_fields_map = defaultdict(list) + + for df in meta.fields: + if df.fieldtype == "Link" and df.options and not df.ignore_user_permissions: + link_fields_map[df.options].append(df.fieldname) + + return link_fields_map + + def build_qb_match_conditions(doctype, user=None) -> list: match_filters = build_match_conditions(doctype, user, False) + link_fields_map = get_link_fields_grouped_by_option(doctype) criterion = [] - if match_filters: - from frappe import qb + apply_strict_user_permissions = frappe.get_system_settings("apply_strict_user_permissions") + if match_filters: _dt = qb.DocType(doctype) for filter in match_filters: - for d, names in filter.items(): - fieldname = d.lower().replace(" ", "_") - criterion.append(_dt[fieldname].isin(names)) + for link_option, allowed_values in filter.items(): + fieldnames = link_fields_map.get(link_option, []) + + for fieldname in fieldnames: + field = _dt[fieldname] + cond = field.isin(allowed_values) + + if not apply_strict_user_permissions: + cond = (Coalesce(field, "") == "") | cond + + criterion.append(cond) return criterion diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index b7d6c8d5ae0..c86600bee9b 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -12,7 +12,6 @@ erpnext.buying.setup_buying_controller(); frappe.ui.form.on("Purchase Order", { setup: function (frm) { - frm.ignore_doctypes_on_cancel_all = ["Unreconcile Payment", "Unreconcile Payment Entries"]; if (frm.doc.is_old_subcontracting_flow) { frm.set_query("reserve_warehouse", "supplied_items", function () { return { @@ -154,6 +153,10 @@ frappe.ui.form.on("Purchase Order", { }, onload: function (frm) { + var ignore_list = ["Unreconcile Payment", "Unreconcile Payment Entries"]; + frm.ignore_doctypes_on_cancel_all = Object.hasOwn(frm, "ignore_doctypes_on_cancel_all") + ? frm.ignore_doctypes_on_cancel_all.concat(ignore_list) + : ignore_list; set_schedule_date(frm); if (!frm.doc.transaction_date) { frm.set_value("transaction_date", frappe.datetime.get_today()); diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 37b2830c084..cb5990c79e6 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -512,6 +512,7 @@ class PurchaseOrder(BuyingController): self.ignore_linked_doctypes = ( "GL Entry", "Payment Ledger Entry", + "Advance Payment Ledger Entry", "Unreconcile Payment", "Unreconcile Payment Entries", ) @@ -743,6 +744,7 @@ def close_or_unclose_purchase_orders(names, status): def set_missing_values(source, target): target.run_method("set_missing_values") target.run_method("calculate_taxes_and_totals") + target.run_method("set_use_serial_batch_fields") @frappe.whitelist() diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 5971af1bb89..5c9663d2b52 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -394,7 +394,6 @@ class AccountsController(TransactionBase): def on_trash(self): from erpnext.accounts.utils import delete_exchange_gain_loss_journal - self._remove_advance_payment_ledger_entries() self._remove_references_in_repost_doctypes() self._remove_references_in_unreconcile() self.remove_serial_and_batch_bundle() @@ -423,6 +422,8 @@ class AccountsController(TransactionBase): (sle.voucher_type == self.doctype) & (sle.voucher_no == self.name) ).run() + self._remove_advance_payment_ledger_entries() + def remove_serial_and_batch_bundle(self): bundles = frappe.get_all( "Serial and Batch Bundle", @@ -2212,55 +2213,30 @@ class AccountsController(TransactionBase): def calculate_total_advance_from_ledger(self): adv = frappe.qb.DocType("Advance Payment Ledger Entry") - advance = ( - frappe.qb.from_(adv) - .select(adv.currency.as_("account_currency"), Abs(Sum(adv.amount)).as_("amount")) - .where( - (adv.against_voucher_type == self.doctype) - & (adv.against_voucher_no == self.name) - & (adv.company == self.company) - ) + return ( + qb.from_(adv) + .select(Abs(Sum(adv.amount)).as_("amount"), adv.currency.as_("account_currency")) + .where(adv.company == self.company) + .where(adv.delinked == 0) + .where(adv.against_voucher_type == self.doctype) + .where(adv.against_voucher_no == self.name) .run(as_dict=True) ) - return advance def set_total_advance_paid(self): advance = self.calculate_total_advance_from_ledger() - advance_paid, order_total = None, None + advance_paid = 0 if advance: advance = advance[0] advance_paid = flt(advance.amount, self.precision("advance_paid")) - formatted_advance_paid = fmt_money( - advance_paid, precision=self.precision("advance_paid"), currency=advance.account_currency - ) - if advance.account_currency: frappe.db.set_value( self.doctype, self.name, "party_account_currency", advance.account_currency ) - if advance.account_currency == self.currency: - order_total = self.get("rounded_total") or self.grand_total - precision = "rounded_total" if self.get("rounded_total") else "grand_total" - else: - order_total = self.get("base_rounded_total") or self.base_grand_total - precision = "base_rounded_total" if self.get("base_rounded_total") else "base_grand_total" - - formatted_order_total = fmt_money( - order_total, precision=self.precision(precision), currency=advance.account_currency - ) - - if self.currency == self.company_currency and advance_paid > order_total: - frappe.throw( - _( - "Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})" - ).format(formatted_advance_paid, self.name, formatted_order_total) - ) - - self.db_set("advance_paid", advance_paid) - + self.db_set("advance_paid", advance_paid) self.set_advance_payment_status() def set_advance_payment_status(self): @@ -2656,7 +2632,10 @@ class AccountsController(TransactionBase): if li: duplicates = "
" + "
".join(li) - frappe.throw(_("Rows with duplicate due dates in other rows were found: {0}").format(duplicates)) + frappe.throw( + _("Rows with duplicate due dates in other rows were found: {0}").format(duplicates), + title=_("Payment Schedule"), + ) def validate_payment_schedule_amount(self): if (self.doctype == "Sales Invoice" and self.is_pos) or self.get("is_opening") == "Yes": @@ -2937,64 +2916,6 @@ class AccountsController(TransactionBase): def get_advance_payment_doctypes(self, payment_type=None) -> list: return _get_advance_payment_doctypes(payment_type=payment_type) - def make_advance_payment_ledger_for_journal(self): - advance_payment_doctypes = self.get_advance_payment_doctypes() - advance_doctype_references = [ - x for x in self.accounts if x.reference_type in advance_payment_doctypes - ] - - for x in advance_doctype_references: - # Looking for payments - dr_or_cr = ( - "credit_in_account_currency" - if x.account_type == "Receivable" - else "debit_in_account_currency" - ) - - amount = x.get(dr_or_cr) - if amount > 0: - doc = frappe.new_doc("Advance Payment Ledger Entry") - doc.company = self.company - doc.voucher_type = self.doctype - doc.voucher_no = self.name - doc.against_voucher_type = x.reference_type - doc.against_voucher_no = x.reference_name - doc.amount = amount if self.docstatus == 1 else -1 * amount - doc.event = "Submit" if self.docstatus == 1 else "Cancel" - doc.currency = x.account_currency - doc.flags.ignore_permissions = 1 - doc.save() - - def make_advance_payment_ledger_for_payment(self): - advance_payment_doctypes = self.get_advance_payment_doctypes() - advance_doctype_references = [ - x for x in self.references if x.reference_doctype in advance_payment_doctypes - ] - currency = ( - self.paid_from_account_currency - if self.payment_type == "Receive" - else self.paid_to_account_currency - ) - for x in advance_doctype_references: - doc = frappe.new_doc("Advance Payment Ledger Entry") - doc.company = self.company - doc.voucher_type = self.doctype - doc.voucher_no = self.name - doc.against_voucher_type = x.reference_doctype - doc.against_voucher_no = x.reference_name - doc.amount = x.allocated_amount if self.docstatus == 1 else -1 * x.allocated_amount - doc.currency = currency - doc.event = "Submit" if self.docstatus == 1 else "Cancel" - doc.flags.ignore_permissions = 1 - doc.save() - - def make_advance_payment_ledger_entries(self): - if self.docstatus != 0: - if self.doctype == "Journal Entry": - self.make_advance_payment_ledger_for_journal() - elif self.doctype == "Payment Entry": - self.make_advance_payment_ledger_for_payment() - def set_transaction_currency_and_rate_in_gl_map(self, gl_entries): for x in gl_entries: x["transaction_currency"] = self.currency diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index 265e44719db..1eda382eab2 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -348,7 +348,7 @@ class BuyingController(SubcontractingController): tax_accounts, total_valuation_amount, total_actual_tax_amount = self.get_tax_details() for i, item in enumerate(self.get("items")): - if item.item_code and item.qty: + if item.item_code and (item.qty or item.get("rejected_qty")): item_tax_amount, actual_tax_amount = 0.0, 0.0 if i == (last_item_idx - 1): item_tax_amount = total_valuation_amount @@ -387,7 +387,19 @@ class BuyingController(SubcontractingController): if item.sales_incoming_rate: # for internal transfer net_rate = item.qty * item.sales_incoming_rate + if ( + not net_rate + and item.get("rejected_qty") + and frappe.get_single_value( + "Buying Settings", "set_valuation_rate_for_rejected_materials" + ) + ): + net_rate = item.rejected_qty * item.net_rate + qty_in_stock_uom = flt(item.qty * item.conversion_factor) + if not qty_in_stock_uom and item.get("rejected_qty"): + qty_in_stock_uom = flt(item.rejected_qty * item.conversion_factor) + if self.get("is_old_subcontracting_flow"): item.rm_supp_cost = self.get_supplied_items_cost(item.name, reset_outgoing_rate) item.valuation_rate = ( diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 0cdf16b2298..fcd60a8f15a 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -104,7 +104,7 @@ status_map = { ["Return Issued", "eval:self.per_returned == 100 and self.docstatus == 1"], [ "Completed", - "eval:(self.per_billed == 100 and self.docstatus == 1) or (self.docstatus == 1 and self.grand_total == 0 and self.per_returned != 100 and self.is_return == 0)", + "eval:(self.per_billed >= 100 and self.docstatus == 1) or (self.docstatus == 1 and self.grand_total == 0 and self.per_returned != 100 and self.is_return == 0)", ], ["Cancelled", "eval:self.docstatus==2"], ["Closed", "eval:self.status=='Closed' and self.docstatus != 2"], diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 750978b0847..3aef41911f9 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -663,7 +663,9 @@ class StockController(AccountsController): ).format(wh, self.company) ) - return process_gl_map(gl_list, precision=precision) + return process_gl_map( + gl_list, precision=precision, from_repost=frappe.flags.through_repost_item_valuation + ) def get_debit_field_precision(self): if not frappe.flags.debit_field_precision: diff --git a/erpnext/crm/doctype/email_campaign/email_campaign.py b/erpnext/crm/doctype/email_campaign/email_campaign.py index 9390573773c..6bfa4f8b3cb 100644 --- a/erpnext/crm/doctype/email_campaign/email_campaign.py +++ b/erpnext/crm/doctype/email_campaign/email_campaign.py @@ -144,4 +144,3 @@ def set_email_campaign_status(): for entry in email_campaigns: email_campaign = frappe.get_doc("Email Campaign", entry.name) email_campaign.update_status() - email_campaign.save() diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js index 325ee3d8d6e..6398a9425b0 100644 --- a/erpnext/crm/doctype/lead/lead.js +++ b/erpnext/crm/doctype/lead/lead.js @@ -2,8 +2,9 @@ // License: GNU General Public License v3. See license.txt frappe.provide("erpnext"); -cur_frm.email_field = "email_id"; - +if (this.frm) { + this.frm.email_field = "email_id"; +} erpnext.LeadController = class LeadController extends frappe.ui.form.Controller { setup() { this.frm.make_methods = { @@ -238,5 +239,6 @@ erpnext.LeadController = class LeadController extends frappe.ui.form.Controller crm_activities.refresh(); } }; - -extend_cscript(cur_frm.cscript, new erpnext.LeadController({ frm: cur_frm })); +if (this.frm) { + extend_cscript(this.frm.cscript, new erpnext.LeadController({ frm: this.frm })); +} diff --git a/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py b/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py index d8562565989..370d3a85333 100644 --- a/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py +++ b/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py @@ -153,7 +153,12 @@ class OpportunitySummaryBySalesStage: }[self.filters.get("based_on")] if self.filters.get("based_on") == "Opportunity Owner": - if d.get(based_on) == "[]" or d.get(based_on) is None or d.get(based_on) == "Not Assigned": + if ( + d.get(based_on) == "[]" + or d.get(based_on) is None + or d.get(based_on) == "Not Assigned" + or d.get(based_on) == "" + ): assignments = ["Not Assigned"] else: assignments = json.loads(d.get(based_on)) diff --git a/erpnext/locale/ar.po b/erpnext/locale/ar.po index c6520ff30d5..465572fc20b 100644 --- a/erpnext/locale/ar.po +++ b/erpnext/locale/ar.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2025-07-20 09:37+0000\n" -"PO-Revision-Date: 2025-07-20 12:57\n" +"POT-Creation-Date: 2025-08-03 09:38+0000\n" +"PO-Revision-Date: 2025-08-03 15:09\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Arabic\n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgstr "" msgid " Address" msgstr "" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:672 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:675 msgid " Amount" msgstr "" @@ -56,7 +56,7 @@ msgstr "" msgid " Name" msgstr "" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:663 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:666 msgid " Rate" msgstr "" @@ -224,7 +224,7 @@ msgstr "" msgid "% of materials delivered against this Sales Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:2317 +#: erpnext/controllers/accounts_controller.py:2293 msgid "'Account' in the Accounting section of Customer {0}" msgstr "" @@ -240,11 +240,11 @@ msgstr "'على أساس' و 'المجموعة حسب' لا يمكن أن يكو msgid "'Days Since Last Order' must be greater than or equal to zero" msgstr "يجب أن تكون \"الأيام منذ آخر طلب\" أكبر من أو تساوي الصفر" -#: erpnext/controllers/accounts_controller.py:2322 +#: erpnext/controllers/accounts_controller.py:2298 msgid "'Default {0} Account' in Company {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271 msgid "'Entries' cannot be empty" msgstr "المدخلات لا يمكن أن تكون فارغة" @@ -270,8 +270,8 @@ msgstr "" msgid "'Inspection Required before Purchase' has disabled for the item {0}, no need to create the QI" msgstr "" -#: erpnext/stock/report/stock_ledger/stock_ledger.py:584 -#: erpnext/stock/report/stock_ledger/stock_ledger.py:617 +#: erpnext/stock/report/stock_ledger/stock_ledger.py:597 +#: erpnext/stock/report/stock_ledger/stock_ledger.py:630 msgid "'Opening'" msgstr "'افتتاحي'" @@ -674,7 +674,7 @@ msgstr "" msgid "
  • Clearance date must be after cheque date for row(s): {0}
    • " msgstr "" -#: erpnext/controllers/accounts_controller.py:2185 +#: erpnext/controllers/accounts_controller.py:2186 msgid "
  • Item {0} in row(s) {1} billed more than {2}
    • " msgstr "" @@ -686,7 +686,7 @@ msgstr "" msgid "
  • {}
    • " msgstr "" -#: erpnext/controllers/accounts_controller.py:2182 +#: erpnext/controllers/accounts_controller.py:2183 msgid "

    Cannot overbill for the following Items:

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

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

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

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

    " msgstr "" @@ -1118,7 +1118,7 @@ msgstr "" #. Label of the qty (Float) field in DocType 'Purchase Receipt Item' #. Label of the qty (Float) field in DocType 'Subcontracting Receipt Item' -#: erpnext/public/js/controllers/transaction.js:2417 +#: erpnext/public/js/controllers/transaction.js:2420 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json msgid "Accepted Quantity" @@ -1316,7 +1316,7 @@ msgid "Account Manager" msgstr "إدارة حساب المستخدم" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:951 -#: erpnext/controllers/accounts_controller.py:2326 +#: erpnext/controllers/accounts_controller.py:2302 msgid "Account Missing" msgstr "الحساب مفقود" @@ -1333,7 +1333,7 @@ msgstr "الحساب مفقود" msgid "Account Name" msgstr "اسم الحساب" -#: erpnext/accounts/doctype/account/account.py:336 +#: erpnext/accounts/doctype/account/account.py:338 msgid "Account Not Found" msgstr "الحساب غير موجود" @@ -1345,7 +1345,7 @@ msgstr "الحساب غير موجود" msgid "Account Number" msgstr "رقم الحساب" -#: erpnext/accounts/doctype/account/account.py:322 +#: erpnext/accounts/doctype/account/account.py:324 msgid "Account Number {0} already used in account {1}" msgstr "رقم الحساب {0} بالفعل مستخدم في الحساب {1}" @@ -1430,7 +1430,7 @@ msgstr "لم يتم تعيين الحساب لمخطط لوحة المعلوما msgid "Account not Found" msgstr "" -#: erpnext/accounts/doctype/account/account.py:390 +#: erpnext/accounts/doctype/account/account.py:392 msgid "Account with child nodes cannot be converted to ledger" msgstr "لا يمكن تحويل الحساب إلى دفتر الأستاذ لأن لديه حسابات فرعية\\n
    \\nAccount with child nodes cannot be converted to ledger" @@ -1438,16 +1438,16 @@ msgstr "لا يمكن تحويل الحساب إلى دفتر الأستاذ ل msgid "Account with child nodes cannot be set as ledger" msgstr "الحساب لديه حسابات فرعية لا يمكن إضافته لدفتر الأستاذ.\\n
    \\nAccount with child nodes cannot be set as ledger" -#: erpnext/accounts/doctype/account/account.py:401 +#: erpnext/accounts/doctype/account/account.py:403 msgid "Account with existing transaction can not be converted to group." msgstr "لا يمكن تحويل حساب جرت عليه أي عملية إلى تصنيف مجموعة" -#: erpnext/accounts/doctype/account/account.py:430 +#: erpnext/accounts/doctype/account/account.py:432 msgid "Account with existing transaction can not be deleted" msgstr "الحساب لديه معاملات موجودة لا يمكن حذفه\\n
    \\nAccount with existing transaction can not be deleted" #: erpnext/accounts/doctype/account/account.py:261 -#: erpnext/accounts/doctype/account/account.py:392 +#: erpnext/accounts/doctype/account/account.py:394 msgid "Account with existing transaction cannot be converted to ledger" msgstr "لا يمكن تحويل الحساب مع الحركة الموجودة إلى دفتر الأستاذ\\n
    \\nAccount with existing transaction cannot be converted to ledger" @@ -1463,7 +1463,7 @@ msgstr "الحساب {0} لا يتنمى للشركة {1}\\n
    \\nAccount {0} d msgid "Account {0} does not belongs to company {1}" msgstr "الحساب {0} لا ينتمي للشركة {1}\\n
    \\nAccount {0} does not belongs to company {1}" -#: erpnext/accounts/doctype/account/account.py:550 +#: erpnext/accounts/doctype/account/account.py:552 msgid "Account {0} does not exist" msgstr "حساب {0} غير موجود" @@ -1483,7 +1483,7 @@ msgstr "الحساب {0} لا يتطابق مع الشركة {1} في طريقة msgid "Account {0} doesn't belong to Company {1}" msgstr "" -#: erpnext/accounts/doctype/account/account.py:507 +#: erpnext/accounts/doctype/account/account.py:509 msgid "Account {0} exists in parent company {1}." msgstr "الحساب {0} موجود في الشركة الأم {1}." @@ -1491,19 +1491,19 @@ msgstr "الحساب {0} موجود في الشركة الأم {1}." msgid "Account {0} has been entered multiple times" msgstr "الحساب {0} تم إدخاله عدة مرات\\n
    \\nAccount {0} has been entered multiple times" -#: erpnext/accounts/doctype/account/account.py:374 +#: erpnext/accounts/doctype/account/account.py:376 msgid "Account {0} is added in the child company {1}" msgstr "تتم إضافة الحساب {0} في الشركة التابعة {1}" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:406 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:403 msgid "Account {0} is frozen" msgstr "الحساب {0} مجمد\\n
    \\nAccount {0} is frozen" -#: erpnext/controllers/accounts_controller.py:1388 +#: erpnext/controllers/accounts_controller.py:1389 msgid "Account {0} is invalid. Account Currency must be {1}" msgstr "الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:351 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:335 msgid "Account {0} should be of type Expense" msgstr "" @@ -1523,19 +1523,19 @@ msgstr "الحساب {0}: الحسابه الأب {1} غير موجود" msgid "Account {0}: You can not assign itself as parent account" msgstr "الحساب {0}: لا يمكنك جعله حساب رئيسي" -#: erpnext/accounts/general_ledger.py:435 +#: erpnext/accounts/general_ledger.py:437 msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry" msgstr "الحساب: {0} عبارة "Capital work" قيد التقدم ولا يمكن تحديثها بواسطة "إدخال دفتر اليومية"" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:366 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:350 msgid "Account: {0} can only be updated via Stock Transactions" msgstr "الحساب: {0} لا يمكن تحديثه إلا من خلال معاملات المخزون" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2792 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2786 msgid "Account: {0} is not permitted under Payment Entry" msgstr "الحساب: {0} غير مسموح به بموجب إدخال الدفع" -#: erpnext/controllers/accounts_controller.py:3155 +#: erpnext/controllers/accounts_controller.py:3076 msgid "Account: {0} with currency: {1} can not be selected" msgstr "الحساب: {0} مع العملة: {1} لا يمكن اختياره" @@ -1625,12 +1625,12 @@ msgid "Accounting Dimension" msgstr "البعد المحاسبي" #: erpnext/accounts/doctype/gl_entry/gl_entry.py:207 -#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:153 +#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:151 msgid "Accounting Dimension {0} is required for 'Balance Sheet' account {1}." msgstr "البعد المحاسبي {0} مطلوب لحساب "الميزانية العمومية" {1}." #: erpnext/accounts/doctype/gl_entry/gl_entry.py:193 -#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:140 +#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:138 msgid "Accounting Dimension {0} is required for 'Profit and Loss' account {1}." msgstr "البعد المحاسبي {0} مطلوب لحساب "الربح والخسارة" {1}." @@ -1823,33 +1823,33 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:806 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:814 msgid "Accounting Entry for Service" msgstr "القيد المحاسبي للخدمة" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:998 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1019 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1037 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1058 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1079 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1103 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1210 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1446 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1468 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:999 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1020 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1038 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1059 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1080 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1104 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1211 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1447 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1469 #: erpnext/controllers/stock_controller.py:579 #: erpnext/controllers/stock_controller.py:596 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:899 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 #: erpnext/stock/doctype/stock_entry/stock_entry.py:1627 #: erpnext/stock/doctype/stock_entry/stock_entry.py:1641 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:613 msgid "Accounting Entry for Stock" msgstr "القيود المحاسبية للمخزون" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:727 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:716 msgid "Accounting Entry for {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:2367 +#: erpnext/controllers/accounts_controller.py:2343 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}" msgstr "المدخل المحاسبي ل {0}: {1} يمكن أن يكون فقط بالعملة {1}.\\n
    \\nAccounting Entry for {0}: {1} can only be made in currency: {2}" @@ -2199,7 +2199,7 @@ msgstr "إعدادات الحسابات" msgid "Accounts User" msgstr "حسابات المستخدمين" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1372 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1370 msgid "Accounts table cannot be blank." msgstr "جدول الحسابات لا يمكن أن يكون فارغا." @@ -2279,7 +2279,7 @@ msgstr "" msgid "Acre (US)" msgstr "" -#: erpnext/crm/doctype/lead/lead.js:41 +#: erpnext/crm/doctype/lead/lead.js:42 #: erpnext/public/js/bank_reconciliation_tool/dialog_manager.js:175 msgid "Action" msgstr "حدث" @@ -2612,7 +2612,7 @@ msgstr "الكمية الفعلية هي إلزامية" msgid "Actual Qty {0} / Waiting Qty {1}" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:166 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:174 msgid "Actual Qty: Quantity available in the warehouse." msgstr "" @@ -2663,7 +2663,7 @@ msgstr "الوقت الفعلي (بالساعات)" msgid "Actual qty in stock" msgstr "الكمية الفعلية في المخزون" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1491 #: erpnext/public/js/controllers/accounts.js:176 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "نوع الضريبة الفعلي لا يمكن تضمينه في معدل الصنف في الصف {0}" @@ -2674,7 +2674,7 @@ msgstr "نوع الضريبة الفعلي لا يمكن تضمينه في مع #. Charges' #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json -#: erpnext/crm/doctype/lead/lead.js:84 +#: erpnext/crm/doctype/lead/lead.js:85 #: erpnext/manufacturing/doctype/bom/bom.js:922 #: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:55 #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:235 @@ -2739,7 +2739,7 @@ msgstr "إضافة بنود" msgid "Add Items in the Purpose Table" msgstr "" -#: erpnext/crm/doctype/lead/lead.js:83 +#: erpnext/crm/doctype/lead/lead.js:84 msgid "Add Lead to Prospect" msgstr "" @@ -2867,7 +2867,7 @@ msgstr "" msgid "Add details" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.js:78 +#: erpnext/stock/doctype/pick_list/pick_list.js:86 #: erpnext/stock/doctype/pick_list/pick_list.py:853 msgid "Add items in the Item Locations table" msgstr "أضف عناصر في جدول "مواقع العناصر"" @@ -2888,7 +2888,7 @@ msgstr "أضف بقية أفراد مؤسستك كمستخدمين. يمكنك msgid "Add to Holidays" msgstr "أضف إلى الإجازات" -#: erpnext/crm/doctype/lead/lead.js:37 +#: erpnext/crm/doctype/lead/lead.js:38 msgid "Add to Prospect" msgstr "" @@ -2930,7 +2930,7 @@ msgstr "وأضاف {0} ({1})" msgid "Added {1} Role to User {0}." msgstr "" -#: erpnext/crm/doctype/lead/lead.js:80 +#: erpnext/crm/doctype/lead/lead.js:81 msgid "Adding Lead to Prospect..." msgstr "" @@ -3474,6 +3474,24 @@ msgstr "" msgid "Advance Taxes and Charges" msgstr "" +#. Label of the advance_voucher_no (Dynamic Link) field in DocType 'Journal +#. Entry Account' +#. Label of the advance_voucher_no (Dynamic Link) field in DocType 'Payment +#. Entry Reference' +#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json +#: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json +msgid "Advance Voucher No" +msgstr "" + +#. Label of the advance_voucher_type (Link) field in DocType 'Journal Entry +#. Account' +#. Label of the advance_voucher_type (Link) field in DocType 'Payment Entry +#. Reference' +#: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json +#: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json +msgid "Advance Voucher Type" +msgstr "" + #. Label of the advance_amount (Currency) field in DocType 'Sales Invoice #. Advance' #: erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json @@ -3484,7 +3502,7 @@ msgstr "المبلغ مقدما" msgid "Advance amount cannot be greater than {0} {1}" msgstr "قيمة الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:940 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}" msgstr "" @@ -3610,12 +3628,12 @@ msgstr "مقابل حساب المصاريف" msgid "Against Income Account" msgstr "مقابل حساب الدخل" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:802 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:775 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:786 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:771 msgid "Against Journal Entry {0} does not have any unmatched {1} entry" msgstr "قيد اليومية المقابل {0} لا يحتوى مدخل {1} غير مطابق\\n
    \\nAgainst Journal Entry {0} does not have any unmatched {1} entry" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:371 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:368 msgid "Against Journal Entry {0} is already adjusted against some other voucher" msgstr "مدخل قيد اليومية {0} تم تعديله بالفعل لقسيمة أخرى\\n
    \\nAgainst Journal Entry {0} is already adjusted \\nagainst some other voucher" @@ -3652,7 +3670,7 @@ msgstr "مقابل بند طلب مبيعات" msgid "Against Stock Entry" msgstr "ضد دخول الأسهم" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:328 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:329 msgid "Against Supplier Invoice {0}" msgstr "" @@ -3809,7 +3827,7 @@ msgstr "الكل" #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:165 #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:185 #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:166 -#: erpnext/accounts/utils.py:1446 erpnext/public/js/setup_wizard.js:184 +#: erpnext/accounts/utils.py:1450 erpnext/public/js/setup_wizard.js:184 msgid "All Accounts" msgstr "جميع الحسابات" @@ -3973,11 +3991,11 @@ msgstr "يجب نقل جميع الاتصالات بما في ذلك وما فو msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1327 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1335 msgid "All items have already been Invoiced/Returned" msgstr "تم بالفعل تحرير / إرجاع جميع العناصر" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:1166 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:1184 msgid "All items have already been received" msgstr "" @@ -3985,7 +4003,7 @@ msgstr "" msgid "All items have already been transferred for this Work Order." msgstr "جميع الإصناف تم نقلها لأمر العمل" -#: erpnext/public/js/controllers/transaction.js:2521 +#: erpnext/public/js/controllers/transaction.js:2524 msgid "All items in this document already have a linked Quality Inspection." msgstr "" @@ -3999,11 +4017,11 @@ msgstr "" msgid "All the items have been already returned." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1080 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1085 msgid "All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:840 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:841 msgid "All these items have already been Invoiced/Returned" msgstr "تم بالفعل إصدار فاتورة / إرجاع جميع هذه العناصر" @@ -4022,7 +4040,7 @@ msgstr "تخصيص" msgid "Allocate Advances Automatically (FIFO)" msgstr "تخصيص السلف تلقائيا (الداخل أولا الخارج أولا)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:904 msgid "Allocate Payment Amount" msgstr "تخصيص مبلغ الدفع" @@ -4032,7 +4050,7 @@ msgstr "تخصيص مبلغ الدفع" msgid "Allocate Payment Based On Payment Terms" msgstr "تخصيص الدفع على أساس شروط الدفع" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1680 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1681 msgid "Allocate Payment Request" msgstr "" @@ -4063,7 +4081,7 @@ msgstr "تخصيص" #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1671 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1672 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4089,11 +4107,11 @@ msgstr "" msgid "Allocated amount" msgstr "المبلغ المخصص" -#: erpnext/accounts/utils.py:637 +#: erpnext/accounts/utils.py:616 msgid "Allocated amount cannot be greater than unadjusted amount" msgstr "لا يمكن أن يكون المبلغ المخصص أكبر من المبلغ غير المعدل" -#: erpnext/accounts/utils.py:635 +#: erpnext/accounts/utils.py:614 msgid "Allocated amount cannot be negative" msgstr "لا يمكن أن يكون المبلغ المخصص سالبًا" @@ -4126,7 +4144,7 @@ msgstr "السماح" #. Label of the allow_account_creation_against_child_company (Check) field in #. DocType 'Company' -#: erpnext/accounts/doctype/account/account.py:505 +#: erpnext/accounts/doctype/account/account.py:507 #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68 #: erpnext/setup/doctype/company/company.json msgid "Allow Account Creation Against Child Company" @@ -4553,7 +4571,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom/bom.js:200 #: erpnext/manufacturing/doctype/work_order/work_order.js:151 #: erpnext/manufacturing/doctype/work_order/work_order.js:166 -#: erpnext/public/js/utils.js:508 +#: erpnext/public/js/utils.js:518 #: erpnext/stock/doctype/stock_entry/stock_entry.js:255 msgid "Alternate Item" msgstr "صنف بديل" @@ -4854,7 +4872,7 @@ msgstr "معدل من" #: erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json #: erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:587 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:588 #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json @@ -4869,7 +4887,7 @@ msgstr "معدل من" #: erpnext/accounts/doctype/pos_closing_entry/closing_voucher_details.html:41 #: erpnext/accounts/doctype/pos_closing_entry/closing_voucher_details.html:67 #: erpnext/accounts/doctype/pos_closing_entry_taxes/pos_closing_entry_taxes.json -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:240 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:241 #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json #: erpnext/accounts/doctype/pos_invoice_reference/pos_invoice_reference.json #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json @@ -4915,7 +4933,7 @@ msgstr "معدل من" #: erpnext/selling/page/point_of_sale/pos_item_cart.js:46 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:52 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:290 -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:46 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:53 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:69 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py:67 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:109 @@ -4967,6 +4985,7 @@ msgstr "" #. Label of the base_amount (Currency) field in DocType 'Delivery Note Item' #. Label of the base_amount (Currency) field in DocType 'Landed Cost Taxes and #. Charges' +#. Label of the amount (Currency) field in DocType 'Landed Cost Vendor Invoice' #. Label of the base_amount (Currency) field in DocType 'Purchase Receipt Item' #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json @@ -4983,6 +5002,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json +#: erpnext/stock/doctype/landed_cost_vendor_invoice/landed_cost_vendor_invoice.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Amount (Company Currency)" msgstr "المبلغ (عملة الشركة)" @@ -5055,19 +5075,19 @@ msgstr "" msgid "Amount to Bill" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1328 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1324 msgid "Amount {0} {1} against {2} {3}" msgstr "مبلغ {0} {1} مقابل {2} {3}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1339 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1335 msgid "Amount {0} {1} deducted against {2}" msgstr "مبلغ {0} {1} خصم مقابل {2}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1303 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1299 msgid "Amount {0} {1} transferred from {2} to {3}" msgstr "القيمة {0} {1} نقلت من {2} إلى {3}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1309 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1305 msgid "Amount {0} {1} {2} {3}" msgstr "القيمة {0} {1} {2} {3}" @@ -5110,7 +5130,7 @@ msgstr "" msgid "An error has been appeared while reposting item valuation via {0}" msgstr "" -#: erpnext/public/js/controllers/buying.js:331 +#: erpnext/public/js/controllers/buying.js:332 #: erpnext/public/js/utils/sales_common.js:463 msgid "An error occurred during the update process" msgstr "حدث خطأ أثناء عملية التحديث" @@ -6145,7 +6165,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "الاصل {0} يجب تقديمه" -#: erpnext/controllers/buying_controller.py:934 +#: erpnext/controllers/buying_controller.py:946 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6175,15 +6195,15 @@ msgstr "" msgid "Assets" msgstr "الأصول" -#: erpnext/controllers/buying_controller.py:952 +#: erpnext/controllers/buying_controller.py:964 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "لم يتم إنشاء الأصول لـ {item_code}. سيكون عليك إنشاء الأصل يدويًا." -#: erpnext/controllers/buying_controller.py:939 +#: erpnext/controllers/buying_controller.py:951 msgid "Assets {assets_link} created for {item_code}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:173 +#: erpnext/manufacturing/doctype/job_card/job_card.js:193 msgid "Assign Job to Employee" msgstr "" @@ -6601,7 +6621,7 @@ msgstr "" msgid "Auto Reserve Stock for Sales Order on Purchase" msgstr "" -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:155 +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:156 msgid "Auto Tax Settings Error" msgstr "" @@ -6622,7 +6642,7 @@ msgstr "" msgid "Auto re-order" msgstr "إعادة ترتيب تلقائي" -#: erpnext/public/js/controllers/buying.js:329 +#: erpnext/public/js/controllers/buying.js:330 #: erpnext/public/js/utils/sales_common.js:458 msgid "Auto repeat document updated" msgstr "تكرار تلقائي للمستندات المحدثة" @@ -6715,7 +6735,7 @@ msgstr "متاح للاستخدام تاريخ" #. 'Delivery Note Item' #: erpnext/manufacturing/doctype/workstation/workstation.js:505 #: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:80 -#: erpnext/public/js/utils.js:568 +#: erpnext/public/js/utils.js:578 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/report/stock_ageing/stock_ageing.py:167 msgid "Available Qty" @@ -6818,7 +6838,7 @@ msgstr "يجب أن يكون التاريخ متاحًا بعد تاريخ ال #: erpnext/stock/report/stock_ageing/stock_ageing.py:168 #: erpnext/stock/report/stock_ageing/stock_ageing.py:202 -#: erpnext/stock/report/stock_balance/stock_balance.py:517 +#: erpnext/stock/report/stock_balance/stock_balance.py:515 msgid "Average Age" msgstr "متوسط العمر" @@ -6923,7 +6943,7 @@ msgstr "" #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:109 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/selling/doctype/sales_order/sales_order.js:1005 -#: erpnext/stock/doctype/material_request/material_request.js:333 +#: erpnext/stock/doctype/material_request/material_request.js:334 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.js:633 #: erpnext/stock/report/bom_search/bom_search.py:38 @@ -7165,7 +7185,7 @@ msgstr "مطلوب، قائمة مكونات المواد و كمية التصن msgid "BOM and Production" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:365 +#: erpnext/stock/doctype/material_request/material_request.js:366 #: erpnext/stock/doctype/stock_entry/stock_entry.js:685 msgid "BOM does not contain any stock item" msgstr "فاتورة الموارد لا تحتوي على أي صنف مخزون" @@ -7280,7 +7300,7 @@ msgstr "التوازن في العملة الأساسية" #: erpnext/stock/report/available_batch_report/available_batch_report.py:63 #: erpnext/stock/report/available_serial_no/available_serial_no.py:126 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:84 -#: erpnext/stock/report/stock_balance/stock_balance.py:445 +#: erpnext/stock/report/stock_balance/stock_balance.py:443 #: erpnext/stock/report/stock_ledger/stock_ledger.py:250 msgid "Balance Qty" msgstr "كمية الرصيد" @@ -7326,12 +7346,12 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:174 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:86 -#: erpnext/stock/report/stock_balance/stock_balance.py:452 +#: erpnext/stock/report/stock_balance/stock_balance.py:450 #: erpnext/stock/report/stock_ledger/stock_ledger.py:307 msgid "Balance Value" msgstr "قيمة الرصيد" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:322 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:319 msgid "Balance for Account {0} must always be {1}" msgstr "رصيد الحساب لـ {0} يجب ان يكون دائما {1}" @@ -7925,7 +7945,7 @@ msgstr "حالة انتهاء صلاحية الدفعة الصنف" #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:89 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:115 -#: erpnext/public/js/controllers/transaction.js:2443 +#: erpnext/public/js/controllers/transaction.js:2446 #: erpnext/public/js/utils/barcode_scanner.js:260 #: erpnext/public/js/utils/serial_no_batch_selector.js:438 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -7946,7 +7966,7 @@ msgstr "حالة انتهاء صلاحية الدفعة الصنف" #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:68 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:81 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:152 -#: erpnext/stock/report/stock_ledger/stock_ledger.js:59 +#: erpnext/stock/report/stock_ledger/stock_ledger.js:78 #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json msgid "Batch No" @@ -8107,7 +8127,7 @@ msgstr "" #. Label of a Link in the Manufacturing Workspace #: erpnext/manufacturing/doctype/bom/bom.py:1177 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/stock/doctype/material_request/material_request.js:123 +#: erpnext/stock/doctype/material_request/material_request.js:124 #: erpnext/stock/doctype/stock_entry/stock_entry.js:615 msgid "Bill of Materials" msgstr "فاتورة المواد" @@ -8205,7 +8225,7 @@ msgstr "" msgid "Billing Address Name" msgstr "اسم عنوان تقديم الفواتير" -#: erpnext/controllers/accounts_controller.py:500 +#: erpnext/controllers/accounts_controller.py:501 msgid "Billing Address does not belong to the {0}" msgstr "" @@ -8475,7 +8495,7 @@ msgstr "النص الأساسي والنص الختامي تعليمات" msgid "Bom No" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:284 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:282 msgid "Book Advance Payments as Liability option is chosen. Paid From account changed from {0} to {1}." msgstr "" @@ -8535,7 +8555,7 @@ msgstr "حجز الأصول الثابتة" msgid "Booking stock value across multiple accounts will make it harder to track stock and account value." msgstr "" -#: erpnext/accounts/general_ledger.py:784 +#: erpnext/accounts/general_ledger.py:786 msgid "Books have been closed till the period ending on {0}" msgstr "" @@ -8648,7 +8668,7 @@ msgstr "رمز الفرع" #: erpnext/stock/report/stock_ageing/stock_ageing.py:146 #: erpnext/stock/report/stock_analytics/stock_analytics.js:34 #: erpnext/stock/report/stock_analytics/stock_analytics.py:44 -#: erpnext/stock/report/stock_ledger/stock_ledger.js:73 +#: erpnext/stock/report/stock_ledger/stock_ledger.js:92 #: erpnext/stock/report/stock_ledger/stock_ledger.py:271 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:45 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:120 @@ -9309,13 +9329,13 @@ msgstr "لا يمكن التصفية بناءً على طريقة الدفع ، msgid "Can not filter based on Voucher No, if grouped by Voucher" msgstr "لا يمكن الفلتره علي اساس (رقم الأيصال)، إذا تم وضعه في مجموعة على اساس (ايصال)" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1431 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2946 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1429 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940 msgid "Can only make payment against unbilled {0}" msgstr "يمكن إجراء دفعة فقط مقابل فاتورة غير مدفوعة {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1458 -#: erpnext/controllers/accounts_controller.py:3064 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1459 +#: erpnext/controllers/accounts_controller.py:2985 #: erpnext/public/js/controllers/accounts.js:90 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" msgstr "" @@ -9503,7 +9523,7 @@ msgstr "" msgid "Cannot amend {0} {1}, please create a new one instead." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:380 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:364 msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" @@ -9527,7 +9547,7 @@ msgstr "لا يمكن الإلغاء لان هناك تدوينات مخزون msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet." msgstr "" -#: erpnext/controllers/buying_controller.py:1042 +#: erpnext/controllers/buying_controller.py:1054 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9571,7 +9591,7 @@ msgstr "لا يمكن تحويل مركز التكلفة إلى حساب دفت msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}." msgstr "" -#: erpnext/accounts/doctype/account/account.py:403 +#: erpnext/accounts/doctype/account/account.py:405 msgid "Cannot convert to Group because Account Type is selected." msgstr "" @@ -9579,11 +9599,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "لا يمكن تحويل الحساب إلى تصنيف مجموعة لأن نوع الحساب تم اختياره." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:980 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:988 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1756 +#: erpnext/selling/doctype/sales_order/sales_order.py:1758 #: erpnext/stock/doctype/pick_list/pick_list.py:199 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9613,7 +9633,7 @@ msgstr "لا يمكن ان تعلن بانها فقدت ، لأنه تم تقد msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "لا يمكن الخصم عندما تكون الفئة \"التقييم\" أو \"التقييم والإجمالي\"" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1777 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1778 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9629,8 +9649,8 @@ msgstr "" msgid "Cannot enqueue multi docs for one company. {0} is already queued/running for company: {1}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:701 -#: erpnext/selling/doctype/sales_order/sales_order.py:724 +#: erpnext/selling/doctype/sales_order/sales_order.py:702 +#: erpnext/selling/doctype/sales_order/sales_order.py:725 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "لا يمكن ضمان التسليم بواسطة Serial No حيث أن العنصر {0} مضاف مع وبدون ضمان التسليم بواسطة Serial No." @@ -9638,7 +9658,7 @@ msgstr "لا يمكن ضمان التسليم بواسطة Serial No حيث أن msgid "Cannot find Item with this Barcode" msgstr "لا يمكن العثور على عنصر بهذا الرمز الشريطي" -#: erpnext/controllers/accounts_controller.py:3601 +#: erpnext/controllers/accounts_controller.py:3522 msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings." msgstr "" @@ -9658,12 +9678,12 @@ msgstr "" msgid "Cannot produce more than {0} items for {1}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:357 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:353 msgid "Cannot receive from customer against negative outstanding" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1475 -#: erpnext/controllers/accounts_controller.py:3079 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1476 +#: erpnext/controllers/accounts_controller.py:3000 #: erpnext/public/js/controllers/accounts.js:100 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" msgstr "لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول" @@ -9676,10 +9696,10 @@ msgstr "" msgid "Cannot retrieve link token. Check Error Log for more information" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1467 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1646 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1894 -#: erpnext/controllers/accounts_controller.py:3069 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1468 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1647 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1888 +#: erpnext/controllers/accounts_controller.py:2990 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/taxes_and_totals.js:470 msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row" @@ -9697,11 +9717,11 @@ msgstr "لا يمكن تحديد التخويل على أساس الخصم ل {0 msgid "Cannot set multiple Item Defaults for a company." msgstr "لا يمكن تعيين عدة عناصر افتراضية لأي شركة." -#: erpnext/controllers/accounts_controller.py:3749 +#: erpnext/controllers/accounts_controller.py:3670 msgid "Cannot set quantity less than delivered quantity" msgstr "لا يمكن ضبط كمية أقل من الكمية المسلمة" -#: erpnext/controllers/accounts_controller.py:3752 +#: erpnext/controllers/accounts_controller.py:3673 msgid "Cannot set quantity less than received quantity" msgstr "لا يمكن تعيين كمية أقل من الكمية المستلمة" @@ -9709,7 +9729,7 @@ msgstr "لا يمكن تعيين كمية أقل من الكمية المستل msgid "Cannot set the field {0} for copying in variants" msgstr "لا يمكن تعيين الحقل {0} للنسخ في المتغيرات" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2004 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1998 msgid "Cannot {0} from {1} without any negative outstanding invoice" msgstr "" @@ -9855,15 +9875,15 @@ msgstr "التدفق النقدي" msgid "Cash Flow Statement" msgstr "بيان التدفق النقدي" -#: erpnext/accounts/report/cash_flow/cash_flow.py:157 +#: erpnext/accounts/report/cash_flow/cash_flow.py:172 msgid "Cash Flow from Financing" msgstr "التدفق النقدي من التمويل" -#: erpnext/accounts/report/cash_flow/cash_flow.py:150 +#: erpnext/accounts/report/cash_flow/cash_flow.py:165 msgid "Cash Flow from Investing" msgstr "التدفق النقد من الاستثمار" -#: erpnext/accounts/report/cash_flow/cash_flow.py:138 +#: erpnext/accounts/report/cash_flow/cash_flow.py:153 msgid "Cash Flow from Operations" msgstr "التدفق النقدي من العمليات" @@ -9872,7 +9892,7 @@ msgstr "التدفق النقدي من العمليات" msgid "Cash In Hand" msgstr "النقدية الحاضرة" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:318 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:319 msgid "Cash or Bank Account is mandatory for making payment entry" msgstr "الحساب النقدي أو البنكي مطلوب لعمل مدخل بيع
    Cash or Bank Account is mandatory for making payment entry" @@ -10060,7 +10080,7 @@ msgstr "" #. Label of the change_amount (Currency) field in DocType 'POS Invoice' #. Label of the change_amount (Currency) field in DocType 'Sales Invoice' -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:306 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:307 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/selling/page/point_of_sale/pos_payment.js:679 @@ -10124,8 +10144,8 @@ msgstr "" msgid "Channel Partner" msgstr "شريك القناة" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2323 -#: erpnext/controllers/accounts_controller.py:3132 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2317 +#: erpnext/controllers/accounts_controller.py:3053 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount" msgstr "" @@ -10308,7 +10328,7 @@ msgstr "عرض الشيك" #. Label of the reference_date (Date) field in DocType 'Payment Entry' #: erpnext/accounts/doctype/payment_entry/payment_entry.json -#: erpnext/public/js/controllers/transaction.js:2354 +#: erpnext/public/js/controllers/transaction.js:2357 msgid "Cheque/Reference Date" msgstr "تاريخ الصك / السند المرجع" @@ -10356,7 +10376,7 @@ msgstr "اسم الطفل" #. Label of the child_row_reference (Data) field in DocType 'Quality #. Inspection' -#: erpnext/public/js/controllers/transaction.js:2449 +#: erpnext/public/js/controllers/transaction.js:2452 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json msgid "Child Row Reference" msgstr "" @@ -10388,6 +10408,12 @@ msgstr "" msgid "City" msgstr "مدينة" +#. Label of the claimed_landed_cost_amount (Currency) field in DocType +#. 'Purchase Invoice' +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +msgid "Claimed Landed Cost Amount (Company Currency)" +msgstr "" + #. Label of the class_per (Data) field in DocType 'Employee Education' #: erpnext/setup/doctype/employee_education/employee_education.json msgid "Class / Percentage" @@ -10452,7 +10478,7 @@ msgstr "تم تحديث تاريخ التخليص\\n
    \\nClearance Date update msgid "Clearing Demo Data..." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:706 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:714 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 "" @@ -10460,7 +10486,7 @@ msgstr "" 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 "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:701 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:709 msgid "Click on Get Sales Orders to fetch sales orders based on the above filters." msgstr "" @@ -10483,11 +10509,11 @@ msgstr "" msgid "Client" msgstr "عميل" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:388 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:391 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:54 #: erpnext/crm/doctype/opportunity/opportunity.js:125 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:121 -#: erpnext/manufacturing/doctype/work_order/work_order.js:677 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:129 +#: erpnext/manufacturing/doctype/work_order/work_order.js:682 #: erpnext/quality_management/doctype/quality_meeting/quality_meeting_list.js:7 #: erpnext/selling/doctype/sales_order/sales_order.js:591 #: erpnext/selling/doctype/sales_order/sales_order.js:623 @@ -10579,7 +10605,7 @@ msgstr "وثائق مغلقة" msgid "Closed Work Order can not be stopped or Re-opened" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:467 +#: erpnext/selling/doctype/sales_order/sales_order.py:468 msgid "Closed order cannot be cancelled. Unclose to cancel." msgstr "الطلب المغلق لايمكن إلغاؤه. ازالة الاغلاق لكي تتمكن من الالغاء" @@ -10676,7 +10702,7 @@ msgstr "" msgid "Collapse All" msgstr "انهيار جميع" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:269 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:270 msgid "Collect Outstanding Amount" msgstr "" @@ -10781,7 +10807,7 @@ msgstr "عمولة" msgid "Commission Rate" msgstr "نسبة العمولة" -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:55 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:67 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:78 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py:82 msgid "Commission Rate %" @@ -11193,7 +11219,7 @@ msgstr "شركات" #: erpnext/selling/report/sales_analytics/sales_analytics.js:69 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:8 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:343 -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:33 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:8 #: erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:8 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:33 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js:33 @@ -11247,6 +11273,7 @@ msgstr "شركات" #: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:7 #: erpnext/stock/report/item_shortage_report/item_shortage_report.js:8 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:137 +#: erpnext/stock/report/landed_cost_report/landed_cost_report.js:8 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:8 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:115 #: erpnext/stock/report/reserved_stock/reserved_stock.js:8 @@ -11258,7 +11285,7 @@ msgstr "شركات" #: erpnext/stock/report/stock_analytics/stock_analytics.js:41 #: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:7 #: erpnext/stock/report/stock_balance/stock_balance.js:8 -#: erpnext/stock/report/stock_balance/stock_balance.py:506 +#: erpnext/stock/report/stock_balance/stock_balance.py:504 #: erpnext/stock/report/stock_ledger/stock_ledger.js:8 #: erpnext/stock/report/stock_ledger/stock_ledger.py:357 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.js:18 @@ -11434,7 +11461,7 @@ msgstr "" msgid "Company currencies of both the companies should match for Inter Company Transactions." msgstr "يجب أن تتطابق عملات الشركة لكلتا الشركتين مع معاملات Inter Inter Company." -#: erpnext/stock/doctype/material_request/material_request.js:359 +#: erpnext/stock/doctype/material_request/material_request.js:360 #: erpnext/stock/doctype/stock_entry/stock_entry.js:679 msgid "Company field is required" msgstr "حقل الشركة مطلوب" @@ -11486,7 +11513,7 @@ msgstr "" msgid "Company {0} added multiple times" msgstr "" -#: erpnext/accounts/doctype/account/account.py:472 +#: erpnext/accounts/doctype/account/account.py:474 msgid "Company {0} does not exist" msgstr "الشركة {0} غير موجودة" @@ -11535,7 +11562,7 @@ msgstr "" msgid "Complete" msgstr "أكمال" -#: erpnext/manufacturing/doctype/job_card/job_card.js:210 +#: erpnext/manufacturing/doctype/job_card/job_card.js:230 #: erpnext/manufacturing/doctype/workstation/workstation.js:151 msgid "Complete Job" msgstr "" @@ -11622,7 +11649,7 @@ msgstr "" #: erpnext/stock/doctype/delivery_note/delivery_note_list.js:24 #: erpnext/stock/doctype/delivery_trip/delivery_trip.json #: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/material_request/material_request_list.js:13 +#: erpnext/stock/doctype/material_request/material_request_list.js:14 #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:25 @@ -11668,8 +11695,8 @@ msgstr "الكمية المكتملة" msgid "Completed Qty cannot be greater than 'Qty to Manufacture'" msgstr "لا يمكن أن تكون الكمية المكتملة أكبر من "الكمية إلى التصنيع"" -#: erpnext/manufacturing/doctype/job_card/job_card.js:258 -#: erpnext/manufacturing/doctype/job_card/job_card.js:353 +#: erpnext/manufacturing/doctype/job_card/job_card.js:278 +#: erpnext/manufacturing/doctype/job_card/job_card.js:373 #: erpnext/manufacturing/doctype/workstation/workstation.js:296 msgid "Completed Quantity" msgstr "الكمية المكتملة" @@ -11855,7 +11882,7 @@ msgstr "" msgid "Consider Minimum Order Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:901 +#: erpnext/manufacturing/doctype/work_order/work_order.js:906 msgid "Consider Process Loss" msgstr "" @@ -12270,7 +12297,7 @@ msgstr "الاتصال رقم" msgid "Contact Person" msgstr "الشخص الذي يمكن الاتصال به" -#: erpnext/controllers/accounts_controller.py:512 +#: erpnext/controllers/accounts_controller.py:513 msgid "Contact Person does not belong to the {0}" msgstr "" @@ -12309,7 +12336,7 @@ msgid "Content Type" msgstr "نوع المحتوى" #: erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js:162 -#: erpnext/public/js/controllers/transaction.js:2367 +#: erpnext/public/js/controllers/transaction.js:2370 #: erpnext/selling/doctype/quotation/quotation.js:357 msgid "Continue" msgstr "استمر" @@ -12450,7 +12477,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json #: erpnext/manufacturing/doctype/bom_item/bom_item.json #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json -#: erpnext/public/js/utils.js:810 +#: erpnext/public/js/utils.js:820 #: erpnext/stock/doctype/packed_item/packed_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/putaway_rule/putaway_rule.json @@ -12482,15 +12509,15 @@ msgstr "معامل التحويل الافتراضي لوحدة القياس ي msgid "Conversion factor for item {0} has been reset to 1.0 as the uom {1} is same as stock uom {2}." msgstr "" -#: erpnext/controllers/accounts_controller.py:2887 +#: erpnext/controllers/accounts_controller.py:2866 msgid "Conversion rate cannot be 0" msgstr "" -#: erpnext/controllers/accounts_controller.py:2894 +#: erpnext/controllers/accounts_controller.py:2873 msgid "Conversion rate is 1.00, but document currency is different from company currency" msgstr "" -#: erpnext/controllers/accounts_controller.py:2890 +#: erpnext/controllers/accounts_controller.py:2869 msgid "Conversion rate must be 1.00 if document currency is same as company currency" msgstr "" @@ -12561,13 +12588,13 @@ msgstr "تصحيحي" msgid "Corrective Action" msgstr "اجراء تصحيحي" -#: erpnext/manufacturing/doctype/job_card/job_card.js:410 +#: erpnext/manufacturing/doctype/job_card/job_card.js:430 msgid "Corrective Job Card" msgstr "" #. Label of the corrective_operation_section (Tab Break) field in DocType 'Job #. Card' -#: erpnext/manufacturing/doctype/job_card/job_card.js:417 +#: erpnext/manufacturing/doctype/job_card/job_card.js:437 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Corrective Operation" msgstr "" @@ -12798,8 +12825,8 @@ msgstr "" msgid "Cost Center is a part of Cost Center Allocation, hence cannot be converted to a group" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1411 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:865 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1412 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:873 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "مركز التكلفة مطلوب في الصف {0} في جدول الضرائب للنوع {1}\\n
    \\nCost Center is required in row {0} in Taxes table for type {1}" @@ -12943,7 +12970,7 @@ msgstr "" msgid "Could not auto create Customer due to the following missing mandatory field(s):" msgstr "تعذر إنشاء العميل تلقائيًا بسبب الحقول الإلزامية التالية المفقودة:" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:672 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:673 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again" msgstr "تعذر إنشاء إشعار دائن تلقائيًا ، يُرجى إلغاء تحديد "إشعار ائتمان الإصدار" وإرساله مرة أخرى" @@ -13063,9 +13090,9 @@ msgstr "" #: erpnext/accounts/doctype/dunning/dunning.js:57 #: erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:34 #: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:68 -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:73 -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:76 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:74 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:77 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:117 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123 @@ -13085,14 +13112,14 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:143 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:151 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:177 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:151 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:421 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:441 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:454 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:461 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:471 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:489 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:495 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:150 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:424 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:444 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:457 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:464 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:474 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:492 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:498 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:53 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:160 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:217 @@ -13101,9 +13128,9 @@ msgstr "" #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:33 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:35 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:36 -#: erpnext/crm/doctype/lead/lead.js:31 erpnext/crm/doctype/lead/lead.js:32 -#: erpnext/crm/doctype/lead/lead.js:33 erpnext/crm/doctype/lead/lead.js:35 -#: erpnext/crm/doctype/lead/lead.js:181 +#: erpnext/crm/doctype/lead/lead.js:32 erpnext/crm/doctype/lead/lead.js:33 +#: erpnext/crm/doctype/lead/lead.js:34 erpnext/crm/doctype/lead/lead.js:36 +#: erpnext/crm/doctype/lead/lead.js:182 #: erpnext/crm/doctype/opportunity/opportunity.js:85 #: erpnext/crm/doctype/opportunity/opportunity.js:93 #: erpnext/crm/doctype/opportunity/opportunity.js:103 @@ -13120,21 +13147,21 @@ msgstr "" #: erpnext/manufacturing/doctype/bom/bom.js:194 #: erpnext/manufacturing/doctype/bom/bom.js:438 #: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:99 -#: erpnext/manufacturing/doctype/job_card/job_card.js:117 -#: erpnext/manufacturing/doctype/job_card/job_card.js:131 +#: erpnext/manufacturing/doctype/job_card/job_card.js:137 +#: erpnext/manufacturing/doctype/job_card/job_card.js:151 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:268 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:137 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:151 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:157 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:145 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:159 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:165 #: erpnext/manufacturing/doctype/work_order/work_order.js:206 #: erpnext/manufacturing/doctype/work_order/work_order.js:221 -#: erpnext/manufacturing/doctype/work_order/work_order.js:366 -#: erpnext/manufacturing/doctype/work_order/work_order.js:946 +#: erpnext/manufacturing/doctype/work_order/work_order.js:371 +#: erpnext/manufacturing/doctype/work_order/work_order.js:951 #: erpnext/projects/doctype/task/task_tree.js:81 #: erpnext/public/js/communication.js:19 erpnext/public/js/communication.js:31 #: erpnext/public/js/communication.js:41 #: erpnext/public/js/controllers/transaction.js:361 -#: erpnext/public/js/controllers/transaction.js:2491 +#: erpnext/public/js/controllers/transaction.js:2494 #: erpnext/selling/doctype/customer/customer.js:181 #: erpnext/selling/doctype/quotation/quotation.js:125 #: erpnext/selling/doctype/quotation/quotation.js:134 @@ -13169,20 +13196,20 @@ msgstr "" #: erpnext/stock/doctype/item/item.js:182 #: erpnext/stock/doctype/item/item.js:549 #: erpnext/stock/doctype/item/item.js:806 -#: erpnext/stock/doctype/material_request/material_request.js:141 -#: erpnext/stock/doctype/material_request/material_request.js:150 -#: erpnext/stock/doctype/material_request/material_request.js:156 -#: erpnext/stock/doctype/material_request/material_request.js:164 -#: erpnext/stock/doctype/material_request/material_request.js:172 -#: erpnext/stock/doctype/material_request/material_request.js:180 -#: erpnext/stock/doctype/material_request/material_request.js:186 -#: erpnext/stock/doctype/material_request/material_request.js:192 -#: erpnext/stock/doctype/material_request/material_request.js:200 -#: erpnext/stock/doctype/material_request/material_request.js:208 -#: erpnext/stock/doctype/material_request/material_request.js:212 -#: erpnext/stock/doctype/material_request/material_request.js:417 -#: erpnext/stock/doctype/pick_list/pick_list.js:113 -#: erpnext/stock/doctype/pick_list/pick_list.js:119 +#: erpnext/stock/doctype/material_request/material_request.js:142 +#: erpnext/stock/doctype/material_request/material_request.js:151 +#: erpnext/stock/doctype/material_request/material_request.js:157 +#: erpnext/stock/doctype/material_request/material_request.js:165 +#: erpnext/stock/doctype/material_request/material_request.js:173 +#: erpnext/stock/doctype/material_request/material_request.js:181 +#: erpnext/stock/doctype/material_request/material_request.js:187 +#: erpnext/stock/doctype/material_request/material_request.js:193 +#: erpnext/stock/doctype/material_request/material_request.js:201 +#: erpnext/stock/doctype/material_request/material_request.js:209 +#: erpnext/stock/doctype/material_request/material_request.js:213 +#: erpnext/stock/doctype/material_request/material_request.js:418 +#: erpnext/stock/doctype/pick_list/pick_list.js:130 +#: erpnext/stock/doctype/pick_list/pick_list.js:136 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:68 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:70 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:82 @@ -13196,9 +13223,9 @@ msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.js:172 #: erpnext/stock/doctype/stock_entry/stock_entry.js:247 #: erpnext/stock/doctype/stock_entry/stock_entry.js:1283 -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:227 -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:260 -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:273 +#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:231 +#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:264 +#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:277 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:76 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:90 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:92 @@ -13212,7 +13239,7 @@ msgstr "انشاء" msgid "Create Chart Of Accounts Based On" msgstr "إنشاء دليل الحسابات استنادا إلى" -#: erpnext/stock/doctype/pick_list/pick_list.js:111 +#: erpnext/stock/doctype/pick_list/pick_list.js:128 msgid "Create Delivery Note" msgstr "" @@ -13308,7 +13335,7 @@ msgstr "" msgid "Create New Lead" msgstr "إنشاء عميل محتمل" -#: erpnext/crm/doctype/lead/lead.js:160 +#: erpnext/crm/doctype/lead/lead.js:161 msgid "Create Opportunity" msgstr "" @@ -13324,7 +13351,7 @@ msgstr "إنشاء إدخال الدفع" msgid "Create Payment Entry for Consolidated POS Invoices." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:718 +#: erpnext/manufacturing/doctype/work_order/work_order.js:723 msgid "Create Pick List" msgstr "إنشاء قائمة انتقاء" @@ -13382,8 +13409,8 @@ msgid "Create Sample Retention Stock Entry" msgstr "إنشاء نموذج إدخال مخزون الاحتفاظ" #: erpnext/stock/dashboard/item_dashboard.js:283 -#: erpnext/stock/doctype/material_request/material_request.js:479 -#: erpnext/stock/doctype/pick_list/pick_list.js:117 +#: erpnext/stock/doctype/material_request/material_request.js:480 +#: erpnext/stock/doctype/pick_list/pick_list.js:134 msgid "Create Stock Entry" msgstr "" @@ -13432,7 +13459,7 @@ msgstr "" msgid "Create a variant with the template image." msgstr "" -#: erpnext/stock/stock_ledger.py:1900 +#: erpnext/stock/stock_ledger.py:1911 msgid "Create an incoming stock transaction for the Item." msgstr "قم بإنشاء حركة مخزون واردة للصنف." @@ -13493,7 +13520,7 @@ msgid "Creating Purchase Order ..." msgstr "إنشاء أمر شراء ..." #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:737 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:566 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:569 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73 msgid "Creating Purchase Receipt ..." msgstr "" @@ -13502,16 +13529,16 @@ msgstr "" msgid "Creating Sales Invoices ..." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:137 -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:213 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:136 +#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:217 msgid "Creating Stock Entry" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:581 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:584 msgid "Creating Subcontracting Order ..." msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:311 +#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:315 msgid "Creating Subcontracting Receipt ..." msgstr "" @@ -13574,7 +13601,7 @@ msgstr "" msgid "Credit ({0})" msgstr "الائتمان ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:601 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:602 msgid "Credit Account" msgstr "حساب دائن" @@ -13713,15 +13740,15 @@ msgstr "الائتمان مذكرة صادرة" msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:669 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:670 msgid "Credit Note {0} has been created automatically" msgstr "تم إنشاء ملاحظة الائتمان {0} تلقائيًا" #. Label of the credit_to (Link) field in DocType 'Purchase Invoice' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:368 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376 -#: erpnext/controllers/accounts_controller.py:2306 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377 +#: erpnext/controllers/accounts_controller.py:2282 msgid "Credit To" msgstr "دائن الى" @@ -13790,7 +13817,7 @@ msgstr "معايير الوزن" msgid "Criteria weights must add up to 100%" msgstr "" -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:142 +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:143 msgid "Cron Interval should be between 1 and 59 Min" msgstr "" @@ -13920,7 +13947,7 @@ msgstr "" #: erpnext/accounts/report/financial_statements.py:678 #: erpnext/accounts/report/general_ledger/general_ledger.js:147 #: erpnext/accounts/report/gross_profit/gross_profit.py:427 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:704 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:707 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:214 #: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:175 #: erpnext/accounts/report/purchase_register/purchase_register.py:229 @@ -13945,6 +13972,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:121 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:72 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:39 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:85 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:137 #: erpnext/stock/doctype/delivery_note/delivery_note.json @@ -14013,13 +14041,13 @@ msgstr "يجب أن يكون صرف العملات ساريًا للشراء أ msgid "Currency and Price List" msgstr "العملة وقائمة الأسعار" -#: erpnext/accounts/doctype/account/account.py:309 +#: erpnext/accounts/doctype/account/account.py:311 msgid "Currency can not be changed after making entries using some other currency" msgstr "لا يمكن تغيير العملة بعد إجراء إدخالات باستخدام بعض العملات الأخرى" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1660 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1728 -#: erpnext/accounts/utils.py:2250 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733 +#: erpnext/accounts/utils.py:2317 msgid "Currency for {0} must be {1}" msgstr "العملة ل {0} يجب أن تكون {1} \\n
    \\nCurrency for {0} must be {1}" @@ -14305,7 +14333,7 @@ msgstr "مخصص" #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/supplier/supplier.js:192 #: erpnext/crm/doctype/contract/contract.json -#: erpnext/crm/doctype/lead/lead.js:31 +#: erpnext/crm/doctype/lead/lead.js:32 #: erpnext/crm/doctype/opportunity/opportunity.js:99 #: erpnext/crm/doctype/prospect/prospect.js:8 #: erpnext/crm/report/lead_conversion_time/lead_conversion_time.py:54 @@ -14341,7 +14369,7 @@ msgstr "مخصص" #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:19 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:41 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:230 -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:40 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:41 #: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:32 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:53 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:32 @@ -14797,7 +14825,7 @@ msgstr "الزبون مطلوب للخصم المعني بالزبائن" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1087 #: erpnext/selling/doctype/sales_order/sales_order.py:373 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:416 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:417 msgid "Customer {0} does not belong to project {1}" msgstr "العميل {0} لا ينتمي الى المشروع {1}\\n
    \\nCustomer {0} does not belong to project {1}" @@ -15029,7 +15057,7 @@ msgstr "استيراد البيانات والإعدادات" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/dunning/dunning.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:611 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:612 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/pos_invoice_reference/pos_invoice_reference.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:36 @@ -15243,7 +15271,10 @@ msgstr "أيام حتى موعد الاستحقاق" msgid "Days before the current subscription period" msgstr "" +#. Label of the delinked (Check) field in DocType 'Advance Payment Ledger +#. Entry' #. Label of the delinked (Check) field in DocType 'Payment Ledger Entry' +#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json msgid "DeLinked" msgstr "" @@ -15291,7 +15322,7 @@ msgstr "" msgid "Debit ({0})" msgstr "مدين ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:591 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:592 msgid "Debit Account" msgstr "حساب مدين" @@ -15353,7 +15384,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:955 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:966 -#: erpnext/controllers/accounts_controller.py:2306 +#: erpnext/controllers/accounts_controller.py:2282 msgid "Debit To" msgstr "الخصم ل" @@ -15361,7 +15392,7 @@ msgstr "الخصم ل" msgid "Debit To is required" msgstr "مدين الى مطلوب" -#: erpnext/accounts/general_ledger.py:506 +#: erpnext/accounts/general_ledger.py:508 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}." msgstr "المدين و الدائن غير متساوي ل {0} # {1}. الفرق هو {2}." @@ -15518,7 +15549,7 @@ msgstr "يجب أن تكون قائمة المواد الافتراضية ({0}) msgid "Default BOM for {0} not found" msgstr "فاتورة المواد ل {0} غير موجودة\\n
    \\nDefault BOM for {0} not found" -#: erpnext/controllers/accounts_controller.py:3790 +#: erpnext/controllers/accounts_controller.py:3711 msgid "Default BOM not found for FG Item {0}" msgstr "" @@ -16139,7 +16170,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Serial No' #. Option for the 'Tracking Status' (Select) field in DocType 'Shipment' #. Option for the 'Status' (Select) field in DocType 'Stock Reservation Entry' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:397 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:400 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:20 #: erpnext/controllers/website_list_for_contact.py:209 @@ -16228,7 +16259,7 @@ msgstr "تسليم" #. Label of the delivery_date (Date) field in DocType 'Sales Order' #. Label of the delivery_date (Date) field in DocType 'Sales Order Item' -#: erpnext/public/js/utils.js:803 +#: erpnext/public/js/utils.js:813 #: erpnext/selling/doctype/sales_order/sales_order.js:1076 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -16516,7 +16547,7 @@ msgstr "المبلغ المستهلك" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:56 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:81 #: erpnext/accounts/report/account_balance/account_balance.js:44 -#: erpnext/accounts/report/cash_flow/cash_flow.py:140 +#: erpnext/accounts/report/cash_flow/cash_flow.py:155 #: erpnext/assets/doctype/asset/asset.json msgid "Depreciation" msgstr "إهلاك" @@ -16856,7 +16887,7 @@ msgstr "" #: erpnext/projects/doctype/task_type/task_type.json #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.json #: erpnext/public/js/bank_reconciliation_tool/data_table_manager.js:55 -#: erpnext/public/js/controllers/transaction.js:2431 +#: erpnext/public/js/controllers/transaction.js:2434 #: erpnext/selling/doctype/installation_note_item/installation_note_item.json #: erpnext/selling/doctype/product_bundle/product_bundle.json #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json @@ -17308,11 +17339,11 @@ msgstr "" msgid "Disabled Warehouse {0} cannot be used for this transaction." msgstr "" -#: erpnext/controllers/accounts_controller.py:830 +#: erpnext/controllers/accounts_controller.py:831 msgid "Disabled pricing rules since this {} is an internal transfer" msgstr "" -#: erpnext/controllers/accounts_controller.py:844 +#: erpnext/controllers/accounts_controller.py:845 msgid "Disabled tax included prices since this {} is an internal transfer" msgstr "" @@ -17539,7 +17570,7 @@ msgstr "" msgid "Discount must be less than 100" msgstr "يجب أن يكون الخصم أقل من 100" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3424 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3418 msgid "Discount of {} applied as per Payment Term" msgstr "" @@ -17864,11 +17895,11 @@ msgstr "" msgid "Do you want to notify all the customers by email?" msgstr "هل تريد أن تخطر جميع العملاء عن طريق البريد الإلكتروني؟" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:321 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:329 msgid "Do you want to submit the material request" msgstr "هل ترغب في تقديم طلب المواد" -#: erpnext/manufacturing/doctype/job_card/job_card.js:56 +#: erpnext/manufacturing/doctype/job_card/job_card.js:76 msgid "Do you want to submit the stock entry?" msgstr "" @@ -17933,7 +17964,7 @@ msgstr "اسم المستند" #: erpnext/public/js/bank_reconciliation_tool/dialog_manager.js:186 #: erpnext/quality_management/doctype/quality_meeting_minutes/quality_meeting_minutes.json #: erpnext/selling/doctype/installation_note_item/installation_note_item.json -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:14 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:22 #: erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:22 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:14 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js:14 @@ -17967,7 +17998,7 @@ msgstr "" msgid "Documents Processed on each trigger. Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:233 +#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:237 msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost." msgstr "" @@ -18277,7 +18308,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json #: erpnext/accounts/doctype/overdue_payment/overdue_payment.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:867 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:868 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_schedule/payment_schedule.json @@ -18514,7 +18545,7 @@ msgstr "كل عملية" msgid "Earliest" msgstr "أولا" -#: erpnext/stock/report/stock_balance/stock_balance.py:518 +#: erpnext/stock/report/stock_balance/stock_balance.py:516 msgid "Earliest Age" msgstr "أقدم عمر" @@ -19006,7 +19037,7 @@ msgstr "فارغة" msgid "Ems(Pica)" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1651 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1649 msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock." msgstr "" @@ -19243,8 +19274,8 @@ msgstr "لا يمكن أن يكون تاريخ الانتهاء قبل تاري #. Label of the end_time (Time) field in DocType 'Stock Reposting Settings' #. Label of the end_time (Time) field in DocType 'Service Day' #. Label of the end_time (Datetime) field in DocType 'Call Log' -#: erpnext/manufacturing/doctype/job_card/job_card.js:291 -#: erpnext/manufacturing/doctype/job_card/job_card.js:360 +#: erpnext/manufacturing/doctype/job_card/job_card.js:311 +#: erpnext/manufacturing/doctype/job_card/job_card.js:380 #: erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json #: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json #: erpnext/support/doctype/service_day/service_day.json @@ -19331,12 +19362,12 @@ msgstr "" msgid "Enter Serial Nos" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:416 +#: erpnext/stock/doctype/material_request/material_request.js:417 msgid "Enter Supplier" msgstr "أدخل المورد" -#: erpnext/manufacturing/doctype/job_card/job_card.js:317 -#: erpnext/manufacturing/doctype/job_card/job_card.js:386 +#: erpnext/manufacturing/doctype/job_card/job_card.js:337 +#: erpnext/manufacturing/doctype/job_card/job_card.js:406 #: erpnext/manufacturing/doctype/workstation/workstation.js:312 msgid "Enter Value" msgstr "أدخل القيمة" @@ -19414,7 +19445,7 @@ msgstr "" msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1042 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1047 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set." msgstr "" @@ -19551,7 +19582,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:955 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:956 msgid "Error: {0} is mandatory field" msgstr "الخطأ: {0} هو حقل إلزامي" @@ -19619,7 +19650,7 @@ msgstr "" msgid "Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings." msgstr "مثال: ABCD. #####. إذا تم ضبط المسلسل ولم يتم ذكر رقم الدفعة في المعاملات ، فسيتم إنشاء رقم الدفعة تلقائيًا استنادًا إلى هذه السلسلة. إذا كنت تريد دائمًا الإشارة صراحة إلى Batch No لهذا العنصر ، فاترك هذا فارغًا. ملاحظة: سيأخذ هذا الإعداد الأولوية على بادئة Naming Series في إعدادات المخزون." -#: erpnext/stock/stock_ledger.py:2166 +#: erpnext/stock/stock_ledger.py:2177 msgid "Example: Serial No {0} reserved in {1}." msgstr "" @@ -19673,8 +19704,8 @@ msgstr "" msgid "Exchange Gain/Loss" msgstr "أرباح / خسائر الناتجة عن صرف العملة" -#: erpnext/controllers/accounts_controller.py:1693 -#: erpnext/controllers/accounts_controller.py:1777 +#: erpnext/controllers/accounts_controller.py:1694 +#: erpnext/controllers/accounts_controller.py:1778 msgid "Exchange Gain/Loss amount has been booked through {0}" msgstr "" @@ -19940,7 +19971,7 @@ msgstr "القيمة المتوقعة بعد حياة مفيدة" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:595 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:596 #: erpnext/accounts/report/account_balance/account_balance.js:28 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:89 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:178 @@ -20008,13 +20039,13 @@ msgstr "طلب النفقات" msgid "Expense Head" msgstr "عنوان المصروف" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:489 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:513 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:533 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:490 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:514 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:534 msgid "Expense Head Changed" msgstr "تغيير رأس المصاريف" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:591 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:592 msgid "Expense account is mandatory for item {0}" msgstr "اجباري حساب النفقات للصنف {0}" @@ -20389,13 +20420,19 @@ msgstr "" msgid "Fetch Timesheet in Sales Invoice" msgstr "" +#. Label of the fetch_valuation_rate_for_internal_transaction (Check) field in +#. DocType 'Accounts Settings' +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json +msgid "Fetch Valuation Rate for Internal Transaction" +msgstr "" + #. Label of the fetch_from_parent (Select) field in DocType 'Inventory #. Dimension' #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json msgid "Fetch Value From" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:351 +#: erpnext/stock/doctype/material_request/material_request.js:352 #: erpnext/stock/doctype/stock_entry/stock_entry.js:656 msgid "Fetch exploded BOM (including sub-assemblies)" msgstr "جلب BOM انفجرت (بما في ذلك المجالس الفرعية)" @@ -20415,7 +20452,7 @@ msgid "Fetching Error" msgstr "" #: erpnext/accounts/doctype/dunning/dunning.js:135 -#: erpnext/public/js/controllers/transaction.js:1305 +#: erpnext/public/js/controllers/transaction.js:1308 msgid "Fetching exchange rates ..." msgstr "" @@ -20529,7 +20566,7 @@ msgstr "" #. Payment Ledger' #. Label of the filters (Section Break) field in DocType 'Tax Rule' #. Label of the filters (Section Break) field in DocType 'Production Plan' -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:930 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:931 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json #: erpnext/accounts/doctype/pos_profile/pos_profile.json #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json @@ -20659,9 +20696,9 @@ msgstr "" msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) " msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:767 -#: erpnext/manufacturing/doctype/work_order/work_order.js:782 -#: erpnext/manufacturing/doctype/work_order/work_order.js:791 +#: erpnext/manufacturing/doctype/work_order/work_order.js:772 +#: erpnext/manufacturing/doctype/work_order/work_order.js:787 +#: erpnext/manufacturing/doctype/work_order/work_order.js:796 msgid "Finish" msgstr "إنهاء" @@ -20674,7 +20711,7 @@ msgstr "تم الانتهاء من" #. Label of the parent_item_code (Link) field in DocType 'Production Plan Sub #. Assembly Item' #. Label of the finished_good (Link) field in DocType 'Subcontracting BOM' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:243 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:246 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json @@ -20691,7 +20728,7 @@ msgstr "" #. Label of the fg_item (Link) field in DocType 'Subcontracting Order Service #. Item' -#: erpnext/public/js/utils.js:829 +#: erpnext/public/js/utils.js:839 #: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json msgid "Finished Good Item" msgstr "" @@ -20700,7 +20737,7 @@ msgstr "" msgid "Finished Good Item Code" msgstr "انتهى رمز السلعة جيدة" -#: erpnext/public/js/utils.js:847 +#: erpnext/public/js/utils.js:857 msgid "Finished Good Item Qty" msgstr "" @@ -20710,15 +20747,15 @@ msgstr "" msgid "Finished Good Item Quantity" msgstr "" -#: erpnext/controllers/accounts_controller.py:3776 +#: erpnext/controllers/accounts_controller.py:3697 msgid "Finished Good Item is not specified for service item {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:3793 +#: erpnext/controllers/accounts_controller.py:3714 msgid "Finished Good Item {0} Qty can not be zero" msgstr "" -#: erpnext/controllers/accounts_controller.py:3787 +#: erpnext/controllers/accounts_controller.py:3708 msgid "Finished Good Item {0} must be a sub-contracted item" msgstr "" @@ -21017,11 +21054,11 @@ msgstr "" msgid "Fluid Ounce (US)" msgstr "" -#: erpnext/selling/page/point_of_sale/pos_item_selector.js:308 +#: erpnext/selling/page/point_of_sale/pos_item_selector.js:335 msgid "Focus on Item Group filter" msgstr "التركيز على عامل تصفية مجموعة العناصر" -#: erpnext/selling/page/point_of_sale/pos_item_selector.js:299 +#: erpnext/selling/page/point_of_sale/pos_item_selector.js:326 msgid "Focus on search input" msgstr "ركز على إدخال البحث" @@ -21091,7 +21128,7 @@ msgstr "للشراء" msgid "For Company" msgstr "للشركة" -#: erpnext/stock/doctype/material_request/material_request.js:394 +#: erpnext/stock/doctype/material_request/material_request.js:395 msgid "For Default Supplier (Optional)" msgstr "للمورد الافتراضي (اختياري)" @@ -21110,7 +21147,7 @@ msgid "For Job Card" msgstr "" #. Label of the for_operation (Link) field in DocType 'Job Card' -#: erpnext/manufacturing/doctype/job_card/job_card.js:430 +#: erpnext/manufacturing/doctype/job_card/job_card.js:450 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "For Operation" msgstr "" @@ -21141,7 +21178,7 @@ msgstr "للكمية (الكمية المصنعة) إلزامية\\n
    \\nFor Q msgid "For Raw Materials" msgstr "" -#: erpnext/controllers/accounts_controller.py:1359 +#: erpnext/controllers/accounts_controller.py:1360 msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}" msgstr "" @@ -21157,10 +21194,10 @@ msgstr "للمورد" #. Label of the warehouse (Link) field in DocType 'Material Request Plan Item' #. Label of the for_warehouse (Link) field in DocType 'Production Plan' #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:458 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:466 #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/selling/doctype/sales_order/sales_order.js:997 -#: erpnext/stock/doctype/material_request/material_request.js:343 +#: erpnext/stock/doctype/material_request/material_request.js:344 #: erpnext/templates/form_grid/material_request_grid.html:36 msgid "For Warehouse" msgstr "لمستودع" @@ -21199,7 +21236,7 @@ msgstr "كم تنفق = 1 نقطة الولاء" msgid "For individual supplier" msgstr "عن مورد فردي" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:308 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:330 msgid "For item {0}, only {1} asset have been created or linked to {2}. Please create or link {3} more asset with the respective document." msgstr "" @@ -21224,7 +21261,7 @@ msgstr "" msgid "For reference" msgstr "للرجوع إليها" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1497 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1498 #: erpnext/public/js/controllers/accounts.js:182 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -21246,7 +21283,7 @@ msgstr "" msgid "For the item {0}, the quantity should be {1} according to the BOM {2}." msgstr "" -#: erpnext/public/js/controllers/transaction.js:1142 +#: erpnext/public/js/controllers/transaction.js:1145 msgctxt "Clear payment terms template and/or payment schedule when due date is changed" msgid "For the new {0} to take effect, would you like to clear the current {1}?" msgstr "" @@ -21466,8 +21503,8 @@ msgstr "من العملاء" #: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json #: erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json #: erpnext/accounts/doctype/loyalty_program/loyalty_program.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:861 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:868 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:862 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:869 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -21538,7 +21575,7 @@ msgstr "من العملاء" #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:17 #: erpnext/selling/report/sales_analytics/sales_analytics.js:51 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:17 -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:21 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:29 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:21 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js:21 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:21 @@ -21554,6 +21591,7 @@ msgstr "من العملاء" #: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:20 #: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:30 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:8 +#: erpnext/stock/report/landed_cost_report/landed_cost_report.js:16 #: erpnext/stock/report/reserved_stock/reserved_stock.js:16 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:16 #: erpnext/stock/report/stock_analytics/stock_analytics.js:62 @@ -22263,10 +22301,10 @@ msgstr "الحصول على مواقع البند" #. Label of the get_items (Button) field in DocType 'Stock Entry' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:408 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:469 -#: erpnext/stock/doctype/material_request/material_request.js:355 -#: erpnext/stock/doctype/pick_list/pick_list.js:194 -#: erpnext/stock/doctype/pick_list/pick_list.js:237 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:477 +#: erpnext/stock/doctype/material_request/material_request.js:356 +#: erpnext/stock/doctype/pick_list/pick_list.js:211 +#: erpnext/stock/doctype/pick_list/pick_list.js:254 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:178 msgid "Get Items" @@ -22279,8 +22317,8 @@ msgstr "احصل على البنود" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:299 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:330 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1073 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:609 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:629 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:612 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:632 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:366 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:388 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:433 @@ -22291,14 +22329,14 @@ msgstr "احصل على البنود" #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js:119 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js:142 #: erpnext/manufacturing/doctype/production_plan/production_plan.json -#: erpnext/public/js/controllers/buying.js:295 +#: erpnext/public/js/controllers/buying.js:296 #: erpnext/selling/doctype/quotation/quotation.js:167 #: erpnext/selling/doctype/sales_order/sales_order.js:174 #: erpnext/selling/doctype/sales_order/sales_order.js:798 #: erpnext/stock/doctype/delivery_note/delivery_note.js:187 #: erpnext/stock/doctype/delivery_note/delivery_note.js:236 -#: erpnext/stock/doctype/material_request/material_request.js:125 -#: erpnext/stock/doctype/material_request/material_request.js:220 +#: erpnext/stock/doctype/material_request/material_request.js:126 +#: erpnext/stock/doctype/material_request/material_request.js:221 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:156 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:270 #: erpnext/stock/doctype/stock_entry/stock_entry.js:319 @@ -22326,7 +22364,7 @@ msgstr "" msgid "Get Items for Purchase Only" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:328 +#: erpnext/stock/doctype/material_request/material_request.js:329 #: erpnext/stock/doctype/stock_entry/stock_entry.js:659 #: erpnext/stock/doctype/stock_entry/stock_entry.js:672 msgid "Get Items from BOM" @@ -22342,7 +22380,7 @@ msgstr "الحصول على عناصر من طلبات المواد ضد هذا msgid "Get Items from Open Material Requests" msgstr "الحصول على عناصر من طلبات فتح المواد" -#: erpnext/public/js/controllers/buying.js:543 +#: erpnext/public/js/controllers/buying.js:544 msgid "Get Items from Product Bundle" msgstr "الحصول على أصناف من حزمة المنتج" @@ -22405,7 +22443,7 @@ msgstr "" msgid "Get Started Sections" msgstr "تبدأ الأقسام" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:539 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:547 msgid "Get Stock" msgstr "" @@ -22689,7 +22727,7 @@ msgstr "المجموع الكلي (العملات شركة)" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:874 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:875 msgid "Greater Than Amount" msgstr "أكبر من المبلغ" @@ -23159,7 +23197,7 @@ msgstr "" msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}" msgstr "" -#: erpnext/stock/stock_ledger.py:1885 +#: erpnext/stock/stock_ledger.py:1896 msgid "Here are the options to proceed:" msgstr "" @@ -23244,7 +23282,7 @@ msgstr "الرقم الأعلى له أولوية أكبر" msgid "History In Company" msgstr "الحركة التاريخيه في الشركة" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:376 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:379 #: erpnext/selling/doctype/sales_order/sales_order.js:617 msgid "Hold" msgstr "معلق" @@ -23569,7 +23607,7 @@ 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." +msgid "If enabled then system won't override the picked qty / batches / serial numbers / warehouse." msgstr "" #. Description of the 'Send Document Print' (Check) field in DocType 'Request @@ -23687,7 +23725,7 @@ msgstr "إذا كان أكثر من حزمة واحدة من نفس النوع ( msgid "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template." msgstr "" -#: erpnext/stock/stock_ledger.py:1895 +#: erpnext/stock/stock_ledger.py:1906 msgid "If not, you can Cancel / Submit this entry" msgstr "" @@ -23703,7 +23741,7 @@ msgstr "" msgid "If subcontracted to a vendor" msgstr "إذا الباطن للبائع" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1075 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1080 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected." msgstr "" @@ -23712,11 +23750,11 @@ msgstr "" msgid "If the account is frozen, entries are allowed to restricted users." msgstr "إذا الحساب مجمد، يسمح بالدخول إلى المستخدمين المحددين." -#: erpnext/stock/stock_ledger.py:1888 +#: erpnext/stock/stock_ledger.py:1899 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}." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1094 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1099 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed." msgstr "" @@ -23754,7 +23792,7 @@ msgstr "إذا كان هذا غير محدد ، فسيتم حفظ إدخالات msgid "If this is unchecked, direct GL entries will be created to book deferred revenue or expense" msgstr "إذا لم يتم تحديد ذلك ، فسيتم إنشاء إدخالات دفتر الأستاذ العام المباشرة لحجز الإيرادات أو المصاريف المؤجلة" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:744 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:740 msgid "If this is undesirable please cancel the corresponding Payment Entry." msgstr "" @@ -23847,7 +23885,7 @@ msgstr "تجاهل" msgid "Ignore Account Closing Balance" msgstr "" -#: erpnext/stock/report/stock_balance/stock_balance.js:106 +#: erpnext/stock/report/stock_balance/stock_balance.js:125 msgid "Ignore Closing Balance" msgstr "" @@ -24271,7 +24309,7 @@ msgstr "في تَقَدم" #: erpnext/stock/report/available_serial_no/available_serial_no.py:112 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:82 -#: erpnext/stock/report/stock_balance/stock_balance.py:473 +#: erpnext/stock/report/stock_balance/stock_balance.py:471 #: erpnext/stock/report/stock_ledger/stock_ledger.py:236 msgid "In Qty" msgstr "كمية قادمة" @@ -24295,15 +24333,15 @@ msgstr "في سوق الأسهم الكمية" msgid "In Transit" msgstr "في مرحلة انتقالية" -#: erpnext/stock/doctype/material_request/material_request.js:478 +#: erpnext/stock/doctype/material_request/material_request.js:479 msgid "In Transit Transfer" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:447 +#: erpnext/stock/doctype/material_request/material_request.js:448 msgid "In Transit Warehouse" msgstr "" -#: erpnext/stock/report/stock_balance/stock_balance.py:479 +#: erpnext/stock/report/stock_balance/stock_balance.py:477 msgid "In Value" msgstr "القيمة القادمة" @@ -24491,7 +24529,7 @@ msgid "Include Default FB Assets" msgstr "" #: erpnext/accounts/report/balance_sheet/balance_sheet.js:29 -#: erpnext/accounts/report/cash_flow/cash_flow.js:19 +#: erpnext/accounts/report/cash_flow/cash_flow.js:20 #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/general_ledger/general_ledger.js:186 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:30 @@ -24596,13 +24634,13 @@ msgstr "تضمين العناصر من الباطن" msgid "Include Timesheets in Draft Status" msgstr "" -#: erpnext/stock/report/stock_balance/stock_balance.js:90 -#: erpnext/stock/report/stock_ledger/stock_ledger.js:90 +#: erpnext/stock/report/stock_balance/stock_balance.js:109 +#: erpnext/stock/report/stock_ledger/stock_ledger.js:109 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:51 msgid "Include UOM" msgstr "تضمين UOM" -#: erpnext/stock/report/stock_balance/stock_balance.js:112 +#: erpnext/stock/report/stock_balance/stock_balance.js:131 msgid "Include Zero Stock Items" msgstr "" @@ -24730,15 +24768,15 @@ msgstr "" msgid "Incorrect Date" msgstr "تاريخ غير صحيح" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:124 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:135 msgid "Incorrect Invoice" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:358 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:354 msgid "Incorrect Payment Type" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:97 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:108 msgid "Incorrect Reference Document (Purchase Receipt Item)" msgstr "" @@ -24866,7 +24904,7 @@ msgstr "دخل غير مباشرة" msgid "Individual" msgstr "فرد" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:303 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:300 msgid "Individual GL Entry cannot be cancelled." msgstr "" @@ -24981,7 +25019,7 @@ msgstr "ملاحظة التثبيت" msgid "Installation Note Item" msgstr "ملاحظة تثبيت الإغلاق" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:623 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:624 msgid "Installation Note {0} has already been submitted" msgstr "مذكرة التسليم {0} ارسلت\\n
    \\nInstallation Note {0} has already been submitted" @@ -25030,8 +25068,8 @@ msgstr "تعليمات" msgid "Insufficient Capacity" msgstr "" -#: erpnext/controllers/accounts_controller.py:3708 -#: erpnext/controllers/accounts_controller.py:3732 +#: erpnext/controllers/accounts_controller.py:3629 +#: erpnext/controllers/accounts_controller.py:3653 msgid "Insufficient Permissions" msgstr "أذونات غير كافية" @@ -25039,12 +25077,12 @@ msgstr "أذونات غير كافية" #: erpnext/stock/doctype/pick_list/pick_list.py:132 #: erpnext/stock/doctype/pick_list/pick_list.py:1003 #: erpnext/stock/doctype/stock_entry/stock_entry.py:788 -#: erpnext/stock/serial_batch_bundle.py:1077 erpnext/stock/stock_ledger.py:1582 -#: erpnext/stock/stock_ledger.py:2057 +#: erpnext/stock/serial_batch_bundle.py:1078 erpnext/stock/stock_ledger.py:1582 +#: erpnext/stock/stock_ledger.py:2068 msgid "Insufficient Stock" msgstr "المالية غير كافية" -#: erpnext/stock/stock_ledger.py:2072 +#: erpnext/stock/stock_ledger.py:2083 msgid "Insufficient Stock for Batch" msgstr "" @@ -25158,7 +25196,7 @@ msgstr "إعدادات نقل المستودعات الداخلية" msgid "Interest" msgstr "فائدة" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3058 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3052 msgid "Interest and/or dunning fee" msgstr "" @@ -25182,11 +25220,11 @@ msgstr "" msgid "Internal Customer for company {0} already exists" msgstr "" -#: erpnext/controllers/accounts_controller.py:730 +#: erpnext/controllers/accounts_controller.py:731 msgid "Internal Sale or Delivery Reference missing." msgstr "" -#: erpnext/controllers/accounts_controller.py:732 +#: erpnext/controllers/accounts_controller.py:733 msgid "Internal Sales Reference Missing" msgstr "" @@ -25217,7 +25255,7 @@ msgstr "" msgid "Internal Transfer" msgstr "نقل داخلي" -#: erpnext/controllers/accounts_controller.py:741 +#: erpnext/controllers/accounts_controller.py:742 msgid "Internal Transfer Reference Missing" msgstr "" @@ -25254,18 +25292,18 @@ msgstr "مقدمة" msgid "Invalid" msgstr "غير صالحة" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:369 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:370 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:378 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:961 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:971 #: erpnext/assets/doctype/asset_category/asset_category.py:69 #: erpnext/assets/doctype/asset_category/asset_category.py:97 -#: erpnext/controllers/accounts_controller.py:3093 -#: erpnext/controllers/accounts_controller.py:3101 +#: erpnext/controllers/accounts_controller.py:3014 +#: erpnext/controllers/accounts_controller.py:3022 msgid "Invalid Account" msgstr "حساب غير صالح" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:398 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:394 #: erpnext/accounts/doctype/payment_request/payment_request.py:861 msgid "Invalid Allocated Amount" msgstr "" @@ -25278,7 +25316,7 @@ msgstr "" msgid "Invalid Attribute" msgstr "خاصية غير صالحة" -#: erpnext/controllers/accounts_controller.py:552 +#: erpnext/controllers/accounts_controller.py:553 msgid "Invalid Auto Repeat Date" msgstr "" @@ -25286,7 +25324,7 @@ msgstr "" msgid "Invalid Barcode. There is no Item attached to this barcode." msgstr "الباركود غير صالح. لا يوجد عنصر مرفق بهذا الرمز الشريطي." -#: erpnext/public/js/controllers/transaction.js:2687 +#: erpnext/public/js/controllers/transaction.js:2690 msgid "Invalid Blanket Order for the selected Customer and Item" msgstr "طلب فارغ غير صالح للعميل والعنصر المحدد" @@ -25300,7 +25338,7 @@ msgstr "شركة غير صالحة للمعاملات بين الشركات." #: erpnext/assets/doctype/asset/asset.py:292 #: erpnext/assets/doctype/asset/asset.py:299 -#: erpnext/controllers/accounts_controller.py:3116 +#: erpnext/controllers/accounts_controller.py:3037 msgid "Invalid Cost Center" msgstr "" @@ -25316,7 +25354,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:111 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:122 msgid "Invalid Document" msgstr "" @@ -25352,7 +25390,7 @@ msgid "Invalid Ledger Entries" msgstr "" #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77 -#: erpnext/accounts/general_ledger.py:776 +#: erpnext/accounts/general_ledger.py:778 msgid "Invalid Opening Entry" msgstr "إدخال فتح غير صالح" @@ -25360,11 +25398,11 @@ msgstr "إدخال فتح غير صالح" msgid "Invalid POS Invoices" msgstr "فواتير نقاط البيع غير صالحة" -#: erpnext/accounts/doctype/account/account.py:350 +#: erpnext/accounts/doctype/account/account.py:352 msgid "Invalid Parent Account" msgstr "حساب الوالد غير صالح" -#: erpnext/public/js/controllers/buying.js:372 +#: erpnext/public/js/controllers/buying.js:373 msgid "Invalid Part Number" msgstr "رقم الجزء غير صالح" @@ -25384,18 +25422,22 @@ msgstr "" msgid "Invalid Process Loss Configuration" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:705 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:701 msgid "Invalid Purchase Invoice" msgstr "" -#: erpnext/controllers/accounts_controller.py:3745 +#: erpnext/controllers/accounts_controller.py:3666 msgid "Invalid Qty" msgstr "" -#: erpnext/controllers/accounts_controller.py:1377 +#: erpnext/controllers/accounts_controller.py:1378 msgid "Invalid Quantity" msgstr "كمية غير صحيحة" +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:435 +msgid "Invalid Query" +msgstr "" + #: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:198 msgid "Invalid Return" msgstr "" @@ -25454,10 +25496,14 @@ msgstr "مرجع غير صالح {0} {1}" msgid "Invalid result key. Response:" msgstr "" -#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:110 -#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:120 -#: erpnext/accounts/general_ledger.py:819 -#: erpnext/accounts/general_ledger.py:829 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:435 +msgid "Invalid search query" +msgstr "" + +#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108 +#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118 +#: erpnext/accounts/general_ledger.py:821 +#: erpnext/accounts/general_ledger.py:831 msgid "Invalid value {0} for {1} against account {2}" msgstr "" @@ -26274,7 +26320,7 @@ msgstr "إصدار إشعار الائتمان" msgid "Issue Date" msgstr "تاريخ القضية" -#: erpnext/stock/doctype/material_request/material_request.js:162 +#: erpnext/stock/doctype/material_request/material_request.js:163 msgid "Issue Material" msgstr "قضية المواد" @@ -26320,7 +26366,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Material Request' #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/material_request/material_request_list.js:39 +#: erpnext/stock/doctype/material_request/material_request_list.js:43 msgid "Issued" msgstr "نشر" @@ -26348,11 +26394,11 @@ msgstr "تاريخ الإصدار" msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" -#: erpnext/public/js/controllers/transaction.js:2130 +#: erpnext/public/js/controllers/transaction.js:2133 msgid "It is needed to fetch Item Details." msgstr "هناك حاجة لجلب تفاصيل البند." -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:160 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:171 msgid "It's not possible to distribute charges equally when total amount is zero, please set 'Distribute Charges Based On' as 'Quantity'" msgstr "" @@ -26456,9 +26502,7 @@ msgstr "" #: erpnext/stock/report/stock_ageing/stock_ageing.js:46 #: erpnext/stock/report/stock_analytics/stock_analytics.js:15 #: erpnext/stock/report/stock_analytics/stock_analytics.py:29 -#: erpnext/stock/report/stock_balance/stock_balance.js:39 -#: erpnext/stock/report/stock_balance/stock_balance.py:400 -#: erpnext/stock/report/stock_ledger/stock_ledger.js:42 +#: erpnext/stock/report/stock_balance/stock_balance.py:398 #: erpnext/stock/report/stock_ledger/stock_ledger.py:206 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.js:27 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 @@ -26676,10 +26720,10 @@ msgstr "" #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:86 #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:119 #: erpnext/projects/doctype/timesheet/timesheet.js:213 -#: erpnext/public/js/controllers/transaction.js:2405 +#: erpnext/public/js/controllers/transaction.js:2408 #: erpnext/public/js/stock_reservation.js:112 -#: erpnext/public/js/stock_reservation.js:317 erpnext/public/js/utils.js:500 -#: erpnext/public/js/utils.js:656 +#: erpnext/public/js/stock_reservation.js:317 erpnext/public/js/utils.js:510 +#: erpnext/public/js/utils.js:666 #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json #: erpnext/selling/doctype/installation_note_item/installation_note_item.json #: erpnext/selling/doctype/quotation/quotation.js:281 @@ -26751,7 +26795,7 @@ msgstr "" msgid "Item Code cannot be changed for Serial No." msgstr "لا يمكن تغيير رمز السلعة للرقم التسلسلي" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:444 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:445 msgid "Item Code required at Row No {0}" msgstr "رمز العنصر المطلوب في الصف رقم {0}\\n
    \\nItem Code required at Row No {0}" @@ -26881,7 +26925,7 @@ msgstr "بيانات الصنف" #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/page/point_of_sale/pos_item_selector.js:161 +#: erpnext/selling/page/point_of_sale/pos_item_selector.js:188 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:30 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:35 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:54 @@ -26918,8 +26962,8 @@ msgstr "بيانات الصنف" #: erpnext/stock/report/stock_analytics/stock_analytics.js:8 #: erpnext/stock/report/stock_analytics/stock_analytics.py:38 #: erpnext/stock/report/stock_balance/stock_balance.js:32 -#: erpnext/stock/report/stock_balance/stock_balance.py:408 -#: erpnext/stock/report/stock_ledger/stock_ledger.js:53 +#: erpnext/stock/report/stock_balance/stock_balance.py:406 +#: erpnext/stock/report/stock_ledger/stock_ledger.js:72 #: erpnext/stock/report/stock_ledger/stock_ledger.py:264 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:39 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:113 @@ -27114,8 +27158,8 @@ msgstr "مادة المصنع" #: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:359 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:138 -#: erpnext/public/js/controllers/transaction.js:2411 -#: erpnext/public/js/utils.js:746 +#: erpnext/public/js/controllers/transaction.js:2414 +#: erpnext/public/js/utils.js:756 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:845 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -27153,7 +27197,7 @@ msgstr "مادة المصنع" #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:131 #: erpnext/stock/report/stock_ageing/stock_ageing.py:136 #: erpnext/stock/report/stock_analytics/stock_analytics.py:31 -#: erpnext/stock/report/stock_balance/stock_balance.py:406 +#: erpnext/stock/report/stock_balance/stock_balance.py:404 #: erpnext/stock/report/stock_ledger/stock_ledger.py:212 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:110 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 @@ -27242,7 +27286,7 @@ msgstr "" msgid "Item Reorder" msgstr "البند إعادة ترتيب" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:134 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:145 msgid "Item Row {0}: {1} {2} does not exist in above '{1}' table" msgstr "صنف الصف {0}: {1} {2} غير موجود في جدول '{1}' أعلاه" @@ -27467,7 +27511,7 @@ msgstr "" msgid "Item is removed since no serial / batch no selected." msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:130 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:141 msgid "Item must be added using 'Get Items from Purchase Receipts' button" msgstr "الصنف يجب اضافته مستخدما مفتاح \"احصل علي الأصناف من المشتريات المستلمة \"" @@ -27481,7 +27525,7 @@ msgstr "اسم السلعة" msgid "Item operation" msgstr "عملية الصنف" -#: erpnext/controllers/accounts_controller.py:3768 +#: erpnext/controllers/accounts_controller.py:3689 msgid "Item qty can not be updated as raw materials are already processed." msgstr "" @@ -27544,7 +27588,7 @@ msgstr "تمت إرجاع الصنف{0} من قبل" msgid "Item {0} has been disabled" msgstr "الصنف{0} تم تعطيله" -#: erpnext/selling/doctype/sales_order/sales_order.py:708 +#: erpnext/selling/doctype/sales_order/sales_order.py:709 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" @@ -27612,7 +27656,7 @@ msgstr "" msgid "Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item)." msgstr "البند {0} الكمية المطلوبة {1} لا يمكن أن تكون أقل من الحد الأدنى للطلب {2} (المحددة في البند)." -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:560 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:568 msgid "Item {0}: {1} qty produced. " msgstr "العنصر {0}: {1} الكمية المنتجة." @@ -27707,7 +27751,7 @@ msgstr "الصنف: {0} غير موجود في النظام" #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/public/js/utils.js:478 +#: erpnext/public/js/utils.js:488 #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/product_bundle/product_bundle.json #: erpnext/selling/doctype/quotation/quotation.json @@ -27722,6 +27766,8 @@ msgstr "الصنف: {0} غير موجود في النظام" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json +#: erpnext/stock/report/stock_balance/stock_balance.js:39 +#: erpnext/stock/report/stock_ledger/stock_ledger.js:43 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json #: erpnext/templates/form_grid/item_grid.html:6 @@ -27760,7 +27806,7 @@ msgstr "اصناف يمكن طلبه" msgid "Items and Pricing" msgstr "السلع والتسعيرات" -#: erpnext/controllers/accounts_controller.py:3990 +#: erpnext/controllers/accounts_controller.py:3911 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}." msgstr "" @@ -27842,7 +27888,7 @@ msgstr "" #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/job_card/job_card.py:876 #: erpnext/manufacturing/doctype/operation/operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:365 +#: erpnext/manufacturing/doctype/work_order/work_order.js:370 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:29 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:86 @@ -27997,7 +28043,7 @@ msgstr "" msgid "Journal Entries" msgstr "" -#: erpnext/accounts/utils.py:1009 +#: erpnext/accounts/utils.py:1013 msgid "Journal Entries {0} are un-linked" msgstr "إدخالات قيد اليومية {0} غير مترابطة" @@ -28056,7 +28102,7 @@ msgstr "حساب قالب إدخال دفتر اليومية" msgid "Journal Entry Type" msgstr "نوع إدخال دفتر اليومية" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:640 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:624 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset." msgstr "" @@ -28065,11 +28111,11 @@ msgstr "" msgid "Journal Entry for Scrap" msgstr "قيد دفتر يومية للتخريد" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:347 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:331 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:790 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:774 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher" msgstr "قيد دفتر اليومية {0} ليس لديه حساب {1} أو قد تم مطابقته مسبقا مع إيصال أخرى" @@ -28234,11 +28280,20 @@ msgstr "" msgid "Label" msgstr "ملصق" +#. Label of the taxes (Table) field in DocType 'Landed Cost Voucher' +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json +msgid "Landed Cost" +msgstr "" + #. Label of the landed_cost_help (HTML) field in DocType 'Landed Cost Voucher' #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json msgid "Landed Cost Help" msgstr "هبطت التكلفة مساعدة" +#: erpnext/stock/report/landed_cost_report/landed_cost_report.py:18 +msgid "Landed Cost Id" +msgstr "" + #. Name of a DocType #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json msgid "Landed Cost Item" @@ -28249,11 +28304,21 @@ msgstr "هبوط تكلفة صنف" msgid "Landed Cost Purchase Receipt" msgstr "تكاليف المشتريات المستلمة" +#. Name of a report +#: erpnext/stock/report/landed_cost_report/landed_cost_report.json +msgid "Landed Cost Report" +msgstr "" + #. Name of a DocType #: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json msgid "Landed Cost Taxes and Charges" msgstr "الضرائب التكلفة هبطت والرسوم" +#. Name of a DocType +#: erpnext/stock/doctype/landed_cost_vendor_invoice/landed_cost_vendor_invoice.json +msgid "Landed Cost Vendor Invoice" +msgstr "" + #. Name of a DocType #. Label of a Link in the Stock Workspace #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:676 @@ -28317,7 +28382,7 @@ msgstr "تاريخ الاتصال الأخير" msgid "Last Completion Date" msgstr "تاريخ الانتهاء الأخير" -#: erpnext/accounts/doctype/account/account.py:621 +#: erpnext/accounts/doctype/account/account.py:623 msgid "Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying." msgstr "" @@ -28384,7 +28449,7 @@ msgstr "" msgid "Latest" msgstr "اخير" -#: erpnext/stock/report/stock_balance/stock_balance.py:519 +#: erpnext/stock/report/stock_balance/stock_balance.py:517 msgid "Latest Age" msgstr "مرحلة متأخرة" @@ -28579,7 +28644,7 @@ msgid "Leave blank to use the standard Delivery Note format" msgstr "اتركه فارغًا لاستخدام تنسيق "ملاحظة التسليم" القياسي" #: erpnext/accounts/doctype/journal_entry/journal_entry.js:63 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:406 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:407 #: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js:43 msgid "Ledger" msgstr "" @@ -28667,7 +28732,7 @@ msgstr "طول" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:879 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:880 msgid "Less Than Amount" msgstr "أقل من المبلغ" @@ -28838,7 +28903,7 @@ msgstr "" msgid "Link existing Quality Procedure." msgstr "ربط إجراءات الجودة الحالية." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:648 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:651 msgid "Link to Material Request" msgstr "رابط لطلب المواد" @@ -29493,7 +29558,7 @@ msgstr "المواد الرئيسية والاختيارية التي تم در #. Label of the make (Data) field in DocType 'Vehicle' #: erpnext/accounts/doctype/journal_entry/journal_entry.js:109 -#: erpnext/manufacturing/doctype/job_card/job_card.js:451 +#: erpnext/manufacturing/doctype/job_card/job_card.js:471 #: erpnext/setup/doctype/vehicle/vehicle.json msgid "Make" msgstr "سنة الصنع" @@ -29542,12 +29607,12 @@ msgstr "انشاء فاتورة المبيعات" msgid "Make Serial No / Batch from Work Order" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:54 +#: erpnext/manufacturing/doctype/job_card/job_card.js:74 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:282 msgid "Make Stock Entry" msgstr "جعل دخول الأسهم" -#: erpnext/manufacturing/doctype/job_card/job_card.js:325 +#: erpnext/manufacturing/doctype/job_card/job_card.js:345 msgid "Make Subcontracting PO" msgstr "" @@ -29622,7 +29687,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:261 #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:71 #: erpnext/public/js/controllers/accounts.js:249 -#: erpnext/public/js/controllers/transaction.js:2809 +#: erpnext/public/js/controllers/transaction.js:2812 #: erpnext/public/js/utils/party.js:321 #: erpnext/stock/doctype/delivery_note/delivery_note.js:164 #: erpnext/stock/doctype/delivery_note/delivery_note.js:203 @@ -29663,11 +29728,11 @@ msgstr "إلزامي لحساب الربح والخسارة" msgid "Mandatory Missing" msgstr "إلزامي مفقود" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:627 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628 msgid "Mandatory Purchase Order" msgstr "أمر شراء إلزامي" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:648 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649 msgid "Mandatory Purchase Receipt" msgstr "إيصال الشراء الإلزامي" @@ -29754,7 +29819,7 @@ msgstr "صناعة" msgid "Manufacture against Material Request" msgstr "تصنيع ضد طلب مواد" -#: erpnext/stock/doctype/material_request/material_request_list.js:43 +#: erpnext/stock/doctype/material_request/material_request_list.js:47 msgid "Manufactured" msgstr "المصنعة" @@ -29820,7 +29885,7 @@ msgstr "الصانع" msgid "Manufacturer Part Number" msgstr "رقم قطعة المُصَنِّع" -#: erpnext/public/js/controllers/buying.js:371 +#: erpnext/public/js/controllers/buying.js:372 msgid "Manufacturer Part Number {0} is invalid" msgstr "رقم جزء الشركة المصنعة {0} غير صالح" @@ -29939,7 +30004,7 @@ msgstr "" msgid "Mapping Subcontracting Order ..." msgstr "" -#: erpnext/public/js/utils.js:974 +#: erpnext/public/js/utils.js:984 msgid "Mapping {0} ..." msgstr "" @@ -30083,7 +30148,7 @@ msgstr "الرئيسية" msgid "Material" msgstr "مواد" -#: erpnext/manufacturing/doctype/work_order/work_order.js:748 +#: erpnext/manufacturing/doctype/work_order/work_order.js:753 msgid "Material Consumption" msgstr "اهلاك المواد" @@ -30121,7 +30186,7 @@ msgstr "صرف مواد" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:84 -#: erpnext/stock/doctype/material_request/material_request.js:170 +#: erpnext/stock/doctype/material_request/material_request.js:171 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Receipt" @@ -30158,7 +30223,7 @@ msgstr "أستلام مواد" #. Label of the material_request (Link) field in DocType 'Subcontracting Order #. Service Item' #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:588 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:591 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:347 #: erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json @@ -30167,8 +30232,8 @@ msgstr "أستلام مواد" #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:33 #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:184 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/manufacturing/doctype/job_card/job_card.js:113 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:147 +#: erpnext/manufacturing/doctype/job_card/job_card.js:133 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:155 #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json #: erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json @@ -30263,7 +30328,7 @@ msgstr "المادة طلب خطة البند" msgid "Material Request Type" msgstr "نوع طلب المواد" -#: erpnext/selling/doctype/sales_order/sales_order.py:1702 +#: erpnext/selling/doctype/sales_order/sales_order.py:1704 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "لم يتم إنشاء طلب المواد ، ككمية للمواد الخام المتاحة بالفعل." @@ -30317,11 +30382,11 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Pick List' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' -#: erpnext/manufacturing/doctype/job_card/job_card.js:127 +#: erpnext/manufacturing/doctype/job_card/job_card.js:147 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/setup/setup_wizard/operations/install_fixtures.py:90 #: erpnext/stock/doctype/item/item.json -#: erpnext/stock/doctype/material_request/material_request.js:148 +#: erpnext/stock/doctype/material_request/material_request.js:149 #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -30329,7 +30394,7 @@ msgstr "" msgid "Material Transfer" msgstr "نقل المواد" -#: erpnext/stock/doctype/material_request/material_request.js:154 +#: erpnext/stock/doctype/material_request/material_request.js:155 msgid "Material Transfer (In Transit)" msgstr "" @@ -30368,8 +30433,8 @@ msgstr "المواد المنقولة لغرض التصنيع" msgid "Material Transferred for Subcontract" msgstr "المواد المنقولة للعقود من الباطن" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:427 -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:264 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:430 +#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:268 msgid "Material to Supplier" msgstr "مواد للمورد" @@ -30441,8 +30506,8 @@ msgstr "أقصى درجة" msgid "Max discount allowed for item: {0} is {1}%" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:896 -#: erpnext/stock/doctype/pick_list/pick_list.js:177 +#: erpnext/manufacturing/doctype/work_order/work_order.js:901 +#: erpnext/stock/doctype/pick_list/pick_list.js:194 msgid "Max: {0}" msgstr "الحد الأقصى: {0}" @@ -30554,7 +30619,7 @@ msgstr "" msgid "Megawatt" msgstr "" -#: erpnext/stock/stock_ledger.py:1901 +#: erpnext/stock/stock_ledger.py:1912 msgid "Mention Valuation Rate in the Item master." msgstr "اذكر معدل التقييم في مدير السلعة." @@ -30603,7 +30668,7 @@ msgstr "" msgid "Merge Similar Account Heads" msgstr "" -#: erpnext/public/js/utils.js:1006 +#: erpnext/public/js/utils.js:1016 msgid "Merge taxes from multiple documents" msgstr "" @@ -30620,7 +30685,7 @@ msgstr "دمج مع الحالي" msgid "Merged" msgstr "" -#: erpnext/accounts/doctype/account/account.py:564 +#: erpnext/accounts/doctype/account/account.py:566 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency" msgstr "" @@ -30949,7 +31014,7 @@ msgstr "الدقائق" msgid "Miscellaneous Expenses" msgstr "نفقات متنوعة" -#: erpnext/controllers/buying_controller.py:623 +#: erpnext/controllers/buying_controller.py:635 msgid "Mismatch" msgstr "" @@ -30959,7 +31024,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:87 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:184 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:587 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:588 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2250 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2850 #: erpnext/assets/doctype/asset_category/asset_category.py:116 @@ -30975,7 +31040,7 @@ msgstr "" msgid "Missing Cost Center" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1217 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1213 msgid "Missing Default in Company" msgstr "" @@ -31123,7 +31188,7 @@ msgstr "طريقة الدفع" #: erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json #: erpnext/accounts/doctype/pos_closing_entry/closing_voucher_details.html:40 #: erpnext/accounts/doctype/pos_closing_entry_detail/pos_closing_entry_detail.json -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:232 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:233 #: erpnext/accounts/doctype/pos_opening_entry_detail/pos_opening_entry_detail.json #: erpnext/accounts/doctype/pos_payment_method/pos_payment_method.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -31487,7 +31552,7 @@ msgstr "متغيرات متعددة" msgid "Multiple Warehouse Accounts" msgstr "" -#: erpnext/controllers/accounts_controller.py:1227 +#: erpnext/controllers/accounts_controller.py:1228 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "يوجد سنوات مالية متعددة لنفس التاريخ {0}. الرجاء تحديد الشركة لهذه السنة المالية\\n
    \\nMultiple fiscal years exist for the date {0}. Please set company in Fiscal Year" @@ -31503,7 +31568,7 @@ msgstr "" #: erpnext/manufacturing/doctype/work_order/work_order.py:1154 #: erpnext/setup/doctype/uom/uom.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:232 -#: erpnext/utilities/transaction_base.py:560 +#: erpnext/utilities/transaction_base.py:563 msgid "Must be Whole Number" msgstr "يجب أن يكون عدد صحيح" @@ -31677,7 +31742,7 @@ msgstr "غاز طبيعي" msgid "Needs Analysis" msgstr "تحليل الاحتياجات" -#: erpnext/stock/serial_batch_bundle.py:1365 +#: erpnext/stock/serial_batch_bundle.py:1366 msgid "Negative Batch Quantity" msgstr "" @@ -31768,40 +31833,40 @@ msgstr "صافي المبلغ ( بعملة الشركة )" msgid "Net Asset value as on" msgstr "صافي قيمة الأصول كما في" -#: erpnext/accounts/report/cash_flow/cash_flow.py:156 +#: erpnext/accounts/report/cash_flow/cash_flow.py:171 msgid "Net Cash from Financing" msgstr "صافي النقد من التمويل" -#: erpnext/accounts/report/cash_flow/cash_flow.py:149 +#: erpnext/accounts/report/cash_flow/cash_flow.py:164 msgid "Net Cash from Investing" msgstr "صافي النقد من الاستثمار" -#: erpnext/accounts/report/cash_flow/cash_flow.py:137 +#: erpnext/accounts/report/cash_flow/cash_flow.py:152 msgid "Net Cash from Operations" msgstr "صافي النقد من العمليات" -#: erpnext/accounts/report/cash_flow/cash_flow.py:142 +#: erpnext/accounts/report/cash_flow/cash_flow.py:157 msgid "Net Change in Accounts Payable" msgstr "صافي التغير في الحسابات الدائنة" -#: erpnext/accounts/report/cash_flow/cash_flow.py:141 +#: erpnext/accounts/report/cash_flow/cash_flow.py:156 msgid "Net Change in Accounts Receivable" msgstr "صافي التغير في الحسابات المدينة" -#: erpnext/accounts/report/cash_flow/cash_flow.py:123 +#: erpnext/accounts/report/cash_flow/cash_flow.py:128 #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:253 msgid "Net Change in Cash" msgstr "صافي التغير في النقد" -#: erpnext/accounts/report/cash_flow/cash_flow.py:158 +#: erpnext/accounts/report/cash_flow/cash_flow.py:173 msgid "Net Change in Equity" msgstr "صافي التغير في حقوق الملكية" -#: erpnext/accounts/report/cash_flow/cash_flow.py:151 +#: erpnext/accounts/report/cash_flow/cash_flow.py:166 msgid "Net Change in Fixed Asset" msgstr "صافي التغير في الأصول الثابتة" -#: erpnext/accounts/report/cash_flow/cash_flow.py:143 +#: erpnext/accounts/report/cash_flow/cash_flow.py:158 msgid "Net Change in Inventory" msgstr "صافي التغير في المخزون" @@ -31967,7 +32032,7 @@ msgstr "الوزن الصافي" msgid "Net Weight UOM" msgstr "الوزن الصافي لوحدة القياس" -#: erpnext/controllers/accounts_controller.py:1583 +#: erpnext/controllers/accounts_controller.py:1584 msgid "Net total calculation precision loss" msgstr "" @@ -32227,8 +32292,8 @@ msgstr "سيتم إرسال البريد الإلكترونية التالي ف #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:625 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:646 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/projects/doctype/project/project.json @@ -32258,7 +32323,7 @@ msgstr "" msgid "No Customer found for Inter Company Transactions which represents company {0}" msgstr "لم يتم العثور على زبون للمعاملات بين الشركات التي تمثل الشركة {0}" -#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:143 +#: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:144 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:404 msgid "No Customers found with selected options." msgstr "" @@ -32311,9 +32376,9 @@ msgstr "" msgid "No POS Profile found. Please create a New POS Profile first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1617 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1677 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1691 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1615 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1675 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1689 #: erpnext/stock/doctype/item/item.py:1363 msgid "No Permission" msgstr "لا يوجد تصريح" @@ -32327,7 +32392,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:333 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1049 msgid "No Remarks" msgstr "لا ملاحظات" @@ -32372,12 +32437,12 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:795 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:803 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:742 msgid "No accounting entries for the following warehouses" msgstr "لا القيود المحاسبية للمستودعات التالية" -#: erpnext/selling/doctype/sales_order/sales_order.py:714 +#: erpnext/selling/doctype/sales_order/sales_order.py:715 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "لم يتم العثور على BOM نشط للعنصر {0}. لا يمكن ضمان التسليم عن طريق الرقم التسلسلي" @@ -32409,7 +32474,7 @@ msgstr "لا توجد بيانات للتصدير" msgid "No description given" msgstr "لم يتم اعطاء وصف" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:219 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:217 msgid "No difference found for stock account {0}" msgstr "" @@ -32434,7 +32499,7 @@ msgstr "" msgid "No items are available in the sales order {0} for production" msgstr "" -#: erpnext/selling/page/point_of_sale/pos_item_selector.js:325 +#: erpnext/selling/page/point_of_sale/pos_item_selector.js:352 msgid "No items found. Scan barcode again." msgstr "لم يتم العثور على العناصر. امسح الباركود ضوئيًا مرة أخرى." @@ -32523,11 +32588,11 @@ msgstr "لم يتم العثور على فواتير معلقة" msgid "No outstanding invoices require exchange rate revaluation" msgstr "لا تتطلب الفواتير المستحقة إعادة تقييم سعر الصرف" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2498 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2492 msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified." msgstr "" -#: erpnext/public/js/controllers/buying.js:475 +#: erpnext/public/js/controllers/buying.js:476 msgid "No pending Material Requests found to link for the given items." msgstr "لم يتم العثور على طلبات المواد المعلقة للربط للعناصر المحددة." @@ -32685,7 +32750,7 @@ msgstr "ولا يتم توريدها" msgid "Not Initiated" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:810 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:812 #: erpnext/templates/pages/material_request_info.py:21 #: erpnext/templates/pages/order.py:37 erpnext/templates/pages/rfq.py:46 msgid "Not Permitted" @@ -32718,6 +32783,10 @@ msgstr "غير محدد" msgid "Not Started" msgstr "لم تبدأ" +#: erpnext/accounts/report/cash_flow/cash_flow.py:399 +msgid "Not able to find the earliest Fiscal Year for the given company." +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom_list.js:11 msgid "Not active" msgstr "غير نشطة" @@ -32738,7 +32807,7 @@ msgstr "غير مسموح بتحديث معاملات الأسهم الأقدم msgid "Not authorized since {0} exceeds limits" msgstr "" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:408 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:405 msgid "Not authorized to edit frozen Account {0}" msgstr "غير مصرح له بتحرير الحساب المجمد {0}\\n
    \\nNot authorized to edit frozen Account {0}" @@ -32750,12 +32819,12 @@ msgstr "" msgid "Not in stock" msgstr "ليس في الأسهم" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:724 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:725 #: erpnext/manufacturing/doctype/work_order/work_order.py:1883 #: erpnext/manufacturing/doctype/work_order/work_order.py:2041 #: erpnext/manufacturing/doctype/work_order/work_order.py:2110 -#: erpnext/selling/doctype/sales_order/sales_order.py:824 -#: erpnext/selling/doctype/sales_order/sales_order.py:1683 +#: erpnext/selling/doctype/sales_order/sales_order.py:826 +#: erpnext/selling/doctype/sales_order/sales_order.py:1685 msgid "Not permitted" msgstr "غير مسموح به" @@ -32768,7 +32837,7 @@ msgstr "غير مسموح به" #: erpnext/manufacturing/doctype/production_plan/production_plan.py:1040 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:1750 #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/controllers/buying.js:476 +#: erpnext/public/js/controllers/buying.js:477 #: erpnext/selling/doctype/customer/customer.py:129 #: erpnext/selling/doctype/sales_order/sales_order.js:1180 #: erpnext/stock/doctype/item/item.js:526 @@ -32802,7 +32871,7 @@ msgstr "" msgid "Note: Item {0} added multiple times" msgstr "ملاحظة: تمت إضافة العنصر {0} عدة مرات" -#: erpnext/controllers/accounts_controller.py:638 +#: erpnext/controllers/accounts_controller.py:639 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified" msgstr "ملاحظة : لن يتم إنشاء تدوين المدفوعات نظرا لأن \" حساب النقد او المصرف\" لم يتم تحديده" @@ -32814,7 +32883,7 @@ msgstr "ملاحظة: مركز التكلفة هذا هو مجموعة. لا ي msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1094 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1078 msgid "Note: {0}" msgstr "ملاحظة : {0}" @@ -33167,7 +33236,7 @@ msgstr "" msgid "On enabling this cancellation entries will be posted on the actual cancellation date and reports will consider cancelled entries as well" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:713 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:721 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 "" @@ -33187,7 +33256,7 @@ msgstr "الشيكات الصحفية على الجهاز" msgid "Once set, this invoice will be on hold till the set date" msgstr "بمجرد تعيينها ، ستكون هذه الفاتورة قيد الانتظار حتى التاريخ المحدد" -#: erpnext/manufacturing/doctype/work_order/work_order.js:679 +#: erpnext/manufacturing/doctype/work_order/work_order.js:684 msgid "Once the Work Order is Closed. It can't be resumed." msgstr "" @@ -33282,7 +33351,7 @@ msgid "Only values between [0,1) are allowed. Like {0.00, 0.04, 0.09, ...}\n" "Ex: If allowance is set at 0.07, accounts that have balance of 0.07 in either of the currencies will be considered as zero balance account" msgstr "" -#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py:44 +#: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py:43 msgid "Only {0} are supported" msgstr "" @@ -33509,7 +33578,7 @@ msgstr "تاريخ الفتح" msgid "Opening Entry" msgstr "فتح مدخل" -#: erpnext/accounts/general_ledger.py:775 +#: erpnext/accounts/general_ledger.py:777 msgid "Opening Entry can not be created after Period Closing Voucher is created." msgstr "" @@ -33536,7 +33605,7 @@ msgstr "أداة إنشاء فاتورة بند افتتاحية" msgid "Opening Invoice Item" msgstr "فتح الفاتورة البند" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1625 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1626 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1837 msgid "Opening Invoice has rounding adjustment of {0}.

    '{1}' account is required to post these values. Please set it in Company: {2}.

    Or, '{3}' can be enabled to not post any rounding adjustment." msgstr "" @@ -33563,7 +33632,7 @@ msgid "Opening Purchase Invoices have been created." msgstr "" #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:81 -#: erpnext/stock/report/stock_balance/stock_balance.py:459 +#: erpnext/stock/report/stock_balance/stock_balance.py:457 msgid "Opening Qty" msgstr "الكمية الافتتاحية" @@ -33583,7 +33652,7 @@ msgstr "مخزون أول المدة" msgid "Opening Time" msgstr "يفتح من الساعة" -#: erpnext/stock/report/stock_balance/stock_balance.py:466 +#: erpnext/stock/report/stock_balance/stock_balance.py:464 msgid "Opening Value" msgstr "القيمة الافتتاحية" @@ -33733,7 +33802,7 @@ msgstr "اكتمال عملية لكيفية العديد من السلع تام msgid "Operation time does not depend on quantity to produce" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:493 +#: erpnext/manufacturing/doctype/job_card/job_card.js:513 msgid "Operation {0} added multiple times in the work order {1}" msgstr "تمت إضافة العملية {0} عدة مرات في أمر العمل {1}" @@ -33820,7 +33889,7 @@ msgstr "" #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json #: erpnext/crm/doctype/crm_settings/crm_settings.json -#: erpnext/crm/doctype/lead/lead.js:32 erpnext/crm/doctype/lead/lead.json +#: erpnext/crm/doctype/lead/lead.js:33 erpnext/crm/doctype/lead/lead.json #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.js:20 #: erpnext/crm/doctype/prospect_opportunity/prospect_opportunity.json @@ -34037,7 +34106,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/quotation/quotation_list.js:34 #: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/material_request/material_request_list.js:35 +#: erpnext/stock/doctype/material_request/material_request_list.js:39 msgid "Ordered" msgstr "تم طلبه" @@ -34062,7 +34131,7 @@ msgstr "تم طلبه" msgid "Ordered Qty" msgstr "أمرت الكمية" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:166 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:174 msgid "Ordered Qty: Quantity ordered for purchase, but not received." msgstr "" @@ -34074,7 +34143,7 @@ msgstr "الكمية التي تم طلبها" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:809 +#: erpnext/selling/doctype/sales_order/sales_order.py:811 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "أوامر" @@ -34199,12 +34268,12 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:119 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:83 -#: erpnext/stock/report/stock_balance/stock_balance.py:481 +#: erpnext/stock/report/stock_balance/stock_balance.py:479 #: erpnext/stock/report/stock_ledger/stock_ledger.py:243 msgid "Out Qty" msgstr "كمية خارجة" -#: erpnext/stock/report/stock_balance/stock_balance.py:487 +#: erpnext/stock/report/stock_balance/stock_balance.py:485 msgid "Out Value" msgstr "القيمة الخارجه" @@ -34293,10 +34362,10 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:871 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:288 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:289 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:180 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -34317,7 +34386,7 @@ msgstr "القيمة القائمة" msgid "Outstanding Cheques and Deposits to clear" msgstr "الشيكات و الإيداعات المعلقة لتوضيح او للمقاصة" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:383 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:380 msgid "Outstanding for {0} cannot be less than zero ({1})" msgstr "غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )" @@ -34341,7 +34410,7 @@ msgstr "نحو الخارج" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1252 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1260 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34382,7 +34451,7 @@ msgstr "" msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role." msgstr "" -#: erpnext/controllers/accounts_controller.py:2099 +#: erpnext/controllers/accounts_controller.py:2100 msgid "Overbilling of {} ignored because you have {} role." msgstr "" @@ -34846,7 +34915,7 @@ msgstr "قائمة بمحتويات الشحنة" msgid "Packing Slip Item" msgstr "مادة كشف التعبئة" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:639 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:640 msgid "Packing Slip(s) cancelled" msgstr "تم إلغاء قائمة الشحنة" @@ -34922,7 +34991,7 @@ msgstr "مدفوع" #: erpnext/accounts/doctype/overdue_payment/overdue_payment.json #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_schedule/payment_schedule.json -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:299 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:171 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -34963,7 +35032,7 @@ msgstr "" msgid "Paid Amount After Tax (Company Currency)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2011 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2005 msgid "Paid Amount cannot be greater than total negative outstanding amount {0}" msgstr "المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ القائم السالب {0}" @@ -34977,7 +35046,7 @@ msgstr "" msgid "Paid To Account Type" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:323 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:324 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1095 msgid "Paid amount + Write Off Amount can not be greater than Grand Total" msgstr "المبلغ المدفوع + المبلغ المشطوب لا يمكن ان يكون أكبر من المجموع الكلي\\n
    \\nPaid amount + Write Off Amount can not be greater than Grand Total" @@ -35207,7 +35276,7 @@ msgstr "" msgid "Partial Payment in POS Transactions are not allowed." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1654 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1652 msgid "Partial Stock Reservation" msgstr "" @@ -35271,8 +35340,9 @@ msgstr "مدفوعاً جزئياً" #. Option for the 'Status' (Select) field in DocType 'Material Request' #. Option for the 'Status' (Select) field in DocType 'Subcontracting Order' #: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/material_request/material_request_list.js:22 -#: erpnext/stock/doctype/material_request/material_request_list.js:31 +#: erpnext/stock/doctype/material_request/material_request_list.js:16 +#: erpnext/stock/doctype/material_request/material_request_list.js:26 +#: erpnext/stock/doctype/material_request/material_request_list.js:35 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json msgid "Partially Received" msgstr "تلقى جزئيا" @@ -35291,7 +35361,7 @@ msgstr "" msgid "Partially Reserved" msgstr "" -#: erpnext/stock/doctype/material_request/material_request_list.js:24 +#: erpnext/stock/doctype/material_request/material_request_list.js:28 msgid "Partially ordered" msgstr "طلبت جزئيا" @@ -35448,7 +35518,7 @@ msgstr "عملة حساب الطرف" msgid "Party Account No. (Bank Statement)" msgstr "" -#: erpnext/controllers/accounts_controller.py:2398 +#: erpnext/controllers/accounts_controller.py:2374 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same" msgstr "" @@ -35592,7 +35662,7 @@ msgstr "نوع الطرف والحزب إلزامي لحساب {0}" msgid "Party Type and Party is required for Receivable / Payable account {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:518 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:514 #: erpnext/accounts/party.py:428 msgid "Party Type is mandatory" msgstr "حقل نوع المستفيد إلزامي\\n
    \\nParty Type is mandatory" @@ -35602,11 +35672,11 @@ msgstr "حقل نوع المستفيد إلزامي\\n
    \\nParty Type is manda msgid "Party User" msgstr "مستخدم الحزب" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:455 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:456 msgid "Party can only be one of {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:521 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:517 msgid "Party is mandatory" msgstr "حقل المستفيد إلزامي\\n
    \\nParty is mandatory" @@ -35658,7 +35728,7 @@ msgstr "مسار" msgid "Pause" msgstr "وقفة" -#: erpnext/manufacturing/doctype/job_card/job_card.js:196 +#: erpnext/manufacturing/doctype/job_card/job_card.js:216 msgid "Pause Job" msgstr "" @@ -35729,14 +35799,14 @@ msgstr "إعدادات الدافع" #: erpnext/accounts/doctype/dunning/dunning.js:51 #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10 #: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12 -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:71 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:72 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:123 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:88 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py:25 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:42 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:459 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:462 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:24 #: erpnext/selling/doctype/sales_order/sales_order.js:764 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:31 @@ -35813,7 +35883,7 @@ msgstr "تاريخ استحقاق السداد" msgid "Payment Entries" msgstr "ادخال دفعات" -#: erpnext/accounts/utils.py:1097 +#: erpnext/accounts/utils.py:1101 msgid "Payment Entries {0} are un-linked" msgstr "تدوين مدفوعات {0} غير مترابطة" @@ -35861,7 +35931,7 @@ msgstr "دفع الدخول المرجعي" msgid "Payment Entry already exists" msgstr "تدوين المدفوعات موجود بالفعل" -#: erpnext/accounts/utils.py:629 +#: erpnext/accounts/utils.py:608 msgid "Payment Entry has been modified after you pulled it. Please pull it again." msgstr "تم تعديل تدوين مدفوعات بعد سحبه. يرجى سحبه مرة أخرى." @@ -35870,7 +35940,7 @@ msgstr "تم تعديل تدوين مدفوعات بعد سحبه. يرجى سح msgid "Payment Entry is already created" msgstr "تدوين المدفوعات تم انشاؤه بالفعل" -#: erpnext/controllers/accounts_controller.py:1534 +#: erpnext/controllers/accounts_controller.py:1535 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice." msgstr "" @@ -35906,7 +35976,7 @@ msgstr "بوابة الدفع" msgid "Payment Gateway Account" msgstr "دفع حساب البوابة" -#: erpnext/accounts/utils.py:1341 +#: erpnext/accounts/utils.py:1345 msgid "Payment Gateway Account not created, please create one manually." msgstr "حساب بوابة الدفع لم يتم انشاءه، يرجى إنشاء واحد يدويا." @@ -36069,7 +36139,7 @@ msgstr "المراجع الدفع" #. Name of a DocType #. Label of a Link in the Receivables Workspace #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1671 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1672 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36078,7 +36148,7 @@ msgstr "المراجع الدفع" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:139 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:126 #: erpnext/accounts/workspace/receivables/receivables.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:467 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:470 #: erpnext/selling/doctype/sales_order/sales_order.js:757 msgid "Payment Request" msgstr "طلب الدفع من قبل المورد" @@ -36109,7 +36179,7 @@ msgstr "طلب الدفع ل {0}" msgid "Payment Request is already created" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:442 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:443 msgid "Payment Request took too long to respond. Please try requesting for payment again." msgstr "" @@ -36131,6 +36201,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/buying/doctype/purchase_order/purchase_order.json +#: erpnext/controllers/accounts_controller.py:2637 #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json msgid "Payment Schedule" @@ -36249,7 +36320,7 @@ msgstr "شروط الدفع:" msgid "Payment Type" msgstr "نوع الدفع" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:607 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:603 msgid "Payment Type must be one of Receive, Pay and Internal Transfer" msgstr "نوع الدفع يجب أن يكون إما استلام , دفع أو مناقلة داخلية\\n
    \\nPayment Type must be one of Receive, Pay and Internal Transfer" @@ -36258,11 +36329,11 @@ msgstr "نوع الدفع يجب أن يكون إما استلام , دفع أو msgid "Payment URL" msgstr "" -#: erpnext/accounts/utils.py:1085 +#: erpnext/accounts/utils.py:1089 msgid "Payment Unlink Error" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:962 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:946 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}" msgstr "الدفعة مقابل {0} {1} لا يمكن أن تكون أكبر من المبلغ القائم {2}" @@ -36274,7 +36345,7 @@ msgstr "لا يمكن أن يكون مبلغ الدفعة أقل من أو يس msgid "Payment methods are mandatory. Please add at least one payment method." msgstr "طرق الدفع إلزامية. الرجاء إضافة طريقة دفع واحدة على الأقل." -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:454 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:455 #: erpnext/selling/page/point_of_sale/pos_payment.js:366 msgid "Payment of {0} received successfully." msgstr "" @@ -36287,11 +36358,11 @@ msgstr "" msgid "Payment related to {0} is not completed" msgstr "الدفع المتعلق بـ {0} لم يكتمل" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:431 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:432 msgid "Payment request failed" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:821 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:817 msgid "Payment term {0} not used in {1}" msgstr "" @@ -36311,7 +36382,7 @@ msgstr "" #. Option for the 'Hold Type' (Select) field in DocType 'Supplier' #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:274 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:275 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -36327,11 +36398,11 @@ msgstr "" msgid "Payments" msgstr "المدفوعات" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:330 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:331 msgid "Payments could not be updated." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:324 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:325 msgid "Payments updated." msgstr "" @@ -36405,7 +36476,7 @@ msgstr "" #: erpnext/manufacturing/report/production_analytics/production_analytics.py:126 #: erpnext/manufacturing/report/work_order_summary/work_order_summary.py:150 #: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/material_request/material_request_list.js:16 +#: erpnext/stock/doctype/material_request/material_request_list.js:20 #: erpnext/templates/pages/order.html:68 msgid "Pending" msgstr "معلق" @@ -36583,7 +36654,7 @@ msgstr "فترة" msgid "Period Based On" msgstr "الفترة على أساس" -#: erpnext/accounts/general_ledger.py:787 +#: erpnext/accounts/general_ledger.py:789 msgid "Period Closed" msgstr "" @@ -36692,7 +36763,7 @@ msgstr "" msgid "Periodic Accounting Entry" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:245 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:243 msgid "Periodic Accounting Entry is not allowed for company {0} with perpetual inventory enabled" msgstr "" @@ -36806,7 +36877,7 @@ msgstr "رقم الهاتف" #. Label of a Link in the Stock Workspace #: erpnext/selling/doctype/sales_order/sales_order.js:637 #: erpnext/stock/doctype/delivery_note/delivery_note.js:199 -#: erpnext/stock/doctype/material_request/material_request.js:139 +#: erpnext/stock/doctype/material_request/material_request.js:140 #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json @@ -37051,7 +37122,7 @@ msgstr "المخطط تكاليف التشغيل" msgid "Planned Qty" msgstr "المخطط الكمية" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:166 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:174 msgid "Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured." msgstr "" @@ -37142,7 +37213,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "يرجى تعيين مجموعة الموردين في إعدادات الشراء." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1842 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1843 msgid "Please Specify Account" msgstr "" @@ -37198,16 +37269,16 @@ msgstr "" msgid "Please cancel and amend the Payment Entry" msgstr "" -#: erpnext/accounts/utils.py:1084 +#: erpnext/accounts/utils.py:1088 msgid "Please cancel payment entry manually first" msgstr "" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:304 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:301 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:344 msgid "Please cancel related transaction." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1036 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1020 msgid "Please check Multi Currency option to allow accounts with other currency" msgstr "يرجى اختيار الخيار عملات متعددة للسماح بحسابات مع عملة أخرى" @@ -37256,7 +37327,7 @@ msgstr "" msgid "Please contact your administrator to extend the credit limits for {0}." msgstr "" -#: erpnext/accounts/doctype/account/account.py:347 +#: erpnext/accounts/doctype/account/account.py:349 msgid "Please convert the parent account in corresponding child company to a group account." msgstr "الرجاء تحويل الحساب الرئيسي في الشركة الفرعية المقابلة إلى حساب مجموعة." @@ -37264,7 +37335,7 @@ msgstr "الرجاء تحويل الحساب الرئيسي في الشركة ا msgid "Please create Customer from Lead {0}." msgstr "الرجاء إنشاء عميل من العميل المحتمل {0}." -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:121 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:132 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled." msgstr "" @@ -37272,7 +37343,7 @@ msgstr "" msgid "Please create a new Accounting Dimension if required." msgstr "" -#: erpnext/controllers/accounts_controller.py:731 +#: erpnext/controllers/accounts_controller.py:732 msgid "Please create purchase from internal sale or delivery document itself" msgstr "" @@ -37326,11 +37397,11 @@ msgstr "" msgid "Please enable {} in {} to allow same item in multiple rows" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:366 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:367 msgid "Please ensure that the {0} account is a Balance Sheet account. You can change the parent account to a Balance Sheet account or select a different account." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:374 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375 msgid "Please ensure that the {0} account {1} is a Payable account. You can change the account type to Payable or select a different account." msgstr "" @@ -37376,11 +37447,11 @@ msgstr "الرجاء إدخال حساب النفقات\\n
    \\nPlease enter Ex msgid "Please enter Item Code to get Batch Number" msgstr "الرجاء إدخال رمز العنصر للحصول على رقم الدفعة\\n
    \\nPlease enter Item Code to get Batch Number" -#: erpnext/public/js/controllers/transaction.js:2559 +#: erpnext/public/js/controllers/transaction.js:2562 msgid "Please enter Item Code to get batch no" msgstr "الرجاء إدخال كود البند للحصول على رقم الدفعة" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:76 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:84 msgid "Please enter Item first" msgstr "الرجاء إدخال البند أولا" @@ -37404,11 +37475,11 @@ msgstr "الرجاء إدخال بند الإنتاج أولا" msgid "Please enter Purchase Receipt first" msgstr "الرجاء إدخال إيصال الشراء أولا\\n
    \\nPlease enter Purchase Receipt first" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:102 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:113 msgid "Please enter Receipt Document" msgstr "الرجاء إدخال مستند الاستلام\\n
    \\nPlease enter Receipt Document" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1100 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1084 msgid "Please enter Reference date" msgstr "الرجاء إدخال تاريخ المرجع\\n
    \\nPlease enter Reference date" @@ -37428,7 +37499,7 @@ msgstr "" msgid "Please enter Warehouse and Date" msgstr "الرجاء إدخال المستودع والتاريخ" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:652 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:653 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1184 msgid "Please enter Write Off Account" msgstr "الرجاء إدخال حساب الشطب" @@ -37441,7 +37512,7 @@ msgstr "الرجاء إدخال الشركة أولا\\n
    \\nPlease enter comp msgid "Please enter company name first" msgstr "الرجاء إدخال اسم الشركة اولاً" -#: erpnext/controllers/accounts_controller.py:2884 +#: erpnext/controllers/accounts_controller.py:2863 msgid "Please enter default currency in Company Master" msgstr "الرجاء إدخال العملة الافتراضية في شركة الرئيسية" @@ -37449,7 +37520,7 @@ msgstr "الرجاء إدخال العملة الافتراضية في شركة msgid "Please enter message before sending" msgstr "الرجاء إدخال الرسالة قبل الإرسال" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:419 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:420 msgid "Please enter mobile number first." msgstr "" @@ -37477,7 +37548,7 @@ msgstr "الرجاء إدخال اسم الشركة للتأكيد" msgid "Please enter the phone number first" msgstr "الرجاء إدخال رقم الهاتف أولاً" -#: erpnext/controllers/buying_controller.py:1090 +#: erpnext/controllers/buying_controller.py:1102 msgid "Please enter the {schedule_date}." msgstr "" @@ -37533,8 +37604,8 @@ msgstr "يرجى التأكد من أنك تريد حقا حذف جميع الم msgid "Please mention 'Weight UOM' along with Weight." msgstr "" -#: erpnext/accounts/general_ledger.py:624 -#: erpnext/accounts/general_ledger.py:631 +#: erpnext/accounts/general_ledger.py:626 +#: erpnext/accounts/general_ledger.py:633 msgid "Please mention '{0}' in Company: {1}" msgstr "" @@ -37576,7 +37647,7 @@ msgstr "يرجى تحديد نوع القالب لتنزيل القالب msgid "Please select Apply Discount On" msgstr "الرجاء اختيار (تطبيق تخفيض على)" -#: erpnext/selling/doctype/sales_order/sales_order.py:1648 +#: erpnext/selling/doctype/sales_order/sales_order.py:1650 msgid "Please select BOM against item {0}" msgstr "الرجاء اختيار بوم ضد العنصر {0}" @@ -37584,7 +37655,7 @@ msgstr "الرجاء اختيار بوم ضد العنصر {0}" msgid "Please select BOM for Item in Row {0}" msgstr "الرجاء تحديد قائمة المواد للبند في الصف {0}" -#: erpnext/controllers/buying_controller.py:550 +#: erpnext/controllers/buying_controller.py:562 msgid "Please select BOM in BOM field for Item {item_code}." msgstr "يرجى تحديد قائمة المواد في الحقل (قائمة المواد) للبند {item_code}." @@ -37596,13 +37667,13 @@ msgstr "" msgid "Please select Category first" msgstr "الرجاء تحديد التصنيف أولا\\n
    \\nPlease select Category first" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1449 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1450 #: erpnext/public/js/controllers/accounts.js:86 #: erpnext/public/js/controllers/accounts.js:124 msgid "Please select Charge Type first" msgstr "يرجى تحديد نوع الرسوم أولا" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:454 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:455 msgid "Please select Company" msgstr "الرجاء اختيار شركة \\n
    \\nPlease select Company" @@ -37611,7 +37682,7 @@ msgstr "الرجاء اختيار شركة \\n
    \\nPlease select Company" msgid "Please select Company and Posting Date to getting entries" msgstr "يرجى تحديد الشركة وتاريخ النشر للحصول على إدخالات" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:696 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:697 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "الرجاء تحديد الشركة أولا\\n
    \\nPlease select Company first" @@ -37650,15 +37721,15 @@ msgstr "يرجى تحديد حالة الصيانة على أنها اكتملت msgid "Please select Party Type first" msgstr "يرجى تحديد نوع الطرف أولا" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:251 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:249 msgid "Please select Periodic Accounting Entry Difference Account" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:497 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:498 msgid "Please select Posting Date before selecting Party" msgstr "الرجاء تجديد تاريخ النشر قبل تحديد المستفيد\\n
    \\nPlease select Posting Date before selecting Party" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:697 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:698 msgid "Please select Posting Date first" msgstr "الرجاء تحديد تاريخ النشر أولا\\n
    \\nPlease select Posting Date first" @@ -37666,7 +37737,7 @@ msgstr "الرجاء تحديد تاريخ النشر أولا\\n
    \\nPlease s msgid "Please select Price List" msgstr "الرجاء اختيار قائمة الأسعار\\n
    \\nPlease select Price List" -#: erpnext/selling/doctype/sales_order/sales_order.py:1650 +#: erpnext/selling/doctype/sales_order/sales_order.py:1652 msgid "Please select Qty against item {0}" msgstr "الرجاء اختيار الكمية ضد العنصر {0}" @@ -37682,7 +37753,7 @@ msgstr "" msgid "Please select Start Date and End Date for Item {0}" msgstr "الرجاء تحديد تاريخ البدء وتاريخ الانتهاء للبند {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:270 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:268 msgid "Please select Stock Asset Account" msgstr "" @@ -37690,7 +37761,7 @@ msgstr "" msgid "Please select Subcontracting Order instead of Purchase Order {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:2733 +#: erpnext/controllers/accounts_controller.py:2712 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}" msgstr "" @@ -37707,7 +37778,7 @@ msgstr "الرجاء اختيار الشركة" #: erpnext/manufacturing/doctype/bom/bom.js:603 #: erpnext/manufacturing/doctype/bom/bom.py:261 #: erpnext/public/js/controllers/accounts.js:249 -#: erpnext/public/js/controllers/transaction.js:2809 +#: erpnext/public/js/controllers/transaction.js:2812 msgid "Please select a Company first." msgstr "الرجاء تحديد شركة أولاً." @@ -37788,7 +37859,11 @@ msgstr "" msgid "Please select atleast one item to continue" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1751 +#: erpnext/manufacturing/doctype/work_order/work_order.js:355 +msgid "Please select atleast one operation to create Job Card" +msgstr "" + +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1749 msgid "Please select correct account" msgstr "يرجى اختيارالحساب الصحيح" @@ -37855,11 +37930,11 @@ msgstr "" msgid "Please select weekly off day" msgstr "الرجاء اختيار يوم العطلة الاسبوعي" -#: erpnext/public/js/utils.js:1026 +#: erpnext/public/js/utils.js:1036 msgid "Please select {0}" msgstr "الرجاء اختيار {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1194 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1195 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:592 #: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py:93 msgid "Please select {0} first" @@ -37877,7 +37952,7 @@ msgstr "يرجى تحديد \"مركز تكلفة اهلاك الأصول\" لل msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}" msgstr "يرجى تحديد \"احساب لربح / الخسارة عند التخلص من الأصول\" للشركة {0}" -#: erpnext/accounts/general_ledger.py:530 +#: erpnext/accounts/general_ledger.py:532 msgid "Please set '{0}' in Company: {1}" msgstr "" @@ -37933,7 +38008,7 @@ msgstr "" msgid "Please set Fixed Asset Account in Asset Category {0}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:584 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:585 msgid "Please set Fixed Asset Account in {} against {}." msgstr "" @@ -37971,7 +38046,7 @@ msgstr "الرجاء تعيين شركة" msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1404 +#: erpnext/selling/doctype/sales_order/sales_order.py:1406 msgid "Please set a Supplier against the Items to be considered in the Purchase Order." msgstr "يرجى تعيين مورد مقابل العناصر التي يجب مراعاتها في أمر الشراء." @@ -37983,7 +38058,7 @@ msgstr "" msgid "Please set a default Holiday List for Employee {0} or Company {1}" msgstr "يرجى تعيين قائمة العطل الافتراضية للموظف {0} أو الشركة {1}\\n
    \\nPlease set a default Holiday List for Employee {0} or Company {1}" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1094 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1095 msgid "Please set account in Warehouse {0}" msgstr "يرجى تعيين الحساب في مستودع {0}" @@ -38024,7 +38099,7 @@ msgstr "الرجاء تعيين حساب نقدي أو مصرفي افتراضي msgid "Please set default Cash or Bank account in Mode of Payments {}" msgstr "الرجاء تعيين حساب نقدي أو مصرفي افتراضي في طريقة الدفع {}" -#: erpnext/accounts/utils.py:2245 +#: erpnext/accounts/utils.py:2312 msgid "Please set default Exchange Gain/Loss Account in Company {}" msgstr "" @@ -38040,8 +38115,8 @@ msgstr "يرجى تعيين الافتراضي UOM في إعدادات الأس msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:276 -#: erpnext/accounts/utils.py:1106 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:274 +#: erpnext/accounts/utils.py:1110 msgid "Please set default {0} in Company {1}" msgstr "يرجى تعيين {0} الافتراضي للشركة {1}" @@ -38053,7 +38128,7 @@ msgstr "يرجى ضبط الفلتر على أساس البند أو المخز msgid "Please set filters" msgstr "يرجى تعيين المرشحات" -#: erpnext/controllers/accounts_controller.py:2314 +#: erpnext/controllers/accounts_controller.py:2290 msgid "Please set one of the following:" msgstr "" @@ -38061,7 +38136,7 @@ msgstr "" msgid "Please set opening number of booked depreciations" msgstr "" -#: erpnext/public/js/controllers/transaction.js:2260 +#: erpnext/public/js/controllers/transaction.js:2263 msgid "Please set recurring after saving" msgstr "يرجى تحديد (تكرار) بعد الحفظ" @@ -38073,7 +38148,7 @@ msgstr "يرجى ضبط عنوان العميل" msgid "Please set the Default Cost Center in {0} company." msgstr "يرجى تعيين مركز التكلفة الافتراضي في الشركة {0}." -#: erpnext/manufacturing/doctype/work_order/work_order.js:600 +#: erpnext/manufacturing/doctype/work_order/work_order.js:605 msgid "Please set the Item Code first" msgstr "يرجى تعيين رمز العنصر أولا" @@ -38116,11 +38191,11 @@ msgstr "يرجى ضبط {0} للعنوان {1}" msgid "Please set {0} in BOM Creator {1}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1214 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1210 msgid "Please set {0} in Company {1} to account for Exchange Gain / Loss" msgstr "" -#: erpnext/controllers/accounts_controller.py:520 +#: erpnext/controllers/accounts_controller.py:521 msgid "Please set {0} to {1}, the same account that was used in the original invoice {2}." msgstr "" @@ -38132,7 +38207,7 @@ msgstr "" msgid "Please share this email with your support team so that they can find and fix the issue." msgstr "" -#: erpnext/public/js/controllers/transaction.js:2128 +#: erpnext/public/js/controllers/transaction.js:2131 msgid "Please specify" msgstr "رجاء حدد" @@ -38140,14 +38215,14 @@ msgstr "رجاء حدد" msgid "Please specify Company" msgstr "يرجى تحديد شركة" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:109 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:110 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:438 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:494 msgid "Please specify Company to proceed" msgstr "الرجاء تحديد الشركة للمضى قدما\\n
    \\nPlease specify Company to proceed" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1472 -#: erpnext/controllers/accounts_controller.py:3075 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1473 +#: erpnext/controllers/accounts_controller.py:2996 #: erpnext/public/js/controllers/accounts.js:97 msgid "Please specify a valid Row ID for row {0} in table {1}" msgstr "يرجى تحديد هوية الصف صالحة لصف {0} في الجدول {1}" @@ -38325,7 +38400,7 @@ msgstr "نفقات بريدية" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:858 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:859 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38363,7 +38438,7 @@ msgstr "نفقات بريدية" #: erpnext/manufacturing/report/job_card_summary/job_card_summary.py:134 #: erpnext/public/js/purchase_trends_filters.js:38 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:25 -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:45 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:51 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:45 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py:66 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:85 @@ -38399,7 +38474,7 @@ msgstr "" msgid "Posting Date cannot be future date" msgstr "لا يمكن أن يكون تاريخ النشر تاريخا مستقبلا\\n
    \\nPosting Date cannot be future date" -#: erpnext/public/js/controllers/transaction.js:895 +#: erpnext/public/js/controllers/transaction.js:898 msgid "Posting Date will change to today's date as Edit Posting Date and Time is unchecked. Are you sure want to proceed?" msgstr "" @@ -39409,7 +39484,7 @@ msgstr "" msgid "Process Loss Qty" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:273 +#: erpnext/manufacturing/doctype/job_card/job_card.js:293 msgid "Process Loss Quantity" msgstr "" @@ -39544,8 +39619,8 @@ msgstr "المنتج" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/workspace/buying/buying.json -#: erpnext/public/js/controllers/buying.js:293 -#: erpnext/public/js/controllers/buying.js:547 +#: erpnext/public/js/controllers/buying.js:294 +#: erpnext/public/js/controllers/buying.js:548 #: erpnext/selling/doctype/product_bundle/product_bundle.json #: erpnext/selling/workspace/selling/selling.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -39716,7 +39791,7 @@ msgid "Production Plan Sub-assembly Item" msgstr "" #. Name of a report -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:101 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:109 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.json msgid "Production Plan Summary" msgstr "" @@ -39944,7 +40019,7 @@ msgstr "" #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json #: erpnext/stock/report/reserved_stock/reserved_stock.js:130 #: erpnext/stock/report/reserved_stock/reserved_stock.py:184 -#: erpnext/stock/report/stock_ledger/stock_ledger.js:84 +#: erpnext/stock/report/stock_ledger/stock_ledger.js:103 #: erpnext/stock/report/stock_ledger/stock_ledger.py:350 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json @@ -40104,7 +40179,7 @@ msgstr "الكمية المتوقعة" msgid "Projected Quantity" msgstr "الكمية المتوقعة" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:166 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:174 msgid "Projected Quantity Formula" msgstr "" @@ -40209,7 +40284,7 @@ msgstr "بنسبة كذا" #. Name of a DocType #. Label of a Link in the CRM Workspace -#: erpnext/crm/doctype/lead/lead.js:35 erpnext/crm/doctype/lead/lead.js:61 +#: erpnext/crm/doctype/lead/lead.js:36 erpnext/crm/doctype/lead/lead.js:62 #: erpnext/crm/doctype/prospect/prospect.json #: erpnext/crm/workspace/crm/crm.json msgid "Prospect" @@ -40406,7 +40481,7 @@ msgstr "تفاصيل شراء" #: erpnext/accounts/workspace/payables/payables.json #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:450 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:453 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 #: erpnext/buying/workspace/buying/buying.json @@ -40458,7 +40533,7 @@ msgstr "لا يمكن إجراء فاتورة الشراء مقابل أصل م msgid "Purchase Invoice {0} is already submitted" msgstr "فاتورة الشراء {0} تم ترحيلها من قبل" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2010 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2011 msgid "Purchase Invoices" msgstr "فواتير الشراء" @@ -40525,7 +40600,7 @@ msgstr "المدير الرئيسي للمشتريات" #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js:48 #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:203 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/buying_controller.py:822 +#: erpnext/controllers/buying_controller.py:834 #: erpnext/crm/doctype/contract/contract.json #: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:54 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json @@ -40534,7 +40609,7 @@ msgstr "المدير الرئيسي للمشتريات" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json -#: erpnext/stock/doctype/material_request/material_request.js:178 +#: erpnext/stock/doctype/material_request/material_request.js:179 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:246 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -40611,11 +40686,11 @@ msgstr "لم يتم استلام طلبات الشراء في الوقت الم msgid "Purchase Order Pricing Rule" msgstr "قاعدة تسعير أمر الشراء" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:623 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624 msgid "Purchase Order Required" msgstr "أمر الشراء مطلوب" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:618 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:619 msgid "Purchase Order Required for item {}" msgstr "طلب الشراء مطلوب للعنصر {}" @@ -40635,11 +40710,11 @@ msgstr "تم إنشاء أمر الشراء بالفعل لجميع بنود أ msgid "Purchase Order number required for Item {0}" msgstr "عدد طلب الشراء مطلوب للبند\\n
    \\nPurchase Order number required for Item {0}" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:661 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:662 msgid "Purchase Order {0} is not submitted" msgstr "طلب الشراء {0} يجب أن يعتمد\\n
    \\nPurchase Order {0} is not submitted" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:905 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 msgid "Purchase Orders" msgstr "طلبات الشراء" @@ -40664,7 +40739,7 @@ msgstr "أوامر الشراء إلى الفاتورة" msgid "Purchase Orders to Receive" msgstr "أوامر الشراء لتلقي" -#: erpnext/controllers/accounts_controller.py:1931 +#: erpnext/controllers/accounts_controller.py:1932 msgid "Purchase Orders {0} are un-linked" msgstr "" @@ -40697,7 +40772,7 @@ msgstr "قائمة أسعار الشراء" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.js:22 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:21 #: erpnext/assets/doctype/asset/asset.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:417 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:420 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json @@ -40752,11 +40827,11 @@ msgstr "شراء قطع الإيصال" msgid "Purchase Receipt No" msgstr "لا شراء استلام" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:644 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645 msgid "Purchase Receipt Required" msgstr "إيصال استلام المشتريات مطلوب" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:639 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:640 msgid "Purchase Receipt Required for item {}" msgstr "إيصال الشراء مطلوب للعنصر {}" @@ -40777,7 +40852,7 @@ msgstr "لا يحتوي إيصال الشراء على أي عنصر تم تمك msgid "Purchase Receipt {0} created." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:668 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669 msgid "Purchase Receipt {0} is not submitted" msgstr "إيصال استلام المشتريات {0} لم يتم تقديمه" @@ -40872,6 +40947,14 @@ msgstr "عضو الشراء" msgid "Purchase Value" msgstr "" +#: erpnext/stock/report/landed_cost_report/landed_cost_report.py:35 +msgid "Purchase Voucher No" +msgstr "" + +#: erpnext/stock/report/landed_cost_report/landed_cost_report.py:29 +msgid "Purchase Voucher Type" +msgstr "" + #: erpnext/utilities/activation.py:105 msgid "Purchase orders help you plan and follow up on your purchases" msgstr "طلبات الشراء تساعدك على تخطيط ومتابعة عمليات الشراء الخاصة بك" @@ -40999,7 +41082,7 @@ msgstr "" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:372 #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:470 #: erpnext/public/js/stock_reservation.js:134 -#: erpnext/public/js/stock_reservation.js:335 erpnext/public/js/utils.js:783 +#: erpnext/public/js/stock_reservation.js:335 erpnext/public/js/utils.js:793 #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:367 #: erpnext/selling/doctype/sales_order/sales_order.js:471 @@ -41146,7 +41229,7 @@ msgstr "الكمية حسب السهم لوحدة قياس السهم" msgid "Qty for which recursion isn't applicable." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:894 +#: erpnext/manufacturing/doctype/work_order/work_order.js:899 msgid "Qty for {0}" msgstr "الكمية ل {0}" @@ -41165,7 +41248,7 @@ msgid "Qty in WIP Warehouse" msgstr "" #. Label of the for_qty (Float) field in DocType 'Pick List' -#: erpnext/stock/doctype/pick_list/pick_list.js:175 +#: erpnext/stock/doctype/pick_list/pick_list.js:192 #: erpnext/stock/doctype/pick_list/pick_list.json msgid "Qty of Finished Goods Item" msgstr "الكمية من السلع تامة الصنع" @@ -41203,7 +41286,7 @@ msgstr "الكمية للتسليم" msgid "Qty to Fetch" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:245 +#: erpnext/manufacturing/doctype/job_card/job_card.js:265 #: erpnext/manufacturing/doctype/job_card/job_card.py:765 msgid "Qty to Manufacture" msgstr "الكمية للتصنيع" @@ -41542,7 +41625,7 @@ msgstr "هدف مراجعة الجودة" #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:194 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:218 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json -#: erpnext/public/js/controllers/buying.js:554 +#: erpnext/public/js/controllers/buying.js:555 #: erpnext/public/js/stock_analytics.js:50 #: erpnext/public/js/utils/serial_no_batch_selector.js:485 #: erpnext/selling/doctype/quotation_item/quotation_item.json @@ -41553,7 +41636,7 @@ msgstr "هدف مراجعة الجودة" #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:67 #: erpnext/stock/dashboard/item_dashboard.js:248 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json -#: erpnext/stock/doctype/material_request/material_request.js:347 +#: erpnext/stock/doctype/material_request/material_request.js:348 #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/packing_slip_item/packing_slip_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -41668,8 +41751,8 @@ msgstr "" msgid "Quantity must be greater than zero, and less or equal to {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:939 -#: erpnext/stock/doctype/pick_list/pick_list.js:183 +#: erpnext/manufacturing/doctype/work_order/work_order.js:944 +#: erpnext/stock/doctype/pick_list/pick_list.js:200 msgid "Quantity must not be more than {0}" msgstr "الكمية يجب ألا تكون أكثر من {0}" @@ -41683,8 +41766,8 @@ msgid "Quantity required for Item {0} in row {1}" msgstr "الكمية مطلوبة للبند {0} في الصف {1}\\n
    \\nQuantity required for Item {0} in row {1}" #: erpnext/manufacturing/doctype/bom/bom.py:604 -#: erpnext/manufacturing/doctype/job_card/job_card.js:301 -#: erpnext/manufacturing/doctype/job_card/job_card.js:370 +#: erpnext/manufacturing/doctype/job_card/job_card.js:321 +#: erpnext/manufacturing/doctype/job_card/job_card.js:390 #: erpnext/manufacturing/doctype/workstation/workstation.js:303 msgid "Quantity should be greater than 0" msgstr "الكمية يجب أن تكون أبر من 0\\n
    \\nQuantity should be greater than 0" @@ -41778,7 +41861,7 @@ msgstr "خيارات الاستعلام" msgid "Query Route String" msgstr "سلسلة مسار الاستعلام" -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:146 +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:147 msgid "Queue Size should be between 5 and 100" msgstr "" @@ -41809,7 +41892,7 @@ msgstr "قائمة الانتظار" msgid "Quick Entry" msgstr "إدخال سريع" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:585 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:586 msgid "Quick Journal Entry" msgstr "قيد دفتر يومية سريع" @@ -41849,7 +41932,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20 #: erpnext/crm/doctype/contract/contract.json #: erpnext/crm/doctype/crm_settings/crm_settings.json -#: erpnext/crm/doctype/lead/lead.js:33 erpnext/crm/doctype/lead/lead.json +#: erpnext/crm/doctype/lead/lead.js:34 erpnext/crm/doctype/lead/lead.json #: erpnext/crm/doctype/opportunity/opportunity.js:108 #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/report/lead_details/lead_details.js:37 @@ -42045,7 +42128,7 @@ msgstr "نطاق" #: erpnext/manufacturing/doctype/bom_item/bom_item.json #: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json -#: erpnext/public/js/utils.js:793 +#: erpnext/public/js/utils.js:803 #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -42348,6 +42431,14 @@ msgstr "اسم المادة الخام" msgid "Raw Material Value" msgstr "" +#: erpnext/stock/report/landed_cost_report/landed_cost_report.js:36 +msgid "Raw Material Voucher No" +msgstr "" + +#: erpnext/stock/report/landed_cost_report/landed_cost_report.js:30 +msgid "Raw Material Voucher Type" +msgstr "" + #: erpnext/manufacturing/report/production_planning_report/production_planning_report.js:65 msgid "Raw Material Warehouse" msgstr "مستودع المواد الخام" @@ -42420,12 +42511,12 @@ msgstr "لا يمكن ترك المواد الخام فارغة." msgid "Raw SQL" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:407 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:113 -#: erpnext/manufacturing/doctype/work_order/work_order.js:698 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:410 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:121 +#: erpnext/manufacturing/doctype/work_order/work_order.js:703 #: erpnext/selling/doctype/sales_order/sales_order.js:596 #: erpnext/selling/doctype/sales_order/sales_order_list.js:70 -#: erpnext/stock/doctype/material_request/material_request.js:225 +#: erpnext/stock/doctype/material_request/material_request.js:226 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:164 msgid "Re-open" msgstr "اعادة فتح" @@ -42529,7 +42620,7 @@ msgstr "سبب لوضع في الانتظار" msgid "Reason for Failure" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:745 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:748 #: erpnext/selling/doctype/sales_order/sales_order.js:1338 msgid "Reason for Hold" msgstr "سبب الانتظار" @@ -42653,8 +42744,8 @@ msgstr "تسلم" #: erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:191 #: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/material_request/material_request_list.js:33 -#: erpnext/stock/doctype/material_request/material_request_list.js:41 +#: erpnext/stock/doctype/material_request/material_request_list.js:37 +#: erpnext/stock/doctype/material_request/material_request_list.js:45 msgid "Received" msgstr "تلقيت" @@ -42681,7 +42772,7 @@ msgstr "" msgid "Received Amount After Tax (Company Currency)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1050 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1046 msgid "Received Amount cannot be greater than Paid Amount" msgstr "" @@ -43077,7 +43168,6 @@ msgstr "تاريخ المرجع" #: erpnext/stock/doctype/pick_list_item/pick_list_item.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:27 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:18 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order_dashboard.py:7 #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json @@ -43088,7 +43178,7 @@ msgstr "تاريخ المرجع" msgid "Reference" msgstr "مرجع" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1098 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1082 msgid "Reference #{0} dated {1}" msgstr "المرجع # {0} بتاريخ {1}" @@ -43099,7 +43189,7 @@ msgstr "المرجع # {0} بتاريخ {1}" msgid "Reference Date" msgstr "المرجع تاريخ" -#: erpnext/public/js/controllers/transaction.js:2366 +#: erpnext/public/js/controllers/transaction.js:2369 msgid "Reference Date for Early Payment Discount" msgstr "" @@ -43114,7 +43204,7 @@ msgstr "" msgid "Reference Detail No" msgstr "تفاصيل المرجع رقم" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1671 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1672 msgid "Reference DocType" msgstr "مرجع DOCTYPE" @@ -43123,7 +43213,7 @@ msgstr "مرجع DOCTYPE" msgid "Reference Doctype" msgstr "مرجع Doctype" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:657 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:653 msgid "Reference Doctype must be one of {0}" msgstr "المستند المرجع يجب أن يكون واحد من {0}\\n
    \\nReference Doctype must be one of {0}" @@ -43203,7 +43293,7 @@ msgstr "" #. Supplied Item' #: erpnext/accounts/doctype/advance_tax/advance_tax.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1671 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1672 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -43226,15 +43316,15 @@ msgstr "اسم الإشارة" msgid "Reference No" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:712 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696 msgid "Reference No & Reference Date is required for {0}" msgstr "رقم المرجع وتاريخه مطلوبان ل {0}\\n
    \\nReference No & Reference Date is required for {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1295 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1291 msgid "Reference No and Reference Date is mandatory for Bank transaction" msgstr "رقم المرجع و تاريخ المرجع إلزامي للمعاملة المصرفية" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:717 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:701 msgid "Reference No is mandatory if you entered Reference Date" msgstr "رقم المرجع إلزامي اذا أدخلت تاريخ المرجع\\n
    \\nReference No is mandatory if you entered Reference Date" @@ -43352,15 +43442,15 @@ msgstr "المرجع: {0}، رمز العنصر: {1} والعميل: {2}" msgid "References" msgstr "المراجع" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:383 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:384 msgid "References to Sales Invoices are Incomplete" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:378 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:379 msgid "References to Sales Orders are Incomplete" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:737 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:733 msgid "References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount." msgstr "" @@ -43508,7 +43598,7 @@ msgstr "علاقة" msgid "Release Date" msgstr "تاريخ النشر" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:314 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:315 msgid "Release date must be in the future" msgstr "يجب أن يكون تاريخ الإصدار في المستقبل" @@ -43644,7 +43734,7 @@ msgstr "إعادة تسمية سمة السمة في سمة البند." msgid "Rename Log" msgstr "إعادة تسمية الدخول" -#: erpnext/accounts/doctype/account/account.py:519 +#: erpnext/accounts/doctype/account/account.py:521 msgid "Rename Not Allowed" msgstr "إعادة تسمية غير مسموح به" @@ -43661,7 +43751,7 @@ msgstr "" msgid "Rename jobs for doctype {0} have not been enqueued." msgstr "" -#: erpnext/accounts/doctype/account/account.py:511 +#: erpnext/accounts/doctype/account/account.py:513 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch." msgstr "يُسمح بإعادة تسميته فقط عبر الشركة الأم {0} ، لتجنب عدم التطابق." @@ -43810,7 +43900,7 @@ msgstr "مرشحات تقرير" msgid "Report Type" msgstr "نوع التقرير" -#: erpnext/accounts/doctype/account/account.py:425 +#: erpnext/accounts/doctype/account/account.py:427 msgid "Report Type is mandatory" msgstr "نوع التقرير إلزامي\\n
    \\nReport Type is mandatory" @@ -43902,7 +43992,7 @@ msgstr "" msgid "Repost in background" msgstr "" -#: erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.py:117 +#: erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.py:118 msgid "Repost started in the background" msgstr "" @@ -43976,7 +44066,7 @@ msgstr "" msgid "Reqd Qty (BOM)" msgstr "" -#: erpnext/public/js/utils.js:803 +#: erpnext/public/js/utils.js:813 msgid "Reqd by date" msgstr "مطلوب بالتاريخ" @@ -43994,7 +44084,7 @@ msgstr "طلب عرض أسعار" msgid "Request Parameters" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:445 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:446 msgid "Request Timeout" msgstr "" @@ -44024,7 +44114,7 @@ msgstr "طلب المعلومات" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:70 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:272 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/doctype/material_request/material_request.js:184 +#: erpnext/stock/doctype/material_request/material_request.js:185 msgid "Request for Quotation" msgstr "طلب للحصول على الاقتباس" @@ -44077,7 +44167,7 @@ msgstr "العناصر المطلوبة للطلب والاستلام" msgid "Requested Qty" msgstr "الكمية المطلبة" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:166 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:174 msgid "Requested Qty: Quantity requested for purchase, but not ordered." msgstr "" @@ -44233,9 +44323,9 @@ msgstr "" msgid "Reservation Based On" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:808 +#: erpnext/manufacturing/doctype/work_order/work_order.js:813 #: erpnext/selling/doctype/sales_order/sales_order.js:76 -#: erpnext/stock/doctype/pick_list/pick_list.js:127 +#: erpnext/stock/doctype/pick_list/pick_list.js:144 msgid "Reserve" msgstr "" @@ -44259,11 +44349,11 @@ msgstr "" msgid "Reserve Warehouse" msgstr "احتياطي مستودع" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:274 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:282 msgid "Reserve for Raw Materials" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:248 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:256 msgid "Reserve for Sub-assembly" msgstr "" @@ -44300,7 +44390,7 @@ msgstr "الكمية المحجوزة للانتاج" msgid "Reserved Qty for Production Plan" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:166 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:174 msgid "Reserved Qty for Production: Raw materials quantity to make manufacturing items." msgstr "" @@ -44309,7 +44399,7 @@ msgstr "" msgid "Reserved Qty for Subcontract" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:166 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:174 msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items." msgstr "" @@ -44317,7 +44407,7 @@ msgstr "" msgid "Reserved Qty should be greater than Delivered Qty." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:166 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:174 msgid "Reserved Qty: Quantity ordered for sale, but not delivered." msgstr "" @@ -44329,39 +44419,39 @@ msgstr "الكمية المحجوزة" msgid "Reserved Quantity for Production" msgstr "الكمية المحجوزة للإنتاج" -#: erpnext/stock/stock_ledger.py:2172 +#: erpnext/stock/stock_ledger.py:2183 msgid "Reserved Serial No." msgstr "" #. Label of the reserved_stock (Float) field in DocType 'Bin' #. Name of a report #: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:24 -#: erpnext/manufacturing/doctype/work_order/work_order.js:824 +#: erpnext/manufacturing/doctype/work_order/work_order.js:829 #: erpnext/public/js/stock_reservation.js:235 #: erpnext/selling/doctype/sales_order/sales_order.js:99 #: erpnext/selling/doctype/sales_order/sales_order.js:434 #: erpnext/stock/dashboard/item_dashboard_list.html:15 #: erpnext/stock/doctype/bin/bin.json -#: erpnext/stock/doctype/pick_list/pick_list.js:147 +#: erpnext/stock/doctype/pick_list/pick_list.js:164 #: erpnext/stock/report/reserved_stock/reserved_stock.json -#: erpnext/stock/report/stock_balance/stock_balance.py:499 -#: erpnext/stock/stock_ledger.py:2156 +#: erpnext/stock/report/stock_balance/stock_balance.py:497 +#: erpnext/stock/stock_ledger.py:2167 msgid "Reserved Stock" msgstr "" -#: erpnext/stock/stock_ledger.py:2202 +#: erpnext/stock/stock_ledger.py:2213 msgid "Reserved Stock for Batch" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:288 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:296 msgid "Reserved Stock for Raw Materials" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:262 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:270 msgid "Reserved Stock for Sub-assembly" msgstr "" -#: erpnext/controllers/buying_controller.py:559 +#: erpnext/controllers/buying_controller.py:571 msgid "Reserved Warehouse is mandatory for the Item {item_code} in Raw Materials supplied." msgstr "" @@ -44395,7 +44485,7 @@ msgstr "محجوزة للتعاقد من الباطن" #: erpnext/public/js/stock_reservation.js:202 #: erpnext/selling/doctype/sales_order/sales_order.js:387 -#: erpnext/stock/doctype/pick_list/pick_list.js:272 +#: erpnext/stock/doctype/pick_list/pick_list.js:289 msgid "Reserving Stock..." msgstr "" @@ -44608,13 +44698,13 @@ msgstr "النتيجة مجال التوجيه" msgid "Result Title Field" msgstr "النتيجة عنوان الحقل" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:382 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:385 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:63 #: erpnext/selling/doctype/sales_order/sales_order.js:582 msgid "Resume" msgstr "استئنف" -#: erpnext/manufacturing/doctype/job_card/job_card.js:180 +#: erpnext/manufacturing/doctype/job_card/job_card.js:200 msgid "Resume Job" msgstr "" @@ -44672,7 +44762,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Purchase Invoice' #. Option for the 'Status' (Select) field in DocType 'Sales Invoice' #. Option for the 'Status' (Select) field in DocType 'Subcontracting Receipt' -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:68 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:69 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -44753,8 +44843,8 @@ msgstr "" msgid "Return invoice of asset cancelled" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:132 -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:208 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:131 +#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:212 msgid "Return of Components" msgstr "" @@ -44975,7 +45065,7 @@ msgstr "نوع الجذر" msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity" msgstr "" -#: erpnext/accounts/doctype/account/account.py:422 +#: erpnext/accounts/doctype/account/account.py:424 msgid "Root Type is mandatory" msgstr "نوع الجذر إلزامي\\n
    \\nRoot Type is mandatory" @@ -45241,20 +45331,20 @@ msgstr "" msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1215 +#: erpnext/controllers/accounts_controller.py:1216 msgid "Row #{0}: Account {1} does not belong to company {2}" msgstr "الصف # {0}: الحساب {1} لا ينتمي إلى الشركة {2}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:395 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:391 msgid "Row #{0}: Allocated Amount cannot be greater than Outstanding Amount of Payment Request {1}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:371 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:476 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:367 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:472 msgid "Row #{0}: Allocated Amount cannot be greater than outstanding amount." msgstr "الصف # {0}: المبلغ المخصص لا يمكن أن يكون أكبر من المبلغ المستحق." -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:488 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:484 msgid "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}" msgstr "" @@ -45278,31 +45368,31 @@ msgstr "" msgid "Row #{0}: Batch No {1} is already selected." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:867 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:863 msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}" msgstr "" -#: erpnext/controllers/accounts_controller.py:3642 +#: erpnext/controllers/accounts_controller.py:3563 msgid "Row #{0}: Cannot delete item {1} which has already been billed." msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تحرير فاتورة به بالفعل." -#: erpnext/controllers/accounts_controller.py:3616 +#: erpnext/controllers/accounts_controller.py:3537 msgid "Row #{0}: Cannot delete item {1} which has already been delivered" msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تسليمه بالفعل" -#: erpnext/controllers/accounts_controller.py:3635 +#: erpnext/controllers/accounts_controller.py:3556 msgid "Row #{0}: Cannot delete item {1} which has already been received" msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم استلامه بالفعل" -#: erpnext/controllers/accounts_controller.py:3622 +#: erpnext/controllers/accounts_controller.py:3543 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it." msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تعيين ترتيب العمل إليه." -#: erpnext/controllers/accounts_controller.py:3628 +#: erpnext/controllers/accounts_controller.py:3549 msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order." msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تعيينه لأمر شراء العميل." -#: erpnext/controllers/accounts_controller.py:3883 +#: erpnext/controllers/accounts_controller.py:3804 msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}." msgstr "" @@ -45354,7 +45444,7 @@ msgstr "" msgid "Row #{0}: Depreciation Start Date is required" msgstr "الصف #{0}: تاريخ بداية الإهلاك مطلوب" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:332 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:328 msgid "Row #{0}: Duplicate entry in References {1} {2}" msgstr "الصف # {0}: إدخال مكرر في المراجع {1} {2}" @@ -45386,11 +45476,11 @@ msgstr "" msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:744 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:770 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:754 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited" msgstr "" @@ -45410,7 +45500,7 @@ msgstr "الصف # {0}: تمت إضافة العنصر" msgid "Row #{0}: Item {1} does not exist" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1558 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1556 msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List." msgstr "" @@ -45430,7 +45520,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a stock item" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:763 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:759 msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher" msgstr "الصف {1} : قيد اليومية {1} لا يحتوى على الحساب {2} أو بالفعل يوجد في قسيمة مقابلة أخرى\\n
    \\nRow #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher" @@ -45442,11 +45532,11 @@ msgstr "" msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:587 +#: erpnext/selling/doctype/sales_order/sales_order.py:588 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists" msgstr "الصف رقم {0}: غير مسموح تغيير المورد لأن أمر الشراء موجود مسبقاً\\n
    \\nRow #{0}: Not allowed to change Supplier as Purchase Order already exists" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1641 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1639 msgid "Row #{0}: Only {1} available to reserve for the Item {2}" msgstr "" @@ -45474,7 +45564,7 @@ msgstr "" msgid "Row #{0}: Please set reorder quantity" msgstr "الصف # {0}: يرجى تعيين إعادة ترتيب الكمية\\n
    \\nRow #{0}: Please set reorder quantity" -#: erpnext/controllers/accounts_controller.py:543 +#: erpnext/controllers/accounts_controller.py:544 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master" msgstr "" @@ -45503,27 +45593,27 @@ msgstr "" msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1374 -#: erpnext/controllers/accounts_controller.py:3742 +#: erpnext/controllers/accounts_controller.py:1375 +#: erpnext/controllers/accounts_controller.py:3663 msgid "Row #{0}: Quantity for Item {1} cannot be zero." msgstr "الصف # {0}: كمية البند {1} لا يمكن أن يكون صفرا" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1626 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1624 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0." msgstr "" -#: erpnext/controllers/accounts_controller.py:798 -#: erpnext/controllers/accounts_controller.py:810 +#: erpnext/controllers/accounts_controller.py:799 +#: erpnext/controllers/accounts_controller.py:811 #: erpnext/utilities/transaction_base.py:114 #: erpnext/utilities/transaction_base.py:120 msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1227 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "الصف {0} : نوع المستند المرجع يجب أن يكون واحدة من طلب شراء ,فاتورة شراء أو قيد يومبة\\n
    \\nRow #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1212 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1213 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "الصف # {0}: يجب أن يكون نوع المستند المرجعي أحد أوامر المبيعات أو فاتورة المبيعات أو إدخال دفتر اليومية أو المطالبة" @@ -45566,15 +45656,15 @@ msgstr "" msgid "Row #{0}: Serial No {1} is already selected." msgstr "" -#: erpnext/controllers/accounts_controller.py:571 +#: erpnext/controllers/accounts_controller.py:572 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date" msgstr "الصف # {0}: لا يمكن أن يكون تاريخ انتهاء الخدمة قبل تاريخ ترحيل الفاتورة" -#: erpnext/controllers/accounts_controller.py:565 +#: erpnext/controllers/accounts_controller.py:566 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date" msgstr "الصف # {0}: لا يمكن أن يكون تاريخ بدء الخدمة أكبر من تاريخ انتهاء الخدمة" -#: erpnext/controllers/accounts_controller.py:559 +#: erpnext/controllers/accounts_controller.py:560 msgid "Row #{0}: Service Start and End Date is required for deferred accounting" msgstr "الصف # {0}: مطلوب بداية وتاريخ انتهاء الخدمة للمحاسبة المؤجلة" @@ -45594,7 +45684,7 @@ msgstr "" msgid "Row #{0}: Status is mandatory" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:542 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:526 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}" msgstr "الصف # {0}: يجب أن تكون الحالة {1} بالنسبة لخصم الفاتورة {2}" @@ -45602,19 +45692,19 @@ msgstr "الصف # {0}: يجب أن تكون الحالة {1} بالنسبة ل msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1571 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1569 msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1584 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1582 msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1598 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1596 msgid "Row #{0}: Stock is already reserved for the Item {1}." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:537 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:538 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}." msgstr "" @@ -45622,8 +45712,8 @@ msgstr "" msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1232 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1612 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1230 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1610 msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}." msgstr "" @@ -45651,7 +45741,7 @@ msgstr "" msgid "Row #{0}: You must select an Asset for Item {1}." msgstr "" -#: erpnext/public/js/controllers/buying.js:236 +#: erpnext/public/js/controllers/buying.js:237 msgid "Row #{0}: {1} can not be negative for item {2}" msgstr "الصف # {0}: {1} لا يمكن أن يكون سالبا للبند {2}" @@ -45675,27 +45765,27 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:490 +#: erpnext/controllers/buying_controller.py:502 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:964 +#: erpnext/controllers/buying_controller.py:976 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:620 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:633 +#: erpnext/controllers/buying_controller.py:645 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:579 +#: erpnext/controllers/buying_controller.py:591 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" -#: erpnext/controllers/buying_controller.py:601 +#: erpnext/controllers/buying_controller.py:613 msgid "Row #{idx}: {field_label} is not allowed in Purchase Return." msgstr "" @@ -45703,7 +45793,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1082 +#: erpnext/controllers/buying_controller.py:1094 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45772,7 +45862,7 @@ msgstr "الصف رقم {}: {} {} غير موجود." msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:433 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:434 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}" msgstr "" @@ -45804,7 +45894,7 @@ msgstr "" msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:675 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:659 msgid "Row {0}: Account {1} and Party Type {2} have different account types" msgstr "" @@ -45812,11 +45902,11 @@ msgstr "" msgid "Row {0}: Activity Type is mandatory." msgstr "الصف {0}: نوع النشاط إلزامي." -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:741 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:725 msgid "Row {0}: Advance against Customer must be credit" msgstr "الصف {0}: الدفعة المقدمة مقابل الزبائن يجب أن تكون دائن" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:743 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727 msgid "Row {0}: Advance against Supplier must be debit" msgstr "الصف {0}:المورد المقابل المتقدم يجب أن يكون مدين\\n
    \\nRow {0}: Advance against Supplier must be debit" @@ -45836,7 +45926,7 @@ msgstr "" msgid "Row {0}: Bill of Materials not found for the Item {1}" msgstr "صف {0}: من مواد مشروع القانون لم يتم العثور على هذا البند {1}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:994 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:978 msgid "Row {0}: Both Debit and Credit values cannot be zero" msgstr "" @@ -45844,15 +45934,15 @@ msgstr "" msgid "Row {0}: Conversion Factor is mandatory" msgstr "الصف {0}: معامل التحويل إلزامي" -#: erpnext/controllers/accounts_controller.py:3113 +#: erpnext/controllers/accounts_controller.py:3034 msgid "Row {0}: Cost Center {1} does not belong to Company {2}" msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:141 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:152 msgid "Row {0}: Cost center is required for an item {1}" msgstr "الصف {0}: مركز التكلفة مطلوب لعنصر {1}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:840 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:824 msgid "Row {0}: Credit entry can not be linked with a {1}" msgstr "صف {0}: لا يمكن ربط قيد دائن مع {1}" @@ -45860,7 +45950,7 @@ msgstr "صف {0}: لا يمكن ربط قيد دائن مع {1}" msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}" msgstr "الصف {0}: العملة للـ BOM #{1} يجب أن يساوي العملة المختارة {2}
    Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:835 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819 msgid "Row {0}: Debit entry can not be linked with a {1}" msgstr "الصف {0}: لا يمكن ربط قيد مدين مع {1}" @@ -45868,7 +45958,7 @@ msgstr "الصف {0}: لا يمكن ربط قيد مدين مع {1}" msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same" msgstr "الصف {0}: لا يمكن أن يكون مستودع التسليم ({1}) ومستودع العميل ({2}) متماثلين" -#: erpnext/controllers/accounts_controller.py:2649 +#: erpnext/controllers/accounts_controller.py:2625 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date" msgstr "الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق في جدول شروط الدفع قبل تاريخ الترحيل" @@ -45876,7 +45966,7 @@ msgstr "الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1085 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1069 #: erpnext/controllers/taxes_and_totals.py:1203 msgid "Row {0}: Exchange Rate is mandatory" msgstr "الصف {0}: سعر صرف إلزامي" @@ -45885,15 +45975,15 @@ msgstr "الصف {0}: سعر صرف إلزامي" msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount" msgstr "الصف {0}: القيمة المتوقعة بعد أن تكون الحياة المفيدة أقل من إجمالي مبلغ الشراء" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:524 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:525 msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:481 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:482 msgid "Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:506 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:507 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}" msgstr "" @@ -45922,7 +46012,7 @@ msgstr "الصف {0}: من وقت يجب أن يكون أقل من الوقت" msgid "Row {0}: Hours value must be greater than zero." msgstr "صف {0}: يجب أن تكون قيمة الساعات أكبر من الصفر." -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:860 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:844 msgid "Row {0}: Invalid reference {1}" msgstr "الصف {0}: مرجع غير صالحة {1}" @@ -45946,7 +46036,7 @@ msgstr "" msgid "Row {0}: Item {1}'s quantity cannot be higher than the available quantity." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:594 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:595 msgid "Row {0}: Packed Qty must be equal to {1} Qty." msgstr "" @@ -45954,11 +46044,11 @@ msgstr "" msgid "Row {0}: Packing Slip is already created for Item {1}." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:886 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:870 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}" msgstr "الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:666 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:650 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}" msgstr "الصف {0}: نوع الطرف المعني والطرف المعني مطلوب للحسابات المدينة / الدائنة {0}" @@ -45966,11 +46056,11 @@ msgstr "الصف {0}: نوع الطرف المعني والطرف المعني msgid "Row {0}: Payment Term is mandatory" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:734 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:718 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance" msgstr "الصف {0}: الدفع لطلب الشراء/البيع يجب أن يكون دائما معلم كمتقدم\\n
    \\nRow {0}: Payment against Sales/Purchase Order should always be marked as advance" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:727 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:711 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry." msgstr "الصف {0}: يرجى اختيار \"دفعة مقدمة\" مقابل الحساب {1} إذا كان هذا الادخال دفعة مقدمة." @@ -46006,7 +46096,7 @@ msgstr "الصف {0}: يرجى ضبط الكود الصحيح على طريقة msgid "Row {0}: Project must be same as the one set in the Timesheet: {1}." msgstr "" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:118 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:129 msgid "Row {0}: Purchase Invoice {1} has no stock impact." msgstr "" @@ -46050,7 +46140,7 @@ msgstr "" msgid "Row {0}: The item {1}, quantity must be positive number" msgstr "الصف {0}: العنصر {1} ، يجب أن تكون الكمية رقمًا موجبًا" -#: erpnext/controllers/accounts_controller.py:3090 +#: erpnext/controllers/accounts_controller.py:3011 msgid "Row {0}: The {3} Account {1} does not belong to the company {2}" msgstr "" @@ -46067,7 +46157,7 @@ msgstr "الصف {0}: عامل تحويل UOM إلزامي\\n
    \\nRow {0}: UOM msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1096 +#: erpnext/controllers/accounts_controller.py:1097 msgid "Row {0}: user has not applied the rule {1} on the item {2}" msgstr "الصف {0}: لم يطبق المستخدم القاعدة {1} على العنصر {2}" @@ -46079,23 +46169,23 @@ msgstr "" msgid "Row {0}: {1} must be greater than 0" msgstr "الصف {0}: يجب أن يكون {1} أكبر من 0" -#: erpnext/controllers/accounts_controller.py:708 +#: erpnext/controllers/accounts_controller.py:709 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:900 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:884 msgid "Row {0}: {1} {2} does not match with {3}" msgstr "الصف {0}: {1} {2} لا يتطابق مع {3}" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:91 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:102 msgid "Row {0}: {2} Item {1} does not exist in {2} {3}" msgstr "" -#: erpnext/utilities/transaction_base.py:555 +#: erpnext/utilities/transaction_base.py:558 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "الصف {1}: لا يمكن أن تكون الكمية ({0}) كسرًا. للسماح بذلك ، قم بتعطيل '{2}' في UOM {3}." -#: erpnext/controllers/buying_controller.py:946 +#: erpnext/controllers/buying_controller.py:958 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46121,7 +46211,7 @@ msgstr "تمت إزالة الصفوف في {0}" msgid "Rows with Same Account heads will be merged on Ledger" msgstr "" -#: erpnext/controllers/accounts_controller.py:2659 +#: erpnext/controllers/accounts_controller.py:2636 msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "تم العثور على صفوف ذات تواريخ استحقاق مكررة في صفوف أخرى: {0}" @@ -46191,7 +46281,7 @@ msgstr "" msgid "SLA Paused On" msgstr "" -#: erpnext/public/js/utils.js:1163 +#: erpnext/public/js/utils.js:1173 msgid "SLA is on hold since {0}" msgstr "اتفاقية مستوى الخدمة معلقة منذ {0}" @@ -46476,11 +46566,11 @@ msgstr "" msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:614 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:615 msgid "Sales Invoice {0} has already been submitted" msgstr "سبق أن تم ترحيل فاتورة المبيعات {0}" -#: erpnext/selling/doctype/sales_order/sales_order.py:517 +#: erpnext/selling/doctype/sales_order/sales_order.py:518 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order" msgstr "" @@ -46621,7 +46711,7 @@ msgstr "" #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.js:160 #: erpnext/stock/doctype/delivery_note/delivery_note.js:223 -#: erpnext/stock/doctype/material_request/material_request.js:218 +#: erpnext/stock/doctype/material_request/material_request.js:219 #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -46705,7 +46795,7 @@ msgstr "" msgid "Sales Order Trends" msgstr "مجرى طلبات البيع" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:266 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:267 msgid "Sales Order required for Item {0}" msgstr "طلب البيع مطلوب للبند {0}\\n
    \\nSales Order required for Item {0}" @@ -46779,8 +46869,8 @@ msgstr "أوامر المبيعات لتقديم" #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sms_center/sms_center.json -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:8 -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:48 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:16 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:60 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:8 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:71 #: erpnext/selling/workspace/selling/selling.json @@ -47171,7 +47261,7 @@ msgstr "مستودع الاحتفاظ بالعينات" #. Label of the sample_size (Float) field in DocType 'Quality Inspection' #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93 -#: erpnext/public/js/controllers/transaction.js:2424 +#: erpnext/public/js/controllers/transaction.js:2427 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json msgid "Sample Size" msgstr "حجم العينة" @@ -47213,7 +47303,7 @@ msgid "Saturday" msgstr "السبت" #: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js:119 -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:628 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.js:75 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:283 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:319 @@ -47497,7 +47587,7 @@ msgstr "" msgid "Scrapped" msgstr "ألغت" -#: erpnext/selling/page/point_of_sale/pos_item_selector.js:152 +#: erpnext/selling/page/point_of_sale/pos_item_selector.js:179 #: erpnext/selling/page/point_of_sale/pos_past_order_list.js:58 #: erpnext/templates/pages/help.html:14 msgid "Search" @@ -47528,7 +47618,7 @@ msgstr "البحث عن طريق اسم العميل ، الهاتف ، البر msgid "Search by invoice id or customer name" msgstr "البحث عن طريق معرف الفاتورة أو اسم العميل" -#: erpnext/selling/page/point_of_sale/pos_item_selector.js:154 +#: erpnext/selling/page/point_of_sale/pos_item_selector.js:181 msgid "Search by item code, serial number or barcode" msgstr "" @@ -47587,11 +47677,11 @@ msgstr "انظر جميع المقالات" msgid "See all open tickets" msgstr "شاهد جميع التذاكر المفتوحة" -#: erpnext/stock/report/stock_ledger/stock_ledger.js:104 +#: erpnext/stock/report/stock_ledger/stock_ledger.js:123 msgid "Segregate Serial / Batch Bundle" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:247 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:250 #: erpnext/selling/doctype/sales_order/sales_order.js:1107 #: erpnext/selling/doctype/sales_order/sales_order_list.js:96 #: erpnext/selling/report/sales_analytics/sales_analytics.js:93 @@ -47602,7 +47692,7 @@ msgstr "حدد" msgid "Select Accounting Dimension." msgstr "" -#: erpnext/public/js/utils.js:476 +#: erpnext/public/js/utils.js:486 msgid "Select Alternate Item" msgstr "اختر البند البديل" @@ -47628,7 +47718,7 @@ msgstr "اختر قائمة المواد، الكمية، وإلى المخزن" #: erpnext/assets/doctype/asset_repair/asset_repair.js:194 #: erpnext/public/js/utils/sales_common.js:417 -#: erpnext/stock/doctype/pick_list/pick_list.js:353 +#: erpnext/stock/doctype/pick_list/pick_list.js:370 msgid "Select Batch No" msgstr "" @@ -47652,7 +47742,7 @@ msgstr "" msgid "Select Company" msgstr "حدد الشركة" -#: erpnext/manufacturing/doctype/job_card/job_card.js:448 +#: erpnext/manufacturing/doctype/job_card/job_card.js:468 msgid "Select Corrective Operation" msgstr "" @@ -47693,11 +47783,11 @@ msgstr "" msgid "Select DocType" msgstr "حدد نوع المستند" -#: erpnext/manufacturing/doctype/job_card/job_card.js:166 +#: erpnext/manufacturing/doctype/job_card/job_card.js:186 msgid "Select Employees" msgstr "حدد الموظفين" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:237 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:240 msgid "Select Finished Good" msgstr "" @@ -47710,7 +47800,7 @@ msgstr "اختيار العناصر" msgid "Select Items based on Delivery Date" msgstr "حدد العناصر بناءً على تاريخ التسليم" -#: erpnext/public/js/controllers/transaction.js:2460 +#: erpnext/public/js/controllers/transaction.js:2463 msgid "Select Items for Quality Inspection" msgstr "" @@ -47740,20 +47830,20 @@ msgstr "اختر برنامج الولاء" msgid "Select Possible Supplier" msgstr "اختار المورد المحتمل" -#: erpnext/manufacturing/doctype/work_order/work_order.js:945 -#: erpnext/stock/doctype/pick_list/pick_list.js:193 +#: erpnext/manufacturing/doctype/work_order/work_order.js:950 +#: erpnext/stock/doctype/pick_list/pick_list.js:210 msgid "Select Quantity" msgstr "إختيار الكمية" #: erpnext/assets/doctype/asset_repair/asset_repair.js:194 #: erpnext/public/js/utils/sales_common.js:417 -#: erpnext/stock/doctype/pick_list/pick_list.js:353 +#: erpnext/stock/doctype/pick_list/pick_list.js:370 msgid "Select Serial No" msgstr "" #: erpnext/assets/doctype/asset_repair/asset_repair.js:197 #: erpnext/public/js/utils/sales_common.js:420 -#: erpnext/stock/doctype/pick_list/pick_list.js:356 +#: erpnext/stock/doctype/pick_list/pick_list.js:373 msgid "Select Serial and Batch" msgstr "" @@ -47791,7 +47881,7 @@ msgstr "" msgid "Select Warehouse..." msgstr "حدد مستودع ..." -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:538 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:546 msgid "Select Warehouses to get Stock for Materials Planning" msgstr "" @@ -47819,7 +47909,7 @@ msgstr "" msgid "Select a Supplier" msgstr "حدد المورد" -#: erpnext/stock/doctype/material_request/material_request.js:398 +#: erpnext/stock/doctype/material_request/material_request.js:399 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 "حدد موردًا من الموردين الافتراضيين للعناصر أدناه. عند التحديد ، سيتم إجراء طلب الشراء مقابل العناصر التي تنتمي إلى المورد المحدد فقط." @@ -47857,11 +47947,11 @@ msgstr "اختر الشركة أولا" msgid "Select company name first." msgstr "حدد اسم الشركة الأول." -#: erpnext/controllers/accounts_controller.py:2905 +#: erpnext/controllers/accounts_controller.py:2884 msgid "Select finance book for the item {0} at row {1}" msgstr "حدد دفتر تمويل للعنصر {0} في الصف {1}" -#: erpnext/selling/page/point_of_sale/pos_item_selector.js:164 +#: erpnext/selling/page/point_of_sale/pos_item_selector.js:191 msgid "Select item group" msgstr "حدد مجموعة العناصر" @@ -47878,7 +47968,7 @@ msgstr "حدد الحساب البنكي للتوفيق." msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1030 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1035 msgid "Select the Item to be manufactured." msgstr "" @@ -47886,8 +47976,8 @@ msgstr "" msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:419 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:432 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:427 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:440 msgid "Select the Warehouse" msgstr "" @@ -47911,7 +48001,7 @@ msgstr "" msgid "Select variant item code for the template item {0}" msgstr "حدد رمز عنصر متغير لعنصر النموذج {0}" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:694 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:702 msgid "Select whether to get items from a Sales Order or a Material Request. For now select Sales Order.\n" " A Production Plan can also be created manually where you can select the Items to manufacture." msgstr "" @@ -48224,7 +48314,7 @@ msgstr "" #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:74 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:114 -#: erpnext/public/js/controllers/transaction.js:2437 +#: erpnext/public/js/controllers/transaction.js:2440 #: erpnext/public/js/utils/serial_no_batch_selector.js:421 #: erpnext/selling/doctype/installation_note_item/installation_note_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -48399,7 +48489,7 @@ msgstr "الرقم التسلسلي ودفعات" msgid "Serial Nos are created successfully" msgstr "" -#: erpnext/stock/stock_ledger.py:2162 +#: erpnext/stock/stock_ledger.py:2173 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding." msgstr "" @@ -48593,7 +48683,7 @@ msgstr "" #: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/dunning/dunning.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:619 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:620 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -48829,12 +48919,12 @@ msgid "Service Stop Date" msgstr "تاريخ توقف الخدمة" #: erpnext/accounts/deferred_revenue.py:44 -#: erpnext/public/js/controllers/transaction.js:1475 +#: erpnext/public/js/controllers/transaction.js:1478 msgid "Service Stop Date cannot be after Service End Date" msgstr "لا يمكن أن يكون تاريخ إيقاف الخدمة بعد تاريخ انتهاء الخدمة" #: erpnext/accounts/deferred_revenue.py:41 -#: erpnext/public/js/controllers/transaction.js:1472 +#: erpnext/public/js/controllers/transaction.js:1475 msgid "Service Stop Date cannot be before Service Start Date" msgstr "لا يمكن أن يكون تاريخ إيقاف الخدمة قبل تاريخ بدء الخدمة" @@ -48875,8 +48965,8 @@ msgstr "قم بتعيين السعر الأساسي يدويًا" msgid "Set Default Supplier" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:319 -#: erpnext/manufacturing/doctype/job_card/job_card.js:388 +#: erpnext/manufacturing/doctype/job_card/job_card.js:339 +#: erpnext/manufacturing/doctype/job_card/job_card.js:408 msgid "Set Finished Good Quantity" msgstr "" @@ -49077,7 +49167,7 @@ msgstr "تعيين معدل عنصر التجميع الفرعي استنادا msgid "Set targets Item Group-wise for this Sales Person." msgstr "تحديد أهداف المجموعة السلعة الحكيم لهذا الشخص المبيعات." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1087 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1092 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)" msgstr "" @@ -49148,7 +49238,7 @@ msgstr "تحديد نوع الحساب يساعد في تحديد هذا الح msgid "Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}" msgstr "وضع الأحداث إلى {0}، لأن الموظف المرفقة أدناه الأشخاص المبيعات لايوجد هوية المستخدم {1}" -#: erpnext/stock/doctype/pick_list/pick_list.js:87 +#: erpnext/stock/doctype/pick_list/pick_list.js:95 msgid "Setting Item Locations..." msgstr "" @@ -49350,7 +49440,7 @@ msgstr "" msgid "Shipment details" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:785 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:786 msgid "Shipments" msgstr "شحنات" @@ -49434,7 +49524,7 @@ msgstr "الشحن العنوان الاسم" msgid "Shipping Address Template" msgstr "" -#: erpnext/controllers/accounts_controller.py:502 +#: erpnext/controllers/accounts_controller.py:503 msgid "Shipping Address does not belong to the {0}" msgstr "" @@ -49601,7 +49691,7 @@ msgstr "عرض مكتمل" msgid "Show Cumulative Amount" msgstr "إظهار المبلغ التراكمي" -#: erpnext/stock/report/stock_balance/stock_balance.js:118 +#: erpnext/stock/report/stock_balance/stock_balance.js:137 msgid "Show Dimension Wise Stock" msgstr "" @@ -49679,6 +49769,10 @@ msgstr "عرض مفتوح" msgid "Show Opening Entries" msgstr "إظهار إدخالات الافتتاح" +#: erpnext/accounts/report/cash_flow/cash_flow.js:26 +msgid "Show Opening and Closing Balance" +msgstr "" + #. Label of the show_operations (Check) field in DocType 'BOM' #: erpnext/manufacturing/doctype/bom/bom.json msgid "Show Operations" @@ -49721,7 +49815,7 @@ msgstr "إظهار إرجاع الإدخالات" msgid "Show Sales Person" msgstr "عرض شخص المبيعات" -#: erpnext/stock/report/stock_balance/stock_balance.js:101 +#: erpnext/stock/report/stock_balance/stock_balance.js:120 msgid "Show Stock Ageing Data" msgstr "عرض البيانات شيخوخة الأسهم" @@ -49735,7 +49829,7 @@ msgstr "" msgid "Show Traceback" msgstr "" -#: erpnext/stock/report/stock_balance/stock_balance.js:96 +#: erpnext/stock/report/stock_balance/stock_balance.js:115 msgid "Show Variant Attributes" msgstr "عرض سمات متغير" @@ -50090,7 +50184,7 @@ msgstr "عنوان مستودع المصدر" msgid "Source Warehouse Address Link" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1162 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1160 msgid "Source Warehouse is mandatory for the Item {0}." msgstr "" @@ -50190,7 +50284,7 @@ msgstr "" msgid "Split Quantity must be less than Asset Quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2524 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2518 msgid "Splitting {0} {1} into {2} rows as per Payment Terms" msgstr "" @@ -50254,7 +50348,7 @@ msgstr "اسم المرحلة" msgid "Stale Days" msgstr "أيام قديمة" -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:112 +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:113 msgid "Stale Days should start from 1." msgstr "" @@ -50317,7 +50411,7 @@ msgstr "" msgid "Standing Name" msgstr "اسم الدائمة" -#: erpnext/manufacturing/doctype/work_order/work_order.js:722 +#: erpnext/manufacturing/doctype/work_order/work_order.js:727 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:57 #: erpnext/public/js/projects/timer.js:35 msgid "Start" @@ -50379,7 +50473,7 @@ msgstr "" msgid "Start Import" msgstr "بدء الاستيراد" -#: erpnext/manufacturing/doctype/job_card/job_card.js:160 +#: erpnext/manufacturing/doctype/job_card/job_card.js:180 #: erpnext/manufacturing/doctype/workstation/workstation.js:124 msgid "Start Job" msgstr "" @@ -50603,12 +50697,12 @@ msgstr "الولاية / المقاطعة" #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:16 #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:425 #: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:378 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:384 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:390 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:399 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:381 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:387 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:393 #: erpnext/buying/doctype/purchase_order/purchase_order.js:402 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:409 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:405 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:412 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -50634,15 +50728,15 @@ msgstr "الولاية / المقاطعة" #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:117 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:125 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:573 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:133 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:581 #: erpnext/manufacturing/doctype/production_plan/production_plan.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:468 -#: erpnext/manufacturing/doctype/work_order/work_order.js:504 -#: erpnext/manufacturing/doctype/work_order/work_order.js:683 -#: erpnext/manufacturing/doctype/work_order/work_order.js:694 -#: erpnext/manufacturing/doctype/work_order/work_order.js:702 +#: erpnext/manufacturing/doctype/work_order/work_order.js:473 +#: erpnext/manufacturing/doctype/work_order/work_order.js:509 +#: erpnext/manufacturing/doctype/work_order/work_order.js:688 +#: erpnext/manufacturing/doctype/work_order/work_order.js:699 +#: erpnext/manufacturing/doctype/work_order/work_order.js:707 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.json @@ -50774,8 +50868,8 @@ msgstr "المخازن" #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:50 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:73 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1336 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1362 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1337 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1363 #: erpnext/accounts/report/account_balance/account_balance.js:58 msgid "Stock Adjustment" msgstr "تسوية المخزون" @@ -50944,7 +51038,7 @@ msgstr "الأسهم الدخول {0} خلق" msgid "Stock Entry {0} has created" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1359 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1357 msgid "Stock Entry {0} is not submitted" msgstr "الحركة المخزنية {0} غير مسجلة" @@ -51146,34 +51240,34 @@ msgstr "" #. Label of the stock_reservation_tab (Tab Break) field in DocType 'Stock #. Settings' -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:250 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:258 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:264 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:276 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:266 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:272 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:284 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:290 -#: erpnext/manufacturing/doctype/work_order/work_order.js:810 -#: erpnext/manufacturing/doctype/work_order/work_order.js:819 -#: erpnext/manufacturing/doctype/work_order/work_order.js:826 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:292 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:298 +#: erpnext/manufacturing/doctype/work_order/work_order.js:815 +#: erpnext/manufacturing/doctype/work_order/work_order.js:824 +#: erpnext/manufacturing/doctype/work_order/work_order.js:831 #: erpnext/manufacturing/doctype/work_order/work_order_dashboard.py:14 #: erpnext/public/js/stock_reservation.js:12 #: erpnext/selling/doctype/sales_order/sales_order.js:78 #: erpnext/selling/doctype/sales_order/sales_order.js:92 #: erpnext/selling/doctype/sales_order/sales_order.js:101 #: erpnext/selling/doctype/sales_order/sales_order.js:227 -#: erpnext/stock/doctype/pick_list/pick_list.js:129 -#: erpnext/stock/doctype/pick_list/pick_list.js:144 -#: erpnext/stock/doctype/pick_list/pick_list.js:149 -#: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:25 +#: erpnext/stock/doctype/pick_list/pick_list.js:146 +#: erpnext/stock/doctype/pick_list/pick_list.js:161 +#: erpnext/stock/doctype/pick_list/pick_list.js:166 +#: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:714 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:666 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1235 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1574 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1587 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1601 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1615 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1629 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1646 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1233 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1572 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1585 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1599 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1613 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1627 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1644 #: erpnext/stock/doctype/stock_settings/stock_settings.json #: erpnext/stock/doctype/stock_settings/stock_settings.py:176 #: erpnext/stock/doctype/stock_settings/stock_settings.py:188 @@ -51182,13 +51276,13 @@ msgstr "" msgid "Stock Reservation" msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1755 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1753 msgid "Stock Reservation Entries Cancelled" msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2138 #: erpnext/manufacturing/doctype/work_order/work_order.py:1738 -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1707 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1705 msgid "Stock Reservation Entries Created" msgstr "" @@ -51210,7 +51304,7 @@ msgstr "" msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:547 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:548 msgid "Stock Reservation Warehouse Mismatch" msgstr "" @@ -51343,7 +51437,7 @@ msgstr "" #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json #: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:35 #: erpnext/stock/report/reserved_stock/reserved_stock.py:110 -#: erpnext/stock/report/stock_balance/stock_balance.py:438 +#: erpnext/stock/report/stock_balance/stock_balance.py:436 #: erpnext/stock/report/stock_ledger/stock_ledger.py:214 #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json @@ -51455,11 +51549,11 @@ msgstr "" msgid "Stock cannot be reserved in group warehouse {0}." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1519 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1517 msgid "Stock cannot be reserved in the group warehouse {0}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:726 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:727 msgid "Stock cannot be updated against Purchase Receipt {0}" msgstr "لا يمكن تحديث المخزون مقابل إيصال الشراء {0}\\n
    \\nStock cannot be updated against Purchase Receipt {0}" @@ -51471,7 +51565,7 @@ msgstr "" msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item." msgstr "" -#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1129 +#: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1127 msgid "Stock has been unreserved for work order {0}." msgstr "" @@ -51537,9 +51631,9 @@ msgstr "" #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json #: erpnext/accounts/doctype/budget/budget.json #: erpnext/buying/doctype/buying_settings/buying_settings.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:690 +#: erpnext/manufacturing/doctype/work_order/work_order.js:695 #: erpnext/selling/doctype/selling_settings/selling_settings.json -#: erpnext/stock/doctype/material_request/material_request.js:133 +#: erpnext/stock/doctype/material_request/material_request.js:134 #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Stop" msgstr "" @@ -51698,7 +51792,7 @@ msgstr "البند من الباطن" msgid "Subcontracted Item To Be Received" msgstr "البند المتعاقد عليه من الباطن" -#: erpnext/stock/doctype/material_request/material_request.js:206 +#: erpnext/stock/doctype/material_request/material_request.js:207 msgid "Subcontracted Purchase Order" msgstr "" @@ -51752,7 +51846,7 @@ msgstr "" #. Receipt Item' #. Label of the subcontracting_order (Link) field in DocType 'Subcontracting #. Receipt Supplied Item' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:437 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:440 #: erpnext/controllers/subcontracting_controller.py:957 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -51787,7 +51881,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:941 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:943 msgid "Subcontracting Order {0} created." msgstr "" @@ -51811,7 +51905,7 @@ msgstr "" #: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/quality_inspection/quality_inspection.json -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:258 +#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:262 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Subcontracting Receipt" msgstr "" @@ -51868,7 +51962,7 @@ msgid "Subject" msgstr "موضوع" #: erpnext/accounts/doctype/payment_order/payment_order.js:139 -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:311 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:312 #: erpnext/manufacturing/doctype/workstation/workstation.js:313 #: erpnext/public/js/payment/payments.js:30 #: erpnext/selling/page/point_of_sale/pos_controller.js:119 @@ -51877,7 +51971,7 @@ msgstr "موضوع" msgid "Submit" msgstr "تسجيل" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:937 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:939 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:910 msgid "Submit Action Failed" msgstr "" @@ -52459,7 +52553,7 @@ msgstr "" msgid "Supplier Invoice Date" msgstr "المورد فاتورة التسجيل" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1729 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1730 msgid "Supplier Invoice Date cannot be greater than Posting Date" msgstr "تاريخ فاتورة المورد لا يمكن أن تكون أكبر من تاريخ الإنشاء
    Supplier Invoice Date cannot be greater than Posting Date" @@ -52474,7 +52568,7 @@ msgstr "تاريخ فاتورة المورد لا يمكن أن تكون أكب msgid "Supplier Invoice No" msgstr "رقم فاتورة المورد" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1756 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1757 msgid "Supplier Invoice No exists in Purchase Invoice {0}" msgstr "المورد فاتورة لا يوجد في شراء الفاتورة {0}" @@ -52594,7 +52688,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Buying Workspace #. Label of the supplier_quotation (Link) field in DocType 'Quotation' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:613 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:616 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:49 @@ -52605,7 +52699,7 @@ msgstr "" #: erpnext/buying/workspace/buying/buying.json #: erpnext/crm/doctype/opportunity/opportunity.js:81 #: erpnext/selling/doctype/quotation/quotation.json -#: erpnext/stock/doctype/material_request/material_request.js:190 +#: erpnext/stock/doctype/material_request/material_request.js:191 msgid "Supplier Quotation" msgstr "التسعيرة من المورد" @@ -52702,7 +52796,7 @@ msgstr "المورد نوع" #. Label of the supplier_warehouse (Link) field in DocType 'Purchase Receipt' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/manufacturing/doctype/job_card/job_card.js:42 +#: erpnext/manufacturing/doctype/job_card/job_card.js:62 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "Supplier Warehouse" msgstr "المورد مستودع" @@ -52830,7 +52924,7 @@ msgstr "" msgid "Synchronize all accounts every hour" msgstr "مزامنة جميع الحسابات كل ساعة" -#: erpnext/accounts/doctype/account/account.py:624 +#: erpnext/accounts/doctype/account/account.py:626 msgid "System In Use" msgstr "" @@ -53007,7 +53101,7 @@ msgstr "" msgid "System will fetch all the entries if limit value is zero." msgstr "سيقوم النظام بجلب كل الإدخالات إذا كانت قيمة الحد صفرا." -#: erpnext/controllers/accounts_controller.py:2144 +#: erpnext/controllers/accounts_controller.py:2145 msgid "System will not check over billing since amount for Item {0} in {1} is zero" msgstr "" @@ -53035,7 +53129,7 @@ msgstr "" msgid "TDS Computation Summary" msgstr "ملخص حساب TDS" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1513 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1514 msgid "TDS Deducted" msgstr "" @@ -53222,7 +53316,7 @@ msgstr "" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:919 +#: erpnext/manufacturing/doctype/work_order/work_order.js:924 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/stock/dashboard/item_dashboard.js:234 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -53727,7 +53821,6 @@ msgstr "الضرائب" #. Quotation' #. Label of the taxes_section (Section Break) field in DocType 'Quotation' #. Label of the taxes_section (Section Break) field in DocType 'Delivery Note' -#. Label of the taxes (Table) field in DocType 'Landed Cost Voucher' #. Label of the taxes_charges_section (Section Break) field in DocType #. 'Purchase Receipt' #: erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -53740,7 +53833,6 @@ msgstr "الضرائب" #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/stock/doctype/delivery_note/delivery_note.json -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "Taxes and Charges" msgstr "الضرائب والرسوم" @@ -54151,8 +54243,8 @@ msgstr "قالب الشروط والأحكام" #: erpnext/selling/report/inactive_customers/inactive_customers.py:76 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:87 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:42 -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:46 -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:39 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:47 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:45 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:59 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:39 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js:46 @@ -54226,7 +54318,7 @@ msgstr "تم تعطيل الوصول إلى طلب عرض الأسعار من ا msgid "The BOM which will be replaced" msgstr "وBOM التي سيتم استبدالها" -#: erpnext/stock/serial_batch_bundle.py:1362 +#: erpnext/stock/serial_batch_bundle.py:1363 msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity." msgstr "" @@ -54316,7 +54408,7 @@ msgstr "" msgid "The current POS opening entry is outdated. Please close it and create a new one." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1035 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1040 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM." msgstr "" @@ -54341,7 +54433,7 @@ msgstr "لا يمكن ترك الحقل من المساهمين فارغا" msgid "The field To Shareholder cannot be blank" msgstr "لا يمكن ترك الحقل للمساهم فارغا" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:397 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:398 msgid "The field {0} in row {1} is not set" msgstr "" @@ -54390,7 +54482,7 @@ msgstr "الوزن الكلي للحزمة. الوزن الصافي عادة + msgid "The holiday on {0} is not between From Date and To Date" msgstr "عطلة على {0} ليست بين من تاريخ وإلى تاريخ" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1161 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" @@ -54398,7 +54490,7 @@ msgstr "" msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1142 +#: erpnext/controllers/buying_controller.py:1154 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54472,11 +54564,11 @@ msgstr "" msgid "The percentage you are allowed to transfer more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed transfer 110 units." msgstr "" -#: erpnext/public/js/utils.js:875 +#: erpnext/public/js/utils.js:885 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.js:138 +#: erpnext/stock/doctype/pick_list/pick_list.js:155 msgid "The reserved stock will be released. Are you certain you wish to proceed?" msgstr "" @@ -54586,15 +54678,15 @@ msgstr "تختلف قيمة {0} بين العناصر {1} و {2}" msgid "The value {0} is already assigned to an existing Item {1}." msgstr "تم تعيين القيمة {0} بالفعل لعنصر موجود {1}." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1063 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1068 msgid "The warehouse where you store finished Items before they are shipped." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1056 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1061 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1068 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1073 msgid "The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as a Work in Progress warehouse." msgstr "" @@ -54602,7 +54694,7 @@ msgstr "" msgid "The {0} ({1}) must be equal to {2} ({3})" msgstr "يجب أن يكون {0} ({1}) مساويًا لـ {2} ({3})" -#: erpnext/public/js/controllers/transaction.js:2846 +#: erpnext/public/js/controllers/transaction.js:2849 msgid "The {0} contains Unit Price Items." msgstr "" @@ -54699,7 +54791,7 @@ msgstr "" msgid "There were errors while sending email. Please try again." msgstr "كانت هناك أخطاء أثناء إرسال البريد الإلكتروني. يرجى المحاولة مرة أخرى." -#: erpnext/accounts/utils.py:1082 +#: erpnext/accounts/utils.py:1086 msgid "There were issues unlinking payment entry {0}." msgstr "" @@ -54721,7 +54813,7 @@ msgstr "هذا العنصر هو متغير {0} (قالب)." msgid "This Month's Summary" msgstr "ملخص هذا الشهر" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:950 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:952 msgid "This PO has been fully subcontracted." msgstr "" @@ -54844,11 +54936,11 @@ msgstr "هذا يعتمد على المعاملات ضد هذا الشخص ال msgid "This is considered dangerous from accounting point of view." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:530 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:531 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice" msgstr "يتم إجراء ذلك للتعامل مع محاسبة الحالات التي يتم فيها إنشاء إيصال الشراء بعد فاتورة الشراء" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1049 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1054 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox." msgstr "" @@ -55288,8 +55380,8 @@ msgstr "إلى العملات" #: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json #: erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json #: erpnext/accounts/doctype/loyalty_program/loyalty_program.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:866 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:870 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:867 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:871 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -55360,7 +55452,7 @@ msgstr "إلى العملات" #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:25 #: erpnext/selling/report/sales_analytics/sales_analytics.js:60 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:29 -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:27 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:35 #: erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:27 #: erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js:27 #: erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:27 @@ -55375,6 +55467,7 @@ msgstr "إلى العملات" #: erpnext/stock/report/delayed_order_report/delayed_order_report.js:23 #: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:27 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:14 +#: erpnext/stock/report/landed_cost_report/landed_cost_report.js:23 #: erpnext/stock/report/reserved_stock/reserved_stock.js:23 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:22 #: erpnext/stock/report/stock_analytics/stock_analytics.js:69 @@ -55390,7 +55483,7 @@ msgstr "إلى العملات" msgid "To Date" msgstr "إلى تاريخ" -#: erpnext/controllers/accounts_controller.py:552 +#: erpnext/controllers/accounts_controller.py:553 #: erpnext/setup/doctype/holiday_list/holiday_list.py:112 msgid "To Date cannot be before From Date" msgstr "(الى تاريخ) لا يمكن ان يكون قبل (من تاريخ)" @@ -55607,7 +55700,7 @@ msgstr "إلى مستودع (اختياري)" msgid "To add Operations tick the 'With Operations' checkbox." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:727 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:735 msgid "To add subcontracted Item's raw materials if include exploded items is disabled." msgstr "" @@ -55647,7 +55740,7 @@ msgstr "لإنشاء مستند مرجع طلب الدفع مطلوب" msgid "To enable Capital Work in Progress Accounting," msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:720 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:728 msgid "To include non-stock items in the material request planning. i.e. Items for which 'Maintain Stock' checkbox is unticked." msgstr "" @@ -55657,8 +55750,8 @@ msgstr "" 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 "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2314 -#: erpnext/controllers/accounts_controller.py:3123 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2308 +#: erpnext/controllers/accounts_controller.py:3044 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف" @@ -55666,7 +55759,7 @@ msgstr "ل تشمل الضريبة في الصف {0} في معدل الإغلا msgid "To merge, following properties must be same for both items" msgstr "لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين" -#: erpnext/accounts/doctype/account/account.py:515 +#: erpnext/accounts/doctype/account/account.py:517 msgid "To overrule this, enable '{0}' in company {1}" msgstr "لإلغاء هذا ، قم بتمكين "{0}" في الشركة {1}" @@ -55674,11 +55767,11 @@ msgstr "لإلغاء هذا ، قم بتمكين "{0}" في الشرك msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings." msgstr "للاستمرار في تعديل قيمة السمة هذه ، قم بتمكين {0} في إعدادات متغير العنصر." -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:620 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:621 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:641 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:642 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}" msgstr "" @@ -55730,8 +55823,8 @@ msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of the tools (Column Break) field in DocType 'Email Digest' #. Label of a Card Break in the Stock Workspace -#: erpnext/buying/doctype/purchase_order/purchase_order.js:644 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:720 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:647 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:723 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:70 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:157 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:442 @@ -55783,7 +55876,7 @@ msgstr "" #: erpnext/accounts/report/financial_statements.py:699 #: erpnext/accounts/report/general_ledger/general_ledger.html:132 #: erpnext/accounts/report/general_ledger/general_ledger.py:378 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:696 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:699 #: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:93 #: erpnext/accounts/report/profitability_analysis/profitability_analysis.py:98 #: erpnext/accounts/report/trial_balance/trial_balance.py:358 @@ -55925,7 +56018,7 @@ msgstr "عملة إجمالي المبلغ" msgid "Total Amount in Words" msgstr "إجمالي المبلغ بالنص" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:207 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:218 msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges" msgstr "مجموع الرسوم المطبقة في شراء طاولة إيصال عناصر يجب أن يكون نفس مجموع الضرائب والرسوم" @@ -56003,7 +56096,7 @@ msgstr "مجموع أحرف" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:61 +#: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:73 #: erpnext/stock/doctype/delivery_note/delivery_note.json msgid "Total Commission" msgstr "مجموع العمولة" @@ -56058,7 +56151,7 @@ msgstr "إجمالي مبلغ التكلفة (عبر الجداول الزمني msgid "Total Credit" msgstr "إجمالي الائتمان" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:340 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:324 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry" msgstr "يجب أن يكون إجمالي مبلغ الائتمان / المدين هو نفسه المرتبطة بإدخال المجلة" @@ -56067,7 +56160,7 @@ msgstr "يجب أن يكون إجمالي مبلغ الائتمان / المدي msgid "Total Debit" msgstr "مجموع الخصم" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1000 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:984 msgid "Total Debit must be equal to Total Credit. The difference is {0}" msgstr "يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان ." @@ -56167,6 +56260,16 @@ msgstr "" msgid "Total Items" msgstr "" +#: erpnext/stock/report/landed_cost_report/landed_cost_report.py:24 +msgid "Total Landed Cost" +msgstr "" + +#. Label of the total_taxes_and_charges (Currency) field in DocType 'Landed +#. Cost Voucher' +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json +msgid "Total Landed Cost (Company Currency)" +msgstr "" + #: erpnext/accounts/report/balance_sheet/balance_sheet.py:213 msgid "Total Liability" msgstr "" @@ -56241,7 +56344,7 @@ msgstr "اجمالي أمر البيع التقديري" msgid "Total Order Value" msgstr "مجموع قيمة الطلب" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:689 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:692 msgid "Total Other Charges" msgstr "" @@ -56282,7 +56385,7 @@ msgstr "إجمالي المبلغ المستحق" msgid "Total Paid Amount" msgstr "إجمالي المبلغ المدفوع" -#: erpnext/controllers/accounts_controller.py:2711 +#: erpnext/controllers/accounts_controller.py:2690 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total" msgstr "يجب أن يكون إجمالي مبلغ الدفع في جدول الدفع مساويا للمجموع الكبير / المستدير" @@ -56294,7 +56397,7 @@ msgstr "لا يمكن أن يكون إجمالي مبلغ طلب الدفع أك msgid "Total Payments" msgstr "مجموع المدفوعات" -#: erpnext/selling/doctype/sales_order/sales_order.py:642 +#: erpnext/selling/doctype/sales_order/sales_order.py:643 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56417,7 +56520,7 @@ msgstr "إجمالي المستهدف" msgid "Total Tasks" msgstr "إجمالي المهام" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:682 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:685 #: erpnext/accounts/report/purchase_register/purchase_register.py:263 msgid "Total Tax" msgstr "مجموع الضرائب" @@ -56475,8 +56578,6 @@ msgstr "مجموع الضرائب والرسوم" #. Order' #. Label of the base_total_taxes_and_charges (Currency) field in DocType #. 'Delivery Note' -#. Label of the total_taxes_and_charges (Currency) field in DocType 'Landed -#. Cost Voucher' #. Label of the base_total_taxes_and_charges (Currency) field in DocType #. 'Purchase Receipt' #: erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -56488,7 +56589,6 @@ msgstr "مجموع الضرائب والرسوم" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/stock/doctype/delivery_note/delivery_note.json -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "Total Taxes and Charges (Company Currency)" msgstr "مجموع الضرائب والرسوم (عملة الشركة)" @@ -56524,6 +56624,12 @@ msgstr "" msgid "Total Variance" msgstr "مجموع الفروق" +#. Label of the total_vendor_invoices_cost (Currency) field in DocType 'Landed +#. Cost Voucher' +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json +msgid "Total Vendor Invoices Cost (Company Currency)" +msgstr "" + #: erpnext/utilities/report/youtube_interactions/youtube_interactions.py:70 msgid "Total Views" msgstr "" @@ -56566,10 +56672,6 @@ msgstr "" msgid "Total Working Hours" msgstr "مجموع ساعات العمل" -#: erpnext/controllers/accounts_controller.py:2257 -msgid "Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})" -msgstr "مجموع مقدما ({0}) ضد النظام {1} لا يمكن أن يكون أكبر من المجموع الكلي ({2})" - #: erpnext/controllers/selling_controller.py:234 msgid "Total allocated percentage for sales team should be 100" msgstr "مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100" @@ -56598,7 +56700,7 @@ msgstr "" msgid "Total {0} ({1})" msgstr "إجمالي {0} ({1})" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:188 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:199 msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'" msgstr "إجمالي {0} لجميع العناصر هو صفر، قد يكون عليك تغيير 'توزيع الرسوم على أساس'\\n
    \\nTotal {0} for all items is zero, may be you should change 'Distribute Charges Based On'" @@ -56805,7 +56907,7 @@ msgstr "" msgid "Transaction not allowed against stopped Work Order {0}" msgstr "المعاملة غير مسموح بها في مقابل أمر العمل المتوقف {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1321 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1317 msgid "Transaction reference no {0} dated {1}" msgstr "إشارة عملية لا {0} بتاريخ {1}" @@ -56840,11 +56942,11 @@ msgstr "" #. Option for the 'Asset Status' (Select) field in DocType 'Serial No' #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/assets/doctype/asset_movement/asset_movement.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:431 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:434 #: erpnext/stock/doctype/item_reorder/item_reorder.json #: erpnext/stock/doctype/serial_no/serial_no.json -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:266 -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:271 +#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:270 +#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:275 msgid "Transfer" msgstr "نقل" @@ -56852,7 +56954,7 @@ msgstr "نقل" msgid "Transfer Asset" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:445 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:453 msgid "Transfer From Warehouses" msgstr "" @@ -56868,7 +56970,7 @@ msgstr "نقل المواد ضد" msgid "Transfer Materials" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:440 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:448 msgid "Transfer Materials For Warehouse {0}" msgstr "نقل المواد للمستودع {0}" @@ -56890,7 +56992,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Material Request' #: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/material_request/material_request_list.js:37 +#: erpnext/stock/doctype/material_request/material_request_list.js:41 msgid "Transferred" msgstr "نقل" @@ -57233,7 +57335,7 @@ msgstr "" #: erpnext/manufacturing/doctype/workstation/workstation.js:480 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:59 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:110 -#: erpnext/public/js/stock_analytics.js:94 erpnext/public/js/utils.js:754 +#: erpnext/public/js/stock_analytics.js:94 erpnext/public/js/utils.js:764 #: erpnext/quality_management/doctype/quality_goal_objective/quality_goal_objective.json #: erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json @@ -57600,9 +57702,9 @@ msgstr "" msgid "Unreconciled Entries" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:817 +#: erpnext/manufacturing/doctype/work_order/work_order.js:822 #: erpnext/selling/doctype/sales_order/sales_order.js:90 -#: erpnext/stock/doctype/pick_list/pick_list.js:135 +#: erpnext/stock/doctype/pick_list/pick_list.js:152 msgid "Unreserve" msgstr "" @@ -57611,17 +57713,17 @@ msgstr "" msgid "Unreserve Stock" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:282 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:290 msgid "Unreserve for Raw Materials" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:256 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:264 msgid "Unreserve for Sub-assembly" msgstr "" #: erpnext/public/js/stock_reservation.js:280 #: erpnext/selling/doctype/sales_order/sales_order.js:491 -#: erpnext/stock/doctype/pick_list/pick_list.js:287 +#: erpnext/stock/doctype/pick_list/pick_list.js:304 msgid "Unreserving Stock..." msgstr "" @@ -57642,7 +57744,7 @@ msgstr "غير المجدولة" msgid "Unsecured Loans" msgstr "القروض غير المضمونة" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1675 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1676 msgid "Unset Matched Payment Request" msgstr "" @@ -57692,10 +57794,10 @@ msgstr "أحداث التقويم القادمة" #: erpnext/accounts/doctype/account/account.js:204 #: erpnext/accounts/doctype/cost_center/cost_center.js:107 -#: erpnext/manufacturing/doctype/job_card/job_card.js:318 -#: erpnext/manufacturing/doctype/job_card/job_card.js:387 +#: erpnext/manufacturing/doctype/job_card/job_card.js:338 +#: erpnext/manufacturing/doctype/job_card/job_card.js:407 #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:500 -#: erpnext/public/js/utils.js:598 erpnext/public/js/utils.js:902 +#: erpnext/public/js/utils.js:608 erpnext/public/js/utils.js:912 #: erpnext/public/js/utils/barcode_scanner.js:183 #: erpnext/public/js/utils/serial_no_batch_selector.js:17 #: erpnext/public/js/utils/serial_no_batch_selector.js:191 @@ -57812,7 +57914,7 @@ msgstr "تحديث اسم / رقم مركز التكلفة" msgid "Update Costing and Billing" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.js:105 +#: erpnext/stock/doctype/pick_list/pick_list.js:122 msgid "Update Current Stock" msgstr "تحديث المخزون الحالي" @@ -57828,8 +57930,8 @@ msgstr "" msgid "Update Existing Records" msgstr "تحديث السجلات الموجودة" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:362 -#: erpnext/public/js/utils.js:854 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:365 +#: erpnext/public/js/utils.js:864 #: erpnext/selling/doctype/sales_order/sales_order.js:59 msgid "Update Items" msgstr "تحديث العناصر" @@ -57859,7 +57961,7 @@ msgstr "تحديث تنسيق الطباعة" msgid "Update Rate and Availability" msgstr "معدل التحديث والتوفر" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:633 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:636 msgid "Update Rate as per Last Purchase" msgstr "" @@ -57929,7 +58031,7 @@ msgstr "" msgid "Updating Variants..." msgstr "جارٍ تحديث المتغيرات ..." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1011 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1016 msgid "Updating Work Order status" msgstr "" @@ -58155,7 +58257,7 @@ msgstr "هوية المستخدم لم يتم تعيين موظف ل {0}" #. Label of the user_remark (Small Text) field in DocType 'Journal Entry' #. Label of the user_remark (Small Text) field in DocType 'Journal Entry #. Account' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:615 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:616 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json msgid "User Remark" @@ -58422,8 +58524,8 @@ msgid "Valuation (I - K)" msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.js:61 -#: erpnext/stock/report/stock_balance/stock_balance.js:82 -#: erpnext/stock/report/stock_ledger/stock_ledger.js:96 +#: erpnext/stock/report/stock_balance/stock_balance.js:101 +#: erpnext/stock/report/stock_ledger/stock_ledger.js:115 msgid "Valuation Field Type" msgstr "" @@ -58474,7 +58576,7 @@ msgstr "طريقة التقييم" #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:85 #: erpnext/stock/report/item_prices/item_prices.py:57 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:67 -#: erpnext/stock/report/stock_balance/stock_balance.py:489 +#: erpnext/stock/report/stock_balance/stock_balance.py:487 #: erpnext/stock/report/stock_ledger/stock_ledger.py:297 msgid "Valuation Rate" msgstr "سعر التقييم" @@ -58483,11 +58585,11 @@ msgstr "سعر التقييم" msgid "Valuation Rate (In / Out)" msgstr "" -#: erpnext/stock/stock_ledger.py:1904 +#: erpnext/stock/stock_ledger.py:1915 msgid "Valuation Rate Missing" msgstr "معدل التقييم مفقود" -#: erpnext/stock/stock_ledger.py:1882 +#: erpnext/stock/stock_ledger.py:1893 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "معدل التقييم للعنصر {0} ، مطلوب لإجراء إدخالات محاسبية لـ {1} {2}." @@ -58518,8 +58620,8 @@ msgstr "" msgid "Valuation rate for the item as per Sales Invoice (Only for Internal Transfers)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2338 -#: erpnext/controllers/accounts_controller.py:3147 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2332 +#: erpnext/controllers/accounts_controller.py:3068 msgid "Valuation type charges can not be marked as Inclusive" msgstr "لا يمكن تحديد رسوم نوع التقييم على أنها شاملة" @@ -58763,6 +58865,18 @@ msgstr "عدد المركبات" msgid "Vehicle Value" msgstr "قيمة المركبة" +#. Label of the vendor_invoice (Link) field in DocType 'Landed Cost Vendor +#. Invoice' +#: erpnext/stock/doctype/landed_cost_vendor_invoice/landed_cost_vendor_invoice.json +#: erpnext/stock/report/landed_cost_report/landed_cost_report.py:42 +msgid "Vendor Invoice" +msgstr "" + +#. Label of the vendor_invoices (Table) field in DocType 'Landed Cost Voucher' +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json +msgid "Vendor Invoices" +msgstr "" + #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.py:475 msgid "Vendor Name" msgstr "اسم البائع" @@ -58836,7 +58950,7 @@ msgstr "اعدادات الفيديو" #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:167 #: erpnext/buying/doctype/supplier/supplier.js:93 #: erpnext/buying/doctype/supplier/supplier.js:104 -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:107 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:115 #: erpnext/projects/doctype/project/project.js:109 #: erpnext/projects/doctype/project/project.js:126 #: erpnext/public/js/controllers/stock_controller.js:76 @@ -58957,7 +59071,7 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.js:56 #: erpnext/stock/report/available_serial_no/available_serial_no.py:196 -#: erpnext/stock/report/stock_ledger/stock_ledger.js:79 +#: erpnext/stock/report/stock_ledger/stock_ledger.js:98 #: erpnext/stock/report/stock_ledger/stock_ledger.py:322 msgid "Voucher #" msgstr "سند #" @@ -59184,7 +59298,7 @@ msgstr "أجور" msgid "Wages per hour" msgstr "الأجور في الساعة" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:423 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:424 msgid "Waiting for payment..." msgstr "" @@ -59274,7 +59388,7 @@ msgstr "عميل غير مسجل" #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.js:8 #: erpnext/public/js/stock_analytics.js:69 #: erpnext/public/js/stock_reservation.js:121 -#: erpnext/public/js/stock_reservation.js:326 erpnext/public/js/utils.js:542 +#: erpnext/public/js/stock_reservation.js:326 erpnext/public/js/utils.js:552 #: erpnext/public/js/utils/serial_no_batch_selector.js:95 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:354 @@ -59327,9 +59441,7 @@ msgstr "عميل غير مسجل" #: erpnext/stock/report/stock_ageing/stock_ageing.js:30 #: erpnext/stock/report/stock_ageing/stock_ageing.py:157 #: erpnext/stock/report/stock_analytics/stock_analytics.js:49 -#: erpnext/stock/report/stock_balance/stock_balance.js:57 -#: erpnext/stock/report/stock_balance/stock_balance.py:415 -#: erpnext/stock/report/stock_ledger/stock_ledger.js:30 +#: erpnext/stock/report/stock_balance/stock_balance.py:413 #: erpnext/stock/report/stock_ledger/stock_ledger.py:257 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.js:38 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:57 @@ -59394,7 +59506,7 @@ msgstr "" #: erpnext/stock/report/available_batch_report/available_batch_report.js:57 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js:45 #: erpnext/stock/report/stock_ageing/stock_ageing.js:23 -#: erpnext/stock/report/stock_balance/stock_balance.js:75 +#: erpnext/stock/report/stock_balance/stock_balance.js:94 msgid "Warehouse Type" msgstr "نوع المستودع" @@ -59445,7 +59557,7 @@ msgid "Warehouse not found against the account {0}" msgstr "لم يتم العثور على المستودع مقابل الحساب {0}" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:424 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:425 msgid "Warehouse required for stock Item {0}" msgstr "مستودع الأسهم المطلوبة لل تفاصيل {0}" @@ -59489,8 +59601,10 @@ msgstr "المستودع: {0} لا ينتمي إلى {1}" #. Label of the warehouses (Table MultiSelect) field in DocType 'Production #. Plan' -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:513 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:521 #: erpnext/manufacturing/doctype/production_plan/production_plan.json +#: erpnext/stock/report/stock_balance/stock_balance.js:76 +#: erpnext/stock/report/stock_ledger/stock_ledger.js:30 msgid "Warehouses" msgstr "المستودعات" @@ -59574,9 +59688,9 @@ msgstr "تحذير لأوامر الشراء الجديدة" msgid "Warn for new Request for Quotations" msgstr "تحذير لطلب جديد للاقتباسات" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:745 -#: erpnext/controllers/accounts_controller.py:819 -#: erpnext/controllers/accounts_controller.py:2147 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:741 +#: erpnext/controllers/accounts_controller.py:820 +#: erpnext/controllers/accounts_controller.py:2148 #: erpnext/stock/doctype/delivery_trip/delivery_trip.js:145 #: erpnext/utilities/transaction_base.py:123 msgid "Warning" @@ -59594,11 +59708,11 @@ msgstr "" msgid "Warning!" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1365 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1363 msgid "Warning: Another {0} # {1} exists against stock entry {2}" msgstr "تحذير: {0} أخر # {1} موجود في مدخل المخزن {2}\\n
    \\nWarning: Another {0} # {1} exists against stock entry {2}" -#: erpnext/stock/doctype/material_request/material_request.js:517 +#: erpnext/stock/doctype/material_request/material_request.js:518 msgid "Warning: Material Requested Qty is less than Minimum Order Qty" msgstr "تحذير : كمية المواد المطلوبة هي أقل من الحد الأدنى للطلب الكمية" @@ -59950,11 +60064,11 @@ msgstr "" msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend." msgstr "" -#: erpnext/accounts/doctype/account/account.py:343 +#: erpnext/accounts/doctype/account/account.py:345 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account." msgstr "أثناء إنشاء حساب الشركة الفرعية {0} ، تم العثور على الحساب الرئيسي {1} كحساب دفتر أستاذ." -#: erpnext/accounts/doctype/account/account.py:333 +#: erpnext/accounts/doctype/account/account.py:335 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA" msgstr "أثناء إنشاء حساب Child Company {0} ، لم يتم العثور على الحساب الرئيسي {1}. الرجاء إنشاء الحساب الرئيسي في شهادة توثيق البرامج المقابلة" @@ -60070,7 +60184,7 @@ msgstr "مستودع قيد الإنجاز" #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:104 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/selling/doctype/sales_order/sales_order.js:665 -#: erpnext/stock/doctype/material_request/material_request.js:198 +#: erpnext/stock/doctype/material_request/material_request.js:199 #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/stock/doctype/material_request/material_request.py:870 #: erpnext/stock/doctype/pick_list/pick_list.json @@ -60081,7 +60195,7 @@ msgstr "مستودع قيد الإنجاز" msgid "Work Order" msgstr "أمر العمل" -#: erpnext/manufacturing/doctype/production_plan/production_plan.js:133 +#: erpnext/manufacturing/doctype/production_plan/production_plan.js:141 msgid "Work Order / Subcontract PO" msgstr "" @@ -60548,11 +60662,11 @@ msgstr "نعم" msgid "You are importing data for the code list:" msgstr "" -#: erpnext/controllers/accounts_controller.py:3729 +#: erpnext/controllers/accounts_controller.py:3650 msgid "You are not allowed to update as per the conditions set in {} Workflow." msgstr "غير مسموح لك بالتحديث وفقًا للشروط المحددة في {} سير العمل." -#: erpnext/accounts/general_ledger.py:766 +#: erpnext/accounts/general_ledger.py:768 msgid "You are not authorized to add or update entries before {0}" msgstr "غير مصرح لك باضافه إدخالات أو تحديثها قبل {0}\\n
    \\nYou are not authorized to add or update entries before {0}" @@ -60584,7 +60698,7 @@ msgstr "يمكنك أيضًا تعيين حساب CWIP الافتراضي في msgid "You can change the parent account to a Balance Sheet account or select a different account." msgstr "يمكنك تغيير الحساب الرئيسي إلى حساب الميزانية العمومية أو تحديد حساب مختلف." -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:760 msgid "You can not enter current voucher in 'Against Journal Entry' column" msgstr "لا يمكنك إدخال القسيمة الحالية في عمود 'قيد اليومية المقابل'.\\n
    \\nYou can not enter current voucher in 'Against Journal Entry' column" @@ -60592,7 +60706,7 @@ msgstr "لا يمكنك إدخال القسيمة الحالية في عمود ' msgid "You can only have Plans with the same billing cycle in a Subscription" msgstr "يمكنك فقط الحصول على خطط مع دورة الفواتير نفسها في الاشتراك" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:411 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:412 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:876 msgid "You can only redeem max {0} points in this order." msgstr "لا يمكنك استرداد سوى {0} نقاط كحد أقصى بهذا الترتيب." @@ -60633,11 +60747,11 @@ msgstr "" msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}" msgstr "لا يمكنك إنشاء أو إلغاء أي قيود محاسبية في فترة المحاسبة المغلقة {0}" -#: erpnext/accounts/general_ledger.py:786 +#: erpnext/accounts/general_ledger.py:788 msgid "You cannot create/amend any accounting entries till this date." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1009 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:993 msgid "You cannot credit and debit same account at the same time" msgstr "لا يمكن إعطاء الحساب قيمة مدين وقيمة دائن في نفس الوقت" @@ -60649,7 +60763,7 @@ msgstr "لا يمكنك حذف مشروع من نوع 'خارجي'" msgid "You cannot edit root node." msgstr "لا يمكنك تحرير عقدة الجذر." -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:151 +#: erpnext/accounts/doctype/accounts_settings/accounts_settings.py:152 msgid "You cannot enable both the settings '{0}' and '{1}'." msgstr "" @@ -60677,7 +60791,7 @@ msgstr "لا يمكنك تقديم الطلب بدون دفع." msgid "You cannot {0} this document because another Period Closing Entry {1} exists after {2}" msgstr "" -#: erpnext/controllers/accounts_controller.py:3705 +#: erpnext/controllers/accounts_controller.py:3626 msgid "You do not have permissions to {} items in a {}." msgstr "ليس لديك أذونات لـ {} من العناصر في {}." @@ -60693,7 +60807,7 @@ msgstr "ليس لديك ما يكفي من النقاط لاستردادها." msgid "You had {} errors while creating opening invoices. Check {} for more details" msgstr "كان لديك {} من الأخطاء أثناء إنشاء الفواتير الافتتاحية. تحقق من {} لمزيد من التفاصيل" -#: erpnext/public/js/utils.js:954 +#: erpnext/public/js/utils.js:964 msgid "You have already selected items from {0} {1}" msgstr "لقد حددت العناصر من {0} {1}" @@ -60725,7 +60839,7 @@ msgstr "يجب عليك تحديد عميل قبل إضافة عنصر." msgid "You need to cancel POS Closing Entry {} to be able to cancel this document." msgstr "" -#: erpnext/controllers/accounts_controller.py:3098 +#: erpnext/controllers/accounts_controller.py:3019 msgid "You selected the account group {1} as {2} Account in row {0}. Please select a single account." msgstr "" @@ -60798,7 +60912,7 @@ msgstr "[هام] [ERPNext] إعادة ترتيب الأخطاء تلقائيًا msgid "`Allow Negative rates for Items`" msgstr "" -#: erpnext/stock/stock_ledger.py:1896 +#: erpnext/stock/stock_ledger.py:1907 msgid "after" msgstr "" @@ -60838,7 +60952,7 @@ msgstr "" msgid "cannot be greater than 100" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:330 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:331 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1046 msgid "dated {0}" msgstr "" @@ -60971,7 +61085,7 @@ msgstr "" msgid "on" msgstr "" -#: erpnext/controllers/accounts_controller.py:1389 +#: erpnext/controllers/accounts_controller.py:1390 msgid "or" msgstr "أو" @@ -60984,7 +61098,7 @@ msgstr "" msgid "out of 5" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1314 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1310 msgid "paid to" msgstr "" @@ -61020,7 +61134,7 @@ msgstr "" msgid "per hour" msgstr "كل ساعة" -#: erpnext/stock/stock_ledger.py:1897 +#: erpnext/stock/stock_ledger.py:1908 msgid "performing either one below:" msgstr "" @@ -61045,7 +61159,7 @@ msgstr "" msgid "ratings" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1314 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1310 msgid "received from" msgstr "مستلم من" @@ -61142,16 +61256,16 @@ msgstr "" msgid "you must select Capital Work in Progress Account in accounts table" msgstr "يجب عليك تحديد حساب رأس المال قيد التقدم في جدول الحسابات" -#: erpnext/accounts/report/cash_flow/cash_flow.py:233 -#: erpnext/accounts/report/cash_flow/cash_flow.py:234 +#: erpnext/accounts/report/cash_flow/cash_flow.py:248 +#: erpnext/accounts/report/cash_flow/cash_flow.py:249 msgid "{0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1207 +#: erpnext/controllers/accounts_controller.py:1208 msgid "{0} '{1}' is disabled" msgstr "{0} '{1}' معطل" -#: erpnext/accounts/utils.py:183 +#: erpnext/accounts/utils.py:185 msgid "{0} '{1}' not in Fiscal Year {2}" msgstr "{0} '{1}' ليس في السنة المالية {2}" @@ -61159,11 +61273,11 @@ msgstr "{0} '{1}' ليس في السنة المالية {2}" msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}" msgstr "{0} ({1}) لا يمكن أن يكون أكبر من الكمية المخطط لها ({2}) في أمر العمل {3}" -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:319 +#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:341 msgid "{0} {1} has submitted Assets. Remove Item {2} from table to continue." msgstr "" -#: erpnext/controllers/accounts_controller.py:2313 +#: erpnext/controllers/accounts_controller.py:2289 msgid "{0} Account not found against Customer {1}." msgstr "" @@ -61183,11 +61297,11 @@ msgstr "{0} القسيمة المستخدمة هي {1}. الكمية المسم msgid "{0} Digest" msgstr "{0} الملخص" -#: erpnext/accounts/utils.py:1400 +#: erpnext/accounts/utils.py:1404 msgid "{0} Number {1} is already used in {2} {3}" msgstr "{0} الرقم {1} مستخدم بالفعل في {2} {3}" -#: erpnext/manufacturing/doctype/work_order/work_order.js:494 +#: erpnext/manufacturing/doctype/work_order/work_order.js:499 msgid "{0} Operations: {1}" msgstr "{0} العمليات: {1}" @@ -61203,7 +61317,11 @@ msgstr "{0} يعتمد الاحتفاظ بالعينة على الدُفعة ، msgid "{0} Transaction(s) Reconciled" msgstr "" -#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:61 +#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:59 +msgid "{0} account is not of company {1}" +msgstr "" + +#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:62 msgid "{0} account is not of type {1}" msgstr "" @@ -61211,19 +61329,19 @@ msgstr "" msgid "{0} account not found while submitting purchase receipt" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1129 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1113 msgid "{0} against Bill {1} dated {2}" msgstr "{0} مقابل الفاتورة {1} بتاريخ {2}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1138 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1122 msgid "{0} against Purchase Order {1}" msgstr "{0} مقابل أمر الشراء {1}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1105 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1089 msgid "{0} against Sales Invoice {1}" msgstr "{0} مقابل فاتورة المبيعات {1}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1112 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1096 msgid "{0} against Sales Order {1}" msgstr "{0} مقابل طلب مبيعات {1}" @@ -61231,7 +61349,7 @@ msgstr "{0} مقابل طلب مبيعات {1}" msgid "{0} already has a Parent Procedure {1}." msgstr "{0} يحتوي بالفعل على إجراء الأصل {1}." -#: erpnext/stock/doctype/delivery_note/delivery_note.py:542 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:543 msgid "{0} and {1}" msgstr "{0} و {1}" @@ -61290,12 +61408,12 @@ msgstr "{0} ادخل مرتين في ضريبة البند" msgid "{0} entered twice {1} in Item Taxes" msgstr "" -#: erpnext/accounts/utils.py:120 +#: erpnext/accounts/utils.py:122 #: erpnext/projects/doctype/activity_cost/activity_cost.py:40 msgid "{0} for {1}" msgstr "{0} ل {1}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:451 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:447 msgid "{0} has Payment Term based allocation enabled. Select a Payment Term for Row #{1} in Payment References section" msgstr "" @@ -61307,7 +61425,7 @@ msgstr "{0} تم التقديم بنجاح" msgid "{0} hours" msgstr "" -#: erpnext/controllers/accounts_controller.py:2654 +#: erpnext/controllers/accounts_controller.py:2630 msgid "{0} in row {1}" msgstr "{0} في الحقل {1}" @@ -61330,7 +61448,7 @@ msgid "{0} is blocked so this transaction cannot proceed" msgstr "تم حظر {0} حتى لا تتم متابعة هذه المعاملة" #: erpnext/accounts/doctype/budget/budget.py:60 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:644 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:640 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:50 #: erpnext/accounts/report/general_ledger/general_ledger.py:59 #: erpnext/accounts/report/pos_register/pos_register.py:107 @@ -61342,8 +61460,8 @@ msgstr "{0} إلزامي" msgid "{0} is mandatory for Item {1}" msgstr "{0} إلزامي للصنف {1}\\n
    \\n{0} is mandatory for Item {1}" -#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:101 -#: erpnext/accounts/general_ledger.py:810 +#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99 +#: erpnext/accounts/general_ledger.py:812 msgid "{0} is mandatory for account {1}" msgstr "" @@ -61351,7 +61469,7 @@ msgstr "" msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}" msgstr "{0} إلزامي. ربما لم يتم إنشاء سجل صرف العملات من {1} إلى {2}" -#: erpnext/controllers/accounts_controller.py:3055 +#: erpnext/controllers/accounts_controller.py:2976 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}." msgstr "{0} إلزامي. ربما لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}." @@ -61387,7 +61505,7 @@ msgstr "" msgid "{0} is not the default supplier for any items." msgstr "{0} ليس المورد الافتراضي لأية عناصر." -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3020 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3014 msgid "{0} is on hold till {1}" msgstr "{0} معلق حتى {1}" @@ -61402,15 +61520,15 @@ msgstr "" msgid "{0} is required" msgstr "{0} مطلوب" -#: erpnext/manufacturing/doctype/work_order/work_order.js:449 +#: erpnext/manufacturing/doctype/work_order/work_order.js:454 msgid "{0} items in progress" msgstr "{0} العنصر قيد الأستخدام" -#: erpnext/manufacturing/doctype/work_order/work_order.js:460 +#: erpnext/manufacturing/doctype/work_order/work_order.js:465 msgid "{0} items lost during process." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:430 +#: erpnext/manufacturing/doctype/work_order/work_order.js:435 msgid "{0} items produced" msgstr "{0} عناصر منتجة" @@ -61458,12 +61576,12 @@ msgstr "" msgid "{0} units of {1} are required in {2} with the inventory dimension: {3} ({4}) on {5} {6} for {7} to complete the transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:1555 erpnext/stock/stock_ledger.py:2048 -#: erpnext/stock/stock_ledger.py:2062 +#: erpnext/stock/stock_ledger.py:1555 erpnext/stock/stock_ledger.py:2059 +#: erpnext/stock/stock_ledger.py:2073 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction." msgstr "{0} وحدات من {1} لازمة ل {2} في {3} {4} ل {5} لإكمال هذه المعاملة." -#: erpnext/stock/stock_ledger.py:2149 erpnext/stock/stock_ledger.py:2195 +#: erpnext/stock/stock_ledger.py:2160 erpnext/stock/stock_ledger.py:2206 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction." msgstr "" @@ -61507,9 +61625,9 @@ msgstr "" msgid "{0} {1} created" msgstr "{0} {1} إنشاء" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:611 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:664 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2762 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:607 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:660 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2756 msgid "{0} {1} does not exist" msgstr "{0} {1} غير موجود\\n
    \\n{0} {1} does not exist" @@ -61517,16 +61635,16 @@ msgstr "{0} {1} غير موجود\\n
    \\n{0} {1} does not exist" msgid "{0} {1} has accounting entries in currency {2} for company {3}. Please select a receivable or payable account with currency {2}." msgstr "{0} يحتوي {1} على إدخالات محاسبية بالعملة {2} للشركة {3}. الرجاء تحديد حساب مستحق أو دائن بالعملة {2}." -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:461 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:457 msgid "{0} {1} has already been fully paid." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:471 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:467 msgid "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts." msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.py:469 -#: erpnext/selling/doctype/sales_order/sales_order.py:526 +#: erpnext/selling/doctype/sales_order/sales_order.py:527 #: erpnext/stock/doctype/material_request/material_request.py:230 msgid "{0} {1} has been modified. Please refresh." msgstr "تم تعديل {0} {1}، يرجى تحديث الصفحة من المتصفح" @@ -61543,7 +61661,7 @@ msgstr "" msgid "{0} {1} is already linked to Common Code {2}." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:694 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:690 msgid "{0} {1} is associated with {2}, but Party Account is {3}" msgstr "{0} {1} مرتبط ب {2}، ولكن حساب الطرف هو {3}" @@ -61560,7 +61678,7 @@ msgstr "{0} {1} يتم إلغاؤه أو إيقافه\\n
    \\n{0} {1} is cancel msgid "{0} {1} is cancelled so the action cannot be completed" msgstr "{0} {1} تم إلغاؤه لذلك لا يمكن إكمال الإجراء" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:924 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:908 msgid "{0} {1} is closed" msgstr "{0} {1} مغلقة" @@ -61572,7 +61690,7 @@ msgstr "{0} {1} معطل" msgid "{0} {1} is frozen" msgstr "{0} {1} مجمد" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:921 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:905 msgid "{0} {1} is fully billed" msgstr "{0} {1} قدمت الفواتير بشكل كامل" @@ -61580,28 +61698,28 @@ msgstr "{0} {1} قدمت الفواتير بشكل كامل" msgid "{0} {1} is not active" msgstr "{0} {1} غير نشطة" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:671 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:667 msgid "{0} {1} is not associated with {2} {3}" msgstr "{0} {1} غير مرتبط {2} {3}" -#: erpnext/accounts/utils.py:116 +#: erpnext/accounts/utils.py:118 msgid "{0} {1} is not in any active Fiscal Year" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:918 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:957 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:902 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:941 msgid "{0} {1} is not submitted" msgstr "{0} {1} لم يتم تقديمه" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:704 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:700 msgid "{0} {1} is on hold" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:710 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:706 msgid "{0} {1} must be submitted" msgstr "{0} {1} يجب أن يتم اعتماده\\n
    \\n{0} {1} must be submitted" -#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:248 +#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:252 msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting." msgstr "" @@ -61617,22 +61735,22 @@ msgstr "" msgid "{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry" msgstr "{0} {1}: نوع حساب \"الربح والخسارة\" {2} غير مسموح به في قيد افتتاحي" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:248 -#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:87 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:245 +#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:85 msgid "{0} {1}: Account {2} does not belong to Company {3}" msgstr "{0} {1}: الحساب {2} لا ينتمي إلى الشركة {3}" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:236 -#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:75 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:233 +#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:73 msgid "{0} {1}: Account {2} is a Group Account and group accounts cannot be used in transactions" msgstr "" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:243 -#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:82 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:240 +#: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:80 msgid "{0} {1}: Account {2} is inactive" msgstr "{0} {1}: الحساب {2} غير فعال \\n
    \\n{0} {1}: Account {2} is inactive" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:289 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:286 msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: قيد محاسبي ل {2} يمكن ان يتم فقط بالعملة : {3}" @@ -61644,11 +61762,11 @@ msgstr "{0} {1}: مركز التكلفة إلزامي للبند {2}" msgid "{0} {1}: Cost Center is required for 'Profit and Loss' account {2}." msgstr "" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:261 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:258 msgid "{0} {1}: Cost Center {2} does not belong to Company {3}" msgstr "{0} {1}: مركز التكلفة {2} لا ينتمي إلى الشركة {3}" -#: erpnext/accounts/doctype/gl_entry/gl_entry.py:268 +#: erpnext/accounts/doctype/gl_entry/gl_entry.py:265 msgid "{0} {1}: Cost Center {2} is a group cost center and group cost centers cannot be used in transactions" msgstr "" @@ -61690,7 +61808,7 @@ msgstr "" msgid "{0}, complete the operation {1} before the operation {2}." msgstr "{0} ، أكمل العملية {1} قبل العملية {2}." -#: erpnext/controllers/accounts_controller.py:469 +#: erpnext/controllers/accounts_controller.py:470 msgid "{0}: {1} does not belong to the Company: {2}" msgstr "" @@ -61698,19 +61816,19 @@ msgstr "" msgid "{0}: {1} does not exists" msgstr "{0}: {1} غير موجود" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:961 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:962 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} يجب أن يكون أقل من {2}" -#: erpnext/controllers/buying_controller.py:923 +#: erpnext/controllers/buying_controller.py:935 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:821 +#: erpnext/controllers/buying_controller.py:833 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} تم إلغائه أو مغلق." -#: erpnext/controllers/buying_controller.py:542 +#: erpnext/controllers/buying_controller.py:554 msgid "{field_label} is mandatory for sub-contracted {doctype}." msgstr "" @@ -61718,7 +61836,7 @@ msgstr "" msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:646 +#: erpnext/controllers/buying_controller.py:658 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/bs.po b/erpnext/locale/bs.po index 11c24149fd6..4a959e192d1 100644 --- a/erpnext/locale/bs.po +++ b/erpnext/locale/bs.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2025-07-20 09:37+0000\n" -"PO-Revision-Date: 2025-07-20 12:58\n" +"POT-Creation-Date: 2025-08-03 09:38+0000\n" +"PO-Revision-Date: 2025-08-03 15:10\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Bosnian\n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgstr " " msgid " Address" msgstr " Adresa" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:672 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:675 msgid " Amount" msgstr "Iznos" @@ -56,7 +56,7 @@ msgstr " Artikal" msgid " Name" msgstr " Naziv" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:663 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:666 msgid " Rate" msgstr " Cijena" @@ -224,7 +224,7 @@ msgstr "% materijala isporučenih prema ovoj Listi Odabira" msgid "% of materials delivered against this Sales Order" msgstr "% materijala dostavljenog naspram ovog Prodajnog Naloga" -#: erpnext/controllers/accounts_controller.py:2317 +#: erpnext/controllers/accounts_controller.py:2293 msgid "'Account' in the Accounting section of Customer {0}" msgstr "'Račun' u sekciji Knjigovodstvo Klijenta {0}" @@ -240,11 +240,11 @@ msgstr "'Na Osnovu' i 'Grupiraj Po' ne mogu biti isti" msgid "'Days Since Last Order' must be greater than or equal to zero" msgstr "'Dana od posljednje narudžbe' mora biti veći ili jednako nuli" -#: erpnext/controllers/accounts_controller.py:2322 +#: erpnext/controllers/accounts_controller.py:2298 msgid "'Default {0} Account' in Company {1}" msgstr "'Standard {0} račun' u Kompaniji {1}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1273 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1271 msgid "'Entries' cannot be empty" msgstr "Polje 'Unosi' ne može biti prazno" @@ -270,8 +270,8 @@ msgstr "'Kontrola Obavezna prije Dostave' je onemogućena za artikal {0}, nema p msgid "'Inspection Required before Purchase' has disabled for the item {0}, no need to create the QI" msgstr "'Potrebna kontrola prije kupovine' je onemogućena za artikal {0}, nema potrebe za kreiranjem kvaliteta kontrole" -#: erpnext/stock/report/stock_ledger/stock_ledger.py:584 -#: erpnext/stock/report/stock_ledger/stock_ledger.py:617 +#: erpnext/stock/report/stock_ledger/stock_ledger.py:597 +#: erpnext/stock/report/stock_ledger/stock_ledger.py:630 msgid "'Opening'" msgstr "'Početno'" @@ -719,7 +719,7 @@ msgstr "