From 608d38a172ef20f2b44c6a2b0d5032406d1f5947 Mon Sep 17 00:00:00 2001 From: Anjali Patel Date: Wed, 13 Aug 2025 09:33:54 +0000 Subject: [PATCH 001/328] fix: prevent self in "Reports To" dropdown (UI-level check) Ensures employee cannot select themselves in the "Reports To" field via UI. This complements server-side validation by improving UX. --- erpnext/setup/doctype/employee/employee.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/employee/employee.js b/erpnext/setup/doctype/employee/employee.js index f6b4a12a760..fdff186d0f6 100755 --- a/erpnext/setup/doctype/employee/employee.js +++ b/erpnext/setup/doctype/employee/employee.js @@ -11,7 +11,13 @@ erpnext.setup.EmployeeController = class EmployeeController extends frappe.ui.fo }; }; this.frm.fields_dict.reports_to.get_query = function (doc, cdt, cdn) { - return { query: "erpnext.controllers.queries.employee_query" }; + // return { query: "erpnext.controllers.queries.employee_query" }; + return { + filters: [ + ["status", "=", "Active"], // only active employees + ["name", "!=", doc.name] // exclude self + ] + }; }; } From cbfb14a6547258a21ea2c73c043b7069eec79a18 Mon Sep 17 00:00:00 2001 From: Anjali Patel Date: Wed, 13 Aug 2025 13:37:48 +0000 Subject: [PATCH 002/328] fix: add missing query key in 'Reports To' field filter --- erpnext/setup/doctype/employee/employee.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/setup/doctype/employee/employee.js b/erpnext/setup/doctype/employee/employee.js index fdff186d0f6..6325d204d63 100755 --- a/erpnext/setup/doctype/employee/employee.js +++ b/erpnext/setup/doctype/employee/employee.js @@ -11,12 +11,12 @@ erpnext.setup.EmployeeController = class EmployeeController extends frappe.ui.fo }; }; this.frm.fields_dict.reports_to.get_query = function (doc, cdt, cdn) { - // return { query: "erpnext.controllers.queries.employee_query" }; return { + query: "erpnext.controllers.queries.employee_query", filters: [ - ["status", "=", "Active"], // only active employees - ["name", "!=", doc.name] // exclude self - ] + ["status", "=", "Active"], + ["name", "!=", doc.name], + ], }; }; } From 1319b28b1f8876ea5f2abf5fff5ea5bdc898fdf2 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Wed, 8 Oct 2025 17:27:58 +0530 Subject: [PATCH 003/328] fix: tds for customer and supplier in Journal Entry --- .../doctype/journal_entry/journal_entry.py | 75 ++++++++++--------- .../tax_withholding_category.py | 3 + 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index b95e140b706..16959e0b53c 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -353,56 +353,52 @@ class JournalEntry(AccountsController): ) def apply_tax_withholding(self): - from erpnext.accounts.report.general_ledger.general_ledger import get_account_type_map - if not self.apply_tds or self.voucher_type not in ("Debit Note", "Credit Note"): return - parties = [d.party for d in self.get("accounts") if d.party] - parties = list(set(parties)) + party = None + party_type = None + party_account = None - if len(parties) > 1: - frappe.throw(_("Cannot apply TDS against multiple parties in one entry")) + for d in self.get("accounts"): + if d.party and party and d.party != party: + frappe.throw(_("Cannot apply TDS against multiple parties in one entry")) - account_type_map = get_account_type_map(self.company) - party_type = "supplier" if self.voucher_type == "Credit Note" else "customer" - doctype = "Purchase Invoice" if self.voucher_type == "Credit Note" else "Sales Invoice" - debit_or_credit = ( - "debit_in_account_currency" - if self.voucher_type == "Credit Note" - else "credit_in_account_currency" + if d.party_type in ("Customer", "Supplier") and d.party: + party = d.party + party_type = d.party_type + party_account = d.account + break + + # debit or credit based on party type + dr_or_cr = "credit_in_account_currency" if party_type == "Supplier" else "debit_in_account_currency" + rev_dr_or_cr = ( + "debit_in_account_currency" if party_type == "Supplier" else "credit_in_account_currency" ) - rev_debit_or_credit = ( - "credit_in_account_currency" - if debit_or_credit == "debit_in_account_currency" - else "debit_in_account_currency" - ) - - party_account = get_party_account(party_type.title(), parties[0], self.company) net_total = sum( - d.get(debit_or_credit) + d.get(dr_or_cr) - d.get(rev_dr_or_cr) for d in self.get("accounts") - if account_type_map.get(d.account) not in ("Tax", "Chargeable") + if d.party == party and d.party_type == party_type ) - party_amount = sum( - d.get(rev_debit_or_credit) for d in self.get("accounts") if d.account == party_account - ) + # only apply tds if net total is positive + if net_total <= 0: + return inv = frappe._dict( { - party_type: parties[0], - "doctype": doctype, + "party_type": party_type, + "party": party, + "doctype": self.doctype, "company": self.company, "posting_date": self.posting_date, - "net_total": net_total, + "tax_withholding_net_total": net_total, + "base_tax_withholding_net_total": net_total, } ) - tax_withholding_details, advance_taxes, voucher_wise_amount = get_party_tax_withholding_details( - inv, self.tax_withholding_category - ) + tax_withholding_details = get_party_tax_withholding_details(inv, self.tax_withholding_category) if not tax_withholding_details: return @@ -413,29 +409,36 @@ class JournalEntry(AccountsController): d.update( { "account": tax_withholding_details.get("account_head"), - debit_or_credit: tax_withholding_details.get("tax_amount"), + dr_or_cr: tax_withholding_details.get("tax_amount"), + rev_dr_or_cr: 0, } ) accounts.append(d.get("account")) if d.get("account") == party_account: - d.update({rev_debit_or_credit: party_amount - tax_withholding_details.get("tax_amount")}) + party_field = dr_or_cr + amount = net_total - tax_withholding_details.get("tax_amount") + if not d.get(party_field): + party_field = rev_dr_or_cr + amount = -1 * amount + + d.update({party_field: amount}) if not accounts or tax_withholding_details.get("account_head") not in accounts: self.append( "accounts", { "account": tax_withholding_details.get("account_head"), - rev_debit_or_credit: tax_withholding_details.get("tax_amount"), - "against_account": parties[0], + dr_or_cr: tax_withholding_details.get("tax_amount"), + "against_account": party, }, ) to_remove = [ d for d in self.get("accounts") - if not d.get(rev_debit_or_credit) and d.account == tax_withholding_details.get("account_head") + if not d.get(dr_or_cr) and d.account == tax_withholding_details.get("account_head") ] for d in to_remove: diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py index 2c6d13b3147..8d6f0bc86f0 100644 --- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py +++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py @@ -85,6 +85,9 @@ def get_party_details(inv): if inv.doctype == "Sales Invoice": party_type = "Customer" party = inv.customer + elif inv.doctype == "Journal Entry": + party_type = inv.party_type + party = inv.party else: party_type = "Supplier" party = inv.supplier From 47aa006ea92978208d859149aed5223161c3704f Mon Sep 17 00:00:00 2001 From: ljain112 Date: Wed, 8 Oct 2025 18:02:19 +0530 Subject: [PATCH 004/328] fix: recalculate totals after applying tds --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 16959e0b53c..920ed14dd00 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -444,6 +444,10 @@ class JournalEntry(AccountsController): for d in to_remove: self.remove(d) + self.set_amounts_in_company_currency() + self.set_total_debit_credit() + self.set_against_account() + def update_asset_value(self): self.update_asset_on_depreciation() self.update_asset_on_disposal() From 31434630b5a506edfd644d4a18969b44f412607b Mon Sep 17 00:00:00 2001 From: ljain112 Date: Wed, 8 Oct 2025 19:29:39 +0530 Subject: [PATCH 005/328] fix: handle multicurrency in tds jv --- .../doctype/journal_entry/journal_entry.py | 118 ++++++++++++------ .../tax_withholding_category.py | 7 +- 2 files changed, 82 insertions(+), 43 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 920ed14dd00..e053dba1f40 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -353,12 +353,15 @@ class JournalEntry(AccountsController): ) def apply_tax_withholding(self): + from erpnext.setup.utils import get_exchange_rate + if not self.apply_tds or self.voucher_type not in ("Debit Note", "Credit Note"): return party = None party_type = None party_account = None + party_row = None for d in self.get("accounts"): if d.party and party and d.party != party: @@ -368,22 +371,25 @@ class JournalEntry(AccountsController): party = d.party party_type = d.party_type party_account = d.account + party_row = d break - # debit or credit based on party type - dr_or_cr = "credit_in_account_currency" if party_type == "Supplier" else "debit_in_account_currency" - rev_dr_or_cr = ( - "debit_in_account_currency" if party_type == "Supplier" else "credit_in_account_currency" - ) + if not (party and party_type): + return - net_total = sum( + # debit or credit based on party type + dr_or_cr = "credit" if party_type == "Supplier" else "debit" + rev_dr_or_cr = "debit" if party_type == "Supplier" else "credit" + + # net total in company currency. + net_total_in_company_currency = sum( d.get(dr_or_cr) - d.get(rev_dr_or_cr) for d in self.get("accounts") if d.party == party and d.party_type == party_type ) # only apply tds if net total is positive - if net_total <= 0: + if net_total_in_company_currency <= 0: return inv = frappe._dict( @@ -393,8 +399,8 @@ class JournalEntry(AccountsController): "doctype": self.doctype, "company": self.company, "posting_date": self.posting_date, - "tax_withholding_net_total": net_total, - "base_tax_withholding_net_total": net_total, + "tax_withholding_net_total": net_total_in_company_currency, + "base_tax_withholding_net_total": net_total_in_company_currency, } ) @@ -403,47 +409,77 @@ class JournalEntry(AccountsController): if not tax_withholding_details: return - accounts = [] + tds_account = tax_withholding_details.get("account_head") + company_default_currency = frappe.get_cached_value("Company", self.company, "default_currency") + tds_account_currency = get_account_currency(tds_account) + + tds_exch_rate = get_exchange_rate(tds_account_currency, company_default_currency, self.posting_date) + + tds_amt_in_company_currency = tax_withholding_details.get("tax_amount") + tds_amt_in_account_currency = tds_amt_in_company_currency / tds_exch_rate + tds_amt_in_party_currency = tds_amt_in_company_currency / party_row.get("exchange_rate", 1) + + # Update or create tax account row + tax_row = None for d in self.get("accounts"): - if d.get("account") == tax_withholding_details.get("account_head"): - d.update( - { - "account": tax_withholding_details.get("account_head"), - dr_or_cr: tax_withholding_details.get("tax_amount"), - rev_dr_or_cr: 0, - } - ) + if d.account == tds_account: + tax_row = d + break - accounts.append(d.get("account")) - - if d.get("account") == party_account: - party_field = dr_or_cr - amount = net_total - tax_withholding_details.get("tax_amount") - if not d.get(party_field): - party_field = rev_dr_or_cr - amount = -1 * amount - - d.update({party_field: amount}) - - if not accounts or tax_withholding_details.get("account_head") not in accounts: - self.append( + if not tax_row: + tax_row = self.append( "accounts", { - "account": tax_withholding_details.get("account_head"), - dr_or_cr: tax_withholding_details.get("tax_amount"), - "against_account": party, + "account": tds_account, + "account_currency": tds_account_currency, + "exchange_rate": tds_exch_rate, + "is_tax_withholding_account": 1, + "against_account": party_account, }, ) - to_remove = [ - d - for d in self.get("accounts") - if not d.get(dr_or_cr) and d.account == tax_withholding_details.get("account_head") - ] + # TDS will always be credit + tax_row.update( + { + "credit": flt(tds_amt_in_company_currency, self.precision("credit")), + "credit_in_account_currency": flt( + tds_amt_in_account_currency, self.precision("credit_in_account_currency") + ), + "debit": 0, + "debit_in_account_currency": 0, + } + ) - for d in to_remove: - self.remove(d) + party_field = dr_or_cr + if not party_row.get(party_field): + party_field = rev_dr_or_cr + tds_amt_in_company_currency = -1 * tds_amt_in_company_currency + tds_amt_in_party_currency = -1 * tds_amt_in_party_currency + if dr_or_cr == "debit": + # for customer,increase the receivable amount + party_row.update( + { + party_field: flt(party_row.get(party_field, 0)) + tds_amt_in_company_currency, + f"{party_field}_in_account_currency": flt( + party_row.get(f"{party_field}_in_account_currency", 0) + ) + + tds_amt_in_party_currency, + } + ) + else: + # for supplier,decrease the payable amount + party_row.update( + { + party_field: flt(party_row.get(party_field, 0)) - tds_amt_in_company_currency, + f"{party_field}_in_account_currency": flt( + party_row.get(f"{party_field}_in_account_currency", 0) + ) + - tds_amt_in_party_currency, + } + ) + + # Recalculate totals self.set_amounts_in_company_currency() self.set_total_debit_credit() self.set_against_account() diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py index 8d6f0bc86f0..4c727a41015 100644 --- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py +++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py @@ -158,7 +158,7 @@ def get_party_tax_withholding_details(inv, tax_withholding_category=None): party_type, parties, inv, tax_details, posting_date, pan_no ) - if party_type == "Supplier": + if party_type == "Supplier" or inv.doctype == "Journal Entry": tax_row = get_tax_row_for_tds(tax_details, tax_amount) else: tax_row = get_tax_row_for_tcs(inv, tax_details, tax_amount, tax_deducted) @@ -349,7 +349,10 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N elif party_type == "Customer": if tax_deducted: # if already TCS is charged, then amount will be calculated based on 'Previous Row Total' - tax_amount = 0 + if inv.doctype == "Sales Invoice": + tax_amount = 0 + else: + tax_amount = inv.base_tax_withholding_net_total * tax_details.rate / 100 else: # if no TCS has been charged in FY, # then chargeable value is "prev invoices + advances - advance_adjusted" value which cross the threshold From 2b4f621c8e8217508a50dbabb0897969c48410bc Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 9 Oct 2025 12:24:54 +0530 Subject: [PATCH 006/328] refactor: proper variable naming --- .../doctype/journal_entry/journal_entry.py | 144 ++++++++++-------- 1 file changed, 77 insertions(+), 67 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index e053dba1f40..03190a8294c 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -360,36 +360,39 @@ class JournalEntry(AccountsController): party = None party_type = None - party_account = None party_row = None - for d in self.get("accounts"): - if d.party and party and d.party != party: - frappe.throw(_("Cannot apply TDS against multiple parties in one entry")) + for row in self.get("accounts"): + if row.party_type in ("Customer", "Supplier") and row.party: + if party and row.party != party: + frappe.throw(_("Cannot apply TDS against multiple parties in one entry")) - if d.party_type in ("Customer", "Supplier") and d.party: - party = d.party - party_type = d.party_type - party_account = d.account - party_row = d - break + if not party: + party = row.party + party_type = row.party_type + party_row = row - if not (party and party_type): + if not party: return # debit or credit based on party type - dr_or_cr = "credit" if party_type == "Supplier" else "debit" - rev_dr_or_cr = "debit" if party_type == "Supplier" else "credit" + dr_cr = "credit" if party_type == "Supplier" else "debit" + rev_dr_cr = "debit" if party_type == "Supplier" else "credit" + + precision = self.precision(dr_cr, party_row) # net total in company currency. - net_total_in_company_currency = sum( - d.get(dr_or_cr) - d.get(rev_dr_or_cr) - for d in self.get("accounts") - if d.party == party and d.party_type == party_type + net_total = flt( + sum( + d.get(dr_cr) - d.get(rev_dr_cr) + for d in self.get("accounts") + if d.party == party and d.party_type == party_type + ), + precision, ) # only apply tds if net total is positive - if net_total_in_company_currency <= 0: + if net_total <= 0: return inv = frappe._dict( @@ -399,87 +402,94 @@ class JournalEntry(AccountsController): "doctype": self.doctype, "company": self.company, "posting_date": self.posting_date, - "tax_withholding_net_total": net_total_in_company_currency, - "base_tax_withholding_net_total": net_total_in_company_currency, + "tax_withholding_net_total": net_total, + "base_tax_withholding_net_total": net_total, } ) - tax_withholding_details = get_party_tax_withholding_details(inv, self.tax_withholding_category) + tax_details = get_party_tax_withholding_details(inv, self.tax_withholding_category) - if not tax_withholding_details: + if not tax_details: return - tds_account = tax_withholding_details.get("account_head") - company_default_currency = frappe.get_cached_value("Company", self.company, "default_currency") - tds_account_currency = get_account_currency(tds_account) + tax_acc = tax_details.get("account_head") + acc_curr = get_account_currency(tax_acc) + comp_curr = frappe.get_cached_value("Company", self.company, "default_currency") - tds_exch_rate = get_exchange_rate(tds_account_currency, company_default_currency, self.posting_date) + exch_rate = get_exchange_rate(acc_curr, comp_curr, self.posting_date) - tds_amt_in_company_currency = tax_withholding_details.get("tax_amount") - tds_amt_in_account_currency = tds_amt_in_company_currency / tds_exch_rate - tds_amt_in_party_currency = tds_amt_in_company_currency / party_row.get("exchange_rate", 1) + tax_amt_in_comp_curr = flt(tax_details.get("tax_amount"), precision) + tax_amt_in_acc_curr = flt(tax_amt_in_comp_curr / exch_rate, precision) + tax_amt_in_party_curr = flt(tax_amt_in_comp_curr / party_row.get("exchange_rate", 1), precision) # Update or create tax account row tax_row = None - for d in self.get("accounts"): - if d.account == tds_account: - tax_row = d + + for row in self.get("accounts"): + if row.account == tax_acc: + tax_row = row break if not tax_row: tax_row = self.append( "accounts", { - "account": tds_account, - "account_currency": tds_account_currency, - "exchange_rate": tds_exch_rate, + "account": tax_acc, + "account_currency": acc_curr, + "exchange_rate": exch_rate, "is_tax_withholding_account": 1, - "against_account": party_account, + "debit": 0, + "credit": 0, + "debit_in_account_currency": 0, + "credit_in_account_currency": 0, }, ) # TDS will always be credit tax_row.update( { - "credit": flt(tds_amt_in_company_currency, self.precision("credit")), - "credit_in_account_currency": flt( - tds_amt_in_account_currency, self.precision("credit_in_account_currency") - ), + "credit": tax_amt_in_comp_curr, + "credit_in_account_currency": tax_amt_in_acc_curr, "debit": 0, "debit_in_account_currency": 0, } ) - party_field = dr_or_cr + # update party row + party_field = dr_cr + + # sometime user may enter amount in opposite field as negative value if not party_row.get(party_field): - party_field = rev_dr_or_cr - tds_amt_in_company_currency = -1 * tds_amt_in_company_currency - tds_amt_in_party_currency = -1 * tds_amt_in_party_currency + party_field = rev_dr_cr + tax_amt_in_comp_curr *= -1 + tax_amt_in_party_curr *= -1 - if dr_or_cr == "debit": - # for customer,increase the receivable amount - party_row.update( - { - party_field: flt(party_row.get(party_field, 0)) + tds_amt_in_company_currency, - f"{party_field}_in_account_currency": flt( - party_row.get(f"{party_field}_in_account_currency", 0) - ) - + tds_amt_in_party_currency, - } - ) - else: - # for supplier,decrease the payable amount - party_row.update( - { - party_field: flt(party_row.get(party_field, 0)) - tds_amt_in_company_currency, - f"{party_field}_in_account_currency": flt( - party_row.get(f"{party_field}_in_account_currency", 0) - ) - - tds_amt_in_party_currency, - } - ) + # for customer amount will be added. + if dr_cr == "debit": + tax_amt_in_comp_curr *= -1 + tax_amt_in_party_curr *= -1 - # Recalculate totals + party_field_in_acc_curr = f"{party_field}_in_account_currency" + party_amt_in_comp_curr = flt(party_row.get(party_field) - tax_amt_in_comp_curr, precision) + party_amt_in_acc_curr = flt(party_row.get(party_field_in_acc_curr) - tax_amt_in_party_curr, precision) + + party_row.update( + { + party_field: party_amt_in_comp_curr, + party_field_in_acc_curr: party_amt_in_acc_curr, + } + ) + + # remove other tds rows if any + dup_rows = [] + for row in self.get("accounts"): + if row.account == tax_acc and row != tax_row: + dup_rows.append(row) + + for row in dup_rows: + self.remove(row) + + # recalculate totals self.set_amounts_in_company_currency() self.set_total_debit_credit() self.set_against_account() From 84e6d278c38ddc0f7fa7d7e100c80af1afff462d Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 9 Oct 2025 12:54:55 +0530 Subject: [PATCH 007/328] chore: remove redundant code --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 03190a8294c..f04772e221a 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -437,7 +437,6 @@ class JournalEntry(AccountsController): "account": tax_acc, "account_currency": acc_curr, "exchange_rate": exch_rate, - "is_tax_withholding_account": 1, "debit": 0, "credit": 0, "debit_in_account_currency": 0, From 004bd5924581dfe5885185df2a5d677696f18012 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 9 Oct 2025 13:08:55 +0530 Subject: [PATCH 008/328] fix: calculate net_total excluding taxes --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index f04772e221a..7ff5ea26cc4 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -353,6 +353,7 @@ class JournalEntry(AccountsController): ) def apply_tax_withholding(self): + from erpnext.accounts.report.general_ledger.general_ledger import get_account_type_map from erpnext.setup.utils import get_exchange_rate if not self.apply_tds or self.voucher_type not in ("Debit Note", "Credit Note"): @@ -361,6 +362,7 @@ class JournalEntry(AccountsController): party = None party_type = None party_row = None + party_account = None for row in self.get("accounts"): if row.party_type in ("Customer", "Supplier") and row.party: @@ -370,6 +372,7 @@ class JournalEntry(AccountsController): if not party: party = row.party party_type = row.party_type + party_account = row.account party_row = row if not party: @@ -381,12 +384,14 @@ class JournalEntry(AccountsController): precision = self.precision(dr_cr, party_row) + account_type_map = get_account_type_map(self.company) + # net total in company currency. net_total = flt( sum( - d.get(dr_cr) - d.get(rev_dr_cr) + d.get(rev_dr_cr) - d.get(dr_cr) for d in self.get("accounts") - if d.party == party and d.party_type == party_type + if account_type_map.get(d.account) not in ("Tax", "Chargeable") and d.account != party_account ), precision, ) From 610877fb17d04c73aea8969f6557ab64907f085c Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 9 Oct 2025 13:11:10 +0530 Subject: [PATCH 009/328] refactor: update exchange rate import to avoid redundancy --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 7ff5ea26cc4..d359a0689e1 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -33,6 +33,7 @@ from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_sched get_depr_schedule, ) from erpnext.controllers.accounts_controller import AccountsController +from erpnext.setup.utils import get_exchange_rate as _get_exchange_rate class StockAccountInvalidTransaction(frappe.ValidationError): @@ -354,7 +355,6 @@ class JournalEntry(AccountsController): def apply_tax_withholding(self): from erpnext.accounts.report.general_ledger.general_ledger import get_account_type_map - from erpnext.setup.utils import get_exchange_rate if not self.apply_tds or self.voucher_type not in ("Debit Note", "Credit Note"): return @@ -421,7 +421,7 @@ class JournalEntry(AccountsController): acc_curr = get_account_currency(tax_acc) comp_curr = frappe.get_cached_value("Company", self.company, "default_currency") - exch_rate = get_exchange_rate(acc_curr, comp_curr, self.posting_date) + exch_rate = _get_exchange_rate(acc_curr, comp_curr, self.posting_date) tax_amt_in_comp_curr = flt(tax_details.get("tax_amount"), precision) tax_amt_in_acc_curr = flt(tax_amt_in_comp_curr / exch_rate, precision) @@ -1808,8 +1808,6 @@ def get_exchange_rate( credit=None, exchange_rate=None, ): - from erpnext.setup.utils import get_exchange_rate - account_details = frappe.get_cached_value( "Account", account, ["account_type", "root_type", "account_currency", "company"], as_dict=1 ) @@ -1832,7 +1830,7 @@ def get_exchange_rate( # The date used to retreive the exchange rate here is the date passed # in as an argument to this function. elif (not exchange_rate or flt(exchange_rate) == 1) and account_currency and posting_date: - exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date) + exchange_rate = _get_exchange_rate(account_currency, company_currency, posting_date) else: exchange_rate = 1 From 2112f36577d8de4eaa655894cbd3896294178407 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 9 Oct 2025 13:32:45 +0530 Subject: [PATCH 010/328] fix: add cost center to tds row in journal entry --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index d359a0689e1..294353eca16 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -442,6 +442,7 @@ class JournalEntry(AccountsController): "account": tax_acc, "account_currency": acc_curr, "exchange_rate": exch_rate, + "cost_center": tax_details.get("cost_center"), "debit": 0, "credit": 0, "debit_in_account_currency": 0, From 88f6d783b427c1c843acce8669dd3717c9b35687 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 9 Oct 2025 13:44:32 +0530 Subject: [PATCH 011/328] fix: include grand_total in journal entry and handle taxes correctly in invoice total calculation --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 1 + .../tax_withholding_category/tax_withholding_category.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 294353eca16..71220186dc7 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -409,6 +409,7 @@ class JournalEntry(AccountsController): "posting_date": self.posting_date, "tax_withholding_net_total": net_total, "base_tax_withholding_net_total": net_total, + "grand_total": net_total, } ) diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py index 4c727a41015..b1c0f426d99 100644 --- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py +++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py @@ -724,7 +724,7 @@ def get_advance_adjusted_in_invoice(inv): def get_invoice_total_without_tcs(inv, tax_details): - tcs_tax_row = [d for d in inv.taxes if d.account_head == tax_details.account_head] + tcs_tax_row = [d for d in inv.get("taxes") or [] if d.account_head == tax_details.account_head] tcs_tax_row_amount = tcs_tax_row[0].base_tax_amount if tcs_tax_row else 0 return inv.grand_total - tcs_tax_row_amount From 2de9f8f2e256cfd4c7d2b72e5e7c70f8a5532f45 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Tue, 14 Oct 2025 17:30:22 +0530 Subject: [PATCH 012/328] test: add TDS and TCS calculations for journal entries in Debit and Credit Notes --- .../test_tax_withholding_category.py | 160 ++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py index b2b05045c3e..84b381e2e1e 100644 --- a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py +++ b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py @@ -849,6 +849,84 @@ class TestTaxWithholdingCategory(IntegrationTestCase): self.assertEqual(payment.taxes[0].tax_amount, 6000) self.assertEqual(payment.taxes[0].allocated_amount, 6000) + def test_tds_on_journal_entry_for_supplier(self): + """Test TDS deduction for Supplier in Debit Note""" + frappe.db.set_value( + "Supplier", "Test TDS Supplier", "tax_withholding_category", "Cumulative Threshold TDS" + ) + + jv = make_journal_entry_with_tax_withholding( + party_type="Supplier", + party="Test TDS Supplier", + voucher_type="Debit Note", + amount=50000, + save=False, + ) + jv.apply_tds = 1 + jv.tax_withholding_category = "Cumulative Threshold TDS" + jv.save() + jv.submit() + + # TDS = 50000 * 10% = 5000 + self.assertEqual(len(jv.accounts), 3) + + # Find TDS account row + tds_row = None + supplier_row = None + for row in jv.accounts: + if row.account == "TDS - _TC": + tds_row = row + elif row.party == "Test TDS Supplier": + supplier_row = row + + self.assertEqual(tds_row.credit, 5000) + self.assertEqual(tds_row.debit, 0) + + # Supplier amount should be reduced by TDS + self.assertEqual(supplier_row.credit, 45000) + + jv.cancel() + + def test_tcs_on_journal_entry_for_customer(self): + """Test TCS collection for Customer in Credit Note""" + frappe.db.set_value( + "Customer", "Test TCS Customer", "tax_withholding_category", "Cumulative Threshold TCS" + ) + + # Create Credit Note with amount exceeding threshold + jv = make_journal_entry_with_tax_withholding( + party_type="Customer", + party="Test TCS Customer", + voucher_type="Credit Note", + amount=50000, + save=False, + ) + jv.apply_tds = 1 + jv.tax_withholding_category = "Cumulative Threshold TCS" + jv.save() + jv.submit() + + # Assert TCS calculation (10% on amount above threshold of 30000) + self.assertEqual(len(jv.accounts), 3) + + # Find TCS account row + tcs_row = None + customer_row = None + for row in jv.accounts: + if row.account == "TCS - _TC": + tcs_row = row + elif row.party == "Test TCS Customer": + customer_row = row + + # TCS should be credited (liability to government) + self.assertEqual(tcs_row.credit, 2000) # above threshold 20000*10% + self.assertEqual(tcs_row.debit, 0) + + # Customer amount should be increased by TCS + self.assertEqual(customer_row.debit, 52000) + + jv.cancel() + def cancel_invoices(): purchase_invoices = frappe.get_all( @@ -997,6 +1075,88 @@ def create_payment_entry(**args): return pe +def make_journal_entry_with_tax_withholding( + party_type, + party, + voucher_type, + amount, + cost_center=None, + posting_date=None, + save=True, + submit=False, +): + """Helper function to create Journal Entry for tax withholding""" + if not cost_center: + cost_center = "_Test Cost Center - _TC" + + jv = frappe.new_doc("Journal Entry") + jv.posting_date = posting_date or today() + jv.company = "_Test Company" + jv.voucher_type = voucher_type + jv.multi_currency = 0 + + if party_type == "Supplier": + # Debit Note: Expense Dr, Supplier Cr + expense_account = "Stock Received But Not Billed - _TC" + party_account = "Creditors - _TC" + + jv.append( + "accounts", + { + "account": expense_account, + "cost_center": cost_center, + "debit_in_account_currency": amount, + "exchange_rate": 1, + }, + ) + + jv.append( + "accounts", + { + "account": party_account, + "party_type": party_type, + "party": party, + "cost_center": cost_center, + "credit_in_account_currency": amount, + "exchange_rate": 1, + }, + ) + else: # Customer + # Credit Note: Customer Dr, Income Cr + party_account = "Debtors - _TC" + income_account = "Sales - _TC" + + jv.append( + "accounts", + { + "account": party_account, + "party_type": party_type, + "party": party, + "cost_center": cost_center, + "debit_in_account_currency": amount, + "exchange_rate": 1, + }, + ) + + jv.append( + "accounts", + { + "account": income_account, + "cost_center": cost_center, + "credit_in_account_currency": amount, + "exchange_rate": 1, + }, + ) + + if save or submit: + jv.insert() + + if submit: + jv.submit() + + return jv + + def create_records(): # create a new suppliers for name in [ From cf1d892d60f9c0622640623066819aa855028cef Mon Sep 17 00:00:00 2001 From: dharanidharan2813 Date: Fri, 17 Oct 2025 13:16:02 +0530 Subject: [PATCH 013/328] fix: Payment Terms auto-fetched in Sales Invoice even when automatically_fetch_payment_terms is disabled --- .../doctype/sales_order/sales_order.py | 1 - .../doctype/sales_order/test_sales_order.py | 35 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 95eaa788cab..431fb663664 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -1399,7 +1399,6 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False, a "doctype": "Sales Invoice", "field_map": { "party_account_currency": "party_account_currency", - "payment_terms_template": "payment_terms_template", }, "field_no_map": ["payment_terms_template"], "validation": {"docstatus": ["=", 1]}, diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 2d01539ca04..0dc0b8c605f 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -177,6 +177,9 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): so.load_from_db() self.assertEqual(so.per_billed, 0) + @IntegrationTestCase.change_settings( + "Accounts Settings", {"automatically_fetch_payment_terms": 1} + ) # Enable auto fetch def test_make_sales_invoice_with_terms(self): so = make_sales_order(do_not_submit=True) @@ -205,6 +208,38 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): si1 = make_sales_invoice(so.name) self.assertEqual(len(si1.get("items")), 0) + @IntegrationTestCase.change_settings( + "Accounts Settings", {"automatically_fetch_payment_terms": 1} + ) # Enable auto fetch + def test_auto_fetch_terms_enable(self): + so = make_sales_order(do_not_submit=True) + + so.payment_terms_template = "_Test Payment Term Template" + so.save() + so.submit() + + si = make_sales_invoice(so.name) + # Check if payment terms are copied from sales order to sales invoice + self.assertTrue(si.payment_terms_template) + si.insert() + si.submit() + + @IntegrationTestCase.change_settings( + "Accounts Settings", {"automatically_fetch_payment_terms": 0} + ) # Disable auto fetch + def test_auto_fetch_terms_disable(self): + so = make_sales_order(do_not_submit=True) + + so.payment_terms_template = "_Test Payment Term Template" + so.save() + so.submit() + + si = make_sales_invoice(so.name) + # Check if payment terms are not copied from sales order to sales invoice + self.assertFalse(si.payment_terms_template) + si.insert() + si.submit() + def test_update_qty(self): so = make_sales_order() From 800a44a65ffe9a3ec6516a55c9515b4c86bbea7e Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Wed, 5 Nov 2025 14:03:45 +0000 Subject: [PATCH 014/328] fix: add validation for company linked address fields --- erpnext/controllers/accounts_controller.py | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 7272202ee33..daff48d2230 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -303,6 +303,31 @@ class AccountsController(TransactionBase): self.set_default_letter_head() self.validate_company_in_accounting_dimension() self.validate_party_address_and_contact() + self.validate_company_linked_addresses() + + def validate_company_linked_addresses(self): + address_fields = [] + if self.doctype in ("Quotation", "Sales Order", "Delivery Note", "Sales Invoice"): + address_fields = ["dispatch_address_name", "company_address"] + elif self.doctype in ("Purchase Order", "Purchase Receipt", "Purchase Invoice", "Supplier Quotation"): + address_fields = ["billing_address", "shipping_address"] + + for field in address_fields: + address = self.get(field) + if address and not frappe.db.exists( + "Dynamic Link", + { + "parent": address, + "parenttype": "Address", + "link_doctype": "Company", + "link_name": self.company, + }, + ): + frappe.throw( + _("{0} does not belong to the {1}.").format( + _(self.meta.get_label(field)), bold(self.company) + ) + ) def set_default_letter_head(self): if hasattr(self, "letter_head") and not self.letter_head: From e10007c6468c545f09e394f5dea7010fd5772669 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Wed, 5 Nov 2025 15:02:57 +0000 Subject: [PATCH 015/328] test: add test for company linked address fields --- .../tests/test_accounts_controller.py | 121 +++++++++++++++++- 1 file changed, 120 insertions(+), 1 deletion(-) diff --git a/erpnext/controllers/tests/test_accounts_controller.py b/erpnext/controllers/tests/test_accounts_controller.py index 4181894c9d5..82c2cd5482e 100644 --- a/erpnext/controllers/tests/test_accounts_controller.py +++ b/erpnext/controllers/tests/test_accounts_controller.py @@ -16,9 +16,16 @@ from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_pay from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice from erpnext.accounts.party import get_party_account -from erpnext.buying.doctype.purchase_order.test_purchase_order import prepare_data_for_internal_transfer +from erpnext.buying.doctype.purchase_order.test_purchase_order import ( + create_purchase_order, + prepare_data_for_internal_transfer, +) from erpnext.projects.doctype.project.test_project import make_project +from erpnext.selling.doctype.quotation.test_quotation import make_quotation +from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order +from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note from erpnext.stock.doctype.item.test_item import create_item +from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt def make_customer(customer_name, currency=None): @@ -2228,6 +2235,30 @@ class TestAccountsController(IntegrationTestCase): supplier_shipping.append("links", {"link_doctype": "Supplier", "link_name": "_Test Supplier"}) supplier_shipping.save() + company_address = make_address( + address_title="Company", address_type="Shipping", address_line1="100", city="Mumbai" + ) + company_address.append("links", {"link_doctype": "Company", "link_name": "_Test Company"}) + company_address.save() + + q = make_quotation(do_not_save=True, qty=10) + q.company_address = supplier_shipping.name + self.assertRaises(frappe.ValidationError, q.save) + q.company_address = company_address.name + q.save() + + so = make_sales_order(do_not_save=True) + so.company_address = supplier_shipping.name + self.assertRaises(frappe.ValidationError, so.save) + so.company_address = company_address.name + so.save() + + so.dispatch_address_name = supplier_shipping.name + self.assertRaises(frappe.ValidationError, so.save) + so.dispatch_address_name = company_address.name + so.reload() + so.save() + si = create_sales_invoice(do_not_save=True) si.customer_address = supplier_billing.name self.assertRaises(frappe.ValidationError, si.save) @@ -2240,12 +2271,100 @@ class TestAccountsController(IntegrationTestCase): si.reload() si.save() + si.company_address = supplier_shipping.name + self.assertRaises(frappe.ValidationError, si.save) + si.company_address = company_address.name + si.reload() + si.save() + + si.dispatch_address_name = supplier_shipping.name + self.assertRaises(frappe.ValidationError, si.save) + si.dispatch_address_name = company_address.name + si.reload() + si.save() + + dn = create_delivery_note(do_not_save=True, qty=10) + dn.company_address = supplier_shipping.name + self.assertRaises(frappe.ValidationError, dn.save) + dn.company_address = company_address.name + dn.save() + + dn.dispatch_address_name = supplier_shipping.name + self.assertRaises(frappe.ValidationError, dn.save) + dn.dispatch_address_name = company_address.name + dn.reload() + dn.save() + + sq = frappe.new_doc("Supplier Quotation") + sq.naming_series = "PUR-SQTN-.YYYY.-" + sq.supplier = "_Test Supplier" + sq.company = "_Test Company" + sq.append( + "items", + { + "item_code": "_Test Item", + "item_name": "_Test Item", + "description": "_Test Item", + "warehouse": "_Test Warehouse - _TC", + "qty": 1, + "uom": "Nos", + "stock_uom": "Nos", + "rate": 100, + }, + ) + sq.shipping_address = customer_shipping.name + self.assertRaises(frappe.ValidationError, sq.save) + sq.shipping_address = company_address.name + sq.save() + + sq.billing_address = customer_shipping.name + self.assertRaises(frappe.ValidationError, sq.save) + sq.billing_address = company_address.name + sq.reload() + sq.save() + + po = create_purchase_order(do_not_save=True) + po.shipping_address = customer_shipping.name + self.assertRaises(frappe.ValidationError, po.save) + po.shipping_address = company_address.name + po.save() + + po.billing_address = supplier_billing.name + self.assertRaises(frappe.ValidationError, po.save) + po.billing_address = company_address.name + po.reload() + po.save() + pi = make_purchase_invoice(do_not_save=True) pi.supplier_address = customer_shipping.name self.assertRaises(frappe.ValidationError, pi.save) pi.supplier_address = supplier_shipping.name pi.save() + pi.billing_address = customer_shipping.name + self.assertRaises(frappe.ValidationError, pi.save) + pi.billing_address = company_address.name + pi.reload() + pi.save() + + pi.shipping_address = customer_shipping.name + self.assertRaises(frappe.ValidationError, pi.save) + pi.shipping_address = company_address.name + pi.reload() + pi.save() + + pr = make_purchase_receipt(do_not_save=True) + pr.shipping_address = customer_shipping.name + self.assertRaises(frappe.ValidationError, pr.save) + pr.shipping_address = company_address.name + pr.save() + + pr.billing_address = customer_shipping.name + self.assertRaises(frappe.ValidationError, pr.save) + pr.billing_address = company_address.name + pr.reload() + pr.save() + def test_party_contact(self): from frappe.contacts.doctype.contact.test_contact import create_contact From 5a3fcbedb55ca46376657f8b62e3036e2390c1a4 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Tue, 11 Nov 2025 10:26:31 +0000 Subject: [PATCH 016/328] fix: use current_tax_amount value for base_total_taxes_and_charges --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 07d129c26dd..1cda9d239da 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -1873,7 +1873,7 @@ class PaymentEntry(AccountsController): else: self.total_taxes_and_charges += current_tax_amount - self.base_total_taxes_and_charges += tax.base_tax_amount + self.base_total_taxes_and_charges += current_tax_amount if self.get("taxes"): self.paid_amount_after_tax = self.get("taxes")[-1].base_total From e64b6db2eb8055344c853d47fabc5ce4f9a1d46a Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Tue, 11 Nov 2025 13:18:05 +0000 Subject: [PATCH 017/328] test: add minimal test case --- .../tests/test_accounts_controller.py | 147 ++++-------------- 1 file changed, 31 insertions(+), 116 deletions(-) diff --git a/erpnext/controllers/tests/test_accounts_controller.py b/erpnext/controllers/tests/test_accounts_controller.py index 20f7e10fe60..08ffa636329 100644 --- a/erpnext/controllers/tests/test_accounts_controller.py +++ b/erpnext/controllers/tests/test_accounts_controller.py @@ -21,11 +21,7 @@ from erpnext.buying.doctype.purchase_order.test_purchase_order import ( prepare_data_for_internal_transfer, ) from erpnext.projects.doctype.project.test_project import make_project -from erpnext.selling.doctype.quotation.test_quotation import make_quotation -from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order -from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note from erpnext.stock.doctype.item.test_item import create_item -from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt def make_customer(customer_name, currency=None): @@ -2235,30 +2231,6 @@ class TestAccountsController(IntegrationTestCase): supplier_shipping.append("links", {"link_doctype": "Supplier", "link_name": "_Test Supplier"}) supplier_shipping.save() - company_address = make_address( - address_title="Company", address_type="Shipping", address_line1="100", city="Mumbai" - ) - company_address.append("links", {"link_doctype": "Company", "link_name": "_Test Company"}) - company_address.save() - - q = make_quotation(do_not_save=True, qty=10) - q.company_address = supplier_shipping.name - self.assertRaises(frappe.ValidationError, q.save) - q.company_address = company_address.name - q.save() - - so = make_sales_order(do_not_save=True) - so.company_address = supplier_shipping.name - self.assertRaises(frappe.ValidationError, so.save) - so.company_address = company_address.name - so.save() - - so.dispatch_address_name = supplier_shipping.name - self.assertRaises(frappe.ValidationError, so.save) - so.dispatch_address_name = company_address.name - so.reload() - so.save() - si = create_sales_invoice(do_not_save=True) si.customer_address = supplier_billing.name self.assertRaises(frappe.ValidationError, si.save) @@ -2271,100 +2243,12 @@ class TestAccountsController(IntegrationTestCase): si.reload() si.save() - si.company_address = supplier_shipping.name - self.assertRaises(frappe.ValidationError, si.save) - si.company_address = company_address.name - si.reload() - si.save() - - si.dispatch_address_name = supplier_shipping.name - self.assertRaises(frappe.ValidationError, si.save) - si.dispatch_address_name = company_address.name - si.reload() - si.save() - - dn = create_delivery_note(do_not_save=True, qty=10) - dn.company_address = supplier_shipping.name - self.assertRaises(frappe.ValidationError, dn.save) - dn.company_address = company_address.name - dn.save() - - dn.dispatch_address_name = supplier_shipping.name - self.assertRaises(frappe.ValidationError, dn.save) - dn.dispatch_address_name = company_address.name - dn.reload() - dn.save() - - sq = frappe.new_doc("Supplier Quotation") - sq.naming_series = "PUR-SQTN-.YYYY.-" - sq.supplier = "_Test Supplier" - sq.company = "_Test Company" - sq.append( - "items", - { - "item_code": "_Test Item", - "item_name": "_Test Item", - "description": "_Test Item", - "warehouse": "_Test Warehouse - _TC", - "qty": 1, - "uom": "Nos", - "stock_uom": "Nos", - "rate": 100, - }, - ) - sq.shipping_address = customer_shipping.name - self.assertRaises(frappe.ValidationError, sq.save) - sq.shipping_address = company_address.name - sq.save() - - sq.billing_address = customer_shipping.name - self.assertRaises(frappe.ValidationError, sq.save) - sq.billing_address = company_address.name - sq.reload() - sq.save() - - po = create_purchase_order(do_not_save=True) - po.shipping_address = customer_shipping.name - self.assertRaises(frappe.ValidationError, po.save) - po.shipping_address = company_address.name - po.save() - - po.billing_address = supplier_billing.name - self.assertRaises(frappe.ValidationError, po.save) - po.billing_address = company_address.name - po.reload() - po.save() - pi = make_purchase_invoice(do_not_save=True) pi.supplier_address = customer_shipping.name self.assertRaises(frappe.ValidationError, pi.save) pi.supplier_address = supplier_shipping.name pi.save() - pi.billing_address = customer_shipping.name - self.assertRaises(frappe.ValidationError, pi.save) - pi.billing_address = company_address.name - pi.reload() - pi.save() - - pi.shipping_address = customer_shipping.name - self.assertRaises(frappe.ValidationError, pi.save) - pi.shipping_address = company_address.name - pi.reload() - pi.save() - - pr = make_purchase_receipt(do_not_save=True) - pr.shipping_address = customer_shipping.name - self.assertRaises(frappe.ValidationError, pr.save) - pr.shipping_address = company_address.name - pr.save() - - pr.billing_address = customer_shipping.name - self.assertRaises(frappe.ValidationError, pr.save) - pr.billing_address = company_address.name - pr.reload() - pr.save() - def test_party_contact(self): from frappe.contacts.doctype.contact.test_contact import create_contact @@ -2551,3 +2435,34 @@ class TestAccountsController(IntegrationTestCase): # Second return should only get remaining discount (100 - 60 = 40) self.assertEqual(return_si_2.discount_amount, -40) + + def test_company_linked_address(self): + from erpnext.crm.doctype.prospect.test_prospect import make_address + + company_address = make_address( + address_title="Company", address_type="Shipping", address_line1="100", city="Mumbai" + ) + company_address.append("links", {"link_doctype": "Company", "link_name": "_Test Company"}) + company_address.save() + + customer_shipping = make_address( + address_title="Customer", address_type="Shipping", address_line1="10" + ) + customer_shipping.append("links", {"link_doctype": "Customer", "link_name": "_Test Customer"}) + customer_shipping.save() + + supplier_billing = make_address(address_title="Supplier", address_line1="2", city="Ahmedabad") + supplier_billing.append("links", {"link_doctype": "Supplier", "link_name": "_Test Supplier"}) + supplier_billing.save() + + po = create_purchase_order(do_not_save=True) + po.shipping_address = customer_shipping.name + self.assertRaises(frappe.ValidationError, po.save) + po.shipping_address = company_address.name + po.save() + + po.billing_address = supplier_billing.name + self.assertRaises(frappe.ValidationError, po.save) + po.billing_address = company_address.name + po.reload() + po.save() From 231479a6e2e6b8ca97d4c58036c6ac4755c83c63 Mon Sep 17 00:00:00 2001 From: l0gesh29 Date: Mon, 17 Nov 2025 13:42:43 +0530 Subject: [PATCH 018/328] fix(ledger-summary-report): show party group and territory --- .../customer_ledger_summary.py | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) 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 6762d6d9cf3..1259430834e 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py @@ -69,12 +69,18 @@ class PartyLedgerSummaryReport: party_type = self.filters.party_type doctype = qb.DocType(party_type) + + party_details_fields = [ + doctype.name.as_("party"), + f"{scrub(party_type)}_name", + f"{scrub(party_type)}_group", + ] + + if party_type == "Customer": + party_details_fields.append(doctype.territory) + conditions = self.get_party_conditions(doctype) - query = ( - qb.from_(doctype) - .select(doctype.name.as_("party"), f"{scrub(party_type)}_name") - .where(Criterion.all(conditions)) - ) + query = qb.from_(doctype).select(*party_details_fields).where(Criterion.all(conditions)) from frappe.desk.reportview import build_match_conditions @@ -153,6 +159,31 @@ class PartyLedgerSummaryReport: credit_or_debit_note = "Credit Note" if self.filters.party_type == "Customer" else "Debit Note" + if self.filters.party_type == "Customer": + columns += [ + { + "label": _("Customer Group"), + "fieldname": "customer_group", + "fieldtype": "Link", + "options": "Customer Group", + }, + { + "label": _("Territory"), + "fieldname": "territory", + "fieldtype": "Link", + "options": "Territory", + }, + ] + else: + columns += [ + { + "label": _("Supplier Group"), + "fieldname": "supplier_group", + "fieldtype": "Link", + "options": "Supplier Group", + } + ] + columns += [ { "label": _("Opening Balance"), @@ -214,35 +245,6 @@ class PartyLedgerSummaryReport: }, ] - # Hidden columns for handling 'User Permissions' - if self.filters.party_type == "Customer": - columns += [ - { - "label": _("Territory"), - "fieldname": "territory", - "fieldtype": "Link", - "options": "Territory", - "hidden": 1, - }, - { - "label": _("Customer Group"), - "fieldname": "customer_group", - "fieldtype": "Link", - "options": "Customer Group", - "hidden": 1, - }, - ] - else: - columns += [ - { - "label": _("Supplier Group"), - "fieldname": "supplier_group", - "fieldtype": "Link", - "options": "Supplier Group", - "hidden": 1, - } - ] - columns.append({"label": _("Dr/Cr"), "fieldname": "dr_or_cr", "fieldtype": "Data", "width": 100}) return columns From 8f91919933e5c7ada6e10152e98d9fbcd57c9b63 Mon Sep 17 00:00:00 2001 From: l0gesh29 Date: Tue, 18 Nov 2025 13:42:45 +0530 Subject: [PATCH 019/328] test: add party_group, territory in json --- .../customer_ledger_summary/test_customer_ledger_summary.py | 4 ++++ 1 file changed, 4 insertions(+) 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 78174b097bd..14e88afca39 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 @@ -186,6 +186,8 @@ class TestCustomerLedgerSummary(AccountsTestMixin, IntegrationTestCase): expected = { "party": "_Test Customer", "customer_name": "_Test Customer", + "customer_group": "_Test Customer Group", + "territory": "_Test Territory", "party_name": "_Test Customer", "opening_balance": 0, "invoiced_amount": 100.0, @@ -213,6 +215,8 @@ class TestCustomerLedgerSummary(AccountsTestMixin, IntegrationTestCase): expected = { "party": "_Test Customer", "customer_name": "_Test Customer", + "customer_group": "_Test Customer Group", + "territory": "_Test Territory", "party_name": "_Test Customer", "opening_balance": 0, "invoiced_amount": 100.0, From 57f9353d90be7bdc393c647dee1c0b5d9b07a095 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Wed, 19 Nov 2025 14:19:26 +0000 Subject: [PATCH 020/328] fix(manufacturing): apply precision for bom amount and rm_cost_per_qty --- erpnext/manufacturing/doctype/bom/bom.py | 4 +++- .../doctype/subcontracting_order/subcontracting_order.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index b020b7c5fcf..f707aa6dde1 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -914,7 +914,9 @@ class BOM(WebsiteGenerator): ) d.base_rate = flt(d.rate) * flt(self.conversion_rate) - d.amount = flt(d.rate, d.precision("rate")) * flt(d.qty, d.precision("qty")) + d.amount = flt( + flt(d.rate, d.precision("rate")) * flt(d.qty, d.precision("qty")), d.precision("amount") + ) d.base_amount = d.amount * flt(self.conversion_rate) d.qty_consumed_per_unit = flt(d.stock_qty, d.precision("stock_qty")) / flt( self.quantity, self.precision("quantity") diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py index dc5f11953c4..221396f64d4 100644 --- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py @@ -202,7 +202,7 @@ class SubcontractingOrder(SubcontractingController): for item in self.get("items"): bom = frappe.get_doc("BOM", item.bom) rm_cost = sum(flt(rm_item.amount) for rm_item in bom.items) - item.rm_cost_per_qty = rm_cost / flt(bom.quantity) + item.rm_cost_per_qty = flt(rm_cost / flt(bom.quantity), item.precision("rm_cost_per_qty")) def calculate_items_qty_and_amount(self): total_qty = total = 0 From 4b612c64a8d191a00aec5363f52399b4c0f4bbb4 Mon Sep 17 00:00:00 2001 From: Jatin3128 Date: Thu, 20 Nov 2025 12:38:09 +0530 Subject: [PATCH 021/328] fix(payment reconciliation): added a hint that posting date can be changed on exchange gain/loss reconcile dialog --- .../doctype/payment_reconciliation/payment_reconciliation.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js index 74a9f709caa..0732e2a7f0e 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js @@ -334,7 +334,9 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo }, { fieldtype: "HTML", - options: " New Journal Entry will be posted for the difference amount ", + options: __( + "New Journal Entry will be posted for the difference amount. The Posting Date can be modified." + ).bold(), }, ], primary_action: () => { From 9194e6350aa92e88e10638718c1121c55ea45300 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Fri, 21 Nov 2025 06:43:20 +0000 Subject: [PATCH 022/328] fix: apply precision for scrap items amount --- erpnext/manufacturing/doctype/bom/bom.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index d65d42a086b..96e0afd2a27 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -941,7 +941,10 @@ class BOM(WebsiteGenerator): d.base_rate = flt(d.rate, d.precision("rate")) * flt( self.conversion_rate, self.precision("conversion_rate") ) - d.amount = flt(d.rate, d.precision("rate")) * flt(d.stock_qty, d.precision("stock_qty")) + d.amount = flt( + flt(d.rate, d.precision("rate")) * flt(d.stock_qty, d.precision("stock_qty")), + d.precision("amount"), + ) d.base_amount = flt(d.amount, d.precision("amount")) * flt( self.conversion_rate, self.precision("conversion_rate") ) From 3404419a1f6df3345245820cea28e331726c9cb9 Mon Sep 17 00:00:00 2001 From: frappe-pr-bot Date: Sun, 23 Nov 2025 09:36:01 +0000 Subject: [PATCH 023/328] chore: update POT file --- erpnext/locale/main.pot | 2844 +++++++++++++++++++++------------------ 1 file changed, 1517 insertions(+), 1327 deletions(-) diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot index 26a8510cbcd..8f9d886a0e3 100644 --- a/erpnext/locale/main.pot +++ b/erpnext/locale/main.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ERPNext VERSION\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2025-11-16 09:35+0000\n" -"PO-Revision-Date: 2025-11-16 09:35+0000\n" +"POT-Creation-Date: 2025-11-23 09:35+0000\n" +"PO-Revision-Date: 2025-11-23 09:35+0000\n" "Last-Translator: hello@frappe.io\n" "Language-Team: hello@frappe.io\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" msgid " Address" msgstr "" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:677 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:603 msgid " Amount" msgstr "" @@ -33,6 +33,11 @@ msgstr "" msgid " BOM" msgstr "" +#. Label of the default_wip_warehouse (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid " Default Work In Progress Warehouse " +msgstr "" + #. Label of the istable (Check) field in DocType 'Inventory Dimension' #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json msgid " Is Child Table" @@ -43,18 +48,23 @@ msgstr "" msgid " Is Subcontracted" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:174 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:196 msgid " Item" msgstr "" #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:206 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107 #: erpnext/selling/report/sales_analytics/sales_analytics.py:128 msgid " Name" msgstr "" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:668 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:144 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:185 +msgid " Phantom Item" +msgstr "" + +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:594 msgid " Rate" msgstr "" @@ -68,7 +78,7 @@ msgid " Skip Material Transfer" msgstr "" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:133 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:163 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:174 msgid " Sub Assembly" msgstr "" @@ -139,7 +149,7 @@ msgstr "" msgid "% Delivered" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:945 +#: erpnext/manufacturing/doctype/bom/bom.js:953 #, python-format msgid "% Finished Item Quantity" msgstr "" @@ -154,8 +164,8 @@ msgstr "" msgid "% Occupied" msgstr "" -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:285 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:340 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:288 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:338 msgid "% Of Grand Total" msgstr "" @@ -244,11 +254,11 @@ msgstr "" msgid "% of materials delivered against this Sales Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:2295 +#: erpnext/controllers/accounts_controller.py:2303 msgid "'Account' in the Accounting section of Customer {0}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:346 +#: erpnext/selling/doctype/sales_order/sales_order.py:348 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'" msgstr "" @@ -260,7 +270,7 @@ msgstr "" msgid "'Days Since Last Order' must be greater than or equal to zero" msgstr "" -#: erpnext/controllers/accounts_controller.py:2300 +#: erpnext/controllers/accounts_controller.py:2308 msgid "'Default {0} Account' in Company {1}" msgstr "" @@ -290,8 +300,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:598 -#: erpnext/stock/report/stock_ledger/stock_ledger.py:631 +#: erpnext/stock/report/stock_ledger/stock_ledger.py:601 +#: erpnext/stock/report/stock_ledger/stock_ledger.py:634 msgid "'Opening'" msgstr "" @@ -305,11 +315,11 @@ msgstr "" msgid "'To Package No.' cannot be less than 'From Package No.'" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:81 +#: erpnext/controllers/sales_and_purchase_return.py:80 msgid "'Update Stock' can not be checked because items are not delivered via {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:439 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:441 msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "" @@ -321,8 +331,8 @@ msgstr "" msgid "'{0}' has been already added." msgstr "" -#: erpnext/setup/doctype/company/company.py:259 -#: erpnext/setup/doctype/company/company.py:270 +#: erpnext/setup/doctype/company/company.py:290 +#: erpnext/setup/doctype/company/company.py:301 msgid "'{0}' should be in company currency {1}." msgstr "" @@ -731,7 +741,7 @@ msgstr "" msgid "
  • Clearance date must be after cheque date for row(s): {0}
    • " msgstr "" -#: erpnext/controllers/accounts_controller.py:2188 +#: erpnext/controllers/accounts_controller.py:2196 msgid "
  • Item {0} in row(s) {1} billed more than {2}
    • " msgstr "" @@ -743,7 +753,7 @@ msgstr "" msgid "
  • {}
    • " msgstr "" -#: erpnext/controllers/accounts_controller.py:2185 +#: erpnext/controllers/accounts_controller.py:2193 msgid "

    Cannot overbill for the following Items:

    " msgstr "" @@ -788,7 +798,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:2197 +#: erpnext/controllers/accounts_controller.py:2205 msgid "

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

    " msgstr "" @@ -851,6 +861,7 @@ msgstr "" #. Header text in the Projects Workspace #. Header text in the Selling Workspace #. Header text in the Home Workspace +#. Header text in the Subcontracting Workspace #. Header text in the Support Workspace #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/payables/payables.json @@ -861,19 +872,13 @@ msgstr "" #: erpnext/projects/workspace/projects/projects.json #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/workspace/home/home.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json #: erpnext/support/workspace/support/support.json msgid "Reports & Masters" msgstr "" -#. Header text in the Settings Workspace -#: erpnext/setup/workspace/settings/settings.json -msgid "Settings" -msgstr "" - -#. Header text in the Accounting Workspace #. Header text in the Payables Workspace #. Header text in the Receivables Workspace -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/payables/payables.json #: erpnext/accounts/workspace/receivables/receivables.json msgid "Shortcuts" @@ -898,6 +903,7 @@ msgstr "" #. Header text in the Projects Workspace #. Header text in the Quality Workspace #. Header text in the Home Workspace +#. Header text in the Subcontracting Workspace #. Header text in the Support Workspace #: erpnext/assets/workspace/assets/assets.json #: erpnext/buying/workspace/buying/buying.json @@ -906,6 +912,7 @@ msgstr "" #: erpnext/projects/workspace/projects/projects.json #: erpnext/quality_management/workspace/quality/quality.json #: erpnext/setup/workspace/home/home.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json #: erpnext/support/workspace/support/support.json msgid "Your Shortcuts" msgstr "" @@ -969,7 +976,7 @@ msgstr "" msgid "A - C" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:314 +#: erpnext/selling/doctype/customer/customer.py:323 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group" msgstr "" @@ -1003,7 +1010,7 @@ msgstr "" msgid "A Reverse Journal Entry {0} already exists for this Journal Entry." msgstr "" -#: erpnext/setup/doctype/company/company.py:1037 +#: erpnext/setup/doctype/company/company.py:1068 msgid "A Transaction Deletion Document: {0} is triggered for {0}" msgstr "" @@ -1103,11 +1110,11 @@ msgstr "" msgid "Abbreviation" msgstr "" -#: erpnext/setup/doctype/company/company.py:194 +#: erpnext/setup/doctype/company/company.py:225 msgid "Abbreviation already used for another company" msgstr "" -#: erpnext/setup/doctype/company/company.py:191 +#: erpnext/setup/doctype/company/company.py:222 msgid "Abbreviation is mandatory" msgstr "" @@ -1310,8 +1317,8 @@ msgstr "" msgid "Account Manager" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1034 -#: erpnext/controllers/accounts_controller.py:2304 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1036 +#: erpnext/controllers/accounts_controller.py:2312 msgid "Account Missing" msgstr "" @@ -1393,7 +1400,7 @@ msgstr "" msgid "Account Type" msgstr "" -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:125 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:128 msgid "Account Value" msgstr "" @@ -1415,6 +1422,10 @@ msgstr "" msgid "Account for Change Amount" msgstr "" +#: erpnext/accounts/doctype/budget/budget.py:149 +msgid "Account is mandatory" +msgstr "" + #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:46 msgid "Account is mandatory to get payment entries" msgstr "" @@ -1460,12 +1471,12 @@ msgstr "" msgid "Account {0} cannot be disabled as it is already set as {1} for {2}." msgstr "" -#: erpnext/setup/doctype/company/company.py:241 -msgid "Account {0} does not belong to company: {1}" +#: erpnext/accounts/doctype/budget/budget.py:158 +msgid "Account {0} does not belong to company {1}" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:104 -msgid "Account {0} does not belongs to company {1}" +#: erpnext/setup/doctype/company/company.py:272 +msgid "Account {0} does not belong to company: {1}" msgstr "" #: erpnext/accounts/doctype/account/account.py:585 @@ -1492,15 +1503,11 @@ msgstr "" msgid "Account {0} exists in parent company {1}." msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:114 -msgid "Account {0} has been entered multiple times" -msgstr "" - #: erpnext/accounts/doctype/account/account.py:409 msgid "Account {0} is added in the child company {1}" msgstr "" -#: erpnext/setup/doctype/company/company.py:230 +#: erpnext/setup/doctype/company/company.py:261 msgid "Account {0} is disabled." msgstr "" @@ -1508,7 +1515,7 @@ msgstr "" msgid "Account {0} is frozen" msgstr "" -#: erpnext/controllers/accounts_controller.py:1391 +#: erpnext/controllers/accounts_controller.py:1399 msgid "Account {0} is invalid. Account Currency must be {1}" msgstr "" @@ -1540,11 +1547,11 @@ msgstr "" msgid "Account: {0} can only be updated via Stock Transactions" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2786 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2787 msgid "Account: {0} is not permitted under Payment Entry" msgstr "" -#: erpnext/controllers/accounts_controller.py:3188 +#: erpnext/controllers/accounts_controller.py:3196 msgid "Account: {0} with currency: {1} can not be selected" msgstr "" @@ -1823,8 +1830,8 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1812 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1832 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1814 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1834 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1832,33 +1839,33 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:824 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:834 msgid "Accounting Entry for Service" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1011 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1032 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1050 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1071 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1092 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1120 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1227 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1463 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1485 -#: erpnext/controllers/stock_controller.py:681 -#: erpnext/controllers/stock_controller.py:698 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:917 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1757 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1771 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1013 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1034 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1052 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1073 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1094 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1122 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1229 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1465 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1487 +#: erpnext/controllers/stock_controller.py:682 +#: erpnext/controllers/stock_controller.py:699 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1773 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:647 msgid "Accounting Entry for Stock" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:721 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:731 msgid "Accounting Entry for {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:2345 +#: erpnext/controllers/accounts_controller.py:2353 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}" msgstr "" @@ -1917,7 +1924,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/selling/doctype/customer/customer.json #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:400 +#: erpnext/setup/doctype/company/company.py:431 #: erpnext/setup/doctype/customer_group/customer_group.json #: erpnext/setup/doctype/email_digest/email_digest.json #: erpnext/setup/doctype/incoterm/incoterm.json @@ -1941,7 +1948,7 @@ msgstr "" msgid "Accounts Included in Report" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:362 msgid "Accounts Missing Error" msgstr "" @@ -1978,7 +1985,6 @@ msgstr "" #. Option for the 'Report' (Select) field in DocType 'Process Statement Of #. Accounts' #. Name of a report -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Receivables Workspace #. Label of a shortcut in the Receivables Workspace #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:12 @@ -1987,7 +1993,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.json #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:136 -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/receivables/receivables.json #: erpnext/selling/doctype/customer/customer.js:159 msgid "Accounts Receivable" @@ -2033,7 +2038,6 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Accounting Workspace -#. Label of a Link in the Settings Workspace #. Label of a shortcut in the Settings Workspace #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json #: erpnext/accounts/workspace/accounting/accounting.json @@ -2085,15 +2089,15 @@ msgstr "" msgid "Accumulated Depreciation as on" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:253 +#: erpnext/accounts/doctype/budget/budget.py:489 msgid "Accumulated Monthly" msgstr "" -#: erpnext/controllers/budget_controller.py:422 +#: erpnext/controllers/budget_controller.py:425 msgid "Accumulated Monthly Budget for Account {0} against {1} {2} is {3}. It will be collectively ({4}) exceeded by {5}" msgstr "" -#: erpnext/controllers/budget_controller.py:324 +#: erpnext/controllers/budget_controller.py:327 msgid "Accumulated Monthly Budget for Account {0} against {1}: {2} is {3}. It will be exceeded by {4}" msgstr "" @@ -2329,7 +2333,7 @@ msgstr "" msgid "Actual End Date (via Timesheet)" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:221 +#: erpnext/manufacturing/doctype/work_order/work_order.py:222 msgid "Actual End Date cannot be before Actual Start Date" msgstr "" @@ -2343,7 +2347,7 @@ msgstr "" msgid "Actual Expense" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:319 +#: erpnext/accounts/doctype/budget/budget.py:569 msgid "Actual Expenses" msgstr "" @@ -2451,7 +2455,7 @@ msgstr "" msgid "Actual qty in stock" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1526 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2493,7 +2497,7 @@ msgstr "" msgid "Add Employees" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:234 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:256 #: erpnext/selling/doctype/sales_order/sales_order.js:277 #: erpnext/stock/dashboard/item_dashboard.js:216 msgid "Add Item" @@ -2541,13 +2545,18 @@ msgstr "" msgid "Add Order Discount" msgstr "" +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:281 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:416 +msgid "Add Phantom Item" +msgstr "" + #. Label of the add_quote (Check) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Add Quote" msgstr "" #. Label of the add_raw_materials (Button) field in DocType 'BOM Operation' -#: erpnext/manufacturing/doctype/bom/bom.js:973 +#: erpnext/manufacturing/doctype/bom/bom.js:981 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json msgid "Add Raw Materials" msgstr "" @@ -2603,8 +2612,8 @@ msgstr "" msgid "Add Stock" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:259 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:390 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:281 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:416 msgid "Add Sub Assembly" msgstr "" @@ -2632,7 +2641,7 @@ msgid "Add details" msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:86 -#: erpnext/stock/doctype/pick_list/pick_list.py:859 +#: erpnext/stock/doctype/pick_list/pick_list.py:863 msgid "Add items in the Item Locations table" msgstr "" @@ -2819,7 +2828,7 @@ msgstr "" msgid "Additional Discount Amount (Company Currency)" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:731 +#: erpnext/controllers/taxes_and_totals.py:785 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -2918,7 +2927,7 @@ msgstr "" msgid "Additional Transferred Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:664 +#: erpnext/manufacturing/doctype/work_order/work_order.py:665 msgid "" "Additional Transferred Qty {0}\n" "\t\t\t\t\tcannot be greater than {1}.\n" @@ -3081,7 +3090,7 @@ msgstr "" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:649 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:659 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3155,7 +3164,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/controllers/accounts_controller.py:279 +#: erpnext/controllers/accounts_controller.py:284 #: erpnext/setup/doctype/company/company.json msgid "Advance Payments" msgstr "" @@ -3198,7 +3207,7 @@ msgstr "" msgid "Advance amount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:868 +#: erpnext/controllers/taxes_and_totals.py:922 msgid "Advance amount cannot be greater than {0} {1}" msgstr "" @@ -3260,7 +3269,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:39 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:91 -#: erpnext/accounts/report/general_ledger/general_ledger.py:741 +#: erpnext/accounts/report/general_ledger/general_ledger.py:748 msgid "Against Account" msgstr "" @@ -3275,7 +3284,7 @@ msgstr "" msgid "Against Blanket Order" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1127 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1129 msgid "Against Customer Order {0}" msgstr "" @@ -3376,13 +3385,13 @@ msgstr "" msgid "Against Stock Entry" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:330 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:332 msgid "Against Supplier Invoice {0}" msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:774 +#: erpnext/accounts/report/general_ledger/general_ledger.py:781 msgid "Against Voucher" msgstr "" @@ -3406,7 +3415,7 @@ msgstr "" #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:772 +#: erpnext/accounts/report/general_ledger/general_ledger.py:779 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3424,7 +3433,7 @@ msgstr "" msgid "Age (Days)" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:218 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:220 msgid "Age ({0})" msgstr "" @@ -3520,7 +3529,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:1483 erpnext/public/js/setup_wizard.js:184 +#: erpnext/accounts/utils.py:1490 erpnext/public/js/setup_wizard.js:184 msgid "All Accounts" msgstr "" @@ -3544,7 +3553,7 @@ msgstr "" msgid "All Activities HTML" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:303 +#: erpnext/manufacturing/doctype/bom/bom.py:306 msgid "All BOMs" msgstr "" @@ -3572,21 +3581,21 @@ msgstr "" #: erpnext/patches/v11_0/update_department_lft_rgt.py:9 #: erpnext/patches/v11_0/update_department_lft_rgt.py:11 #: erpnext/patches/v11_0/update_department_lft_rgt.py:16 -#: erpnext/setup/doctype/company/company.py:393 -#: erpnext/setup/doctype/company/company.py:396 -#: erpnext/setup/doctype/company/company.py:401 -#: erpnext/setup/doctype/company/company.py:407 -#: erpnext/setup/doctype/company/company.py:413 -#: erpnext/setup/doctype/company/company.py:419 -#: erpnext/setup/doctype/company/company.py:425 -#: erpnext/setup/doctype/company/company.py:431 -#: erpnext/setup/doctype/company/company.py:437 -#: erpnext/setup/doctype/company/company.py:443 -#: erpnext/setup/doctype/company/company.py:449 -#: erpnext/setup/doctype/company/company.py:455 -#: erpnext/setup/doctype/company/company.py:461 -#: erpnext/setup/doctype/company/company.py:467 -#: erpnext/setup/doctype/company/company.py:473 +#: erpnext/setup/doctype/company/company.py:424 +#: erpnext/setup/doctype/company/company.py:427 +#: erpnext/setup/doctype/company/company.py:432 +#: erpnext/setup/doctype/company/company.py:438 +#: erpnext/setup/doctype/company/company.py:444 +#: erpnext/setup/doctype/company/company.py:450 +#: erpnext/setup/doctype/company/company.py:456 +#: erpnext/setup/doctype/company/company.py:462 +#: erpnext/setup/doctype/company/company.py:468 +#: erpnext/setup/doctype/company/company.py:474 +#: erpnext/setup/doctype/company/company.py:480 +#: erpnext/setup/doctype/company/company.py:486 +#: erpnext/setup/doctype/company/company.py:492 +#: erpnext/setup/doctype/company/company.py:498 +#: erpnext/setup/doctype/company/company.py:504 msgid "All Departments" msgstr "" @@ -3662,7 +3671,7 @@ msgstr "" msgid "All Territories" msgstr "" -#: erpnext/setup/doctype/company/company.py:338 +#: erpnext/setup/doctype/company/company.py:369 msgid "All Warehouses" msgstr "" @@ -3680,15 +3689,15 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1354 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1364 msgid "All items have already been Invoiced/Returned" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:1202 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:1205 msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2910 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2912 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3696,11 +3705,11 @@ msgstr "" msgid "All items in this document already have a linked Quality Inspection." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1266 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1268 msgid "All items must be linked to a Sales Order or Subcontracting Inward Order for this Sales Invoice." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1277 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1279 msgid "All linked Sales Orders must be subcontracted." msgstr "" @@ -3714,11 +3723,11 @@ msgstr "" msgid "All the items have been already returned." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1176 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1179 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:853 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:855 msgid "All these items have already been Invoiced/Returned" msgstr "" @@ -3747,7 +3756,7 @@ msgstr "" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1716 msgid "Allocate Payment Request" msgstr "" @@ -3778,7 +3787,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:1708 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1707 #: 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 @@ -3804,11 +3813,11 @@ msgstr "" msgid "Allocated amount" msgstr "" -#: erpnext/accounts/utils.py:617 +#: erpnext/accounts/utils.py:621 msgid "Allocated amount cannot be greater than unadjusted amount" msgstr "" -#: erpnext/accounts/utils.py:615 +#: erpnext/accounts/utils.py:619 msgid "Allocated amount cannot be negative" msgstr "" @@ -3829,7 +3838,7 @@ msgstr "" msgid "Allocations" msgstr "" -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:422 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:427 msgid "Allotted Qty" msgstr "" @@ -3910,7 +3919,7 @@ msgstr "" msgid "Allow Item To Be Added Multiple Times in a Transaction" msgstr "" -#: erpnext/controllers/selling_controller.py:813 +#: erpnext/controllers/selling_controller.py:825 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" @@ -4250,7 +4259,7 @@ msgstr "" msgid "Allows users to submit Supplier Quotations with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:1001 +#: erpnext/stock/doctype/pick_list/pick_list.py:1005 msgid "Already Picked" msgstr "" @@ -4286,7 +4295,7 @@ msgstr "" msgid "Alternative Item Name" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.js:361 +#: erpnext/selling/doctype/quotation/quotation.js:362 msgid "Alternative Items" msgstr "" @@ -4310,6 +4319,7 @@ msgstr "" #. Charges' #. Label of the amount (Data) field in DocType 'Bank Clearance Detail' #. Label of the amount (Currency) field in DocType 'Bank Guarantee' +#. Label of the amount (Currency) field in DocType 'Budget Distribution' #. Label of the amount (Float) field in DocType 'Cashier Closing Payments' #. Label of the sec_break1 (Section Break) field in DocType 'Journal Entry #. Account' @@ -4407,8 +4417,9 @@ msgstr "" #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json #: erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json +#: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:588 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:592 #: 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 @@ -4441,8 +4452,8 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:45 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:330 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:278 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:328 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:201 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44 @@ -4463,7 +4474,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/selling/doctype/quotation/quotation.js:299 +#: erpnext/selling/doctype/quotation/quotation.js:300 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:46 @@ -4502,6 +4513,8 @@ msgstr "" msgid "Amount (AED)" msgstr "" +#. Label of the base_amount (Currency) field in DocType 'Advance Payment Ledger +#. Entry' #. Label of the base_tax_amount (Currency) field in DocType 'Advance Taxes and #. Charges' #. Label of the amount (Currency) field in DocType 'Payment Entry Deduction' @@ -4524,6 +4537,7 @@ msgstr "" #. 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_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json @@ -4663,12 +4677,12 @@ msgstr "" msgid "An Item Group is a way to classify items based on types." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:446 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:517 msgid "An error has been appeared while reposting item valuation via {0}" msgstr "" #: erpnext/public/js/controllers/buying.js:380 -#: erpnext/public/js/utils/sales_common.js:464 +#: erpnext/public/js/utils/sales_common.js:486 msgid "An error occurred during the update process" msgstr "" @@ -4688,11 +4702,11 @@ msgstr "" msgid "Annual Billing: {0}" msgstr "" -#: erpnext/controllers/budget_controller.py:446 +#: erpnext/controllers/budget_controller.py:449 msgid "Annual Budget for Account {0} against {1} {2} is {3}. It will be collectively ({4}) exceeded by {5}" msgstr "" -#: erpnext/controllers/budget_controller.py:311 +#: erpnext/controllers/budget_controller.py:314 msgid "Annual Budget for Account {0} against {1}: {2} is {3}. It will be exceeded by {4}" msgstr "" @@ -4715,8 +4729,8 @@ msgstr "" msgid "Annual Revenue" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:86 -msgid "Another Budget record '{0}' already exists against {1} '{2}' and account '{3}' for fiscal year {4}" +#: erpnext/accounts/doctype/budget/budget.py:141 +msgid "Another Budget record '{0}' already exists against {1} '{2}' and account '{3}' with overlapping fiscal years." msgstr "" #: erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py:107 @@ -5107,7 +5121,7 @@ msgstr "" msgid "Are you sure you want to clear all demo data?" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:451 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:480 msgid "Are you sure you want to delete this Item?" msgstr "" @@ -5119,6 +5133,10 @@ msgstr "" msgid "Are you sure you want to restart this subscription?" msgstr "" +#: erpnext/accounts/doctype/budget/budget.js:76 +msgid "Are you sure you want to revise this budget? The current budget will be cancelled and a new draft will be created." +msgstr "" + #. Label of the area (Float) field in DocType 'Location' #. Name of a UOM #: erpnext/assets/doctype/location/location.json @@ -5131,7 +5149,7 @@ msgstr "" msgid "Area UOM" msgstr "" -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:430 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:435 msgid "Arrival Quantity" msgstr "" @@ -5166,7 +5184,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:984 +#: erpnext/stock/doctype/item/item.py:965 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5178,7 +5196,7 @@ msgstr "" msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1788 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1811 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}." msgstr "" @@ -5607,7 +5625,7 @@ msgstr "" msgid "Asset restored after Asset Capitalization {0} was cancelled" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1496 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1498 msgid "Asset returned" msgstr "" @@ -5619,8 +5637,8 @@ msgstr "" msgid "Asset scrapped via Journal Entry {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1496 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1499 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1498 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1501 msgid "Asset sold" msgstr "" @@ -5723,7 +5741,7 @@ msgstr "" msgid "Assets {assets_link} created for {item_code}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:219 +#: erpnext/manufacturing/doctype/job_card/job_card.js:228 msgid "Assign Job to Employee" msgstr "" @@ -5759,16 +5777,16 @@ msgstr "" msgid "At least one asset has to be selected." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:972 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:979 msgid "At least one invoice has to be selected." msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:169 +#: erpnext/controllers/sales_and_purchase_return.py:168 msgid "At least one item should be entered with negative quantity in return document" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:485 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:599 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:490 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:601 msgid "At least one mode of payment is required for POS invoice." msgstr "" @@ -5804,7 +5822,7 @@ msgstr "" msgid "At row {0}: Batch No is mandatory for Item {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:93 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:94 msgid "At row {0}: Parent Row No cannot be set for item {1}" msgstr "" @@ -5816,11 +5834,11 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:629 +#: erpnext/controllers/stock_controller.py:630 msgid "At row {0}: Serial and Batch Bundle {1} has already created. Please remove the values from the serial no or batch no fields." msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:87 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:88 msgid "At row {0}: set Parent Row No for item {1}" msgstr "" @@ -5880,7 +5898,7 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:920 +#: erpnext/stock/doctype/item/item.py:901 msgid "Attribute table is mandatory" msgstr "" @@ -5888,11 +5906,11 @@ msgstr "" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:924 +#: erpnext/stock/doctype/item/item.py:905 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:833 msgid "Attributes" msgstr "" @@ -6094,7 +6112,7 @@ msgid "Auto re-order" msgstr "" #: erpnext/public/js/controllers/buying.js:375 -#: erpnext/public/js/utils/sales_common.js:459 +#: erpnext/public/js/utils/sales_common.js:481 msgid "Auto repeat document updated" msgstr "" @@ -6157,7 +6175,7 @@ msgid "Availability Of Slots" msgstr "" #: erpnext/manufacturing/doctype/workstation/workstation.js:513 -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:379 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:384 msgid "Available" msgstr "" @@ -6187,11 +6205,11 @@ msgstr "" #. Label of the available_quantity_section (Section Break) field in DocType #. 'Pick List Item' #: erpnext/manufacturing/doctype/workstation/workstation.js:505 -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:80 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:88 #: erpnext/public/js/utils.js:556 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json -#: erpnext/stock/report/stock_ageing/stock_ageing.py:167 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:169 msgid "Available Qty" msgstr "" @@ -6290,8 +6308,8 @@ msgstr "" msgid "Available-for-use Date should be after purchase date" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:168 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:202 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:170 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:204 #: erpnext/stock/report/stock_balance/stock_balance.py:515 msgid "Average Age" msgstr "" @@ -6392,7 +6410,7 @@ msgstr "" #: erpnext/manufacturing/doctype/work_order/work_order.js:216 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/report/bom_explorer/bom_explorer.js:8 -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:56 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:67 #: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:8 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js:5 #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:109 @@ -6412,7 +6430,7 @@ msgstr "" msgid "BOM 1" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1628 +#: erpnext/manufacturing/doctype/bom/bom.py:1668 msgid "BOM 1 {0} and BOM 2 {1} should not be same" msgstr "" @@ -6490,7 +6508,7 @@ msgstr "" msgid "BOM Item" msgstr "" -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:59 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:71 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:174 msgid "BOM Level" msgstr "" @@ -6549,7 +6567,7 @@ msgstr "" msgid "BOM Operations Time" msgstr "" -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:25 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:26 msgid "BOM Qty" msgstr "" @@ -6588,8 +6606,8 @@ msgstr "" msgid "BOM Tree" msgstr "" -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:26 -msgid "BOM UoM" +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:27 +msgid "BOM UOM" msgstr "" #. Name of a DocType @@ -6641,7 +6659,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.js:1299 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:1297 msgid "BOM and Manufacturing Quantity are required" msgstr "" @@ -6651,7 +6669,7 @@ msgstr "" msgid "BOM and Production" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:368 +#: erpnext/stock/doctype/material_request/material_request.js:371 #: erpnext/stock/doctype/stock_entry/stock_entry.js:710 msgid "BOM does not contain any stock item" msgstr "" @@ -6660,23 +6678,23 @@ msgstr "" msgid "BOM recursion: {0} cannot be child of {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:677 +#: erpnext/manufacturing/doctype/bom/bom.py:688 msgid "BOM recursion: {1} cannot be parent or child of {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1378 +#: erpnext/manufacturing/doctype/bom/bom.py:1407 msgid "BOM {0} does not belong to Item {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1360 +#: erpnext/manufacturing/doctype/bom/bom.py:1389 msgid "BOM {0} must be active" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1363 +#: erpnext/manufacturing/doctype/bom/bom.py:1392 msgid "BOM {0} must be submitted" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:765 +#: erpnext/manufacturing/doctype/bom/bom.py:776 msgid "BOM {0} not found for the item {1}" msgstr "" @@ -6685,15 +6703,15 @@ msgstr "" msgid "BOMs Updated" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:274 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:275 msgid "BOMs created successfully" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:284 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:285 msgid "BOMs creation failed" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:224 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:225 msgid "BOMs creation has been enqueued, kindly check the status after some time" msgstr "" @@ -6747,7 +6765,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:693 +#: erpnext/accounts/report/general_ledger/general_ledger.py:700 msgid "Balance ({0})" msgstr "" @@ -6792,7 +6810,7 @@ msgstr "" #: erpnext/accounts/doctype/process_period_closing_voucher_detail/process_period_closing_voucher_detail.json #: erpnext/accounts/report/balance_sheet/balance_sheet.json #: erpnext/accounts/workspace/financial_reports/financial_reports.json -#: erpnext/public/js/financial_statements.js:256 +#: erpnext/public/js/financial_statements.js:267 #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Balance Sheet" msgstr "" @@ -7218,7 +7236,7 @@ msgstr "" msgid "Base Tax Withholding Net Total" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:261 msgid "Base Total" msgstr "" @@ -7411,11 +7429,11 @@ msgstr "" msgid "Batch No is mandatory" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2994 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3023 msgid "Batch No {0} does not exists" msgstr "" -#: erpnext/stock/utils.py:640 +#: erpnext/stock/utils.py:644 msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead." msgstr "" @@ -7434,11 +7452,11 @@ msgstr "" msgid "Batch Nos" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1658 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1687 msgid "Batch Nos are created successfully" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:1071 +#: erpnext/controllers/sales_and_purchase_return.py:1072 msgid "Batch Not Available for Return" msgstr "" @@ -7483,7 +7501,7 @@ msgstr "" msgid "Batch and Serial No" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:881 +#: erpnext/manufacturing/doctype/work_order/work_order.py:882 msgid "Batch not created for item {} since it does not have a batch series." msgstr "" @@ -7491,16 +7509,16 @@ msgstr "" msgid "Batch {0} and Warehouse" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:1070 +#: erpnext/controllers/sales_and_purchase_return.py:1071 msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3086 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3088 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:286 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3092 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3094 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -7564,7 +7582,7 @@ msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace -#: erpnext/manufacturing/doctype/bom/bom.py:1234 +#: erpnext/manufacturing/doctype/bom/bom.py:1246 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/material_request/material_request.js:126 #: erpnext/stock/doctype/stock_entry/stock_entry.js:644 @@ -7667,7 +7685,7 @@ msgstr "" msgid "Billing Address Name" msgstr "" -#: erpnext/controllers/accounts_controller.py:503 +#: erpnext/controllers/accounts_controller.py:508 msgid "Billing Address does not belong to the {0}" msgstr "" @@ -8000,7 +8018,7 @@ msgstr "" msgid "Booked Fixed Asset" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:144 +#: erpnext/stock/doctype/warehouse/warehouse.py:146 msgid "Booking stock value across multiple accounts will make it harder to track stock and account value." msgstr "" @@ -8148,38 +8166,60 @@ msgstr "" msgid "Budget Account" msgstr "" -#. Label of the accounts (Table) field in DocType 'Budget' -#: erpnext/accounts/doctype/budget/budget.json -msgid "Budget Accounts" -msgstr "" - #. Label of the budget_against (Select) field in DocType 'Budget' #: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:80 msgid "Budget Against" msgstr "" +#. Label of the budget_amount (Currency) field in DocType 'Budget' #. Label of the budget_amount (Currency) field in DocType 'Budget Account' +#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/doctype/budget_account/budget_account.json msgid "Budget Amount" msgstr "" +#: erpnext/accounts/doctype/budget/budget.py:83 +msgid "Budget Amount can not be {0}." +msgstr "" + #. Label of the budget_detail (Section Break) field in DocType 'Company' #: erpnext/setup/doctype/company/company.json msgid "Budget Detail" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:299 -#: erpnext/accounts/doctype/budget/budget.py:301 -#: erpnext/controllers/budget_controller.py:286 +#. Label of the budget_distribution (Table) field in DocType 'Budget' +#. Name of a DocType +#: erpnext/accounts/doctype/budget/budget.json +#: erpnext/accounts/doctype/budget_distribution/budget_distribution.json +msgid "Budget Distribution" +msgstr "" + +#. Label of the budget_end_date (Date) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json +msgid "Budget End Date" +msgstr "" + +#: erpnext/accounts/doctype/budget/budget.py:538 +#: erpnext/accounts/doctype/budget/budget.py:540 #: erpnext/controllers/budget_controller.py:289 +#: erpnext/controllers/budget_controller.py:292 msgid "Budget Exceeded" msgstr "" +#: erpnext/accounts/doctype/budget/budget.py:228 +msgid "Budget Limit Exceeded" +msgstr "" + #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:61 msgid "Budget List" msgstr "" +#. Label of the budget_start_date (Date) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json +msgid "Budget Start Date" +msgstr "" + #. Name of a report #. Label of a Link in the Accounting Workspace #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:77 @@ -8188,11 +8228,11 @@ msgstr "" msgid "Budget Variance Report" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:101 +#: erpnext/accounts/doctype/budget/budget.py:156 msgid "Budget cannot be assigned against Group Account {0}" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:108 +#: erpnext/accounts/doctype/budget/budget.py:161 msgid "Budget cannot be assigned against {0}, as it's not an Income or Expense account" msgstr "" @@ -8328,7 +8368,6 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Buying Workspace -#. Label of a Link in the Settings Workspace #. Label of a shortcut in the Settings Workspace #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/workspace/buying/buying.json @@ -8392,10 +8431,8 @@ msgstr "" #. Name of a DocType #. Label of a Link in the CRM Workspace -#. Label of a Link in the Settings Workspace #: erpnext/crm/doctype/crm_settings/crm_settings.json #: erpnext/crm/workspace/crm/crm.json -#: erpnext/setup/workspace/settings/settings.json msgid "CRM Settings" msgstr "" @@ -8646,7 +8683,7 @@ msgstr "" msgid "Can be approved by {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2418 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2420 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state." msgstr "" @@ -8675,16 +8712,17 @@ msgid "Can not filter based on Voucher No, if grouped by Voucher" msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1441 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2941 msgid "Can only make payment against unbilled {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1495 -#: erpnext/controllers/accounts_controller.py:3097 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1494 +#: erpnext/controllers/accounts_controller.py:3105 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" msgstr "" +#: erpnext/setup/doctype/company/company.py:193 #: erpnext/stock/doctype/stock_settings/stock_settings.py:144 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method" msgstr "" @@ -8735,17 +8773,17 @@ msgstr "" msgid "Cannot Calculate Arrival Time as Driver Address is Missing." msgstr "" -#: erpnext/setup/doctype/company/company.py:181 +#: erpnext/setup/doctype/company/company.py:212 msgid "Cannot Change Inventory Account Setting" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:375 +#: erpnext/controllers/sales_and_purchase_return.py:376 msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:627 -#: erpnext/stock/doctype/item/item.py:640 -#: erpnext/stock/doctype/item/item.py:654 +#: erpnext/stock/doctype/item/item.py:608 +#: erpnext/stock/doctype/item/item.py:621 +#: erpnext/stock/doctype/item/item.py:635 msgid "Cannot Merge" msgstr "" @@ -8785,11 +8823,11 @@ msgstr "" msgid "Cannot cancel Stock Reservation Entry {0}, as it has used in the work order {1}. Please cancel the work order first or unreserved the stock" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:234 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:243 msgid "Cannot cancel as processing of cancelled documents is pending." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1066 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1067 msgid "Cannot cancel because submitted Stock Entry {0} exists" msgstr "" @@ -8809,7 +8847,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:872 +#: erpnext/stock/doctype/item/item.py:853 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -8825,11 +8863,11 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:863 +#: erpnext/stock/doctype/item/item.py:844 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" -#: erpnext/setup/doctype/company/company.py:286 +#: erpnext/setup/doctype/company/company.py:317 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency." msgstr "" @@ -8853,11 +8891,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:998 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1008 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1976 +#: erpnext/selling/doctype/sales_order/sales_order.py:1979 #: erpnext/stock/doctype/pick_list/pick_list.py:205 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 "" @@ -8866,11 +8904,11 @@ msgstr "" msgid "Cannot create accounting entries against disabled accounts: {0}" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:374 +#: erpnext/controllers/sales_and_purchase_return.py:375 msgid "Cannot create return for consolidated invoice {0}." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1090 +#: erpnext/manufacturing/doctype/bom/bom.py:1103 msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs" msgstr "" @@ -8883,7 +8921,7 @@ msgstr "" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1813 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -8891,15 +8929,15 @@ msgstr "" msgid "Cannot delete Serial No {0}, as it is used in stock transactions" msgstr "" -#: erpnext/setup/doctype/company/company.py:516 +#: erpnext/setup/doctype/company/company.py:547 msgid "Cannot disable perpetual inventory, as there are existing Stock Ledger Entries for the company {0}. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:681 +#: erpnext/manufacturing/doctype/work_order/work_order.py:682 msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/setup/doctype/company/company.py:178 +#: erpnext/setup/doctype/company/company.py:209 msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" @@ -8907,8 +8945,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:772 -#: erpnext/selling/doctype/sales_order/sales_order.py:795 +#: erpnext/selling/doctype/sales_order/sales_order.py:771 +#: erpnext/selling/doctype/sales_order/sales_order.py:794 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -8920,7 +8958,7 @@ msgstr "" msgid "Cannot find Item with this Barcode" msgstr "" -#: erpnext/controllers/accounts_controller.py:3645 +#: erpnext/controllers/accounts_controller.py:3653 msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings." msgstr "" @@ -8928,15 +8966,15 @@ msgstr "" msgid "Cannot make any transactions until the deletion job is completed" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:529 +#: erpnext/manufacturing/doctype/work_order/work_order.py:530 msgid "Cannot produce more Item {0} than Sales Order quantity {1}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1421 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1422 msgid "Cannot produce more item for {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1425 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1426 msgid "Cannot produce more than {0} items for {1}" msgstr "" @@ -8944,8 +8982,8 @@ msgstr "" msgid "Cannot receive from customer against negative outstanding" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 -#: erpnext/controllers/accounts_controller.py:3112 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1511 +#: erpnext/controllers/accounts_controller.py:3120 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" msgstr "" @@ -8958,16 +8996,16 @@ msgstr "" msgid "Cannot retrieve link token. Check Error Log for more information" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1504 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1888 -#: erpnext/controllers/accounts_controller.py:3102 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1503 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1682 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1889 +#: erpnext/controllers/accounts_controller.py:3110 #: erpnext/public/js/controllers/accounts.js:112 #: erpnext/public/js/controllers/taxes_and_totals.js:521 msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.py:285 +#: erpnext/selling/doctype/quotation/quotation.py:287 msgid "Cannot set as Lost as Sales Order is made." msgstr "" @@ -8975,15 +9013,15 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:718 +#: erpnext/stock/doctype/item/item.py:699 msgid "Cannot set multiple Item Defaults for a company." msgstr "" -#: erpnext/controllers/accounts_controller.py:3800 +#: erpnext/controllers/accounts_controller.py:3808 msgid "Cannot set quantity less than delivered quantity" msgstr "" -#: erpnext/controllers/accounts_controller.py:3803 +#: erpnext/controllers/accounts_controller.py:3811 msgid "Cannot set quantity less than received quantity" msgstr "" @@ -8991,7 +9029,7 @@ msgstr "" msgid "Cannot set the field {0} for copying in variants" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1998 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1999 msgid "Cannot {0} from {1} without any negative outstanding invoice" msgstr "" @@ -9026,7 +9064,7 @@ msgstr "" msgid "Capacity Planning" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1052 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1053 msgid "Capacity Planning Error, planned start time can not be same as end time" msgstr "" @@ -9147,7 +9185,7 @@ msgstr "" msgid "Cash Flow" msgstr "" -#: erpnext/public/js/financial_statements.js:266 +#: erpnext/public/js/financial_statements.js:277 msgid "Cash Flow Statement" msgstr "" @@ -9168,7 +9206,7 @@ msgstr "" msgid "Cash In Hand" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:320 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:322 msgid "Cash or Bank Account is mandatory for making payment entry" msgstr "" @@ -9262,12 +9300,12 @@ msgstr "" msgid "Category-wise Asset Value" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:333 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:335 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:115 msgid "Caution" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:169 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:178 msgid "Caution: This might alter frozen accounts." msgstr "" @@ -9367,7 +9405,7 @@ msgstr "" msgid "Change in Stock Value" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1053 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1055 msgid "Change the account type to Receivable or select a different account." msgstr "" @@ -9377,7 +9415,7 @@ msgstr "" msgid "Change this date manually to setup the next synchronization start date" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:126 +#: erpnext/selling/doctype/customer/customer.py:127 msgid "Changed customer name to '{}' as '{}' already exists." msgstr "" @@ -9399,8 +9437,8 @@ msgstr "" msgid "Channel Partner" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2317 -#: erpnext/controllers/accounts_controller.py:3165 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2318 +#: erpnext/controllers/accounts_controller.py:3173 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount" msgstr "" @@ -9445,7 +9483,6 @@ msgid "Chart Tree" msgstr "" #. Label of a Link in the Accounting Workspace -#. Label of a shortcut in the Accounting Workspace #. Label of the section_break_28 (Section Break) field in DocType 'Company' #. Label of a Link in the Home Workspace #: erpnext/accounts/doctype/account/account.js:69 @@ -9453,7 +9490,7 @@ msgstr "" #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:52 #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/public/js/setup_wizard.js:43 -#: erpnext/setup/doctype/company/company.js:116 +#: erpnext/setup/doctype/company/company.js:123 #: erpnext/setup/doctype/company/company.json #: erpnext/setup/workspace/home/home.json msgid "Chart of Accounts" @@ -9634,7 +9671,7 @@ msgstr "" msgid "Child nodes can be only created under 'Group' type nodes" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:101 +#: erpnext/stock/doctype/warehouse/warehouse.py:103 msgid "Child warehouse exists for this warehouse. You can not delete this warehouse." msgstr "" @@ -9774,11 +9811,11 @@ msgstr "" msgid "Closed Documents" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2341 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2343 msgid "Closed Work Order can not be stopped or Re-opened" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:523 +#: erpnext/selling/doctype/sales_order/sales_order.py:525 msgid "Closed order cannot be cancelled. Unclose to cancel." msgstr "" @@ -10193,7 +10230,7 @@ msgstr "" #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json #: erpnext/accounts/doctype/item_tax_template/item_tax_template.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:137 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:141 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.json @@ -10259,9 +10296,9 @@ msgstr "" #: erpnext/accounts/report/gross_profit/gross_profit.js:8 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:8 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:40 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:232 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:235 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:28 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:280 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:278 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:8 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:8 #: erpnext/accounts/report/pos_register/pos_register.js:8 @@ -10345,7 +10382,7 @@ msgstr "" #: erpnext/projects/doctype/timesheet/timesheet.json #: erpnext/projects/report/project_summary/project_summary.js:8 #: erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:44 -#: erpnext/public/js/financial_statements.js:278 +#: erpnext/public/js/financial_statements.js:289 #: erpnext/public/js/purchase_trends_filters.js:8 #: erpnext/public/js/sales_trends_filters.js:51 #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json @@ -10521,7 +10558,7 @@ msgstr "" msgid "Company Address Name" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:308 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:310 msgid "Company Address is missing. You don't have permission to update it. Please contact your System Manager." msgstr "" @@ -10611,11 +10648,11 @@ msgstr "" msgid "Company and Posting Date is mandatory" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2547 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2549 msgid "Company currencies of both the companies should match for Inter Company Transactions." msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:362 +#: erpnext/stock/doctype/material_request/material_request.js:365 #: erpnext/stock/doctype/stock_entry/stock_entry.js:704 msgid "Company field is required" msgstr "" @@ -10632,7 +10669,7 @@ msgstr "" msgid "Company is mandatory for generating an invoice. Please set a default company in Global Defaults." msgstr "" -#: erpnext/setup/doctype/company/company.js:215 +#: erpnext/setup/doctype/company/company.js:222 msgid "Company name not same" msgstr "" @@ -10680,7 +10717,7 @@ msgstr "" msgid "Company {} does not exist yet. Taxes setup aborted." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:529 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:534 msgid "Company {} does not match with POS Profile Company {}" msgstr "" @@ -10705,12 +10742,12 @@ msgstr "" #. Label of the competitors (Table MultiSelect) field in DocType 'Opportunity' #. Label of the competitors (Table MultiSelect) field in DocType 'Quotation' #: erpnext/crm/doctype/opportunity/opportunity.json -#: erpnext/public/js/utils/sales_common.js:558 +#: erpnext/public/js/utils/sales_common.js:580 #: erpnext/selling/doctype/quotation/quotation.json msgid "Competitors" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:256 +#: erpnext/manufacturing/doctype/job_card/job_card.js:265 #: erpnext/manufacturing/doctype/workstation/workstation.js:151 msgid "Complete Job" msgstr "" @@ -10748,12 +10785,12 @@ msgstr "" msgid "Completed Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1335 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1336 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:304 -#: erpnext/manufacturing/doctype/job_card/job_card.js:425 +#: erpnext/manufacturing/doctype/job_card/job_card.js:313 +#: erpnext/manufacturing/doctype/job_card/job_card.js:434 #: erpnext/manufacturing/doctype/workstation/workstation.js:296 msgid "Completed Quantity" msgstr "" @@ -10885,7 +10922,7 @@ msgstr "" msgid "Consider Minimum Order Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:980 +#: erpnext/manufacturing/doctype/work_order/work_order.js:983 msgid "Consider Process Loss" msgstr "" @@ -10957,7 +10994,7 @@ msgstr "" #. Log' #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:612 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:614 msgid "Consolidated Sales Invoice" msgstr "" @@ -11051,7 +11088,7 @@ msgstr "" msgid "Consumed Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1710 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1711 msgid "Consumed Qty cannot be greater than Reserved Qty for item {0}" msgstr "" @@ -11204,7 +11241,7 @@ msgstr "" msgid "Contact Person" msgstr "" -#: erpnext/controllers/accounts_controller.py:515 +#: erpnext/controllers/accounts_controller.py:520 msgid "Contact Person does not belong to the {0}" msgstr "" @@ -11387,19 +11424,19 @@ msgstr "" msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" -#: erpnext/controllers/stock_controller.py:84 +#: erpnext/controllers/stock_controller.py:85 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:2880 +#: erpnext/controllers/accounts_controller.py:2888 msgid "Conversion rate cannot be 0" msgstr "" -#: erpnext/controllers/accounts_controller.py:2887 +#: erpnext/controllers/accounts_controller.py:2895 msgid "Conversion rate is 1.00, but document currency is different from company currency" msgstr "" -#: erpnext/controllers/accounts_controller.py:2883 +#: erpnext/controllers/accounts_controller.py:2891 msgid "Conversion rate must be 1.00 if document currency is same as company currency" msgstr "" @@ -11453,11 +11490,6 @@ msgstr "" msgid "Copy Fields to Variant" msgstr "" -#. Label of a Card Break in the Settings Workspace -#: erpnext/setup/workspace/settings/settings.json -msgid "Core" -msgstr "" - #. Option for the 'Corrective/Preventive' (Select) field in DocType 'Quality #. Action' #: erpnext/quality_management/doctype/quality_action/quality_action.json @@ -11470,13 +11502,13 @@ msgstr "" msgid "Corrective Action" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:482 +#: erpnext/manufacturing/doctype/job_card/job_card.js:491 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:489 +#: erpnext/manufacturing/doctype/job_card/job_card.js:498 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Corrective Operation" msgstr "" @@ -11620,10 +11652,10 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:153 -#: erpnext/accounts/report/general_ledger/general_ledger.py:767 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:384 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:308 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:306 #: erpnext/accounts/report/purchase_register/purchase_register.js:46 #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:29 #: erpnext/accounts/report/sales_register/sales_register.js:52 @@ -11646,7 +11678,7 @@ msgstr "" #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json #: erpnext/buying/report/procurement_tracker/procurement_tracker.js:15 #: erpnext/buying/report/procurement_tracker/procurement_tracker.py:32 -#: erpnext/public/js/financial_statements.js:371 +#: erpnext/public/js/financial_statements.js:382 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/delivery_note/delivery_note.json @@ -11699,7 +11731,7 @@ msgstr "" msgid "Cost Center and Budgeting" msgstr "" -#: erpnext/public/js/utils/sales_common.js:492 +#: erpnext/public/js/utils/sales_common.js:514 msgid "Cost Center for Item rows has been updated to {0}" msgstr "" @@ -11707,8 +11739,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:1428 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:883 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1430 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:893 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -11740,7 +11772,7 @@ msgstr "" msgid "Cost Center: {0} does not exist" msgstr "" -#: erpnext/setup/doctype/company/company.js:106 +#: erpnext/setup/doctype/company/company.js:113 msgid "Cost Centers" msgstr "" @@ -11851,11 +11883,11 @@ msgstr "" msgid "Could Not Delete Demo Data" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.py:606 +#: erpnext/selling/doctype/quotation/quotation.py:608 msgid "Could not auto create Customer due to the following missing mandatory field(s):" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:676 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:678 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again" msgstr "" @@ -12059,7 +12091,7 @@ msgstr "" msgid "Create Payment Entry" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:814 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:819 msgid "Create Payment Entry for Consolidated POS Invoices." msgstr "" @@ -12121,7 +12153,7 @@ msgid "Create Sample Retention Stock Entry" msgstr "" #: erpnext/stock/dashboard/item_dashboard.js:283 -#: erpnext/stock/doctype/material_request/material_request.js:482 +#: erpnext/stock/doctype/material_request/material_request.js:485 #: erpnext/stock/doctype/pick_list/pick_list.js:138 msgid "Create Stock Entry" msgstr "" @@ -12130,7 +12162,7 @@ msgstr "" msgid "Create Supplier Quotation" msgstr "" -#: erpnext/setup/doctype/company/company.js:150 +#: erpnext/setup/doctype/company/company.js:157 msgid "Create Tax Template" msgstr "" @@ -12307,15 +12339,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:711 +#: erpnext/accounts/report/general_ledger/general_ledger.py:718 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:686 +#: erpnext/accounts/report/general_ledger/general_ledger.py:693 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:602 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:606 msgid "Credit Account" msgstr "" @@ -12393,7 +12425,7 @@ msgstr "" msgid "Credit Limit" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:584 +#: erpnext/selling/doctype/customer/customer.py:593 msgid "Credit Limit Crossed" msgstr "" @@ -12441,7 +12473,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:176 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:147 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1216 -#: erpnext/controllers/sales_and_purchase_return.py:390 +#: erpnext/controllers/sales_and_purchase_return.py:391 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:303 #: erpnext/stock/doctype/delivery_note/delivery_note.js:89 #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -12457,7 +12489,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:268 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:270 msgid "Credit Note Issued" msgstr "" @@ -12467,15 +12499,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:673 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:675 msgid "Credit Note {0} has been created automatically" msgstr "" #. Label of the credit_to (Link) field in DocType 'Purchase Invoice' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:383 -#: erpnext/controllers/accounts_controller.py:2284 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:385 +#: erpnext/controllers/accounts_controller.py:2292 msgid "Credit To" msgstr "" @@ -12484,16 +12516,16 @@ msgstr "" msgid "Credit in Company Currency" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:550 -#: erpnext/selling/doctype/customer/customer.py:605 +#: erpnext/selling/doctype/customer/customer.py:559 +#: erpnext/selling/doctype/customer/customer.py:614 msgid "Credit limit has been crossed for customer {0} ({1}/{2})" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:343 +#: erpnext/selling/doctype/customer/customer.py:352 msgid "Credit limit is already defined for the Company {0}" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:604 +#: erpnext/selling/doctype/customer/customer.py:613 msgid "Credit limit reached for customer {0}" msgstr "" @@ -12670,9 +12702,9 @@ msgstr "" msgid "Currency filters are currently unsupported in Custom Financial Report." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733 -#: erpnext/accounts/utils.py:2364 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1666 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1734 +#: erpnext/accounts/utils.py:2390 msgid "Currency for {0} must be {1}" msgstr "" @@ -12680,7 +12712,7 @@ msgstr "" msgid "Currency of the Closing Account must be {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:611 +#: erpnext/manufacturing/doctype/bom/bom.py:622 msgid "Currency of the price list {0} must be {1} or {2}" msgstr "" @@ -12956,7 +12988,7 @@ msgstr "" #: erpnext/accounts/report/gross_profit/gross_profit.py:405 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:37 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:22 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:224 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:222 #: erpnext/accounts/report/pos_register/pos_register.js:44 #: erpnext/accounts/report/pos_register/pos_register.py:120 #: erpnext/accounts/report/pos_register/pos_register.py:181 @@ -12975,7 +13007,7 @@ msgstr "" #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:88 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:98 #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json #: erpnext/projects/doctype/project/project.json @@ -13224,7 +13256,7 @@ msgstr "" #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:228 #: erpnext/accounts/report/gross_profit/gross_profit.py:412 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:211 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:209 #: erpnext/accounts/report/sales_register/sales_register.js:27 #: erpnext/accounts/report/sales_register/sales_register.py:202 #: erpnext/crm/doctype/opportunity/opportunity.json @@ -13334,7 +13366,7 @@ msgstr "" #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:92 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:35 #: erpnext/accounts/report/gross_profit/gross_profit.py:419 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:231 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:229 #: erpnext/accounts/report/sales_register/sales_register.py:193 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/crm/doctype/opportunity/opportunity.json @@ -13439,7 +13471,7 @@ msgstr "" msgid "Customer Provided Item Cost" msgstr "" -#: erpnext/setup/doctype/company/company.py:442 +#: erpnext/setup/doctype/company/company.py:473 msgid "Customer Service" msgstr "" @@ -13496,9 +13528,9 @@ msgstr "" msgid "Customer required for 'Customerwise Discount'" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1170 -#: erpnext/selling/doctype/sales_order/sales_order.py:420 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:420 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1172 +#: erpnext/selling/doctype/sales_order/sales_order.py:422 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:422 msgid "Customer {0} does not belong to project {1}" msgstr "" @@ -13608,7 +13640,7 @@ msgstr "" msgid "DFS" msgstr "" -#: erpnext/projects/doctype/project/project.py:673 +#: erpnext/projects/doctype/project/project.py:672 msgid "Daily Project Summary for {0}" msgstr "" @@ -13697,7 +13729,7 @@ msgstr "" msgid "Date of Commencement" msgstr "" -#: erpnext/setup/doctype/company/company.js:87 +#: erpnext/setup/doctype/company/company.js:94 msgid "Date of Commencement should be greater than Date of Incorporation" msgstr "" @@ -13721,7 +13753,7 @@ msgstr "" msgid "Date of Joining" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:287 msgid "Date of Transaction" msgstr "" @@ -13853,11 +13885,11 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:704 +#: erpnext/accounts/report/general_ledger/general_ledger.py:711 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:679 +#: erpnext/accounts/report/general_ledger/general_ledger.py:686 msgid "Debit ({0})" msgstr "" @@ -13867,7 +13899,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:592 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:596 msgid "Debit Account" msgstr "" @@ -13910,7 +13942,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:178 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:147 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1219 -#: erpnext/controllers/sales_and_purchase_return.py:394 +#: erpnext/controllers/sales_and_purchase_return.py:395 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:304 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:61 msgid "Debit Note" @@ -13936,13 +13968,13 @@ msgstr "" #. Label of the debit_to (Link) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1038 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1049 -#: erpnext/controllers/accounts_controller.py:2284 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1040 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1051 +#: erpnext/controllers/accounts_controller.py:2292 msgid "Debit To" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1034 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1036 msgid "Debit To is required" msgstr "" @@ -14007,7 +14039,7 @@ msgstr "" msgid "Decimeter" msgstr "" -#: erpnext/public/js/utils/sales_common.js:585 +#: erpnext/public/js/utils/sales_common.js:607 msgid "Declare Lost" msgstr "" @@ -14069,14 +14101,14 @@ msgstr "" #. Label of the default_advance_paid_account (Link) field in DocType 'Company' #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:271 +#: erpnext/setup/doctype/company/company.py:302 msgid "Default Advance Paid Account" msgstr "" #. Label of the default_advance_received_account (Link) field in DocType #. 'Company' #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:260 +#: erpnext/setup/doctype/company/company.py:291 msgid "Default Advance Received Account" msgstr "" @@ -14089,15 +14121,15 @@ msgstr "" msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2151 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2152 msgid "Default BOM for {0} not found" msgstr "" -#: erpnext/controllers/accounts_controller.py:3841 +#: erpnext/controllers/accounts_controller.py:3849 msgid "Default BOM not found for FG Item {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2148 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2149 msgid "Default BOM not found for Item {0} and Project {1}" msgstr "" @@ -14225,9 +14257,8 @@ msgstr "" msgid "Default Finance Book" msgstr "" -#. Label of the default_fg_warehouse (Link) field in DocType 'Manufacturing -#. Settings' -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json +#. Label of the default_fg_warehouse (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json msgid "Default Finished Goods Warehouse" msgstr "" @@ -14362,14 +14393,18 @@ msgstr "" msgid "Default Receivable Account" msgstr "" +#. Label of the default_sales_contact (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid "Default Sales Contact" +msgstr "" + #. Label of the sales_uom (Link) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Default Sales Unit of Measure" msgstr "" -#. Label of the default_scrap_warehouse (Link) field in DocType 'Manufacturing -#. Settings' -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json +#. Label of the default_scrap_warehouse (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json msgid "Default Scrap Warehouse" msgstr "" @@ -14407,6 +14442,11 @@ msgstr "" msgid "Default Stock UOM" msgstr "" +#. Label of the valuation_method (Select) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid "Default Stock Valuation Method" +msgstr "" + #. Label of the default_supplier (Link) field in DocType 'Item Default' #: erpnext/stock/doctype/item_default/item_default.json msgid "Default Supplier" @@ -14434,15 +14474,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "" -#: erpnext/stock/doctype/item/item.py:1267 +#: erpnext/stock/doctype/item/item.py:1248 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1250 +#: erpnext/stock/doctype/item/item.py:1231 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:898 +#: erpnext/stock/doctype/item/item.py:879 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -14469,18 +14509,6 @@ msgstr "" msgid "Default Warehouse for Sales Return" msgstr "" -#. Label of the section_break_6 (Section Break) field in DocType 'Manufacturing -#. Settings' -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json -msgid "Default Warehouses for Production" -msgstr "" - -#. Label of the default_wip_warehouse (Link) field in DocType 'Manufacturing -#. Settings' -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json -msgid "Default Work In Progress Warehouse" -msgstr "" - #. Label of the workstation (Link) field in DocType 'Operation' #: erpnext/manufacturing/doctype/operation/operation.json msgid "Default Workstation" @@ -14497,7 +14525,7 @@ msgstr "" msgid "Default settings for your stock-related transactions" msgstr "" -#: erpnext/setup/doctype/company/company.js:184 +#: erpnext/setup/doctype/company/company.js:191 msgid "Default tax templates for sales, purchase and items are created." msgstr "" @@ -14657,12 +14685,12 @@ msgstr "" #. Label of the delete_transactions (Check) field in DocType 'Transaction #. Deletion Record' -#: erpnext/setup/doctype/company/company.js:161 +#: erpnext/setup/doctype/company/company.js:168 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json msgid "Delete Transactions" msgstr "" -#: erpnext/setup/doctype/company/company.js:230 +#: erpnext/setup/doctype/company/company.js:237 msgid "Delete all the Transactions for this Company" msgstr "" @@ -14814,7 +14842,7 @@ msgstr "" msgid "Delivery Details" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:109 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:119 msgid "Delivery From Date" msgstr "" @@ -14845,7 +14873,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js:22 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:21 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:294 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:292 #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1038 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 @@ -14896,7 +14924,7 @@ msgstr "" msgid "Delivery Note Trends" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1426 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1428 msgid "Delivery Note {0} is not submitted" msgstr "" @@ -14946,7 +14974,7 @@ msgstr "" msgid "Delivery To" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:115 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:125 msgid "Delivery To Date" msgstr "" @@ -14983,7 +15011,7 @@ msgstr "" msgid "Delivery to" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:439 +#: erpnext/selling/doctype/sales_order/sales_order.py:441 msgid "Delivery warehouse required for stock item {0}" msgstr "" @@ -15239,7 +15267,7 @@ msgstr "" #. Label of the order_lost_reason (Small Text) field in DocType 'Opportunity' #. Label of the order_lost_reason (Small Text) field in DocType 'Quotation' #: erpnext/crm/doctype/opportunity/opportunity.json -#: erpnext/public/js/utils/sales_common.js:564 +#: erpnext/public/js/utils/sales_common.js:586 #: erpnext/selling/doctype/quotation/quotation.json msgid "Detailed Reason" msgstr "" @@ -15351,12 +15379,12 @@ msgstr "" msgid "Difference Posting Date" msgstr "" -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:92 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:100 msgid "Difference Qty" msgstr "" #: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:136 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:131 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:134 msgid "Difference Value" msgstr "" @@ -15503,15 +15531,15 @@ msgstr "" msgid "Disabled Account Selected" msgstr "" -#: erpnext/stock/utils.py:446 +#: erpnext/stock/utils.py:450 msgid "Disabled Warehouse {0} cannot be used for this transaction." msgstr "" -#: erpnext/controllers/accounts_controller.py:833 +#: erpnext/controllers/accounts_controller.py:838 msgid "Disabled pricing rules since this {} is an internal transfer" msgstr "" -#: erpnext/controllers/accounts_controller.py:847 +#: erpnext/controllers/accounts_controller.py:852 msgid "Disabled tax included prices since this {} is an internal transfer" msgstr "" @@ -15747,7 +15775,7 @@ msgstr "" msgid "Discount must be less than 100" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3418 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3419 msgid "Discount of {} applied as per Payment Term" msgstr "" @@ -15819,7 +15847,7 @@ msgstr "" msgid "Dislikes" msgstr "" -#: erpnext/setup/doctype/company/company.py:436 +#: erpnext/setup/doctype/company/company.py:467 msgid "Dispatch" msgstr "" @@ -15964,6 +15992,11 @@ msgstr "" msgid "Distribute Charges Based On" msgstr "" +#. Label of the distribute_equally (Check) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json +msgid "Distribute Equally" +msgstr "" + #. Option for the 'Distribute Charges Based On' (Select) field in DocType #. 'Landed Cost Voucher' #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json @@ -16000,6 +16033,11 @@ msgstr "" msgid "Distributed Discount Amount" msgstr "" +#. Label of the distribution_frequency (Select) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json +msgid "Distribution Frequency" +msgstr "" + #. Label of the distribution_id (Data) field in DocType 'Monthly Distribution' #: erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json msgid "Distribution Name" @@ -16081,7 +16119,7 @@ msgstr "" msgid "Do you want to submit the material request" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:94 +#: erpnext/manufacturing/doctype/job_card/job_card.js:103 msgid "Do you want to submit the stock entry?" msgstr "" @@ -16112,7 +16150,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:254 +#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:257 msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost." msgstr "" @@ -16286,7 +16324,7 @@ msgstr "" msgid "Due Date cannot be before {0}" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:129 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:138 msgid "Due to stock closing entry {0}, you cannot repost item valuation before {1}" msgstr "" @@ -16368,7 +16406,7 @@ msgid "Duplicate POS Fields" msgstr "" #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:104 -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:65 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:64 msgid "Duplicate POS Invoices found" msgstr "" @@ -16434,12 +16472,12 @@ msgstr "" msgid "Dyne" msgstr "" -#: erpnext/regional/italy/utils.py:248 erpnext/regional/italy/utils.py:268 -#: erpnext/regional/italy/utils.py:278 erpnext/regional/italy/utils.py:286 -#: erpnext/regional/italy/utils.py:293 erpnext/regional/italy/utils.py:297 -#: erpnext/regional/italy/utils.py:304 erpnext/regional/italy/utils.py:313 -#: erpnext/regional/italy/utils.py:338 erpnext/regional/italy/utils.py:345 -#: erpnext/regional/italy/utils.py:450 +#: erpnext/regional/italy/utils.py:221 erpnext/regional/italy/utils.py:241 +#: erpnext/regional/italy/utils.py:251 erpnext/regional/italy/utils.py:259 +#: erpnext/regional/italy/utils.py:266 erpnext/regional/italy/utils.py:270 +#: erpnext/regional/italy/utils.py:277 erpnext/regional/italy/utils.py:286 +#: erpnext/regional/italy/utils.py:311 erpnext/regional/italy/utils.py:318 +#: erpnext/regional/italy/utils.py:423 msgid "E-Invoicing Information Missing" msgstr "" @@ -16482,7 +16520,7 @@ msgstr "" msgid "Each Transaction" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:174 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:176 msgid "Earliest" msgstr "" @@ -16495,7 +16533,7 @@ msgstr "" msgid "Earnest Money" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:499 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:528 msgid "Edit BOM" msgstr "" @@ -16564,8 +16602,8 @@ msgstr "" msgid "Either 'Selling' or 'Buying' must be selected" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:268 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:413 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:290 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:441 msgid "Either Workstation or Workstation Type is mandatory" msgstr "" @@ -16615,11 +16653,6 @@ msgstr "" msgid "Ells (UK)" msgstr "" -#. Label of a Card Break in the Settings Workspace -#: erpnext/setup/workspace/settings/settings.json -msgid "Email / Notifications" -msgstr "" - #: erpnext/www/book_appointment/index.html:52 msgid "Email Address (required)" msgstr "" @@ -16908,7 +16941,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1059 +#: erpnext/stock/doctype/item/item.py:1040 msgid "Enable Auto Re-Order" msgstr "" @@ -17082,8 +17115,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:362 -#: erpnext/manufacturing/doctype/job_card/job_card.js:432 +#: erpnext/manufacturing/doctype/job_card/job_card.js:371 +#: erpnext/manufacturing/doctype/job_card/job_card.js:441 #: 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 @@ -17099,7 +17132,7 @@ msgstr "" #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64 #: erpnext/accounts/report/financial_ratios/financial_ratios.js:25 #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:89 -#: erpnext/public/js/financial_statements.js:340 +#: erpnext/public/js/financial_statements.js:351 msgid "End Year" msgstr "" @@ -17144,7 +17177,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:13 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:23 -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:29 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:30 msgid "Enough Parts to Build" msgstr "" @@ -17170,12 +17203,12 @@ msgstr "" msgid "Enter Serial Nos" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:419 +#: erpnext/stock/doctype/material_request/material_request.js:422 msgid "Enter Supplier" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:389 -#: erpnext/manufacturing/doctype/job_card/job_card.js:458 +#: erpnext/manufacturing/doctype/job_card/job_card.js:398 +#: erpnext/manufacturing/doctype/job_card/job_card.js:467 #: erpnext/manufacturing/doctype/workstation/workstation.js:312 msgid "Enter Value" msgstr "" @@ -17184,7 +17217,7 @@ msgstr "" msgid "Enter Visit Details" msgstr "" -#: erpnext/manufacturing/doctype/routing/routing.js:78 +#: erpnext/manufacturing/doctype/routing/routing.js:88 msgid "Enter a name for Routing." msgstr "" @@ -17232,7 +17265,7 @@ msgstr "" msgid "Enter the Bank Guarantee Number before submitting." msgstr "" -#: erpnext/manufacturing/doctype/routing/routing.js:83 +#: erpnext/manufacturing/doctype/routing/routing.js:93 msgid "" "Enter the Operation, the table will fetch the Operation details like Hourly Rate, Workstation automatically.\n" "\n" @@ -17251,11 +17284,11 @@ msgstr "" msgid "Enter the opening stock units." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:918 +#: erpnext/manufacturing/doctype/bom/bom.js:926 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:1138 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1141 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set." msgstr "" @@ -17340,7 +17373,7 @@ msgstr "" msgid "Error while processing deferred accounting for {0}" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:442 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:513 msgid "Error while reposting item valuation" msgstr "" @@ -17397,7 +17430,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:990 +#: erpnext/stock/doctype/item/item.py:971 msgid "Example of a linked document: {0}" msgstr "" @@ -17463,15 +17496,17 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json #: erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json -#: erpnext/setup/doctype/company/company.py:624 +#: erpnext/setup/doctype/company/company.py:655 msgid "Exchange Gain/Loss" msgstr "" -#: erpnext/controllers/accounts_controller.py:1696 -#: erpnext/controllers/accounts_controller.py:1780 +#: erpnext/controllers/accounts_controller.py:1704 +#: erpnext/controllers/accounts_controller.py:1788 msgid "Exchange Gain/Loss amount has been booked through {0}" msgstr "" +#. Label of the exchange_rate (Float) field in DocType 'Advance Payment Ledger +#. Entry' #. Label of the exchange_rate (Float) field in DocType 'Journal Entry Account' #. Label of the exchange_rate (Float) field in DocType 'Payment Entry #. Reference' @@ -17499,6 +17534,7 @@ msgstr "" #. Label of the exchange_rate (Float) field in DocType 'Landed Cost Taxes and #. Charges' #. Label of the conversion_rate (Float) field in DocType 'Purchase Receipt' +#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json @@ -17550,7 +17586,7 @@ msgstr "" msgid "Exchange Rate Revaluation Settings" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:73 +#: erpnext/controllers/sales_and_purchase_return.py:72 msgid "Exchange Rate must be same as {0} {1} ({2})" msgstr "" @@ -17562,7 +17598,7 @@ msgstr "" msgid "Excise Entry" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.js:1367 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:1365 msgid "Excise Invoice" msgstr "" @@ -17627,7 +17663,7 @@ msgstr "" msgid "Expected Amount" msgstr "" -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:424 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:429 msgid "Expected Arrival Date" msgstr "" @@ -17657,7 +17693,7 @@ msgstr "" msgid "Expected Delivery Date" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:401 +#: erpnext/selling/doctype/sales_order/sales_order.py:403 msgid "Expected Delivery Date should be after Sales Order Date" msgstr "" @@ -17731,7 +17767,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:601 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:603 #: 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:184 @@ -17739,7 +17775,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:895 +#: erpnext/controllers/stock_controller.py:896 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -17772,7 +17808,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_profile/pos_profile.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/account_balance/account_balance.js:46 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:253 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:256 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -17787,7 +17823,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:875 +#: erpnext/controllers/stock_controller.py:876 msgid "Expense Account Missing" msgstr "" @@ -17802,13 +17838,13 @@ msgstr "" msgid "Expense Head" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:495 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:519 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:539 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:497 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:521 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:541 msgid "Expense Head Changed" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:597 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:599 msgid "Expense account is mandatory for item {0}" msgstr "" @@ -17932,11 +17968,14 @@ msgstr "" msgid "FG / Semi FG Item" msgstr "" +#. Option for the 'Default Stock Valuation Method' (Select) field in DocType +#. 'Company' #. Option for the 'Valuation Method' (Select) field in DocType 'Item' #. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock #. Settings' #. Option for the 'Pick Serial / Batch Based On' (Select) field in DocType #. 'Stock Settings' +#: erpnext/setup/doctype/company/company.json #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "FIFO" @@ -17995,7 +18034,7 @@ msgstr "" msgid "Failed to login" msgstr "" -#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:163 +#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:164 msgid "Failed to parse MT940 format. Error: {0}" msgstr "" @@ -18012,7 +18051,7 @@ msgstr "" msgid "Failed to setup defaults" msgstr "" -#: erpnext/setup/doctype/company/company.py:821 +#: erpnext/setup/doctype/company/company.py:852 msgid "Failed to setup defaults for country {0}. Please contact support." msgstr "" @@ -18106,7 +18145,7 @@ msgstr "" msgid "Fetch Value From" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:354 +#: erpnext/stock/doctype/material_request/material_request.js:357 #: erpnext/stock/doctype/stock_entry/stock_entry.js:681 msgid "Fetch exploded BOM (including sub-assemblies)" msgstr "" @@ -18125,11 +18164,11 @@ msgstr "" msgid "Fetching Error" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:188 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:198 msgid "Fetching Material Requests..." msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:135 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:145 msgid "Fetching Sales Orders..." msgstr "" @@ -18167,7 +18206,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:16 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:16 -#: erpnext/public/js/financial_statements.js:292 +#: erpnext/public/js/financial_statements.js:303 msgid "Filter Based On" msgstr "" @@ -18201,11 +18240,11 @@ msgstr "" msgid "Filter on Payment" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:148 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:158 msgid "Filters for Material Requests" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:82 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:92 msgid "Filters for Sales Orders" msgstr "" @@ -18272,7 +18311,7 @@ msgstr "" #: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json #: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:48 -#: erpnext/public/js/financial_statements.js:286 +#: erpnext/public/js/financial_statements.js:297 msgid "Finance Book" msgstr "" @@ -18333,7 +18372,7 @@ msgstr "" #. Label of a Card Break in the Financial Reports Workspace #: erpnext/accounts/workspace/financial_reports/financial_reports.json -#: erpnext/public/js/financial_statements.js:254 +#: erpnext/public/js/financial_statements.js:265 msgid "Financial Statements" msgstr "" @@ -18406,15 +18445,15 @@ msgstr "" msgid "Finished Good Item Quantity" msgstr "" -#: erpnext/controllers/accounts_controller.py:3827 +#: erpnext/controllers/accounts_controller.py:3835 msgid "Finished Good Item is not specified for service item {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:3844 +#: erpnext/controllers/accounts_controller.py:3852 msgid "Finished Good Item {0} Qty can not be zero" msgstr "" -#: erpnext/controllers/accounts_controller.py:3838 +#: erpnext/controllers/accounts_controller.py:3846 msgid "Finished Good Item {0} must be a sub-contracted item" msgstr "" @@ -18459,7 +18498,7 @@ msgstr "" msgid "Finished Good {0} must be a sub-contracted item." msgstr "" -#: erpnext/setup/doctype/company/company.py:341 +#: erpnext/setup/doctype/company/company.py:372 msgid "Finished Goods" msgstr "" @@ -18490,7 +18529,6 @@ msgstr "" #. Label of the warehouse (Link) field in DocType 'Production Plan Item' #. Label of the fg_warehouse (Link) field in DocType 'Work Order Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Finished Goods Warehouse" @@ -18501,7 +18539,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1523 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1525 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -18555,11 +18593,10 @@ msgstr "" msgid "First Response Time for Opportunity" msgstr "" -#: erpnext/regional/italy/utils.py:256 +#: erpnext/regional/italy/utils.py:229 msgid "Fiscal Regime is mandatory, kindly set the fiscal regime in the company {0}" msgstr "" -#. Label of the fiscal_year (Link) field in DocType 'Budget' #. Name of a DocType #. Label of the fiscal_year (Link) field in DocType 'GL Entry' #. Label of the fiscal_year (Link) field in DocType 'Monthly Distribution' @@ -18569,7 +18606,6 @@ msgstr "" #. Certificate' #. Label of the fiscal_year (Link) field in DocType 'Target Detail' #. Label of the fiscal_year (Data) field in DocType 'Stock Ledger Entry' -#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json @@ -18615,6 +18651,10 @@ msgstr "" msgid "Fiscal Year {0} does not exist" msgstr "" +#: erpnext/accounts/doctype/budget/budget.py:96 +msgid "Fiscal Year {0} is not available for Company {1}." +msgstr "" + #: erpnext/accounts/report/trial_balance/trial_balance.py:43 msgid "Fiscal Year {0} is required" msgstr "" @@ -18665,7 +18705,7 @@ msgstr "" msgid "Fixed Asset Turnover Ratio" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:668 +#: erpnext/manufacturing/doctype/bom/bom.py:679 msgid "Fixed Asset item {0} cannot be used in BOMs." msgstr "" @@ -18743,7 +18783,7 @@ msgstr "" msgid "Following Material Requests have been raised automatically based on Item's re-order level" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:775 +#: erpnext/selling/doctype/customer/customer.py:784 msgid "Following fields are mandatory to create address:" msgstr "" @@ -18775,7 +18815,7 @@ msgstr "" msgid "For" msgstr "" -#: erpnext/public/js/utils/sales_common.js:367 +#: erpnext/public/js/utils/sales_common.js:389 msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table." msgstr "" @@ -18795,7 +18835,7 @@ msgstr "" msgid "For Company" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:397 +#: erpnext/stock/doctype/material_request/material_request.js:400 msgid "For Default Supplier (Optional)" msgstr "" @@ -18804,7 +18844,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1441 +#: erpnext/controllers/stock_controller.py:1527 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -18814,7 +18854,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:502 +#: erpnext/manufacturing/doctype/job_card/job_card.js:511 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "For Operation" msgstr "" @@ -18845,7 +18885,7 @@ msgstr "" msgid "For Raw Materials" msgstr "" -#: erpnext/controllers/accounts_controller.py:1362 +#: erpnext/controllers/accounts_controller.py:1370 msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}" msgstr "" @@ -18873,11 +18913,11 @@ msgstr "" msgid "For Work Order" msgstr "" -#: erpnext/controllers/status_updater.py:276 +#: erpnext/controllers/status_updater.py:277 msgid "For an item {0}, quantity must be negative number" msgstr "" -#: erpnext/controllers/status_updater.py:273 +#: erpnext/controllers/status_updater.py:274 msgid "For an item {0}, quantity must be positive number" msgstr "" @@ -18907,11 +18947,11 @@ msgstr "" msgid "For item {0}, only {1} asset have been created or linked to {2}. Please create or link {3} more asset with the respective document." msgstr "" -#: erpnext/controllers/status_updater.py:281 +#: erpnext/controllers/status_updater.py:282 msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2488 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2490 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})" msgstr "" @@ -18928,7 +18968,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1555 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1557 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -18937,12 +18977,12 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1533 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1677 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1701 msgid "For row {0}: Enter Planned Qty" msgstr "" @@ -18970,11 +19010,11 @@ msgctxt "Clear payment terms template and/or payment schedule when due date is c msgid "For the new {0} to take effect, would you like to clear the current {1}?" msgstr "" -#: erpnext/controllers/stock_controller.py:399 +#: erpnext/controllers/stock_controller.py:400 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:1122 +#: erpnext/controllers/sales_and_purchase_return.py:1123 msgid "For the {0}, the quantity is required to make the return entry" msgstr "" @@ -19083,7 +19123,7 @@ msgstr "" msgid "Free item code is not selected" msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:651 +#: erpnext/accounts/doctype/pricing_rule/utils.py:654 msgid "Free item not set in the pricing rule {0}" msgstr "" @@ -19124,6 +19164,11 @@ msgstr "" msgid "From BOM" msgstr "" +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:63 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:25 +msgid "From BOM No" +msgstr "" + #. Label of the from_company (Data) field in DocType 'Warranty Claim' #: erpnext/support/doctype/warranty_claim/warranty_claim.json msgid "From Company" @@ -19168,14 +19213,14 @@ msgstr "" msgid "From Date cannot be greater than To Date" msgstr "" -#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:26 +#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:27 msgid "From Date is mandatory" msgstr "" #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:53 #: erpnext/accounts/report/general_ledger/general_ledger.py:86 #: erpnext/accounts/report/pos_register/pos_register.py:115 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:39 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:41 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:41 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:34 #: erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py:38 @@ -19228,10 +19273,16 @@ msgstr "" msgid "From External Ecomm Platform" msgstr "" +#. Label of the from_fiscal_year (Link) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:43 msgid "From Fiscal Year" msgstr "" +#: erpnext/accounts/doctype/budget/budget.py:109 +msgid "From Fiscal Year cannot be greater than To Fiscal Year" +msgstr "" + #. Label of the from_folio_no (Data) field in DocType 'Share Transfer' #: erpnext/accounts/doctype/share_transfer/share_transfer.json msgid "From Folio No" @@ -19574,7 +19625,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:664 +#: erpnext/accounts/report/general_ledger/general_ledger.py:671 msgid "GL Entry" msgstr "" @@ -19631,7 +19682,7 @@ msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:134 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:220 -#: erpnext/setup/doctype/company/company.py:632 +#: erpnext/setup/doctype/company/company.py:663 msgid "Gain/Loss on Asset Disposal" msgstr "" @@ -19673,13 +19724,11 @@ msgstr "" #. Option for the 'Report' (Select) field in DocType 'Process Statement Of #. Accounts' #. Name of a report -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Financial Reports Workspace #: erpnext/accounts/doctype/account/account.js:92 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/general_ledger/general_ledger.json -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/financial_reports/financial_reports.json msgid "General Ledger" msgstr "" @@ -19749,7 +19798,7 @@ msgstr "" msgid "Generated" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:46 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:56 msgid "Generating Master Production Schedule..." msgstr "" @@ -19914,8 +19963,8 @@ msgstr "" #. Label of the get_material_requests (Button) field in DocType 'Master #. Production Schedule' -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:171 -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:173 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:181 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:183 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json msgid "Get Material Requests" msgstr "" @@ -19955,8 +20004,8 @@ msgstr "" #. Label of the get_sales_orders (Button) field in DocType 'Master Production #. Schedule' #. Label of the get_sales_orders (Button) field in DocType 'Production Plan' -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:118 -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:120 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:128 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:130 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json #: erpnext/manufacturing/doctype/production_plan/production_plan.json msgid "Get Sales Orders" @@ -20032,7 +20081,6 @@ msgid "Give free item for every N quantity" msgstr "" #. Name of a DocType -#. Label of a Link in the Settings Workspace #. Label of a shortcut in the Settings Workspace #: erpnext/setup/doctype/global_defaults/global_defaults.json #: erpnext/setup/workspace/settings/settings.json @@ -20058,7 +20106,7 @@ msgstr "" msgid "Goods" msgstr "" -#: erpnext/setup/doctype/company/company.py:342 +#: erpnext/setup/doctype/company/company.py:373 #: erpnext/stock/doctype/stock_entry/stock_entry_list.js:21 msgid "Goods In Transit" msgstr "" @@ -20067,7 +20115,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2070 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2072 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -20188,7 +20236,7 @@ msgstr "" #: erpnext/accounts/report/pos_register/pos_register.py:202 #: erpnext/accounts/report/purchase_register/purchase_register.py:275 #: erpnext/accounts/report/sales_register/sales_register.py:305 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json #: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json @@ -20371,7 +20419,7 @@ msgstr "" msgid "Group by Voucher" msgstr "" -#: erpnext/stock/utils.py:440 +#: erpnext/stock/utils.py:444 msgid "Group node warehouse is not allowed to select for transactions" msgstr "" @@ -20433,10 +20481,12 @@ msgstr "" msgid "HR User" msgstr "" +#. Option for the 'Distribution Frequency' (Select) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:64 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77 #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59 -#: erpnext/public/js/financial_statements.js:353 +#: erpnext/public/js/financial_statements.js:364 #: erpnext/public/js/purchase_trends_filters.js:21 #: erpnext/public/js/sales_trends_filters.js:13 #: erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34 @@ -20510,6 +20560,12 @@ msgstr "" msgid "Has Item Scanned" msgstr "" +#. Label of the has_operating_cost (Check) field in DocType 'Landed Cost Taxes +#. and Charges' +#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json +msgid "Has Operating Cost" +msgstr "" + #. Label of the has_print_format (Check) field in DocType 'Cheque Print #. Template' #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json @@ -20667,7 +20723,7 @@ msgstr "" msgid "Hertz" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:444 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:515 msgid "Hi," msgstr "" @@ -20755,7 +20811,7 @@ msgstr "" msgid "Holiday" msgstr "" -#: erpnext/setup/doctype/holiday_list/holiday_list.py:153 +#: erpnext/setup/doctype/holiday_list/holiday_list.py:162 msgid "Holiday Date {0} added multiple times" msgstr "" @@ -20867,7 +20923,7 @@ msgstr "" msgid "Hrs" msgstr "" -#: erpnext/setup/doctype/company/company.py:448 +#: erpnext/setup/doctype/company/company.py:479 msgid "Human Resources" msgstr "" @@ -21234,7 +21290,7 @@ msgstr "" msgid "If set, the system does not use the user's Email or the standard outgoing Email account for sending request for quotations." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1171 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1174 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected." msgstr "" @@ -21247,7 +21303,7 @@ msgstr "" msgid "If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1190 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1193 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed." msgstr "" @@ -21306,7 +21362,7 @@ msgstr "" msgid "If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured." msgstr "" -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:36 +#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24 msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials." msgstr "" @@ -21338,15 +21394,15 @@ msgstr "" msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1793 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1816 msgid "If you still want to proceed, please enable {0}." msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:373 +#: erpnext/accounts/doctype/pricing_rule/utils.py:376 msgid "If you {0} {1} quantities of the item {2}, the scheme {3} will be applied on the item." msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:378 +#: erpnext/accounts/doctype/pricing_rule/utils.py:381 msgid "If you {0} {1} worth item {2}, the scheme {3} will be applied on the item." msgstr "" @@ -21410,7 +21466,7 @@ msgstr "" msgid "Ignore Existing Ordered Qty" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1785 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1808 msgid "Ignore Existing Projected Quantity" msgstr "" @@ -21601,7 +21657,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:12 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:22 -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:28 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:29 msgid "In Stock Qty" msgstr "" @@ -21614,11 +21670,11 @@ msgstr "" msgid "In Transit" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:481 +#: erpnext/stock/doctype/material_request/material_request.js:484 msgid "In Transit Transfer" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:450 +#: erpnext/stock/doctype/material_request/material_request.js:453 msgid "In Transit Warehouse" msgstr "" @@ -21871,7 +21927,7 @@ msgstr "" msgid "Include POS Transactions" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:194 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:199 msgid "Include Payment" msgstr "" @@ -21952,7 +22008,7 @@ msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:235 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:465 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:467 #: erpnext/accounts/report/account_balance/account_balance.js:27 #: erpnext/accounts/report/financial_statements.py:776 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:182 @@ -21974,7 +22030,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/account_balance/account_balance.js:53 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:77 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:301 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:299 msgid "Income Account" msgstr "" @@ -22022,7 +22078,7 @@ msgstr "" msgid "Incorrect Balance Qty After Transaction" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1006 +#: erpnext/controllers/subcontracting_controller.py:1027 msgid "Incorrect Batch Consumed" msgstr "" @@ -22056,7 +22112,7 @@ msgstr "" msgid "Incorrect Serial No Valuation" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1019 +#: erpnext/controllers/subcontracting_controller.py:1040 msgid "Incorrect Serial Number Consumed" msgstr "" @@ -22237,13 +22293,13 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1335 +#: erpnext/controllers/stock_controller.py:1421 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1305 -#: erpnext/controllers/stock_controller.py:1307 +#: erpnext/controllers/stock_controller.py:1391 +#: erpnext/controllers/stock_controller.py:1393 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -22260,7 +22316,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1320 +#: erpnext/controllers/stock_controller.py:1406 msgid "Inspection Submission" msgstr "" @@ -22290,7 +22346,7 @@ msgstr "" msgid "Installation Note Item" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:627 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:629 msgid "Installation Note {0} has already been submitted" msgstr "" @@ -22329,14 +22385,14 @@ msgstr "" msgid "Insufficient Capacity" msgstr "" -#: erpnext/controllers/accounts_controller.py:3752 -#: erpnext/controllers/accounts_controller.py:3776 +#: erpnext/controllers/accounts_controller.py:3760 +#: erpnext/controllers/accounts_controller.py:3784 msgid "Insufficient Permissions" msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:120 #: erpnext/stock/doctype/pick_list/pick_list.py:138 -#: erpnext/stock/doctype/pick_list/pick_list.py:1009 +#: erpnext/stock/doctype/pick_list/pick_list.py:1013 #: erpnext/stock/doctype/stock_entry/stock_entry.py:841 #: erpnext/stock/serial_batch_bundle.py:1186 erpnext/stock/stock_ledger.py:1679 #: erpnext/stock/stock_ledger.py:2165 @@ -22475,7 +22531,7 @@ msgstr "" msgid "Interest Income" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3052 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3053 msgid "Interest and/or dunning fee" msgstr "" @@ -22500,7 +22556,7 @@ msgstr "" msgid "Internal Customer" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:223 +#: erpnext/selling/doctype/customer/customer.py:224 msgid "Internal Customer for company {0} already exists" msgstr "" @@ -22508,7 +22564,7 @@ msgstr "" msgid "Internal Purchase Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:733 +#: erpnext/controllers/accounts_controller.py:738 msgid "Internal Sale or Delivery Reference missing." msgstr "" @@ -22516,7 +22572,7 @@ msgstr "" msgid "Internal Sales Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:735 +#: erpnext/controllers/accounts_controller.py:740 msgid "Internal Sales Reference Missing" msgstr "" @@ -22547,7 +22603,7 @@ msgstr "" msgid "Internal Transfer" msgstr "" -#: erpnext/controllers/accounts_controller.py:744 +#: erpnext/controllers/accounts_controller.py:749 msgid "Internal Transfer Reference Missing" msgstr "" @@ -22560,7 +22616,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1402 +#: erpnext/controllers/stock_controller.py:1488 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -22574,14 +22630,14 @@ msgstr "" msgid "Interval should be between 1 to 59 MInutes" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:384 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1044 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1054 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:378 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:386 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1046 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1056 #: erpnext/assets/doctype/asset_category/asset_category.py:69 #: erpnext/assets/doctype/asset_category/asset_category.py:97 -#: erpnext/controllers/accounts_controller.py:3126 #: erpnext/controllers/accounts_controller.py:3134 +#: erpnext/controllers/accounts_controller.py:3142 msgid "Invalid Account" msgstr "" @@ -22598,7 +22654,7 @@ msgstr "" msgid "Invalid Attribute" msgstr "" -#: erpnext/controllers/accounts_controller.py:555 +#: erpnext/controllers/accounts_controller.py:560 msgid "Invalid Auto Repeat Date" msgstr "" @@ -22614,17 +22670,17 @@ msgstr "" msgid "Invalid Child Procedure" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2326 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2328 msgid "Invalid Company for Inter Company Transaction." msgstr "" #: erpnext/assets/doctype/asset/asset.py:296 #: erpnext/assets/doctype/asset/asset.py:303 -#: erpnext/controllers/accounts_controller.py:3149 +#: erpnext/controllers/accounts_controller.py:3157 msgid "Invalid Cost Center" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:403 +#: erpnext/selling/doctype/sales_order/sales_order.py:405 msgid "Invalid Delivery Date" msgstr "" @@ -22632,7 +22688,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:738 +#: erpnext/controllers/taxes_and_totals.py:792 msgid "Invalid Discount Amount" msgstr "" @@ -22653,12 +22709,12 @@ msgstr "" msgid "Invalid Group By" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:454 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:459 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:934 msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1405 +#: erpnext/stock/doctype/item/item.py:1386 msgid "Invalid Item Defaults" msgstr "" @@ -22706,7 +22762,7 @@ msgstr "" msgid "Invalid Priority" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1139 +#: erpnext/manufacturing/doctype/bom/bom.py:1152 msgid "Invalid Process Loss Configuration" msgstr "" @@ -22714,11 +22770,11 @@ msgstr "" msgid "Invalid Purchase Invoice" msgstr "" -#: erpnext/controllers/accounts_controller.py:3796 +#: erpnext/controllers/accounts_controller.py:3804 msgid "Invalid Qty" msgstr "" -#: erpnext/controllers/accounts_controller.py:1380 +#: erpnext/controllers/accounts_controller.py:1388 msgid "Invalid Quantity" msgstr "" @@ -22739,11 +22795,11 @@ msgstr "" msgid "Invalid Schedule" msgstr "" -#: erpnext/controllers/selling_controller.py:287 +#: erpnext/controllers/selling_controller.py:296 msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1598 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1600 msgid "Invalid Serial and Batch Bundle" msgstr "" @@ -22773,7 +22829,7 @@ msgstr "" msgid "Invalid filter formula. Please check the syntax." msgstr "" -#: erpnext/selling/doctype/quotation/quotation.py:272 +#: erpnext/selling/doctype/quotation/quotation.py:274 msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" @@ -22804,12 +22860,12 @@ msgstr "" msgid "Invalid {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2324 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2326 msgid "Invalid {0} for Inter Company Transaction." msgstr "" #: erpnext/accounts/report/general_ledger/general_ledger.py:101 -#: erpnext/controllers/sales_and_purchase_return.py:35 +#: erpnext/controllers/sales_and_purchase_return.py:34 msgid "Invalid {0}: {1}" msgstr "" @@ -22869,8 +22925,8 @@ msgstr "" #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/subscription_invoice/subscription_invoice.json -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:177 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:197 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:180 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:195 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:97 msgid "Invoice" msgstr "" @@ -22929,7 +22985,7 @@ msgstr "" msgid "Invoice Number" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:820 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:825 msgid "Invoice Paid" msgstr "" @@ -23028,7 +23084,7 @@ msgstr "" #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json #: erpnext/accounts/doctype/pos_profile/pos_profile.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2375 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2377 #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62 msgid "Invoices" @@ -23108,7 +23164,7 @@ msgid "Is Advance" msgstr "" #. Label of the is_alternative (Check) field in DocType 'Quotation Item' -#: erpnext/selling/doctype/quotation/quotation.js:307 +#: erpnext/selling/doctype/quotation/quotation.js:308 #: erpnext/selling/doctype/quotation_item/quotation_item.json msgid "Is Alternative" msgstr "" @@ -23304,6 +23360,13 @@ msgstr "" msgid "Is Group Warehouse" msgstr "" +#. Label of the is_half_day (Check) field in DocType 'Holiday' +#. Label of the is_half_day (Check) field in DocType 'Holiday List' +#: erpnext/setup/doctype/holiday/holiday.json +#: erpnext/setup/doctype/holiday_list/holiday_list.json +msgid "Is Half Day" +msgstr "" + #. Label of the is_internal_customer (Check) field in DocType 'Sales Invoice' #. Label of the is_internal_customer (Check) field in DocType 'Customer' #. Label of the is_internal_customer (Check) field in DocType 'Sales Order' @@ -23398,6 +23461,19 @@ msgstr "" msgid "Is Period Closing Voucher Entry" msgstr "" +#. Label of the is_phantom_bom (Check) field in DocType 'BOM' +#: erpnext/manufacturing/doctype/bom/bom.json +msgid "Is Phantom BOM" +msgstr "" + +#. Label of the is_phantom_item (Check) field in DocType 'BOM Creator Item' +#. Label of the is_phantom_item (Check) field in DocType 'BOM Item' +#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json +#: erpnext/manufacturing/doctype/bom_item/bom_item.json +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:68 +msgid "Is Phantom Item" +msgstr "" + #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" @@ -23732,13 +23808,13 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:204 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1148 +#: erpnext/controllers/taxes_and_totals.py:1202 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json -#: erpnext/manufacturing/doctype/bom/bom.js:1011 +#: erpnext/manufacturing/doctype/bom/bom.js:1019 #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25 -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:49 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:50 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:9 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:19 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:22 @@ -23746,8 +23822,8 @@ msgstr "" #: erpnext/manufacturing/report/process_loss_report/process_loss_report.js:15 #: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:74 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:212 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:359 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:234 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:385 #: erpnext/public/js/purchase_trends_filters.js:48 #: erpnext/public/js/purchase_trends_filters.js:63 #: erpnext/public/js/sales_trends_filters.js:23 @@ -23975,8 +24051,8 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:68 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:37 #: erpnext/accounts/report/gross_profit/gross_profit.py:301 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:150 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:170 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:153 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:168 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:37 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json @@ -24012,7 +24088,7 @@ msgstr "" #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json #: erpnext/manufacturing/doctype/workstation/workstation.js:471 #: erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155 -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:49 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:60 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:8 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:103 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:100 @@ -24021,7 +24097,7 @@ msgstr "" #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.js:30 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:935 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:971 -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:359 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:364 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:27 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:86 #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:119 @@ -24033,7 +24109,7 @@ msgstr "" #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json #: erpnext/selling/doctype/installation_note_item/installation_note_item.json -#: erpnext/selling/doctype/quotation/quotation.js:281 +#: erpnext/selling/doctype/quotation/quotation.js:282 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:368 #: erpnext/selling/doctype/sales_order/sales_order.js:476 @@ -24084,7 +24160,7 @@ msgstr "" #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:429 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:130 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:132 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:26 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json @@ -24115,11 +24191,11 @@ msgstr "" msgid "Item Code cannot be changed for Serial No." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:451 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:453 msgid "Item Code required at Row No {0}" msgstr "" -#: erpnext/selling/page/point_of_sale/pos_controller.js:845 +#: erpnext/selling/page/point_of_sale/pos_controller.js:849 #: erpnext/selling/page/point_of_sale/pos_item_details.js:275 msgid "Item Code: {0} is not available under warehouse {1}." msgstr "" @@ -24226,9 +24302,9 @@ msgstr "" #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:21 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:28 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:28 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:164 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:167 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:65 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:184 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:182 #: erpnext/accounts/report/purchase_register/purchase_register.js:58 #: erpnext/accounts/report/sales_register/sales_register.js:70 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -24280,7 +24356,7 @@ msgstr "" #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:37 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:100 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:139 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:141 #: 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 @@ -24451,8 +24527,8 @@ msgstr "" #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:71 #: erpnext/accounts/report/gross_profit/gross_profit.py:308 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:33 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:156 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:176 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:159 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:174 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:71 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json @@ -24488,7 +24564,7 @@ msgstr "" #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json #: erpnext/manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:8 -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:55 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:66 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:109 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:23 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:106 @@ -24496,7 +24572,7 @@ msgstr "" #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:942 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:978 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:153 -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:366 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:371 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:138 #: erpnext/public/js/controllers/transaction.js:2785 @@ -24538,7 +24614,7 @@ msgstr "" #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:131 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:436 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:136 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:138 #: erpnext/stock/report/stock_analytics/stock_analytics.py:31 #: erpnext/stock/report/stock_balance/stock_balance.py:404 #: erpnext/stock/report/stock_ledger/stock_ledger.py:213 @@ -24633,6 +24709,11 @@ msgstr "" msgid "Item Reorder" msgstr "" +#. Label of the item_row (Data) field in DocType 'Item Wise Tax Detail' +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json +msgid "Item Row" +msgstr "" + #: 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 "" @@ -24746,8 +24827,8 @@ msgstr "" msgid "Item UOM" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:410 -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:417 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:415 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:422 msgid "Item Unavailable" msgstr "" @@ -24780,7 +24861,7 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:768 +#: erpnext/stock/doctype/item/item.py:749 msgid "Item Variants updated" msgstr "" @@ -24823,15 +24904,39 @@ msgstr "" msgid "Item Weight Details" msgstr "" -#. Label of the item_wise_tax_detail (Code) field in DocType 'Purchase Taxes -#. and Charges' -#. Label of the item_wise_tax_detail (Code) field in DocType 'Sales Taxes and -#. Charges' -#: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json -#: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json +#. Name of a DocType +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" msgstr "" +#. Label of the item_wise_tax_details (Table) field in DocType 'POS Invoice' +#. Label of the item_wise_tax_details (Table) field in DocType 'Purchase +#. Invoice' +#. Label of the item_wise_tax_details (Table) field in DocType 'Sales Invoice' +#. Label of the item_wise_tax_details (Table) field in DocType 'Purchase Order' +#. Label of the item_wise_tax_details (Table) field in DocType 'Supplier +#. Quotation' +#. Label of the item_wise_tax_details (Table) field in DocType 'Quotation' +#. Label of the item_wise_tax_details (Table) field in DocType 'Sales Order' +#. Label of the item_wise_tax_details (Table) field in DocType 'Delivery Note' +#. Label of the item_wise_tax_details (Table) field in DocType 'Purchase +#. Receipt' +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json +#: erpnext/buying/doctype/purchase_order/purchase_order.json +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +#: 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/purchase_receipt/purchase_receipt.json +msgid "Item Wise Tax Details" +msgstr "" + +#: erpnext/controllers/taxes_and_totals.py:538 +msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" +msgstr "" + #. Label of the section_break_rrrx (Section Break) field in DocType 'Sales #. Forecast' #. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation' @@ -24845,15 +24950,15 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3067 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:785 +#: erpnext/stock/doctype/item/item.py:766 msgid "Item has variants." msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:408 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:436 msgid "Item is mandatory in Raw Materials table." msgstr "" @@ -24875,7 +24980,7 @@ msgstr "" msgid "Item operation" msgstr "" -#: erpnext/controllers/accounts_controller.py:3819 +#: erpnext/controllers/accounts_controller.py:3827 msgid "Item qty can not be updated as raw materials are already processed." msgstr "" @@ -24897,15 +25002,15 @@ msgstr "" msgid "Item valuation rate is recalculated considering landed cost voucher amount" msgstr "" -#: erpnext/stock/utils.py:555 +#: erpnext/stock/utils.py:559 msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:942 +#: erpnext/stock/doctype/item/item.py:923 msgid "Item variant {0} exists with same attributes" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:83 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:84 msgid "Item {0} cannot be added as a sub-assembly of itself" msgstr "" @@ -24914,23 +25019,23 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:278 -#: erpnext/stock/doctype/item/item.py:632 +#: erpnext/stock/doctype/item/item.py:613 msgid "Item {0} does not exist" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:596 +#: erpnext/manufacturing/doctype/bom/bom.py:607 msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:513 +#: erpnext/controllers/stock_controller.py:514 msgid "Item {0} does not exist." msgstr "" -#: erpnext/controllers/selling_controller.py:810 +#: erpnext/controllers/selling_controller.py:822 msgid "Item {0} entered multiple times." msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:222 +#: erpnext/controllers/sales_and_purchase_return.py:221 msgid "Item {0} has already been returned" msgstr "" @@ -24938,11 +25043,11 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:779 +#: erpnext/selling/doctype/sales_order/sales_order.py:778 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/stock/doctype/item/item.py:1121 +#: erpnext/stock/doctype/item/item.py:1102 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -24954,11 +25059,11 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1141 +#: erpnext/stock/doctype/item/item.py:1122 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1125 +#: erpnext/stock/doctype/item/item.py:1106 msgid "Item {0} is disabled" msgstr "" @@ -24966,7 +25071,7 @@ msgstr "" msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1133 +#: erpnext/stock/doctype/item/item.py:1114 msgid "Item {0} is not a stock Item" msgstr "" @@ -24974,7 +25079,7 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1982 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -24994,7 +25099,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1338 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -25002,7 +25107,7 @@ msgstr "" msgid "Item {0} not found." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:360 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:362 msgid "Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item)." msgstr "" @@ -25010,7 +25115,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1441 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1442 msgid "Item {} does not exist." msgstr "" @@ -25051,7 +25156,7 @@ msgstr "" msgid "Item/Item Code required to get Item Tax Template." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:346 +#: erpnext/manufacturing/doctype/bom/bom.py:349 msgid "Item: {0} does not exist in the system" msgstr "" @@ -25150,7 +25255,7 @@ msgstr "" msgid "Items Filter" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1639 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1646 #: erpnext/selling/doctype/sales_order/sales_order.js:1645 msgid "Items Required" msgstr "" @@ -25167,11 +25272,11 @@ msgstr "" msgid "Items and Pricing" msgstr "" -#: erpnext/controllers/accounts_controller.py:4053 +#: erpnext/controllers/accounts_controller.py:4061 msgid "Items cannot be updated as Subcontracting Inward Order(s) exist against this Subcontracted Sales Order." msgstr "" -#: erpnext/controllers/accounts_controller.py:4046 +#: erpnext/controllers/accounts_controller.py:4054 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}." msgstr "" @@ -25189,7 +25294,7 @@ msgstr "" msgid "Items to Be Repost" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1638 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1645 msgid "Items to Manufacture are required to pull the Raw Materials associated with it." msgstr "" @@ -25209,7 +25314,7 @@ msgstr "" msgid "Items under this warehouse will be suggested" msgstr "" -#: erpnext/controllers/stock_controller.py:123 +#: erpnext/controllers/stock_controller.py:124 msgid "Items {0} do not exist in the Item master." msgstr "" @@ -25389,7 +25494,7 @@ msgstr "" msgid "Job Worker Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2539 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2541 msgid "Job card {0} created" msgstr "" @@ -25416,7 +25521,7 @@ msgstr "" msgid "Journal Entries" msgstr "" -#: erpnext/accounts/utils.py:1023 +#: erpnext/accounts/utils.py:1027 msgid "Journal Entries {0} are un-linked" msgstr "" @@ -25429,7 +25534,6 @@ msgstr "" #. Option for the 'Invoice Type' (Select) field in DocType 'Payment #. Reconciliation Invoice' #. Label of a Link in the Accounting Workspace -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Payables Workspace #. Label of a shortcut in the Payables Workspace #. Label of a shortcut in the Receivables Workspace @@ -25624,11 +25728,14 @@ msgstr "" msgid "Knot" msgstr "" +#. Option for the 'Default Stock Valuation Method' (Select) field in DocType +#. 'Company' #. Option for the 'Valuation Method' (Select) field in DocType 'Item' #. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock #. Settings' #. Option for the 'Pick Serial / Batch Based On' (Select) field in DocType #. 'Stock Settings' +#: erpnext/setup/doctype/company/company.json #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "LIFO" @@ -25760,7 +25867,7 @@ msgstr "" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:98 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:106 #: erpnext/stock/doctype/item/item.json #: erpnext/stock/report/item_prices/item_prices.py:56 msgid "Last Purchase Rate" @@ -25807,7 +25914,7 @@ msgstr "" msgid "Last transacted" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:175 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:177 msgid "Latest" msgstr "" @@ -25950,11 +26057,6 @@ msgstr "" msgid "Leads help you get business, add all your contacts and more as your leads" msgstr "" -#. Label of a shortcut in the Accounting Workspace -#: erpnext/accounts/workspace/accounting/accounting.json -msgid "Learn Accounting" -msgstr "" - #. Label of a shortcut in the Stock Workspace #: erpnext/stock/workspace/stock/stock.json msgid "Learn Inventory Management" @@ -26135,7 +26237,7 @@ msgstr "" msgid "License Plate" msgstr "" -#: erpnext/controllers/status_updater.py:459 +#: erpnext/controllers/status_updater.py:460 msgid "Limit Crossed" msgstr "" @@ -26217,7 +26319,7 @@ msgstr "" msgid "Linked Location" msgstr "" -#: erpnext/stock/doctype/item/item.py:994 +#: erpnext/stock/doctype/item/item.py:975 msgid "Linked with submitted documents" msgstr "" @@ -26398,7 +26500,7 @@ msgstr "" #. 'Quotation' #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/report/lost_opportunity/lost_opportunity.py:49 -#: erpnext/public/js/utils/sales_common.js:548 +#: erpnext/public/js/utils/sales_common.js:570 #: erpnext/selling/doctype/quotation/quotation.json msgid "Lost Reasons" msgstr "" @@ -26542,11 +26644,11 @@ msgstr "" msgid "MPS Generated" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:432 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:448 msgid "MRP Log documents are being created in the background." msgstr "" -#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:156 +#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:157 msgid "MT940 file detected. Please enable 'Import MT940 Format' to proceed." msgstr "" @@ -26570,10 +26672,10 @@ msgstr "" msgid "Machine operator errors" msgstr "" -#: erpnext/setup/doctype/company/company.py:685 -#: erpnext/setup/doctype/company/company.py:700 -#: erpnext/setup/doctype/company/company.py:701 -#: erpnext/setup/doctype/company/company.py:702 +#: erpnext/setup/doctype/company/company.py:716 +#: erpnext/setup/doctype/company/company.py:731 +#: erpnext/setup/doctype/company/company.py:732 +#: erpnext/setup/doctype/company/company.py:733 msgid "Main" msgstr "" @@ -26813,7 +26915,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:523 +#: erpnext/manufacturing/doctype/job_card/job_card.js:532 #: erpnext/manufacturing/doctype/work_order/work_order.js:798 #: erpnext/manufacturing/doctype/work_order/work_order.js:832 #: erpnext/setup/doctype/vehicle/vehicle.json @@ -26873,12 +26975,12 @@ msgstr "" msgid "Make Serial No / Batch from Work Order" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:92 +#: erpnext/manufacturing/doctype/job_card/job_card.js:101 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279 msgid "Make Stock Entry" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:397 +#: erpnext/manufacturing/doctype/job_card/job_card.js:406 msgid "Make Subcontracting PO" msgstr "" @@ -26911,8 +27013,8 @@ msgstr "" #: erpnext/assets/doctype/asset/asset.js:150 #: erpnext/assets/doctype/asset/asset.js:160 #: erpnext/assets/doctype/asset/asset.js:176 -#: erpnext/setup/doctype/company/company.js:154 -#: erpnext/setup/doctype/company/company.js:165 +#: erpnext/setup/doctype/company/company.js:161 +#: erpnext/setup/doctype/company/company.js:172 msgid "Manage" msgstr "" @@ -26925,7 +27027,7 @@ msgstr "" msgid "Manage your orders" msgstr "" -#: erpnext/setup/doctype/company/company.py:454 +#: erpnext/setup/doctype/company/company.py:485 msgid "Management" msgstr "" @@ -26941,7 +27043,7 @@ msgstr "" msgid "Mandatory Accounting Dimension" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1852 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1854 msgid "Mandatory Field" msgstr "" @@ -26957,15 +27059,15 @@ msgstr "" msgid "Mandatory For Profit and Loss Account" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.py:610 +#: erpnext/selling/doctype/quotation/quotation.py:612 msgid "Mandatory Missing" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:633 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:635 msgid "Mandatory Purchase Order" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:654 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:656 msgid "Mandatory Purchase Receipt" msgstr "" @@ -27079,7 +27181,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:62 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:70 #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/item_manufacturer/item_manufacturer.json #: erpnext/stock/doctype/manufacturer/manufacturer.json @@ -27109,7 +27211,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:68 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:76 #: erpnext/stock/doctype/item_manufacturer/item_manufacturer.json #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -27183,7 +27285,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2206 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2208 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -27195,10 +27297,8 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Manufacturing Workspace -#. Label of a Link in the Settings Workspace #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/setup/workspace/settings/settings.json msgid "Manufacturing Settings" msgstr "" @@ -27359,13 +27459,13 @@ msgstr "" msgid "Market Segment" msgstr "" -#: erpnext/setup/doctype/company/company.py:406 +#: erpnext/setup/doctype/company/company.py:437 msgid "Marketing" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:112 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:191 -#: erpnext/setup/doctype/company/company.py:641 +#: erpnext/setup/doctype/company/company.py:672 msgid "Marketing Expenses" msgstr "" @@ -27487,7 +27587,7 @@ msgstr "" #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:33 #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:184 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/manufacturing/doctype/job_card/job_card.js:151 +#: erpnext/manufacturing/doctype/job_card/job_card.js:160 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:159 #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json @@ -27583,7 +27683,7 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1922 +#: erpnext/selling/doctype/sales_order/sales_order.py:1925 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -27597,7 +27697,7 @@ msgstr "" msgid "Material Request used to make this Stock Entry" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1272 +#: erpnext/controllers/subcontracting_controller.py:1293 msgid "Material Request {0} is cancelled or stopped" msgstr "" @@ -27613,7 +27713,7 @@ msgstr "" #. Label of the material_requests (Table) field in DocType 'Master Production #. Schedule' #. Label of the material_requests (Table) field in DocType 'Production Plan' -#: erpnext/accounts/doctype/budget/budget.py:337 +#: erpnext/accounts/doctype/budget/budget.py:592 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json #: erpnext/manufacturing/doctype/production_plan/production_plan.json msgid "Material Requests" @@ -27651,7 +27751,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Pick List' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' -#: erpnext/manufacturing/doctype/job_card/job_card.js:165 +#: erpnext/manufacturing/doctype/job_card/job_card.js:174 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/setup/setup_wizard/operations/install_fixtures.py:83 #: erpnext/stock/doctype/item/item.json @@ -27711,7 +27811,7 @@ msgstr "" msgid "Material to Supplier" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1493 +#: erpnext/controllers/subcontracting_controller.py:1514 msgid "Materials are already received against the {0} {1}" msgstr "" @@ -27784,7 +27884,7 @@ msgstr "" msgid "Max discount allowed for item: {0} is {1}%" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:972 +#: erpnext/manufacturing/doctype/work_order/work_order.js:975 #: erpnext/stock/doctype/pick_list/pick_list.js:198 msgid "Max: {0}" msgstr "" @@ -27806,11 +27906,11 @@ msgstr "" msgid "Maximum Payment Amount" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3603 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3627 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3594 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3618 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -27827,7 +27927,7 @@ msgstr "" msgid "Maximum Value" msgstr "" -#: erpnext/controllers/selling_controller.py:256 +#: erpnext/controllers/selling_controller.py:265 msgid "Maximum discount for Item {0} is {1}%" msgstr "" @@ -28231,20 +28331,20 @@ msgstr "" msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1442 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1443 msgid "Missing" msgstr "" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:97 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:200 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:593 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2391 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3047 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:595 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2393 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3049 #: erpnext/assets/doctype/asset_category/asset_category.py:116 msgid "Missing Account" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:456 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:458 msgid "Missing Asset" msgstr "" @@ -28265,7 +28365,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1533 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1535 msgid "Missing Finished Good" msgstr "" @@ -28293,8 +28393,8 @@ msgstr "" msgid "Missing required filter: {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1098 -#: erpnext/manufacturing/doctype/work_order/work_order.py:1447 +#: erpnext/manufacturing/doctype/bom/bom.py:1111 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1448 msgid "Missing value" msgstr "" @@ -28309,8 +28409,8 @@ msgstr "" msgid "Mobile: " msgstr "" -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:218 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:251 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:221 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:249 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 #: erpnext/accounts/report/sales_register/sales_register.py:224 msgid "Mode Of Payment" @@ -28399,11 +28499,6 @@ msgstr "" msgid "Module (for Export)" msgstr "" -#. Label of a Card Break in the Settings Workspace -#: erpnext/setup/workspace/settings/settings.json -msgid "Module Settings" -msgstr "" - #. Label of the monitor_progress (Section Break) field in DocType 'Project' #: erpnext/projects/doctype/project/project.json msgid "Monitor Progress" @@ -28441,10 +28536,8 @@ msgstr "" msgid "Monthly Completed Work Orders" msgstr "" -#. Label of the monthly_distribution (Link) field in DocType 'Budget' #. Name of a DocType #. Label of a Link in the Accounting Workspace -#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:69 #: erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json #: erpnext/accounts/workspace/accounting/accounting.json @@ -28512,9 +28605,12 @@ msgstr "" msgid "Movement" msgstr "" +#. Option for the 'Default Stock Valuation Method' (Select) field in DocType +#. 'Company' #. Option for the 'Valuation Method' (Select) field in DocType 'Item' #. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock #. Settings' +#: erpnext/setup/doctype/company/company.json #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Moving Average" @@ -28538,15 +28634,15 @@ msgstr "" msgid "Multi-level BOM Creator" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:384 +#: erpnext/selling/doctype/customer/customer.py:393 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1221 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1223 msgid "Multiple POS Opening Entry" msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:343 +#: erpnext/accounts/doctype/pricing_rule/utils.py:346 msgid "Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}" msgstr "" @@ -28560,15 +28656,15 @@ msgstr "" msgid "Multiple Variants" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:150 +#: erpnext/stock/doctype/warehouse/warehouse.py:152 msgid "Multiple Warehouse Accounts" msgstr "" -#: erpnext/controllers/accounts_controller.py:1230 +#: erpnext/controllers/accounts_controller.py:1234 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1540 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1542 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -28577,7 +28673,7 @@ msgid "Music" msgstr "" #. Label of the must_be_whole_number (Check) field in DocType 'UOM' -#: erpnext/manufacturing/doctype/work_order/work_order.py:1394 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1395 #: erpnext/setup/doctype/uom/uom.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:267 #: erpnext/utilities/transaction_base.py:563 @@ -29003,7 +29099,7 @@ msgstr "" msgid "Net Weight UOM" msgstr "" -#: erpnext/controllers/accounts_controller.py:1586 +#: erpnext/controllers/accounts_controller.py:1594 msgid "Net total calculation precision loss" msgstr "" @@ -29158,7 +29254,7 @@ msgstr "" msgid "New Workplace" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:353 +#: erpnext/selling/doctype/customer/customer.py:362 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}" msgstr "" @@ -29176,6 +29272,10 @@ msgstr "" msgid "New release date should be in the future" msgstr "" +#: erpnext/accounts/doctype/budget/budget.js:85 +msgid "New revised budget created successfully" +msgstr "" + #: erpnext/templates/pages/projects.html:37 msgid "New task" msgstr "" @@ -29230,7 +29330,7 @@ msgstr "" msgid "No Answer" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2493 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2495 msgid "No Customer found for Inter Company Transactions which represents company {0}" msgstr "" @@ -29255,7 +29355,7 @@ msgstr "" msgid "No Item with Serial No {0}" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1407 +#: erpnext/controllers/subcontracting_controller.py:1428 msgid "No Items selected for transfer." msgstr "" @@ -29279,14 +29379,14 @@ msgstr "" msgid "No Outstanding Invoices found for this party" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:624 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:629 msgid "No POS Profile found. Please create a New POS Profile first" msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1627 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1687 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1701 -#: erpnext/stock/doctype/item/item.py:1366 +#: erpnext/stock/doctype/item/item.py:1347 msgid "No Permission" msgstr "" @@ -29299,8 +29399,8 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:335 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1132 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:337 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1134 msgid "No Remarks" msgstr "" @@ -29308,7 +29408,7 @@ msgstr "" msgid "No Selection" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:857 +#: erpnext/controllers/sales_and_purchase_return.py:858 msgid "No Serial / Batches are available for return" msgstr "" @@ -29320,7 +29420,7 @@ msgstr "" msgid "No Summary" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2477 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2479 msgid "No Supplier found for Inter Company Transactions which represents company {0}" msgstr "" @@ -29345,12 +29445,12 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:813 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:823 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:799 msgid "No accounting entries for the following warehouses" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:785 +#: erpnext/selling/doctype/sales_order/sales_order.py:784 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -29390,7 +29490,7 @@ msgstr "" msgid "No employee was scheduled for call popup" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1316 +#: erpnext/controllers/subcontracting_controller.py:1337 msgid "No item available for transfer." msgstr "" @@ -29491,11 +29591,11 @@ msgstr "" msgid "No of Workstations" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:307 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:323 msgid "No open Material Requests found for the given criteria." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1215 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1217 msgid "No open POS Opening Entry found for POS Profile {0}." msgstr "" @@ -29515,7 +29615,7 @@ msgstr "" msgid "No outstanding invoices require exchange rate revaluation" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2492 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2493 msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified." msgstr "" @@ -29576,11 +29676,11 @@ msgstr "" msgid "No values" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:361 msgid "No {0} Accounts found for this company." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2541 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2543 msgid "No {0} found for Inter Company Transactions." msgstr "" @@ -29615,7 +29715,7 @@ msgstr "" msgid "Non Profit" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1469 +#: erpnext/manufacturing/doctype/bom/bom.py:1504 msgid "Non stock items" msgstr "" @@ -29633,8 +29733,8 @@ msgid "None of the items have any change in quantity or value." msgstr "" #. Name of a UOM -#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:705 -#: erpnext/stock/utils.py:707 +#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:709 +#: erpnext/stock/utils.py:711 msgid "Nos" msgstr "" @@ -29645,8 +29745,8 @@ msgstr "" msgid "Not Applicable" msgstr "" -#: erpnext/selling/page/point_of_sale/pos_controller.js:844 -#: erpnext/selling/page/point_of_sale/pos_controller.js:873 +#: erpnext/selling/page/point_of_sale/pos_controller.js:848 +#: erpnext/selling/page/point_of_sale/pos_controller.js:877 msgid "Not Available" msgstr "" @@ -29745,7 +29845,7 @@ msgstr "" msgid "Note: Email will not be sent to disabled users" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:680 +#: erpnext/manufacturing/doctype/bom/bom.py:691 msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material." msgstr "" @@ -29753,7 +29853,7 @@ msgstr "" msgid "Note: Item {0} added multiple times" msgstr "" -#: erpnext/controllers/accounts_controller.py:641 +#: erpnext/controllers/accounts_controller.py:646 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified" msgstr "" @@ -29761,7 +29861,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:623 +#: erpnext/stock/doctype/item/item.py:604 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -30242,7 +30342,7 @@ msgstr "" msgid "Open Activities HTML" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:21 +#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:24 msgid "Open BOM {0}" msgstr "" @@ -30276,7 +30376,7 @@ msgstr "" msgid "Open Issues " msgstr "" -#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:25 +#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:28 #: erpnext/manufacturing/doctype/work_order/work_order_preview.html:28 msgid "Open Item {0}" msgstr "" @@ -30458,8 +30558,8 @@ msgstr "" msgid "Opening Invoice Item" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1642 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1961 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1644 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1963 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 "" @@ -30547,7 +30647,7 @@ msgstr "" msgid "Operating Cost Per BOM Quantity" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1545 +#: erpnext/manufacturing/doctype/bom/bom.py:1588 msgid "Operating Cost as per Work Order / BOM" msgstr "" @@ -30623,7 +30723,7 @@ msgstr "" msgid "Operation Time" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1453 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1454 msgid "Operation Time must be greater than 0 for Operation {0}" msgstr "" @@ -30638,7 +30738,7 @@ msgstr "" msgid "Operation time does not depend on quantity to produce" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:565 +#: erpnext/manufacturing/doctype/job_card/job_card.js:574 msgid "Operation {0} added multiple times in the work order {1}" msgstr "" @@ -30660,7 +30760,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/work_order/work_order.js:307 #: erpnext/manufacturing/doctype/work_order/work_order.json -#: erpnext/setup/doctype/company/company.py:424 +#: erpnext/setup/doctype/company/company.py:455 #: erpnext/setup/doctype/email_digest/email_digest.json #: erpnext/templates/generators/bom.html:61 msgid "Operations" @@ -30672,7 +30772,7 @@ msgstr "" msgid "Operations Routing" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1107 +#: erpnext/manufacturing/doctype/bom/bom.py:1120 msgid "Operations cannot be left blank" msgstr "" @@ -30786,7 +30886,7 @@ msgstr "" #. Label of the opportunity_owner (Link) field in DocType 'Opportunity' #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:32 -#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:65 +#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:66 msgid "Opportunity Owner" msgstr "" @@ -30880,7 +30980,7 @@ msgstr "" #: erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.py:142 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:175 -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:378 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:383 msgid "Order Qty" msgstr "" @@ -30968,7 +31068,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:957 +#: erpnext/selling/doctype/sales_order/sales_order.py:956 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -31111,7 +31211,7 @@ msgstr "" msgid "Out of stock" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1228 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1230 #: erpnext/selling/page/point_of_sale/pos_controller.js:208 msgid "Outdated POS Opening Entry" msgstr "" @@ -31202,7 +31302,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1271 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1281 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -31220,11 +31320,11 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1568 +#: erpnext/controllers/stock_controller.py:1654 msgid "Over Receipt" msgstr "" -#: erpnext/controllers/status_updater.py:464 +#: erpnext/controllers/status_updater.py:465 msgid "Over Receipt/Delivery of {0} {1} ignored for item {2} because you have {3} role." msgstr "" @@ -31239,11 +31339,11 @@ msgstr "" msgid "Over Transfer Allowance (%)" msgstr "" -#: erpnext/controllers/status_updater.py:466 +#: erpnext/controllers/status_updater.py:467 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role." msgstr "" -#: erpnext/controllers/accounts_controller.py:2102 +#: erpnext/controllers/accounts_controller.py:2110 msgid "Overbilling of {} ignored because you have {} role." msgstr "" @@ -31259,7 +31359,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:275 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:277 #: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json #: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json #: erpnext/manufacturing/report/production_analytics/production_analytics.py:125 @@ -31480,7 +31580,7 @@ msgstr "" msgid "POS Invoice isn't created by user {}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:194 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:199 msgid "POS Invoice should have the field {0} checked." msgstr "" @@ -31493,11 +31593,11 @@ msgstr "" msgid "POS Invoices can't be added when Sales Invoice is enabled" msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:667 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:662 msgid "POS Invoices will be consolidated in a background process" msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:669 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:664 msgid "POS Invoices will be unconsolidated in a background process" msgstr "" @@ -31515,7 +31615,7 @@ msgstr "" msgid "POS Opening Entry" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1229 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1231 msgid "POS Opening Entry - {0} is outdated. Please close the POS and create a new POS Opening Entry." msgstr "" @@ -31536,7 +31636,7 @@ msgstr "" msgid "POS Opening Entry Exists" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1214 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1216 msgid "POS Opening Entry Missing" msgstr "" @@ -31570,7 +31670,7 @@ msgstr "" msgid "POS Profile" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1222 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1224 msgid "POS Profile - {0} has multiple open POS Opening Entries. Please close or cancel the existing entries before proceeding." msgstr "" @@ -31588,11 +31688,11 @@ msgstr "" msgid "POS Profile doesn't match {}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1182 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1184 msgid "POS Profile is mandatory to mark this invoice as POS Transaction." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1406 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1408 msgid "POS Profile required to make POS Entry" msgstr "" @@ -31699,7 +31799,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1406 +#: erpnext/controllers/stock_controller.py:1492 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -31734,7 +31834,7 @@ msgstr "" msgid "Packing Slip Item" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:643 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:645 msgid "Packing Slip(s) cancelled" msgstr "" @@ -31757,7 +31857,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:281 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:283 msgid "Paid" msgstr "" @@ -31811,7 +31911,7 @@ msgstr "" msgid "Paid Amount After Tax (Company Currency)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2005 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2006 msgid "Paid Amount cannot be greater than total negative outstanding amount {0}" msgstr "" @@ -31825,8 +31925,8 @@ msgstr "" msgid "Paid To Account Type" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:325 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1178 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:327 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1180 msgid "Paid amount + Write Off Amount can not be greater than Grand Total" msgstr "" @@ -31916,7 +32016,7 @@ msgstr "" msgid "Parent Company" msgstr "" -#: erpnext/setup/doctype/company/company.py:559 +#: erpnext/setup/doctype/company/company.py:590 msgid "Parent Company must be a group company" msgstr "" @@ -31982,7 +32082,7 @@ msgstr "" msgid "Parent Row No" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:506 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:512 msgid "Parent Row No not found for {0}" msgstr "" @@ -32025,7 +32125,7 @@ msgstr "" msgid "Parent Warehouse" msgstr "" -#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:166 +#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:167 msgid "Parsed file is not in valid MT940 format or contains no transactions." msgstr "" @@ -32038,7 +32138,7 @@ msgstr "" msgid "Partial Material Transferred" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1201 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1203 msgid "Partial Payment in POS Transactions are not allowed." msgstr "" @@ -32234,7 +32334,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:228 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:750 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -32282,7 +32382,7 @@ msgstr "" msgid "Party Account No. (Bank Statement)" msgstr "" -#: erpnext/controllers/accounts_controller.py:2376 +#: erpnext/controllers/accounts_controller.py:2384 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same" msgstr "" @@ -32328,7 +32428,7 @@ msgstr "" msgid "Party Link" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:50 +#: erpnext/controllers/sales_and_purchase_return.py:49 msgid "Party Mismatch" msgstr "" @@ -32339,7 +32439,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:110 -#: erpnext/accounts/report/general_ledger/general_ledger.py:752 +#: erpnext/accounts/report/general_ledger/general_ledger.py:759 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -32403,7 +32503,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:219 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:742 +#: erpnext/accounts/report/general_ledger/general_ledger.py:749 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -32491,7 +32591,7 @@ msgstr "" msgid "Pause" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:242 +#: erpnext/manufacturing/doctype/job_card/job_card.js:251 msgid "Pause Job" msgstr "" @@ -32543,7 +32643,7 @@ msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:39 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1160 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:211 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:214 #: erpnext/accounts/report/purchase_register/purchase_register.py:194 #: erpnext/accounts/report/purchase_register/purchase_register.py:235 msgid "Payable Account" @@ -32652,7 +32752,7 @@ msgstr "" msgid "Payment Entries" msgstr "" -#: erpnext/accounts/utils.py:1110 +#: erpnext/accounts/utils.py:1114 msgid "Payment Entries {0} are un-linked" msgstr "" @@ -32666,7 +32766,6 @@ msgstr "" #. Option for the 'Payment Order Type' (Select) field in DocType 'Payment #. Order' #. Label of a Link in the Accounting Workspace -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Payables Workspace #. Label of a shortcut in the Payables Workspace #. Label of a Link in the Receivables Workspace @@ -32700,7 +32799,7 @@ msgstr "" msgid "Payment Entry already exists" msgstr "" -#: erpnext/accounts/utils.py:609 +#: erpnext/accounts/utils.py:613 msgid "Payment Entry has been modified after you pulled it. Please pull it again." msgstr "" @@ -32709,7 +32808,7 @@ msgstr "" msgid "Payment Entry is already created" msgstr "" -#: erpnext/controllers/accounts_controller.py:1537 +#: erpnext/controllers/accounts_controller.py:1545 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice." msgstr "" @@ -32745,7 +32844,7 @@ msgstr "" msgid "Payment Gateway Account" msgstr "" -#: erpnext/accounts/utils.py:1377 +#: erpnext/accounts/utils.py:1384 msgid "Payment Gateway Account not created, please create one manually." msgstr "" @@ -32908,7 +33007,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:1708 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1707 #: 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 @@ -32970,7 +33069,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:2651 +#: erpnext/controllers/accounts_controller.py:2659 #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json msgid "Payment Schedule" @@ -33098,7 +33197,7 @@ msgstr "" msgid "Payment URL" msgstr "" -#: erpnext/accounts/utils.py:1098 +#: erpnext/accounts/utils.py:1102 msgid "Payment Unlink Error" msgstr "" @@ -33106,7 +33205,7 @@ msgstr "" msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:756 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:761 msgid "Payment amount cannot be less than or equal to 0" msgstr "" @@ -33123,7 +33222,7 @@ msgstr "" msgid "Payment of {0} received successfully. Waiting for other requests to complete..." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:379 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:384 msgid "Payment related to {0} is not completed" msgstr "" @@ -33267,7 +33366,7 @@ msgstr "" msgid "Pending activities for today" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:236 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:245 msgid "Pending processing" msgstr "" @@ -33510,7 +33609,7 @@ msgstr "" #: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json #: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:54 -#: erpnext/public/js/financial_statements.js:348 +#: erpnext/public/js/financial_statements.js:359 msgid "Periodicity" msgstr "" @@ -33547,6 +33646,15 @@ msgstr "" msgid "Petrol" msgstr "" +#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:16 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:321 +msgid "Phantom Item" +msgstr "" + +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:430 +msgid "Phantom Item is mandatory" +msgstr "" + #: erpnext/setup/setup_wizard/operations/install_fixtures.py:234 msgid "Pharmaceutical" msgstr "" @@ -33938,7 +34046,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1878 msgid "Please Specify Account" msgstr "" @@ -33966,7 +34074,7 @@ msgstr "" msgid "Please add atleast one Serial No / Batch No" msgstr "" -#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:84 +#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:85 msgid "Please add the Bank Account column" msgstr "" @@ -33982,7 +34090,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1579 +#: erpnext/controllers/stock_controller.py:1665 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -33990,11 +34098,11 @@ msgstr "" msgid "Please attach CSV file" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3184 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3186 msgid "Please cancel and amend the Payment Entry" msgstr "" -#: erpnext/accounts/utils.py:1097 +#: erpnext/accounts/utils.py:1101 msgid "Please cancel payment entry manually first" msgstr "" @@ -34015,7 +34123,7 @@ msgstr "" msgid "Please check either with operations or FG Based Operating Cost." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:450 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:521 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again." msgstr "" @@ -34040,7 +34148,7 @@ msgstr "" msgid "Please click on 'Generate Schedule' to get schedule" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:576 +#: erpnext/selling/doctype/customer/customer.py:585 msgid "Please contact any of the following users to extend the credit limits for {0}: {1}" msgstr "" @@ -34048,7 +34156,7 @@ msgstr "" msgid "Please contact any of the following users to {} this transaction." msgstr "" -#: erpnext/selling/doctype/customer/customer.py:569 +#: erpnext/selling/doctype/customer/customer.py:578 msgid "Please contact your administrator to extend the credit limits for {0}." msgstr "" @@ -34056,7 +34164,7 @@ msgstr "" msgid "Please convert the parent account in corresponding child company to a group account." msgstr "" -#: erpnext/selling/doctype/quotation/quotation.py:608 +#: erpnext/selling/doctype/quotation/quotation.py:610 msgid "Please create Customer from Lead {0}." msgstr "" @@ -34068,7 +34176,7 @@ msgstr "" msgid "Please create a new Accounting Dimension if required." msgstr "" -#: erpnext/controllers/accounts_controller.py:734 +#: erpnext/controllers/accounts_controller.py:739 msgid "Please create purchase from internal sale or delivery document itself" msgstr "" @@ -34076,7 +34184,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:651 +#: erpnext/stock/doctype/item/item.py:632 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -34092,11 +34200,11 @@ msgstr "" msgid "Please do not create more than 500 items at a time" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:133 +#: erpnext/accounts/doctype/budget/budget.py:181 msgid "Please enable Applicable on Booking Actual Expenses" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:129 +#: erpnext/accounts/doctype/budget/budget.py:177 msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses" msgstr "" @@ -34112,23 +34220,23 @@ msgstr "" msgid "Please enable {0} in the {1}." msgstr "" -#: erpnext/controllers/selling_controller.py:812 +#: erpnext/controllers/selling_controller.py:824 msgid "Please enable {} in {} to allow same item in multiple rows" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:373 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375 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:381 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:383 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 "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1038 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1040 msgid "Please ensure {} account is a Balance Sheet account." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1048 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1050 msgid "Please ensure {} account {} is a Receivable account." msgstr "" @@ -34136,8 +34244,8 @@ msgstr "" msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:509 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1313 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:514 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1315 msgid "Please enter Account for Change Amount" msgstr "" @@ -34149,7 +34257,7 @@ msgstr "" msgid "Please enter Cost Center" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:407 +#: erpnext/selling/doctype/sales_order/sales_order.py:409 msgid "Please enter Delivery Date" msgstr "" @@ -34218,8 +34326,8 @@ msgstr "" msgid "Please enter Warehouse and Date" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:658 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1309 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:660 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1311 msgid "Please enter Write Off Account" msgstr "" @@ -34239,7 +34347,7 @@ msgstr "" msgid "Please enter company name first" msgstr "" -#: erpnext/controllers/accounts_controller.py:2877 +#: erpnext/controllers/accounts_controller.py:2885 msgid "Please enter default currency in Company Master" msgstr "" @@ -34267,7 +34375,7 @@ msgstr "" msgid "Please enter serial nos" msgstr "" -#: erpnext/setup/doctype/company/company.js:207 +#: erpnext/setup/doctype/company/company.js:214 msgid "Please enter the company name to confirm" msgstr "" @@ -34275,7 +34383,7 @@ msgstr "" msgid "Please enter the first delivery date" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:759 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:764 msgid "Please enter the phone number first" msgstr "" @@ -34327,7 +34435,7 @@ msgstr "" msgid "Please make sure the file you are using has 'Parent Account' column present in the header." msgstr "" -#: erpnext/setup/doctype/company/company.js:209 +#: erpnext/setup/doctype/company/company.js:216 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone." msgstr "" @@ -34377,12 +34485,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:744 -#: erpnext/public/js/controllers/taxes_and_totals.js:815 +#: erpnext/controllers/taxes_and_totals.py:798 +#: erpnext/public/js/controllers/taxes_and_totals.js:776 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1868 +#: erpnext/selling/doctype/sales_order/sales_order.py:1871 msgid "Please select BOM against item {0}" msgstr "" @@ -34402,13 +34510,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1486 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1485 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:455 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:459 msgid "Please select Company" msgstr "" @@ -34417,7 +34525,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:697 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:701 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -34426,12 +34534,13 @@ msgstr "" msgid "Please select Completion Date for Completed Asset Maintenance Log" msgstr "" +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:195 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js:84 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js:125 msgid "Please select Customer first" msgstr "" -#: erpnext/setup/doctype/company/company.py:490 +#: erpnext/setup/doctype/company/company.py:521 msgid "Please select Existing Company for creating Chart of Accounts" msgstr "" @@ -34465,15 +34574,15 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:698 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:702 msgid "Please select Posting Date first" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1152 +#: erpnext/manufacturing/doctype/bom/bom.py:1165 msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1870 +#: erpnext/selling/doctype/sales_order/sales_order.py:1873 msgid "Please select Qty against item {0}" msgstr "" @@ -34493,26 +34602,26 @@ msgstr "" msgid "Please select Stock Asset Account" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1457 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1459 msgid "Please select Subcontracting Order instead of Purchase Order {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:2726 +#: erpnext/controllers/accounts_controller.py:2734 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1384 +#: erpnext/manufacturing/doctype/bom/bom.py:1413 msgid "Please select a BOM" msgstr "" #: erpnext/accounts/party.py:430 -#: erpnext/stock/doctype/pick_list/pick_list.py:1583 +#: erpnext/stock/doctype/pick_list/pick_list.py:1588 msgid "Please select a Company" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:267 -#: erpnext/manufacturing/doctype/bom/bom.js:631 -#: erpnext/manufacturing/doctype/bom/bom.py:261 +#: erpnext/manufacturing/doctype/bom/bom.js:639 +#: erpnext/manufacturing/doctype/bom/bom.py:264 #: erpnext/public/js/controllers/accounts.js:277 #: erpnext/public/js/controllers/transaction.js:3219 msgid "Please select a Company first." @@ -34542,7 +34651,7 @@ msgstr "" msgid "Please select a Work Order first." msgstr "" -#: erpnext/setup/doctype/holiday_list/holiday_list.py:80 +#: erpnext/setup/doctype/holiday_list/holiday_list.py:89 msgid "Please select a country" msgstr "" @@ -34676,7 +34785,7 @@ msgstr "" msgid "Please select valid document type." msgstr "" -#: erpnext/setup/doctype/holiday_list/holiday_list.py:51 +#: erpnext/setup/doctype/holiday_list/holiday_list.py:52 msgid "Please select weekly off day" msgstr "" @@ -34706,7 +34815,7 @@ msgstr "" msgid "Please set Account" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1852 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1854 msgid "Please set Account for Change Amount" msgstr "" @@ -34714,7 +34823,7 @@ msgstr "" msgid "Please set Account in Warehouse {0} or Default Inventory Account in Company {1}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:321 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:333 msgid "Please set Accounting Dimension {} in {}" msgstr "" @@ -34744,12 +34853,12 @@ msgstr "" msgid "Please set Email/Phone for the contact" msgstr "" -#: erpnext/regional/italy/utils.py:277 +#: erpnext/regional/italy/utils.py:250 #, python-format msgid "Please set Fiscal Code for the customer '%s'" msgstr "" -#: erpnext/regional/italy/utils.py:285 +#: erpnext/regional/italy/utils.py:258 #, python-format msgid "Please set Fiscal Code for the public administration '%s'" msgstr "" @@ -34758,11 +34867,11 @@ msgstr "" msgid "Please set Fixed Asset Account in Asset Category {0}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:590 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:592 msgid "Please set Fixed Asset Account in {} against {}." msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:256 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:257 msgid "Please set Parent Row No for item {0}" msgstr "" @@ -34775,7 +34884,7 @@ msgstr "" msgid "Please set Root Type" msgstr "" -#: erpnext/regional/italy/utils.py:292 +#: erpnext/regional/italy/utils.py:265 #, python-format msgid "Please set Tax ID for the customer '%s'" msgstr "" @@ -34800,32 +34909,32 @@ 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:1622 +#: erpnext/selling/doctype/sales_order/sales_order.py:1625 msgid "Please set a Supplier against the Items to be considered in the Purchase Order." msgstr "" -#: erpnext/projects/doctype/project/project.py:729 +#: erpnext/projects/doctype/project/project.py:728 msgid "Please set a default Holiday List for Company {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:269 +#: erpnext/setup/doctype/employee/employee.py:273 msgid "Please set a default Holiday List for Employee {0} or Company {1}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1111 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1113 msgid "Please set account in Warehouse {0}" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:58 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:68 msgid "Please set actual demand or sales forecast to generate Material Requirements Planning Report." msgstr "" -#: erpnext/regional/italy/utils.py:247 +#: erpnext/regional/italy/utils.py:220 #, python-format msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:870 +#: erpnext/controllers/stock_controller.py:871 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -34833,31 +34942,31 @@ msgstr "" msgid "Please set an email id for the Lead {0}" msgstr "" -#: erpnext/regional/italy/utils.py:303 +#: erpnext/regional/italy/utils.py:276 msgid "Please set at least one row in the Taxes and Charges Table" msgstr "" -#: erpnext/regional/italy/utils.py:267 +#: erpnext/regional/italy/utils.py:240 msgid "Please set both the Tax ID and Fiscal Code on Company {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2388 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2390 msgid "Please set default Cash or Bank account in Mode of Payment {0}" msgstr "" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:94 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:197 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3044 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3046 msgid "Please set default Cash or Bank account in Mode of Payment {}" msgstr "" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:96 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:199 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3046 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3048 msgid "Please set default Cash or Bank account in Mode of Payments {}" msgstr "" -#: erpnext/accounts/utils.py:2359 +#: erpnext/accounts/utils.py:2385 msgid "Please set default Exchange Gain/Loss Account in Company {}" msgstr "" @@ -34869,16 +34978,16 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:729 +#: erpnext/controllers/stock_controller.py:730 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" -#: erpnext/controllers/stock_controller.py:188 +#: erpnext/controllers/stock_controller.py:189 msgid "Please set default inventory account for item {0}, or their item group or brand." msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:274 -#: erpnext/accounts/utils.py:1119 +#: erpnext/accounts/utils.py:1123 msgid "Please set default {0} in Company {1}" msgstr "" @@ -34886,7 +34995,7 @@ msgstr "" msgid "Please set filter based on Item or Warehouse" msgstr "" -#: erpnext/controllers/accounts_controller.py:2292 +#: erpnext/controllers/accounts_controller.py:2300 msgid "Please set one of the following:" msgstr "" @@ -34898,7 +35007,7 @@ msgstr "" msgid "Please set recurring after saving" msgstr "" -#: erpnext/regional/italy/utils.py:297 +#: erpnext/regional/italy/utils.py:270 msgid "Please set the Customer Address" msgstr "" @@ -34910,11 +35019,11 @@ msgstr "" msgid "Please set the Item Code first" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1479 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1480 msgid "Please set the Target Warehouse in the Job Card" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1483 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1484 msgid "Please set the WIP Warehouse in the Job Card" msgstr "" @@ -34941,11 +35050,11 @@ msgstr "" msgid "Please set {0} for Batched Item {1}, which is used to set {2} on Submit." msgstr "" -#: erpnext/regional/italy/utils.py:449 +#: erpnext/regional/italy/utils.py:422 msgid "Please set {0} for address {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:209 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:210 msgid "Please set {0} in BOM Creator {1}" msgstr "" @@ -34953,7 +35062,7 @@ msgstr "" msgid "Please set {0} in Company {1} to account for Exchange Gain / Loss" msgstr "" -#: erpnext/controllers/accounts_controller.py:523 +#: erpnext/controllers/accounts_controller.py:528 msgid "Please set {0} to {1}, the same account that was used in the original invoice {2}." msgstr "" @@ -34975,8 +35084,8 @@ msgstr "" msgid "Please specify Company to proceed" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1509 -#: erpnext/controllers/accounts_controller.py:3108 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/controllers/accounts_controller.py:3116 #: erpnext/public/js/controllers/accounts.js:117 msgid "Please specify a valid Row ID for row {0} in table {1}" msgstr "" @@ -35001,7 +35110,7 @@ msgstr "" msgid "Please supply the specified items at the best possible rates" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:235 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:244 msgid "Please try again in an hour." msgstr "" @@ -35174,10 +35283,10 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:66 #: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.py:151 -#: erpnext/accounts/report/general_ledger/general_ledger.py:670 +#: erpnext/accounts/report/general_ledger/general_ledger.py:677 #: erpnext/accounts/report/gross_profit/gross_profit.py:289 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:203 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:186 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:201 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:143 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94 #: erpnext/accounts/report/pos_register/pos_register.py:172 @@ -35210,7 +35319,7 @@ msgstr "" #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:86 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:502 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:24 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:113 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:116 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:144 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:36 #: erpnext/templates/form_grid/bank_reconciliation_grid.html:6 @@ -35223,7 +35332,7 @@ msgstr "" msgid "Posting Date Inheritance for Exchange Gain / Loss" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:256 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:266 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:136 msgid "Posting Date cannot be future date" msgstr "" @@ -35282,18 +35391,18 @@ msgstr "" #: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:105 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:63 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:25 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:117 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:149 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:41 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2154 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2156 msgid "Posting date and posting time is mandatory" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:67 +#: erpnext/controllers/sales_and_purchase_return.py:66 msgid "Posting timestamp must be after {0}" msgstr "" @@ -35684,7 +35793,7 @@ msgstr "" msgid "Price is not set for the item." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:492 +#: erpnext/manufacturing/doctype/bom/bom.py:503 msgid "Price not found for item {0} in price list {1}" msgstr "" @@ -36057,7 +36166,7 @@ msgstr "" msgid "Process Loss" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1135 +#: erpnext/manufacturing/doctype/bom/bom.py:1148 msgid "Process Loss Percentage cannot be greater than 100" msgstr "" @@ -36079,7 +36188,7 @@ msgstr "" msgid "Process Loss Qty" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:319 +#: erpnext/manufacturing/doctype/job_card/job_card.js:328 msgid "Process Loss Quantity" msgstr "" @@ -36307,7 +36416,7 @@ msgstr "" #. Label of a Card Break in the Manufacturing Workspace #: erpnext/manufacturing/doctype/workstation/workstation.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/setup/doctype/company/company.py:430 +#: erpnext/setup/doctype/company/company.py:461 msgid "Production" msgstr "" @@ -36454,7 +36563,7 @@ msgstr "" #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/process_period_closing_voucher_detail/process_period_closing_voucher_detail.json #: erpnext/accounts/workspace/accounting/accounting.json -#: erpnext/public/js/financial_statements.js:261 +#: erpnext/public/js/financial_statements.js:272 msgid "Profit and Loss" msgstr "" @@ -36544,7 +36653,7 @@ msgstr "" msgid "Project Summary" msgstr "" -#: erpnext/projects/doctype/project/project.py:667 +#: erpnext/projects/doctype/project/project.py:666 msgid "Project Summary for {0}" msgstr "" @@ -36658,7 +36767,7 @@ msgstr "" #. Name of a Workspace #. Label of a Card Break in the Projects Workspace -#: erpnext/config/projects.py:7 erpnext/projects/doctype/project/project.py:446 +#: erpnext/config/projects.py:7 erpnext/projects/doctype/project/project.py:445 #: erpnext/projects/workspace/projects/projects.json #: erpnext/selling/doctype/customer/customer_dashboard.py:26 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:28 @@ -36675,10 +36784,8 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Projects Workspace -#. Label of a Link in the Settings Workspace #: erpnext/projects/doctype/projects_settings/projects_settings.json #: erpnext/projects/workspace/projects/projects.json -#: erpnext/setup/workspace/settings/settings.json msgid "Projects Settings" msgstr "" @@ -36801,7 +36908,7 @@ msgstr "" msgid "Providing" msgstr "" -#: erpnext/setup/doctype/company/company.py:529 +#: erpnext/setup/doctype/company/company.py:560 msgid "Provisional Account" msgstr "" @@ -36867,7 +36974,7 @@ msgstr "" #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/projects/doctype/project/project_dashboard.py:16 -#: erpnext/setup/doctype/company/company.py:418 erpnext/setup/install.py:334 +#: erpnext/setup/doctype/company/company.py:449 erpnext/setup/install.py:334 #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/item_lead_time/item_lead_time.json #: erpnext/stock/doctype/item_reorder/item_reorder.json @@ -36946,7 +37053,6 @@ msgstr "" #. Option for the 'Invoice Type' (Select) field in DocType 'Payment #. Reconciliation Invoice' #. Name of a DocType -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Payables Workspace #. Label of a shortcut in the Payables Workspace #. Label of the purchase_invoice (Link) field in DocType 'Asset' @@ -36969,7 +37075,6 @@ msgstr "" #: erpnext/accounts/print_format/purchase_auditing_voucher/purchase_auditing_voucher.html:5 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:22 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/payables/payables.json #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json @@ -37020,12 +37125,12 @@ msgstr "" msgid "Purchase Invoice cannot be made against an existing asset {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:433 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:447 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:443 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:457 msgid "Purchase Invoice {0} is already submitted" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2027 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2029 msgid "Purchase Invoices" msgstr "" @@ -37048,11 +37153,12 @@ msgstr "" #. Label of the purchase_order (Link) field in DocType 'Stock Entry' #. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt #. Item' +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:144 #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:242 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json @@ -37077,6 +37183,7 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Purchase Order" msgstr "" @@ -37149,11 +37256,11 @@ msgstr "" msgid "Purchase Order Pricing Rule" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:629 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:631 msgid "Purchase Order Required" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626 msgid "Purchase Order Required for item {}" msgstr "" @@ -37169,7 +37276,7 @@ msgstr "" msgid "Purchase Order already created for all Sales Order items" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:322 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:332 msgid "Purchase Order number required for Item {0}" msgstr "" @@ -37177,11 +37284,11 @@ msgstr "" msgid "Purchase Order {0} created" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:667 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669 msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:932 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:931 msgid "Purchase Orders" msgstr "" @@ -37191,7 +37298,7 @@ msgstr "" msgid "Purchase Orders Items Overdue" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:321 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:323 msgid "Purchase Orders are not allowed for {0} due to a scorecard standing of {1}." msgstr "" @@ -37206,7 +37313,7 @@ msgstr "" msgid "Purchase Orders to Receive" msgstr "" -#: erpnext/controllers/accounts_controller.py:1934 +#: erpnext/controllers/accounts_controller.py:1942 msgid "Purchase Orders {0} are un-linked" msgstr "" @@ -37234,7 +37341,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:663 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49 #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:246 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:249 #: erpnext/accounts/report/purchase_register/purchase_register.py:223 #: 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 @@ -37288,11 +37395,11 @@ msgstr "" msgid "Purchase Receipt No" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:650 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:652 msgid "Purchase Receipt Required" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647 msgid "Purchase Receipt Required for item {}" msgstr "" @@ -37313,7 +37420,7 @@ msgstr "" msgid "Purchase Receipt {0} created." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:674 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:676 msgid "Purchase Receipt {0} is not submitted" msgstr "" @@ -37330,7 +37437,7 @@ msgstr "" #. Label of the purchase_tax_template (Link) field in DocType 'Tax Rule' #: erpnext/accounts/doctype/tax_rule/tax_rule.json -#: erpnext/setup/doctype/company/company.js:138 +#: erpnext/setup/doctype/company/company.js:145 msgid "Purchase Tax Template" msgstr "" @@ -37400,7 +37507,7 @@ msgstr "" msgid "Purchased" msgstr "" -#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185 +#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:146 msgid "Purchases" msgstr "" @@ -37420,7 +37527,7 @@ msgstr "" #. Label of the purpose (Select) field in DocType 'Stock Entry Type' #. Label of the purpose (Select) field in DocType 'Stock Reconciliation' #: erpnext/assets/doctype/asset_movement/asset_movement.json -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:153 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:163 #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/stock_entry/stock_entry.js:348 @@ -37495,7 +37602,7 @@ msgstr "" #: erpnext/controllers/trends.py:268 erpnext/controllers/trends.py:280 #: erpnext/controllers/trends.py:285 #: erpnext/crm/doctype/opportunity_item/opportunity_item.json -#: erpnext/manufacturing/doctype/bom/bom.js:1031 +#: erpnext/manufacturing/doctype/bom/bom.js:1039 #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json #: erpnext/manufacturing/doctype/bom_item/bom_item.json #: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json @@ -37505,11 +37612,11 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:28 -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:57 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:213 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:307 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:372 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:470 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:69 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:235 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:333 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:398 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:499 #: erpnext/public/js/stock_reservation.js:134 #: erpnext/public/js/stock_reservation.js:336 erpnext/public/js/utils.js:771 #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json @@ -37608,7 +37715,7 @@ msgstr "" msgid "Qty In Stock" msgstr "" -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:74 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:82 msgid "Qty Per Unit" msgstr "" @@ -37621,7 +37728,7 @@ msgstr "" msgid "Qty To Manufacture" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1390 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1391 msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}." msgstr "" @@ -37672,7 +37779,7 @@ msgstr "" msgid "Qty for which recursion isn't applicable." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:970 +#: erpnext/manufacturing/doctype/work_order/work_order.js:973 msgid "Qty for {0}" msgstr "" @@ -37723,7 +37830,7 @@ msgstr "" msgid "Qty to Fetch" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:291 +#: erpnext/manufacturing/doctype/job_card/job_card.js:300 #: erpnext/manufacturing/doctype/job_card/job_card.py:774 msgid "Qty to Manufacture" msgstr "" @@ -37944,7 +38051,7 @@ msgstr "" msgid "Quality Inspection(s)" msgstr "" -#: erpnext/setup/doctype/company/company.py:460 +#: erpnext/setup/doctype/company/company.py:491 msgid "Quality Management" msgstr "" @@ -38080,7 +38187,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:350 +#: erpnext/stock/doctype/material_request/material_request.js:353 #: 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 @@ -38194,7 +38301,7 @@ msgstr "" msgid "Quantity must be greater than zero, and less or equal to {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1018 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1021 #: erpnext/stock/doctype/pick_list/pick_list.js:204 msgid "Quantity must not be more than {0}" msgstr "" @@ -38204,13 +38311,13 @@ msgstr "" msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:660 +#: erpnext/manufacturing/doctype/bom/bom.py:671 msgid "Quantity required for Item {0} in row {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:604 -#: erpnext/manufacturing/doctype/job_card/job_card.js:372 -#: erpnext/manufacturing/doctype/job_card/job_card.js:442 +#: erpnext/manufacturing/doctype/bom/bom.py:615 +#: erpnext/manufacturing/doctype/job_card/job_card.js:381 +#: erpnext/manufacturing/doctype/job_card/job_card.js:451 #: erpnext/manufacturing/doctype/workstation/workstation.js:303 msgid "Quantity should be greater than 0" msgstr "" @@ -38223,11 +38330,11 @@ msgstr "" msgid "Quantity to Manufacture" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2481 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2483 msgid "Quantity to Manufacture can not be zero for the operation {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1382 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1383 msgid "Quantity to Manufacture must be greater than 0." msgstr "" @@ -38235,7 +38342,7 @@ msgstr "" msgid "Quantity to Produce" msgstr "" -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:36 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:37 msgid "Quantity to Produce should be greater than zero." msgstr "" @@ -38272,7 +38379,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:586 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:590 msgid "Quick Journal Entry" msgstr "" @@ -38370,15 +38477,15 @@ msgstr "" msgid "Quotation Trends" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:471 +#: erpnext/selling/doctype/sales_order/sales_order.py:473 msgid "Quotation {0} is cancelled" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:384 +#: erpnext/selling/doctype/sales_order/sales_order.py:386 msgid "Quotation {0} not of type {1}" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.py:345 +#: erpnext/selling/doctype/quotation/quotation.py:347 #: erpnext/selling/page/sales_funnel/sales_funnel.py:57 msgid "Quotations" msgstr "" @@ -38480,8 +38587,8 @@ msgstr "" #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:268 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:323 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:271 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:321 #: erpnext/accounts/report/share_ledger/share_ledger.py:56 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -38678,7 +38785,7 @@ msgstr "" msgid "Rate at which this tax is applied" msgstr "" -#: erpnext/controllers/accounts_controller.py:3930 +#: erpnext/controllers/accounts_controller.py:3938 msgid "Rate of '{}' items cannot be changed" msgstr "" @@ -38750,7 +38857,7 @@ msgstr "" msgid "Raw Material" msgstr "" -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:402 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:407 msgid "Raw Material Code" msgstr "" @@ -38795,7 +38902,7 @@ msgstr "" msgid "Raw Material Item Code" msgstr "" -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:409 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:414 msgid "Raw Material Name" msgstr "" @@ -38819,12 +38926,12 @@ msgstr "" #. Label of the section_break_8 (Section Break) field in DocType 'Job Card' #. Label of the mr_items (Table) field in DocType 'Production Plan' #: erpnext/manufacturing/doctype/bom/bom.js:370 -#: erpnext/manufacturing/doctype/bom/bom.js:1004 +#: erpnext/manufacturing/doctype/bom/bom.js:1012 #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/workstation/workstation.js:462 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:353 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:379 msgid "Raw Materials" msgstr "" @@ -38879,7 +38986,7 @@ msgstr "" msgid "Raw Materials Supplied Cost" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:652 +#: erpnext/manufacturing/doctype/bom/bom.py:663 msgid "Raw Materials cannot be blank." msgstr "" @@ -39077,7 +39184,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:68 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1158 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:244 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:242 #: erpnext/accounts/report/sales_register/sales_register.py:217 #: erpnext/accounts/report/sales_register/sales_register.py:271 msgid "Receivable Account" @@ -39493,7 +39600,7 @@ msgstr "" msgid "Reference No is mandatory if you entered Reference Date" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:280 msgid "Reference No." msgstr "" @@ -39581,11 +39688,11 @@ msgstr "" msgid "References" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:387 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:389 msgid "References to Sales Invoices are Incomplete" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:382 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:384 msgid "References to Sales Orders are Incomplete" msgstr "" @@ -39698,7 +39805,7 @@ msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:23 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:14 #: erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py:22 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:23 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:26 msgid "Related" msgstr "" @@ -39717,7 +39824,7 @@ msgstr "" msgid "Release Date" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:316 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:318 msgid "Release date must be in the future" msgstr "" @@ -39792,7 +39899,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1264 #: erpnext/accounts/report/general_ledger/general_ledger.html:90 #: erpnext/accounts/report/general_ledger/general_ledger.html:116 -#: erpnext/accounts/report/general_ledger/general_ledger.py:785 +#: erpnext/accounts/report/general_ledger/general_ledger.py:792 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -39819,7 +39926,7 @@ msgstr "" msgid "Remarks:" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:94 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:95 msgid "Remove Parent Row No in Items Table" msgstr "" @@ -40048,6 +40155,16 @@ msgstr "" msgid "Repost Item Valuation" msgstr "" +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:334 +msgid "Repost Item Valuation restarted for selected failed records." +msgstr "" + +#. Label of the repost_only_accounting_ledgers (Check) field in DocType 'Repost +#. Item Valuation' +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json +msgid "Repost Only Accounting Ledgers" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json msgid "Repost Payment Ledger" @@ -40075,7 +40192,7 @@ msgstr "" msgid "Repost started in the background" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:115 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:119 msgid "Reposting Completed {0}%" msgstr "" @@ -40091,16 +40208,22 @@ msgstr "" msgid "Reposting Info" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:123 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:127 msgid "Reposting Progress" msgstr "" -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:179 +#. Label of the reposting_reference (Data) field in DocType 'Repost Item +#. Valuation' +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json +msgid "Reposting Reference" +msgstr "" + +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:182 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:327 msgid "Reposting entries created: {0}" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:99 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:103 msgid "Reposting has been started in the background." msgstr "" @@ -40323,13 +40446,13 @@ msgstr "" #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:86 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:94 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:11 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:21 -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:27 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:28 #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:58 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1041 -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:421 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:426 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:139 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json @@ -40363,7 +40486,7 @@ msgstr "" msgid "Research" msgstr "" -#: erpnext/setup/doctype/company/company.py:466 +#: erpnext/setup/doctype/company/company.py:497 msgid "Research & Development" msgstr "" @@ -40453,6 +40576,10 @@ msgstr "" msgid "Reserved" msgstr "" +#: erpnext/controllers/stock_controller.py:1251 +msgid "Reserved Batch Conflict" +msgstr "" + #. Label of the reserved_qty (Float) field in DocType 'Bin' #. Label of the reserved_qty (Float) field in DocType 'Stock Reservation Entry' #. Label of the stock_reserved_qty (Float) field in DocType 'Subcontracting @@ -40736,10 +40863,14 @@ msgstr "" msgid "Rest Of The World" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:82 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:84 msgid "Restart" msgstr "" +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation_list.js:23 +msgid "Restart Failed Entries" +msgstr "" + #: erpnext/accounts/doctype/subscription/subscription.js:54 msgid "Restart Subscription" msgstr "" @@ -40797,7 +40928,7 @@ msgstr "" msgid "Resume" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:226 +#: erpnext/manufacturing/doctype/job_card/job_card.js:235 msgid "Resume Job" msgstr "" @@ -40847,13 +40978,15 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'POS Invoice' #. 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 'Purchase Receipt' #. Option for the 'Status' (Select) field in DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:79 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:277 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:279 #: erpnext/stock/doctype/delivery_note/delivery_note_list.js:16 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:15 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:138 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:167 @@ -40938,7 +41071,7 @@ msgstr "" msgid "Return Raw Material to Customer" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1499 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1501 msgid "Return invoice of asset cancelled" msgstr "" @@ -41020,7 +41153,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:25 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py:35 #: erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py:24 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:30 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:33 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt_dashboard.py:27 msgid "Returns" msgstr "" @@ -41089,6 +41222,19 @@ msgstr "" msgid "Reviews" msgstr "" +#: erpnext/accounts/doctype/budget/budget.js:37 +msgid "Revise Budget" +msgstr "" + +#. Label of the revision_of (Data) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json +msgid "Revision Of" +msgstr "" + +#: erpnext/accounts/doctype/budget/budget.js:92 +msgid "Revision cancelled" +msgstr "" + #. Label of the rgt (Int) field in DocType 'Account' #. Label of the rgt (Int) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json @@ -41358,8 +41504,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:741 -#: erpnext/controllers/stock_controller.py:756 +#: erpnext/controllers/stock_controller.py:742 +#: erpnext/controllers/stock_controller.py:757 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -41384,7 +41530,7 @@ msgstr "" msgid "Row # {0}:" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:226 +#: erpnext/controllers/sales_and_purchase_return.py:225 msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" @@ -41396,25 +41542,25 @@ msgstr "" msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:151 +#: erpnext/controllers/sales_and_purchase_return.py:150 msgid "Row # {0}: Rate cannot be greater than the rate used in {1} {2}" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:135 +#: erpnext/controllers/sales_and_purchase_return.py:134 msgid "Row # {0}: Returned Item {1} does not exist in {2} {3}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:256 +#: erpnext/manufacturing/doctype/work_order/work_order.py:257 msgid "Row #1: Sequence ID must be 1 for Operation {0}." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:518 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2044 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:523 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2046 msgid "Row #{0} (Payment Table): Amount must be negative" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:516 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2039 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:521 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2041 msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" @@ -41439,7 +41585,7 @@ msgstr "" msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1218 +#: erpnext/controllers/accounts_controller.py:1222 msgid "Row #{0}: Account {1} does not belong to company {2}" msgstr "" @@ -41460,19 +41606,19 @@ msgstr "" msgid "Row #{0}: Amount must be a positive number" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:443 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:445 msgid "Row #{0}: Asset {1} cannot be sold, it is already {2}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:448 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:450 msgid "Row #{0}: Asset {1} is already sold" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:369 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:371 msgid "Row #{0}: BOM is not specified for subcontracting item {0}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:286 +#: erpnext/selling/doctype/sales_order/sales_order.py:288 msgid "Row #{0}: BOM not found for FG Item {1}" msgstr "" @@ -41500,27 +41646,27 @@ msgstr "" msgid "Row #{0}: Cannot cancel this Stock Entry as returned quantity cannot be greater than delivered quantity for Item {1} in the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:3686 +#: erpnext/controllers/accounts_controller.py:3694 msgid "Row #{0}: Cannot delete item {1} which has already been billed." msgstr "" -#: erpnext/controllers/accounts_controller.py:3660 +#: erpnext/controllers/accounts_controller.py:3668 msgid "Row #{0}: Cannot delete item {1} which has already been delivered" msgstr "" -#: erpnext/controllers/accounts_controller.py:3679 +#: erpnext/controllers/accounts_controller.py:3687 msgid "Row #{0}: Cannot delete item {1} which has already been received" msgstr "" -#: erpnext/controllers/accounts_controller.py:3666 +#: erpnext/controllers/accounts_controller.py:3674 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it." msgstr "" -#: erpnext/controllers/accounts_controller.py:3672 +#: erpnext/controllers/accounts_controller.py:3680 msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order." msgstr "" -#: erpnext/controllers/accounts_controller.py:3939 +#: erpnext/controllers/accounts_controller.py:3947 msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}." msgstr "" @@ -41570,11 +41716,11 @@ msgstr "" msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times in the Subcontracting Inward process." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:333 +#: erpnext/manufacturing/doctype/work_order/work_order.py:334 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:358 +#: erpnext/manufacturing/doctype/work_order/work_order.py:359 msgid "Row #{0}: Customer Provided Item {1} does not exist in the Required Items table linked to the Subcontracting Inward Order." msgstr "" @@ -41582,7 +41728,7 @@ msgstr "" msgid "Row #{0}: Customer Provided Item {1} exceeds quantity available through Subcontracting Inward Order" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:346 +#: erpnext/manufacturing/doctype/work_order/work_order.py:347 msgid "Row #{0}: Customer Provided Item {1} has insufficient quantity in the Subcontracting Inward Order. Available quantity is {2}." msgstr "" @@ -41599,7 +41745,7 @@ msgstr "" msgid "Row #{0}: Dates overlapping with other row" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:393 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:395 msgid "Row #{0}: Default BOM not found for FG Item {1}" msgstr "" @@ -41611,26 +41757,26 @@ msgstr "" msgid "Row #{0}: Duplicate entry in References {1} {2}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:316 +#: erpnext/selling/doctype/sales_order/sales_order.py:318 msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:872 +#: erpnext/controllers/stock_controller.py:873 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:398 -#: erpnext/selling/doctype/sales_order/sales_order.py:289 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:400 +#: erpnext/selling/doctype/sales_order/sales_order.py:291 msgid "Row #{0}: Finished Good Item Qty can not be zero" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:380 -#: erpnext/selling/doctype/sales_order/sales_order.py:269 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:382 +#: erpnext/selling/doctype/sales_order/sales_order.py:271 msgid "Row #{0}: Finished Good Item is not specified for service item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:387 -#: erpnext/selling/doctype/sales_order/sales_order.py:276 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:389 +#: erpnext/selling/doctype/sales_order/sales_order.py:278 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item" msgstr "" @@ -41675,7 +41821,7 @@ msgstr "" msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List." msgstr "" -#: erpnext/controllers/stock_controller.py:107 +#: erpnext/controllers/stock_controller.py:108 msgid "Row #{0}: Item {1} has zero rate but 'Allow Zero Valuation Rate' is not enabled." msgstr "" @@ -41720,7 +41866,7 @@ msgstr "" msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:658 +#: erpnext/selling/doctype/sales_order/sales_order.py:657 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists" msgstr "" @@ -41761,7 +41907,7 @@ msgstr "" msgid "Row #{0}: Please set reorder quantity" msgstr "" -#: erpnext/controllers/accounts_controller.py:546 +#: erpnext/controllers/accounts_controller.py:551 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master" msgstr "" @@ -41778,15 +41924,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1301 +#: erpnext/controllers/stock_controller.py:1387 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1316 +#: erpnext/controllers/stock_controller.py:1402 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1331 +#: erpnext/controllers/stock_controller.py:1417 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -41794,8 +41940,8 @@ msgstr "" msgid "Row #{0}: Quantity cannot be a non-positive number. Please increase the quantity or remove the Item {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1377 -#: erpnext/controllers/accounts_controller.py:3793 +#: erpnext/controllers/accounts_controller.py:1385 +#: erpnext/controllers/accounts_controller.py:3801 msgid "Row #{0}: Quantity for Item {1} cannot be zero." msgstr "" @@ -41807,8 +41953,8 @@ msgstr "" msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0." msgstr "" -#: erpnext/controllers/accounts_controller.py:801 -#: erpnext/controllers/accounts_controller.py:813 +#: erpnext/controllers/accounts_controller.py:806 +#: erpnext/controllers/accounts_controller.py:818 #: erpnext/utilities/transaction_base.py:114 #: erpnext/utilities/transaction_base.py:120 msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" @@ -41830,7 +41976,7 @@ msgstr "" msgid "Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:451 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:453 msgid "Row #{0}: Return Against is required for returning asset" msgstr "" @@ -41846,7 +41992,7 @@ msgstr "" msgid "Row #{0}: Scrap Item Qty cannot be zero" msgstr "" -#: erpnext/controllers/selling_controller.py:274 +#: erpnext/controllers/selling_controller.py:283 msgid "" "Row #{0}: Selling rate for item {1} is lower than its {2}.\n" "\t\t\t\t\tSelling {3} should be atleast {4}.

    Alternatively,\n" @@ -41854,11 +42000,11 @@ msgid "" "\t\t\t\t\tthis validation." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:262 +#: erpnext/manufacturing/doctype/work_order/work_order.py:263 msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:259 +#: erpnext/controllers/stock_controller.py:260 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -41874,19 +42020,19 @@ msgstr "" msgid "Row #{0}: Serial No(s) {1} are not a part of the linked Subcontracting Inward Order. Please select valid Serial No(s)." msgstr "" -#: erpnext/controllers/accounts_controller.py:574 +#: erpnext/controllers/accounts_controller.py:579 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date" msgstr "" -#: erpnext/controllers/accounts_controller.py:568 +#: erpnext/controllers/accounts_controller.py:573 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date" msgstr "" -#: erpnext/controllers/accounts_controller.py:562 +#: erpnext/controllers/accounts_controller.py:567 msgid "Row #{0}: Service Start and End Date is required for deferred accounting" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:479 +#: erpnext/selling/doctype/sales_order/sales_order.py:481 msgid "Row #{0}: Set Supplier for item {1}" msgstr "" @@ -41898,11 +42044,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:367 +#: erpnext/manufacturing/doctype/work_order/work_order.py:368 msgid "Row #{0}: Source Warehouse {1} for item {2} cannot be a customer warehouse." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:322 +#: erpnext/manufacturing/doctype/work_order/work_order.py:323 msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" @@ -41946,7 +42092,7 @@ msgstr "" msgid "Row #{0}: Stock is already reserved for the Item {1}." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:541 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:543 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}." msgstr "" @@ -41959,7 +42105,7 @@ msgstr "" msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1295 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1297 msgid "Row #{0}: Stock quantity {1} ({2}) for item {3} cannot exceed {4}" msgstr "" @@ -41967,7 +42113,7 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:272 +#: erpnext/controllers/stock_controller.py:273 msgid "Row #{0}: The batch {1} has already expired." msgstr "" @@ -41991,7 +42137,7 @@ msgstr "" msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:455 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:457 msgid "Row #{0}: You must select an Asset for Item {1}." msgstr "" @@ -42059,19 +42205,19 @@ msgstr "" msgid "Row #{}: Finance Book should not be empty since you're using multiple." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:407 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:412 msgid "Row #{}: Item Code: {} is not available under warehouse {}." msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:93 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:92 msgid "Row #{}: POS Invoice {} has been {}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:74 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:73 msgid "Row #{}: POS Invoice {} is not against customer {}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:89 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:88 msgid "Row #{}: POS Invoice {} is not submitted yet" msgstr "" @@ -42083,19 +42229,19 @@ msgstr "" msgid "Row #{}: Please use a different Finance Book." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:478 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:483 msgid "Row #{}: Serial No {} cannot be returned since it was not transacted in original invoice {}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:414 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:419 msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}." msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:104 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:103 msgid "Row #{}: The original Invoice {} of return invoice {} is not consolidated." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:451 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:456 msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return." msgstr "" @@ -42112,11 +42258,11 @@ msgstr "" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1398 +#: erpnext/stock/doctype/item/item.py:1379 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:440 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:442 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}" msgstr "" @@ -42128,11 +42274,11 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1388 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1390 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1412 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1414 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -42176,11 +42322,11 @@ msgstr "" msgid "Row {0}: Both Debit and Credit values cannot be zero" msgstr "" -#: erpnext/controllers/selling_controller.py:266 +#: erpnext/controllers/selling_controller.py:275 msgid "Row {0}: Conversion Factor is mandatory" msgstr "" -#: erpnext/controllers/accounts_controller.py:3146 +#: erpnext/controllers/accounts_controller.py:3154 msgid "Row {0}: Cost Center {1} does not belong to Company {2}" msgstr "" @@ -42192,7 +42338,7 @@ msgstr "" msgid "Row {0}: Credit entry can not be linked with a {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:466 +#: erpnext/manufacturing/doctype/bom/bom.py:475 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}" msgstr "" @@ -42200,7 +42346,7 @@ msgstr "" msgid "Row {0}: Debit entry can not be linked with a {1}" msgstr "" -#: erpnext/controllers/selling_controller.py:834 +#: erpnext/controllers/selling_controller.py:846 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same" msgstr "" @@ -42208,7 +42354,7 @@ msgstr "" msgid "Row {0}: Delivery Warehouse cannot be same as Customer Warehouse for Item {1}." msgstr "" -#: erpnext/controllers/accounts_controller.py:2639 +#: erpnext/controllers/accounts_controller.py:2647 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date" msgstr "" @@ -42217,7 +42363,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1075 -#: erpnext/controllers/taxes_and_totals.py:1228 +#: erpnext/controllers/taxes_and_totals.py:1330 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -42225,15 +42371,15 @@ msgstr "" msgid "Row {0}: Expected Value After Useful Life must be less than Net Purchase Amount" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:530 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:532 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:487 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:489 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:512 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:514 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}" msgstr "" @@ -42250,7 +42396,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1397 +#: erpnext/controllers/stock_controller.py:1483 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -42266,11 +42412,11 @@ msgstr "" msgid "Row {0}: Invalid reference {1}" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:140 +#: erpnext/controllers/taxes_and_totals.py:137 msgid "Row {0}: Item Tax template updated as per validity and rate applied" msgstr "" -#: erpnext/controllers/selling_controller.py:599 +#: erpnext/controllers/selling_controller.py:611 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer" msgstr "" @@ -42286,7 +42432,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:598 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:600 msgid "Row {0}: Packed Qty must be equal to {1} Qty." msgstr "" @@ -42330,15 +42476,15 @@ msgstr "" msgid "Row {0}: Please select an valid BOM for Item {1}." msgstr "" -#: erpnext/regional/italy/utils.py:310 +#: erpnext/regional/italy/utils.py:283 msgid "Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges" msgstr "" -#: erpnext/regional/italy/utils.py:337 +#: erpnext/regional/italy/utils.py:310 msgid "Row {0}: Please set the Mode of Payment in Payment Schedule" msgstr "" -#: erpnext/regional/italy/utils.py:342 +#: erpnext/regional/italy/utils.py:315 msgid "Row {0}: Please set the correct code on Mode of Payment {1}" msgstr "" @@ -42374,11 +42520,11 @@ msgstr "" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1425 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1427 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1388 +#: erpnext/controllers/stock_controller.py:1474 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -42390,7 +42536,7 @@ msgstr "" msgid "Row {0}: The item {1}, quantity must be positive number" msgstr "" -#: erpnext/controllers/accounts_controller.py:3123 +#: erpnext/controllers/accounts_controller.py:3131 msgid "Row {0}: The {3} Account {1} does not belong to the company {2}" msgstr "" @@ -42402,12 +42548,12 @@ msgstr "" msgid "Row {0}: UOM Conversion Factor is mandatory" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1118 -#: erpnext/manufacturing/doctype/work_order/work_order.py:396 +#: erpnext/manufacturing/doctype/bom/bom.py:1131 +#: erpnext/manufacturing/doctype/work_order/work_order.py:397 msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1099 +#: erpnext/controllers/accounts_controller.py:1104 msgid "Row {0}: user has not applied the rule {1} on the item {2}" msgstr "" @@ -42419,7 +42565,7 @@ msgstr "" msgid "Row {0}: {1} must be greater than 0" msgstr "" -#: erpnext/controllers/accounts_controller.py:711 +#: erpnext/controllers/accounts_controller.py:716 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}" msgstr "" @@ -42461,15 +42607,15 @@ msgstr "" msgid "Rows with Same Account heads will be merged on Ledger" msgstr "" -#: erpnext/controllers/accounts_controller.py:2650 +#: erpnext/controllers/accounts_controller.py:2658 msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:124 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:128 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" -#: erpnext/controllers/accounts_controller.py:275 +#: erpnext/controllers/accounts_controller.py:280 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry." msgstr "" @@ -42636,11 +42782,11 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.js:288 #: erpnext/crm/doctype/opportunity/opportunity.py:158 #: erpnext/projects/doctype/project/project_dashboard.py:15 -#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185 +#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:146 #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/setup/doctype/company/company.py:412 -#: erpnext/setup/doctype/company/company.py:599 +#: erpnext/setup/doctype/company/company.py:443 +#: erpnext/setup/doctype/company/company.py:630 #: erpnext/setup/doctype/company/company_dashboard.py:9 #: erpnext/setup/doctype/sales_person/sales_person_dashboard.py:12 #: erpnext/setup/install.py:329 @@ -42649,7 +42795,7 @@ msgstr "" msgid "Sales" msgstr "" -#: erpnext/setup/doctype/company/company.py:599 +#: erpnext/setup/doctype/company/company.py:630 msgid "Sales Account" msgstr "" @@ -42723,7 +42869,6 @@ msgstr "" #. DocType 'POS Settings' #. Name of a DocType #. Label of the sales_invoice (Link) field in DocType 'Sales Invoice Reference' -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Receivables Workspace #. Label of a shortcut in the Receivables Workspace #. Option for the 'Document Type' (Select) field in DocType 'Contract' @@ -42746,7 +42891,6 @@ msgstr "" #: erpnext/accounts/report/gross_profit/gross_profit.js:30 #: erpnext/accounts/report/gross_profit/gross_profit.py:276 #: erpnext/accounts/report/gross_profit/gross_profit.py:283 -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/receivables/receivables.json #: erpnext/crm/doctype/contract/contract.json #: erpnext/projects/doctype/timesheet/timesheet.json @@ -42835,15 +42979,15 @@ msgstr "" msgid "Sales Invoice isn't created by user {}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:423 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:428 msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:618 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:620 msgid "Sales Invoice {0} has already been submitted" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:574 +#: erpnext/selling/doctype/sales_order/sales_order.py:576 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order" msgstr "" @@ -42890,15 +43034,16 @@ msgstr "" #. Label of the sales_order (Link) field in DocType 'Purchase Receipt Item' #. Option for the 'Voucher Type' (Select) field in DocType 'Stock Reservation #. Entry' +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:272 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:287 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:285 #: erpnext/accounts/report/sales_register/sales_register.py:238 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json -#: erpnext/controllers/selling_controller.py:504 +#: erpnext/controllers/selling_controller.py:513 #: erpnext/crm/doctype/contract/contract.json #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js:65 #: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json @@ -42935,6 +43080,7 @@ msgstr "" #: erpnext/stock/report/delayed_item_report/delayed_item_report.py:159 #: erpnext/stock/report/delayed_order_report/delayed_order_report.js:30 #: erpnext/stock/report/delayed_order_report/delayed_order_report.py:74 +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Sales Order" msgstr "" @@ -43025,24 +43171,24 @@ msgstr "" msgid "Sales Order Trends" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:270 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:272 msgid "Sales Order required for Item {0}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:340 +#: erpnext/selling/doctype/sales_order/sales_order.py:342 msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1420 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1422 msgid "Sales Order {0} is not submitted" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:447 +#: erpnext/manufacturing/doctype/work_order/work_order.py:448 msgid "Sales Order {0} is not valid" msgstr "" -#: erpnext/controllers/selling_controller.py:485 -#: erpnext/manufacturing/doctype/work_order/work_order.py:452 +#: erpnext/controllers/selling_controller.py:494 +#: erpnext/manufacturing/doctype/work_order/work_order.py:453 msgid "Sales Order {0} is {1}" msgstr "" @@ -43213,7 +43359,7 @@ msgstr "" msgid "Sales Person" msgstr "" -#: erpnext/controllers/selling_controller.py:248 +#: erpnext/controllers/selling_controller.py:257 msgid "Sales Person {0} is disabled." msgstr "" @@ -43290,7 +43436,7 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/sales_stage/sales_stage.json #: erpnext/crm/report/lost_opportunity/lost_opportunity.py:51 -#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:69 +#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:70 #: erpnext/crm/workspace/crm/crm.json msgid "Sales Stage" msgstr "" @@ -43301,7 +43447,7 @@ msgstr "" #. Label of the sales_tax_template (Link) field in DocType 'Tax Rule' #: erpnext/accounts/doctype/tax_rule/tax_rule.json -#: erpnext/setup/doctype/company/company.js:126 +#: erpnext/setup/doctype/company/company.js:133 msgid "Sales Tax Template" msgstr "" @@ -43442,7 +43588,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3585 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3609 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -43572,7 +43718,7 @@ msgstr "" msgid "Scheduler is Inactive. Can't trigger jobs now." msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:676 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:671 msgid "Scheduler is inactive. Cannot enqueue job." msgstr "" @@ -43762,7 +43908,7 @@ msgstr "" msgid "Secretary" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:194 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117 msgid "Section Code" msgstr "" @@ -43801,7 +43947,7 @@ msgstr "" msgid "Select Alternate Item" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.js:325 +#: erpnext/selling/doctype/quotation/quotation.js:326 msgid "Select Alternative Items for Sales Order" msgstr "" @@ -43822,7 +43968,7 @@ msgid "Select BOM, Qty and For Warehouse" msgstr "" #: erpnext/assets/doctype/asset_repair/asset_repair.js:194 -#: erpnext/public/js/utils/sales_common.js:418 +#: erpnext/public/js/utils/sales_common.js:440 #: erpnext/stock/doctype/pick_list/pick_list.js:385 msgid "Select Batch No" msgstr "" @@ -43843,11 +43989,11 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:132 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:136 msgid "Select Company" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:520 +#: erpnext/manufacturing/doctype/job_card/job_card.js:529 msgid "Select Corrective Operation" msgstr "" @@ -43883,7 +44029,7 @@ msgstr "" msgid "Select Dispatch Address " msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:212 +#: erpnext/manufacturing/doctype/job_card/job_card.js:221 msgid "Select Employees" msgstr "" @@ -43937,19 +44083,19 @@ msgstr "" msgid "Select Possible Supplier" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1024 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1027 #: erpnext/stock/doctype/pick_list/pick_list.js:214 msgid "Select Quantity" msgstr "" #: erpnext/assets/doctype/asset_repair/asset_repair.js:194 -#: erpnext/public/js/utils/sales_common.js:418 +#: erpnext/public/js/utils/sales_common.js:440 #: erpnext/stock/doctype/pick_list/pick_list.js:385 msgid "Select Serial No" msgstr "" #: erpnext/assets/doctype/asset_repair/asset_repair.js:197 -#: erpnext/public/js/utils/sales_common.js:421 +#: erpnext/public/js/utils/sales_common.js:443 #: erpnext/stock/doctype/pick_list/pick_list.js:388 msgid "Select Serial and Batch" msgstr "" @@ -44016,7 +44162,7 @@ msgstr "" msgid "Select a Supplier" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:401 +#: erpnext/stock/doctype/material_request/material_request.js:404 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 "" @@ -44036,7 +44182,7 @@ msgstr "" msgid "Select an invoice to load summary data" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.js:340 +#: erpnext/selling/doctype/quotation/quotation.js:341 msgid "Select an item from each set to be used in the Sales Order." msgstr "" @@ -44054,7 +44200,7 @@ msgstr "" msgid "Select company name first." msgstr "" -#: erpnext/controllers/accounts_controller.py:2898 +#: erpnext/controllers/accounts_controller.py:2906 msgid "Select finance book for the item {0} at row {1}" msgstr "" @@ -44075,11 +44221,11 @@ 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:1126 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1129 msgid "Select the Item to be manufactured." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:911 +#: erpnext/manufacturing/doctype/bom/bom.js:919 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically." msgstr "" @@ -44100,7 +44246,7 @@ msgstr "" msgid "Select the date and your timezone" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:930 +#: erpnext/manufacturing/doctype/bom/bom.js:938 msgid "Select the raw materials (Items) required to manufacture the Item" msgstr "" @@ -44128,7 +44274,7 @@ msgstr "" msgid "Selected POS Opening Entry should be open." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2536 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2538 msgid "Selected Price List should have buying and selling fields checked." msgstr "" @@ -44208,7 +44354,6 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Selling Workspace -#. Label of a Link in the Settings Workspace #. Label of a shortcut in the Settings Workspace #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/selling/workspace/selling/selling.json @@ -44334,7 +44479,7 @@ msgstr "" msgid "Serial / Batch Bundle" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:442 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:447 msgid "Serial / Batch Bundle Missing" msgstr "" @@ -44452,7 +44597,7 @@ msgstr "" msgid "Serial No Range" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2288 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2317 msgid "Serial No Reserved" msgstr "" @@ -44528,7 +44673,7 @@ msgstr "" msgid "Serial No {0} does not exist" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2988 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3017 msgid "Serial No {0} does not exists" msgstr "" @@ -44560,7 +44705,7 @@ msgstr "" msgid "Serial No {0} not found" msgstr "" -#: erpnext/selling/page/point_of_sale/pos_controller.js:875 +#: erpnext/selling/page/point_of_sale/pos_controller.js:879 msgid "Serial No: {0} has already been transacted into another POS Invoice." msgstr "" @@ -44581,7 +44726,7 @@ msgstr "" msgid "Serial Nos and Batches" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1607 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1636 msgid "Serial Nos are created successfully" msgstr "" @@ -44663,15 +44808,15 @@ msgstr "" msgid "Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1829 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1858 msgid "Serial and Batch Bundle created" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1901 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1930 msgid "Serial and Batch Bundle updated" msgstr "" -#: erpnext/controllers/stock_controller.py:153 +#: erpnext/controllers/stock_controller.py:154 msgid "Serial and Batch Bundle {0} is already used in {1} {2}." msgstr "" @@ -44723,7 +44868,7 @@ msgstr "" msgid "Serial and Batch Summary" msgstr "" -#: erpnext/stock/utils.py:419 +#: erpnext/stock/utils.py:423 msgid "Serial number {0} entered more than once" msgstr "" @@ -44789,7 +44934,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:620 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:624 #: 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 @@ -45080,8 +45225,8 @@ msgstr "" msgid "Set Delivery Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:391 -#: erpnext/manufacturing/doctype/job_card/job_card.js:460 +#: erpnext/manufacturing/doctype/job_card/job_card.js:400 +#: erpnext/manufacturing/doctype/job_card/job_card.js:469 msgid "Set Finished Good Quantity" msgstr "" @@ -45132,7 +45277,7 @@ msgstr "" msgid "Set Operating Cost Based On BOM Quantity" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:88 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:89 msgid "Set Parent Row No in Items Table" msgstr "" @@ -45141,7 +45286,7 @@ msgstr "" msgid "Set Posting Date" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:957 +#: erpnext/manufacturing/doctype/bom/bom.js:965 msgid "Set Process Loss Item Quantity" msgstr "" @@ -45177,7 +45322,7 @@ msgstr "" #. Label of the set_warehouse (Link) field in DocType 'Sales Order' #. Label of the set_warehouse (Link) field in DocType 'Delivery Note' #. Label of the set_from_warehouse (Link) field in DocType 'Material Request' -#: erpnext/public/js/utils/sales_common.js:520 +#: erpnext/public/js/utils/sales_common.js:542 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/material_request/material_request.json @@ -45191,7 +45336,7 @@ msgstr "" #. Label of the set_warehouse (Link) field in DocType 'Subcontracting Order' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/public/js/utils/sales_common.js:517 +#: erpnext/public/js/utils/sales_common.js:539 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json @@ -45223,7 +45368,7 @@ msgstr "" msgid "Set as Completed" msgstr "" -#: erpnext/public/js/utils/sales_common.js:544 +#: erpnext/public/js/utils/sales_common.js:566 #: erpnext/selling/doctype/quotation/quotation.js:129 msgid "Set as Lost" msgstr "" @@ -45246,11 +45391,11 @@ msgstr "" msgid "Set by Item Tax Template" msgstr "" -#: erpnext/setup/doctype/company/company.py:502 +#: erpnext/setup/doctype/company/company.py:533 msgid "Set default inventory account for perpetual inventory" msgstr "" -#: erpnext/setup/doctype/company/company.py:528 +#: erpnext/setup/doctype/company/company.py:559 msgid "Set default {0} account for non stock items" msgstr "" @@ -45260,7 +45405,7 @@ msgstr "" msgid "Set fieldname from which you want to fetch the data from the parent form." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:947 +#: erpnext/manufacturing/doctype/bom/bom.js:955 msgid "Set quantity of process loss item:" msgstr "" @@ -45276,7 +45421,7 @@ msgstr "" msgid "Set targets Item Group-wise for this Sales Person." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1183 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1186 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)" msgstr "" @@ -45365,8 +45510,8 @@ msgstr "" msgid "Setting up company" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1097 -#: erpnext/manufacturing/doctype/work_order/work_order.py:1446 +#: erpnext/manufacturing/doctype/bom/bom.py:1110 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1447 msgid "Setting {0} is required" msgstr "" @@ -45526,7 +45671,7 @@ msgstr "" msgid "Shipment details" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:789 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:791 msgid "Shipments" msgstr "" @@ -45561,7 +45706,7 @@ msgstr "" msgid "Shipping Address Template" msgstr "" -#: erpnext/controllers/accounts_controller.py:505 +#: erpnext/controllers/accounts_controller.py:510 msgid "Shipping Address does not belong to the {0}" msgstr "" @@ -45924,7 +46069,7 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" -#: erpnext/stock/utils.py:579 +#: erpnext/stock/utils.py:583 msgid "Show pending entries" msgstr "" @@ -46026,7 +46171,7 @@ msgstr "" msgid "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:96 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:105 msgid "Since {0} are Serial No/Batch No items, you cannot enable 'Recreate Stock Ledgers' in Repost Item Valuation." msgstr "" @@ -46125,7 +46270,7 @@ msgstr "" msgid "Solvency Ratios" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:300 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:302 msgid "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager." msgstr "" @@ -46133,15 +46278,15 @@ msgstr "" msgid "Something went wrong please try again" msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:752 +#: erpnext/accounts/doctype/pricing_rule/utils.py:755 msgid "Sorry, this coupon code is no longer valid" msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:750 +#: erpnext/accounts/doctype/pricing_rule/utils.py:753 msgid "Sorry, this coupon code's validity has expired" msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:748 +#: erpnext/accounts/doctype/pricing_rule/utils.py:751 msgid "Sorry, this coupon code's validity has not started" msgstr "" @@ -46218,7 +46363,7 @@ msgstr "" #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:126 -#: erpnext/public/js/utils/sales_common.js:516 +#: erpnext/public/js/utils/sales_common.js:538 #: erpnext/stock/dashboard/item_dashboard.js:227 #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.js:668 @@ -46241,7 +46386,7 @@ msgstr "" msgid "Source Warehouse is mandatory for the Item {0}." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:281 +#: erpnext/manufacturing/doctype/work_order/work_order.py:282 msgid "Source Warehouse {0} must be same as Customer Warehouse {1} in the Subcontracting Inward Order." msgstr "" @@ -46297,6 +46442,10 @@ msgstr "" msgid "Specify conditions to calculate shipping amount" msgstr "" +#: erpnext/accounts/doctype/budget/budget.py:216 +msgid "Spending for Account {0} ({1}) between {2} and {3} has already exceeded the new allocated budget. Spent: {4}, Budget: {5}" +msgstr "" + #: erpnext/assets/doctype/asset/asset.js:557 #: erpnext/stock/doctype/batch/batch.js:91 #: erpnext/stock/doctype/batch/batch.js:183 @@ -46336,7 +46485,7 @@ msgstr "" msgid "Split Quantity must be less than Asset Quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2518 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2519 msgid "Splitting {0} {1} into {2} rows as per Payment Terms" msgstr "" @@ -46403,7 +46552,7 @@ msgstr "" msgid "Standard Buying" msgstr "" -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:61 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:73 msgid "Standard Description" msgstr "" @@ -46473,7 +46622,7 @@ msgstr "" msgid "Start Deletion" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:206 +#: erpnext/manufacturing/doctype/job_card/job_card.js:215 #: erpnext/manufacturing/doctype/workstation/workstation.js:124 msgid "Start Job" msgstr "" @@ -46482,7 +46631,7 @@ msgstr "" msgid "Start Merge" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:95 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:99 msgid "Start Reposting" msgstr "" @@ -46498,7 +46647,7 @@ msgstr "" #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56 #: erpnext/accounts/report/financial_ratios/financial_ratios.js:17 #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:81 -#: erpnext/public/js/financial_statements.js:332 +#: erpnext/public/js/financial_statements.js:343 msgid "Start Year" msgstr "" @@ -46567,7 +46716,7 @@ msgstr "" msgid "Status Illustration" msgstr "" -#: erpnext/projects/doctype/project/project.py:710 +#: erpnext/projects/doctype/project/project.py:709 msgid "Status must be Cancelled or Completed" msgstr "" @@ -46603,8 +46752,8 @@ msgstr "" #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1353 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1379 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1355 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1381 #: erpnext/accounts/report/account_balance/account_balance.js:58 msgid "Stock Adjustment" msgstr "" @@ -46761,7 +46910,7 @@ msgstr "" msgid "Stock Entry Type" msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:1402 +#: erpnext/stock/doctype/pick_list/pick_list.py:1407 msgid "Stock Entry has been already created against this Pick List" msgstr "" @@ -46825,7 +46974,7 @@ msgid "Stock Ledger Entry" msgstr "" #: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:98 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:107 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:110 msgid "Stock Ledger ID" msgstr "" @@ -46839,6 +46988,12 @@ msgstr "" msgid "Stock Ledger Variance" msgstr "" +#. Description of the 'Repost Only Accounting Ledgers' (Check) field in DocType +#. 'Repost Item Valuation' +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json +msgid "Stock Ledgers won’t be reposted." +msgstr "" + #: erpnext/stock/doctype/batch/batch.js:79 #: erpnext/stock/doctype/item/item.js:542 msgid "Stock Levels" @@ -46918,8 +47073,8 @@ msgstr "" #. Label of the stock_qty (Float) field in DocType 'BOM Item' #. Label of the stock_qty (Float) field in DocType 'Delivery Schedule Item' #. Label of the stock_qty (Float) field in DocType 'Material Request Item' -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:259 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:314 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:262 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:312 #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json #: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json #: erpnext/manufacturing/doctype/bom_item/bom_item.json @@ -46949,7 +47104,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' #. Label of a Link in the Stock Workspace #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:614 +#: erpnext/stock/doctype/item/item.py:595 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json msgid "Stock Reconciliation" @@ -46960,7 +47115,7 @@ msgstr "" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:614 +#: erpnext/stock/doctype/item/item.py:595 msgid "Stock Reconciliations" msgstr "" @@ -47021,8 +47176,8 @@ msgid "Stock Reservation Entries Cancelled" msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:995 -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2196 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2028 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2229 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2029 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1773 msgid "Stock Reservation Entries Created" msgstr "" @@ -47050,7 +47205,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:551 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:553 msgid "Stock Reservation Warehouse Mismatch" msgstr "" @@ -47083,7 +47238,6 @@ msgstr "" #. Label of the auto_accounting_for_stock_settings (Section Break) field in #. DocType 'Company' -#. Label of a Link in the Settings Workspace #. Label of a shortcut in the Settings Workspace #. Name of a DocType #. Label of a Link in the Stock Workspace @@ -47163,8 +47317,8 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:261 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:316 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:264 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:314 #: erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json @@ -47294,7 +47448,7 @@ msgstr "" #: erpnext/stock/doctype/bin/bin.json #: erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.json #: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:134 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:123 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:126 msgid "Stock Value" msgstr "" @@ -47316,15 +47470,15 @@ msgstr "" msgid "Stock cannot be reserved in the group warehouse {0}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:732 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:734 msgid "Stock cannot be updated against Purchase Receipt {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1253 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1255 msgid "Stock cannot be updated against the following Delivery Notes: {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1322 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1324 msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item." msgstr "" @@ -47336,7 +47490,7 @@ msgstr "" msgid "Stock not available for Item {0} in Warehouse {1}." msgstr "" -#: erpnext/selling/page/point_of_sale/pos_controller.js:855 +#: erpnext/selling/page/point_of_sale/pos_controller.js:859 msgid "Stock quantity not enough for Item Code: {0} under warehouse {1}. Available quantity {2} {3}." msgstr "" @@ -47356,7 +47510,7 @@ msgstr "" msgid "Stock will be reserved on submission of Purchase Receipt created against Material Request for Sales Order." msgstr "" -#: erpnext/stock/utils.py:570 +#: erpnext/stock/utils.py:574 msgid "Stock/Accounts can not be frozen as processing of backdated entries is going on. Please try again later." msgstr "" @@ -47371,11 +47525,11 @@ msgstr "" msgid "Stop Reason" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1056 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1057 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel" msgstr "" -#: erpnext/setup/doctype/company/company.py:339 +#: erpnext/setup/doctype/company/company.py:370 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:528 #: erpnext/stock/doctype/item/item.py:283 @@ -47402,7 +47556,7 @@ msgstr "" msgid "Sub Assemblies & Raw Materials" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:298 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:321 msgid "Sub Assembly Item" msgstr "" @@ -47418,7 +47572,7 @@ msgstr "" msgid "Sub Assembly Item Reference" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:403 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:430 msgid "Sub Assembly Item is mandatory" msgstr "" @@ -47436,7 +47590,7 @@ msgstr "" #. Label of the operation (Link) field in DocType 'Job Card Time Log' #. Name of a DocType -#: erpnext/manufacturing/doctype/job_card/job_card.js:336 +#: erpnext/manufacturing/doctype/job_card/job_card.js:345 #: erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json #: erpnext/manufacturing/doctype/sub_operation/sub_operation.json msgid "Sub Operation" @@ -47495,8 +47649,10 @@ msgstr "" #. Name of a report #. Label of a Link in the Manufacturing Workspace +#. Label of a Link in the Subcontracting Workspace #: erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontract Order Summary" msgstr "" @@ -47514,10 +47670,12 @@ msgstr "" #. Label of a Link in the Buying Workspace #. Label of a Link in the Manufacturing Workspace #. Label of a Link in the Stock Workspace +#. Label of a Link in the Subcontracting Workspace #: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.json #: erpnext/buying/workspace/buying/buying.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/workspace/stock/stock.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracted Item To Be Received" msgstr "" @@ -47537,10 +47695,12 @@ msgstr "" #. Label of a Link in the Buying Workspace #. Label of a Link in the Manufacturing Workspace #. Label of a Link in the Stock Workspace +#. Label of a Link in the Subcontracting Workspace #: erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.json #: erpnext/buying/workspace/buying/buying.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/workspace/stock/stock.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracted Raw Materials To Be Transferred" msgstr "" @@ -47549,18 +47709,22 @@ msgstr "" #. 'Production Plan Sub Assembly Item' #. Label of a Card Break in the Manufacturing Workspace #. Option for the 'Purpose' (Select) field in DocType 'Material Request' +#. Name of a Workspace #: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:10 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/material_request/material_request.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting" msgstr "" #. Label of a Link in the Manufacturing Workspace #. Name of a DocType +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting BOM" msgstr "" @@ -47575,10 +47739,12 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/setup/setup_wizard/operations/install_fixtures.py:132 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:158 +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting Delivery" msgstr "" @@ -47598,11 +47764,13 @@ msgstr "" #. Option for the 'From Voucher Type' (Select) field in DocType 'Stock #. Reservation Entry' #. Name of a DocType +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/selling/doctype/sales_order/sales_order.js:1001 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting Inward Order" msgstr "" @@ -47644,8 +47812,9 @@ msgstr "" #. Receipt Item' #. Label of the subcontracting_order (Link) field in DocType 'Subcontracting #. Receipt Supplied Item' +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/buying/doctype/purchase_order/purchase_order.js:440 -#: erpnext/controllers/subcontracting_controller.py:1102 +#: erpnext/controllers/subcontracting_controller.py:1123 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json @@ -47653,6 +47822,7 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:140 #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting Order" msgstr "" @@ -47681,7 +47851,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:968 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:967 msgid "Subcontracting Order {0} created." msgstr "" @@ -47700,6 +47870,7 @@ msgstr "" #. Option for the 'Reference Type' (Select) field in DocType 'Quality #. Inspection' #. Name of a DocType +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json #: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json @@ -47707,6 +47878,7 @@ msgstr "" #: erpnext/stock/doctype/quality_inspection/quality_inspection.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:530 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting Receipt" msgstr "" @@ -47749,7 +47921,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:964 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:963 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:987 msgid "Submit Action Failed" msgstr "" @@ -47797,7 +47969,7 @@ msgstr "" #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:16 #: erpnext/selling/doctype/quotation/quotation_dashboard.py:12 #: erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py:25 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:31 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:34 msgid "Subscription" msgstr "" @@ -48066,7 +48238,7 @@ msgstr "" #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:60 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:34 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:191 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:194 #: erpnext/accounts/report/purchase_register/purchase_register.js:21 #: erpnext/accounts/report/purchase_register/purchase_register.py:171 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 @@ -48235,11 +48407,11 @@ msgstr "" #. Label of the bill_date (Date) field in DocType 'Purchase Invoice' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:238 msgid "Supplier Invoice Date" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1746 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1748 msgid "Supplier Invoice Date cannot be greater than Posting Date" msgstr "" @@ -48249,12 +48421,12 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:110 -#: erpnext/accounts/report/general_ledger/general_ledger.py:780 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218 +#: erpnext/accounts/report/general_ledger/general_ledger.py:787 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:232 msgid "Supplier Invoice No" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1773 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1775 msgid "Supplier Invoice No exists in Purchase Invoice {0}" msgstr "" @@ -48296,7 +48468,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1174 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:198 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:201 #: erpnext/accounts/report/purchase_register/purchase_register.py:177 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:35 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:73 @@ -48379,7 +48551,7 @@ msgstr "" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:49 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json -#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:232 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:234 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:60 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:258 #: erpnext/buying/workspace/buying/buying.json @@ -48482,7 +48654,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:80 +#: erpnext/manufacturing/doctype/job_card/job_card.js:89 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "Supplier Warehouse" msgstr "" @@ -48505,7 +48677,7 @@ msgstr "" msgid "Supplier of Goods or Services." msgstr "" -#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:185 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:187 msgid "Supplier {0} not found in {1}" msgstr "" @@ -48558,10 +48730,8 @@ msgstr "" msgid "Support Search Source" msgstr "" -#. Label of a Link in the Settings Workspace #. Name of a DocType #. Label of a Link in the Support Workspace -#: erpnext/setup/workspace/settings/settings.json #: erpnext/support/doctype/support_settings/support_settings.json #: erpnext/support/workspace/support/support.json msgid "Support Settings" @@ -48636,7 +48806,7 @@ msgstr "" msgid "System will fetch all the entries if limit value is zero." msgstr "" -#: erpnext/controllers/accounts_controller.py:2147 +#: erpnext/controllers/accounts_controller.py:2155 msgid "System will not check over billing since amount for Item {0} in {1} is zero" msgstr "" @@ -48646,16 +48816,16 @@ msgstr "" msgid "System will notify to increase or decrease quantity or amount " msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267 msgid "TCS Amount" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:249 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125 msgid "TCS Rate %" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267 msgid "TDS Amount" msgstr "" @@ -48664,7 +48834,7 @@ msgstr "" msgid "TDS Computation Summary" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1530 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1532 msgid "TDS Deducted" msgstr "" @@ -48672,7 +48842,7 @@ msgstr "" msgid "TDS Payable" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:249 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125 msgid "TDS Rate %" msgstr "" @@ -48839,7 +49009,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:998 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1001 #: 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 @@ -48860,7 +49030,7 @@ msgstr "" msgid "Target Warehouse Address Link" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:236 +#: erpnext/manufacturing/doctype/work_order/work_order.py:237 msgid "Target Warehouse Reservation Error" msgstr "" @@ -48868,15 +49038,15 @@ msgstr "" msgid "Target Warehouse for Finished Good must be same as Finished Good Warehouse {1} in Work Order {2} linked to the Subcontracting Inward Order." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:741 +#: erpnext/manufacturing/doctype/work_order/work_order.py:742 msgid "Target Warehouse is required before Submit" msgstr "" -#: erpnext/controllers/selling_controller.py:840 +#: erpnext/controllers/selling_controller.py:852 msgid "Target Warehouse is set for some items but the customer is not an internal customer." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:297 +#: erpnext/manufacturing/doctype/work_order/work_order.py:298 msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcontracting Inward Order Item." msgstr "" @@ -48971,6 +49141,8 @@ msgstr "" msgid "Tax Account" msgstr "" +#. Label of the amount (Currency) field in DocType 'Item Wise Tax Detail' +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:137 msgid "Tax Amount" msgstr "" @@ -49127,12 +49299,14 @@ msgstr "" #. Label of the tax_rate (Float) field in DocType 'Account' #. Label of the rate (Float) field in DocType 'Advance Taxes and Charges' #. Label of the tax_rate (Float) field in DocType 'Item Tax Template Detail' +#. Label of the rate (Float) field in DocType 'Item Wise Tax Detail' #. Label of the rate (Float) field in DocType 'Purchase Taxes and Charges' #. Label of the rate (Float) field in DocType 'Sales Taxes and Charges' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/account_tree.js:166 #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/doctype/pos_closing_entry/closing_voucher_details.html:66 #: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json #: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json @@ -49148,6 +49322,11 @@ msgstr "" msgid "Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme" msgstr "" +#. Label of the tax_row (Data) field in DocType 'Item Wise Tax Detail' +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json +msgid "Tax Row" +msgstr "" + #. Name of a DocType #. Label of a Link in the Accounting Workspace #: erpnext/accounts/doctype/tax_rule/tax_rule.json @@ -49188,7 +49367,7 @@ msgstr "" msgid "Tax Withheld Vouchers" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:361 msgid "Tax Withholding" msgstr "" @@ -49280,10 +49459,13 @@ msgstr "" msgid "Tax will be withheld only for amount exceeding the cumulative threshold" msgstr "" +#. Label of the taxable_amount (Currency) field in DocType 'Item Wise Tax +#. Detail' #. Label of the taxable_amount (Currency) field in DocType 'Tax Withheld #. Vouchers' +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json -#: erpnext/controllers/taxes_and_totals.py:1148 +#: erpnext/controllers/taxes_and_totals.py:1202 msgid "Taxable Amount" msgstr "" @@ -49700,7 +49882,7 @@ msgstr "" #: erpnext/accounts/report/gross_profit/gross_profit.py:425 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:8 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:21 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:262 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:260 #: erpnext/accounts/report/sales_register/sales_register.py:209 #: erpnext/crm/doctype/lead/lead.json #: erpnext/crm/doctype/opportunity/opportunity.json @@ -49810,6 +49992,10 @@ msgstr "" msgid "The Campaign '{0}' already exists for the {1} '{2}'" msgstr "" +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:74 +msgid "The Company {0} of Sales Forecast {1} does not match with the Company {2} of Master Production Schedule {3}." +msgstr "" + #: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:206 msgid "The Document Type {0} must have a Status field to configure Service Level Agreement" msgstr "" @@ -49838,7 +50024,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2432 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -49850,11 +50036,11 @@ msgstr "" msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}." msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2285 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2314 msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1595 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1597 msgid "The Serial and Batch Bundle {0} is not valid for this transaction. The 'Type of Transaction' should be 'Outward' instead of 'Inward' in Serial and Batch Bundle {0}" msgstr "" @@ -49862,7 +50048,7 @@ msgstr "" msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing.

    When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2091 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2093 msgid "The Work Order is mandatory for Disassembly Order" msgstr "" @@ -49880,6 +50066,10 @@ msgstr "" msgid "The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document." msgstr "" +#: erpnext/controllers/stock_controller.py:1240 +msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." +msgstr "" + #: erpnext/accounts/doctype/dunning/dunning.py:87 msgid "The currency of invoice {} ({}) is different from the currency of this dunning ({})." msgstr "" @@ -49888,7 +50078,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:1131 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1134 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM." msgstr "" @@ -49913,7 +50103,7 @@ msgstr "" msgid "The field To Shareholder cannot be blank" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:401 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:403 msgid "The field {0} in row {1} is not set" msgstr "" @@ -49937,7 +50127,7 @@ msgstr "" msgid "The following batches are expired, please restock them:
    {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:839 +#: erpnext/stock/doctype/item/item.py:820 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -49958,7 +50148,7 @@ msgstr "" msgid "The gross weight of the package. Usually net weight + packaging material weight. (for print)" msgstr "" -#: erpnext/setup/doctype/holiday_list/holiday_list.py:117 +#: erpnext/setup/doctype/holiday_list/holiday_list.py:126 msgid "The holiday on {0} is not between From Date and To Date" msgstr "" @@ -49966,7 +50156,7 @@ msgstr "" msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:616 +#: erpnext/stock/doctype/item/item.py:597 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" @@ -50012,7 +50202,7 @@ msgstr "" msgid "The operation {0} can not be the sub operation" msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:108 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:107 msgid "The original invoice should be consolidated before or along with the return invoice." msgstr "" @@ -50064,7 +50254,7 @@ msgstr "" msgid "The selected BOMs are not for the same item" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:494 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:499 msgid "The selected change account {} doesn't belongs to Company {}." msgstr "" @@ -50081,7 +50271,7 @@ msgstr "" msgid "The serial and batch bundle {0} not linked to {1} {2}" msgstr "" -#: erpnext/stock/doctype/batch/batch.py:426 +#: erpnext/stock/doctype/batch/batch.py:427 msgid "The serial no {0} does not belong to item {1}" msgstr "" @@ -50120,11 +50310,11 @@ msgstr "" msgid "The task has been enqueued as a background job." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1007 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1018 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1019 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -50136,7 +50326,7 @@ msgstr "" msgid "The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3}" msgstr "" -#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:153 +#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:154 msgid "The uploaded file does not appear to be in valid MT940 format." msgstr "" @@ -50168,15 +50358,15 @@ msgstr "" msgid "The value {0} is already assigned to an existing Item {1}." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1159 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1162 msgid "The warehouse where you store finished Items before they are shipped." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1152 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1155 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:1164 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1167 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 "" @@ -50192,7 +50382,7 @@ msgstr "" msgid "The {0} {1} created successfully" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:43 +#: erpnext/controllers/sales_and_purchase_return.py:42 msgid "The {0} {1} does not match with the {0} {2} in the {3} {4}" msgstr "" @@ -50256,11 +50446,11 @@ msgstr "" msgid "There is already an active Subcontracting BOM {0} for the Finished Good {1}." msgstr "" -#: erpnext/stock/doctype/batch/batch.py:434 +#: erpnext/stock/doctype/batch/batch.py:435 msgid "There is no batch found against the {0}: {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1532 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1534 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -50281,7 +50471,7 @@ msgstr "" msgid "There was an issue connecting to Plaid's authentication server. Check browser console for more information" msgstr "" -#: erpnext/accounts/utils.py:1095 +#: erpnext/accounts/utils.py:1099 msgid "There were issues unlinking payment entry {0}." msgstr "" @@ -50303,22 +50493,14 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:977 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:976 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2132 +#: erpnext/selling/doctype/sales_order/sales_order.py:2135 msgid "This Sales Order has been fully subcontracted." msgstr "" -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31 -msgid "This Warehouse will be auto-updated in the Target Warehouse field of Work Order." -msgstr "" - -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24 -msgid "This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders." -msgstr "" - #: erpnext/setup/doctype/email_digest/email_digest.py:184 msgid "This Week's Summary" msgstr "" @@ -50339,7 +50521,7 @@ msgstr "" msgid "This covers all scorecards tied to this Setup" msgstr "" -#: erpnext/controllers/status_updater.py:447 +#: erpnext/controllers/status_updater.py:448 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?" msgstr "" @@ -50353,7 +50535,7 @@ msgstr "" msgid "This filter will be applied to Journal Entry." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:820 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:825 msgid "This invoice has already been paid." msgstr "" @@ -50430,11 +50612,11 @@ msgstr "" msgid "This is considered dangerous from accounting point of view." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:536 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:538 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:1145 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1148 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 "" @@ -50462,7 +50644,7 @@ msgstr "" msgid "This schedule was created when Asset {0} was repaired through Asset Repair {1}." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1476 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1478 msgid "This schedule was created when Asset {0} was restored due to Sales Invoice {1} cancellation." msgstr "" @@ -50474,7 +50656,7 @@ msgstr "" msgid "This schedule was created when Asset {0} was restored." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1472 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1474 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}." msgstr "" @@ -50486,7 +50668,7 @@ msgstr "" msgid "This schedule was created when Asset {0} was {1} into new Asset {2}." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1448 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1450 msgid "This schedule was created when Asset {0} was {1} through Sales Invoice {2}." msgstr "" @@ -50530,7 +50712,7 @@ msgstr "" msgid "This will restrict user access to other employee records" msgstr "" -#: erpnext/controllers/selling_controller.py:841 +#: erpnext/controllers/selling_controller.py:853 msgid "This {} will be treated as material transfer." msgstr "" @@ -50688,7 +50870,7 @@ msgstr "" msgid "Timesheet for tasks." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:919 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:921 msgid "Timesheet {0} is already completed or cancelled" msgstr "" @@ -50735,8 +50917,8 @@ msgstr "" msgid "To Currency" msgstr "" -#: erpnext/controllers/accounts_controller.py:555 -#: erpnext/setup/doctype/holiday_list/holiday_list.py:112 +#: erpnext/controllers/accounts_controller.py:560 +#: erpnext/setup/doctype/holiday_list/holiday_list.py:121 msgid "To Date cannot be before From Date" msgstr "" @@ -50750,7 +50932,7 @@ msgstr "" msgid "To Date cannot be less than From Date" msgstr "" -#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:29 +#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:30 msgid "To Date is mandatory" msgstr "" @@ -50807,6 +50989,8 @@ msgstr "" msgid "To Employee" msgstr "" +#. Label of the to_fiscal_year (Link) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:51 msgid "To Fiscal Year" msgstr "" @@ -50948,7 +51132,7 @@ msgstr "" msgid "To Warehouse (Optional)" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:925 +#: erpnext/manufacturing/doctype/bom/bom.js:933 msgid "To add Operations tick the 'With Operations' checkbox." msgstr "" @@ -50956,11 +51140,11 @@ msgstr "" msgid "To add subcontracted Item's raw materials if include exploded items is disabled." msgstr "" -#: erpnext/controllers/status_updater.py:442 +#: erpnext/controllers/status_updater.py:443 msgid "To allow over billing, update \"Over Billing Allowance\" in Accounts Settings or the Item." msgstr "" -#: erpnext/controllers/status_updater.py:438 +#: erpnext/controllers/status_updater.py:439 msgid "To allow over receipt / delivery, update \"Over Receipt/Delivery Allowance\" in Stock Settings or the Item." msgstr "" @@ -50976,11 +51160,11 @@ msgstr "" msgid "To be Delivered to Customer" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:611 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:613 msgid "To cancel a {} you need to cancel the POS Closing Entry {}." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:624 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:626 msgid "To cancel this Sales Invoice you need to cancel the POS Closing Entry {}." msgstr "" @@ -51002,12 +51186,12 @@ 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:2308 -#: erpnext/controllers/accounts_controller.py:3156 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2309 +#: erpnext/controllers/accounts_controller.py:3164 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:638 +#: erpnext/stock/doctype/item/item.py:619 msgid "To merge, following properties must be same for both items" msgstr "" @@ -51023,11 +51207,11 @@ msgstr "" msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}" msgstr "" @@ -51181,7 +51365,7 @@ msgstr "" #. Label of the total_amount (Currency) field in DocType 'Stock Entry' #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json #: erpnext/accounts/doctype/journal_entry/journal_entry.json -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:255 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131 #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json @@ -51376,6 +51560,10 @@ msgstr "" msgid "Total Expense This Year" msgstr "" +#: erpnext/accounts/doctype/budget/budget.py:544 +msgid "Total Expenses booked through" +msgstr "" + #. Label of the total_experience (Data) field in DocType 'Employee External #. Work History' #: erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json @@ -51531,7 +51719,7 @@ msgstr "" msgid "Total Order Value" msgstr "" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:694 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:620 msgid "Total Other Charges" msgstr "" @@ -51572,7 +51760,7 @@ msgstr "" msgid "Total Paid Amount" msgstr "" -#: erpnext/controllers/accounts_controller.py:2704 +#: erpnext/controllers/accounts_controller.py:2712 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total" msgstr "" @@ -51584,7 +51772,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:713 +#: erpnext/selling/doctype/sales_order/sales_order.py:712 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -51707,7 +51895,7 @@ msgstr "" msgid "Total Tasks" msgstr "" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:687 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:613 #: erpnext/accounts/report/purchase_register/purchase_register.py:263 msgid "Total Tax" msgstr "" @@ -51864,20 +52052,28 @@ msgstr "" msgid "Total Workstation Time (In Hours)" msgstr "" -#: erpnext/controllers/selling_controller.py:234 +#: erpnext/controllers/selling_controller.py:243 msgid "Total allocated percentage for sales team should be 100" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:161 +#: erpnext/selling/doctype/customer/customer.py:162 msgid "Total contribution percentage should be equal to 100" msgstr "" +#: erpnext/accounts/doctype/budget/budget.py:331 +msgid "Total distributed amount {0} must be equal to Budget Amount {1}" +msgstr "" + +#: erpnext/accounts/doctype/budget/budget.py:338 +msgid "Total distribution percent must equal 100 (currently {0})" +msgstr "" + #: erpnext/projects/doctype/project/project_dashboard.html:2 msgid "Total hours: {0}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:524 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:595 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:529 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:597 msgid "Total payments amount can't be greater than {}" msgstr "" @@ -52056,7 +52252,7 @@ msgstr "" #. Label of the transaction_type (Data) field in DocType 'Bank Transaction' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:278 msgid "Transaction Type" msgstr "" @@ -52097,7 +52293,7 @@ msgstr "" msgid "Transactions against the Company already exist! Chart of Accounts can only be imported for a Company with no transactions." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1186 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1188 msgid "Transactions using Sales Invoice in POS are disabled." msgstr "" @@ -52269,10 +52465,8 @@ msgid "Tree of Procedures" msgstr "" #. Name of a report -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Financial Reports Workspace #: erpnext/accounts/report/trial_balance/trial_balance.json -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/financial_reports/financial_reports.json msgid "Trial Balance" msgstr "" @@ -52473,7 +52667,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json #: erpnext/manufacturing/doctype/workstation/workstation.js:480 -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:58 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:70 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:110 #: erpnext/public/js/stock_analytics.js:94 erpnext/public/js/utils.js:742 #: erpnext/quality_management/doctype/quality_goal_objective/quality_goal_objective.json @@ -52502,7 +52696,7 @@ msgstr "" #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:94 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:176 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:178 #: erpnext/stock/report/stock_analytics/stock_analytics.py:45 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:134 #: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 @@ -52556,7 +52750,7 @@ msgstr "" msgid "UOM Conversion Factor" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1424 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1431 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}" msgstr "" @@ -52569,7 +52763,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3507 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3531 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -52624,7 +52818,7 @@ msgstr "" msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1014 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1015 msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" @@ -52645,7 +52839,7 @@ msgstr "" msgid "Unassigned Qty" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:360 +#: erpnext/accounts/doctype/budget/budget.py:617 msgid "Unbilled Orders" msgstr "" @@ -52695,7 +52889,7 @@ msgstr "" msgid "Unit" msgstr "" -#: erpnext/controllers/accounts_controller.py:3930 +#: erpnext/controllers/accounts_controller.py:3938 msgid "Unit Price" msgstr "" @@ -52752,7 +52946,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:272 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:274 #: erpnext/accounts/doctype/subscription/subscription.json #: erpnext/accounts/doctype/subscription/subscription_list.js:12 msgid "Unpaid" @@ -52885,7 +53079,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1711 msgid "Unset Matched Payment Request" msgstr "" @@ -52962,7 +53156,7 @@ msgstr "" #. Label of the update_bom_costs_automatically (Check) field in DocType #. 'Manufacturing Settings' -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:35 +#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:23 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json msgid "Update BOM Cost Automatically" msgstr "" @@ -53055,7 +53249,7 @@ msgstr "" #. Invoice' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/controllers/accounts_controller.py:190 +#: erpnext/controllers/accounts_controller.py:195 msgid "Update Outstanding for Self" msgstr "" @@ -53140,15 +53334,15 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1382 +#: erpnext/stock/doctype/item/item.py:1363 msgid "Updating Variants..." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1107 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1110 msgid "Updating Work Order status" msgstr "" -#: erpnext/public/js/print.js:129 +#: erpnext/public/js/print.js:139 msgid "Updating details." msgstr "" @@ -53330,7 +53524,7 @@ msgstr "" msgid "Use Transaction Date Exchange Rate" msgstr "" -#: erpnext/projects/doctype/project/project.py:561 +#: erpnext/projects/doctype/project/project.py:560 msgid "Use a name that is different from previous project name" msgstr "" @@ -53366,7 +53560,7 @@ msgstr "" #. Label of the user_remark (Small Text) field in DocType 'Journal Entry' #. Label of the user_remark (Small Text) field in DocType 'Journal Entry #. Account' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:616 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:620 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json msgid "User Remark" @@ -53377,7 +53571,7 @@ msgstr "" msgid "User Resolution Time" msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:591 +#: erpnext/accounts/doctype/pricing_rule/utils.py:594 msgid "User has not applied rule on the invoice {0}" msgstr "" @@ -53541,11 +53735,11 @@ msgstr "" msgid "Valid from and valid upto fields are mandatory for the cumulative" msgstr "" -#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:167 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:169 msgid "Valid till Date cannot be before Transaction Date" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.py:156 +#: erpnext/selling/doctype/quotation/quotation.py:158 msgid "Valid till date cannot be before transaction date" msgstr "" @@ -53608,7 +53802,7 @@ msgstr "" msgid "Validity in Days" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.py:363 +#: erpnext/selling/doctype/quotation/quotation.py:365 msgid "Validity period of this quotation has ended." msgstr "" @@ -53706,7 +53900,7 @@ msgstr "" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -53719,8 +53913,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:2332 -#: erpnext/controllers/accounts_controller.py:3180 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2333 +#: erpnext/controllers/accounts_controller.py:3188 msgid "Valuation type charges can not be marked as Inclusive" msgstr "" @@ -53732,7 +53926,7 @@ msgstr "" msgid "Value (G - D)" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:219 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:221 msgid "Value ({0})" msgstr "" @@ -53848,7 +54042,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:854 +#: erpnext/stock/doctype/item/item.py:835 msgid "Variant Attribute Error" msgstr "" @@ -53867,7 +54061,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:882 +#: erpnext/stock/doctype/item/item.py:863 msgid "Variant Based On cannot be changed" msgstr "" @@ -53885,7 +54079,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:833 msgid "Variant Items" msgstr "" @@ -54041,7 +54235,7 @@ msgstr "" msgid "View Ledgers" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:55 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:65 msgid "View MRP" msgstr "" @@ -54172,7 +54366,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:209 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:735 +#: erpnext/accounts/report/general_ledger/general_ledger.py:742 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:65 @@ -54194,7 +54388,7 @@ msgstr "" #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:51 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:112 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:33 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:117 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:120 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:165 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:74 msgid "Voucher No" @@ -54212,7 +54406,7 @@ msgstr "" #. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:729 +#: erpnext/accounts/report/general_ledger/general_ledger.py:736 msgid "Voucher Subtype" msgstr "" @@ -54245,7 +54439,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1194 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200 -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:734 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -54269,7 +54463,7 @@ msgstr "" #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:107 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:482 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:27 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:115 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:118 #: erpnext/stock/report/stock_ledger/stock_ledger.py:321 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:159 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:68 @@ -54423,7 +54617,7 @@ msgstr "" msgid "Warehouse and Reference" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:98 +#: erpnext/stock/doctype/warehouse/warehouse.py:100 msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse." msgstr "" @@ -54431,16 +54625,16 @@ msgstr "" msgid "Warehouse cannot be changed for Serial No." msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:161 +#: erpnext/controllers/sales_and_purchase_return.py:160 msgid "Warehouse is mandatory" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:253 +#: erpnext/stock/doctype/warehouse/warehouse.py:259 msgid "Warehouse not found against the account {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1243 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:428 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1245 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:430 msgid "Warehouse required for stock Item {0}" msgstr "" @@ -54454,7 +54648,7 @@ msgstr "" msgid "Warehouse wise Stock Value" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:92 +#: erpnext/stock/doctype/warehouse/warehouse.py:94 msgid "Warehouse {0} can not be deleted as quantity exists for Item {1}" msgstr "" @@ -54462,19 +54656,19 @@ msgstr "" msgid "Warehouse {0} does not belong to Company {1}." msgstr "" -#: erpnext/stock/utils.py:433 +#: erpnext/stock/utils.py:437 msgid "Warehouse {0} does not belong to company {1}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:233 +#: erpnext/manufacturing/doctype/work_order/work_order.py:234 msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:769 +#: erpnext/controllers/stock_controller.py:770 msgid "Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}." msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:142 +#: erpnext/stock/doctype/warehouse/warehouse.py:144 msgid "Warehouse's Stock Value has already been booked in the following accounts:" msgstr "" @@ -54491,15 +54685,15 @@ msgstr "" msgid "Warehouses" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:171 +#: erpnext/stock/doctype/warehouse/warehouse.py:173 msgid "Warehouses with child nodes cannot be converted to ledger" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:181 +#: erpnext/stock/doctype/warehouse/warehouse.py:183 msgid "Warehouses with existing transaction can not be converted to group." msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:173 +#: erpnext/stock/doctype/warehouse/warehouse.py:175 msgid "Warehouses with existing transaction can not be converted to ledger." msgstr "" @@ -54587,15 +54781,15 @@ msgstr "" msgid "Warning: Another {0} # {1} exists against stock entry {2}" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:520 +#: erpnext/stock/doctype/material_request/material_request.js:524 msgid "Warning: Material Requested Qty is less than Minimum Order Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1431 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1432 msgid "Warning: Quantity exceeds maximum producible quantity based on quantity of raw materials received through the Subcontracting Inward Order {0}." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:333 +#: erpnext/selling/doctype/sales_order/sales_order.py:335 msgid "Warning: Sales Order {0} already exists against Customer's Purchase Order {1}" msgstr "" @@ -54915,15 +55109,11 @@ msgstr "" #: erpnext/assets/doctype/asset/asset_list.js:12 #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json -#: erpnext/setup/doctype/company/company.py:340 +#: erpnext/setup/doctype/company/company.py:371 #: erpnext/support/doctype/warranty_claim/warranty_claim.json msgid "Work In Progress" msgstr "" -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:23 -msgid "Work In Progress Warehouse" -msgstr "" - #. Option for the 'Transfer Material Against' (Select) field in DocType 'BOM' #. Label of the work_order (Link) field in DocType 'Job Card' #. Name of a DocType @@ -55020,12 +55210,12 @@ msgstr "" msgid "Work Order cannot be created for following reason:
    {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1375 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1376 msgid "Work Order cannot be raised against a Item Template" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2345 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2425 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2347 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2427 msgid "Work Order has been {0}" msgstr "" @@ -55067,7 +55257,7 @@ msgstr "" msgid "Work-in-Progress Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:739 +#: erpnext/manufacturing/doctype/work_order/work_order.py:740 msgid "Work-in-Progress Warehouse is required before Submit" msgstr "" @@ -55204,7 +55394,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/setup/doctype/company/company.py:617 +#: erpnext/setup/doctype/company/company.py:648 msgid "Write Off" msgstr "" @@ -55307,7 +55497,7 @@ msgstr "" msgid "Wrong Company" msgstr "" -#: erpnext/setup/doctype/company/company.js:226 +#: erpnext/setup/doctype/company/company.js:233 msgid "Wrong Password" msgstr "" @@ -55354,7 +55544,7 @@ msgstr "" msgid "You are importing data for the code list:" msgstr "" -#: erpnext/controllers/accounts_controller.py:3773 +#: erpnext/controllers/accounts_controller.py:3781 msgid "You are not allowed to update as per the conditions set in {} Workflow." msgstr "" @@ -55374,7 +55564,7 @@ msgstr "" msgid "You are picking more than required quantity for the item {0}. Check if there is any other pick list created for the sales order {1}." msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:112 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:111 msgid "You can add the original invoice {} manually to proceed." msgstr "" @@ -55386,7 +55576,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1041 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1043 msgid "You can change the parent account to a Balance Sheet account or select a different account." msgstr "" @@ -55427,7 +55617,7 @@ msgstr "" msgid "You can't redeem Loyalty Points having more value than the Total Amount." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:681 +#: erpnext/manufacturing/doctype/bom/bom.js:689 msgid "You cannot change the rate if BOM is mentioned against any Item." msgstr "" @@ -55463,7 +55653,7 @@ msgstr "" msgid "You cannot redeem more than {0}." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:171 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:180 msgid "You cannot repost item valuation before {}" msgstr "" @@ -55483,7 +55673,7 @@ msgstr "" msgid "You cannot {0} this document because another Period Closing Entry {1} exists after {2}" msgstr "" -#: erpnext/controllers/accounts_controller.py:3749 +#: erpnext/controllers/accounts_controller.py:3757 msgid "You do not have permissions to {} items in a {}." msgstr "" @@ -55519,7 +55709,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: erpnext/stock/doctype/item/item.py:1058 +#: erpnext/stock/doctype/item/item.py:1039 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -55531,11 +55721,11 @@ msgstr "" msgid "You must select a customer before adding an item." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:268 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:273 msgid "You need to cancel POS Closing Entry {} to be able to cancel this document." msgstr "" -#: erpnext/controllers/accounts_controller.py:3131 +#: erpnext/controllers/accounts_controller.py:3139 msgid "You selected the account group {1} as {2} Account in row {0}. Please select a single account." msgstr "" @@ -55599,7 +55789,7 @@ msgstr "" msgid "[Important] [ERPNext] Auto Reorder Errors" msgstr "" -#: erpnext/controllers/status_updater.py:285 +#: erpnext/controllers/status_updater.py:286 msgid "`Allow Negative rates for Items`" msgstr "" @@ -55619,7 +55809,7 @@ msgstr "" msgid "as Title" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:949 +#: erpnext/manufacturing/doctype/bom/bom.js:957 msgid "as a percentage of finished item quantity" msgstr "" @@ -55635,12 +55825,12 @@ msgstr "" msgid "by {}" msgstr "" -#: erpnext/public/js/utils/sales_common.js:314 +#: erpnext/public/js/utils/sales_common.js:336 msgid "cannot be greater than 100" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:332 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1129 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1131 msgid "dated {0}" msgstr "" @@ -55688,7 +55878,7 @@ msgstr "" msgid "exchangerate.host" msgstr "" -#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:171 +#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:184 msgid "fieldname" msgstr "" @@ -55743,7 +55933,7 @@ msgstr "" msgid "material_request_item" msgstr "" -#: erpnext/controllers/selling_controller.py:195 +#: erpnext/controllers/selling_controller.py:204 msgid "must be between 0 and 100" msgstr "" @@ -55818,7 +56008,7 @@ msgstr "" msgid "received from" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1450 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1452 msgid "returned" msgstr "" @@ -55853,7 +56043,7 @@ msgstr "" msgid "sandbox" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1450 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1452 msgid "sold" msgstr "" @@ -55861,8 +56051,8 @@ msgstr "" msgid "subscription is already cancelled." msgstr "" -#: erpnext/controllers/status_updater.py:450 -#: erpnext/controllers/status_updater.py:470 +#: erpnext/controllers/status_updater.py:451 +#: erpnext/controllers/status_updater.py:471 msgid "target_ref_field" msgstr "" @@ -55880,7 +56070,7 @@ msgstr "" msgid "to" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3186 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3188 msgid "to unallocate the amount of this Return Invoice before cancelling it." msgstr "" @@ -55907,7 +56097,7 @@ msgstr "" msgid "you must select Capital Work in Progress Account in accounts table" msgstr "" -#: erpnext/controllers/accounts_controller.py:1210 +#: erpnext/controllers/accounts_controller.py:1214 msgid "{0} '{1}' is disabled" msgstr "" @@ -55915,7 +56105,7 @@ msgstr "" msgid "{0} '{1}' not in Fiscal Year {2}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:631 +#: erpnext/manufacturing/doctype/work_order/work_order.py:632 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}" msgstr "" @@ -55923,7 +56113,7 @@ msgstr "" msgid "{0} {1} has submitted Assets. Remove Item {2} from table to continue." msgstr "" -#: erpnext/controllers/accounts_controller.py:2291 +#: erpnext/controllers/accounts_controller.py:2299 msgid "{0} Account not found against Customer {1}." msgstr "" @@ -55931,15 +56121,15 @@ msgstr "" msgid "{0} Account: {1} ({2}) must be in either customer billing currency: {3} or Company default currency: {4}" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:276 +#: erpnext/accounts/doctype/budget/budget.py:515 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It is already exceeded by {5}." msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:279 +#: erpnext/accounts/doctype/budget/budget.py:518 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It will be exceeded by {5}." msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:767 +#: erpnext/accounts/doctype/pricing_rule/utils.py:770 msgid "{0} Coupon used are {1}. Allowed quantity is exhausted" msgstr "" @@ -55947,11 +56137,11 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/accounts/utils.py:1437 +#: erpnext/accounts/utils.py:1444 msgid "{0} Number {1} is already used in {2} {3}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1511 +#: erpnext/manufacturing/doctype/bom/bom.py:1546 msgid "{0} Operating Cost for operation {1}" msgstr "" @@ -55979,7 +56169,7 @@ msgstr "" msgid "{0} account is not of type {1}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:499 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:509 msgid "{0} account not found while submitting purchase receipt" msgstr "" @@ -56034,11 +56224,11 @@ msgstr "" msgid "{0} created" msgstr "" -#: erpnext/setup/doctype/company/company.py:247 +#: erpnext/setup/doctype/company/company.py:278 msgid "{0} currency must be same as company's default currency. Please select another account." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:330 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:332 msgid "{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution." msgstr "" @@ -56076,7 +56266,7 @@ msgstr "" msgid "{0} hours" msgstr "" -#: erpnext/controllers/accounts_controller.py:2644 +#: erpnext/controllers/accounts_controller.py:2652 msgid "{0} in row {1}" msgstr "" @@ -56086,7 +56276,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:100 #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:153 -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:61 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:60 msgid "{0} is added multiple times on rows: {1}" msgstr "" @@ -56094,11 +56284,11 @@ msgstr "" msgid "{0} is already running for {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:166 +#: erpnext/controllers/accounts_controller.py:171 msgid "{0} is blocked so this transaction cannot proceed" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1158 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160 msgid "{0} is mandatory for Item {1}" msgstr "" @@ -56111,11 +56301,11 @@ msgstr "" msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}" msgstr "" -#: erpnext/controllers/accounts_controller.py:3088 +#: erpnext/controllers/accounts_controller.py:3096 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}." msgstr "" -#: erpnext/selling/doctype/customer/customer.py:203 +#: erpnext/selling/doctype/customer/customer.py:204 msgid "{0} is not a company bank account" msgstr "" @@ -56147,7 +56337,7 @@ msgstr "" msgid "{0} is not the default supplier for any items." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3014 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3015 msgid "{0} is on hold till {1}" msgstr "" @@ -56175,15 +56365,15 @@ msgstr "" msgid "{0} items produced" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:219 +#: erpnext/controllers/sales_and_purchase_return.py:218 msgid "{0} must be negative in return document" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2337 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2339 msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:499 +#: erpnext/manufacturing/doctype/bom/bom.py:510 msgid "{0} not found for item {1}" msgstr "" @@ -56195,7 +56385,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1571 +#: erpnext/controllers/stock_controller.py:1657 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -56203,11 +56393,11 @@ msgstr "" msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:1006 +#: erpnext/stock/doctype/pick_list/pick_list.py:1010 msgid "{0} units of Item {1} is not available in any of the warehouses." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:998 +#: erpnext/stock/doctype/pick_list/pick_list.py:1002 msgid "{0} units of Item {1} is picked in another Pick List." msgstr "" @@ -56232,7 +56422,7 @@ msgstr "" msgid "{0} until {1}" msgstr "" -#: erpnext/stock/utils.py:424 +#: erpnext/stock/utils.py:428 msgid "{0} valid serial nos for Item {1}" msgstr "" @@ -56274,7 +56464,7 @@ msgstr "" #: 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 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2757 msgid "{0} {1} does not exist" msgstr "" @@ -56290,8 +56480,8 @@ msgstr "" msgid "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:470 -#: erpnext/selling/doctype/sales_order/sales_order.py:583 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:472 +#: erpnext/selling/doctype/sales_order/sales_order.py:585 #: erpnext/stock/doctype/material_request/material_request.py:246 msgid "{0} {1} has been modified. Please refresh." msgstr "" @@ -56312,8 +56502,8 @@ msgstr "" msgid "{0} {1} is associated with {2}, but Party Account is {3}" msgstr "" -#: erpnext/controllers/selling_controller.py:504 -#: erpnext/controllers/subcontracting_controller.py:1102 +#: erpnext/controllers/selling_controller.py:513 +#: erpnext/controllers/subcontracting_controller.py:1123 msgid "{0} {1} is cancelled or closed" msgstr "" @@ -56366,7 +56556,7 @@ msgstr "" msgid "{0} {1} must be submitted" msgstr "" -#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269 +#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:272 msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting." msgstr "" @@ -56401,7 +56591,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:901 +#: erpnext/controllers/stock_controller.py:902 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -56455,7 +56645,7 @@ msgstr "" msgid "{0}, complete the operation {1} before the operation {2}." msgstr "" -#: erpnext/controllers/accounts_controller.py:472 +#: erpnext/controllers/accounts_controller.py:477 msgid "{0}: {1} does not belong to the Company: {2}" msgstr "" @@ -56463,7 +56653,7 @@ msgstr "" msgid "{0}: {1} does not exists" msgstr "" -#: erpnext/setup/doctype/company/company.py:234 +#: erpnext/setup/doctype/company/company.py:265 msgid "{0}: {1} is a group account." msgstr "" @@ -56483,7 +56673,7 @@ msgstr "" msgid "{field_label} is mandatory for sub-contracted {doctype}." msgstr "" -#: erpnext/controllers/stock_controller.py:1976 +#: erpnext/controllers/stock_controller.py:2062 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" @@ -56549,7 +56739,7 @@ msgstr "" msgid "{} To Bill" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2103 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2105 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}" msgstr "" From 3b7d7aed4c8091033bdea02fcb806c0b4e0b9d18 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sun, 23 Nov 2025 19:16:39 +0530 Subject: [PATCH 024/328] fix: unknown column error --- erpnext/accounts/doctype/pricing_rule/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py index f276235d402..efbd0ce5fae 100644 --- a/erpnext/accounts/doctype/pricing_rule/utils.py +++ b/erpnext/accounts/doctype/pricing_rule/utils.py @@ -244,7 +244,7 @@ def get_other_conditions(conditions, values, args): conditions += " and " + group_condition date = args.get("transaction_date") or frappe.get_value( - args.get("doctype"), args.get("name"), "posting_date" + args.get("doctype"), args.get("name"), "posting_date", ignore=True ) if date: conditions += """ and %(transaction_date)s between ifnull(`tabPricing Rule`.valid_from, '2000-01-01') From 7b1d860c334b0141c8f61d9c31cf147ad3e45888 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sun, 23 Nov 2025 21:33:38 +0530 Subject: [PATCH 025/328] fix: subassembly inside phantom item not being fetched in production plan --- erpnext/manufacturing/doctype/bom/bom.py | 7 +- .../production_plan/production_plan.py | 70 +++++++------------ .../production_plan/test_production_plan.py | 21 ++++-- 3 files changed, 45 insertions(+), 53 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 46c73199fbd..d7b5b687da1 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -1408,7 +1408,7 @@ def validate_bom_no(item, bom_no): @frappe.whitelist() -def get_children(parent=None, return_all=True, fetch_phantom_items=False, is_root=False, **filters): +def get_children(parent=None, is_root=False, **filters): if not parent or parent == "BOM": frappe.msgprint(_("Please select a BOM")) return @@ -1420,13 +1420,10 @@ def get_children(parent=None, return_all=True, fetch_phantom_items=False, is_roo bom_doc = frappe.get_cached_doc("BOM", frappe.form_dict.parent) frappe.has_permission("BOM", doc=bom_doc, throw=True) - filters = [["parent", "=", frappe.form_dict.parent]] - if not return_all: - filters.append(["is_phantom_item", "=", cint(fetch_phantom_items)]) bom_items = frappe.get_all( "BOM Item", fields=["item_code", "bom_no as value", "stock_qty", "qty", "is_phantom_item", "bom_no"], - filters=filters, + filters=[["parent", "=", frappe.form_dict.parent]], order_by="idx", ) diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index 85a5b79efd2..17ecc66e272 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -1661,23 +1661,6 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d ] += d.get("qty") sub_assembly_items = {k[:2]: v for k, v in sub_assembly_items.items()} - data = [] - for row in doc.get("po_items"): - get_sub_assembly_items( - [], - frappe._dict(), - row.get("bom_no"), - data, - row.get("planned_qty"), - doc.get("company"), - warehouse=doc.get("sub_assembly_warehouse"), - skip_available_sub_assembly_item=doc.get("skip_available_sub_assembly_item"), - fetch_phantom_items=True, - ) - - for d in data: - sub_assembly_items[(d.get("production_item"), d.get("bom_no"))] += d.get("stock_qty") - for data in po_items: if not data.get("include_exploded_items") and doc.get("sub_assembly_items"): data["include_exploded_items"] = 1 @@ -1896,9 +1879,8 @@ def get_sub_assembly_items( warehouse=None, indent=0, skip_available_sub_assembly_item=False, - fetch_phantom_items=False, ): - data = get_bom_children(parent=bom_no, return_all=False, fetch_phantom_items=fetch_phantom_items) + data = get_bom_children(parent=bom_no) for d in data: if d.expandable: parent_item_code = frappe.get_cached_value("BOM", bom_no, "item") @@ -1921,31 +1903,32 @@ def get_sub_assembly_items( elif warehouse: bin_details.setdefault(d.item_code, get_bin_details(d, company, for_warehouse=warehouse)) - bom_data.append( - frappe._dict( - { - "actual_qty": bin_details[d.item_code][0].get("actual_qty", 0) - if bin_details.get(d.item_code) - else 0, - "parent_item_code": parent_item_code, - "description": d.description, - "production_item": d.item_code, - "item_name": d.item_name, - "stock_uom": d.stock_uom, - "uom": d.stock_uom, - "bom_no": d.value, - "is_sub_contracted_item": d.is_sub_contracted_item, - "bom_level": indent, - "indent": indent, - "stock_qty": stock_qty, - "required_qty": required_qty, - "projected_qty": bin_details[d.item_code][0].get("projected_qty", 0) - if bin_details.get(d.item_code) - else 0, - "main_bom": bom_no, - } + if not d.is_phantom_item: + bom_data.append( + frappe._dict( + { + "actual_qty": bin_details[d.item_code][0].get("actual_qty", 0) + if bin_details.get(d.item_code) + else 0, + "parent_item_code": parent_item_code, + "description": d.description, + "production_item": d.item_code, + "item_name": d.item_name, + "stock_uom": d.stock_uom, + "uom": d.stock_uom, + "bom_no": d.value, + "is_sub_contracted_item": d.is_sub_contracted_item, + "bom_level": indent, + "indent": indent, + "stock_qty": stock_qty, + "required_qty": required_qty, + "projected_qty": bin_details[d.item_code][0].get("projected_qty", 0) + if bin_details.get(d.item_code) + else 0, + "main_bom": bom_no, + } + ) ) - ) if d.value: get_sub_assembly_items( @@ -1958,7 +1941,6 @@ def get_sub_assembly_items( warehouse, indent=indent + 1, skip_available_sub_assembly_item=skip_available_sub_assembly_item, - fetch_phantom_items=fetch_phantom_items, ) diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py index 22738c5f639..03ff4beb339 100644 --- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py @@ -2422,9 +2422,17 @@ class TestProductionPlan(IntegrationTestCase): self.assertEqual(row.ordered_qty, 10.0) def test_phantom_bom_explosion(self): - from erpnext.manufacturing.doctype.bom.test_bom import create_tree_for_phantom_bom_tests + from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom - create_tree_for_phantom_bom_tests() + bom_tree_1 = { + "Top Level Parent": { + "Sub Assembly Level 1-1": {"Phantom Item Level 1-2": {"Item Level 1-3": {}}}, + "Phantom Item Level 2-1": {"Sub Assembly Level 2-2": {"Item Level 2-3": {}}}, + "Item Level 3-1": {}, + } + } + phantom_list = ["Phantom Item Level 1-2", "Phantom Item Level 2-1"] + create_nested_bom(bom_tree_1, prefix="", phantom_items=phantom_list) plan = create_production_plan( item_code="Top Level Parent", @@ -2442,8 +2450,13 @@ class TestProductionPlan(IntegrationTestCase): for d in mr_items: plan.append("mr_items", d) - self.assertEqual(plan.sub_assembly_items[0].production_item, "Sub Assembly Level 1-1") - self.assertEqual([item.item_code for item in plan.mr_items], ["Item Level 1-3", "Item Level 2-3"]) + self.assertEqual( + [item.production_item for item in plan.sub_assembly_items], + ["Sub Assembly Level 1-1", "Sub Assembly Level 2-2"], + ) + self.assertEqual( + [item.item_code for item in plan.mr_items], ["Item Level 1-3", "Item Level 2-3", "Item Level 3-1"] + ) def create_production_plan(**args): From 49c866db742b982479a45bf405b0d5b0c7fcbb7f Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 24 Nov 2025 11:12:06 +0530 Subject: [PATCH 026/328] chore: change manufacturing course link --- .../manufacturing/workspace/manufacturing/manufacturing.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/manufacturing/workspace/manufacturing/manufacturing.json b/erpnext/manufacturing/workspace/manufacturing/manufacturing.json index 3d16dac7acc..05618b1ebfd 100644 --- a/erpnext/manufacturing/workspace/manufacturing/manufacturing.json +++ b/erpnext/manufacturing/workspace/manufacturing/manufacturing.json @@ -438,7 +438,7 @@ "type": "Link" } ], - "modified": "2025-11-03 17:02:26.882516", + "modified": "2025-11-24 11:11:28.343568", "modified_by": "Administrator", "module": "Manufacturing", "name": "Manufacturing", @@ -456,7 +456,7 @@ "doc_view": "List", "label": "Learn Manufacturing", "type": "URL", - "url": "https://school.frappe.io/lms/courses/manufacturing?utm_source=in_app" + "url": "https://school.frappe.io/lms/courses/production-planning-and-execution" }, { "color": "Grey", From d01c4b68feba8c71dddfe33640e0a464f5344649 Mon Sep 17 00:00:00 2001 From: Kavin <78342682+kavin-114@users.noreply.github.com> Date: Mon, 24 Nov 2025 11:47:14 +0530 Subject: [PATCH 027/328] fix: add validation for FG Items as per BOM qty (#50579) Co-authored-by: Kavin <78342682+kavin0411@users.noreply.github.com> Co-authored-by: Mihir Kandoi --- .../buying_settings/buying_settings.json | 11 +- .../buying_settings/buying_settings.py | 1 + .../controllers/subcontracting_controller.py | 6 +- .../subcontracting_receipt.py | 65 ++++++++++- .../test_subcontracting_receipt.py | 108 +++++++++++++++++- 5 files changed, 181 insertions(+), 10 deletions(-) diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json index 9a73760d269..1ce2dc24d1b 100644 --- a/erpnext/buying/doctype/buying_settings/buying_settings.json +++ b/erpnext/buying/doctype/buying_settings/buying_settings.json @@ -36,6 +36,7 @@ "backflush_raw_materials_of_subcontract_based_on", "column_break_11", "over_transfer_allowance", + "validate_consumed_qty", "section_break_xcug", "auto_create_subcontracting_order", "column_break_izrr", @@ -270,6 +271,14 @@ "label": "Fixed Outgoing Email Account", "link_filters": "[[\"Email Account\",\"enable_outgoing\",\"=\",1]]", "options": "Email Account" + }, + { + "default": "0", + "depends_on": "eval:doc.backflush_raw_materials_of_subcontract_based_on == \"Material Transferred for Subcontract\"", + "description": "Raw materials consumed qty will be validated based on FG BOM required qty", + "fieldname": "validate_consumed_qty", + "fieldtype": "Check", + "label": "Validate Consumed Qty (as per BOM)" } ], "grid_page_length": 50, @@ -278,7 +287,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-08-20 22:13:38.506889", + "modified": "2025-11-20 12:59:09.925862", "modified_by": "Administrator", "module": "Buying", "name": "Buying Settings", diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.py b/erpnext/buying/doctype/buying_settings/buying_settings.py index 8b83418f6f8..3634f8a9069 100644 --- a/erpnext/buying/doctype/buying_settings/buying_settings.py +++ b/erpnext/buying/doctype/buying_settings/buying_settings.py @@ -44,6 +44,7 @@ class BuyingSettings(Document): supp_master_name: DF.Literal["Supplier Name", "Naming Series", "Auto Name"] supplier_group: DF.Link | None use_transaction_date_exchange_rate: DF.Check + validate_consumed_qty: DF.Check # end: auto-generated types def validate(self): diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py index ff7342607c3..8eb494947c0 100644 --- a/erpnext/controllers/subcontracting_controller.py +++ b/erpnext/controllers/subcontracting_controller.py @@ -549,7 +549,7 @@ class SubcontractingController(StockController): if item.get("serial_and_batch_bundle"): frappe.delete_doc("Serial and Batch Bundle", item.serial_and_batch_bundle, force=True) - def __get_materials_from_bom(self, item_code, bom_no, exploded_item=0): + def _get_materials_from_bom(self, item_code, bom_no, exploded_item=0): data = [] doctype = "BOM Item" if not exploded_item else "BOM Explosion Item" @@ -590,7 +590,7 @@ class SubcontractingController(StockController): to_remove = [] for item in data: if item.is_phantom_item: - data += self.__get_materials_from_bom( + data += self._get_materials_from_bom( item.rm_item_code, item.bom_no, exploded_item=exploded_item ) to_remove.append(item) @@ -921,7 +921,7 @@ class SubcontractingController(StockController): if self.doctype == self.subcontract_data.order_doctype or ( self.backflush_based_on == "BOM" or self.is_return ): - for bom_item in self.__get_materials_from_bom( + for bom_item in self._get_materials_from_bom( row.item_code, row.bom, row.get("include_exploded_items") ): qty = flt(bom_item.qty_consumed_per_unit) * flt(row.qty) * row.conversion_factor diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py index a622b1fb9c4..7cb7531a7af 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py @@ -1,6 +1,8 @@ # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors # For license information, please see license.txt +from collections import defaultdict + import frappe from frappe import _ from frappe.model.mapper import get_mapped_doc @@ -18,6 +20,10 @@ from erpnext.stock.get_item_details import get_default_cost_center, get_default_ from erpnext.stock.stock_ledger import get_valuation_rate +class BOMQuantityError(frappe.ValidationError): + pass + + class SubcontractingReceipt(SubcontractingController): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. @@ -157,6 +163,7 @@ class SubcontractingReceipt(SubcontractingController): def on_submit(self): self.validate_closed_subcontracting_order() self.validate_available_qty_for_consumption() + self.validate_bom_required_qty() self.update_status_updater_args() self.update_prevdoc_status() self.set_subcontracting_order_status(update_bin=False) @@ -540,12 +547,60 @@ class SubcontractingReceipt(SubcontractingController): item.available_qty_for_consumption and flt(item.available_qty_for_consumption, precision) - flt(item.consumed_qty, precision) < 0 ): - msg = f"""Row {item.idx}: Consumed Qty {flt(item.consumed_qty, precision)} - must be less than or equal to Available Qty For Consumption - {flt(item.available_qty_for_consumption, precision)} - in Consumed Items Table.""" + msg = _( + """Row {0}: Consumed Qty {1} {2} must be less than or equal to Available Qty For Consumption + {3} {4} in Consumed Items Table.""" + ).format( + item.idx, + flt(item.consumed_qty, precision), + item.stock_uom, + flt(item.available_qty_for_consumption, precision), + item.stock_uom, + ) - frappe.throw(_(msg)) + frappe.throw(msg) + + def validate_bom_required_qty(self): + if ( + frappe.db.get_single_value("Buying Settings", "backflush_raw_materials_of_subcontract_based_on") + == "Material Transferred for Subcontract" + ) and not (frappe.db.get_single_value("Buying Settings", "validate_consumed_qty")): + return + + rm_consumed_dict = self.get_rm_wise_consumed_qty() + + for row in self.items: + precision = row.precision("qty") + for bom_item in self._get_materials_from_bom( + row.item_code, row.bom, row.get("include_exploded_items") + ): + required_qty = flt( + bom_item.qty_consumed_per_unit * row.qty * row.conversion_factor, precision + ) + consumed_qty = rm_consumed_dict.get(bom_item.rm_item_code, 0) + diff = flt(consumed_qty, precision) - flt(required_qty, precision) + + if diff < 0: + msg = _( + """Additional {0} {1} of item {2} required as per BOM to complete this transaction""" + ).format( + frappe.bold(abs(diff)), + frappe.bold(bom_item.stock_uom), + frappe.bold(bom_item.rm_item_code), + ) + + frappe.throw( + msg, + exc=BOMQuantityError, + ) + + def get_rm_wise_consumed_qty(self): + rm_dict = defaultdict(float) + + for row in self.supplied_items: + rm_dict[row.rm_item_code] += row.consumed_qty + + return rm_dict def update_status_updater_args(self): if cint(self.is_return): diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py index ac9d956fa08..75dc06e16fc 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py @@ -38,6 +38,9 @@ from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import from erpnext.subcontracting.doctype.subcontracting_order.subcontracting_order import ( make_subcontracting_receipt, ) +from erpnext.subcontracting.doctype.subcontracting_receipt.subcontracting_receipt import ( + BOMQuantityError, +) class TestSubcontractingReceipt(IntegrationTestCase): @@ -174,7 +177,7 @@ class TestSubcontractingReceipt(IntegrationTestCase): def test_subcontracting_over_receipt(self): """ Behaviour: Raise multiple SCRs against one SCO that in total - receive more than the required qty in the SCO. + receive more than the required qty in the SCO. Expected Result: Error Raised for Over Receipt against SCO. """ from erpnext.controllers.subcontracting_controller import ( @@ -1784,6 +1787,109 @@ class TestSubcontractingReceipt(IntegrationTestCase): self.assertEqual(scr.items[0].rm_cost_per_qty, 300) self.assertEqual(scr.items[0].service_cost_per_qty, 100) + def test_bom_required_qty_validation_based_on_bom(self): + set_backflush_based_on("BOM") + frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1) + + fg_item = make_item(properties={"is_stock_item": 1, "is_sub_contracted_item": 1}).name + rm_item1 = make_item( + properties={ + "is_stock_item": 1, + "has_batch_no": 1, + "create_new_batch": 1, + "batch_number_series": "BRQV-.####", + } + ).name + + make_bom(item=fg_item, raw_materials=[rm_item1], rm_qty=2) + se = make_stock_entry( + item_code=rm_item1, + qty=1, + target="_Test Warehouse 1 - _TC", + rate=300, + ) + + batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle) + + service_items = [ + { + "warehouse": "_Test Warehouse - _TC", + "item_code": "Subcontracted Service Item 1", + "qty": 1, + "rate": 100, + "fg_item": fg_item, + "fg_item_qty": 1, + }, + ] + + sco = get_subcontracting_order(service_items=service_items) + scr = make_subcontracting_receipt(sco.name) + scr.save() + scr.reload() + + self.assertEqual(scr.supplied_items[0].batch_no, batch_no) + self.assertEqual(scr.supplied_items[0].consumed_qty, 1) + self.assertEqual(scr.supplied_items[0].required_qty, 2) + + self.assertRaises(BOMQuantityError, scr.submit) + + frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0) + + def test_bom_required_qty_validation_based_on_transfer(self): + from erpnext.controllers.subcontracting_controller import ( + make_rm_stock_entry as make_subcontract_transfer_entry, + ) + + set_backflush_based_on("Material Transferred for Subcontract") + frappe.db.set_single_value("Buying Settings", "validate_consumed_qty", 1) + + item_code = "_Test Subcontracted Validation FG Item 1" + rm_item1 = make_item( + properties={ + "is_stock_item": 1, + } + ).name + + make_subcontracted_item(item_code=item_code, raw_materials=[rm_item1]) + service_items = [ + { + "warehouse": "_Test Warehouse - _TC", + "item_code": "Subcontracted Service Item 1", + "qty": 10, + "rate": 100, + "fg_item": item_code, + "fg_item_qty": 10, + }, + ] + sco = get_subcontracting_order( + service_items=service_items, + include_exploded_items=0, + ) + + # inward raw material stock + make_stock_entry(target="_Test Warehouse - _TC", item_code=rm_item1, qty=10, basic_rate=100) + + rm_items = [ + { + "item_code": item_code, + "rm_item_code": sco.supplied_items[0].rm_item_code, + "qty": sco.supplied_items[0].required_qty - 5, + "warehouse": "_Test Warehouse - _TC", + "stock_uom": "Nos", + }, + ] + + # transfer partial raw materials + ste = frappe.get_doc(make_subcontract_transfer_entry(sco.name, rm_items)) + ste.to_warehouse = "_Test Warehouse 1 - _TC" + ste.save() + ste.submit() + + scr = make_subcontracting_receipt(sco.name) + scr.save() + + self.assertRaises(BOMQuantityError, scr.submit) + def make_return_subcontracting_receipt(**args): args = frappe._dict(args) From 56def01240a050f654419309e1b015327676075f Mon Sep 17 00:00:00 2001 From: "El-Shafei H." Date: Mon, 24 Nov 2025 09:51:42 +0300 Subject: [PATCH 028/328] fix: add missing translate function --- erpnext/assets/doctype/asset/asset.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index c50881fcd7a..6eda855bbfb 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -198,7 +198,7 @@ frappe.ui.form.on("Asset", { callback: function (r) { if (!r.message) { $(".primary-action").prop("hidden", true); - $(".form-message").text("Capitalize this asset to confirm"); + $(".form-message").text(__("Capitalize this asset to confirm")); frm.add_custom_button(__("Capitalize Asset"), function () { frm.trigger("create_asset_capitalization"); From 40b787827a37d4d4aa8988bd8d5923ca7ffb0abd Mon Sep 17 00:00:00 2001 From: ljain112 Date: Mon, 24 Nov 2025 18:04:56 +0530 Subject: [PATCH 029/328] fix: use alias for get_exchange_rate function in JournalEntry --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index c31705ee957..f114095d0ab 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -1832,7 +1832,7 @@ def get_exchange_rate( # The date used to retreive the exchange rate here is the date passed # in as an argument to this function. elif (not flt(exchange_rate) or flt(exchange_rate) == 1) and account_currency and posting_date: - exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date) + exchange_rate = _get_exchange_rate(account_currency, company_currency, posting_date) else: exchange_rate = 1 From fa8007f9497650a4d5ea35504e95218fadbe2425 Mon Sep 17 00:00:00 2001 From: MochaMind Date: Mon, 24 Nov 2025 10:27:59 -0800 Subject: [PATCH 030/328] fix: sync translations from crowdin (#50699) --- erpnext/locale/bs.po | 6 +- erpnext/locale/fa.po | 156 +++--- erpnext/locale/hr.po | 6 +- erpnext/locale/sl.po | 1076 +++++++++++++++++++++------------------ erpnext/locale/sr.po | 182 +++---- erpnext/locale/sr_CS.po | 182 +++---- 6 files changed, 842 insertions(+), 766 deletions(-) diff --git a/erpnext/locale/bs.po b/erpnext/locale/bs.po index ab0ffb11175..0b14eb7bac5 100644 --- a/erpnext/locale/bs.po +++ b/erpnext/locale/bs.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2025-11-16 09:35+0000\n" -"PO-Revision-Date: 2025-11-19 22:23\n" +"PO-Revision-Date: 2025-11-23 23:34\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Bosnian\n" "MIME-Version: 1.0\n" @@ -2091,7 +2091,7 @@ msgstr "Račun Potraživanja/Obveza" #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/setup/workspace/settings/settings.json msgid "Accounts Settings" -msgstr "Postavke Kjnigovodstva" +msgstr "Postavke Knjigovodstva" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1382 msgid "Accounts table cannot be blank." @@ -2510,7 +2510,7 @@ msgstr "Stvarni tip PDV-a ne može se uključiti u cijenu Artikla u redu {0}" #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1005 msgid "Ad-hoc Qty" -msgstr "Ad-hoc Količina" +msgstr "Namjenska Količina" #: erpnext/stock/doctype/item/item.js:557 #: erpnext/stock/doctype/price_list/price_list.js:8 diff --git a/erpnext/locale/fa.po b/erpnext/locale/fa.po index 0e2e031fd4d..98622c3232d 100644 --- a/erpnext/locale/fa.po +++ b/erpnext/locale/fa.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2025-11-16 09:35+0000\n" -"PO-Revision-Date: 2025-11-20 22:24\n" +"PO-Revision-Date: 2025-11-23 23:33\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -1127,7 +1127,7 @@ msgstr "مقدار پذیرفته شده" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Accepted Qty in Stock UOM" -msgstr "مقدار پذیرفته شده در انبار UOM" +msgstr "مقدار پذیرفته شده بر حسب واحد اندازه‌گیری موجودی" #. Label of the qty (Float) field in DocType 'Purchase Receipt Item' #. Label of the qty (Float) field in DocType 'Subcontracting Receipt Item' @@ -1509,7 +1509,7 @@ msgstr "حساب: {0} یک کار سرمایه ای در حال انجا #: erpnext/accounts/doctype/journal_entry/journal_entry.py:351 msgid "Account: {0} can only be updated via Stock Transactions" -msgstr "حساب: {0} فقط از طریق معاملات موجودی قابل به‌روزرسانی است" +msgstr "حساب: {0} فقط از طریق تراکنش‌های موجودی قابل به‌روزرسانی است" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2786 msgid "Account: {0} is not permitted under Payment Entry" @@ -3762,7 +3762,7 @@ msgstr "مبلغ تخصیص یافته" #. Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Allocated Entries" -msgstr "ورودی های اختصاص داده شده" +msgstr "ثبت‌های اختصاص داده شده" #: erpnext/public/js/templates/crm_activities.html:49 msgid "Allocated To:" @@ -4188,7 +4188,7 @@ msgstr "نقش‌های اصلی مجاز عبارتند از «مشتری» و #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Allows to keep aside a specific quantity of inventory for a particular order." -msgstr "اجازه می دهد تا مقدار مشخصی از موجودی را برای یک سفارش خاص کنار بگذارید." +msgstr "اجازه می‌دهد تا مقدار مشخصی از موجودی را برای یک سفارش خاص کنار بگذارید." #. Description of the 'Allow Purchase Order with Zero Quantity' (Check) field #. in DocType 'Buying Settings' @@ -4266,7 +4266,7 @@ msgstr "آیتم جایگزین نباید با کد آیتم مشابه باش #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:378 msgid "Alternatively, you can download the template and fill your data in." -msgstr "همچنین می‌توانید الگو را دانلود کرده و داده های خود را پر کنید." +msgstr "همچنین می‌توانید الگو را دانلود کرده و داده‌های خود را پر کنید." #. Option for the 'Action on New Invoice' (Select) field in DocType 'POS #. Profile' @@ -4832,7 +4832,7 @@ msgstr "در هر خواندن اعمال می‌شود." #: erpnext/stock/doctype/putaway_rule/putaway_rule.py:188 msgid "Applied putaway rules." -msgstr "اعمال قوانین حذف" +msgstr "قوانین جانمایی اعمال شده." #. Label of the applies_to (Table) field in DocType 'Common Code' #: erpnext/edi/doctype/common_code/common_code.json @@ -4910,7 +4910,7 @@ msgstr "اعمال روی" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Apply Putaway Rule" -msgstr "اعمال قانون Putaway" +msgstr "اعمال قانون جانمایی" #. Label of the apply_recursion_over (Float) field in DocType 'Pricing Rule' #. Label of the apply_recursion_over (Float) field in DocType 'Promotional @@ -5075,7 +5075,7 @@ msgstr "آر (100 متر مربع)" #: erpnext/public/js/utils/demo.js:20 msgid "Are you sure you want to clear all demo data?" -msgstr "آیا مطمئن هستید که می‌خواهید تمام داده های نمایشی را پاک کنید؟" +msgstr "آیا مطمئن هستید که می‌خواهید تمام داده‌های نمایشی را پاک کنید؟" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:451 msgid "Are you sure you want to delete this Item?" @@ -5126,7 +5126,7 @@ msgstr "همانطور که در تاریخ" #. Entry' #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "As per Stock UOM" -msgstr "مطابق با موجودی UOM" +msgstr "مطابق واحد اندازه‌گیری موجودی" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.py:189 msgid "As the field {0} is enabled, the field {1} is mandatory." @@ -5864,7 +5864,7 @@ msgstr "ویژگی {0} چندین بار در جدول ویژگی‌ها انت #: erpnext/stock/doctype/item/item.py:852 msgid "Attributes" -msgstr "ویژگی های" +msgstr "ویژگی‌های" #. Name of a role #: erpnext/accounts/doctype/account/account.json @@ -7212,7 +7212,7 @@ msgstr "مجموع مبلغ هزینه‌یابی مبنا" #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:46 msgid "Based On Data ( in years )" -msgstr "بر اساس داده ها (در سال)" +msgstr "بر اساس داده‌ها (در سال)" #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:30 msgid "Based On Document" @@ -8781,7 +8781,7 @@ msgstr "نمی‌توان تراکنش را برای دستور کار تکمی #: erpnext/stock/doctype/item/item.py:872 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" -msgstr "پس از تراکنش موجودی نمی‌توان ویژگی ها را تغییر داد. یک آیتم جدید بسازید و موجودی را به آیتم جدید منتقل کنید" +msgstr "پس از تراکنش موجودی نمی‌توان ویژگی‌ها را تغییر داد. یک آیتم جدید بسازید و موجودی را به آیتم جدید منتقل کنید" #: erpnext/accounts/doctype/fiscal_year/fiscal_year.py:49 msgid "Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved." @@ -8797,7 +8797,7 @@ msgstr "نمی‌توان تاریخ توقف سرویس را برای مورد #: erpnext/stock/doctype/item/item.py:863 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." -msgstr "پس از تراکنش موجودی نمی‌توان ویژگی های گونه را تغییر داد. برای این کار باید یک آیتم جدید بسازید." +msgstr "پس از تراکنش موجودی نمی‌توان ویژگی‌های گونه را تغییر داد. برای این کار باید یک آیتم جدید بسازید." #: erpnext/setup/doctype/company/company.py:286 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency." @@ -8859,7 +8859,7 @@ msgstr "" #: erpnext/stock/doctype/serial_no/serial_no.py:120 msgid "Cannot delete Serial No {0}, as it is used in stock transactions" -msgstr "نمی‌توان شماره سریال {0} را حذف کرد، زیرا در معاملات موجودی استفاده می‌شود" +msgstr "نمی‌توان شماره سریال {0} را حذف کرد، زیرا در تراکنش‌های موجودی استفاده می‌شود" #: erpnext/setup/doctype/company/company.py:516 msgid "Cannot disable perpetual inventory, as there are existing Stock Ledger Entries for the company {0}. Please cancel the stock transactions first and try again." @@ -8988,7 +8988,7 @@ msgstr "ظرفیت (بر حسب روز)" #: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:69 msgid "Capacity (Stock UOM)" -msgstr "ظرفیت (Stock UOM)" +msgstr "ظرفیت (واحد اندازه‌گیری موجودی)" #. Label of the capacity_planning (Section Break) field in DocType #. 'Manufacturing Settings' @@ -9009,7 +9009,7 @@ msgstr "برنامه‌ریزی ظرفیت برای (بر حسب روز)" #. Label of the stock_capacity (Float) field in DocType 'Putaway Rule' #: erpnext/stock/doctype/putaway_rule/putaway_rule.json msgid "Capacity in Stock UOM" -msgstr "ظرفیت موجود در انبار UOM" +msgstr "ظرفیت بر حسب واحد اندازه‌گیری موجودی" #: erpnext/stock/doctype/putaway_rule/putaway_rule.py:85 msgid "Capacity must be greater than 0" @@ -9636,7 +9636,7 @@ msgstr "بندها و شرایط" #: erpnext/public/js/utils/demo.js:11 msgid "Clear Demo Data" -msgstr "پاک کردن داده های نمایشی" +msgstr "پاک کردن داده‌های نمایشی" #. Label of the clear_notifications (Check) field in DocType 'Transaction #. Deletion Record' @@ -9680,7 +9680,7 @@ msgstr "تاریخ ترخیص به روز شد" #: erpnext/public/js/utils/demo.js:24 msgid "Clearing Demo Data..." -msgstr "در حال پاک کردن داده های نمایشی..." +msgstr "در حال پاک کردن داده‌های نمایشی..." #: erpnext/manufacturing/doctype/production_plan/production_plan.js:719 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." @@ -11819,7 +11819,7 @@ msgstr "" #: erpnext/setup/demo.py:55 msgid "Could Not Delete Demo Data" -msgstr "داده های نسخه ی نمایشی حذف نشد" +msgstr "داده‌های نسخه ی نمایشی حذف نشد" #: erpnext/selling/doctype/quotation/quotation.py:606 msgid "Could not auto create Customer due to the following missing mandatory field(s):" @@ -13605,7 +13605,7 @@ msgstr "" #: erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:15 msgid "Data Based On" -msgstr "داده ها بر اساس" +msgstr "داده‌ها بر اساس" #. Label of the receivable_payable_fetch_method (Select) field in DocType #. 'Accounts Settings' @@ -13622,7 +13622,7 @@ msgstr "پیکربندی درون‌بُرد داده" #. Label of a Card Break in the Home Workspace #: erpnext/setup/workspace/home/home.json msgid "Data Import and Settings" -msgstr "درون‌بُرد داده ها و تنظیمات" +msgstr "درون‌بُرد داده‌ها و تنظیمات" #. Label of the data_source (Select) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json @@ -14738,7 +14738,7 @@ msgstr "مقدار تحویل داده شده" #. Label of the delivered_qty (Float) field in DocType 'Pick List Item' #: erpnext/stock/doctype/pick_list_item/pick_list_item.json msgid "Delivered Qty (in Stock UOM)" -msgstr "مقدار تحویل داده شده (به UOM موجودی)" +msgstr "مقدار تحویل داده شده (بر حسب واحد اندازه‌گیری موجودی)" #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:101 msgid "Delivered Quantity" @@ -17027,7 +17027,7 @@ msgstr "فعال‌سازی این گزینه تضمین می‌کند که هر #. field in DocType 'Company' #: erpnext/setup/doctype/company/company.json msgid "Enabling this option will allow you to record -

    1. Advances Received in a Liability Account instead of the Asset Account

    2. Advances Paid in an Asset Account instead of the Liability Account" -msgstr "فعال کردن این گزینه به شما امکان می دهد ثبت کنید -

    1. پیش‌پرداخت‌های دریافت شده در حساب بدهی به جای حساب دارایی

    2. پیش‌پرداخت‌های پرداخت شده در حساب دارایی به جای حساب بدهی" +msgstr "فعال کردن این گزینه به شما امکان می‌دهد ثبت کنید -

    1. پیش‌پرداخت‌های دریافت شده در حساب بدهی به جای حساب دارایی

    2. پیش‌پرداخت‌های پرداخت شده در حساب دارایی به جای حساب بدهی" #. Description of the 'Allow multi-currency invoices against single party #. account ' (Check) field in DocType 'Accounts Settings' @@ -19678,7 +19678,7 @@ msgstr "ایجاد تقاضا" #: erpnext/public/js/setup_wizard.js:54 msgid "Generate Demo Data for Exploration" -msgstr "داده های نسخه ی نمایشی را برای کاوش ایجاد کنید" +msgstr "داده‌های نسخه ی نمایشی را برای کاوش ایجاد کنید" #: erpnext/accounts/doctype/sales_invoice/regional/italy.js:4 msgid "Generate E-Invoice" @@ -20990,7 +20990,7 @@ msgstr "اگر علامت زده شود، مبلغ مالیات به عنوان #: erpnext/public/js/setup_wizard.js:56 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later." -msgstr "در صورت علامت زدن، داده‌های نمایشی را برای شما ایجاد می‌کنیم تا سیستم را کاوش کنید. این داده های نمایشی را می‌توان بعداً پاک کرد." +msgstr "در صورت علامت زدن، داده‌های نمایشی را برای شما ایجاد می‌کنیم تا سیستم را کاوش کنید. این داده‌های نمایشی را می‌توان بعداً پاک کرد." #. Description of the 'Service Address' (Small Text) field in DocType 'Warranty #. Claim' @@ -21095,7 +21095,7 @@ msgstr "اگر فعال شود، نرخ آیتم در انتقالات داخل #. DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "If enabled, the source and target warehouse in the Material Transfer Stock Entry must be different else an error will be thrown. If inventory dimensions are present, same source and target warehouse can be allowed but atleast any one of the inventory dimension fields must be different." -msgstr "" +msgstr "در صورت فعال بودن، انبار مبدا و مقصد در ثبت موجودی انتقال مواد باید متفاوت باشند، در غیر این صورت خطا رخ خواهد داد. اگر ابعاد موجودی وجود داشته باشد، می‌توان انبار مبدا و هدف یکسانی را مجاز دانست، اما حداقل هر یک از فیلدهای ابعاد موجودی باید متفاوت باشند." #. Description of the 'Allow UOM with Conversion Rate Defined in Item' (Check) #. field in DocType 'Stock Settings' @@ -21160,7 +21160,7 @@ msgstr "اگر آیتم‌ها موجود هستند، مراحل انتقال #. (Link) field in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "If mentioned, the system will allow only the users with this Role to create or modify any stock transaction earlier than the latest stock transaction for a specific item and warehouse. If set as blank, it allows all users to create/edit back-dated transactions." -msgstr "در صورت ذکر شده، این سیستم فقط به کاربران دارای این نقش اجازه می‌دهد تا هر تراکنش موجودی را زودتر از آخرین تراکنش موجودی برای یک کالا و انبار خاص ایجاد یا اصلاح کنند. اگر به صورت خالی تنظیم شود، به همه کاربران اجازه می دهد تا تراکنش‌های قدیمی را ایجاد/ویرایش کنند." +msgstr "در صورت ذکر شده، این سیستم فقط به کاربران دارای این نقش اجازه می‌دهد تا هر تراکنش موجودی را زودتر از آخرین تراکنش موجودی برای یک کالا و انبار خاص ایجاد یا اصلاح کنند. اگر به صورت خالی تنظیم شود، به همه کاربران اجازه می‌دهد تا تراکنش‌های قدیمی را ایجاد/ویرایش کنند." #. Description of the 'To Package No.' (Int) field in DocType 'Packing Slip' #: erpnext/stock/doctype/packing_slip/packing_slip.json @@ -21566,7 +21566,7 @@ msgstr "موجود" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:22 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:28 msgid "In Stock Qty" -msgstr "موجودی تعداد" +msgstr "مقدار موجود" #. Option for the 'Status' (Select) field in DocType 'Delivery Trip' #. Option for the 'Transfer Status' (Select) field in DocType 'Material @@ -21878,7 +21878,7 @@ msgstr "شامل جدول زمانی در وضعیت پیش‌نویس" #: erpnext/stock/report/stock_ledger/stock_ledger.js:108 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:51 msgid "Include UOM" -msgstr "شامل UOM شود" +msgstr "شامل واحد اندازه‌گیری" #: erpnext/stock/report/stock_balance/stock_balance.js:131 msgid "Include Zero Stock Items" @@ -21904,7 +21904,7 @@ msgstr "شامل سود ناخالص" #. Entry' #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Including items for sub assemblies" -msgstr "شامل آیتم‌ها برای زیر مونتاژ ها" +msgstr "شامل آیتم‌های زیر مونتاژ ها" #. Option for the 'Root Type' (Select) field in DocType 'Account' #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge' @@ -22117,7 +22117,7 @@ msgstr "" #. Description of the 'Delivery Note' (Link) field in DocType 'Packing Slip' #: erpnext/stock/doctype/packing_slip/packing_slip.json msgid "Indicates that the package is a part of this delivery (Only Draft)" -msgstr "نشان می دهد که بسته بخشی از این تحویل است (فقط پیش‌نویس)" +msgstr "نشان می‌دهد که بسته بخشی از این تحویل است (فقط پیش‌نویس)" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json @@ -23014,7 +23014,7 @@ msgstr "صدور فاکتور" #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "Invoicing Features" -msgstr "ویژگی های صورتحساب" +msgstr "ویژگی‌های صورتحساب" #. Option for the 'Payment Request Type' (Select) field in DocType 'Payment #. Request' @@ -24741,7 +24741,7 @@ msgstr "تنظیمات گونه آیتم" #: erpnext/stock/doctype/item/item.js:876 msgid "Item Variant {0} already exists with same attributes" -msgstr "گونه آیتم {0} در حال حاضر با همان ویژگی ها وجود دارد" +msgstr "گونه آیتم {0} در حال حاضر با همان ویژگی‌ها وجود دارد" #: erpnext/stock/doctype/item/item.py:768 msgid "Item Variants updated" @@ -24866,7 +24866,7 @@ msgstr "ارسال مجدد ارزیابی آیتم در حال انجام اس #: erpnext/stock/doctype/item/item.py:942 msgid "Item variant {0} exists with same attributes" -msgstr "گونه آیتم {0} با همان ویژگی ها وجود دارد" +msgstr "گونه آیتم {0} با همان ویژگی‌ها وجود دارد" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:83 msgid "Item {0} cannot be added as a sub-assembly of itself" @@ -27887,7 +27887,7 @@ msgstr "ادغام شد" #: erpnext/accounts/doctype/account/account.py:599 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency" -msgstr "ادغام تنها در صورتی امکان پذیر است که ویژگی های زیر در هر دو رکورد یکسان باشند. گروه، نوع ریشه، شرکت و ارز حساب است" +msgstr "ادغام تنها در صورتی امکان پذیر است که ویژگی‌های زیر در هر دو رکورد یکسان باشند. گروه، نوع ریشه، شرکت و ارز حساب است" #: erpnext/accounts/doctype/ledger_merge/ledger_merge.js:16 msgid "Merging {0} of {1}" @@ -28170,7 +28170,7 @@ msgstr "حداقل مقدار" #. Description of the 'Minimum Order Qty' (Float) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Minimum quantity should be as per Stock UOM" -msgstr "حداقل مقدار باید مطابق با موجودی UOM باشد" +msgstr "حداقل مقدار باید مطابق واحد اندازه‌گیری موجودی باشد" #. Label of the minute (Text Editor) field in DocType 'Quality Meeting Minutes' #. Name of a UOM @@ -29671,7 +29671,7 @@ msgstr "ایجاد بعد حسابداری برای {0} مجاز نیست" #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:265 msgid "Not allowed to update stock transactions older than {0}" -msgstr "به‌روزرسانی معاملات موجودی قدیمی‌تر از {0} مجاز نیست" +msgstr "به‌روزرسانی تراکنش‌های موجودی قدیمی‌تر از {0} مجاز نیست" #: erpnext/setup/doctype/authorization_control/authorization_control.py:59 msgid "Not authorized since {0} exceeds limits" @@ -29828,7 +29828,7 @@ msgstr "از طریق ایمیل اطلاع دهید" #. Label of the reorder_email_notify (Check) field in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Notify by Email on Creation of Automatic Material Request" -msgstr "از طریق ایمیل در مورد ایجاد درخواست خودکار مواد مطلع شوید" +msgstr "اطلاع رسانی از طریق ایمیل در مورد ایجاد درخواست خودکار مواد" #. Description of the 'Notify Via Email' (Check) field in DocType 'Appointment #. Booking Settings' @@ -30116,7 +30116,7 @@ msgstr "فقط «ثبت‌های پرداخت» انجام‌شده در برا #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:105 msgid "Only CSV and Excel files can be used to for importing data. Please check the file format you are trying to upload" -msgstr "برای درون‌بُرد داده ها فقط می‌توان از فایل های CSV و Excel استفاده کرد. لطفاً فرمت فایلی را که می‌خواهید آپلود کنید بررسی کنید" +msgstr "برای درون‌بُرد داده‌ها فقط می‌توان از فایل های CSV و Excel استفاده کرد. لطفاً فرمت فایلی را که می‌خواهید آپلود کنید بررسی کنید" #. Label of the tax_on_excess_amount (Check) field in DocType 'Tax Withholding #. Category' @@ -33605,7 +33605,7 @@ msgstr "مقدار انتخاب شده" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json msgid "Picked Qty (in Stock UOM)" -msgstr "مقدار انتخاب شده (در انبار UOM)" +msgstr "مقدار انتخاب شده (بر حسب واحد اندازه‌گیری موجودی)" #. Option for the 'Pickup Type' (Select) field in DocType 'Shipment' #: erpnext/stock/doctype/shipment/shipment.json @@ -34290,7 +34290,7 @@ msgstr "لطفاً مطمئن شوید که فایلی که استفاده می #: erpnext/setup/doctype/company/company.js:209 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone." -msgstr "لطفاً مطمئن شوید که واقعاً می‌خواهید همه تراکنش‌های این شرکت را حذف کنید. داده های اصلی شما همانطور که هست باقی می ماند. این عمل قابل لغو نیست." +msgstr "لطفاً مطمئن شوید که واقعاً می‌خواهید همه تراکنش‌های این شرکت را حذف کنید. داده‌های اصلی شما همانطور که هست باقی می ماند. این عمل قابل لغو نیست." #: erpnext/stock/doctype/item/item.js:578 msgid "Please mention 'Weight UOM' along with Weight." @@ -35661,7 +35661,7 @@ msgstr "طبقه های تخفیف قیمت یا محصول مورد نیاز ا #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:237 msgid "Price per Unit (Stock UOM)" -msgstr "قیمت هر واحد (Stock UOM)" +msgstr "قیمت هر واحد (واحد اندازه‌گیری موجودی)" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 @@ -36579,7 +36579,7 @@ msgstr "ردیابی موجودی از نظر پروژه " #: erpnext/controllers/trends.py:421 msgid "Project-wise data is not available for Quotation" -msgstr "داده های پروژه محور برای پیش‌فاکتور در دسترس نیست" +msgstr "داده‌های پروژه محور برای پیش‌فاکتور در دسترس نیست" #. Label of the projected_qty (Float) field in DocType 'Material Request Plan #. Item' @@ -37411,11 +37411,11 @@ msgstr "اهداف مورد نیاز" #: erpnext/stock/doctype/putaway_rule/putaway_rule.json #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Putaway Rule" -msgstr "قانون Putaway" +msgstr "قانون جانمایی" #: erpnext/stock/doctype/putaway_rule/putaway_rule.py:52 msgid "Putaway Rule already exists for Item {0} in Warehouse {1}." -msgstr "قانون Putaway از قبل برای مورد {0} در انبار {1} وجود دارد." +msgstr "قانون جانمایی از قبل برای آیتم {0} در انبار {1} وجود دارد." #. Label of the free_qty (Float) field in DocType 'Pricing Rule' #. Label of the free_qty (Float) field in DocType 'Promotional Scheme Product @@ -37537,7 +37537,7 @@ msgstr "مقدار (انبار)" #. Label of the stock_qty (Float) field in DocType 'Pick List Item' #: erpnext/stock/doctype/pick_list_item/pick_list_item.json msgid "Qty (in Stock UOM)" -msgstr "" +msgstr "مقدار (بر حسب واحد موجودی)" #. Label of the qty_after_transaction (Float) field in DocType 'Stock Ledger #. Entry' @@ -37622,7 +37622,7 @@ msgstr "تعداد به ازای موجودی UOM" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Qty as per Stock UOM" -msgstr "تعداد طبق موجودی UOM" +msgstr "مقدار مطابق واحد اندازه‌گیری موجودی" #. Description of the 'Apply Recursion Over (As Per Transaction UOM)' (Float) #. field in DocType 'Pricing Rule' @@ -37643,7 +37643,7 @@ msgstr "تعداد برای {0}" #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:231 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json msgid "Qty in Stock UOM" -msgstr "تعداد موجود در انبار UOM" +msgstr "مقدار بر حسب واحد اندازه‌گیری موجودی" #. Label of the for_qty (Float) field in DocType 'Pick List' #: erpnext/stock/doctype/pick_list/pick_list.js:196 @@ -39151,7 +39151,7 @@ msgstr "مبلغ مقدار دریافتی" #. Item' #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Received Qty in Stock UOM" -msgstr "مقدار دریافت شده به UOM موجودی" +msgstr "مقدار دریافت شده بر حسب واحد اندازه‌گیری موجودی" #. Label of the received_qty (Float) field in DocType 'Purchase Receipt Item' #. Label of the received_qty (Float) field in DocType 'Subcontracting Receipt @@ -39849,7 +39849,7 @@ msgstr "سطح سفارش مجدد" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:218 msgid "Reorder Qty" -msgstr "تعداد را دوباره سفارش دهید" +msgstr "مقدار سفارش مجدد" #. Label of the reorder_levels (Table) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json @@ -40186,7 +40186,7 @@ msgstr "درخواست شده است" #: erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.json #: erpnext/stock/workspace/stock/stock.json msgid "Requested Items To Be Transferred" -msgstr "موارد درخواستی برای انتقال" +msgstr "آیتم‌های درخواستی برای انتقال" #. Name of a report #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.json @@ -40969,7 +40969,7 @@ msgstr "مقدار برگردانده شده " #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Returned Qty in Stock UOM" -msgstr "تعداد برگردانده شده در انبار UOM" +msgstr "مقدار برگردانده شده بر حسب واحد اندازه‌گیری موجودی" #: erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:101 msgid "Returned exchange rate is neither integer not float." @@ -42318,7 +42318,7 @@ msgstr "ردیف {0}: تعداد نمی‌تواند بیشتر از {1} برا #: erpnext/stock/doctype/stock_entry/stock_entry.py:461 msgid "Row {0}: Qty in Stock UOM can not be zero." -msgstr "ردیف {0}: تعداد موجودی UOM در انبار نمی‌تواند صفر باشد." +msgstr "ردیف {0}: مقدار بر حسب واحد اندازه‌گیری موجودی نمی‌تواند صفر باشد." #: erpnext/stock/doctype/packing_slip/packing_slip.py:124 msgid "Row {0}: Qty must be greater than 0." @@ -45029,7 +45029,7 @@ msgstr "تنظیم پیش‌پرداخت و تخصیص (FIFO)" #. Detail' #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Set Basic Rate Manually" -msgstr "نرخ پایه را به صورت دستی تنظیم کنید" +msgstr "تنظیم نرخ پایه به صورت دستی" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:180 msgid "Set Default Supplier" @@ -45133,7 +45133,7 @@ msgstr "زمان پاسخ را برای اولویت {0} در ردیف {1} تن #. (Check) field in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Set Serial and Batch Bundle Naming Based on Naming Series" -msgstr "" +msgstr "تنظیم نامگذاری سریال و دسته‌ای باندل بر اساس سری نامگذاری" #. Label of the set_warehouse (Link) field in DocType 'Sales Order' #. Label of the set_warehouse (Link) field in DocType 'Delivery Note' @@ -45285,7 +45285,7 @@ msgstr "«انبار رزرو» را در هر ردیف از جدول آیتم #. Entry' #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Sets 'Source Warehouse' in each row of the items table." -msgstr "انبار منبع را در هر ردیف از جدول آیتم‌ها تنظیم می‌کند." +msgstr "«انبار منبع» را در هر ردیف از جدول آیتم‌ها تنظیم می‌کند." #. Description of the 'Default Target Warehouse' (Link) field in DocType 'Stock #. Entry' @@ -45833,7 +45833,7 @@ msgstr "نمایش فروشنده" #: erpnext/stock/report/stock_balance/stock_balance.js:120 msgid "Show Stock Ageing Data" -msgstr "نمایش داده های سالخوردگی موجودی" +msgstr "نمایش داده‌های سالخوردگی موجودی" #. Label of the show_taxes_as_table_in_print (Check) field in DocType 'Accounts #. Settings' @@ -45843,7 +45843,7 @@ msgstr "نمایش مالیات به عنوان جدول در چاپ" #: erpnext/stock/report/stock_balance/stock_balance.js:115 msgid "Show Variant Attributes" -msgstr "نمایش ویژگی های گونه" +msgstr "نمایش ویژگی‌های گونه" #: erpnext/stock/doctype/item/item.js:138 msgid "Show Variants" @@ -47039,7 +47039,7 @@ msgstr "مقدار موجودی رزرو شده" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json msgid "Stock Reserved Qty (in Stock UOM)" -msgstr "تعداد موجودی رزرو شده (در انبار UOM)" +msgstr "مقدار موجودی رزرو شده (بر حسب واحد اندازه‌گیری موجودی)" #. Label of the auto_accounting_for_stock_settings (Section Break) field in #. DocType 'Company' @@ -47074,7 +47074,7 @@ msgstr "تراکنش‌های موجودی" #. Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Stock Transactions Settings" -msgstr "تنظیمات معاملات موجودی" +msgstr "تنظیمات تراکنش‌های موجودی" #. Label of the stock_uom (Link) field in DocType 'POS Invoice Item' #. Label of the stock_uom (Link) field in DocType 'Purchase Invoice Item' @@ -47166,7 +47166,7 @@ msgstr "تنظیمات معاملات موجودی" #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json msgid "Stock UOM" -msgstr "UOM موجودی" +msgstr "واحد اندازه‌گیری موجودی" #. Label of the conversion_factor_section (Section Break) field in DocType #. 'Stock Settings' @@ -47302,13 +47302,13 @@ msgstr "مقدار موجودی برای کد مورد کافی نیست: {0} د #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:252 msgid "Stock transactions before {0} are frozen" -msgstr "معاملات موجودی قبل از {0} مسدود می‌شوند" +msgstr "تراکنش‌های موجودی قبل از {0} مسدود می‌شوند" #. Description of the 'Freeze Stocks Older Than (Days)' (Int) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Stock transactions that are older than the mentioned days cannot be modified." -msgstr "معاملات موجودی با قدمت بیشتر از روزهای مذکور قابل تغییر نمی باشد." +msgstr "تراکنش‌های موجودی با قدمت بیشتر از روزهای مذکور قابل تغییر نمی باشد." #. Description of the 'Auto Reserve Stock for Sales Order on Purchase' (Check) #. field in DocType 'Stock Settings' @@ -48453,7 +48453,7 @@ msgstr "انبار تامین کننده" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/packed_item/packed_item.json msgid "Supplier delivers to Customer" -msgstr "تامین کننده به مشتری تحویل می دهد" +msgstr "تامین کننده به مشتری تحویل می‌دهد" #. Description of the 'Supplier Numbers' (Table) field in DocType 'Customer' #: erpnext/selling/doctype/customer/customer.json @@ -49885,7 +49885,7 @@ msgstr "اعداد برگ مطابقت ندارند" #: erpnext/stock/doctype/putaway_rule/putaway_rule.py:293 msgid "The following Items, having Putaway Rules, could not be accomodated:" -msgstr "موارد زیر که دارای قوانین Putaway هستند، قابل استفاده نیستند:" +msgstr "آیتم‌های زیر، که دارای قوانین جانمایی هستند، قابل پذیرش نیستند:" #: erpnext/assets/doctype/asset/depreciation.py:340 msgid "The following assets have failed to automatically post depreciation entries: {0}" @@ -49897,7 +49897,7 @@ msgstr "" #: erpnext/stock/doctype/item/item.py:839 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." -msgstr "ویژگی های حذف شده زیر در گونه‌ها وجود دارد اما در قالب وجود ندارد. می‌توانید گونه‌ها را حذف کنید یا ویژگی(ها) را در قالب نگه دارید." +msgstr "ویژگی‌های حذف شده زیر در گونه‌ها وجود دارد اما در قالب وجود ندارد. می‌توانید گونه‌ها را حذف کنید یا ویژگی(ها) را در قالب نگه دارید." #: erpnext/setup/doctype/employee/employee.py:176 msgid "The following employees are currently still reporting to {0}:" @@ -50295,7 +50295,7 @@ msgstr "" #: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py:7 msgid "This covers all scorecards tied to this Setup" -msgstr "این همه کارت های امتیازی مرتبط با این راه‌اندازی را پوشش می دهد" +msgstr "این همه کارت های امتیازی مرتبط با این راه‌اندازی را پوشش می‌دهد" #: erpnext/controllers/status_updater.py:447 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?" @@ -50460,7 +50460,7 @@ msgstr "این زمان‌بندی زمانی ایجاد شد که شیفت‌ه #. 'Dunning Type' #: erpnext/accounts/doctype/dunning_type/dunning_type.json msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print." -msgstr "این بخش به کاربر اجازه می دهد متن Body و Closing نامه اخطار بدهی را برای اخطار بدهی Type بر اساس زبان تنظیم کند که می‌تواند در Print استفاده شود." +msgstr "این بخش به کاربر اجازه می‌دهد متن Body و Closing نامه اخطار بدهی را برای اخطار بدهی Type بر اساس زبان تنظیم کند که می‌تواند در Print استفاده شود." #: erpnext/stock/doctype/delivery_note/delivery_note.js:496 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc." @@ -50967,7 +50967,7 @@ msgstr "برای گنجاندن مالیات در ردیف {0} در نرخ مو #: erpnext/stock/doctype/item/item.py:638 msgid "To merge, following properties must be same for both items" -msgstr "برای ادغام، ویژگی های زیر باید برای هر دو مورد یکسان باشد" +msgstr "برای ادغام، ویژگی‌های زیر باید برای هر دو مورد یکسان باشد" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:42 msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled." @@ -51315,7 +51315,7 @@ msgstr "کل مبلغ تحویل شده" #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:247 msgid "Total Demand (Past Data)" -msgstr "تقاضای کل (داده های گذشته)" +msgstr "تقاضای کل (داده‌های گذشته)" #: erpnext/accounts/report/balance_sheet/balance_sheet.py:223 msgid "Total Equity" @@ -51342,11 +51342,11 @@ msgstr "مجموع تجربه" #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:260 msgid "Total Forecast (Future Data)" -msgstr "کل پیش بینی (داده های آینده)" +msgstr "کل پیش بینی (داده‌های آینده)" #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:253 msgid "Total Forecast (Past Data)" -msgstr "کل پیش بینی (داده های گذشته)" +msgstr "کل پیش بینی (داده‌های گذشته)" #. Label of the total_gain_loss (Currency) field in DocType 'Exchange Rate #. Revaluation' @@ -52867,7 +52867,7 @@ msgstr "تأیید نشده" #: erpnext/erpnext_integrations/utils.py:22 msgid "Unverified Webhook Data" -msgstr "داده های وب هوک تأیید نشده" +msgstr "داده‌های وب هوک تأیید نشده" #: erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.js:17 msgid "Up" @@ -53814,7 +53814,7 @@ msgstr "خطای ویژگی گونه" #: erpnext/public/js/templates/item_quick_entry.html:1 #: erpnext/stock/doctype/item/item.json msgid "Variant Attributes" -msgstr "ویژگی های گونه" +msgstr "ویژگی‌های گونه" #: erpnext/manufacturing/doctype/bom/bom.js:197 msgid "Variant BOM" @@ -55310,7 +55310,7 @@ msgstr "تاریخ شروع یا تاریخ پایان سال با {0} همپو #: erpnext/edi/doctype/code_list/code_list_import.js:29 msgid "You are importing data for the code list:" -msgstr "شما در حال درون‌برد داده ها برای لیست کد هستید:" +msgstr "شما در حال درون‌برد داده‌ها برای لیست کد هستید:" #: erpnext/controllers/accounts_controller.py:3773 msgid "You are not allowed to update as per the conditions set in {} Workflow." @@ -55322,7 +55322,7 @@ msgstr "شما مجاز به افزودن یا به‌روزرسانی ورود #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:334 msgid "You are not authorized to make/edit Stock Transactions for Item {0} under warehouse {1} before this time." -msgstr "شما مجاز به انجام/ویرایش معاملات موجودی برای کالای {0} در انبار {1} قبل از این زمان نیستید." +msgstr "شما مجاز به انجام/ویرایش تراکنش‌های موجودی برای کالای {0} در انبار {1} قبل از این زمان نیستید." #: erpnext/accounts/doctype/account/account.py:310 msgid "You are not authorized to set Frozen value" @@ -55755,7 +55755,7 @@ msgstr "انجام هر یک از موارد زیر:" #. Item' #: erpnext/stock/doctype/pick_list_item/pick_list_item.json msgid "product bundle item row's name in sales order. Also indicates that picked item is to be used for a product bundle" -msgstr "نام ردیف آیتم‌های باندل محصول در سفارش فروش. همچنین نشان می دهد که آیتم انتخاب شده قرار است برای یک باندل محصول استفاده شود" +msgstr "نام ردیف آیتم‌های باندل محصول در سفارش فروش. همچنین نشان می‌دهد که آیتم انتخاب شده قرار است برای یک باندل محصول استفاده شود" #. Option for the 'Plaid Environment' (Select) field in DocType 'Plaid #. Settings' diff --git a/erpnext/locale/hr.po b/erpnext/locale/hr.po index 7c3a7dbc725..855e0bb6450 100644 --- a/erpnext/locale/hr.po +++ b/erpnext/locale/hr.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2025-11-16 09:35+0000\n" -"PO-Revision-Date: 2025-11-19 22:23\n" +"PO-Revision-Date: 2025-11-23 23:34\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Croatian\n" "MIME-Version: 1.0\n" @@ -2091,7 +2091,7 @@ msgstr "Račun Potraživanja/Obveza" #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/setup/workspace/settings/settings.json msgid "Accounts Settings" -msgstr "Postavke Kjnigovodstva" +msgstr "Postavke Knjigovodstva" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1382 msgid "Accounts table cannot be blank." @@ -2510,7 +2510,7 @@ msgstr "Stvarni tip PDV-a ne može se uključiti u cijenu Artikla u redu {0}" #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1005 msgid "Ad-hoc Qty" -msgstr "Ad-hoc Količina" +msgstr "Namjenska Količina" #: erpnext/stock/doctype/item/item.js:557 #: erpnext/stock/doctype/price_list/price_list.js:8 diff --git a/erpnext/locale/sl.po b/erpnext/locale/sl.po index 475efc9b3b3..18c1028df7b 100644 --- a/erpnext/locale/sl.po +++ b/erpnext/locale/sl.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2025-11-16 09:35+0000\n" -"PO-Revision-Date: 2025-11-20 22:24\n" +"PO-Revision-Date: 2025-11-23 23:33\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Slovenian\n" "MIME-Version: 1.0\n" @@ -25,87 +25,87 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.js:73 msgid " Address" -msgstr "" +msgstr " Naslov" #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:677 msgid " Amount" -msgstr "" +msgstr " Znesek" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:114 msgid " BOM" -msgstr "" +msgstr " Kosovnica" #. Label of the istable (Check) field in DocType 'Inventory Dimension' #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json msgid " Is Child Table" -msgstr "" +msgstr " Je Podrejena Tabela" #. Label of the is_subcontracted (Check) field in DocType 'Job Card' #: erpnext/manufacturing/doctype/job_card/job_card.json msgid " Is Subcontracted" -msgstr "" +msgstr " Je oddano podizvajalcem" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:174 msgid " Item" -msgstr "" +msgstr " Artikel" #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107 #: erpnext/selling/report/sales_analytics/sales_analytics.py:128 msgid " Name" -msgstr "" +msgstr " Ime" #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:668 msgid " Rate" -msgstr "" +msgstr " Cena" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:122 msgid " Raw Material" -msgstr "" +msgstr " Surovina" #. Label of the skip_material_transfer (Check) field in DocType 'BOM Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json msgid " Skip Material Transfer" -msgstr "" +msgstr " Preskoči Prenos Materiala" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:133 #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:163 msgid " Sub Assembly" -msgstr "" +msgstr " Podsestav" #: erpnext/projects/doctype/project_update/project_update.py:104 msgid " Summary" -msgstr "" +msgstr " Povzetek" #: erpnext/stock/doctype/item/item.py:236 msgid "\"Customer Provided Item\" cannot be Purchase Item also" -msgstr "" +msgstr "\"Artikel, ki ga zagotovi stranka\" ne more biti tudi predmet nakupa" #: erpnext/stock/doctype/item/item.py:238 msgid "\"Customer Provided Item\" cannot have Valuation Rate" -msgstr "" +msgstr "»Artikel, ki ga zagotovi stranka« ne more imeti Stopnje Vrednotenja" #: erpnext/stock/doctype/item/item.py:314 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" -msgstr "" +msgstr "»Je Osnovno Sredstvo« ni mogoče odznačiti, ker za element obstaja zapis sredstva" #: erpnext/public/js/utils/serial_no_batch_selector.js:262 msgid "\"SN-01::10\" for \"SN-01\" to \"SN-10\"" -msgstr "" +msgstr "\"SN-01::10\" za \"SN-01\" do \"SN-10\"" #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:148 msgid "# In Stock" -msgstr "" +msgstr "# Na Zalogi" #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:141 msgid "# Req'd Items" -msgstr "" +msgstr "# Zahtevani Artikli" #. Label of the per_delivered (Percent) field in DocType 'Sales Order' #: erpnext/selling/doctype/sales_order/sales_order.json msgid "% Delivered" -msgstr "" +msgstr "% Dostavljeno" #. Label of the per_billed (Percent) field in DocType 'Timesheet' #. Label of the per_billed (Percent) field in DocType 'Sales Order' @@ -116,22 +116,22 @@ msgstr "" #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "% Amount Billed" -msgstr "" +msgstr "% Fakturirano" #. Label of the per_billed (Percent) field in DocType 'Purchase Order' #: erpnext/buying/doctype/purchase_order/purchase_order.json msgid "% Billed" -msgstr "" +msgstr "% Fakturirano" #. Label of the percent_complete_method (Select) field in DocType 'Project' #: erpnext/projects/doctype/project/project.json msgid "% Complete Method" -msgstr "" +msgstr "% Dokončana Metoda" #. Label of the percent_complete (Percent) field in DocType 'Project' #: erpnext/projects/doctype/project/project.json msgid "% Completed" -msgstr "" +msgstr "% Dokončano" #. Label of the per_delivered (Percent) field in DocType 'Pick List' #. Label of the per_delivered (Percent) field in DocType 'Subcontracting Inward @@ -139,37 +139,37 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json msgid "% Delivered" -msgstr "" +msgstr "% Dostavljeno" #: erpnext/manufacturing/doctype/bom/bom.js:945 #, python-format msgid "% Finished Item Quantity" -msgstr "" +msgstr "% Količina Dokončanih Artiklov" #. Label of the per_installed (Percent) field in DocType 'Delivery Note' #: erpnext/stock/doctype/delivery_note/delivery_note.json msgid "% Installed" -msgstr "" +msgstr "% Nameščeno" #: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:70 #: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:16 msgid "% Occupied" -msgstr "" +msgstr "% Zasedeno" #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:285 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:340 msgid "% Of Grand Total" -msgstr "" +msgstr "% Od Skupnega Zneska" #. Label of the per_ordered (Percent) field in DocType 'Material Request' #: erpnext/stock/doctype/material_request/material_request.json msgid "% Ordered" -msgstr "" +msgstr "% Naročeno" #. Label of the per_picked (Percent) field in DocType 'Sales Order' #: erpnext/selling/doctype/sales_order/sales_order.json msgid "% Picked" -msgstr "" +msgstr "% Izbrano" #. Label of the process_loss_percentage (Percent) field in DocType 'BOM' #. Label of the process_loss_percentage (Percent) field in DocType 'Stock @@ -180,30 +180,30 @@ msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json msgid "% Process Loss" -msgstr "" +msgstr "% Izgub Procesa" #. Label of the per_produced (Percent) field in DocType 'Subcontracting Inward #. Order' #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json msgid "% Produced" -msgstr "" +msgstr "% Proizvedeno" #. Label of the progress (Percent) field in DocType 'Task' #: erpnext/projects/doctype/task/task.json msgid "% Progress" -msgstr "" +msgstr "% Napredak" #. Label of the per_raw_material_received (Percent) field in DocType #. 'Subcontracting Inward Order' #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json msgid "% Raw Material Received" -msgstr "" +msgstr "% Prejete Surovine" #. Label of the per_raw_material_returned (Percent) field in DocType #. 'Subcontracting Inward Order' #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json msgid "% Raw Material Returned" -msgstr "" +msgstr "% Vrnjenih Surovin" #. Label of the per_received (Percent) field in DocType 'Purchase Order' #. Label of the per_received (Percent) field in DocType 'Material Request' @@ -212,7 +212,7 @@ msgstr "" #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json msgid "% Received" -msgstr "" +msgstr "% Prejeto" #. Label of the per_returned (Percent) field in DocType 'Delivery Note' #. Label of the per_returned (Percent) field in DocType 'Purchase Receipt' @@ -225,68 +225,68 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "% Returned" -msgstr "" +msgstr "% Vrnjenih" #. Description of the '% Amount Billed' (Percent) field in DocType 'Sales #. Order' #: erpnext/selling/doctype/sales_order/sales_order.json #, python-format msgid "% of materials billed against this Sales Order" -msgstr "" +msgstr "% materialov, zaračunanih za to Prodajno Naročilo" #. Description of the '% Delivered' (Percent) field in DocType 'Pick List' #: erpnext/stock/doctype/pick_list/pick_list.json #, python-format msgid "% of materials delivered against this Pick List" -msgstr "" +msgstr "% materialov, dostavljenih v skladu s tem Izbirnim Seznamom" #. Description of the '% Delivered' (Percent) field in DocType 'Sales Order' #: erpnext/selling/doctype/sales_order/sales_order.json #, python-format msgid "% of materials delivered against this Sales Order" -msgstr "" +msgstr "% dobavljenih materialov po tem Prodajnem Naročilu" #: erpnext/controllers/accounts_controller.py:2295 msgid "'Account' in the Accounting section of Customer {0}" -msgstr "" +msgstr "»Račun« v razdelku Računovodstvo Stranke {0}" #: erpnext/selling/doctype/sales_order/sales_order.py:346 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'" -msgstr "" +msgstr "»Dovoli več Prodajnih Naročil za Kupolno Naročilo Stranke«" #: erpnext/controllers/trends.py:56 msgid "'Based On' and 'Group By' can not be same" -msgstr "" +msgstr "'Na podlagi' in 'Po skupini' ne moreta biti enaka" #: erpnext/selling/report/inactive_customers/inactive_customers.py:18 msgid "'Days Since Last Order' must be greater than or equal to zero" -msgstr "" +msgstr "\"Dnevi od zadnjega Naročila\" morajo biti večji ali enaki nič" #: erpnext/controllers/accounts_controller.py:2300 msgid "'Default {0} Account' in Company {1}" -msgstr "" +msgstr "\"Privzet Račun {0} \" v Podjetju {1}" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1283 msgid "'Entries' cannot be empty" -msgstr "" +msgstr "'Vnosi' ne morejo biti prazni" #: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:24 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:127 #: erpnext/stock/report/stock_analytics/stock_analytics.py:313 msgid "'From Date' is required" -msgstr "" +msgstr "\"Od Datuma\" je obvezno" #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:18 msgid "'From Date' must be after 'To Date'" -msgstr "" +msgstr "\"Od Datuma\" mora biti za \"Do Datuma\"" #: erpnext/stock/doctype/item/item.py:397 msgid "'Has Serial No' can not be 'Yes' for non-stock item" -msgstr "" +msgstr "\"Ima serijsko številko\" ne more biti \"Da\" za artikel, ki ni na zalogi" #: erpnext/stock/doctype/quality_inspection/quality_inspection.py:139 msgid "'Inspection Required before Delivery' has disabled for the item {0}, no need to create the QI" -msgstr "" +msgstr "'Pregled Obvezen pred Dostavo' je onemogočen za artikel {0}, zato ni treba ustvariti Nadzor Kakovosti" #: erpnext/stock/doctype/quality_inspection/quality_inspection.py:130 msgid "'Inspection Required before Purchase' has disabled for the item {0}, no need to create the QI" @@ -301,7 +301,7 @@ msgstr "" #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:129 #: erpnext/stock/report/stock_analytics/stock_analytics.py:319 msgid "'To Date' is required" -msgstr "" +msgstr "'Do Datuma' je obavezno" #: erpnext/stock/doctype/packing_slip/packing_slip.py:95 msgid "'To Package No.' cannot be less than 'From Package No.'" @@ -317,109 +317,109 @@ msgstr "" #: erpnext/accounts/doctype/bank_account/bank_account.py:64 msgid "'{0}' account is already used by {1}. Use another account." -msgstr "" +msgstr "'{0}' račun že uporablja {1}. Uporabite drug račun." #: erpnext/accounts/doctype/pos_settings/pos_settings.py:43 msgid "'{0}' has been already added." -msgstr "" +msgstr "'{0}' je že dodan." #: erpnext/setup/doctype/company/company.py:259 #: erpnext/setup/doctype/company/company.py:270 msgid "'{0}' should be in company currency {1}." -msgstr "" +msgstr "'{0}' mora biti v valuti podjetja {1}." #: erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:174 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:203 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:106 msgid "(A) Qty After Transaction" -msgstr "" +msgstr "(A) Količina po Transakciji" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:208 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:111 msgid "(B) Expected Qty After Transaction" -msgstr "" +msgstr "(B) Pričakovana Količina po Transakciji" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:223 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:126 msgid "(C) Total Qty in Queue" -msgstr "" +msgstr "(C) Skupna Količina v Čakalni Vrsti" #: erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:184 msgid "(C) Total qty in queue" -msgstr "" +msgstr "(C) Skupna Količina v Čakalni Vrsti" #: erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:194 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:233 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:136 msgid "(D) Balance Stock Value" -msgstr "" +msgstr "(D) Bilančna Vrednost Zalog" #. Description of the 'Capacity' (Int) field in DocType 'Item Lead Time' #: erpnext/stock/doctype/item_lead_time/item_lead_time.json msgid "(Daily Yield * No of Units Produced) / 100" -msgstr "" +msgstr "(Dnevni Pridelek * Število Proizvedenih Enot) / 100" #: erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:199 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:238 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:141 msgid "(E) Balance Stock Value in Queue" -msgstr "" +msgstr "(E) Vrednost Zaloge v Čakalni Vrsti" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:248 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:151 msgid "(F) Change in Stock Value" -msgstr "" +msgstr "(F) Sprememba Vrednosti Zalog" #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:192 msgid "(Forecast)" -msgstr "" +msgstr "(Napoved)" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:253 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:156 msgid "(G) Sum of Change in Stock Value" -msgstr "" +msgstr "(G) Vsota Spremembe Vrednosti Zalog" #. Description of the 'Daily Yield (%)' (Percent) field in DocType 'Item Lead #. Time' #: erpnext/stock/doctype/item_lead_time/item_lead_time.json msgid "(Good Units Produced / Total Units Produced) × 100" -msgstr "" +msgstr "(Proizvedene Enote / Skupno Proizvedene Enote) × 100" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:263 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:166 msgid "(H) Change in Stock Value (FIFO Queue)" -msgstr "" +msgstr "(H) Sprememba Vrednosti Zalog (čakalna vrsta FIFO)" #: erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:209 msgid "(H) Valuation Rate" -msgstr "" +msgstr "(H) Stopnja Vrednotenja" #. Description of the 'Actual Operating Cost' (Currency) field in DocType 'Work #. Order Operation' #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "(Hour Rate / 60) * Actual Operation Time" -msgstr "" +msgstr "(Urna Postavka / 60) * Dejanski Čas Delovanja" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:273 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:176 msgid "(I) Valuation Rate" -msgstr "" +msgstr "(I) Stopnja Vrednotenja" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:278 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:181 msgid "(J) Valuation Rate as per FIFO" -msgstr "" +msgstr "(J) Stopnja Vrednotenja po FIFO" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:288 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:191 msgid "(K) Valuation = Value (D) ÷ Qty (A)" -msgstr "" +msgstr "(K) Vrednotenje = Vrednost (D) ÷ Količina (A)" #. Description of the 'Applicable on Cumulative Expense' (Check) field in #. DocType 'Budget' #: erpnext/accounts/doctype/budget/budget.json msgid "(Purchase Order + Material Request + Actual Expense)" -msgstr "" +msgstr "(Naročilnica + Zahteva za Material + Dejanski Stroški)" #. Description of the 'No of Units Produced' (Int) field in DocType 'Item Lead #. Time' @@ -431,37 +431,37 @@ msgstr "" #. Description of the 'To No' (Int) field in DocType 'Share Transfer' #: erpnext/accounts/doctype/share_transfer/share_transfer.json msgid "(including)" -msgstr "" +msgstr "(vključno)" #. Description of the 'Sales Taxes and Charges' (Table) field in DocType 'Sales #. Taxes and Charges Template' #: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json msgid "* Will be calculated in the transaction." -msgstr "" +msgstr "* Izračuna se pri transakciji." #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:112 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:360 msgid "0 - 30 Days" -msgstr "" +msgstr "0 - 30 Dni" #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:114 msgid "0-30" -msgstr "" +msgstr "0-30" #: erpnext/manufacturing/report/work_order_summary/work_order_summary.py:110 msgid "0-30 Days" -msgstr "" +msgstr "0 - 30 Dni" #. Description of the 'Conversion Factor' (Float) field in DocType 'Loyalty #. Program' #: erpnext/accounts/doctype/loyalty_program/loyalty_program.json msgid "1 Loyalty Points = How much base currency?" -msgstr "" +msgstr "1 Točke Zvestobe = Koliko osnovne valute?" #. Option for the 'Frequency' (Select) field in DocType 'Video Settings' #: erpnext/utilities/doctype/video_settings/video_settings.json msgid "1 hr" -msgstr "" +msgstr "1 ura" #. Option for the 'No of Employees' (Select) field in DocType 'Lead' #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity' @@ -470,7 +470,7 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.json msgid "1-10" -msgstr "" +msgstr "1-10" #. Option for the 'No of Employees' (Select) field in DocType 'Lead' #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity' @@ -479,7 +479,7 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.json msgid "1000+" -msgstr "" +msgstr "1000+" #. Option for the 'No of Employees' (Select) field in DocType 'Lead' #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity' @@ -488,18 +488,18 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.json msgid "11-50" -msgstr "" +msgstr "11-50" #: erpnext/regional/report/uae_vat_201/uae_vat_201.py:95 #: erpnext/regional/report/uae_vat_201/uae_vat_201.py:101 msgid "1{0}" -msgstr "" +msgstr "1{0}" #. Option for the 'Periodicity' (Select) field in DocType 'Asset Maintenance #. Task' #: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json msgid "2 Yearly" -msgstr "" +msgstr "2 Letno" #. Option for the 'No of Employees' (Select) field in DocType 'Lead' #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity' @@ -508,31 +508,31 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.json msgid "201-500" -msgstr "" +msgstr "201-500" #. Option for the 'Periodicity' (Select) field in DocType 'Asset Maintenance #. Task' #: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json msgid "3 Yearly" -msgstr "" +msgstr "3 Letno" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:113 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:361 msgid "30 - 60 Days" -msgstr "" +msgstr "30 - 60 Dni" #. Option for the 'Frequency' (Select) field in DocType 'Video Settings' #: erpnext/utilities/doctype/video_settings/video_settings.json msgid "30 mins" -msgstr "" +msgstr "30 minut" #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:115 msgid "30-60" -msgstr "" +msgstr "30–60" #: erpnext/manufacturing/report/work_order_summary/work_order_summary.py:110 msgid "30-60 Days" -msgstr "" +msgstr "30 - 60 Dni" #. Option for the 'No of Employees' (Select) field in DocType 'Lead' #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity' @@ -541,7 +541,7 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.json msgid "501-1000" -msgstr "" +msgstr "501-1000" #. Option for the 'No of Employees' (Select) field in DocType 'Lead' #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity' @@ -550,35 +550,35 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.json msgid "51-200" -msgstr "" +msgstr "51-200" #. Option for the 'Frequency' (Select) field in DocType 'Video Settings' #: erpnext/utilities/doctype/video_settings/video_settings.json msgid "6 hrs" -msgstr "" +msgstr "6 ur" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:114 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:362 msgid "60 - 90 Days" -msgstr "" +msgstr "60 - 90 Dni" #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:116 msgid "60-90" -msgstr "" +msgstr "60–90" #: erpnext/manufacturing/report/work_order_summary/work_order_summary.py:110 msgid "60-90 Days" -msgstr "" +msgstr "60 - 90 Dni" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:115 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:363 msgid "90 - 120 Days" -msgstr "" +msgstr "90 - 120 Dni" #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:117 #: erpnext/manufacturing/report/work_order_summary/work_order_summary.py:110 msgid "90 Above" -msgstr "" +msgstr "90 Zgoraj" #: erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py:61 msgid "From Time cannot be later than To Time for {0}" @@ -604,7 +604,22 @@ msgid "
    \n" "
    Hello {{ customer.customer_name }},
    PFA your Statement Of Accounts from {{ doc.from_date }} to {{ doc.to_date }}.
    \n" "\n" "" -msgstr "" +msgstr "
    \n" +"

    Opomba

    \n" +"
      \n" +"
    • \n" +"Za dinamične vrednosti lahko uporabite oznake Jinja v poljih Zadeva in Telo .\n" +"
    • \n" +" Vsa polja v tem dokumentu tipa dokumenta so na voljo v okviru objekta doc , vsa polja za stranko, ki ji bo poslana pošta, pa so na voljo v okviru objekta customer .\n" +"
    \n" +"

    Primeri

    \n" +"\n" +"
      \n" +"
    • Zadeva:

      Izpisek računov za {{ customer.customer_name }}

      • \n" +"
    • Telo:

      \n" +"
      Pozdravljeni, {{ customer.customer_name }},
      PFA vaš izpisek računa od {{ doc.from_date }} do {{ doc.to_date }}.
      • \n" +"
    \n" +"" #. Content of the 'Other Details' (HTML) field in DocType 'Purchase Receipt' #. Content of the 'Other Details' (HTML) field in DocType 'Subcontracting @@ -612,24 +627,26 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "
    Other Details
    " -msgstr "" +msgstr "
    Druge Podrobnosti
    " #. Content of the 'no_bank_transactions' (HTML) field in DocType 'Bank #. Reconciliation Tool' #: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json msgid "
    No Matching Bank Transactions Found
    " -msgstr "" +msgstr "
    Ni najdenih Ustreznih Bančnih Transakcij
    " #: erpnext/public/js/bank_reconciliation_tool/dialog_manager.js:262 msgid "
    {0}
    " -msgstr "" +msgstr "
    {0}
    " #. Content of the 'settings' (HTML) field in DocType 'Cheque Print Template' #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json msgid "
    \n" "

    All dimensions in centimeter only

    \n" "
    " -msgstr "" +msgstr "
    \n" +"

    Vse dimenzije so samo v centimetrih

    \n" +"
    " #. Content of the 'about' (HTML) field in DocType 'Product Bundle' #: erpnext/selling/doctype/product_bundle/product_bundle.json @@ -691,42 +708,42 @@ msgstr "" #. Template' #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json msgid "" -msgstr "" +msgstr "" #. Content of the 'html_19' (HTML) field in DocType 'Cheque Print Template' #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json msgid "" -msgstr "" +msgstr "" #. Content of the 'Date Settings' (HTML) field in DocType 'Cheque Print #. Template' #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json msgid "" -msgstr "" +msgstr "" #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:123 msgid "
  • Clearance date must be after cheque date for row(s): {0}
    • " -msgstr "" +msgstr "
  • Datum odobritve mora biti po datumu čeka za vrstico(e): {0}
    • " #: erpnext/controllers/accounts_controller.py:2188 msgid "
  • Item {0} in row(s) {1} billed more than {2}
    • " -msgstr "" +msgstr "
  • Artikel {0} v vrstici(ah) {1} je bila zaračunana več kot {2}
    • " #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:118 msgid "
  • Payment document required for row(s): {0}
    • " -msgstr "" +msgstr "
  • Plačilni dokument, potreben za vrstico(e): {0}
    • " #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:163 msgid "
  • {}
    • " -msgstr "" +msgstr "
  • {}
    • " #: erpnext/controllers/accounts_controller.py:2185 msgid "

    Cannot overbill for the following Items:

    " -msgstr "" +msgstr "

    Za naslednje artikle ni mogoče zaračunati preveč:

    " #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:157 msgid "

    Following {0}s doesn't belong to Company {1} :

    " -msgstr "" +msgstr "

    Sledi {0}s ne pripada podjetju {1} :

    " #. Content of the 'html_llwp' (HTML) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -750,23 +767,42 @@ msgid "

    In your Email Template, you can use the following special varia " \n" "

    \n" "

    Apart from these, you can access all values in this RFQ, like {{ message_for_supplier }} or {{ terms }}.

    " -msgstr "" +msgstr "

    V vaši Predlog E-poštelahko uporabite naslednje posebne spremenljivke:\n" +"

    \n" +"
      \n" +"
    • \n" +" {{ update_password_link }}: Povezava, kjer lahko vaš dobavitelj nastavi novo geslo za prijavo v vaš portal.\n" +"
      • \n" +"
    • \n" +" {{ portal_link }}: Povezava do tega povpraševanja po ponudbi na vašem dobaviteljskem portalu.\n" +"
      • \n" +"
    • \n" +" {{ supplier_name }}: Ime podjetja vašega dobavitelja.\n" +"
      • \n" +"
    • \n" +" {{ contact.salutation }} {{ contact.last_name }}: Kontaktna oseba vašega dobavitelja.\n" +"
    • \n" +" {{ user_fullname }}: Vaše polno ime.\n" +"
      • \n" +"
    \n" +"

    \n" +"

    Poleg teh lahko dostopate do vseh vrednosti v tem RFQ, kot so {{ message_for_supplier }} ali {{ terms }}.

    " #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:116 msgid "

    Please correct the following row(s):

      " -msgstr "" +msgstr "

      Popravite naslednje vrstice:

        " #: erpnext/controllers/buying_controller.py:108 msgid "

        Posting Date {0} cannot be before Purchase Order date for the following:

          " -msgstr "" +msgstr "

          Datum knjiženja {0} ne sme biti pred datumom naročila za naslednje primere:

            " #: erpnext/stock/doctype/stock_settings/stock_settings.js:69 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 "" +msgstr "

            Cenik v nastavitvah prodaje ni bil nastavljen kot urejevalni. V tem primeru bo nastavitev Posodobi cenik na podlagi na Cenik preprečila samodejno posodabljanje cene artikla.

            Ali ste prepričani, da želite nadaljevati?" #: erpnext/controllers/accounts_controller.py:2197 msgid "

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

            " -msgstr "" +msgstr "

            Če želite dovoliti preplačilo, nastavite dovoljeno vrednost v Nastavitvah Računovodstva.

            " #. Content of the 'Message Examples' (HTML) field in DocType 'Payment Gateway #. Account' @@ -777,7 +813,12 @@ msgid "
            Message Example
            \n\n"
 "<p> We don't want you to be spending time running around in order to pay for your Bill.
            After all, life is beautiful and the time you have in hand should be spent to enjoy it!
            So here are our little ways to help you get more time for life! </p>\n\n"
 "<a href=\"{{ payment_url }}\"> click here to pay </a>\n\n"
 "
            \n" -msgstr "" +msgstr "
            Primer Sporočila
            \n\n"
+"<p> Hvala, ker ste del {{ doc.company }}! Upamo, da uživate v storitvi.</p>\n\n"
+"<p> V prilogi je izpisek e-računa. Neporavnani znesek je {{ doc.grand_total }}.</p>\n\n"
+"<p> Nočemo, da bi morali teči naokoli, da bi plačali svoj račun.
            Navsezadnje je življenje lepo in čas, ki ga imate na voljo, bi morali porabiti za uživanje!
            Tukaj so naši majhni načini, kako si boste lahko privoščili več časa za življenje! </p>\n\n"
+"<a href=\"{{ payment_url }}\"> kliknite tukaj za plačilo </a>\n\n"
+"
            \n" #. Content of the 'Message Examples' (HTML) field in DocType 'Payment Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -786,26 +827,30 @@ msgid "
            Message Example
            \n\n"
 "<p>Requesting payment for {{ doc.doctype }}, {{ doc.name }} for {{ doc.grand_total }}.</p>\n\n"
 "<a href=\"{{ payment_url }}\"> click here to pay </a>\n\n"
 "
            \n" -msgstr "" +msgstr "
            Primer Sporočila
            \n\n"
+"<p>Spoštovani {{ doc.contact_person }},</p>\n\n"
+"<p>Zahtevam plačilo za {{ doc.doctype }}, {{ doc.name }} za {{ doc.grand_total }}.</p>\n\n"
+"<a href=\"{{ payment_url }}\"> Kliknite tukaj za plačilo </a>\n\n"
+"
            \n" #. Header text in the Stock Workspace #: erpnext/stock/workspace/stock/stock.json msgid "Masters & Reports" -msgstr "" +msgstr "Nastavitve & Poročila" #. Header text in the Selling Workspace #. Header text in the Stock Workspace #: erpnext/selling/workspace/selling/selling.json #: erpnext/stock/workspace/stock/stock.json msgid "Quick Access" -msgstr "" +msgstr "Hitri Dostop" #. Header text in the Assets Workspace #. Header text in the Quality Workspace #: erpnext/assets/workspace/assets/assets.json #: erpnext/quality_management/workspace/quality/quality.json msgid "Reports & Masters" -msgstr "" +msgstr "Poročila & Nastavitve" #. Header text in the Accounting Workspace #. Header text in the Payables Workspace @@ -828,12 +873,12 @@ msgstr "" #: erpnext/setup/workspace/home/home.json #: erpnext/support/workspace/support/support.json msgid "Reports & Masters" -msgstr "" +msgstr "Poročila & Nastavitve" #. Header text in the Settings Workspace #: erpnext/setup/workspace/settings/settings.json msgid "Settings" -msgstr "" +msgstr "Nastavitve" #. Header text in the Accounting Workspace #. Header text in the Payables Workspace @@ -842,7 +887,7 @@ msgstr "" #: erpnext/accounts/workspace/payables/payables.json #: erpnext/accounts/workspace/receivables/receivables.json msgid "Shortcuts" -msgstr "" +msgstr "Bližnjice" #. Header text in the Settings Workspace #: erpnext/setup/workspace/settings/settings.json @@ -853,7 +898,13 @@ msgid "Your Shortcuts\n" "\t\t\n" "\t\t\t\n" "\t\t" -msgstr "" +msgstr "Bližnjice\n" +"\t\t\t\n" +"\t\t\n" +"\t\t\t\n" +"\t\t\n" +"\t\t\t\n" +"\t\t" #. Header text in the Assets Workspace #. Header text in the Buying Workspace @@ -872,15 +923,15 @@ msgstr "" #: erpnext/setup/workspace/home/home.json #: erpnext/support/workspace/support/support.json msgid "Your Shortcuts" -msgstr "" +msgstr "Bližnjice" #: erpnext/accounts/doctype/payment_request/payment_request.py:991 msgid "Grand Total: {0}" -msgstr "" +msgstr "Skupni Znesek: {0}" #: erpnext/accounts/doctype/payment_request/payment_request.py:992 msgid "Outstanding Amount: {0}" -msgstr "" +msgstr "Neporavnani Znesek: {0}" #. Content of the 'html_19' (HTML) field in DocType 'Inventory Dimension' #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json @@ -910,18 +961,43 @@ msgid "\n" "\n\n" "\n" "
            \n\n\n\n\n\n\n" -msgstr "" +msgstr "\n" +"\n" +" \n" +" \n" +" \n" +" \n" +"\n" +"\n" +"\n" +" \n" +" \n" +"\n" +"\n" +" \n" +" \n" +"\n\n" +"\n" +"
            Podrejeni dokumentDokument, ki ni podrejen
            \n" +"

            Za dostop do polja nadrejenega dokumenta uporabite parent.fieldname, za dostop do polja podrejene tabele pa doc.fieldname

            \n\n" +"             		\n" +"

            Za dostop do polja dokumenta uporabite doc.fieldname

            \n" +"
            \n" +"

            Primer: parent.doctype == \"Vnos zaloge\" in doc.item_code == \"Test\"

            \n\n" +"             		\n" +"

            Primer: doc.doctype == \"Vnos zaloge\" in doc.purpose == \"Proizvodnja\"

            \n" +"
            \n\n\n\n\n\n\n" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:213 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:116 msgid "A - B" -msgstr "" +msgstr "A - B" #: erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:189 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:228 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:131 msgid "A - C" -msgstr "" +msgstr "A - B" #: erpnext/selling/doctype/customer/customer.py:314 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group" @@ -997,28 +1073,28 @@ msgstr "" #. Option for the 'Blood Group' (Select) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "A+" -msgstr "" +msgstr "A+" #. Option for the 'Blood Group' (Select) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "A-" -msgstr "" +msgstr "A-" #. Option for the 'Blood Group' (Select) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "AB+" -msgstr "" +msgstr "AB+" #. Option for the 'Blood Group' (Select) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "AB-" -msgstr "" +msgstr "AB-" #. Option for the 'Invoice Series' (Select) field in DocType 'Import Supplier #. Invoice' #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json msgid "ACC-PINV-.YYYY.-" -msgstr "" +msgstr "ACC-PINV-.YYYY.-" #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:548 msgid "AMC Expiry (Serial)" @@ -1035,53 +1111,53 @@ msgstr "" #. Exchange Settings' #: erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json msgid "API Details" -msgstr "" +msgstr "API Podrobnosti" #. Label of the awb_number (Data) field in DocType 'Shipment' #: erpnext/stock/doctype/shipment/shipment.json msgid "AWB Number" -msgstr "" +msgstr "AWB Številka" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Abampere" -msgstr "" +msgstr "Abampere" #. Label of the abbr (Data) field in DocType 'Company' #: erpnext/setup/doctype/company/company.json msgid "Abbr" -msgstr "" +msgstr "Okrajšava" #. Label of the abbr (Data) field in DocType 'Item Attribute Value' #: erpnext/stock/doctype/item_attribute_value/item_attribute_value.json msgid "Abbreviation" -msgstr "" +msgstr "Okrajšava" #: erpnext/setup/doctype/company/company.py:194 msgid "Abbreviation already used for another company" -msgstr "" +msgstr "Okrajšava se že uporablja za drugo podjetje" #: erpnext/setup/doctype/company/company.py:191 msgid "Abbreviation is mandatory" -msgstr "" +msgstr "Okrajšava je obvezna" #: erpnext/stock/doctype/item_attribute/item_attribute.py:113 msgid "Abbreviation: {0} must appear only once" -msgstr "" +msgstr "Okrajšava: {0} se lahko pojavi samo enkrat" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1281 msgid "Above" -msgstr "" +msgstr "Nad" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:116 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:364 msgid "Above 120 Days" -msgstr "" +msgstr "Nad 120 Dni" #. Name of a role #: erpnext/setup/doctype/department/department.json msgid "Academics User" -msgstr "" +msgstr "Akademski Uporabnik" #. Label of the acceptance_formula (Code) field in DocType 'Item Quality #. Inspection Parameter' @@ -1090,7 +1166,7 @@ msgstr "" #: erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json #: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json msgid "Acceptance Criteria Formula" -msgstr "" +msgstr "Formula Meril Sprejemljivosti" #. Label of the value (Data) field in DocType 'Item Quality Inspection #. Parameter' @@ -1103,14 +1179,14 @@ msgstr "" #. Label of the qty (Float) field in DocType 'Purchase Invoice Item' #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json msgid "Accepted Qty" -msgstr "" +msgstr "Sprejeta Količina" #. Label of the stock_qty (Float) field in DocType 'Purchase Invoice Item' #. Label of the stock_qty (Float) field in DocType 'Purchase Receipt Item' #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Accepted Qty in Stock UOM" -msgstr "" +msgstr "Sprejeta Količina na Enoti Zaloge" #. Label of the qty (Float) field in DocType 'Purchase Receipt Item' #. Label of the qty (Float) field in DocType 'Subcontracting Receipt Item' @@ -1118,7 +1194,7 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json msgid "Accepted Quantity" -msgstr "" +msgstr "Sprejeta Količina" #. Label of the warehouse (Link) field in DocType 'Purchase Invoice Item' #. Label of the set_warehouse (Link) field in DocType 'Purchase Receipt' @@ -1131,12 +1207,12 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json msgid "Accepted Warehouse" -msgstr "" +msgstr "Sprejeto Skladišče" #. Label of the access_key (Data) field in DocType 'Currency Exchange Settings' #: erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json msgid "Access Key" -msgstr "" +msgstr "Dostopni Ključ" #: erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:48 msgid "Access Key is required for Service Provider: {0}" @@ -1154,14 +1230,14 @@ msgstr "" #. Name of a report #: erpnext/accounts/report/account_balance/account_balance.json msgid "Account Balance" -msgstr "" +msgstr "Stanje Računa" #. Label of the account_category (Link) field in DocType 'Account' #. Name of a DocType #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account_category/account_category.json msgid "Account Category" -msgstr "" +msgstr "Kategorija Računa" #. Label of the account_category_name (Data) field in DocType 'Account #. Category' @@ -1205,7 +1281,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json #: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json msgid "Account Currency" -msgstr "" +msgstr "Valuta Računa" #. Label of the paid_from_account_currency (Link) field in DocType 'Payment #. Entry' @@ -1223,7 +1299,7 @@ msgstr "" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Account Data" -msgstr "" +msgstr "Podatki Računa" #: erpnext/accounts/report/balance_sheet/balance_sheet.js:20 #: erpnext/accounts/report/cash_flow/cash_flow.js:29 @@ -1242,7 +1318,7 @@ msgstr "" #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json msgid "Account Details" -msgstr "" +msgstr "Podrobnosti Računa" #. Label of the account_head (Link) field in DocType 'Advance Tax' #. Label of the account_head (Link) field in DocType 'Advance Taxes and @@ -1257,17 +1333,17 @@ msgstr "" #: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json #: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json msgid "Account Head" -msgstr "" +msgstr "Račun" #. Label of the account_manager (Link) field in DocType 'Customer' #: erpnext/selling/doctype/customer/customer.json msgid "Account Manager" -msgstr "" +msgstr "Vodja Računovodstva" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1034 #: erpnext/controllers/accounts_controller.py:2304 msgid "Account Missing" -msgstr "" +msgstr "Manjka Račun" #. Label of the account_name (Data) field in DocType 'Account' #. Label of the account_name (Data) field in DocType 'Bank Account' @@ -1281,11 +1357,11 @@ msgstr "" #: erpnext/accounts/report/financial_statements.py:681 #: erpnext/accounts/report/trial_balance/trial_balance.py:480 msgid "Account Name" -msgstr "" +msgstr "Ime Računa" #: erpnext/accounts/doctype/account/account.py:371 msgid "Account Not Found" -msgstr "" +msgstr "Račun ni bil najden" #. Label of the account_number (Data) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json @@ -1294,7 +1370,7 @@ msgstr "" #: erpnext/accounts/report/financial_statements.py:688 #: erpnext/accounts/report/trial_balance/trial_balance.py:487 msgid "Account Number" -msgstr "" +msgstr "Številka Računa" #: erpnext/accounts/doctype/account/account.py:357 msgid "Account Number {0} already used in account {1}" @@ -1345,11 +1421,11 @@ msgstr "" #: erpnext/accounts/report/account_balance/account_balance.js:34 #: erpnext/setup/doctype/party_type/party_type.json msgid "Account Type" -msgstr "" +msgstr "Tip Računa" #: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:125 msgid "Account Value" -msgstr "" +msgstr "Vrednost Računa" #: erpnext/accounts/doctype/account/account.py:326 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'" @@ -1367,7 +1443,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_profile/pos_profile.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json msgid "Account for Change Amount" -msgstr "" +msgstr "Račun za Znesek Spremembe" #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:46 msgid "Account is mandatory to get payment entries" @@ -1504,7 +1580,7 @@ msgstr "" #: erpnext/setup/setup_wizard/data/designation.txt:1 msgid "Accountant" -msgstr "" +msgstr "Računovodja" #. Group in Bank Account's connections #. Label of the section_break_19 (Section Break) field in DocType 'POS Profile' @@ -1530,7 +1606,7 @@ msgstr "" #: erpnext/setup/workspace/home/home.json erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Accounting" -msgstr "" +msgstr "Računovodstvo" #. Label of the accounting_details_section (Section Break) field in DocType #. 'Dunning' @@ -1571,7 +1647,7 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json msgid "Accounting Details" -msgstr "" +msgstr "Računovodske Podrobnosti" #. Name of a DocType #. Label of the accounting_dimension (Select) field in DocType 'Accounting @@ -1585,27 +1661,27 @@ msgstr "" #: erpnext/accounts/report/profitability_analysis/profitability_analysis.js:32 #: erpnext/accounts/workspace/accounting/accounting.json msgid "Accounting Dimension" -msgstr "" +msgstr "Računovodska Dimenzija" #: erpnext/accounts/doctype/gl_entry/gl_entry.py:215 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:151 msgid "Accounting Dimension {0} is required for 'Balance Sheet' account {1}." -msgstr "" +msgstr "Za račun »Bilanca Stanja« {1} je potrebna Računovodska Dimenzija {0}." #: erpnext/accounts/doctype/gl_entry/gl_entry.py:201 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:138 msgid "Accounting Dimension {0} is required for 'Profit and Loss' account {1}." -msgstr "" +msgstr "Za račun 'Poslovni Izid' {1} je potrebna Računovodska Dimenzija {0}." #. Name of a DocType #: erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.json msgid "Accounting Dimension Detail" -msgstr "" +msgstr "Podrobnosti Računovodske Dimenzije" #. Name of a DocType #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json msgid "Accounting Dimension Filter" -msgstr "" +msgstr "Filter Računovodske Dimenzije" #. Label of the accounting_dimensions_section (Section Break) field in DocType #. 'Advance Taxes and Charges' @@ -1741,7 +1817,7 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json msgid "Accounting Dimensions" -msgstr "" +msgstr "Računovodske Dimenzije" #. Label of the accounting_dimensions_section (Section Break) field in DocType #. 'Purchase Invoice' @@ -1756,26 +1832,26 @@ msgstr "" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Accounting Dimensions " -msgstr "" +msgstr "Računovodske Dimenzije " #. Label of the accounting_dimensions_section (Section Break) field in DocType #. 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Accounting Dimensions Filter" -msgstr "" +msgstr "Filter Računovodskih Dimenzij" #. Label of the accounts (Table) field in DocType 'Journal Entry' #. Label of the accounts (Table) field in DocType 'Journal Entry Template' #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json msgid "Accounting Entries" -msgstr "" +msgstr "Računovodski Vnosi" #: erpnext/assets/doctype/asset/asset.py:810 #: erpnext/assets/doctype/asset/asset.py:825 #: erpnext/assets/doctype/asset_capitalization/asset_capitalization.py:561 msgid "Accounting Entry for Asset" -msgstr "" +msgstr "Računovodski Vnos za Sredstvo" #: erpnext/stock/doctype/stock_entry/stock_entry.py:1812 #: erpnext/stock/doctype/stock_entry/stock_entry.py:1832 @@ -1823,7 +1899,7 @@ msgstr "" #: erpnext/selling/doctype/customer/customer.js:170 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:50 msgid "Accounting Ledger" -msgstr "" +msgstr "Računovodski Register" #. Label of a Card Break in the Accounting Workspace #: erpnext/accounts/workspace/accounting/accounting.json @@ -1878,7 +1954,7 @@ msgstr "" #: erpnext/setup/doctype/supplier_group/supplier_group.json #: erpnext/setup/install.py:325 msgid "Accounts" -msgstr "" +msgstr "Računovodstvo" #. Label of the closing_settings_tab (Tab Break) field in DocType 'Accounts #. Settings' @@ -1917,7 +1993,7 @@ msgstr "" #: erpnext/accounts/workspace/payables/payables.json #: erpnext/buying/doctype/supplier/supplier.js:102 msgid "Accounts Payable" -msgstr "" +msgstr "Obveznosti" #. Name of a report #. Label of a Link in the Payables Workspace @@ -1925,7 +2001,7 @@ msgstr "" #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.json #: erpnext/accounts/workspace/payables/payables.json msgid "Accounts Payable Summary" -msgstr "" +msgstr "Povzetek Obveznosti" #. Option for the 'Write Off Based On' (Select) field in DocType 'Journal #. Entry' @@ -1945,7 +2021,7 @@ msgstr "" #: erpnext/accounts/workspace/receivables/receivables.json #: erpnext/selling/doctype/customer/customer.js:159 msgid "Accounts Receivable" -msgstr "" +msgstr "Terjatve" #. Label of the accounts_receivable_payable_tuning_section (Section Break) #. field in DocType 'Accounts Settings' @@ -1983,7 +2059,7 @@ msgstr "" #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "Accounts Receivable/Payable" -msgstr "" +msgstr "Račun Terjatve/Obveznosti" #. Name of a DocType #. Label of a Link in the Accounting Workspace @@ -1993,21 +2069,21 @@ msgstr "" #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/setup/workspace/settings/settings.json msgid "Accounts Settings" -msgstr "" +msgstr "Nastavitve Računovodstva" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1382 msgid "Accounts table cannot be blank." -msgstr "" +msgstr "Tabela računov ne more biti prazna." #. Label of the merge_accounts (Table) field in DocType 'Ledger Merge' #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json msgid "Accounts to Merge" -msgstr "" +msgstr "Računi za združitev" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:264 msgid "Accrued Expenses" -msgstr "" +msgstr "Načrtovani Stroški" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json @@ -2015,7 +2091,7 @@ msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:112 #: erpnext/accounts/report/account_balance/account_balance.js:37 msgid "Accumulated Depreciation" -msgstr "" +msgstr "Akumulirana Amortizacija" #. Label of the accumulated_depreciation_account (Link) field in DocType 'Asset #. Category Account' @@ -2024,7 +2100,7 @@ msgstr "" #: erpnext/assets/doctype/asset_category_account/asset_category_account.json #: erpnext/setup/doctype/company/company.json msgid "Accumulated Depreciation Account" -msgstr "" +msgstr "Račun Akumulirane Amortizacije" #. Label of the accumulated_depreciation_amount (Currency) field in DocType #. 'Depreciation Schedule' @@ -2032,16 +2108,16 @@ msgstr "" #: erpnext/assets/doctype/asset/asset.js:289 #: erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json msgid "Accumulated Depreciation Amount" -msgstr "" +msgstr "Znesek Akumulirane Amortizacije" #: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:635 #: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:653 msgid "Accumulated Depreciation as on" -msgstr "" +msgstr "Akumulirana amortizacija na dan" #: erpnext/accounts/doctype/budget/budget.py:253 msgid "Accumulated Monthly" -msgstr "" +msgstr "Akumulirani Mesečno" #: erpnext/controllers/budget_controller.py:422 msgid "Accumulated Monthly Budget for Account {0} against {1} {2} is {3}. It will be collectively ({4}) exceeded by {5}" @@ -2063,22 +2139,22 @@ msgstr "" #: erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:111 msgid "Achieved ({})" -msgstr "" +msgstr "Doseženo ({})" #. Label of the acquisition_date (Date) field in DocType 'Vehicle' #: erpnext/setup/doctype/vehicle/vehicle.json msgid "Acquisition Date" -msgstr "" +msgstr "Datum Pridobitve" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Acre" -msgstr "" +msgstr "Acre" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Acre (US)" -msgstr "" +msgstr "Acre (ZDA)" #. Label of the action_if_quality_inspection_is_not_submitted (Select) field in #. DocType 'Stock Settings' @@ -2100,7 +2176,7 @@ msgstr "" #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" -msgstr "" +msgstr "Dejanje Inicializirano" #. Label of the action_if_accumulated_monthly_budget_exceeded (Select) field in #. DocType 'Budget' @@ -2177,12 +2253,12 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:55 msgid "Active Leads" -msgstr "" +msgstr "Aktivne Potencialne Stranke" #. Label of the on_status_image (Attach Image) field in DocType 'Workstation' #: erpnext/manufacturing/doctype/workstation/workstation.json msgid "Active Status" -msgstr "" +msgstr "Aktivno Stanje" #. Label of the activities_tab (Tab Break) field in DocType 'Lead' #. Label of the activities_tab (Tab Break) field in DocType 'Opportunity' @@ -2191,14 +2267,14 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.json msgid "Activities" -msgstr "" +msgstr "Dejavnosti" #. Name of a DocType #. Label of a Link in the Projects Workspace #: erpnext/projects/doctype/activity_cost/activity_cost.json #: erpnext/projects/workspace/projects/projects.json msgid "Activity Cost" -msgstr "" +msgstr "Stroški Dejavnosti" #: erpnext/projects/doctype/activity_cost/activity_cost.py:51 msgid "Activity Cost exists for Employee {0} against Activity Type - {1}" @@ -2223,7 +2299,7 @@ msgstr "" #: erpnext/public/js/projects/timer.js:9 #: erpnext/templates/pages/timelog_info.html:25 msgid "Activity Type" -msgstr "" +msgstr "Tip Dejavnosti" #. Option for the 'Type' (Select) field in DocType 'Advance Taxes and Charges' #. Option for the 'Type' (Select) field in DocType 'Purchase Taxes and Charges' @@ -2234,38 +2310,38 @@ msgstr "" #: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:100 #: erpnext/accounts/report/budget_variance_report/budget_variance_report.py:110 msgid "Actual" -msgstr "" +msgstr "Dejansko" #: erpnext/stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:125 msgid "Actual Balance Qty" -msgstr "" +msgstr "Dejanska Bilanca Količina" #. Label of the actual_batch_qty (Float) field in DocType 'Packed Item' #: erpnext/stock/doctype/packed_item/packed_item.json msgid "Actual Batch Quantity" -msgstr "" +msgstr "Dejanska Količina Šarže" #: erpnext/buying/report/procurement_tracker/procurement_tracker.py:101 msgid "Actual Cost" -msgstr "" +msgstr "Dejanski Stroški" #. Label of the actual_date (Date) field in DocType 'Maintenance Schedule #. Detail' #: erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json msgid "Actual Date" -msgstr "" +msgstr "Dejanski Datum" #: erpnext/buying/report/procurement_tracker/procurement_tracker.py:121 #: erpnext/stock/report/delayed_item_report/delayed_item_report.py:141 #: erpnext/stock/report/delayed_order_report/delayed_order_report.py:66 msgid "Actual Delivery Date" -msgstr "" +msgstr "Dejanski Datum Dobave" #. Label of the section_break_cmgo (Section Break) field in DocType 'Master #. Production Schedule' #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json msgid "Actual Demand" -msgstr "" +msgstr "Dejansko Povpraševanje" #. Label of the actual_end_date (Datetime) field in DocType 'Job Card' #. Label of the actual_end_date (Datetime) field in DocType 'Work Order' @@ -2274,7 +2350,7 @@ msgstr "" #: erpnext/manufacturing/report/work_order_summary/work_order_summary.py:254 #: erpnext/projects/report/delayed_tasks_summary/delayed_tasks_summary.py:115 msgid "Actual End Date" -msgstr "" +msgstr "Dejanski Končni Datum" #. Label of the actual_end_date (Date) field in DocType 'Project' #. Label of the act_end_date (Date) field in DocType 'Task' @@ -2317,7 +2393,7 @@ msgstr "" #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:430 msgid "Actual Posting" -msgstr "" +msgstr "Dejansko Knjiženje" #. Label of the actual_qty (Float) field in DocType 'Production Plan Sub #. Assembly Item' @@ -2332,27 +2408,27 @@ msgstr "" #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:96 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:141 msgid "Actual Qty" -msgstr "" +msgstr "Dejanska Količina" #. Label of the actual_qty (Float) field in DocType 'Stock Entry Detail' #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Actual Qty (at source/target)" -msgstr "" +msgstr "Dejanska Količina (pri viru/cilju)" #. Label of the actual_qty (Float) field in DocType 'Asset Capitalization Stock #. Item' #: erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json msgid "Actual Qty in Warehouse" -msgstr "" +msgstr "Dejanska Količina v Skladišču" #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:198 msgid "Actual Qty is mandatory" -msgstr "" +msgstr "Dejanska Količina je obvezna" #: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:37 #: erpnext/stock/dashboard/item_dashboard_list.html:28 msgid "Actual Qty {0} / Waiting Qty {1}" -msgstr "" +msgstr "Dejanska Količina {0} / Čakalna Količina {1}" #: erpnext/manufacturing/doctype/production_plan/production_plan.js:179 msgid "Actual Qty: Quantity available in the warehouse." @@ -2412,21 +2488,21 @@ msgstr "" #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1005 msgid "Ad-hoc Qty" -msgstr "" +msgstr "Namen Količina" #: erpnext/stock/doctype/item/item.js:557 #: erpnext/stock/doctype/price_list/price_list.js:8 msgid "Add / Edit Prices" -msgstr "" +msgstr "Dodaj/Uredi Cene" #: erpnext/accounts/report/general_ledger/general_ledger.js:207 msgid "Add Columns in Transaction Currency" -msgstr "" +msgstr "Dodaj stolpce v valuti transakcije" #: erpnext/templates/pages/task_info.html:94 #: erpnext/templates/pages/task_info.html:96 msgid "Add Comment" -msgstr "" +msgstr "Dodaj komentar" #. Label of the add_corrective_operation_cost_in_finished_good_valuation #. (Check) field in DocType 'Manufacturing Settings' @@ -2436,39 +2512,39 @@ msgstr "" #: erpnext/public/js/event.js:24 msgid "Add Customers" -msgstr "" +msgstr "Dodaj Stranke" #: erpnext/selling/page/point_of_sale/pos_item_cart.js:92 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:442 msgid "Add Discount" -msgstr "" +msgstr "Dodaj Popust" #: erpnext/public/js/event.js:40 msgid "Add Employees" -msgstr "" +msgstr "Dodaj Osebje" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:234 #: erpnext/selling/doctype/sales_order/sales_order.js:277 #: erpnext/stock/dashboard/item_dashboard.js:216 msgid "Add Item" -msgstr "" +msgstr "Dodaj Artikel" #: erpnext/public/js/utils/item_selector.js:20 #: erpnext/public/js/utils/item_selector.js:35 msgid "Add Items" -msgstr "" +msgstr "Dodaj Artikle" #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py:56 msgid "Add Items in the Purpose Table" -msgstr "" +msgstr "Dodaj Artikle v Tabelo Namenov" #: erpnext/crm/doctype/lead/lead.js:84 msgid "Add Lead to Prospect" -msgstr "" +msgstr "Dodaj Potencialne Stranke k Priložnosti" #: erpnext/public/js/event.js:16 msgid "Add Leads" -msgstr "" +msgstr "Dodaj Potencialne Stranke" #. Label of the add_local_holidays (Section Break) field in DocType 'Holiday #. List' @@ -2479,36 +2555,36 @@ msgstr "" #. Label of the add_manually (Check) field in DocType 'Repost Payment Ledger' #: erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json msgid "Add Manually" -msgstr "" +msgstr "Dodaj Ročno" #: erpnext/projects/doctype/task/task_tree.js:49 msgid "Add Multiple Tasks" -msgstr "" +msgstr "Dodaj več Opravil" #. Label of the add_deduct_tax (Select) field in DocType 'Advance Taxes and #. Charges' #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json msgid "Add Or Deduct" -msgstr "" +msgstr "Dodaj ali Odštej" #: erpnext/selling/page/point_of_sale/pos_item_cart.js:280 msgid "Add Order Discount" -msgstr "" +msgstr "Dodaj Popust za Naročilo" #. Label of the add_quote (Check) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Add Quote" -msgstr "" +msgstr "Dodaj Ponudbo" #. Label of the add_raw_materials (Button) field in DocType 'BOM Operation' #: erpnext/manufacturing/doctype/bom/bom.js:973 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json msgid "Add Raw Materials" -msgstr "" +msgstr "Dodaj Surovine" #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.js:82 msgid "Add Safety Stock" -msgstr "" +msgstr "Dodaj Varnostno Zalogo" #: erpnext/public/js/event.js:48 msgid "Add Sales Partners" @@ -2645,7 +2721,7 @@ msgstr "" #: erpnext/selling/page/point_of_sale/pos_item_cart.js:450 msgid "Additional" -msgstr "" +msgstr "Dodatno" #. Label of the additional_asset_cost (Currency) field in DocType 'Asset' #: erpnext/assets/doctype/asset/asset.json @@ -3028,7 +3104,7 @@ msgstr "" #. Label of the adjust_qty (Float) field in DocType 'Sales Forecast Item' #: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json msgid "Adjust Qty" -msgstr "" +msgstr "Prilagodi Količino" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1111 msgid "Adjustment Against" @@ -3072,12 +3148,12 @@ msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/selling/doctype/sales_order/sales_order.json msgid "Advance Paid" -msgstr "" +msgstr "Predplačilo" #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:75 #: erpnext/selling/doctype/sales_order/sales_order_list.js:122 msgid "Advance Payment" -msgstr "" +msgstr "Predplačilo" #. Option for the 'Reconciliation Takes Effect On' (Select) field in DocType #. 'Company' @@ -3149,7 +3225,7 @@ msgstr "" #. Advance' #: erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json msgid "Advance amount" -msgstr "" +msgstr "Znesek Predplačila" #: erpnext/controllers/taxes_and_totals.py:868 msgid "Advance amount cannot be greater than {0} {1}" @@ -3181,7 +3257,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json msgid "Advances" -msgstr "" +msgstr "Predplačila" #: erpnext/setup/setup_wizard/data/marketing_source.txt:3 msgid "Advertisement" @@ -3205,7 +3281,7 @@ msgstr "" #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:20 msgid "Against" -msgstr "" +msgstr "Proti" #. Label of the against_account (Data) field in DocType 'Bank Clearance Detail' #. Label of the against_account (Text) field in DocType 'Journal Entry Account' @@ -3369,7 +3445,7 @@ msgstr "" #: erpnext/manufacturing/report/work_order_summary/work_order_summary.py:259 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:102 msgid "Age" -msgstr "" +msgstr "Starost" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:154 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:133 @@ -3397,23 +3473,23 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:35 #: erpnext/stock/report/stock_ageing/stock_ageing.js:58 msgid "Ageing Range" -msgstr "" +msgstr "Starostno Obdobje" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:104 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:352 msgid "Ageing Report based on {0} up to {1}" -msgstr "" +msgstr "Poročilo o staranju na podlagi {0} do {1}" #. Label of the agenda (Table) field in DocType 'Quality Meeting' #. Label of the agenda (Text Editor) field in DocType 'Quality Meeting Agenda' #: erpnext/quality_management/doctype/quality_meeting/quality_meeting.json #: erpnext/quality_management/doctype/quality_meeting_agenda/quality_meeting_agenda.json msgid "Agenda" -msgstr "" +msgstr "Dnevni red" #: erpnext/setup/setup_wizard/data/sales_partner_type.txt:4 msgid "Agent" -msgstr "" +msgstr "Agent" #. Label of the agent_busy_message (Data) field in DocType 'Incoming Call #. Settings' @@ -3428,13 +3504,13 @@ msgstr "" #. 'Appointment Booking Settings' #: erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json msgid "Agent Details" -msgstr "" +msgstr "Podrobnosti Agenta" #. Label of the agent_group (Link) field in DocType 'Incoming Call Handling #. Schedule' #: erpnext/telephony/doctype/incoming_call_handling_schedule/incoming_call_handling_schedule.json msgid "Agent Group" -msgstr "" +msgstr "Skupina Agentov" #. Label of the agent_unavailable_message (Data) field in DocType 'Incoming #. Call Settings' @@ -3449,7 +3525,7 @@ msgstr "" #. Booking Settings' #: erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json msgid "Agents" -msgstr "" +msgstr "Agenti" #. Description of a DocType #: erpnext/selling/doctype/product_bundle/product_bundle.json @@ -3458,7 +3534,7 @@ msgstr "" #: erpnext/setup/setup_wizard/data/industry_type.txt:4 msgid "Agriculture" -msgstr "" +msgstr "Kmetijstvo" #: erpnext/setup/setup_wizard/data/industry_type.txt:5 msgid "Airline" @@ -3468,14 +3544,14 @@ msgstr "" #. Statements' #: erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json msgid "Algorithm" -msgstr "" +msgstr "Algoritem" #: 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:1483 erpnext/public/js/setup_wizard.js:184 msgid "All Accounts" -msgstr "" +msgstr "Kontni Načrt" #. Label of the all_activities_section (Section Break) field in DocType 'Lead' #. Label of the all_activities_section (Section Break) field in DocType @@ -3486,7 +3562,7 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.json msgid "All Activities" -msgstr "" +msgstr "Vse Dejavnosti" #. Label of the all_activities_html (HTML) field in DocType 'Lead' #. Label of the all_activities_html (HTML) field in DocType 'Opportunity' @@ -3495,16 +3571,16 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.json msgid "All Activities HTML" -msgstr "" +msgstr "Vse Dejavnosti HTML" #: erpnext/manufacturing/doctype/bom/bom.py:303 msgid "All BOMs" -msgstr "" +msgstr "Vse Kosovnice" #. Option for the 'Send To' (Select) field in DocType 'SMS Center' #: erpnext/selling/doctype/sms_center/sms_center.json msgid "All Contact" -msgstr "" +msgstr "Vsi Stiki" #. Option for the 'Send To' (Select) field in DocType 'SMS Center' #: erpnext/selling/doctype/sms_center/sms_center.json @@ -3541,7 +3617,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:467 #: erpnext/setup/doctype/company/company.py:473 msgid "All Departments" -msgstr "" +msgstr "Vsi Oddelki" #. Option for the 'Send To' (Select) field in DocType 'SMS Center' #: erpnext/selling/doctype/sms_center/sms_center.json @@ -3561,7 +3637,7 @@ msgstr "" #: erpnext/selling/page/point_of_sale/pos_item_selector.js:25 msgid "All Items" -msgstr "" +msgstr "Vsi Artikli" #. Option for the 'Send To' (Select) field in DocType 'SMS Center' #: erpnext/selling/doctype/sms_center/sms_center.json @@ -3570,17 +3646,17 @@ msgstr "" #: erpnext/accounts/report/general_ledger/general_ledger.html:68 msgid "All Parties " -msgstr "" +msgstr "Vse Stranke " #. Option for the 'Send To' (Select) field in DocType 'SMS Center' #: erpnext/selling/doctype/sms_center/sms_center.json msgid "All Sales Partner Contact" -msgstr "" +msgstr "Vsi Kontakti Prodajnih Partnerjev" #. Option for the 'Send To' (Select) field in DocType 'SMS Center' #: erpnext/selling/doctype/sms_center/sms_center.json msgid "All Sales Person" -msgstr "" +msgstr "Vsi Prodajni Predstavniki" #. Description of a DocType #: erpnext/setup/doctype/sales_person/sales_person.json @@ -3605,7 +3681,7 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/install_fixtures.py:236 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:242 msgid "All Supplier Groups" -msgstr "" +msgstr "Vse Skupine Dobaviteljev" #: erpnext/patches/v13_0/remove_bad_selling_defaults.py:12 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:145 @@ -3613,11 +3689,11 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/install_fixtures.py:154 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:160 msgid "All Territories" -msgstr "" +msgstr "Vsa Ozemlja" #: erpnext/setup/doctype/company/company.py:338 msgid "All Warehouses" -msgstr "" +msgstr "Vsa Skladišča" #. Description of the 'Reconciled' (Check) field in DocType 'Process Payment #. Reconciliation Log' @@ -3679,7 +3755,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:101 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:108 msgid "Allocate" -msgstr "" +msgstr "Dodeli" #. Label of the allocate_advances_automatically (Check) field in DocType 'POS #. Invoice' @@ -3688,17 +3764,17 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json msgid "Allocate Advances Automatically (FIFO)" -msgstr "" +msgstr "Samodejna Dodelitev Predplačil (FIFO)" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:910 msgid "Allocate Payment Amount" -msgstr "" +msgstr "Dodeli Znesek Plačila" #. Label of the allocate_payment_based_on_payment_terms (Check) field in #. DocType 'Payment Terms Template' #: erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json msgid "Allocate Payment Based On Payment Terms" -msgstr "" +msgstr "Dodeli Plačilo na podlagi Plačilnih Pogojev" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" @@ -3711,7 +3787,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Allocated" -msgstr "" +msgstr "Dodeljeno" #. Label of the allocated_amount (Currency) field in DocType 'Advance Tax' #. Label of the allocated_amount (Currency) field in DocType 'Advance Taxes and @@ -3739,23 +3815,23 @@ msgstr "" #: erpnext/accounts/report/gross_profit/gross_profit.py:398 #: erpnext/public/js/utils/unreconcile.js:87 msgid "Allocated Amount" -msgstr "" +msgstr "Dodeljeni Znesek" #. Label of the sec_break2 (Section Break) field in DocType 'Payment #. Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Allocated Entries" -msgstr "" +msgstr "Dodeljeni Vnosi" #: erpnext/public/js/templates/crm_activities.html:49 msgid "Allocated To:" -msgstr "" +msgstr "Dodeljeno:" #. Label of the allocated_amount (Currency) field in DocType 'Sales Invoice #. Advance' #: erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json msgid "Allocated amount" -msgstr "" +msgstr "Dodeljeni Znesek" #: erpnext/accounts/utils.py:617 msgid "Allocated amount cannot be greater than unadjusted amount" @@ -3769,7 +3845,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:282 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Allocation" -msgstr "" +msgstr "Dodela" #. Label of the allocations (Table) field in DocType 'Process Payment #. Reconciliation Log' @@ -3780,11 +3856,11 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/public/js/utils/unreconcile.js:104 msgid "Allocations" -msgstr "" +msgstr "Dodelitve" #: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:422 msgid "Allotted Qty" -msgstr "" +msgstr "Dodeljena Količina" #. Label of the allow_account_creation_against_child_company (Check) field in #. DocType 'Company' @@ -3811,7 +3887,7 @@ msgstr "" #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Allow Alternative Item" -msgstr "" +msgstr "Dovoli Alternativni Artikel" #: erpnext/stock/doctype/item_alternative/item_alternative.py:65 msgid "Allow Alternative Item must be checked on Item {}" @@ -4001,7 +4077,7 @@ msgstr "" #. Label of the is_sales_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Allow Sales" -msgstr "" +msgstr "Dovoli Prodajo" #. Label of the dn_required (Check) field in DocType 'Customer' #: erpnext/selling/doctype/customer/customer.json @@ -4449,7 +4525,7 @@ msgstr "" #: erpnext/templates/form_grid/stock_entry_grid.html:11 #: erpnext/templates/pages/order.html:103 erpnext/templates/pages/rfq.html:46 msgid "Amount" -msgstr "" +msgstr "Znesek" #: erpnext/regional/report/uae_vat_201/uae_vat_201.py:22 msgid "Amount (AED)" @@ -4495,7 +4571,7 @@ msgstr "" #: 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 "" +msgstr "Znesek (Valuta Podjetja)" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:314 msgid "Amount Delivered" @@ -4505,7 +4581,7 @@ msgstr "" #. Reconciliation Item' #: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json msgid "Amount Difference" -msgstr "" +msgstr "Razlika v Znesku" #. Label of the amount_difference_with_purchase_invoice (Currency) field in #. DocType 'Purchase Receipt Item' @@ -4584,32 +4660,32 @@ msgstr "" #. Label of the amounts_section (Section Break) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json msgid "Amounts" -msgstr "" +msgstr "Zneski" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Ampere" -msgstr "" +msgstr "Amper" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Ampere-Hour" -msgstr "" +msgstr "Amper-ura" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Ampere-Minute" -msgstr "" +msgstr "Amper-minuta" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Ampere-Second" -msgstr "" +msgstr "Amper-sekunda" #: erpnext/controllers/trends.py:269 erpnext/controllers/trends.py:281 #: erpnext/controllers/trends.py:290 msgid "Amt" -msgstr "" +msgstr "Znesek" #. Description of a DocType #: erpnext/setup/doctype/item_group/item_group.json @@ -4635,11 +4711,11 @@ msgstr "" #: erpnext/setup/setup_wizard/data/designation.txt:4 msgid "Analyst" -msgstr "" +msgstr "Analitik" #: erpnext/public/js/utils.js:93 msgid "Annual Billing: {0}" -msgstr "" +msgstr "Letni Obračun: {0}" #: erpnext/controllers/budget_controller.py:446 msgid "Annual Budget for Account {0} against {1} {2} is {3}. It will be collectively ({4}) exceeded by {5}" @@ -4652,12 +4728,12 @@ msgstr "" #. Label of the expense_year_to_date (Check) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Annual Expenses" -msgstr "" +msgstr "Letni Stroški" #. Label of the income_year_to_date (Check) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Annual Income" -msgstr "" +msgstr "Letni Dohodek" #. Label of the annual_revenue (Currency) field in DocType 'Lead' #. Label of the annual_revenue (Currency) field in DocType 'Opportunity' @@ -4666,7 +4742,7 @@ msgstr "" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/prospect/prospect.json msgid "Annual Revenue" -msgstr "" +msgstr "Letni Prihodek" #: erpnext/accounts/doctype/budget/budget.py:86 msgid "Another Budget record '{0}' already exists against {1} '{2}' and account '{3}' for fiscal year {4}" @@ -4690,7 +4766,7 @@ msgstr "" #: erpnext/setup/setup_wizard/data/industry_type.txt:6 msgid "Apparel & Accessories" -msgstr "" +msgstr "Oblačila & Dodatki" #. Label of the applicable_charges (Currency) field in DocType 'Landed Cost #. Item' @@ -4699,13 +4775,13 @@ msgstr "" #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json msgid "Applicable Charges" -msgstr "" +msgstr "Veljavni Stroški" #. Label of the dimensions (Table) field in DocType 'Accounting Dimension #. Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json msgid "Applicable Dimension" -msgstr "" +msgstr "Veljavna Dimenzija" #. Description of the 'Holiday List' (Link) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json @@ -5082,7 +5158,7 @@ msgstr "" #. Label of the area_uom (Link) field in DocType 'Location' #: erpnext/assets/doctype/location/location.json msgid "Area UOM" -msgstr "" +msgstr "Območna Enota" #: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:430 msgid "Arrival Quantity" @@ -5091,7 +5167,7 @@ msgstr "" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Arshin" -msgstr "" +msgstr "Aršin" #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:57 #: erpnext/stock/report/stock_ageing/stock_ageing.js:16 @@ -5184,12 +5260,12 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:215 #: erpnext/stock/doctype/serial_no/serial_no.json msgid "Asset" -msgstr "" +msgstr "Sredstvo" #. Label of the asset_account (Link) field in DocType 'Share Transfer' #: erpnext/accounts/doctype/share_transfer/share_transfer.json msgid "Asset Account" -msgstr "" +msgstr "Račun Sredstev" #. Name of a DocType #. Name of a report @@ -5198,7 +5274,7 @@ msgstr "" #: erpnext/assets/report/asset_activity/asset_activity.json #: erpnext/assets/workspace/assets/assets.json msgid "Asset Activity" -msgstr "" +msgstr "Dejavnost Sredstev" #. Group in Asset's connections #. Name of a DocType @@ -5207,7 +5283,7 @@ msgstr "" #: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json #: erpnext/assets/workspace/assets/assets.json msgid "Asset Capitalization" -msgstr "" +msgstr "Kapitalizacija Sredstev" #. Name of a DocType #: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json @@ -5666,7 +5742,7 @@ msgstr "" #: erpnext/assets/doctype/asset_movement/asset_movement.json #: erpnext/assets/workspace/assets/assets.json msgid "Assets" -msgstr "" +msgstr "Sredstva" #: erpnext/controllers/buying_controller.py:1025 msgid "Assets not created for {item_code}. You will have to create asset manually." @@ -5784,7 +5860,7 @@ msgstr "" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Atmosphere" -msgstr "" +msgstr "Atmosfera" #: erpnext/public/js/utils/serial_no_batch_selector.js:244 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:73 @@ -5818,12 +5894,12 @@ msgstr "" #: erpnext/portal/doctype/website_attribute/website_attribute.json #: erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json msgid "Attribute" -msgstr "" +msgstr "Atribut" #. Label of the attribute_name (Data) field in DocType 'Item Attribute' #: erpnext/stock/doctype/item_attribute/item_attribute.json msgid "Attribute Name" -msgstr "" +msgstr "Ime Atributa" #. Label of the attribute_value (Data) field in DocType 'Item Attribute Value' #. Label of the attribute_value (Data) field in DocType 'Item Variant @@ -5831,11 +5907,11 @@ msgstr "" #: erpnext/stock/doctype/item_attribute_value/item_attribute_value.json #: erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json msgid "Attribute Value" -msgstr "" +msgstr "Vrednost Atributa" #: erpnext/stock/doctype/item/item.py:920 msgid "Attribute table is mandatory" -msgstr "" +msgstr "Tabela Atributov je obvezna" #: erpnext/stock/doctype/item_attribute/item_attribute.py:108 msgid "Attribute value: {0} must appear only once" @@ -5847,7 +5923,7 @@ msgstr "" #: erpnext/stock/doctype/item/item.py:852 msgid "Attributes" -msgstr "" +msgstr "Atributi" #. Name of a role #: erpnext/accounts/doctype/account/account.json @@ -5867,7 +5943,7 @@ msgstr "" #: erpnext/regional/doctype/south_africa_vat_settings/south_africa_vat_settings.json #: erpnext/setup/doctype/company/company.json msgid "Auditor" -msgstr "" +msgstr "Revizor" #: erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py:68 msgid "Authentication Failed" @@ -6044,7 +6120,7 @@ msgstr "" #. Label of the reorder_section (Section Break) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto re-order" -msgstr "" +msgstr "Samodejno ponovno naročanje" #: erpnext/public/js/controllers/buying.js:375 #: erpnext/public/js/utils/sales_common.js:459 @@ -6146,7 +6222,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list_item/pick_list_item.json #: erpnext/stock/report/stock_ageing/stock_ageing.py:167 msgid "Available Qty" -msgstr "" +msgstr "Razpoložljiva Količina" #. Label of the required_qty (Float) field in DocType 'Purchase Receipt Item #. Supplied' @@ -6155,19 +6231,19 @@ msgstr "" #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json msgid "Available Qty For Consumption" -msgstr "" +msgstr "Razpoložljiva Količina za Porabo" #. Label of the company_total_stock (Float) field in DocType 'Purchase Order #. Item' #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json msgid "Available Qty at Company" -msgstr "" +msgstr "Razpoložljiva Količina v Podjetju" #. Label of the available_qty_at_source_warehouse (Float) field in DocType #. 'Work Order Item' #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json msgid "Available Qty at Source Warehouse" -msgstr "" +msgstr "Razpoložljiva Količina v Skladišču Virov" #. Label of the actual_qty (Float) field in DocType 'Purchase Order Item' #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -6301,12 +6377,12 @@ msgstr "" #. Option for the 'Blood Group' (Select) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "B+" -msgstr "" +msgstr "B+" #. Option for the 'Blood Group' (Select) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "B-" -msgstr "" +msgstr "B-" #. Option for the 'Algorithm' (Select) field in DocType 'Bisect Accounting #. Statements' @@ -6318,7 +6394,7 @@ msgstr "" #. Request Plan Item' #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json msgid "BIN Qty" -msgstr "" +msgstr "Skladiščna Količina" #. Label of the bom (Link) field in DocType 'Purchase Invoice Item' #. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) @@ -6359,30 +6435,30 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json msgid "BOM" -msgstr "" +msgstr "Kosovnica" #: erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:21 msgid "BOM 1" -msgstr "" +msgstr "Kosovnica 1" #: erpnext/manufacturing/doctype/bom/bom.py:1628 msgid "BOM 1 {0} and BOM 2 {1} should not be same" -msgstr "" +msgstr "Kosovnica 1 {0} in Kosovnica 2 {1} ne smeta biti enaka" #: erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:38 msgid "BOM 2" -msgstr "" +msgstr "Kosovnica 2" #. Label of a Link in the Manufacturing Workspace #: erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:4 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json msgid "BOM Comparison Tool" -msgstr "" +msgstr "Orodje za primerjavo Kosovnice" #. Label of the bom_created (Check) field in DocType 'BOM Creator Item' #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json msgid "BOM Created" -msgstr "" +msgstr "Kosovnica Ustvarjena" #. Label of the bom_creator (Link) field in DocType 'BOM' #. Name of a DocType @@ -6391,14 +6467,14 @@ msgstr "" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json msgid "BOM Creator" -msgstr "" +msgstr "Ustvarjalnik Kosovnice" #. Label of the bom_creator_item (Data) field in DocType 'BOM' #. Name of a DocType #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json msgid "BOM Creator Item" -msgstr "" +msgstr "Artikel Ustvarjalca Kosovnice" #. Label of the bom_detail_no (Data) field in DocType 'Purchase Order Item #. Supplied' @@ -6416,12 +6492,12 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json msgid "BOM Detail No" -msgstr "" +msgstr "Številka Podrobnosti Kosovnice" #. Name of a report #: erpnext/manufacturing/report/bom_explorer/bom_explorer.json msgid "BOM Explorer" -msgstr "" +msgstr "Raziskovalec Kosovnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json @@ -6431,22 +6507,22 @@ msgstr "" #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:20 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:101 msgid "BOM ID" -msgstr "" +msgstr "ID Kosovnice" #. Label of the bom_info_section (Section Break) field in DocType 'Stock Entry' #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "BOM Info" -msgstr "" +msgstr "Informacije Kosovnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_item/bom_item.json msgid "BOM Item" -msgstr "" +msgstr "Artikel Kosovnice" #: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:59 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:174 msgid "BOM Level" -msgstr "" +msgstr "Raven Kosovnice" #. Label of the bom_no (Link) field in DocType 'BOM Item' #. Label of the bom_no (Link) field in DocType 'BOM Operation' @@ -6476,24 +6552,24 @@ msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "BOM No" -msgstr "" +msgstr "Številka Kosovnice" #. Label of the bom_no (Link) field in DocType 'Work Order Operation' #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "BOM No (For Semi-Finished Goods)" -msgstr "" +msgstr "Številka Kosovnice (za polizdelke)" #. Description of the 'BOM No' (Link) field in DocType 'Stock Entry Detail' #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "BOM No. for a Finished Good Item" -msgstr "" +msgstr "Številka Kosovnice za končni izdelek" #. Name of a DocType #. Label of the operations (Table) field in DocType 'Routing' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/routing/routing.json msgid "BOM Operation" -msgstr "" +msgstr "Operacija Kosovnice" #. Name of a report #. Label of a Link in the Manufacturing Workspace @@ -6504,23 +6580,23 @@ msgstr "" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:25 msgid "BOM Qty" -msgstr "" +msgstr "Količina Kosovnice" #: erpnext/stock/report/item_prices/item_prices.py:60 msgid "BOM Rate" -msgstr "" +msgstr "Cena Kosovnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json msgid "BOM Scrap Item" -msgstr "" +msgstr "Odpadni Artikel Kosovnice" #. Label of a Link in the Manufacturing Workspace #. Name of a report #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/report/bom_search/bom_search.json msgid "BOM Search" -msgstr "" +msgstr "Iskanje Kosovnice" #. Name of a report #: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.json @@ -6539,11 +6615,11 @@ msgstr "" #. Label of the tab_2_tab (Tab Break) field in DocType 'BOM Creator' #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json msgid "BOM Tree" -msgstr "" +msgstr "Steblo Kosovnice" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:26 msgid "BOM UoM" -msgstr "" +msgstr "Enota Kosovnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_update_batch/bom_update_batch.json @@ -6582,7 +6658,7 @@ msgstr "" #. Name of a report #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.json msgid "BOM Variance Report" -msgstr "" +msgstr "Poročilo Odstopanja Kosovnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json @@ -6636,7 +6712,7 @@ msgstr "" #. Label of the boms_updated (Long Text) field in DocType 'BOM Update Batch' #: erpnext/manufacturing/doctype/bom_update_batch/bom_update_batch.json msgid "BOMs Updated" -msgstr "" +msgstr "Kosovnica Posodobljena" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:274 msgid "BOMs created successfully" @@ -6694,27 +6770,27 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:278 #: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:71 msgid "Balance" -msgstr "" +msgstr "Stanje" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:40 msgid "Balance (Dr - Cr)" -msgstr "" +msgstr "Stanje (Dr - Cr)" #: erpnext/accounts/report/general_ledger/general_ledger.py:693 msgid "Balance ({0})" -msgstr "" +msgstr "Stanje ({0})" #. Label of the balance_in_account_currency (Currency) field in DocType #. 'Exchange Rate Revaluation Account' #: erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json msgid "Balance In Account Currency" -msgstr "" +msgstr "Stanje v Valuti Računa" #. Label of the balance_in_base_currency (Currency) field in DocType 'Exchange #. Rate Revaluation Account' #: erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json msgid "Balance In Base Currency" -msgstr "" +msgstr "Stanje v Osnovni Valuti" #: erpnext/stock/report/available_batch_report/available_batch_report.py:63 #: erpnext/stock/report/available_serial_no/available_serial_no.py:126 @@ -6722,15 +6798,15 @@ msgstr "" #: erpnext/stock/report/stock_balance/stock_balance.py:443 #: erpnext/stock/report/stock_ledger/stock_ledger.py:251 msgid "Balance Qty" -msgstr "" +msgstr "Količinsko Stanje" #: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:71 msgid "Balance Qty (Stock)" -msgstr "" +msgstr "Količinsko Stanja (Zaloga)" #: erpnext/stock/report/available_serial_no/available_serial_no.py:144 msgid "Balance Serial No" -msgstr "" +msgstr "Serijska Številka Stanja" #. Option for the 'Report Type' (Select) field in DocType 'Account' #. Option for the 'Report Type' (Select) field in DocType 'Financial Report @@ -6748,13 +6824,13 @@ msgstr "" #: erpnext/public/js/financial_statements.js:256 #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Balance Sheet" -msgstr "" +msgstr "Bilanca Stanja" #. Label of the bs_closing_balance (JSON) field in DocType 'Process Period #. Closing Voucher' #: erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.json msgid "Balance Sheet Closing Balance" -msgstr "" +msgstr "Končno Stanje Bilance Stanja" #. Label of the balance_sheet_summary (Heading) field in DocType 'Bisect #. Accounting Statements' @@ -6762,11 +6838,11 @@ msgstr "" #: erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json #: erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json msgid "Balance Sheet Summary" -msgstr "" +msgstr "Povzetek Bilance Stanja" #: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:13 msgid "Balance Stock Qty" -msgstr "" +msgstr "Bilanca Zaloge Količina" #. Label of the stock_value (Currency) field in DocType 'Stock Closing Balance' #. Label of the stock_value (Currency) field in DocType 'Stock Ledger Entry' @@ -6785,7 +6861,7 @@ msgstr "" #: erpnext/stock/report/stock_balance/stock_balance.py:450 #: erpnext/stock/report/stock_ledger/stock_ledger.py:308 msgid "Balance Value" -msgstr "" +msgstr "Vrednost Stanja" #: erpnext/accounts/doctype/gl_entry/gl_entry.py:346 msgid "Balance for Account {0} must always be {1}" @@ -6821,18 +6897,18 @@ msgstr "" #: erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py:99 #: erpnext/setup/doctype/employee/employee.json msgid "Bank" -msgstr "" +msgstr "Banka" #. Label of the bank_cash_account (Link) field in DocType 'Payment #. Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Bank / Cash Account" -msgstr "" +msgstr "Bančni / Gotovinski Račun" #. Label of the bank_ac_no (Data) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "Bank A/C No." -msgstr "" +msgstr "Številka Bančnega Računa." #. Name of a DocType #. Label of the bank_account (Link) field in DocType 'Bank Clearance' @@ -6860,7 +6936,7 @@ msgstr "" #: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.js:16 #: erpnext/accounts/workspace/accounting/accounting.json msgid "Bank Account" -msgstr "" +msgstr "Bančni Račun" #. Label of the bank_account_details (Section Break) field in DocType 'Payment #. Order Reference' @@ -6869,7 +6945,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json #: erpnext/accounts/doctype/payment_request/payment_request.json msgid "Bank Account Details" -msgstr "" +msgstr "Podrobnosti Bančnega Računu" #. Label of the bank_account_info (Section Break) field in DocType 'Bank #. Guarantee' @@ -6905,32 +6981,32 @@ msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:15 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:20 msgid "Bank Accounts" -msgstr "" +msgstr "Bančni Računi" #. Label of the bank_balance (Check) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Bank Balance" -msgstr "" +msgstr "Bančno Stanje" #. Label of the bank_charges (Currency) field in DocType 'Invoice Discounting' #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:133 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:219 #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json msgid "Bank Charges" -msgstr "" +msgstr "Bančne Provizije" #. Label of the bank_charges_account (Link) field in DocType 'Invoice #. Discounting' #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json msgid "Bank Charges Account" -msgstr "" +msgstr "Račun Bančne Provizije" #. Name of a DocType #. Label of a Link in the Accounting Workspace #: erpnext/accounts/doctype/bank_clearance/bank_clearance.json #: erpnext/accounts/workspace/accounting/accounting.json msgid "Bank Clearance" -msgstr "" +msgstr "Bančno Poravnavo" #. Name of a DocType #: erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json @@ -6954,7 +7030,7 @@ msgstr "" #: erpnext/accounts/doctype/bank/bank_dashboard.py:7 #: erpnext/setup/doctype/employee/employee.json msgid "Bank Details" -msgstr "" +msgstr "Bančne Podrobnosti" #: erpnext/setup/setup_wizard/operations/install_fixtures.py:260 msgid "Bank Draft" @@ -6990,7 +7066,7 @@ msgstr "" #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json #: erpnext/setup/doctype/employee/employee.json msgid "Bank Name" -msgstr "" +msgstr "Ime Banke" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:308 @@ -7025,7 +7101,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js:32 msgid "Bank Transaction" -msgstr "" +msgstr "Bančna Transakcija" #. Label of the bank_transaction_mapping (Table) field in DocType 'Bank' #. Name of a DocType @@ -7091,26 +7167,26 @@ msgstr "" #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/setup/setup_wizard/data/industry_type.txt:8 msgid "Banking" -msgstr "" +msgstr "Bančništvo" #. Label of the barcode_type (Select) field in DocType 'Item Barcode' #: erpnext/stock/doctype/item_barcode/item_barcode.json msgid "Barcode Type" -msgstr "" +msgstr "Tip Črtne Kode" #: erpnext/stock/doctype/item/item.py:456 msgid "Barcode {0} already used in Item {1}" -msgstr "" +msgstr "Črtna koda {0} je že uporabljena v artiklu {1}" #: erpnext/stock/doctype/item/item.py:471 msgid "Barcode {0} is not a valid {1} code" -msgstr "" +msgstr "Črtna koda {0} ni veljavna koda {1}" #. Label of the sb_barcodes (Section Break) field in DocType 'Item' #. Label of the barcodes (Table) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Barcodes" -msgstr "" +msgstr "Črtne Kode" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json @@ -7130,7 +7206,7 @@ msgstr "" #. Label of the base_amount (Currency) field in DocType 'BOM Creator Item' #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json msgid "Base Amount" -msgstr "" +msgstr "Osnovni Znesek" #. Label of the base_amount (Currency) field in DocType 'Sales Invoice Payment' #: erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json @@ -7157,7 +7233,7 @@ msgstr "" #. Label of the base_rate (Currency) field in DocType 'BOM Creator Item' #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json msgid "Base Rate" -msgstr "" +msgstr "Osnovna Cena" #. Label of the base_tax_withholding_net_total (Currency) field in DocType #. 'Purchase Invoice' @@ -7266,38 +7342,38 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:80 #: erpnext/stock/workspace/stock/stock.json msgid "Batch" -msgstr "" +msgstr "Šarža" #. Label of the description (Small Text) field in DocType 'Batch' #: erpnext/stock/doctype/batch/batch.json msgid "Batch Description" -msgstr "" +msgstr "Opis Serije" #. Label of the sb_batch (Section Break) field in DocType 'Batch' #: erpnext/stock/doctype/batch/batch.json msgid "Batch Details" -msgstr "" +msgstr "Podrobnosti Šarže" #: erpnext/stock/doctype/batch/batch.py:210 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:465 msgid "Batch Expiry Date" -msgstr "" +msgstr "Datum izteka veljavnosti Serije" #. Label of the batch_id (Data) field in DocType 'Batch' #: erpnext/stock/doctype/batch/batch.json msgid "Batch ID" -msgstr "" +msgstr "ID Šarže" #: erpnext/stock/doctype/batch/batch.py:129 msgid "Batch ID is mandatory" -msgstr "" +msgstr "ID Šarže je obvezan" #. Name of a report #. Label of a Link in the Stock Workspace #: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.json #: erpnext/stock/workspace/stock/stock.json msgid "Batch Item Expiry Status" -msgstr "" +msgstr "Stanje izteka veljavnosti Artikla Šarže" #. Label of the batch_no (Link) field in DocType 'POS Invoice Item' #. Label of the batch_no (Link) field in DocType 'Purchase Invoice Item' @@ -7358,15 +7434,15 @@ msgstr "" #: 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" -msgstr "" +msgstr "Številke Šarže" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1080 msgid "Batch No is mandatory" -msgstr "" +msgstr "Številka Šarže je obvezna" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2994 msgid "Batch No {0} does not exists" -msgstr "" +msgstr "Številka Šarže {0} ne obstaja" #: erpnext/stock/utils.py:640 msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead." @@ -7379,13 +7455,13 @@ msgstr "" #. Label of the batch_no (Int) field in DocType 'BOM Update Batch' #: erpnext/manufacturing/doctype/bom_update_batch/bom_update_batch.json msgid "Batch No." -msgstr "" +msgstr "Številke Šarže." #: erpnext/public/js/utils/serial_no_batch_selector.js:16 #: erpnext/public/js/utils/serial_no_batch_selector.js:190 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:50 msgid "Batch Nos" -msgstr "" +msgstr "Številke Šarže" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1658 msgid "Batch Nos are created successfully" @@ -7402,7 +7478,7 @@ msgstr "" #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:161 msgid "Batch Qty" -msgstr "" +msgstr "Količina Šarže" #: erpnext/stock/doctype/batch/batch.py:170 msgid "Batch Qty updated to {0}" @@ -7423,12 +7499,12 @@ msgstr "" #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Batch Size" -msgstr "" +msgstr "Velikost Šarže" #. Label of the stock_uom (Link) field in DocType 'Batch' #: erpnext/stock/doctype/batch/batch.json msgid "Batch UOM" -msgstr "" +msgstr "Šaržna Enota" #. Label of the batch_and_serial_no_section (Section Break) field in DocType #. 'Asset Capitalization Stock Item' @@ -7468,7 +7544,7 @@ msgstr "" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:183 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:86 msgid "Batchwise Valuation" -msgstr "" +msgstr "Vrednotenje Šarže" #. Label of the section_break_3 (Section Break) field in DocType 'Stock #. Reconciliation Item' @@ -7542,7 +7618,7 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:209 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:298 msgid "Billed Amount" -msgstr "" +msgstr "Znesek Fakture" #. Label of the billed_amt (Currency) field in DocType 'Sales Order Item' #. Label of the billed_amt (Currency) field in DocType 'Delivery Note Item' @@ -7551,7 +7627,7 @@ msgstr "" #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Billed Amt" -msgstr "" +msgstr "Obračunani Znesek" #. Name of a report #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.json @@ -7634,7 +7710,7 @@ msgstr "" #: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:73 #: erpnext/selling/report/territory_wise_sales/territory_wise_sales.py:50 msgid "Billing Amount" -msgstr "" +msgstr "Znesek Fakture" #. Label of the billing_city (Data) field in DocType 'Tax Rule' #: erpnext/accounts/doctype/tax_rule/tax_rule.json @@ -7680,7 +7756,7 @@ msgstr "" #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.json #: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:67 msgid "Billing Hours" -msgstr "" +msgstr "Ure Fakture" #. Label of the billing_interval (Select) field in DocType 'Subscription Plan' #: erpnext/accounts/doctype/subscription_plan/subscription_plan.json @@ -7719,7 +7795,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:31 msgid "Billing Status" -msgstr "" +msgstr "Stanje Fakture" #. Label of the billing_zipcode (Data) field in DocType 'Tax Rule' #: erpnext/accounts/doctype/tax_rule/tax_rule.json @@ -7747,7 +7823,7 @@ msgstr "" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Biot" -msgstr "" +msgstr "Biot" #: erpnext/setup/setup_wizard/data/industry_type.txt:9 msgid "Biotechnology" @@ -7986,7 +8062,7 @@ msgstr "" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Box" -msgstr "" +msgstr "Škatla" #. Label of the branch (Link) field in DocType 'SMS Center' #. Name of a DocType @@ -8232,7 +8308,7 @@ msgstr "" #: erpnext/stock/doctype/batch/batch_dashboard.py:8 #: erpnext/stock/doctype/item/item_dashboard.py:22 msgid "Buy" -msgstr "" +msgstr "Nabava" #. Description of a DocType #: erpnext/selling/doctype/customer/customer.json @@ -8260,7 +8336,7 @@ msgstr "" #: erpnext/stock/doctype/item_price/item_price.json #: erpnext/stock/doctype/price_list/price_list.json msgid "Buying" -msgstr "" +msgstr "Nabava" #. Label of the sales_settings (Section Break) field in DocType 'Company' #: erpnext/setup/doctype/company/company.json @@ -8273,11 +8349,11 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:40 msgid "Buying Price List" -msgstr "" +msgstr "Cenik Nabave" #: erpnext/stock/report/item_price_stock/item_price_stock.py:46 msgid "Buying Rate" -msgstr "" +msgstr "Nabavna Cena" #. Name of a DocType #. Label of a Link in the Buying Workspace @@ -8321,7 +8397,7 @@ msgstr "" #. Option for the 'Barcode Type' (Select) field in DocType 'Item Barcode' #: erpnext/stock/doctype/item_barcode/item_barcode.json msgid "CODE-39" -msgstr "" +msgstr "CODE-39" #. Name of a report #: erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.json @@ -8336,12 +8412,12 @@ msgstr "" #. Label of a Card Break in the Home Workspace #: erpnext/crm/workspace/crm/crm.json erpnext/setup/workspace/home/home.json msgid "CRM" -msgstr "" +msgstr "Prodajna Podpora" #. Name of a DocType #: erpnext/crm/doctype/crm_note/crm_note.json msgid "CRM Note" -msgstr "" +msgstr "Opomba Prodajne Podpore" #. Name of a DocType #. Label of a Link in the CRM Workspace @@ -8350,7 +8426,7 @@ msgstr "" #: erpnext/crm/workspace/crm/crm.json #: erpnext/setup/workspace/settings/settings.json msgid "CRM Settings" -msgstr "" +msgstr "Nastavitve Prodajne Podpore" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:67 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117 @@ -8574,7 +8650,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/campaign_item/campaign_item.json msgid "Campaign Item" -msgstr "" +msgstr "Artikel Kampanje" #. Label of the campaign_name (Data) field in DocType 'Campaign' #. Option for the 'Campaign Naming By' (Select) field in DocType 'CRM Settings' @@ -9478,7 +9554,7 @@ msgstr "" #: erpnext/selling/page/point_of_sale/pos_item_cart.js:92 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:148 msgid "Checkout" -msgstr "" +msgstr "Kasa" #: erpnext/selling/page/point_of_sale/pos_item_cart.js:263 msgid "Checkout Order / Submit Order / New Order" @@ -10411,7 +10487,7 @@ msgstr "" #: erpnext/support/report/issue_analytics/issue_analytics.js:8 #: erpnext/support/report/issue_summary/issue_summary.js:8 msgid "Company" -msgstr "" +msgstr "Podjetje" #: erpnext/public/js/setup_wizard.js:36 msgid "Company Abbreviation" @@ -10950,7 +11026,7 @@ msgstr "" #: erpnext/stock/doctype/serial_no/serial_no.json #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:60 msgid "Consumed" -msgstr "" +msgstr "Porabljeno" #: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 msgid "Consumed Amount" @@ -10974,7 +11050,7 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Consumed Items" -msgstr "" +msgstr "Porabljeni Artikli" #. Label of the consumed_items_cost (Currency) field in DocType 'Asset Repair' #: erpnext/assets/doctype/asset_repair/asset_repair.json @@ -11183,7 +11259,7 @@ msgstr "" #: erpnext/crm/doctype/contract/contract.json #: erpnext/crm/workspace/crm/crm.json msgid "Contract" -msgstr "" +msgstr "Pogodba" #. Label of the sb_contract (Section Break) field in DocType 'Contract' #: erpnext/crm/doctype/contract/contract.json @@ -11616,7 +11692,7 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json msgid "Cost Center" -msgstr "" +msgstr "Stroškovno Središče" #. Name of a DocType #. Label of a Link in the Accounting Workspace @@ -12996,18 +13072,18 @@ msgstr "" #: erpnext/support/web_form/issues/issues.json #: erpnext/telephony/doctype/call_log/call_log.json msgid "Customer" -msgstr "" +msgstr "Stranka" #. Label of the customer (Link) field in DocType 'Customer Item' #: erpnext/accounts/doctype/customer_item/customer_item.json msgid "Customer " -msgstr "" +msgstr "Stranka " #. Label of the master_name (Dynamic Link) field in DocType 'Authorization #. Rule' #: erpnext/setup/doctype/authorization_rule/authorization_rule.json msgid "Customer / Item / Item Group" -msgstr "" +msgstr "Stranka / Artikel / Skupina Artiklov" #. Label of the customer_address (Link) field in DocType 'Opportunity' #: erpnext/crm/doctype/opportunity/opportunity.json @@ -13061,7 +13137,7 @@ msgstr "" #. Label of the customer_code (Small Text) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Customer Code" -msgstr "" +msgstr "Koda Stranke" #. Label of the customer_contact_person (Link) field in DocType 'Purchase #. Order' @@ -13116,7 +13192,7 @@ msgstr "" #: erpnext/stock/doctype/item/item.json #: erpnext/support/doctype/warranty_claim/warranty_claim.json msgid "Customer Details" -msgstr "" +msgstr "Podrobnosti Stranke" #. Label of the customer_feedback (Small Text) field in DocType 'Maintenance #. Visit' @@ -13201,12 +13277,12 @@ msgstr "" #: erpnext/support/doctype/service_level_agreement/service_level_agreement.json #: erpnext/support/doctype/warranty_claim/warranty_claim.json msgid "Customer Group" -msgstr "" +msgstr "Skupina Stranke" #. Name of a DocType #: erpnext/accounts/doctype/customer_group_item/customer_group_item.json msgid "Customer Group Item" -msgstr "" +msgstr "Artikel Skupine Stranke" #. Label of the customer_group_name (Data) field in DocType 'Customer Group' #: erpnext/setup/doctype/customer_group/customer_group.json @@ -13225,12 +13301,12 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/customer_item/customer_item.json msgid "Customer Item" -msgstr "" +msgstr "Artikel Stranke" #. Label of the customer_items (Table) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Customer Items" -msgstr "" +msgstr "Artikli Stranke" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1235 msgid "Customer LPO" @@ -13306,7 +13382,7 @@ msgstr "" #: erpnext/support/doctype/issue/issue.json #: erpnext/support/doctype/warranty_claim/warranty_claim.json msgid "Customer Name" -msgstr "" +msgstr "Ime Stranke" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:22 msgid "Customer Name: " @@ -13336,7 +13412,7 @@ msgstr "" #: erpnext/stock/report/delayed_item_report/delayed_item_report.py:165 #: erpnext/stock/report/delayed_order_report/delayed_order_report.py:80 msgid "Customer PO" -msgstr "" +msgstr "Naročilnica Stranke" #. Label of the customer_po_details (Section Break) field in DocType 'POS #. Invoice' @@ -13382,13 +13458,13 @@ msgstr "" #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/material_request/material_request.json msgid "Customer Provided" -msgstr "" +msgstr "Zagotovila Stranka" #. Label of the customer_provided_item_cost (Currency) field in DocType 'Stock #. Entry Detail' #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Customer Provided Item Cost" -msgstr "" +msgstr "Stroški artikla, ki jih je zagotovila stranka" #: erpnext/setup/doctype/company/company.py:442 msgid "Customer Service" @@ -13419,7 +13495,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json msgid "Customer Warehouse (Optional)" -msgstr "" +msgstr "Skladišče Stranke (neobvezno)" #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py:141 msgid "Customer Warehouse {0} does not belong to Customer {1}." @@ -13441,7 +13517,7 @@ msgstr "" #. Label of the customer_or_item (Select) field in DocType 'Authorization Rule' #: erpnext/setup/doctype/authorization_rule/authorization_rule.json msgid "Customer or Item" -msgstr "" +msgstr "Stranka ali Artikel" #: erpnext/setup/doctype/authorization_rule/authorization_rule.py:95 msgid "Customer required for 'Customerwise Discount'" @@ -13464,7 +13540,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json msgid "Customer's Item Code" -msgstr "" +msgstr "Koda Artikla Stranke" #. Label of the po_no (Data) field in DocType 'POS Invoice' #. Label of the po_no (Data) field in DocType 'Sales Invoice' @@ -14034,11 +14110,11 @@ msgstr "" #. Label of the default_bom (Link) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Default BOM" -msgstr "" +msgstr "Privzeta Kosovnica" #: erpnext/stock/doctype/item/item.py:417 msgid "Default BOM ({0}) must be active for this item or its template" -msgstr "" +msgstr "Privzeta Kosovnica({0}) mora biti aktivna za ta artikel ali njegovo predlogo" #: erpnext/manufacturing/doctype/work_order/work_order.py:2151 msgid "Default BOM for {0} not found" @@ -14356,7 +14432,7 @@ msgstr "" #. Label of the stock_uom (Link) field in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Default Stock UOM" -msgstr "" +msgstr "Privzeta Enota Zaloge" #. Label of the default_supplier (Link) field in DocType 'Item Default' #: erpnext/stock/doctype/item_default/item_default.json @@ -14412,7 +14488,7 @@ msgstr "" #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Default Warehouse" -msgstr "" +msgstr "Privzeto Skladišče" #. Label of the default_warehouse_for_sales_return (Link) field in DocType #. 'Company' @@ -14714,7 +14790,7 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_scrap_item/subcontracting_inward_order_scrap_item.json msgid "Delivered Qty" -msgstr "" +msgstr "Dostavljena Količina" #. Label of the delivered_qty (Float) field in DocType 'Pick List Item' #: erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -14777,7 +14853,7 @@ msgstr "" #: erpnext/stock/doctype/delivery_trip/delivery_trip.json #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json msgid "Delivery Manager" -msgstr "" +msgstr "Vodja Dostave" #. Label of the delivery_note (Link) field in DocType 'POS Invoice Item' #. Label of the delivery_note (Link) field in DocType 'Sales Invoice Item' @@ -14918,7 +14994,7 @@ msgstr "" #: erpnext/stock/doctype/delivery_trip/delivery_trip.json #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json msgid "Delivery User" -msgstr "" +msgstr "Uporabnik Dostave" #. Label of the warehouse (Link) field in DocType 'Sales Order Item' #. Label of the delivery_warehouse (Link) field in DocType 'Subcontracting @@ -15863,7 +15939,7 @@ msgstr "" #. Label of the uom (Link) field in DocType 'Delivery Trip' #: erpnext/stock/doctype/delivery_trip/delivery_trip.json msgid "Distance UOM" -msgstr "" +msgstr "Enota Razdalja" #. Label of the acc_pay_dist_from_left_edge (Float) field in DocType 'Cheque #. Print Template' @@ -16397,17 +16473,17 @@ msgstr "" #. Option for the 'Barcode Type' (Select) field in DocType 'Item Barcode' #: erpnext/stock/doctype/item_barcode/item_barcode.json msgid "EAN" -msgstr "" +msgstr "EAN" #. Option for the 'Barcode Type' (Select) field in DocType 'Item Barcode' #: erpnext/stock/doctype/item_barcode/item_barcode.json msgid "EAN-12" -msgstr "" +msgstr "EAN-12" #. Option for the 'Barcode Type' (Select) field in DocType 'Item Barcode' #: erpnext/stock/doctype/item_barcode/item_barcode.json msgid "EAN-8" -msgstr "" +msgstr "EAN-8" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json @@ -16456,7 +16532,7 @@ msgstr "" #: erpnext/selling/page/point_of_sale/pos_item_cart.js:92 msgid "Edit Cart" -msgstr "" +msgstr "Uredi Košarico" #: erpnext/controllers/item_variant.py:155 msgid "Edit Not Allowed" @@ -16836,7 +16912,7 @@ msgstr "" #: erpnext/stock/doctype/batch/batch_list.js:16 msgid "Empty" -msgstr "" +msgstr "Prazno" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json @@ -20265,7 +20341,7 @@ msgstr "" #. Label of the gross_weight_uom (Link) field in DocType 'Packing Slip' #: erpnext/stock/doctype/packing_slip/packing_slip.json msgid "Gross Weight UOM" -msgstr "" +msgstr "Bruto Teža Enota" #. Name of a report #: erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.json @@ -21858,7 +21934,7 @@ msgstr "" #: erpnext/stock/report/stock_ledger/stock_ledger.js:108 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:51 msgid "Include UOM" -msgstr "" +msgstr "Vključi Enoto" #: erpnext/stock/report/stock_balance/stock_balance.js:131 msgid "Include Zero Stock Items" @@ -24687,7 +24763,7 @@ msgstr "" #. Label of the uom (Link) field in DocType 'BOM' #: erpnext/manufacturing/doctype/bom/bom.json msgid "Item UOM" -msgstr "" +msgstr "Artikel Enota" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:410 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:417 @@ -31283,7 +31359,7 @@ msgstr "" #. Closing Voucher' #: erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.json msgid "P&L Closing Balance" -msgstr "" +msgstr "Končno Stanje Bilance Uspeha" #. Label of the pan_no (Data) field in DocType 'Lower Deduction Certificate' #: erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json @@ -35614,7 +35690,7 @@ msgstr "" #. Label of the price_not_uom_dependent (Check) field in DocType 'Price List' #: erpnext/stock/doctype/price_list/price_list.json msgid "Price Not UOM Dependent" -msgstr "" +msgstr "Cena ni Odvisna od Enote" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:251 msgid "Price Per Unit ({0})" @@ -35850,7 +35926,7 @@ msgstr "" #: erpnext/setup/install.py:104 msgid "Print UOM after Quantity" -msgstr "" +msgstr "Izpis Enote po Količini" #. Label of the print_without_amount (Check) field in DocType 'Delivery Note' #: erpnext/stock/doctype/delivery_note/delivery_note.json @@ -38461,7 +38537,7 @@ msgstr "" #: erpnext/templates/form_grid/item_grid.html:8 #: erpnext/templates/pages/order.html:100 erpnext/templates/pages/rfq.html:43 msgid "Rate" -msgstr "" +msgstr "Cena" #. Label of the rate_amount_section (Section Break) field in DocType 'BOM Item' #: erpnext/manufacturing/doctype/bom_item/bom_item.json @@ -38487,7 +38563,7 @@ msgstr "" #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Rate (Company Currency)" -msgstr "" +msgstr "Cena (Valuta Podjetja)" #. Label of the rm_cost_as_per (Select) field in DocType 'BOM' #. Label of the rm_cost_as_per (Select) field in DocType 'BOM Creator' @@ -38532,7 +38608,7 @@ msgstr "" #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Rate With Margin" -msgstr "" +msgstr "Cena z Maržo" #. Label of the base_rate_with_margin (Currency) field in DocType 'POS Invoice #. Item' @@ -38559,7 +38635,7 @@ msgstr "" #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Rate With Margin (Company Currency)" -msgstr "" +msgstr "Cena z Maržo (Valuta Podjetja)" #. Label of the rate_and_amount (Section Break) field in DocType 'Purchase #. Receipt Item' @@ -38659,7 +38735,7 @@ msgstr "" #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Rate of Stock UOM" -msgstr "" +msgstr "Cena Enote Zaloge" #. Label of the rate_or_discount (Select) field in DocType 'Pricing Rule' #. Label of the rate_or_discount (Data) field in DocType 'Pricing Rule Detail' @@ -39519,7 +39595,7 @@ msgstr "" #: erpnext/projects/doctype/timesheet/timesheet_dashboard.py:7 #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json msgid "References" -msgstr "" +msgstr "Reference" #: erpnext/stock/doctype/delivery_note/delivery_note.py:387 msgid "References to Sales Invoices are Incomplete" @@ -42585,11 +42661,11 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/install_fixtures.py:297 #: erpnext/stock/doctype/item/item.json msgid "Sales" -msgstr "" +msgstr "Prodaja" #: erpnext/setup/doctype/company/company.py:599 msgid "Sales Account" -msgstr "" +msgstr "Prodajni Račun" #. Label of a shortcut in the CRM Workspace #. Name of a report @@ -42599,7 +42675,7 @@ msgstr "" #: erpnext/selling/report/sales_analytics/sales_analytics.json #: erpnext/selling/workspace/selling/selling.json msgid "Sales Analytics" -msgstr "" +msgstr "Prodajna Analitika" #. Label of the sales_team (Table) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -42610,12 +42686,12 @@ msgstr "" #. Default' #: erpnext/stock/doctype/item_default/item_default.json msgid "Sales Defaults" -msgstr "" +msgstr "Privzete Prodaje" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:126 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:212 msgid "Sales Expenses" -msgstr "" +msgstr "Prodajni Stroški" #. Label of the sales_forecast (Link) field in DocType 'Master Production #. Schedule' @@ -42625,7 +42701,7 @@ msgstr "" #: erpnext/manufacturing/doctype/sales_forecast/sales_forecast.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json msgid "Sales Forecast" -msgstr "" +msgstr "Napoved Prodaje" #. Name of a DocType #: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json @@ -42639,7 +42715,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.js:46 #: erpnext/selling/workspace/selling/selling.json msgid "Sales Funnel" -msgstr "" +msgstr "Prodajni Lijak" #. Label of the sales_incoming_rate (Currency) field in DocType 'Purchase #. Invoice Item' @@ -42699,12 +42775,12 @@ msgstr "" #: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json msgid "Sales Invoice" -msgstr "" +msgstr "Prodajna Faktura" #. Name of a DocType #: erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json msgid "Sales Invoice Advance" -msgstr "" +msgstr "Predplačilo Prodajne Fakture" #. Label of the sales_invoice_item (Data) field in DocType 'Purchase Invoice #. Item' @@ -42713,12 +42789,12 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json msgid "Sales Invoice Item" -msgstr "" +msgstr "Artikel Prodajne Fakture" #. Label of the sales_invoice_no (Link) field in DocType 'Stock Entry' #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Sales Invoice No" -msgstr "" +msgstr "Številka Prodajne Fakture" #. Label of the payments (Table) field in DocType 'POS Invoice' #. Label of the payments (Table) field in DocType 'Sales Invoice' @@ -42727,7 +42803,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json msgid "Sales Invoice Payment" -msgstr "" +msgstr "Plačilo Prodajne Fakture" #. Name of a DocType #: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json @@ -42874,7 +42950,7 @@ msgstr "" #: erpnext/stock/report/delayed_order_report/delayed_order_report.js:30 #: erpnext/stock/report/delayed_order_report/delayed_order_report.py:74 msgid "Sales Order" -msgstr "" +msgstr "Prodajno Naročilo" #. Label of a Link in the Receivables Workspace #. Name of a report @@ -42993,21 +43069,21 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/report/work_order_summary/work_order_summary.js:42 msgid "Sales Orders" -msgstr "" +msgstr "Prodajna Naročila" #: erpnext/manufacturing/doctype/production_plan/production_plan.py:341 msgid "Sales Orders Required" -msgstr "" +msgstr "Zahtevana Prodajna Naročila" #. Label of the sales_orders_to_bill (Check) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Sales Orders to Bill" -msgstr "" +msgstr "Prodajna Naročila za Fakturiranje" #. Label of the sales_orders_to_deliver (Check) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Sales Orders to Deliver" -msgstr "" +msgstr "Prodajna Naročila za Dostavo" #. Label of the sales_partner (Link) field in DocType 'POS Invoice' #. Option for the 'Applicable For' (Select) field in DocType 'Pricing Rule' @@ -43048,12 +43124,12 @@ msgstr "" #: erpnext/setup/doctype/sales_partner/sales_partner.json #: erpnext/stock/doctype/delivery_note/delivery_note.json msgid "Sales Partner" -msgstr "" +msgstr "Prodajni Partner" #. Label of the sales_partner (Link) field in DocType 'Sales Partner Item' #: erpnext/accounts/doctype/sales_partner_item/sales_partner_item.json msgid "Sales Partner " -msgstr "" +msgstr "Prodajni Partner " #. Name of a report #: erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.json @@ -43432,7 +43508,7 @@ msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Scan Barcode" -msgstr "" +msgstr "Skeniraj Črtno Kodo" #: erpnext/public/js/utils/serial_no_batch_selector.js:160 msgid "Scan Batch No" @@ -43740,7 +43816,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.js:325 msgid "Select Alternative Items for Sales Order" -msgstr "" +msgstr "Izberi Alternativne Artikle za Prodajno Naročilo" #: erpnext/stock/doctype/item/item.js:689 msgid "Select Attribute Values" @@ -43748,11 +43824,11 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1251 msgid "Select BOM" -msgstr "" +msgstr "Izberi Kosovnico" #: erpnext/selling/doctype/sales_order/sales_order.js:1232 msgid "Select BOM and Qty for Production" -msgstr "" +msgstr "Izberi Kosovnico in Količino za Proizvodnjo" #: erpnext/selling/doctype/sales_order/sales_order.js:1383 msgid "Select BOM, Qty and For Warehouse" @@ -45867,7 +45943,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:80 #: erpnext/accounts/report/trial_balance/trial_balance.js:100 msgid "Show unclosed fiscal year's P&L balances" -msgstr "" +msgstr "Prikaži stanja uspeha za nezaključeno poslovno leto" #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:96 msgid "Show with upcoming revenue/expense" @@ -46823,7 +46899,7 @@ msgstr "" #: erpnext/stock/doctype/warehouse_type/warehouse_type.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Stock Manager" -msgstr "" +msgstr "Vodja Zaloge" #: erpnext/stock/doctype/item/item_dashboard.py:34 msgid "Stock Movement" @@ -47014,7 +47090,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json msgid "Stock Reserved Qty (in Stock UOM)" -msgstr "" +msgstr "Zaloga Rezervirana Količina (na Enoti Zaloge)" #. Label of the auto_accounting_for_stock_settings (Section Break) field in #. DocType 'Company' @@ -47141,13 +47217,13 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json msgid "Stock UOM" -msgstr "" +msgstr "Enota Zaloga" #. Label of the conversion_factor_section (Section Break) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Stock UOM Quantity" -msgstr "" +msgstr "Količina Enote Zaloga" #: erpnext/public/js/stock_reservation.js:230 #: erpnext/selling/doctype/sales_order/sales_order.js:451 @@ -47162,7 +47238,7 @@ msgstr "" #: erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json msgid "Stock Uom" -msgstr "" +msgstr "Enota Zaloga" #. Name of a role #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json @@ -47215,7 +47291,7 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Stock User" -msgstr "" +msgstr "Uporabnik Zaloge" #. Label of the stock_validations_tab (Tab Break) field in DocType 'Stock #. Settings' @@ -52443,17 +52519,17 @@ msgstr "" #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 msgid "UOM" -msgstr "" +msgstr "Enota" #. Name of a DocType #: erpnext/stock/doctype/uom_category/uom_category.json msgid "UOM Category" -msgstr "" +msgstr "Kategorija Enote" #. Name of a DocType #: erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json msgid "UOM Conversion Detail" -msgstr "" +msgstr "Podrobnosti o Pretvorbi Enote" #. Label of the conversion_factor (Float) field in DocType 'POS Invoice Item' #. Label of the conversion_factor (Float) field in DocType 'Purchase Invoice @@ -52487,7 +52563,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list_item/pick_list_item.json #: erpnext/stock/workspace/stock/stock.json msgid "UOM Conversion Factor" -msgstr "" +msgstr "Faktor Pretvorbe Enote" #: erpnext/manufacturing/doctype/production_plan/production_plan.py:1424 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}" @@ -52500,7 +52576,7 @@ msgstr "" #. Label of the uom_name (Data) field in DocType 'UOM' #: erpnext/setup/doctype/uom/uom.json msgid "UOM Name" -msgstr "" +msgstr "Ime Enote" #: erpnext/stock/doctype/stock_entry/stock_entry.py:3507 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" @@ -52508,12 +52584,12 @@ msgstr "" #: erpnext/stock/doctype/item_price/item_price.py:61 msgid "UOM {0} not found in Item {1}" -msgstr "" +msgstr "Enota {0} ni bila najdena v artiklu {1}" #. Label of the uoms (Table) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "UOMs" -msgstr "" +msgstr "Enote" #. Option for the 'Barcode Type' (Select) field in DocType 'Item Barcode' #: erpnext/stock/doctype/item_barcode/item_barcode.json @@ -52626,7 +52702,7 @@ msgstr "" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Unit" -msgstr "" +msgstr "Enota" #: erpnext/controllers/accounts_controller.py:3930 msgid "Unit Price" @@ -52641,7 +52717,7 @@ msgstr "" #: erpnext/setup/workspace/home/home.json #: erpnext/stock/workspace/stock/stock.json msgid "Unit of Measure (UOM)" -msgstr "" +msgstr "Enota" #: erpnext/stock/doctype/item/item.py:383 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" diff --git a/erpnext/locale/sr.po b/erpnext/locale/sr.po index 8bfab929473..56bf3276901 100644 --- a/erpnext/locale/sr.po +++ b/erpnext/locale/sr.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2025-11-16 09:35+0000\n" -"PO-Revision-Date: 2025-11-18 22:13\n" +"PO-Revision-Date: 2025-11-23 23:33\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Serbian (Cyrillic)\n" "MIME-Version: 1.0\n" @@ -1265,13 +1265,13 @@ msgstr "Стање рачуна" #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account_category/account_category.json msgid "Account Category" -msgstr "" +msgstr "Категорија рачуна" #. Label of the account_category_name (Data) field in DocType 'Account #. Category' #: erpnext/accounts/doctype/account_category/account_category.json msgid "Account Category Name" -msgstr "" +msgstr "Назив категорије рачуна" #. Name of a DocType #: erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json @@ -1327,14 +1327,14 @@ msgstr "Валута рачуна (ка)" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Account Data" -msgstr "" +msgstr "Подаци о рачуну" #: erpnext/accounts/report/balance_sheet/balance_sheet.js:20 #: erpnext/accounts/report/cash_flow/cash_flow.js:29 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:21 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:20 msgid "Account Detail Level" -msgstr "" +msgstr "Ниво детаља рачуна" #. Label of the account_details_section (Section Break) field in DocType 'Bank #. Account' @@ -1997,7 +1997,7 @@ msgstr "Рачуни су закључани до датума" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:192 msgid "Accounts Included in Report" -msgstr "" +msgstr "Рачуни укључени у извештај" #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348 msgid "Accounts Missing Error" @@ -2006,7 +2006,7 @@ msgstr "Грешка због недостајућег рачуна" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:166 #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:191 msgid "Accounts Missing from Report" -msgstr "" +msgstr "Рачуни недостају у извештају" #. Option for the 'Write Off Based On' (Select) field in DocType 'Journal #. Entry' @@ -2111,7 +2111,7 @@ msgstr "Рачуни за спајање" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:264 msgid "Accrued Expenses" -msgstr "" +msgstr "Обрачунати трошкови" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json @@ -2879,7 +2879,7 @@ msgstr "Висина додатног попуста (валута компан #: erpnext/controllers/taxes_and_totals.py:731 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" -msgstr "" +msgstr "Додатни износ попуста ({discount_amount}) не може премашити укупан износ пре таквог попуста ({total_before_discount})" #. Label of the additional_discount_percentage (Float) field in DocType 'POS #. Invoice' @@ -3280,7 +3280,7 @@ msgstr "Авансне уплате распоређене према наруџ #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Advanced Filtering" -msgstr "" +msgstr "Напредно филтрирање" #. Label of the advances (Table) field in DocType 'POS Invoice' #. Label of the advances (Table) field in DocType 'Purchase Invoice' @@ -5843,7 +5843,7 @@ msgstr "Мора бити изабран барем један од продај #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:25 msgid "At least one row is required for a financial report template" -msgstr "" +msgstr "Потребан је најмање један ред у шаблону финансијског извештаја" #: erpnext/stock/doctype/stock_entry/stock_entry.py:704 msgid "At least one warehouse is mandatory" @@ -6886,7 +6886,7 @@ msgstr "Стање вредности залиха" #. Label of the balance_type (Select) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Balance Type" -msgstr "" +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 @@ -7913,7 +7913,7 @@ msgstr "Црна" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Blank Line" -msgstr "" +msgstr "Празан ред" #. Label of the blanket_order (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7997,13 +7997,13 @@ msgstr "Помоћ за текст и закључак текста" #. Label of the bold_text (Check) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Bold Text" -msgstr "" +msgstr "Подебљан текст" #. Description of the 'Bold Text' (Check) field in DocType 'Financial Report #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Bold text for emphasis (totals, major headings)" -msgstr "" +msgstr "Подебљан текст за наглашавање (укупни износи, главни наслови)" #: 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}." @@ -8518,7 +8518,7 @@ msgstr "Израчунај цену пакета производа на осн #. DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Calculate but don't show on final report" -msgstr "" +msgstr "Израчунати, али не приказивати у коначном извештају" #. Label of the calculate_depr_using_total_days (Check) field in DocType #. 'Accounts Settings' @@ -8530,7 +8530,7 @@ msgstr "Израчунај дневну амортизацију користе #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Calculated Amount" -msgstr "" +msgstr "Израчунати износ" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:53 msgid "Calculated Bank Statement balance" @@ -9931,7 +9931,7 @@ msgstr "Листа кодова" #. Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Code to reference this line in formulas (e.g., REV100, EXP200, ASSET100)" -msgstr "" +msgstr "Шифра за референцирање овог реда у формулама (нпр. REV100, EXP200, ASSET100)" #: erpnext/setup/setup_wizard/data/marketing_source.txt:4 msgid "Cold Calling" @@ -9965,7 +9965,7 @@ msgstr "Ниво колекције" #. Description of the 'Color' (Color) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Color to highlight values (e.g., red for exceptions)" -msgstr "" +msgstr "Боја за истицање вредности (нпр. црвена за изузетке)" #: erpnext/setup/setup_wizard/operations/install_fixtures.py:280 msgid "Colour" @@ -12729,7 +12729,7 @@ msgstr "Валута не може бити промењена након што #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:226 msgid "Currency filters are currently unsupported in Custom Financial Report." -msgstr "" +msgstr "Филтери по валути тренутно нису подржани у прилагођеном финансијском извештају." #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733 @@ -12908,7 +12908,7 @@ msgstr "Надзор" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Custom API" -msgstr "" +msgstr "Прилагођени API" #. Option for the 'Report Type' (Select) field in DocType 'Financial Report #. Template' @@ -12916,7 +12916,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.json msgid "Custom Financial Statement" -msgstr "" +msgstr "Прилагођени финансијски извештај" #. Label of the custom_remarks (Check) field in DocType 'Payment Entry' #: erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -13166,7 +13166,7 @@ msgstr "Адресе и контакт купца" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:268 msgid "Customer Advances" -msgstr "" +msgstr "Аванси купца" #. Label of the customer_code (Small Text) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json @@ -13718,7 +13718,7 @@ msgstr "Увоз података и подешавања" #. Label of the data_source (Select) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Data Source" -msgstr "" +msgstr "Извор података" #. Label of the date (Date) field in DocType 'Bulk Transaction Log Detail' #: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json @@ -15291,7 +15291,7 @@ msgstr "Опис садржаја" #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Descriptive name for your template (e.g., 'Standard P&L', 'Detailed Balance Sheet')" -msgstr "" +msgstr "Описни назив Вашег шаблона (нпр. 'Стандардни биланс успеха', 'Детаљан биланс стања')" #: erpnext/setup/setup_wizard/data/designation.txt:14 msgid "Designer" @@ -15558,7 +15558,7 @@ msgstr "Онемогући број серије и селектор шарже" #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Disable template to prevent use in reports" -msgstr "" +msgstr "Онемогућите шаблон да бисте спречили његово коришћење у извештајима" #: erpnext/accounts/general_ledger.py:149 msgid "Disabled Account Selected" @@ -15954,7 +15954,7 @@ msgstr "Поставке отпреме" #. Label of the display_name (Data) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Display Name" -msgstr "" +msgstr "Назив за приказ" #. Label of the disposal_date (Date) field in DocType 'Asset' #: erpnext/assets/doctype/asset/asset.json @@ -16858,7 +16858,7 @@ msgstr "Аванси запосленог лица" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:184 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:321 msgid "Employee Benefits Obligation" -msgstr "" +msgstr "Обавезе по основу бенефиција запосленим лицима" #. Label of the employee_detail (Section Break) field in DocType 'Timesheet' #: erpnext/projects/doctype/timesheet/timesheet.json @@ -18368,20 +18368,20 @@ msgstr "Финансијски показатељи" #. Name of a DocType #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Financial Report Row" -msgstr "" +msgstr "Ред финансијског извештаја" #. Name of a DocType #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Financial Report Template" -msgstr "" +msgstr "Шаблон финансијског извештаја" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:242 msgid "Financial Report Template {0} is disabled" -msgstr "" +msgstr "Шаблон финансијског извештаја {0} је онемогућен" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:239 msgid "Financial Report Template {0} not found" -msgstr "" +msgstr "Шаблон финансијског извештаја {0} није пронађен" #. Name of a Workspace #: erpnext/accounts/workspace/financial_reports/financial_reports.json @@ -19092,7 +19092,7 @@ msgstr "Критеријуми засновани на формули" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Formula or Account Filter" -msgstr "" +msgstr "Формула или филтер рачуна" #: erpnext/templates/pages/help.html:35 msgid "Forum Activity" @@ -19110,7 +19110,7 @@ msgstr "URL форума" #: erpnext/setup/install.py:200 msgid "Frappe School" -msgstr "" +msgstr "Frappe School" #. Title of an incoterm #: erpnext/setup/doctype/incoterm/incoterms.csv:4 @@ -20736,7 +20736,7 @@ msgstr "Здраво," #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Hidden Line (Internal Use Only)" -msgstr "" +msgstr "Скривени ред (само за интерну употребу)" #. Description of the 'Contact List' (Code) field in DocType 'Shareholder' #: erpnext/accounts/doctype/shareholder/shareholder.json @@ -20757,7 +20757,7 @@ msgstr "Сакриј порески број купца из продајних #. Label of the hide_when_empty (Check) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Hide If Zero" -msgstr "" +msgstr "Сакриј уколико је нула" #. Label of the hide_images (Check) field in DocType 'POS Profile' #: erpnext/accounts/doctype/pos_profile/pos_profile.json @@ -20777,7 +20777,7 @@ msgstr "Сакриј недоступне ставке" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Hide this line if amount is zero" -msgstr "" +msgstr "Сакриј овај ред уколико је износ нула" #. Label of the hide_timesheets (Check) field in DocType 'Project User' #: erpnext/projects/doctype/project_user/project_user.json @@ -20915,13 +20915,13 @@ msgstr "Колико често треба ажурирати пројекат #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "How this line gets its data" -msgstr "" +msgstr "На који начин овај ред добија своје податке" #. Description of the 'Value Type' (Select) field in DocType 'Financial Report #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "How to format and present values in the financial report (only if different from column fieldtype)" -msgstr "" +msgstr "Како форматирати и приказати вредности у финансијском извештају (само уколико се разликује од врсте поља колона)" #. Label of the hours (Float) field in DocType 'Timesheet Detail' #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.json @@ -21193,7 +21193,7 @@ msgstr "Уколико је омогућено, цена ставке неће #. DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "If enabled, the source and target warehouse in the Material Transfer Stock Entry must be different else an error will be thrown. If inventory dimensions are present, same source and target warehouse can be allowed but atleast any one of the inventory dimension fields must be different." -msgstr "" +msgstr "Уколико је омогућено, изворно и циљно складиште у уносу залиха преноса материјала морају бити различити, иначе ће бити пријављена грешка. Уколико постоје димензије залиха, исто изворно и циљно складиште може бити дозвољено, али барем једно од поља димензија залиха мора бити различито." #. Description of the 'Allow UOM with Conversion Rate Defined in Item' (Check) #. field in DocType 'Stock Settings' @@ -21235,7 +21235,7 @@ msgstr "Уколико је омогућено, систем ће само ва #. Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "If enabled, this row's values will be displayed on financial charts" -msgstr "" +msgstr "Уколико је омогућено, вредности овог реда биће приказани на финансијским дијаграмима" #. Description of the 'Confirm before resetting posting date' (Check) field in #. DocType 'Accounts Settings' @@ -21986,7 +21986,7 @@ msgstr "Укључи ставке које имају вредност нула #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Include in Charts" -msgstr "" +msgstr "Укључити у дијаграме" #. Label of the include_in_gross (Check) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json @@ -22204,13 +22204,13 @@ msgstr "Захтев" #. Label of the indentation_level (Int) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Indent Level" -msgstr "" +msgstr "Ниво увлачења" #. Description of the 'Indent Level' (Int) field in DocType 'Financial Report #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Indentation level: 0 = Main heading, 1 = Sub-category, 2 = Individual accounts, etc." -msgstr "" +msgstr "Ниво увлачења: 0 = Главни наслов, 1 = Поткатегорија, 2 = Појединачни рачуни, итд." #. Description of the 'Delivery Note' (Link) field in DocType 'Packing Slip' #: erpnext/stock/doctype/packing_slip/packing_slip.json @@ -22529,12 +22529,12 @@ msgstr "Камата" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:132 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:218 msgid "Interest Expense" -msgstr "" +msgstr "Трошак камата" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242 msgid "Interest Income" -msgstr "" +msgstr "Приход од камата" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:3052 msgid "Interest and/or dunning fee" @@ -22543,7 +22543,7 @@ msgstr "Камата и/или накнада за опомену" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:147 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243 msgid "Interest on Fixed Deposits" -msgstr "" +msgstr "Камата на орочење депозите" #. Option for the 'Status' (Select) field in DocType 'Lead' #: erpnext/crm/doctype/lead/lead.json @@ -22695,7 +22695,7 @@ msgstr "Неважећи попуст" #: erpnext/controllers/taxes_and_totals.py:738 msgid "Invalid Discount Amount" -msgstr "" +msgstr "Неважећи износ попуста" #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:122 msgid "Invalid Document" @@ -22832,7 +22832,7 @@ msgstr "Неважећи израз услова" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:93 msgid "Invalid filter formula. Please check the syntax." -msgstr "" +msgstr "Неважећа формула филтера. Молимо Вас да проверите синтаксу." #: erpnext/selling/doctype/quotation/quotation.py:272 msgid "Invalid lost reason {0}, please create a new lost reason" @@ -23743,13 +23743,13 @@ msgstr "Није могуће равномерно расподелити тро #. Label of the italic_text (Check) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Italic Text" -msgstr "" +msgstr "Курзивни текст" #. Description of the 'Italic Text' (Check) field in DocType 'Financial Report #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Italic text for subtotals or notes" -msgstr "" +msgstr "Курзивни текст за међузбирове или напомене" #. Label of the item_code (Link) field in DocType 'POS Invoice Item' #. Label of the item_code (Link) field in DocType 'Purchase Invoice Item' @@ -25426,7 +25426,7 @@ msgstr "Контакт извршиоца посла" #. Order' #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json msgid "Job Worker Currency" -msgstr "" +msgstr "Валута извршиоца посла" #. Label of the supplier_delivery_note (Data) field in DocType 'Subcontracting #. Receipt' @@ -26220,7 +26220,7 @@ msgstr "Ограничења се не примењују на" #. Label of the reference_code (Data) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Line Reference" -msgstr "" +msgstr "Референца реда" #. Label of the amt_in_words_line_spacing (Float) field in DocType 'Cheque #. Print Template' @@ -26398,7 +26398,7 @@ msgstr "Логотип" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:317 msgid "Long-term Provisions" -msgstr "" +msgstr "Дугорочна резервисања" #. Label of the longitude (Float) field in DocType 'Location' #. Label of the lng (Float) field in DocType 'Delivery Stop' @@ -26652,7 +26652,7 @@ msgstr "Главни трошковни центар {0} не може бити #. Item' #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json msgid "Main Item Code" -msgstr "" +msgstr "Главна шифра ставке" #: erpnext/assets/doctype/asset/asset.js:136 msgid "Maintain Asset" @@ -28214,7 +28214,7 @@ msgstr "Минимална количина треба да буде већа о #: erpnext/stock/doctype/item/item.js:827 msgid "Min Value: {0}, Max Value: {1}, in Increments of: {2}" -msgstr "" +msgstr "Минимална вредност: {0}, максимална вредност: {1}, у корацима од: {2}" #. Label of the minimum_invoice_amount (Currency) field in DocType 'Payment #. Reconciliation' @@ -28352,7 +28352,7 @@ msgstr "Недостаје имејл шаблон за слање. Молимо #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:223 msgid "Missing required filter: {0}" -msgstr "" +msgstr "Недостаје обавезни филтер: {0}" #: erpnext/manufacturing/doctype/bom/bom.py:1098 #: erpnext/manufacturing/doctype/work_order/work_order.py:1447 @@ -28458,7 +28458,7 @@ msgstr "Измењено дана" #. Label of the module (Link) field in DocType 'Financial Report Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Module (for Export)" -msgstr "" +msgstr "Модул (за извоз)" #. Label of a Card Break in the Settings Workspace #: erpnext/setup/workspace/settings/settings.json @@ -29276,7 +29276,7 @@ msgstr "Следећи имејл ће бити послат на:" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:161 msgid "No Account Data row found" -msgstr "" +msgstr "Није пронађен ниједан ред у подацима рачуна" #: erpnext/setup/doctype/company/test_company.py:99 msgid "No Account matched these filters: {}" @@ -29683,7 +29683,7 @@ msgstr "Ставке ван залиха" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:316 msgid "Non-Current Liabilities" -msgstr "" +msgstr "Дугорочне обавезе" #: erpnext/selling/report/sales_analytics/sales_analytics.js:95 msgid "Non-Zeros" @@ -30460,7 +30460,7 @@ msgstr "Почетно стање" #. Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Opening Balance = Start of period, Closing Balance = End of period, Period Movement = Net change during period" -msgstr "" +msgstr "Почетно стање = почетак периода, завршно стање = крај периода, кретање у периоду = нето промена током периода" #. Label of the balance_details (Table) field in DocType 'POS Opening Entry' #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.json @@ -31659,7 +31659,7 @@ msgstr "Профил малопродаје је неопходан за уно #: erpnext/accounts/doctype/pos_profile/pos_profile.py:113 msgid "POS Profile {0} cannot be disabled as there are ongoing POS sessions." -msgstr "" +msgstr "Профил малопродаје {0} не може бити онемогућен јер постоје активне малопродајне сесије." #: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:63 msgid "POS Profile {} contains Mode of Payment {}. Please remove them to disable this mode." @@ -31667,15 +31667,15 @@ msgstr "Профил малопродаје {} садржи начин плаћ #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:58 msgid "POS Profile {} does not belong to company {}" -msgstr "" +msgstr "Профил малопродаје {} не припада компанији {}" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:47 msgid "POS Profile {} does not exist." -msgstr "" +msgstr "Профил малопродаје {} не постоји." #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:54 msgid "POS Profile {} is disabled." -msgstr "" +msgstr "Профил малопродаје {} је онемогућен." #. Name of a report #: erpnext/accounts/report/pos_register/pos_register.json @@ -33453,11 +33453,11 @@ msgstr "Документ за затварање периода" #: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:499 msgid "Period Closing Voucher {0} GL Entry Cancellation Failed" -msgstr "" +msgstr "Отказивање уноса у главну књигу за документ за затварање периода {0} није успело" #: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:478 msgid "Period Closing Voucher {0} GL Entry Processing Failed" -msgstr "" +msgstr "Обрада уноса у главну књигу за документ за затварање периода {0} није успела" #. Label of the period_details_section (Section Break) field in DocType 'POS #. Closing Entry' @@ -33483,7 +33483,7 @@ msgstr "Датум завршетка периода не може бити ве #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Period Movement (Debits - Credits)" -msgstr "" +msgstr "Кретање у периоду (Дугује - Потражује)" #. Label of the period_name (Data) field in DocType 'Accounting Period' #: erpnext/accounts/doctype/accounting_period/accounting_period.json @@ -34431,7 +34431,7 @@ msgstr "Молимо Вас да прво сачувате" #: erpnext/selling/doctype/sales_order/sales_order.js:859 msgid "Please save the Sales Order before adding a delivery schedule." -msgstr "" +msgstr "Сачувајте продајну поруџбину пре додавања распореда испоруке." #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:79 msgid "Please select Template Type to download template" @@ -34878,7 +34878,7 @@ msgstr "Молимо Вас да поставите рачун у складиш #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:58 msgid "Please set actual demand or sales forecast to generate Material Requirements Planning Report." -msgstr "" +msgstr "Молимо Вас подесите стварну потражњу или прогнозу продаје да бисте генерисали извештај о планирању потреба за материјалом." #: erpnext/regional/italy/utils.py:247 #, python-format @@ -35431,7 +35431,7 @@ msgstr "Преферирани имејл" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:34 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:51 msgid "Prepaid Expenses" -msgstr "" +msgstr "Унапред плаћени расходи" #: erpnext/setup/setup_wizard/data/designation.txt:24 msgid "President" @@ -40036,14 +40036,14 @@ msgstr "Грешка у извештају" #. Label of the rows (Table) field in DocType 'Financial Report Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Report Line Items" -msgstr "" +msgstr "Ставке реда извештаја" #: erpnext/accounts/report/balance_sheet/balance_sheet.js:13 #: erpnext/accounts/report/cash_flow/cash_flow.js:22 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:13 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:13 msgid "Report Template" -msgstr "" +msgstr "Шаблон извештаја" #: erpnext/accounts/doctype/account/account.py:460 msgid "Report Type is mandatory" @@ -41113,7 +41113,7 @@ msgstr "Поништавање налога књижења" #. Label of the reverse_sign (Check) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Reverse Sign" -msgstr "" +msgstr "Обрнути знак" #. Label of the review (Link) field in DocType 'Quality Action' #. Group in Quality Goal's connections @@ -45763,12 +45763,12 @@ msgstr "Кратка биографија за веб-сајт и друге п #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:35 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:55 msgid "Short-term Investments" -msgstr "" +msgstr "Краткорочна улагања" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:175 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:295 msgid "Short-term Provisions" -msgstr "" +msgstr "Краткорочна резервисања" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:225 msgid "Shortage Qty" @@ -45973,7 +45973,7 @@ msgstr "Прикажи на веб-сајту" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Show negative values as positive (for expenses in P&L)" -msgstr "" +msgstr "Прикажи негативне вредности као позитивне (за расходе у билансу стања)" #: erpnext/accounts/report/trial_balance/trial_balance.js:111 msgid "Show net values in opening and closing columns" @@ -47093,7 +47093,7 @@ msgstr "Уноси резервације залиха креирани" #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py:445 msgid "Stock Reservation Entries created" -msgstr "" +msgstr "Креирани уноси резервације залиха" #. Name of a DocType #: erpnext/public/js/stock_reservation.js:309 @@ -47480,7 +47480,7 @@ msgstr "Шифра ставке подсклопа" #. Request Plan Item' #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json msgid "Sub Assembly Item Reference" -msgstr "" +msgstr "Референца ставке подсклопа" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:403 msgid "Sub Assembly Item is mandatory" @@ -47526,7 +47526,7 @@ msgstr "Међузбир" #: erpnext/manufacturing/doctype/production_plan/production_plan.py:600 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." -msgstr "" +msgstr "Недостају референце ставки подсклопа. Молимо Вас да поново учитате подсклопе и сировине." #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:127 msgid "Sub-assembly BOM Count" @@ -49144,7 +49144,7 @@ msgstr "Пореска категорија је промењена на \"Ук #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:136 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:230 msgid "Tax Expense" -msgstr "" +msgstr "Порески расход" #. Label of the tax_id (Data) field in DocType 'Supplier' #. Label of the tax_id (Data) field in DocType 'Customer' @@ -49850,7 +49850,7 @@ msgstr "Тесла" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Text displayed on the financial statement (e.g., 'Total Revenue', 'Cash and Cash Equivalents')" -msgstr "" +msgstr "Текст приказан у финансијском извештају (нпр. 'Укупни приходи', 'Готовина и готовински еквиваленти')" #: erpnext/stock/doctype/packing_slip/packing_slip.py:91 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1." @@ -52436,7 +52436,7 @@ msgstr "Врста документа који треба преименоват #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Type of financial statement this template generates" -msgstr "" +msgstr "Врста финансијског извештаја коју овај шаблон генерише" #: erpnext/config/projects.py:61 msgid "Types of activities for Time Logs" @@ -53197,7 +53197,7 @@ msgstr "Ажурирано путем 'Запис времена' (у минут #: erpnext/accounts/doctype/account_category/account_category.py:54 msgid "Updated {0} Financial Report Row(s) with new category name" -msgstr "" +msgstr "Ажурирано {0} редова финансијског извештаја са новим називом категорије" #: erpnext/projects/doctype/project/project.js:137 msgid "Updating Costing and Billing fields against this Project..." @@ -53256,7 +53256,7 @@ msgstr "Користи дугме 'Поновна обрада као позад #. Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Use Python filters to get Accounts" -msgstr "" +msgstr "Користите Python филтере да добијете рачуне" #. Label of the use_batchwise_valuation (Check) field in DocType 'Batch' #: erpnext/stock/doctype/batch/batch.json @@ -53416,7 +53416,7 @@ msgstr "Искоришћено за план производње" #. Description of the 'Account Category' (Link) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json msgid "Used with Financial Report Template" -msgstr "" +msgstr "Користи се уз шаблон финансијског извештаја" #: erpnext/setup/install.py:194 msgid "User Forum" @@ -53630,7 +53630,7 @@ msgstr "Проверите компоненте и количине компон #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Validate Material Transfer Warehouses" -msgstr "" +msgstr "Провери складишта за пренос материјала" #. Label of the validate_negative_stock (Check) field in DocType 'Inventory #. Dimension' @@ -53837,7 +53837,7 @@ msgstr "Предлог вредности" #. Label of the fieldtype (Select) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Value Type" -msgstr "" +msgstr "Врста вредности" #: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:599 #: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:629 @@ -54068,7 +54068,7 @@ msgstr "Видео подешавање" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:7 msgid "View Account Coverage" -msgstr "" +msgstr "Приказ покривености рачуна" #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js:25 msgid "View BOM Update Log" @@ -54664,7 +54664,7 @@ msgstr "Упозорење: Продајна поруџбина {0} већ по #: erpnext/accounts/doctype/financial_report_template/financial_report_validation.py:77 msgid "Warnings" -msgstr "" +msgstr "Упозорења" #. Label of a Card Break in the Support Workspace #: erpnext/support/workspace/support/support.json @@ -56305,7 +56305,7 @@ msgstr "{0} варијанти је креирано." #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:232 msgid "{0} view is currently unsupported in Custom Financial Report." -msgstr "" +msgstr "Приказ {0} тренутно није подржан у прилагођеном финансијском извештају." #: erpnext/accounts/doctype/payment_term/payment_term.js:19 msgid "{0} will be given as discount." diff --git a/erpnext/locale/sr_CS.po b/erpnext/locale/sr_CS.po index 41552ce8547..73ea01e8082 100644 --- a/erpnext/locale/sr_CS.po +++ b/erpnext/locale/sr_CS.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2025-11-16 09:35+0000\n" -"PO-Revision-Date: 2025-11-18 22:14\n" +"PO-Revision-Date: 2025-11-22 22:59\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Serbian (Latin)\n" "MIME-Version: 1.0\n" @@ -1265,13 +1265,13 @@ msgstr "Stanje računa" #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account_category/account_category.json msgid "Account Category" -msgstr "" +msgstr "Kategorija računa" #. Label of the account_category_name (Data) field in DocType 'Account #. Category' #: erpnext/accounts/doctype/account_category/account_category.json msgid "Account Category Name" -msgstr "" +msgstr "Naziv kategorije računa" #. Name of a DocType #: erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json @@ -1327,14 +1327,14 @@ msgstr "Valuta računa (ka)" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Account Data" -msgstr "" +msgstr "Podaci o računu" #: erpnext/accounts/report/balance_sheet/balance_sheet.js:20 #: erpnext/accounts/report/cash_flow/cash_flow.js:29 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:21 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:20 msgid "Account Detail Level" -msgstr "" +msgstr "Nivo detalja računa" #. Label of the account_details_section (Section Break) field in DocType 'Bank #. Account' @@ -1997,7 +1997,7 @@ msgstr "Računi su zaključani do datuma" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:192 msgid "Accounts Included in Report" -msgstr "" +msgstr "Računi uključeni u izveštaj" #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348 msgid "Accounts Missing Error" @@ -2006,7 +2006,7 @@ msgstr "Greška zbog nedostajućeg računa" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:166 #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:191 msgid "Accounts Missing from Report" -msgstr "" +msgstr "Računi nedostaju u izveštaju" #. Option for the 'Write Off Based On' (Select) field in DocType 'Journal #. Entry' @@ -2111,7 +2111,7 @@ msgstr "Računi za spajanje" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:264 msgid "Accrued Expenses" -msgstr "" +msgstr "Obračunati troškovi" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json @@ -2879,7 +2879,7 @@ msgstr "Visina dodatnog popusta (valuta kompanije)" #: erpnext/controllers/taxes_and_totals.py:731 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" -msgstr "" +msgstr "Dodatni iznos popusta ({discount_amount}) ne može premašiti ukupan iznos pre takvog popusta ({total_before_discount})" #. Label of the additional_discount_percentage (Float) field in DocType 'POS #. Invoice' @@ -3280,7 +3280,7 @@ msgstr "Avansne uplate raspoređene prema narudžbinama biće samo preuzete" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Advanced Filtering" -msgstr "" +msgstr "Napredno filtriranje" #. Label of the advances (Table) field in DocType 'POS Invoice' #. Label of the advances (Table) field in DocType 'Purchase Invoice' @@ -5843,7 +5843,7 @@ msgstr "Mora biti izabran barem jedan od prodaje ili nabavke" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:25 msgid "At least one row is required for a financial report template" -msgstr "" +msgstr "Potreban je najmanje jedan red u šablonu finansijskog izveštaja" #: erpnext/stock/doctype/stock_entry/stock_entry.py:704 msgid "At least one warehouse is mandatory" @@ -6886,7 +6886,7 @@ msgstr "Stanje vrednosti zaliha" #. Label of the balance_type (Select) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Balance Type" -msgstr "" +msgstr "Vrsta salda" #: erpnext/stock/report/available_serial_no/available_serial_no.py:174 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:86 @@ -7913,7 +7913,7 @@ msgstr "Crna" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Blank Line" -msgstr "" +msgstr "Prazan red" #. Label of the blanket_order (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7997,13 +7997,13 @@ msgstr "Pomoć za tekst i zaključak teksta" #. Label of the bold_text (Check) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Bold Text" -msgstr "" +msgstr "Podebljan tekst" #. Description of the 'Bold Text' (Check) field in DocType 'Financial Report #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Bold text for emphasis (totals, major headings)" -msgstr "" +msgstr "Podebljan tekst za naglašavanje (ukupni iznosi, glavni naslovi)" #: 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}." @@ -8518,7 +8518,7 @@ msgstr "Izračunaj cenu paketa proizvoda na osnovu stope zavisne stavke" #. DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Calculate but don't show on final report" -msgstr "" +msgstr "Izračunati, ali ne prikazivati u konačnom izveštaju" #. Label of the calculate_depr_using_total_days (Check) field in DocType #. 'Accounts Settings' @@ -8530,7 +8530,7 @@ msgstr "Izračunaj dnevnu amortizaciju koristeći ukupne dane u periodu amortiza #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Calculated Amount" -msgstr "" +msgstr "Izračunati iznos" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:53 msgid "Calculated Bank Statement balance" @@ -9931,7 +9931,7 @@ msgstr "Lista kodova" #. Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Code to reference this line in formulas (e.g., REV100, EXP200, ASSET100)" -msgstr "" +msgstr "Šifra za referenciranje ovog reda u formulama (npr. REV100, EXP200, ASSET100)" #: erpnext/setup/setup_wizard/data/marketing_source.txt:4 msgid "Cold Calling" @@ -9965,7 +9965,7 @@ msgstr "Nivo kolekcije" #. Description of the 'Color' (Color) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Color to highlight values (e.g., red for exceptions)" -msgstr "" +msgstr "Boja za isticanje vrednosti (npr. crvena za izuzetke)" #: erpnext/setup/setup_wizard/operations/install_fixtures.py:280 msgid "Colour" @@ -12729,7 +12729,7 @@ msgstr "Valuta ne može biti promenjena nakon što su uneseni podaci koristeći #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:226 msgid "Currency filters are currently unsupported in Custom Financial Report." -msgstr "" +msgstr "Filteri po valuti trenutno nisu podržani u prilagođenom finansijskom izveštaju." #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733 @@ -12908,7 +12908,7 @@ msgstr "Nadzor" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Custom API" -msgstr "" +msgstr "Prilagođeni API" #. Option for the 'Report Type' (Select) field in DocType 'Financial Report #. Template' @@ -12916,7 +12916,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.json msgid "Custom Financial Statement" -msgstr "" +msgstr "Prilagođeni finansijski izveštaj" #. Label of the custom_remarks (Check) field in DocType 'Payment Entry' #: erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -13166,7 +13166,7 @@ msgstr "Adrese i kontakt kupca" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:268 msgid "Customer Advances" -msgstr "" +msgstr "Avansi kupca" #. Label of the customer_code (Small Text) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json @@ -13718,7 +13718,7 @@ msgstr "Uvoz podataka i podešavanja" #. Label of the data_source (Select) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Data Source" -msgstr "" +msgstr "Izvor podataka" #. Label of the date (Date) field in DocType 'Bulk Transaction Log Detail' #: erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json @@ -15291,7 +15291,7 @@ msgstr "Opis sadržaja" #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Descriptive name for your template (e.g., 'Standard P&L', 'Detailed Balance Sheet')" -msgstr "" +msgstr "Opisni naziv Vašeg šablona (npr. 'Standardni bilans uspeha', 'Detaljan bilans stanja')" #: erpnext/setup/setup_wizard/data/designation.txt:14 msgid "Designer" @@ -15558,7 +15558,7 @@ msgstr "Onemogući broj serije i selektor šarže" #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Disable template to prevent use in reports" -msgstr "" +msgstr "Onemogućite šablon da biste sprečili njegovo korišćenje u izveštajima" #: erpnext/accounts/general_ledger.py:149 msgid "Disabled Account Selected" @@ -15954,7 +15954,7 @@ msgstr "Postavke otpreme" #. Label of the display_name (Data) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Display Name" -msgstr "" +msgstr "Naziv za prikaz" #. Label of the disposal_date (Date) field in DocType 'Asset' #: erpnext/assets/doctype/asset/asset.json @@ -16858,7 +16858,7 @@ msgstr "Avansi zaposlenog lica" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:184 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:321 msgid "Employee Benefits Obligation" -msgstr "" +msgstr "Obaveze po osnovu beneficija zaposlenim licima" #. Label of the employee_detail (Section Break) field in DocType 'Timesheet' #: erpnext/projects/doctype/timesheet/timesheet.json @@ -18368,20 +18368,20 @@ msgstr "Finansijski pokazatelji" #. Name of a DocType #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Financial Report Row" -msgstr "" +msgstr "Red finansijskog izveštaja" #. Name of a DocType #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Financial Report Template" -msgstr "" +msgstr "Šablon finansijskog izveštaja" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:242 msgid "Financial Report Template {0} is disabled" -msgstr "" +msgstr "Šablon finansijskog izveštaja {0} je onemogućen" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:239 msgid "Financial Report Template {0} not found" -msgstr "" +msgstr "Šablon finansijskog izveštaja {0} nije pronađen" #. Name of a Workspace #: erpnext/accounts/workspace/financial_reports/financial_reports.json @@ -19092,7 +19092,7 @@ msgstr "Kriterijumi zasnovani na formuli" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Formula or Account Filter" -msgstr "" +msgstr "Formula ili filter računa" #: erpnext/templates/pages/help.html:35 msgid "Forum Activity" @@ -19110,7 +19110,7 @@ msgstr "URL foruma" #: erpnext/setup/install.py:200 msgid "Frappe School" -msgstr "" +msgstr "Frappe School" #. Title of an incoterm #: erpnext/setup/doctype/incoterm/incoterms.csv:4 @@ -20736,7 +20736,7 @@ msgstr "Zdravo," #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Hidden Line (Internal Use Only)" -msgstr "" +msgstr "Skriveni red (samo za internu upotrebu)" #. Description of the 'Contact List' (Code) field in DocType 'Shareholder' #: erpnext/accounts/doctype/shareholder/shareholder.json @@ -20757,7 +20757,7 @@ msgstr "Sakrij poreski broj kupca iz prodajnih transakcija" #. Label of the hide_when_empty (Check) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Hide If Zero" -msgstr "" +msgstr "Sakrij ukoliko je nula" #. Label of the hide_images (Check) field in DocType 'POS Profile' #: erpnext/accounts/doctype/pos_profile/pos_profile.json @@ -20777,7 +20777,7 @@ msgstr "Sakrij nedostupne stavke" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Hide this line if amount is zero" -msgstr "" +msgstr "Sakrij ovaj red ukoliko je iznos nula" #. Label of the hide_timesheets (Check) field in DocType 'Project User' #: erpnext/projects/doctype/project_user/project_user.json @@ -20915,13 +20915,13 @@ msgstr "Koliko često treba ažurirati projekat u vezi sa ukupnim troškom nabav #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "How this line gets its data" -msgstr "" +msgstr "Na koji način ovaj red dobija svoje podatke" #. Description of the 'Value Type' (Select) field in DocType 'Financial Report #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "How to format and present values in the financial report (only if different from column fieldtype)" -msgstr "" +msgstr "Kako formatirati i prikazati vrednosti u finansijskom izveštaju (samo ukoliko se razlikuje od vrste polja kolona)" #. Label of the hours (Float) field in DocType 'Timesheet Detail' #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.json @@ -21193,7 +21193,7 @@ msgstr "Ukoliko je omogućeno, cena stavke neće se prilagoditi stopi vrednovanj #. DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "If enabled, the source and target warehouse in the Material Transfer Stock Entry must be different else an error will be thrown. If inventory dimensions are present, same source and target warehouse can be allowed but atleast any one of the inventory dimension fields must be different." -msgstr "" +msgstr "Ukoliko je omogućeno, izvorno i ciljno skladište u unosu zaliha prenosa materijala moraju biti različiti, inače će biti prijavljena greška. Ukoliko postoje dimenzije zaliha, isto izvorno i ciljno skladište može biti dozvoljeno, ali barem jedno od polja dimenzija zaliha mora biti različito." #. Description of the 'Allow UOM with Conversion Rate Defined in Item' (Check) #. field in DocType 'Stock Settings' @@ -21235,7 +21235,7 @@ msgstr "Ukoliko je omogućeno, sistem će samo validirati pravilo određivanja c #. Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "If enabled, this row's values will be displayed on financial charts" -msgstr "" +msgstr "Ukoliko je omogućeno, vrednosti ovog reda biće prikazani na finansijskim dijagramima" #. Description of the 'Confirm before resetting posting date' (Check) field in #. DocType 'Accounts Settings' @@ -21986,7 +21986,7 @@ msgstr "Uključi stavke koje imaju vrednost nula na zalihama" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Include in Charts" -msgstr "" +msgstr "Uključiti u dijagrame" #. Label of the include_in_gross (Check) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json @@ -22204,13 +22204,13 @@ msgstr "Zahtev" #. Label of the indentation_level (Int) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Indent Level" -msgstr "" +msgstr "Nivo uvlačenja" #. Description of the 'Indent Level' (Int) field in DocType 'Financial Report #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Indentation level: 0 = Main heading, 1 = Sub-category, 2 = Individual accounts, etc." -msgstr "" +msgstr "Nivo uvlačenja: 0 = Glavni naslov, 1 = Potkategorija, 2 = Pojedinačni računi, itd." #. Description of the 'Delivery Note' (Link) field in DocType 'Packing Slip' #: erpnext/stock/doctype/packing_slip/packing_slip.json @@ -22529,12 +22529,12 @@ msgstr "Kamata" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:132 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:218 msgid "Interest Expense" -msgstr "" +msgstr "Trošak kamata" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242 msgid "Interest Income" -msgstr "" +msgstr "Prihod od kamata" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:3052 msgid "Interest and/or dunning fee" @@ -22543,7 +22543,7 @@ msgstr "Kamata i/ili naknada za opomenu" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:147 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243 msgid "Interest on Fixed Deposits" -msgstr "" +msgstr "Kamata na oročene depozite" #. Option for the 'Status' (Select) field in DocType 'Lead' #: erpnext/crm/doctype/lead/lead.json @@ -22695,7 +22695,7 @@ msgstr "Nevažeći popust" #: erpnext/controllers/taxes_and_totals.py:738 msgid "Invalid Discount Amount" -msgstr "" +msgstr "Nevažeći iznos popusta" #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:122 msgid "Invalid Document" @@ -22832,7 +22832,7 @@ msgstr "Nevažeći izraz uslova" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:93 msgid "Invalid filter formula. Please check the syntax." -msgstr "" +msgstr "Nevažeća formula filtera. Molimo Vas da proverite sintaksu." #: erpnext/selling/doctype/quotation/quotation.py:272 msgid "Invalid lost reason {0}, please create a new lost reason" @@ -23743,13 +23743,13 @@ msgstr "Nije moguće ravnomerno raspodeliti troškove kada je ukupni iznos nula, #. Label of the italic_text (Check) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Italic Text" -msgstr "" +msgstr "Kurzivni tekst" #. Description of the 'Italic Text' (Check) field in DocType 'Financial Report #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Italic text for subtotals or notes" -msgstr "" +msgstr "Kurizvni tekst za međuzbirove ili napomene" #. Label of the item_code (Link) field in DocType 'POS Invoice Item' #. Label of the item_code (Link) field in DocType 'Purchase Invoice Item' @@ -25426,7 +25426,7 @@ msgstr "Kontakt izvršioca posla" #. Order' #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json msgid "Job Worker Currency" -msgstr "" +msgstr "Valuta izvršioca posla" #. Label of the supplier_delivery_note (Data) field in DocType 'Subcontracting #. Receipt' @@ -26220,7 +26220,7 @@ msgstr "Ograničenja se ne primenjuju na" #. Label of the reference_code (Data) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Line Reference" -msgstr "" +msgstr "Referenca reda" #. Label of the amt_in_words_line_spacing (Float) field in DocType 'Cheque #. Print Template' @@ -26398,7 +26398,7 @@ msgstr "Logotip" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:317 msgid "Long-term Provisions" -msgstr "" +msgstr "Dugoročna rezervisanja" #. Label of the longitude (Float) field in DocType 'Location' #. Label of the lng (Float) field in DocType 'Delivery Stop' @@ -26652,7 +26652,7 @@ msgstr "Glavni troškovni centar {0} ne može biti unet u zavisnu tabelu podatak #. Item' #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json msgid "Main Item Code" -msgstr "" +msgstr "Glavna šifra stavke" #: erpnext/assets/doctype/asset/asset.js:136 msgid "Maintain Asset" @@ -28214,7 +28214,7 @@ msgstr "Minimalna količina treba da bude veća od količine za ponavljanje" #: erpnext/stock/doctype/item/item.js:827 msgid "Min Value: {0}, Max Value: {1}, in Increments of: {2}" -msgstr "" +msgstr "Minimalna vrednost: {0}, maksimalna vrednost: {1}, u koracima od: {2}" #. Label of the minimum_invoice_amount (Currency) field in DocType 'Payment #. Reconciliation' @@ -28352,7 +28352,7 @@ msgstr "Nedostaje imejl šablon za slanje. Molimo Vas da ga postavite u podešav #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:223 msgid "Missing required filter: {0}" -msgstr "" +msgstr "Nedostaje obavezni filter: {0}" #: erpnext/manufacturing/doctype/bom/bom.py:1098 #: erpnext/manufacturing/doctype/work_order/work_order.py:1447 @@ -28458,7 +28458,7 @@ msgstr "Izmenjeno dana" #. Label of the module (Link) field in DocType 'Financial Report Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Module (for Export)" -msgstr "" +msgstr "Modul (za izvoz)" #. Label of a Card Break in the Settings Workspace #: erpnext/setup/workspace/settings/settings.json @@ -29276,7 +29276,7 @@ msgstr "Sledeći imejl će biti poslat na:" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:161 msgid "No Account Data row found" -msgstr "" +msgstr "Nije pronađen nijedan red u podacima računa" #: erpnext/setup/doctype/company/test_company.py:99 msgid "No Account matched these filters: {}" @@ -29683,7 +29683,7 @@ msgstr "Stavke van zaliha" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:316 msgid "Non-Current Liabilities" -msgstr "" +msgstr "Dugoročne obaveze" #: erpnext/selling/report/sales_analytics/sales_analytics.js:95 msgid "Non-Zeros" @@ -30460,7 +30460,7 @@ msgstr "Početno stanje" #. Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Opening Balance = Start of period, Closing Balance = End of period, Period Movement = Net change during period" -msgstr "" +msgstr "Početno stanje = početak perioda, završno stanje = kraj perioda, kretanje u periodu = neto promena tokom perioda" #. Label of the balance_details (Table) field in DocType 'POS Opening Entry' #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.json @@ -31659,7 +31659,7 @@ msgstr "Profil maloprodaje je neophodan za unos" #: erpnext/accounts/doctype/pos_profile/pos_profile.py:113 msgid "POS Profile {0} cannot be disabled as there are ongoing POS sessions." -msgstr "" +msgstr "Profil maloprodaje {0} ne može biti onemogućen jer postoje aktivne maloprodajne sesije." #: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:63 msgid "POS Profile {} contains Mode of Payment {}. Please remove them to disable this mode." @@ -31667,15 +31667,15 @@ msgstr "Profil maloprodaje {} sadrži način plaćanja {}. Molimo Vas da ga uklo #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:58 msgid "POS Profile {} does not belong to company {}" -msgstr "" +msgstr "Profil maloprodaje {} ne pripada kompaniji {}" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:47 msgid "POS Profile {} does not exist." -msgstr "" +msgstr "Profil maloprodaje {} ne postoji." #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:54 msgid "POS Profile {} is disabled." -msgstr "" +msgstr "Profil maloprodaje {} je onemogućen." #. Name of a report #: erpnext/accounts/report/pos_register/pos_register.json @@ -33453,11 +33453,11 @@ msgstr "Dokument za zatvaranje perioda" #: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:499 msgid "Period Closing Voucher {0} GL Entry Cancellation Failed" -msgstr "" +msgstr "Otkazivanje unosa u glavnu knjigu za dokument za zatvaranje perioda {0} nije uspelo" #: erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py:478 msgid "Period Closing Voucher {0} GL Entry Processing Failed" -msgstr "" +msgstr "Obrada unosa u glavnu knjigu za dokument za zatvaranje perioda {0} nije uspela" #. Label of the period_details_section (Section Break) field in DocType 'POS #. Closing Entry' @@ -33483,7 +33483,7 @@ msgstr "Datum završetka perioda ne može biti veći od datuma završetka fiskal #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Period Movement (Debits - Credits)" -msgstr "" +msgstr "Kretanje u periodu (Duguje - Potražuje)" #. Label of the period_name (Data) field in DocType 'Accounting Period' #: erpnext/accounts/doctype/accounting_period/accounting_period.json @@ -34431,7 +34431,7 @@ msgstr "Molimo Vas da prvo sačuvate" #: erpnext/selling/doctype/sales_order/sales_order.js:859 msgid "Please save the Sales Order before adding a delivery schedule." -msgstr "" +msgstr "Sačuvajte prodajnu porudžbinu pre dodavanja rasporeda isporuke." #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:79 msgid "Please select Template Type to download template" @@ -34878,7 +34878,7 @@ msgstr "Molimo Vas da postavite račun u skladištu {0}" #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:58 msgid "Please set actual demand or sales forecast to generate Material Requirements Planning Report." -msgstr "" +msgstr "Molimo Vas da podesite stvarnu potražnju ili prognozu prodaje da biste generisali izveštaj o planiranju potreba za materijalom." #: erpnext/regional/italy/utils.py:247 #, python-format @@ -35431,7 +35431,7 @@ msgstr "Preferirani imejl" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:34 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:51 msgid "Prepaid Expenses" -msgstr "" +msgstr "Unapred plaćeni rashodi" #: erpnext/setup/setup_wizard/data/designation.txt:24 msgid "President" @@ -40036,14 +40036,14 @@ msgstr "Greška u izveštaju" #. Label of the rows (Table) field in DocType 'Financial Report Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Report Line Items" -msgstr "" +msgstr "Stavke reda izveštaja" #: erpnext/accounts/report/balance_sheet/balance_sheet.js:13 #: erpnext/accounts/report/cash_flow/cash_flow.js:22 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:13 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:13 msgid "Report Template" -msgstr "" +msgstr "Šablon izveštaja" #: erpnext/accounts/doctype/account/account.py:460 msgid "Report Type is mandatory" @@ -41113,7 +41113,7 @@ msgstr "Poništavanje naloga knjiženja" #. Label of the reverse_sign (Check) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Reverse Sign" -msgstr "" +msgstr "Obrnuti znak" #. Label of the review (Link) field in DocType 'Quality Action' #. Group in Quality Goal's connections @@ -45763,12 +45763,12 @@ msgstr "Kratka biografija za veb-sajt i druge publikacije." #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:35 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:55 msgid "Short-term Investments" -msgstr "" +msgstr "Kratkoročna ulaganja" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:175 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:295 msgid "Short-term Provisions" -msgstr "" +msgstr "Kratkoročna rezervisanja" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:225 msgid "Shortage Qty" @@ -45973,7 +45973,7 @@ msgstr "Prikaži na veb-sajtu" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Show negative values as positive (for expenses in P&L)" -msgstr "" +msgstr "Prikaži negativne vrednosti kao pozitivne (za rashode u bilansu stanja)" #: erpnext/accounts/report/trial_balance/trial_balance.js:111 msgid "Show net values in opening and closing columns" @@ -47093,7 +47093,7 @@ msgstr "Unosi rezervacije zaliha kreirani" #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py:445 msgid "Stock Reservation Entries created" -msgstr "" +msgstr "Kreirani unosi rezervacije zaliha" #. Name of a DocType #: erpnext/public/js/stock_reservation.js:309 @@ -47480,7 +47480,7 @@ msgstr "Šifra stavke podsklopa" #. Request Plan Item' #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json msgid "Sub Assembly Item Reference" -msgstr "" +msgstr "Referenca stavke podsklopa" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:403 msgid "Sub Assembly Item is mandatory" @@ -47526,7 +47526,7 @@ msgstr "Međuzbir" #: erpnext/manufacturing/doctype/production_plan/production_plan.py:600 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." -msgstr "" +msgstr "Nedostaju reference stavki podsklopa. Molimo Vas da ponovo učitate podsklope i sirovine." #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:127 msgid "Sub-assembly BOM Count" @@ -49144,7 +49144,7 @@ msgstr "Poreska kategorija je promenjena na \"Ukupno\" jer su sve stavke zapravo #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:136 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:230 msgid "Tax Expense" -msgstr "" +msgstr "Poreski rashod" #. Label of the tax_id (Data) field in DocType 'Supplier' #. Label of the tax_id (Data) field in DocType 'Customer' @@ -49850,7 +49850,7 @@ msgstr "Tesla" #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Text displayed on the financial statement (e.g., 'Total Revenue', 'Cash and Cash Equivalents')" -msgstr "" +msgstr "Tekst prikazan u finansijskom izveštaju (npr. 'Ukupni prihodi', 'Gotovina i gotovinski ekvivalenti')" #: erpnext/stock/doctype/packing_slip/packing_slip.py:91 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1." @@ -52436,7 +52436,7 @@ msgstr "Vrsta dokumenta koji treba preimenovati." #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json msgid "Type of financial statement this template generates" -msgstr "" +msgstr "Vrsta finansijskog izveštaja koju ovaj šablon generiše" #: erpnext/config/projects.py:61 msgid "Types of activities for Time Logs" @@ -53197,7 +53197,7 @@ msgstr "Ažurirano putem 'Zapis vremena' (u minutima)" #: erpnext/accounts/doctype/account_category/account_category.py:54 msgid "Updated {0} Financial Report Row(s) with new category name" -msgstr "" +msgstr "Ažurirano {0} redova finansijskog izveštaja sa novim nazivom kategorije" #: erpnext/projects/doctype/project/project.js:137 msgid "Updating Costing and Billing fields against this Project..." @@ -53256,7 +53256,7 @@ msgstr "Koristi dugme 'Ponovna obrada kao pozadinski proces' za pokretanje pozad #. Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Use Python filters to get Accounts" -msgstr "" +msgstr "Koristite Python filtere da dobijete račune" #. Label of the use_batchwise_valuation (Check) field in DocType 'Batch' #: erpnext/stock/doctype/batch/batch.json @@ -53416,7 +53416,7 @@ msgstr "Iskorišćeno za plan proizvodnje" #. Description of the 'Account Category' (Link) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json msgid "Used with Financial Report Template" -msgstr "" +msgstr "Koristi se uz šablon finansijskog izveštaja" #: erpnext/setup/install.py:194 msgid "User Forum" @@ -53630,7 +53630,7 @@ msgstr "Proverite komponente i količine komponenti po sastavnici" #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Validate Material Transfer Warehouses" -msgstr "" +msgstr "Proveri skladišta za prenos materijala" #. Label of the validate_negative_stock (Check) field in DocType 'Inventory #. Dimension' @@ -53837,7 +53837,7 @@ msgstr "Predlog vrednosti" #. Label of the fieldtype (Select) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Value Type" -msgstr "" +msgstr "Vrsta vrednosti" #: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:599 #: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:629 @@ -54068,7 +54068,7 @@ msgstr "Video podešavanje" #: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:7 msgid "View Account Coverage" -msgstr "" +msgstr "Prikaz pokrivenosti računa" #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js:25 msgid "View BOM Update Log" @@ -54664,7 +54664,7 @@ msgstr "Upozorenje: Prodajna porudžbina {0} već postoji za nabavnu porudžbinu #: erpnext/accounts/doctype/financial_report_template/financial_report_validation.py:77 msgid "Warnings" -msgstr "" +msgstr "Upozorenja" #. Label of a Card Break in the Support Workspace #: erpnext/support/workspace/support/support.json @@ -56305,7 +56305,7 @@ msgstr "{0} varijanti je kreirano." #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:232 msgid "{0} view is currently unsupported in Custom Financial Report." -msgstr "" +msgstr "Prikaz {0} trenutno nije podržan u prilagođenom finansijskom izveštaju." #: erpnext/accounts/doctype/payment_term/payment_term.js:19 msgid "{0} will be given as discount." From c2b8b97d7dcbdfd3cd8a070ce842f339c67ebd43 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 25 Nov 2025 10:18:04 +0530 Subject: [PATCH 031/328] fix: incorrect query filter when selecting primary customer adr (#50727) --- erpnext/buying/doctype/supplier/supplier.js | 8 +++--- erpnext/buying/doctype/supplier/supplier.py | 22 ++++++++++------ erpnext/selling/doctype/customer/customer.js | 9 ++++--- .../selling/doctype/customer/customer.json | 2 +- erpnext/selling/doctype/customer/customer.py | 26 ++++++++++++------- 5 files changed, 43 insertions(+), 24 deletions(-) diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js index 0621503c100..fb4ef867ade 100644 --- a/erpnext/buying/doctype/supplier/supplier.js +++ b/erpnext/buying/doctype/supplier/supplier.js @@ -41,18 +41,20 @@ frappe.ui.form.on("Supplier", { frm.set_query("supplier_primary_contact", function (doc) { return { - query: "erpnext.buying.doctype.supplier.supplier.get_supplier_primary_contact", + query: "erpnext.buying.doctype.supplier.supplier.get_supplier_primary", filters: { supplier: doc.name, + type: "Contact", }, }; }); frm.set_query("supplier_primary_address", function (doc) { return { + query: "erpnext.buying.doctype.supplier.supplier.get_supplier_primary", filters: { - link_doctype: "Supplier", - link_name: doc.name, + supplier: doc.name, + type: "Address", }, }; }); diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py index e3aac1b407a..be85f887047 100644 --- a/erpnext/buying/doctype/supplier/supplier.py +++ b/erpnext/buying/doctype/supplier/supplier.py @@ -219,19 +219,25 @@ class Supplier(TransactionBase): @frappe.whitelist() @frappe.validate_and_sanitize_search_inputs -def get_supplier_primary_contact(doctype, txt, searchfield, start, page_len, filters): +def get_supplier_primary(doctype, txt, searchfield, start, page_len, filters): supplier = filters.get("supplier") - contact = frappe.qb.DocType("Contact") + type = filters.get("type") + type_doctype = frappe.qb.DocType(type) dynamic_link = frappe.qb.DocType("Dynamic Link") - return ( - frappe.qb.from_(contact) + query = ( + frappe.qb.from_(type_doctype) .join(dynamic_link) - .on(contact.name == dynamic_link.parent) - .select(contact.name, contact.email_id) + .on(type_doctype.name == dynamic_link.parent) + .select(type_doctype.name) .where( (dynamic_link.link_name == supplier) & (dynamic_link.link_doctype == "Supplier") - & (contact.name.like(f"%{txt}%")) + & (type_doctype.name.like(f"%{txt}%")) ) - ).run(as_dict=False) + ) + + if type == "Contact": + query = query.select(type_doctype.email_id) + + return query.run() diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js index 230472a6c29..9864beeffa5 100644 --- a/erpnext/selling/doctype/customer/customer.js +++ b/erpnext/selling/doctype/customer/customer.js @@ -74,17 +74,20 @@ frappe.ui.form.on("Customer", { frm.set_query("customer_primary_contact", function (doc) { return { - query: "erpnext.selling.doctype.customer.customer.get_customer_primary_contact", + query: "erpnext.selling.doctype.customer.customer.get_customer_primary", filters: { customer: doc.name, + type: "Contact", }, }; }); + frm.set_query("customer_primary_address", function (doc) { return { + query: "erpnext.selling.doctype.customer.customer.get_customer_primary", filters: { - link_doctype: "Customer", - link_name: doc.name, + customer: doc.name, + type: "Address", }, }; }); diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json index 33ddc6d316d..73994d3dd0b 100644 --- a/erpnext/selling/doctype/customer/customer.json +++ b/erpnext/selling/doctype/customer/customer.json @@ -618,7 +618,7 @@ "link_fieldname": "party" } ], - "modified": "2025-04-27 12:01:29.549008", + "modified": "2025-11-25 09:35:56.772949", "modified_by": "Administrator", "module": "Selling", "name": "Customer", diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py index 8b5d6a21604..fab36058bc9 100644 --- a/erpnext/selling/doctype/customer/customer.py +++ b/erpnext/selling/doctype/customer/customer.py @@ -815,21 +815,29 @@ def make_address(args, is_primary_address=1, is_shipping_address=1): @frappe.whitelist() @frappe.validate_and_sanitize_search_inputs -def get_customer_primary_contact(doctype, txt, searchfield, start, page_len, filters): +def get_customer_primary(doctype, txt, searchfield, start, page_len, filters): customer = filters.get("customer") - - con = qb.DocType("Contact") + type = filters.get("type") + type_doctype = qb.DocType(type) dlink = qb.DocType("Dynamic Link") - return ( - qb.from_(con) + query = ( + qb.from_(type_doctype) .join(dlink) - .on(con.name == dlink.parent) - .select(con.name, con.email_id) - .where((dlink.link_name == customer) & (con.name.like(f"%{txt}%"))) - .run() + .on(type_doctype.name == dlink.parent) + .select(type_doctype.name) + .where( + (dlink.link_name == customer) + & (type_doctype.name.like(f"%{txt}%")) + & (dlink.link_doctype == "Customer") + ) ) + if type == "Contact": + query = query.select(type_doctype.email_id) + + return query.run() + def parse_full_name(full_name: str) -> tuple[str, str | None, str | None]: """Parse full name into first name, middle name and last name""" From 5e58e344b2d57456b7c83d2445babf0f0e38e98d Mon Sep 17 00:00:00 2001 From: Logesh Periyasamy Date: Tue, 25 Nov 2025 10:21:17 +0530 Subject: [PATCH 032/328] feat(accounting-dimension): add dynamic triggers for custom accounting dimensions (#50621) * feat: add dynamic triggers for custom accounting dimensions * feat: add accounting dimension trigger call in setup event * chore: ignore cur_frm semgrep rules * chore: move function to transaction.js --- .../purchase_invoice/purchase_invoice.js | 1 + .../doctype/sales_invoice/sales_invoice.js | 1 + .../doctype/purchase_order/purchase_order.js | 1 + erpnext/public/js/controllers/transaction.js | 17 +++++++++++++++++ .../selling/doctype/sales_order/sales_order.js | 3 +++ .../doctype/delivery_note/delivery_note.js | 1 + .../purchase_receipt/purchase_receipt.js | 1 + 7 files changed, 25 insertions(+) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js index 0cda42a6ca2..8365590450d 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -12,6 +12,7 @@ erpnext.buying.setup_buying_controller(); erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.BuyingController { setup(doc) { + this.setup_accounting_dimension_triggers(); this.setup_posting_date_time_check(); super.setup(doc); diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 2c86981a8a4..c707eee4b97 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -14,6 +14,7 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends ( erpnext.selling.SellingController ) { setup(doc) { + this.setup_accounting_dimension_triggers(); this.setup_posting_date_time_check(); super.setup(doc); this.frm.make_methods = { diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index a1b50202f5b..79b3b3f19d8 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -317,6 +317,7 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends ( erpnext.buying.BuyingController ) { setup() { + this.setup_accounting_dimension_triggers(); this.frm.custom_make_buttons = { "Purchase Receipt": "Purchase Receipt", "Purchase Invoice": "Purchase Invoice", diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 42fad3cbdcc..a46a273017f 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -3140,6 +3140,23 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe ]); } } + + setup_accounting_dimension_triggers() { + frappe.call({ + method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.get_dimensions", + callback: function (r) { + if (r.message && r.message[0]) { + let dimensions = r.message[0].map((d) => d.fieldname); + dimensions.forEach((dim) => { + // nosemgrep: frappe-semgrep-rules.rules.frappe-cur-frm-usage + cur_frm.cscript[dim] = function (doc, cdt, cdn) { + erpnext.utils.copy_value_in_all_rows(doc, cdt, cdn, "items", dim); + }; + }); + } + }, + }); + } }; erpnext.show_serial_batch_selector = function (frm, item_row, callback, on_close, show_dialog) { diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 235838f8f11..263b3010dc7 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -917,6 +917,9 @@ frappe.ui.form.on("Sales Order Item", { }); erpnext.selling.SalesOrderController = class SalesOrderController extends erpnext.selling.SellingController { + setup() { + this.setup_accounting_dimension_triggers(); + } onload(doc, dt, dn) { super.onload(doc, dt, dn); } diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 527d672cc6a..b9c98bbb8ba 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -140,6 +140,7 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends ( erpnext.selling.SellingController ) { setup(doc) { + this.setup_accounting_dimension_triggers(); this.setup_posting_date_time_check(); super.setup(doc); this.frm.make_methods = { diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index db065a80c92..29026969404 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -195,6 +195,7 @@ erpnext.stock.PurchaseReceiptController = class PurchaseReceiptController extend erpnext.buying.BuyingController ) { setup(doc) { + this.setup_accounting_dimension_triggers(); this.setup_posting_date_time_check(); super.setup(doc); } From 3d0b28a19805e1f21380319e16333cf4c0a9aa9e Mon Sep 17 00:00:00 2001 From: sokumon Date: Tue, 25 Nov 2025 11:17:29 +0530 Subject: [PATCH 033/328] fix: re-export all sidebars --- erpnext/workspace_sidebar/accounting.json | 376 +------------- erpnext/workspace_sidebar/assets.json | 244 +-------- erpnext/workspace_sidebar/banking.json | 101 +--- erpnext/workspace_sidebar/budget.json | 68 +-- erpnext/workspace_sidebar/buying.json | 233 +-------- erpnext/workspace_sidebar/crm.json | 486 +----------------- .../workspace_sidebar/financial_reports.json | 255 +-------- erpnext/workspace_sidebar/home.json | 79 +-- erpnext/workspace_sidebar/manufacturing.json | 409 +-------------- .../workspace_sidebar/opening_&_closing.json | 57 +- erpnext/workspace_sidebar/payables.json | 68 +-- erpnext/workspace_sidebar/projects.json | 68 +-- erpnext/workspace_sidebar/quality.json | 211 +------- erpnext/workspace_sidebar/receivables.json | 79 +-- erpnext/workspace_sidebar/selling.json | 486 +----------------- erpnext/workspace_sidebar/settings.json | 123 +---- .../workspace_sidebar/share_management.json | 50 +- erpnext/workspace_sidebar/stock.json | 244 +-------- erpnext/workspace_sidebar/subcontracting.json | 178 +------ erpnext/workspace_sidebar/subscription.json | 35 +- erpnext/workspace_sidebar/support.json | 167 +----- erpnext/workspace_sidebar/taxes.json | 79 +-- 22 files changed, 37 insertions(+), 4059 deletions(-) diff --git a/erpnext/workspace_sidebar/accounting.json b/erpnext/workspace_sidebar/accounting.json index 00e9679496e..8767e96a22a 100644 --- a/erpnext/workspace_sidebar/accounting.json +++ b/erpnext/workspace_sidebar/accounting.json @@ -9,759 +9,385 @@ { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Accounting", "link_type": "Workspace", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "a64og9oq94", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "chart", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Dashboard", "link_to": "Accounts", "link_type": "Dashboard", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhugl9lua", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "arrow-right", - "idx": 3, "indent": 1, "keep_closed": 0, "label": "Receivables", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jh0n3qq66", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Customer", "link_to": "Customer", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhcm51kp3", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Sales Invoice", "link_to": "Sales Invoice", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jh19c141t", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Credit Note", "link_to": "Sales Invoice", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "3fkm5nvbjl", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Accounts Receivable", "link_to": "Accounts Receivable", "link_type": "Report", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhburdf01", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "arrow-left", - "idx": 8, "indent": 1, "keep_closed": 0, "label": "Payables", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "4cdf4p0upe", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 9, "indent": 0, "keep_closed": 0, "label": "Supplier", "link_to": "Supplier", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "4cduqhi5vd", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 10, "indent": 0, "keep_closed": 0, "label": "Purchase Invoice", "link_to": "Purchase Invoice", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jh6euud0o", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 11, "indent": 0, "keep_closed": 0, "label": "Debit Note", "link_to": "Purchase Invoice", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "4kkni6snil", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 12, "indent": 0, "keep_closed": 0, "label": "Accounts Payable", "link_to": "Accounts Payable", "link_type": "Report", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhq8anndl", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "dollar-sign", - "idx": 13, "indent": 1, "keep_closed": 1, "label": "Payments", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "5vdsnvlp5l", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 14, "indent": 0, "keep_closed": 0, "label": "Payment Entry", "link_to": "Payment Entry", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jh5ugbv3j", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "Journal Entry", "link_to": "Journal Entry", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jh9ejcdq9", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 16, "indent": 0, "keep_closed": 0, "label": "Payment Reconciliaition", "link_to": "Payment Reconciliation", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "9ki4da3hsk", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 17, "indent": 1, "keep_closed": 1, "label": "Reports", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhhu54rmu", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 18, "indent": 0, "keep_closed": 0, "label": "General Ledger", "link_to": "General Ledger", "link_type": "Report", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhoigppkp", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 19, "indent": 0, "keep_closed": 0, "label": "Trial Balance", "link_to": "Trial Balance", "link_type": "Report", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jha0kei8j", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 20, "indent": 0, "keep_closed": 0, "label": "Financial Reports", "link_to": "Financial Reports", "link_type": "Workspace", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "bgrjea5gs2", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "database", - "idx": 21, "indent": 1, "keep_closed": 1, "label": "Setup", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhgskgkbk", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 22, "indent": 0, "keep_closed": 0, "label": "Chart of Accounts", "link_to": "Account", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhda6gfhu", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 23, "indent": 0, "keep_closed": 0, "label": "Chart of Cost Centers", "link_to": "Cost Center", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhqqetrmr", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 24, "indent": 0, "keep_closed": 0, "label": "Accounting Dimension", "link_to": "Accounting Dimension", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhnutv8g9", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 25, "indent": 0, "keep_closed": 0, "label": "Currency", "link_to": "Currency", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhp6j08e5", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 26, "indent": 0, "keep_closed": 0, "label": "Currency Exchange", "link_to": "Currency Exchange", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhfeb7pha", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 27, "indent": 0, "keep_closed": 0, "label": "Finance Book", "link_to": "Finance Book", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhbe7q82k", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 28, "indent": 0, "keep_closed": 0, "label": "Mode of Payment", "link_to": "Mode of Payment", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhsqj699i", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 29, "indent": 0, "keep_closed": 0, "label": "Payment Term", "link_to": "Payment Term", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhb94vg23", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 30, "indent": 0, "keep_closed": 0, "label": "Journal Entry Template", "link_to": "Journal Entry Template", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhj8j1138", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 31, "indent": 0, "keep_closed": 0, "label": "Terms and Conditions", "link_to": "Terms and Conditions", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhjsnnpf1", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 32, "indent": 0, "keep_closed": 0, "label": "Company", "link_to": "Company", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jhbm036q6", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 33, "indent": 0, "keep_closed": 0, "label": "Fiscal Year", "link_to": "Fiscal Year", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jh431vkrk", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.303793", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 34, "indent": 0, "keep_closed": 0, "label": "Accounts Settings", "link_to": "Accounts Settings", "link_type": "DocType", - "modified": "2025-11-17 14:59:43.158864", - "modified_by": "Administrator", - "name": "2jh7892p5u", - "owner": "Administrator", - "parent": "Accounting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-17 14:59:43.158864", + "modified": "2025-11-25 10:46:09.814457", "modified_by": "Administrator", "module": "Accounts", "name": "Accounting", diff --git a/erpnext/workspace_sidebar/assets.json b/erpnext/workspace_sidebar/assets.json index e7e8cc5cb62..4db0ce0725a 100644 --- a/erpnext/workspace_sidebar/assets.json +++ b/erpnext/workspace_sidebar/assets.json @@ -9,495 +9,253 @@ { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Assets", "link_type": "Workspace", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "a52l2788jf", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "chart", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Dashboard", "link_to": "Asset", "link_type": "Dashboard", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0je4sp9cb", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "assets", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Asset", "link_to": "Asset", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jc4af821", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "move-horizontal", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Asset Movement", "link_to": "Asset Movement", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0j0fa4r1r", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Fixed Asset Register", "link_to": "Fixed Asset Register", "link_type": "Report", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jb39gjp2", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "getting-started", - "idx": 6, "indent": 1, "keep_closed": 1, "label": "Maintenance", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0j32u4pe5", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Asset Maintenance Team", "link_to": "Asset Maintenance Team", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jq5f46ub", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "Asset Maintenance", "link_to": "Asset Maintenance", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jle7uu4e", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 9, "indent": 0, "keep_closed": 0, "label": "Asset Maintenance Log", "link_to": "Asset Maintenance Log", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0j2rldana", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 10, "indent": 0, "keep_closed": 0, "label": "Asset Value Adjustment", "link_to": "Asset Value Adjustment", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0j8651m4i", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 11, "indent": 0, "keep_closed": 0, "label": "Asset Repair", "link_to": "Asset Repair", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jk0g68p4", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 12, "indent": 0, "keep_closed": 0, "label": "Asset Capitalization", "link_to": "Asset Capitalization", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0j32nu6h5", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 13, "indent": 1, "keep_closed": 1, "label": "Reports", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jd0tq9qq", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 14, "indent": 0, "keep_closed": 0, "label": "Asset Depreciation Ledger", "link_to": "Asset Depreciation Ledger", "link_type": "Report", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jmch6u7q", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "Asset Depreciations and Balances", "link_to": "Asset Depreciations and Balances", "link_type": "Report", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0j6s36eoc", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 16, "indent": 0, "keep_closed": 0, "label": "Asset Maintenance", "link_to": "Asset Maintenance", "link_type": "Report", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jh1oghnt", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 17, "indent": 0, "keep_closed": 0, "label": "Asset Activity", "link_to": "Asset Activity", "link_type": "Report", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jgu5ia1o", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "database", - "idx": 18, "indent": 1, "keep_closed": 1, "label": "Setup", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jaak1hei", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 19, "indent": 0, "keep_closed": 0, "label": "Asset Category", "link_to": "Asset Category", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0j0odb91v", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 20, "indent": 0, "keep_closed": 0, "label": "Location", "link_to": "Location", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "p0jk59ac25", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 21, "indent": 0, "keep_closed": 0, "label": "Depreciation Schedule", "link_to": "Asset Depreciation Schedule", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "hirqeqcmr5", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.546717", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 22, "indent": 0, "keep_closed": 0, "label": "Settings", "link_to": "Accounts Settings", "link_type": "DocType", - "modified": "2025-11-17 15:25:01.307323", - "modified_by": "Administrator", - "name": "f84hnvfn6j", - "owner": "Administrator", - "parent": "Assets", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link", "url": "" } ], - "modified": "2025-11-17 15:25:01.307323", + "modified": "2025-11-25 10:46:09.778268", "modified_by": "Administrator", "module": "Assets", "name": "Assets", diff --git a/erpnext/workspace_sidebar/banking.json b/erpnext/workspace_sidebar/banking.json index 7131a267571..1cb227667a2 100644 --- a/erpnext/workspace_sidebar/banking.json +++ b/erpnext/workspace_sidebar/banking.json @@ -9,209 +9,110 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-12 14:55:28.092635", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "organization", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Bank", "link_to": "Bank", "link_type": "DocType", - "modified": "2025-11-18 12:51:44.039817", - "modified_by": "Administrator", - "name": "eahahtoddv", - "owner": "Administrator", - "parent": "Banking", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 14:55:28.092635", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "accounting", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Bank Account", "link_to": "Bank Account", "link_type": "DocType", - "modified": "2025-11-18 12:51:44.039817", - "modified_by": "Administrator", - "name": "eahili0kbv", - "owner": "Administrator", - "parent": "Banking", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 14:55:28.092635", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "book-open-check", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Bank Clearance", "link_to": "Bank Clearance", "link_type": "DocType", - "modified": "2025-11-18 12:51:44.039817", - "modified_by": "Administrator", - "name": "eahekkd6t3", - "owner": "Administrator", - "parent": "Banking", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 14:55:28.092635", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "tool", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Bank Reconciliation", "link_to": "Bank Reconciliation Tool", "link_type": "DocType", - "modified": "2025-11-18 12:51:44.039817", - "modified_by": "Administrator", - "name": "eahk476pjp", - "owner": "Administrator", - "parent": "Banking", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 14:55:28.092635", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "clipboard-check", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Reconciliation Report", "link_to": "Bank Reconciliation Statement", "link_type": "Report", - "modified": "2025-11-18 12:51:44.039817", - "modified_by": "Administrator", - "name": "eahhm00e57", - "owner": "Administrator", - "parent": "Banking", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 14:55:28.092635", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Plaid Settings", "link_to": "Plaid Settings", "link_type": "DocType", - "modified": "2025-11-18 12:51:44.039817", - "modified_by": "Administrator", - "name": "h2mfgkqdl3", - "owner": "Administrator", - "parent": "Banking", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 14:55:28.092635", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "scroll-text", - "idx": 7, "indent": 1, "keep_closed": 1, "label": "Dunning", "link_type": "DocType", - "modified": "2025-11-18 12:51:44.039817", - "modified_by": "Administrator", - "name": "eahgr170fh", - "owner": "Administrator", - "parent": "Banking", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-12 14:55:28.092635", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "Dunning", "link_to": "Dunning", "link_type": "DocType", - "modified": "2025-11-18 12:51:44.039817", - "modified_by": "Administrator", - "name": "eah1o6fbli", - "owner": "Administrator", - "parent": "Banking", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-12 14:55:28.092635", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 9, "indent": 0, "keep_closed": 0, "label": "Dunning Type", "link_to": "Dunning Type", "link_type": "DocType", - "modified": "2025-11-18 12:51:44.039817", - "modified_by": "Administrator", - "name": "eahuts5ooj", - "owner": "Administrator", - "parent": "Banking", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 12:51:44.039817", + "modified": "2025-11-25 10:46:09.274779", "modified_by": "Administrator", "module": "Accounts", "name": "Banking", diff --git a/erpnext/workspace_sidebar/budget.json b/erpnext/workspace_sidebar/budget.json index 9282501dc76..9a7fdb06ee1 100644 --- a/erpnext/workspace_sidebar/budget.json +++ b/erpnext/workspace_sidebar/budget.json @@ -9,143 +9,77 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-10 16:53:45.409587", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "briefcase-business", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Budget", "link_to": "Budget", "link_type": "DocType", - "modified": "2025-11-18 12:48:09.606096", - "modified_by": "Administrator", - "name": "s4ept3e1of", - "owner": "Administrator", - "parent": "Budget", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-10 16:53:45.409587", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "circle-dollar-sign", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Cost Center", "link_to": "Cost Center", "link_type": "DocType", - "modified": "2025-11-18 12:48:09.606096", - "modified_by": "Administrator", - "name": "s4esfj59cn", - "owner": "Administrator", - "parent": "Budget", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-10 16:53:45.409587", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "accounting", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Accounting Dimension", "link_to": "Accounting Dimension", "link_type": "DocType", - "modified": "2025-11-18 12:48:09.606096", - "modified_by": "Administrator", - "name": "s4e73hjuai", - "owner": "Administrator", - "parent": "Budget", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-10 16:53:45.409587", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Cost Center Allocation", "link_to": "Cost Center Allocation", "link_type": "DocType", - "modified": "2025-11-18 12:48:09.606096", - "modified_by": "Administrator", - "name": "s4eacufehs", - "owner": "Administrator", - "parent": "Budget", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-10 16:53:45.409587", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "file-text", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Budget Variance", "link_to": "Budget Variance Report", "link_type": "Report", - "modified": "2025-11-18 12:48:09.606096", - "modified_by": "Administrator", - "name": "s4emq8u9cr", - "owner": "Administrator", - "parent": "Budget", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-10 16:53:45.409587", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "receipt-text", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Monthly Distribution", "link_to": "Monthly Distribution", "link_type": "DocType", - "modified": "2025-11-18 12:48:09.606096", - "modified_by": "Administrator", - "name": "s4e8c3nvk3", - "owner": "Administrator", - "parent": "Budget", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 12:48:09.606096", + "modified": "2025-11-25 10:46:09.281991", "modified_by": "Administrator", "module": "Accounts", "name": "Budget", diff --git a/erpnext/workspace_sidebar/buying.json b/erpnext/workspace_sidebar/buying.json index 07d6c94aab2..faa4d9679d3 100644 --- a/erpnext/workspace_sidebar/buying.json +++ b/erpnext/workspace_sidebar/buying.json @@ -9,476 +9,245 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735790", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Buying", "link_type": "Workspace", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "gj5tkhc51a", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "chart", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Dashboard", "link_to": "Buying", "link_type": "Dashboard", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "c6ngbsgmu7", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.736164", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "customer", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Supplier", "link_to": "Supplier", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "gj5tcsnu6v", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notebook-tabs", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Item", "link_to": "Item", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "v09g9g77og", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.739370", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Material Request", "link_to": "Material Request", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "gj5g2gdlha", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.738809", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "book-open-text", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Supplier Quotation", "link_to": "Supplier Quotation", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "gj5di8ssne", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.739880", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "receipt-text", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Purchase Order", "link_to": "Purchase Order", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "gj5stil147", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "liabilities", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "Purchase Invoice", "link_to": "Purchase Invoice", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "hfvebrug3s", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 9, "indent": 1, "keep_closed": 1, "label": "Reports", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "djqho64h67", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:04.740534", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 10, "indent": 0, "keep_closed": 0, "label": "Purchase Analytics", "link_to": "Purchase Analytics", "link_type": "Report", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "gj5pmo9dqh", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:04.742357", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 11, "indent": 0, "keep_closed": 0, "label": "Purchase Order Analysis", "link_to": "Purchase Order Analysis", "link_type": "Report", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "gj5daa86uf", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 12, "indent": 0, "keep_closed": 0, "label": "Requested Items to Order and Receive", "link_to": "Requested Items to Order and Receive", "link_type": "Report", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "f54sps7llq", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 13, "indent": 0, "keep_closed": 0, "label": "Items To Be Requested", "link_to": "Items To Be Requested", "link_type": "Report", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "h5pffu963i", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 14, "indent": 0, "keep_closed": 0, "label": "Item-wise Purchase History", "link_to": "Item-wise Purchase History", "link_type": "Report", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "h5pshh2bnv", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "Purchase Receipt Trends ", "link_to": "Purchase Receipt Trends", "link_type": "Report", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "h5p06ggcb8", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 16, "indent": 0, "keep_closed": 0, "label": "Purchase Invoice Trends", "link_to": "Purchase Invoice Trends", "link_type": "Report", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "h5pl2oikn6", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "database", - "idx": 17, "indent": 1, "keep_closed": 1, "label": "Setup", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "3lshttck3p", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 18, "indent": 0, "keep_closed": 0, "label": "Supplier Group", "link_to": "Supplier Group", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "3lso15lerr", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 19, "indent": 0, "keep_closed": 0, "label": "Address", "link_to": "Address", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "3ls6o080ck", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 20, "indent": 0, "keep_closed": 0, "label": "Contacts", "link_to": "Contact", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "3lsjq2lpd1", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.735352", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 21, "indent": 0, "keep_closed": 0, "label": "Settings", "link_to": "Buying Settings", "link_type": "DocType", - "modified": "2025-11-17 14:47:15.396657", - "modified_by": "Administrator", - "name": "m4qt4e0fli", - "owner": "Administrator", - "parent": "Buying", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-17 14:47:15.396657", + "modified": "2025-11-25 10:46:09.205029", "modified_by": "Administrator", "module": "Buying", "name": "Buying", diff --git a/erpnext/workspace_sidebar/crm.json b/erpnext/workspace_sidebar/crm.json index 81875f41cf8..392a0988c34 100644 --- a/erpnext/workspace_sidebar/crm.json +++ b/erpnext/workspace_sidebar/crm.json @@ -9,979 +9,495 @@ { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "CRM", "link_type": "Workspace", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "lobub12mvm", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "chart", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Dashboard", "link_to": "CRM", "link_type": "Dashboard", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jl4jn5kr", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "users-round", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Lead", "link_to": "Lead", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jpcvuhcm", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "lightbulb", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Opportunity", "link_to": "Opportunity", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j9uc53k6", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "customer", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Customer", "link_to": "Customer", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0ja243ee9", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 6, "indent": 1, "keep_closed": 1, "label": "Reports", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jkdsbos0", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Sales Analytics", "link_to": "Sales Analytics", "link_type": "Report", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j6nplgan", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "Lead Details", "link_to": "Lead Details", "link_type": "Report", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jdmdfunh", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 9, "indent": 0, "keep_closed": 0, "label": "Sales Pipeline Analytics", "link_to": "Sales Pipeline Analytics", "link_type": "Report", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jppg8i9d", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 10, "indent": 0, "keep_closed": 0, "label": "Opportunity Summary by Sales Stage", "link_to": "Opportunity Summary by Sales Stage", "link_type": "Report", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jbqc46vg", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 11, "indent": 0, "keep_closed": 0, "label": "Sales Funnel", "link_to": "sales-funnel", "link_type": "Page", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jk58g0lr", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 12, "indent": 0, "keep_closed": 0, "label": "Prospects Engaged But Not Converted", "link_to": "Prospects Engaged But Not Converted", "link_type": "Report", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jdo465fk", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 13, "indent": 0, "keep_closed": 0, "label": "First Response Time for Opportunity", "link_to": "First Response Time for Opportunity", "link_type": "Report", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j12n4psl", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 14, "indent": 0, "keep_closed": 0, "label": "Inactive Customers", "link_to": "Inactive Customers", "link_type": "Report", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jfqekfo9", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "Campaign Efficiency", "link_to": "Campaign Efficiency", "link_type": "Report", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jcoha9kq", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 16, "indent": 0, "keep_closed": 0, "label": "Lead Owner Efficiency", "link_to": "Lead Owner Efficiency", "link_type": "Report", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jh068mgq", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "getting-started", - "idx": 17, "indent": 1, "keep_closed": 1, "label": "Maintenance", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jat9iu0r", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 18, "indent": 0, "keep_closed": 0, "label": "Maintenance Schedule", "link_to": "Maintenance Schedule", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j83c4sql", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 19, "indent": 0, "keep_closed": 0, "label": "Maintenance Visit", "link_to": "Maintenance Visit", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j3be6kct", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 20, "indent": 0, "keep_closed": 0, "label": "Warranty Claim", "link_to": "Warranty Claim", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j51jtnl3", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "funnel", - "idx": 21, "indent": 1, "keep_closed": 1, "label": "Sales Pipeline", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j1kj87co", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 22, "indent": 0, "keep_closed": 0, "label": "Lead", "link_to": "Lead", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j0vmejna", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 23, "indent": 0, "keep_closed": 0, "label": "Opportunity", "link_to": "Opportunity", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jo1ucbp8", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 24, "indent": 0, "keep_closed": 0, "label": "Customer", "link_to": "Customer", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jt6m0ep0", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 25, "indent": 0, "keep_closed": 0, "label": "Contract", "link_to": "Contract", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j5n8t0ve", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 26, "indent": 0, "keep_closed": 0, "label": "Appointment", "link_to": "Appointment", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jjms5iuq", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 27, "indent": 0, "keep_closed": 0, "label": "Communication", "link_to": "Communication", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j3antkj7", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "sell", - "idx": 28, "indent": 1, "keep_closed": 1, "label": "Campaign", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jbd317v6", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 29, "indent": 0, "keep_closed": 0, "label": "Campaign", "link_to": "Campaign", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jupapghj", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 30, "indent": 0, "keep_closed": 0, "label": "Email Campaign", "link_to": "Email Campaign", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jb99jakb", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 31, "indent": 0, "keep_closed": 0, "label": "SMS Center", "link_to": "SMS Center", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jl7aspa5", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 32, "indent": 0, "keep_closed": 0, "label": "SMS Log", "link_to": "SMS Log", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j6r550f7", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 33, "indent": 0, "keep_closed": 0, "label": "Email Group", "link_to": "Email Group", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jd7tnjn3", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "database", - "idx": 34, "indent": 1, "keep_closed": 1, "label": "Setup", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j09bl75c", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 35, "indent": 0, "keep_closed": 0, "label": "Territory", "link_to": "Territory", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jo5mc0gm", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 36, "indent": 0, "keep_closed": 0, "label": "Customer Group", "link_to": "Customer Group", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j9mthhbf", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 37, "indent": 0, "keep_closed": 0, "label": "Contact", "link_to": "Contact", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jpf5rhjt", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 38, "indent": 0, "keep_closed": 0, "label": "Prospect", "link_to": "Prospect", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0ji2u3lpq", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 39, "indent": 0, "keep_closed": 0, "label": "Sales Person", "link_to": "Sales Person", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j6kcb3c2", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 40, "indent": 0, "keep_closed": 0, "label": "Sales Stage", "link_to": "Sales Stage", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jt4l8lq2", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 41, "indent": 0, "keep_closed": 0, "label": "Lead Source", "link_to": "UTM Source", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0j1ef8tm5", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 42, "indent": 1, "keep_closed": 1, "label": "Settings", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jbqif846", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 43, "indent": 0, "keep_closed": 0, "label": "CRM Settings", "link_to": "CRM Settings", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0jmd2tqut", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.562339", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 44, "indent": 0, "keep_closed": 0, "label": "SMS Settings", "link_to": "SMS Settings", "link_type": "DocType", - "modified": "2025-11-17 15:19:26.814678", - "modified_by": "Administrator", - "name": "p0ja73sbef", - "owner": "Administrator", - "parent": "CRM", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-17 15:19:26.814678", + "modified": "2025-11-25 10:46:09.695726", "modified_by": "Administrator", "module": "CRM", "name": "CRM", diff --git a/erpnext/workspace_sidebar/financial_reports.json b/erpnext/workspace_sidebar/financial_reports.json index 4f3858c46bb..563d4f63a86 100644 --- a/erpnext/workspace_sidebar/financial_reports.json +++ b/erpnext/workspace_sidebar/financial_reports.json @@ -9,511 +9,258 @@ { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "accounting", - "idx": 1, "indent": 1, "keep_closed": 0, "label": "Financial Reports", "link_type": "DocType", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcf7p2v5i1", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Balance Sheet", "link_to": "Balance Sheet", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfcub1qov", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Profit and Loss", "link_to": "Profit and Loss Statement", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfuomeq40", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Cash Flow", "link_to": "Cash Flow", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcf8shjg1l", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Trial Balance", "link_to": "Trial Balance", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcf04jmiqd", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Consolidated Report", "link_to": "Consolidated Financial Statement", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcf30kc4nm", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "book-text", - "idx": 7, "indent": 1, "keep_closed": 0, "label": "Ledgers", "link_type": "DocType", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfh2o3p50", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "General Ledger", "link_to": "General Ledger", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfi0btl7m", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 9, "indent": 0, "keep_closed": 0, "label": "Customer Ledger", "link_to": "Customer Ledger Summary", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcf9ghjshq", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 10, "indent": 0, "keep_closed": 0, "label": "Supplier Ledger", "link_to": "Supplier Ledger Summary", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcf7rstsis", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "dollar-sign", - "idx": 11, "indent": 1, "keep_closed": 1, "label": "Profitability", "link_type": "DocType", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfpe02q4r", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 12, "indent": 0, "keep_closed": 0, "label": "Gross Profit", "link_to": "Gross Profit", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfgikjen7", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 13, "indent": 0, "keep_closed": 0, "label": "Profitability Analysis", "link_to": "Profitability Analysis", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcf2nmj0go", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 14, "indent": 0, "keep_closed": 0, "label": "Sales Invoice Trends", "link_to": "Sales Invoice Trends", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcf2o3pc4m", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "Purchase Invoice Trends", "link_to": "Purchase Invoice Trends", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcffhb5v3e", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "scroll-text", - "idx": 16, "indent": 1, "keep_closed": 1, "label": "Other Reports", "link_type": "DocType", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcf0hoisq3", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 17, "indent": 0, "keep_closed": 0, "label": "Trial Balance for Party", "link_to": "Trial Balance for Party", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfsv0j8if", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 18, "indent": 0, "keep_closed": 0, "label": "Payment Period Based On Invoice Date", "link_to": "Payment Period Based On Invoice Date", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfqaoljtv", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 19, "indent": 0, "keep_closed": 0, "label": "Sales Partners Commission", "link_to": "Sales Partners Commission", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcf839lg28", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 20, "indent": 0, "keep_closed": 0, "label": "Customer Credit Balance", "link_to": "Customer Credit Balance", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfkktlnno", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 21, "indent": 0, "keep_closed": 0, "label": "Sales Payment Summary", "link_to": "Sales Payment Summary", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfsa36b7e", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 22, "indent": 0, "keep_closed": 0, "label": "Address And Contacts", "link_to": "Address And Contacts", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfd5h3374", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.576629", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 23, "indent": 0, "keep_closed": 0, "label": "UAE VAT 201", "link_to": "UAE VAT 201", "link_type": "Report", - "modified": "2025-11-18 12:56:20.287230", - "modified_by": "Administrator", - "name": "tcfnm3du50", - "owner": "Administrator", - "parent": "Financial Reports", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 12:56:20.287230", + "modified": "2025-11-25 10:46:09.634854", "modified_by": "Administrator", "module": "Accounts", "name": "Financial Reports", diff --git a/erpnext/workspace_sidebar/home.json b/erpnext/workspace_sidebar/home.json index c30a889fec1..61b3e600421 100644 --- a/erpnext/workspace_sidebar/home.json +++ b/erpnext/workspace_sidebar/home.json @@ -9,115 +9,60 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.805785", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 1, - "indent": 0, - "keep_closed": 0, - "label": "Home", - "link_to": "Home", - "link_type": "Workspace", - "modified": "2025-11-17 13:28:30.310305", - "modified_by": "Administrator", - "name": "gj783t37on", - "owner": "Administrator", - "parent": "Home", - "parentfield": "items", - "parenttype": "Workspace Sidebar", - "show_arrow": 0, - "type": "Link" - }, - { - "child": 0, - "collapsible": 1, - "creation": "2025-11-17 13:19:04.806286", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Item", "link_to": "Item", "link_type": "DocType", - "modified": "2025-11-17 13:28:30.310305", - "modified_by": "Administrator", - "name": "gj7121ufmk", - "owner": "Administrator", - "parent": "Home", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.806983", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 2, + "indent": 0, + "keep_closed": 0, + "label": "Home", + "link_to": "Home", + "link_type": "Workspace", + "show_arrow": 0, + "type": "Link" + }, + { + "child": 0, + "collapsible": 1, "indent": 0, "keep_closed": 0, "label": "Customer", "link_to": "Customer", "link_type": "DocType", - "modified": "2025-11-17 13:28:30.310305", - "modified_by": "Administrator", - "name": "gj7fbkfr9v", - "owner": "Administrator", - "parent": "Home", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.807394", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Supplier", "link_to": "Supplier", "link_type": "DocType", - "modified": "2025-11-17 13:28:30.310305", - "modified_by": "Administrator", - "name": "gj7jmt8t94", - "owner": "Administrator", - "parent": "Home", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.807720", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Sales Invoice", "link_to": "Sales Invoice", "link_type": "DocType", - "modified": "2025-11-17 13:28:30.310305", - "modified_by": "Administrator", - "name": "gj7ms79fte", - "owner": "Administrator", - "parent": "Home", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-17 13:28:30.310305", + "modified": "2025-11-25 10:46:09.198568", "modified_by": "Administrator", "module": "Setup", "name": "Home", diff --git a/erpnext/workspace_sidebar/manufacturing.json b/erpnext/workspace_sidebar/manufacturing.json index 9b33e908e22..efd353678f1 100644 --- a/erpnext/workspace_sidebar/manufacturing.json +++ b/erpnext/workspace_sidebar/manufacturing.json @@ -9,830 +9,423 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Manufacturing", "link_type": "Dashboard", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1uljp978", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notebook-tabs", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Item", "link_to": "Item", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1diqf2pu", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "warehouse", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Warehouse", "link_to": "Warehouse", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "vjujt9jk0d", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "list-tree", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "BOM", "link_to": "BOM", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1ge8r618", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "factory", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Work Order", "link_to": "Work Order", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1cchm62h", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "person-standing", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Job Card", "link_to": "Job Card", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1kmhn1o7", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "stock", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Stock Entry", "link_to": "Stock Entry", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1g2ggojd", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "getting-started", - "idx": 8, "indent": 1, "keep_closed": 1, "label": "Material Planning", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo170ktc4t", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 9, "indent": 0, "keep_closed": 0, "label": "Production Plan", "link_to": "Production Plan", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1i33pov5", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 10, "indent": 0, "keep_closed": 0, "label": "Forecasting", "link_to": "Exponential Smoothing Forecasting", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1bpn7sn1", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 11, "indent": 0, "keep_closed": 0, "label": "Master Production Schedule", "link_to": "Master Production Schedule", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo14q8iq2g", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 12, "indent": 0, "keep_closed": 0, "label": "Sales Forecast", "link_to": "Sales Forecast", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo18lfqj7u", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 13, "indent": 0, "keep_closed": 0, "label": "Production Planning Report", "link_to": "Production Planning Report", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo11fm3384", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "tool", - "idx": 14, "indent": 1, "keep_closed": 1, "label": "Tools", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1trvh3uk", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "BOM Creator", "link_to": "BOM Creator", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1fr91egu", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 16, "indent": 0, "keep_closed": 0, "label": "BOM Update Tool", "link_to": "BOM Update Tool", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1sn3vg4m", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 17, "indent": 0, "keep_closed": 0, "label": "BOM Comparison Tool", "link_to": "bom-comparison-tool", "link_type": "Page", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo17cqvguh", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 18, "indent": 0, "keep_closed": 0, "label": "Downtime Entry", "link_to": "Downtime Entry", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1ue8rtc4", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 19, "indent": 1, "keep_closed": 1, "label": "Reports", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo135aokmv", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 20, "indent": 0, "keep_closed": 0, "label": "Production Planning Report", "link_to": "Production Planning Report", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo15flqdi7", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 21, "indent": 0, "keep_closed": 0, "label": "Work Order Summary", "link_to": "Work Order Summary", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1shj86ul", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 22, "indent": 0, "keep_closed": 0, "label": "Quality Inspection Summary", "link_to": "Quality Inspection Summary", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo16ncrtc0", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 23, "indent": 0, "keep_closed": 0, "label": "Downtime Analysis", "link_to": "Downtime Analysis", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1bka5k0f", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 24, "indent": 0, "keep_closed": 0, "label": "Job Card Summary", "link_to": "Job Card Summary", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1k8bdo6d", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 25, "indent": 0, "keep_closed": 0, "label": "BOM Search", "link_to": "BOM Search", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1nklgk54", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 26, "indent": 0, "keep_closed": 0, "label": "BOM Stock Report", "link_to": "BOM Stock Report", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1c7kpop3", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 27, "indent": 0, "keep_closed": 0, "label": "Production Analytics", "link_to": "Production Analytics", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1j4hpeai", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 28, "indent": 0, "keep_closed": 0, "label": "BOM Operations Time", "link_to": "BOM Operations Time", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1sdfi370", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 29, "indent": 0, "keep_closed": 0, "label": "Work Order Consumed Materials", "link_to": "Work Order Consumed Materials", "link_type": "Report", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo10jt5k2e", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "database", - "idx": 30, "indent": 1, "keep_closed": 1, "label": "Setup", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo11067h51", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 31, "indent": 0, "keep_closed": 0, "label": "Warehouse", "link_to": "Warehouse", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo178fndpb", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 32, "indent": 0, "keep_closed": 0, "label": "Operation", "link_to": "Operation", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo13edmjfk", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 33, "indent": 0, "keep_closed": 0, "label": "Workstation", "link_to": "Workstation", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1lolsniv", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 34, "indent": 0, "keep_closed": 0, "label": "Workstation Type", "link_to": "Workstation Type", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1o9honde", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 35, "indent": 0, "keep_closed": 0, "label": "Plant Floor", "link_to": "Plant Floor", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo177fokrh", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 36, "indent": 0, "keep_closed": 0, "label": "Routing", "link_to": "Routing", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1o823p7h", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-05 12:11:24.739243", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 37, "indent": 0, "keep_closed": 0, "label": "Settings", "link_to": "Manufacturing Settings", "link_type": "DocType", - "modified": "2025-11-17 14:43:32.100016", - "modified_by": "Administrator", - "name": "lo1eafhvmc", - "owner": "Administrator", - "parent": "Manufacturing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-17 14:43:32.100016", + "modified": "2025-11-25 10:46:09.349984", "modified_by": "Administrator", "module": "Manufacturing", "name": "Manufacturing", diff --git a/erpnext/workspace_sidebar/opening_&_closing.json b/erpnext/workspace_sidebar/opening_&_closing.json index 899f613b61d..eddcbf929dc 100644 --- a/erpnext/workspace_sidebar/opening_&_closing.json +++ b/erpnext/workspace_sidebar/opening_&_closing.json @@ -9,120 +9,65 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:14:26.244306", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "accounting", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "COA Importer", "link_to": "Chart of Accounts Importer", "link_type": "DocType", - "modified": "2025-11-18 12:18:23.250303", - "modified_by": "Administrator", - "name": "pe69544ed2", - "owner": "Administrator", - "parent": "Opening & Closing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:14:26.244306", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "tool", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Opening Invoice Tool", "link_to": "Opening Invoice Creation Tool", "link_type": "DocType", - "modified": "2025-11-18 12:18:23.250303", - "modified_by": "Administrator", - "name": "pe66qd6uek", - "owner": "Administrator", - "parent": "Opening & Closing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:14:26.244306", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "folder-clock", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Accounting Period", "link_to": "Accounting Period", "link_type": "DocType", - "modified": "2025-11-18 12:18:23.250303", - "modified_by": "Administrator", - "name": "qafpmb1c3g", - "owner": "Administrator", - "parent": "Opening & Closing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:14:26.244306", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "expand-alt", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "FX Revaluation", "link_to": "Exchange Rate Revaluation", "link_type": "DocType", - "modified": "2025-11-18 12:18:23.250303", - "modified_by": "Administrator", - "name": "pe6228hgro", - "owner": "Administrator", - "parent": "Opening & Closing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:14:26.244306", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "calendar-check", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Period Closing Voucher", "link_to": "Period Closing Voucher", "link_type": "DocType", - "modified": "2025-11-18 12:18:23.250303", - "modified_by": "Administrator", - "name": "pe6ravef13", - "owner": "Administrator", - "parent": "Opening & Closing", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 12:18:23.250303", + "modified": "2025-11-25 10:46:09.262478", "modified_by": "Administrator", "module": "Accounts", "name": "Opening & Closing", diff --git a/erpnext/workspace_sidebar/payables.json b/erpnext/workspace_sidebar/payables.json index e66d67dba14..5932569028c 100644 --- a/erpnext/workspace_sidebar/payables.json +++ b/erpnext/workspace_sidebar/payables.json @@ -9,143 +9,77 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.870797", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Payables", "link_type": "Workspace", - "modified": "2025-11-17 16:01:59.692895", - "modified_by": "Administrator", - "name": "gj86odhe5m", - "owner": "Administrator", - "parent": "Payables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.870143", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "customer", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Supplier", "link_to": "Supplier", "link_type": "DocType", - "modified": "2025-11-17 16:01:59.692895", - "modified_by": "Administrator", - "name": "dlacul61d4", - "owner": "Administrator", - "parent": "Payables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.871726", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "liabilities", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Purchase Invoice", "link_to": "Purchase Invoice", "link_type": "DocType", - "modified": "2025-11-17 16:01:59.692895", - "modified_by": "Administrator", - "name": "gj854ajj3t", - "owner": "Administrator", - "parent": "Payables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.872480", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "dollar-sign", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Payment Entry", "link_to": "Payment Entry", "link_type": "DocType", - "modified": "2025-11-17 16:01:59.692895", - "modified_by": "Administrator", - "name": "gj8a4oias2", - "owner": "Administrator", - "parent": "Payables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.872136", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "calendar-range", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Journal Entry", "link_to": "Journal Entry", "link_type": "DocType", - "modified": "2025-11-17 16:01:59.692895", - "modified_by": "Administrator", - "name": "gj8l8h85er", - "owner": "Administrator", - "parent": "Payables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.871321", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Accounts Payable", "link_to": "Accounts Payable", "link_type": "Report", - "modified": "2025-11-17 16:01:59.692895", - "modified_by": "Administrator", - "name": "gj8m5jhujl", - "owner": "Administrator", - "parent": "Payables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-17 16:01:59.692895", + "modified": "2025-11-25 10:46:09.192845", "modified_by": "Administrator", "module": "Accounts", "name": "Payables", diff --git a/erpnext/workspace_sidebar/projects.json b/erpnext/workspace_sidebar/projects.json index e0b7aacedad..42d8687708a 100644 --- a/erpnext/workspace_sidebar/projects.json +++ b/erpnext/workspace_sidebar/projects.json @@ -9,141 +9,75 @@ { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.610193", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Projects", "link_type": "Workspace", - "modified": "2025-11-18 12:57:32.419129", - "modified_by": "Administrator", - "name": "v5271ba9qe", - "owner": "Administrator", - "parent": "Projects", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.610193", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "projects", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Project", "link_to": "Project", "link_type": "DocType", - "modified": "2025-11-18 12:57:32.419129", - "modified_by": "Administrator", - "name": "v52uislo05", - "owner": "Administrator", - "parent": "Projects", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.610193", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "list-todo", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Task", "link_to": "Task", "link_type": "DocType", - "modified": "2025-11-18 12:57:32.419129", - "modified_by": "Administrator", - "name": "v52s06s5c9", - "owner": "Administrator", - "parent": "Projects", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.610193", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "calendar-clock", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Timesheet", "link_to": "Timesheet", "link_type": "DocType", - "modified": "2025-11-18 12:57:32.419129", - "modified_by": "Administrator", - "name": "v52l5ajg37", - "owner": "Administrator", - "parent": "Projects", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.610193", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Reports", "link_type": "DocType", - "modified": "2025-11-18 12:57:32.419129", - "modified_by": "Administrator", - "name": "v52fgh6rp7", - "owner": "Administrator", - "parent": "Projects", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.610193", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "table", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Project Summary", "link_to": "Project Summary", "link_type": "Report", - "modified": "2025-11-18 12:57:32.419129", - "modified_by": "Administrator", - "name": "v5293kftfm", - "owner": "Administrator", - "parent": "Projects", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 12:57:32.419129", + "modified": "2025-11-25 10:46:09.466032", "modified_by": "Administrator", "name": "Projects", "owner": "Administrator", diff --git a/erpnext/workspace_sidebar/quality.json b/erpnext/workspace_sidebar/quality.json index 4d5b44bb291..733a25e2ddf 100644 --- a/erpnext/workspace_sidebar/quality.json +++ b/erpnext/workspace_sidebar/quality.json @@ -9,429 +9,220 @@ { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "quality", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Quality Goal", "link_to": "Quality Goal", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tceqfuja3h", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "book-text", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Quality Procedure", "link_to": "Quality Procedure", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tce8t7m3qb", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "inspection-panel", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Quality Inspection", "link_to": "Quality Inspection", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tcevm834v9", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "review", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Quality Review", "link_to": "Quality Review", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tcesi270tl", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "square-activity", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Quality Action", "link_to": "Quality Action", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tcejoad9a5", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "grid-2x2-check", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Non Conformance", "link_to": "Non Conformance", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tcedpel3gh", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "calendar-check-2", - "idx": 7, "indent": 1, "keep_closed": 1, "label": "Goal and Procedure", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tcee3hfgf9", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "Quality Goal", "link_to": "Quality Goal", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tceumn3rd3", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 9, "indent": 0, "keep_closed": 0, "label": "Quality Procedure", "link_to": "Quality Procedure", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tceku71e6g", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 10, "indent": 0, "keep_closed": 0, "label": "Tree of Procedures", "link_to": "Quality Procedure", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tceftftl2o", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "thumbs-up", - "idx": 11, "indent": 1, "keep_closed": 1, "label": "Feedback", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tce3k5c8pv", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 12, "indent": 0, "keep_closed": 0, "label": "Quality Feedback", "link_to": "Quality Feedback", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tce2c6bjrj", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 13, "indent": 0, "keep_closed": 0, "label": "Feedback Template", "link_to": "Quality Feedback Template", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tce32i3puc", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "calendar-check", - "idx": 14, "indent": 1, "keep_closed": 1, "label": "Meeting", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tcedk9qhic", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "Quality Meeting", "link_to": "Quality Meeting", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tce9dbh54t", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "review", - "idx": 16, "indent": 1, "keep_closed": 1, "label": "Review and Action", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tce2o9099i", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 17, "indent": 0, "keep_closed": 0, "label": "Non Conformance", "link_to": "Non Conformance", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tcep7u03dr", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 18, "indent": 0, "keep_closed": 0, "label": "Quality Review", "link_to": "Quality Review", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tcefnlftl3", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.613016", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 19, "indent": 0, "keep_closed": 0, "label": "Quality Action", "link_to": "Quality Action", "link_type": "DocType", - "modified": "2025-11-18 13:04:51.305653", - "modified_by": "Administrator", - "name": "tcea5tgvcq", - "owner": "Administrator", - "parent": "Quality", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 13:04:51.305653", + "modified": "2025-11-25 10:46:09.454532", "modified_by": "Administrator", "module": "Quality Management", "name": "Quality", diff --git a/erpnext/workspace_sidebar/receivables.json b/erpnext/workspace_sidebar/receivables.json index b1e0aad7afc..e6ecb4884c1 100644 --- a/erpnext/workspace_sidebar/receivables.json +++ b/erpnext/workspace_sidebar/receivables.json @@ -9,165 +9,88 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.958687", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Receivables", "link_type": "Workspace", - "modified": "2025-11-17 16:00:54.952576", - "modified_by": "Administrator", - "name": "gj8jglttfq", - "owner": "Administrator", - "parent": "Receivables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.959354", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "customer", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Customer", "link_to": "Customer", "link_type": "DocType", - "modified": "2025-11-17 16:00:54.952576", - "modified_by": "Administrator", - "name": "gj8igreert", - "owner": "Administrator", - "parent": "Receivables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.959658", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "receipt", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Sales Invoice", "link_to": "Sales Invoice", "link_type": "DocType", - "modified": "2025-11-17 16:00:54.952576", - "modified_by": "Administrator", - "name": "gj81ke1nng", - "owner": "Administrator", - "parent": "Receivables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.960341", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "dollar-sign", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Payment Entry", "link_to": "Payment Entry", "link_type": "DocType", - "modified": "2025-11-17 16:00:54.952576", - "modified_by": "Administrator", - "name": "gj8t64ehel", - "owner": "Administrator", - "parent": "Receivables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.959965", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "file-text", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Journal Entry", "link_to": "Journal Entry", "link_type": "DocType", - "modified": "2025-11-17 16:00:54.952576", - "modified_by": "Administrator", - "name": "gj85hgn5df", - "owner": "Administrator", - "parent": "Receivables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.959041", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "computer", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "POS Invoice", "link_to": "POS Invoice", "link_type": "DocType", - "modified": "2025-11-17 16:00:54.952576", - "modified_by": "Administrator", - "name": "gj8p0q3mk1", - "owner": "Administrator", - "parent": "Receivables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:04.960735", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Accounts Receivable", "link_to": "Accounts Receivable", "link_type": "Report", - "modified": "2025-11-17 16:00:54.952576", - "modified_by": "Administrator", - "name": "gj84i3l5b8", - "owner": "Administrator", - "parent": "Receivables", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-17 16:00:54.952576", + "modified": "2025-11-25 10:46:09.185843", "modified_by": "Administrator", "module": "Accounts", "name": "Receivables", diff --git a/erpnext/workspace_sidebar/selling.json b/erpnext/workspace_sidebar/selling.json index c178b35a1ee..8581594d686 100644 --- a/erpnext/workspace_sidebar/selling.json +++ b/erpnext/workspace_sidebar/selling.json @@ -9,983 +9,499 @@ { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Selling", "link_type": "Workspace", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at2o427kh", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "chart", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Dashboard", "link_to": "Selling", "link_type": "Dashboard", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "alepd3fdu8", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "customer", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Customer", "link_to": "Customer", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atka0g887", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notebook-tabs", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Item", "link_to": "Item", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "ue6j7io1me", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "receipt-text", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Quotation", "link_to": "Quotation", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at5inv5oa", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "sell", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Sales Order", "link_to": "Sales Order", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atvo6st6f", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "receipt", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Sales Invoice", "link_to": "Sales Invoice", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2ate21i45p", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "computer", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "POS", "link_to": "point-of-sale", "link_type": "Page", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "ue6ljik47i", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "package", - "idx": 9, "indent": 1, "keep_closed": 1, "label": "Item and Pricing", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atka2aegd", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 10, "indent": 0, "keep_closed": 0, "label": "Item", "link_to": "Item", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atd73pi1m", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 11, "indent": 0, "keep_closed": 0, "label": "Item Group", "link_to": "Item Group", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at5sdshor", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 12, "indent": 0, "keep_closed": 0, "label": "Price List", "link_to": "Price List", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atcs4kogo", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 13, "indent": 0, "keep_closed": 0, "label": "Item Price", "link_to": "Item Price", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atk4ls5l6", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 14, "indent": 0, "keep_closed": 0, "label": "Pricing Rule", "link_to": "Pricing Rule", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2ats28ulcs", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "Promotional Scheme", "link_to": "Promotional Scheme", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atlbm6pan", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 16, "indent": 0, "keep_closed": 0, "label": "Coupon Code", "link_to": "Coupon Code", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2ata3q33bn", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 17, "indent": 0, "keep_closed": 0, "label": "Blanket Order", "link_to": "Blanket Order", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at8dbno0l", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 18, "indent": 1, "keep_closed": 1, "label": "Reports", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atkrmifps", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 19, "indent": 0, "keep_closed": 0, "label": "Sales Analytics", "link_to": "Sales Analytics", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at88tvna7", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 20, "indent": 0, "keep_closed": 0, "label": "Pending SO Items For Purchase Request", "link_to": "Pending SO Items For Purchase Request", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at0o5arcg", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 21, "indent": 0, "keep_closed": 0, "label": "Available Stock for Packing Items", "link_to": "Available Stock for Packing Items", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at4g7h7bo", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 22, "indent": 0, "keep_closed": 0, "label": "Customer Addresses And Contacts", "link_to": "Address And Contacts", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atms4hij6", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 23, "indent": 0, "keep_closed": 0, "label": "Delivery Note Trends", "link_to": "Delivery Note Trends", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at4091isc", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 24, "indent": 0, "keep_closed": 0, "label": "Sales Invoice Trends", "link_to": "Sales Invoice Trends", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atu7ebnks", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 25, "indent": 0, "keep_closed": 0, "label": "Customer Credit Balance", "link_to": "Customer Credit Balance", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atokn9fai", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 26, "indent": 0, "keep_closed": 0, "label": "Customers Without Any Sales Transactions", "link_to": "Customers Without Any Sales Transactions", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at0347om8", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 27, "indent": 0, "keep_closed": 0, "label": "Sales Partners Commission", "link_to": "Sales Partners Commission", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atiljm0bd", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 28, "indent": 0, "keep_closed": 0, "label": "Territory Target Variance Based On Item Group", "link_to": "Territory Target Variance Based On Item Group", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atsfkrqq1", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 29, "indent": 0, "keep_closed": 0, "label": "Sales Person Target Variance Based On Item Group", "link_to": "Sales Person Target Variance Based On Item Group", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at42iqcic", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 30, "indent": 0, "keep_closed": 0, "label": "Sales Partner Target Variance Based On Item Group", "link_to": "Sales Partner Target Variance based on Item Group", "link_type": "Report", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at8vugell", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "database", - "idx": 31, "indent": 1, "keep_closed": 1, "label": "Setup", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atjp698mu", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 32, "indent": 0, "keep_closed": 0, "label": "Customer Group", "link_to": "Customer Group", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at0tc62l1", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 33, "indent": 0, "keep_closed": 0, "label": "Address", "link_to": "Address", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2ateadrb5k", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 34, "indent": 0, "keep_closed": 0, "label": "Contact", "link_to": "Contact", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atccn4bn5", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 35, "indent": 0, "keep_closed": 0, "label": "Territory", "link_to": "Territory", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at3dg7din", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 36, "indent": 0, "keep_closed": 0, "label": "Campaign", "link_to": "Campaign", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at95f73q2", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 37, "indent": 0, "keep_closed": 0, "label": "Sales Partner", "link_to": "Sales Partner", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atf6ic5fq", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 38, "indent": 0, "keep_closed": 0, "label": "Sales Person", "link_to": "Sales Person", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atakl9er0", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 39, "indent": 0, "keep_closed": 0, "label": "Product Bundle", "link_to": "Product Bundle", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atc7e2uv3", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 40, "indent": 0, "keep_closed": 0, "label": "Shipping Rule", "link_to": "Shipping Rule", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atmepv8em", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 41, "indent": 0, "keep_closed": 0, "label": "UTM Source", "link_to": "UTM Source", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atg9ll9m2", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 42, "indent": 0, "keep_closed": 0, "label": "Terms Template", "link_to": "Terms and Conditions", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2at2jleuo2", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 43, "indent": 0, "keep_closed": 0, "label": "Tax Template", "link_to": "Sales Taxes and Charges Template", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2atsp053ek", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.624753", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 44, "indent": 0, "keep_closed": 0, "label": "Settings", "link_to": "Selling Settings", "link_type": "DocType", - "modified": "2025-11-18 13:31:22.097585", - "modified_by": "Administrator", - "name": "2ath6o7jt9", - "owner": "Administrator", - "parent": "Selling", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 13:31:22.097585", + "modified": "2025-11-25 10:46:09.425854", "modified_by": "Administrator", "module": "Selling", "name": "Selling", diff --git a/erpnext/workspace_sidebar/settings.json b/erpnext/workspace_sidebar/settings.json index 2814c840a36..18104819c72 100644 --- a/erpnext/workspace_sidebar/settings.json +++ b/erpnext/workspace_sidebar/settings.json @@ -9,258 +9,137 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.051033", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Settings", "link_type": "Workspace", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "gj96mk2v27", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.050624", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "crm", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "CRM Settings", "link_to": "CRM Settings", "link_type": "DocType", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "evs5nlr1q0", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.053190", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "sell", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Selling Settings", "link_to": "Selling Settings", "link_type": "DocType", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "gj9u1k3i56", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.053492", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "buying", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Buying Settings", "link_to": "Buying Settings", "link_type": "DocType", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "gj9ct0hfhj", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.052094", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "accounting", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Accounts Settings", "link_to": "Accounts Settings", "link_type": "DocType", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "gj996hcboc", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.052884", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "stock", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Stock Settings", "link_to": "Stock Settings", "link_type": "DocType", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "gj9hup4r96", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.050624", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "building-2", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Manufacturing Settings", "link_to": "Manufacturing Settings", "link_type": "DocType", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "e0c9du5q9a", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.051420", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "printer", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "Print Settings", "link_to": "Print Settings", "link_type": "DocType", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "gj9j587oit", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.051734", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "computer", - "idx": 9, "indent": 0, "keep_closed": 0, "label": "System Settings", "link_to": "System Settings", "link_type": "DocType", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "gj9uqukv96", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.052565", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "earth", - "idx": 10, "indent": 0, "keep_closed": 0, "label": "Global Defaults", "link_to": "Global Defaults", "link_type": "DocType", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "gj9koe7aa7", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.050624", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "projects", - "idx": 11, "indent": 0, "keep_closed": 0, "label": "Projects Settings", "link_to": "Projects Settings", "link_type": "DocType", - "modified": "2025-11-19 16:15:06.422138", - "modified_by": "Administrator", - "name": "e0ccorpl3c", - "owner": "Administrator", - "parent": "Settings", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-19 16:15:06.422138", + "modified": "2025-11-25 10:46:09.177392", "modified_by": "Administrator", "module": "Setup", "name": "Settings", diff --git a/erpnext/workspace_sidebar/share_management.json b/erpnext/workspace_sidebar/share_management.json index b01ab96feda..acf60104a0a 100644 --- a/erpnext/workspace_sidebar/share_management.json +++ b/erpnext/workspace_sidebar/share_management.json @@ -9,89 +9,49 @@ { "child": 1, "collapsible": 1, - "creation": "2025-11-10 16:49:07.269956", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Shareholder", "link_to": "Shareholder", "link_type": "DocType", - "modified": "2025-11-10 16:49:07.269956", - "modified_by": "Administrator", - "name": "pdhudir9vv", - "owner": "Administrator", - "parent": "Share Management", - "parentfield": "items", - "parenttype": "Workspace Sidebar", + "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-10 16:49:07.269956", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Share Transfer", "link_to": "Share Transfer", "link_type": "DocType", - "modified": "2025-11-10 16:49:07.269956", - "modified_by": "Administrator", - "name": "pdhao6uhur", - "owner": "Administrator", - "parent": "Share Management", - "parentfield": "items", - "parenttype": "Workspace Sidebar", + "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-10 16:49:07.269956", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Share Ledger", "link_to": "Share Ledger", "link_type": "Report", - "modified": "2025-11-10 16:49:07.269956", - "modified_by": "Administrator", - "name": "pdhu2dmb8c", - "owner": "Administrator", - "parent": "Share Management", - "parentfield": "items", - "parenttype": "Workspace Sidebar", + "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-10 16:49:07.269956", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Share Balance", "link_to": "Share Balance", "link_type": "Report", - "modified": "2025-11-10 16:49:07.269956", - "modified_by": "Administrator", - "name": "pdhdlil4tj", - "owner": "Administrator", - "parent": "Share Management", - "parentfield": "items", - "parenttype": "Workspace Sidebar", + "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-10 16:49:07.269956", + "modified": "2025-11-25 10:46:09.287187", "modified_by": "Administrator", "name": "Share Management", "owner": "Administrator", diff --git a/erpnext/workspace_sidebar/stock.json b/erpnext/workspace_sidebar/stock.json index a9718c592ae..418e5eb104a 100644 --- a/erpnext/workspace_sidebar/stock.json +++ b/erpnext/workspace_sidebar/stock.json @@ -9,500 +9,258 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160663", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Stock", "link_type": "Workspace", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "gja54p8iro", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "chart", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Dashboard", "link_to": "Stock", "link_type": "Dashboard", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "j8aml7m309", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.161008", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notebook-tabs", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Item", "link_to": "Item", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "gjadhps05b", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "warehouse", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Warehouse", "link_to": "Warehouse", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "oireksin6t", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.162519", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "stock", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Stock Entry", "link_to": "Stock Entry", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "gja7sj5ifi", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.163583", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "receipt-text", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Purchase Receipt", "link_to": "Purchase Receipt", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "gjaitj2pf5", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.164585", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "truck", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Delivery Note", "link_to": "Delivery Note", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "gjat1cts78", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "recycle", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "Stock Reconciliation", "link_to": "Stock Reconciliation", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "kvab7rcjha", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.162170", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "arrow-right", - "idx": 9, "indent": 0, "keep_closed": 0, "label": "Material Request", "link_to": "Material Request", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "gjarcmvmn6", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 10, "indent": 1, "keep_closed": 1, "label": "Reports", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "j8aodg1i1s", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:05.165130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 11, "indent": 0, "keep_closed": 0, "label": "Stock Ledger", "link_to": "Stock Ledger", "link_type": "Report", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "gjapqvrrmq", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:05.165495", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 12, "indent": 0, "keep_closed": 0, "label": "Stock Balance", "link_to": "Stock Balance", "link_type": "Report", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "gjaj690jt2", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 13, "indent": 0, "keep_closed": 0, "label": "Stock Analytics", "link_to": "Stock Analytics", "link_type": "Report", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "n6kpjnqsj2", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 14, "indent": 0, "keep_closed": 0, "label": "Serial No and Batch Traceability", "link_to": "Serial No and Batch Traceability", "link_type": "Report", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "n6ks5anhue", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "Purchase Receipt Trends", "link_to": "Purchase Receipt Trends", "link_type": "Report", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "se7iuu2mdi", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 16, "indent": 0, "keep_closed": 0, "label": "Delivery Note Trends", "link_to": "Delivery Note Trends", "link_type": "Report", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "se7dk9ef48", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "database", - "idx": 17, "indent": 1, "keep_closed": 1, "label": "Setup", "link_to": "", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "o9hmjc5aed", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 18, "indent": 0, "keep_closed": 0, "label": "Serial No", "link_to": "Serial No", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "o9h476tph6", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 19, "indent": 0, "keep_closed": 0, "label": "Batch No", "link_to": "Batch", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "o9h14rep04", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 20, "indent": 0, "keep_closed": 0, "label": "Serial and Batch Bundle", "link_to": "Serial and Batch Bundle", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "o9h1c3g8ob", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 21, "indent": 0, "keep_closed": 0, "label": "Inventory Dimension", "link_to": "Inventory Dimension", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "rpo7g0ubck", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 13:19:05.160130", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 22, "indent": 0, "keep_closed": 0, "label": "Settings", "link_to": "Stock Settings", "link_type": "DocType", - "modified": "2025-11-18 13:47:47.050671", - "modified_by": "Administrator", - "name": "lh7kd1p97i", - "owner": "Administrator", - "parent": "Stock", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 13:47:47.050671", + "modified": "2025-11-25 10:46:09.161250", "modified_by": "Administrator", "module": "Stock", "name": "Stock", diff --git a/erpnext/workspace_sidebar/subcontracting.json b/erpnext/workspace_sidebar/subcontracting.json index c2337f74310..0fd05b13d11 100644 --- a/erpnext/workspace_sidebar/subcontracting.json +++ b/erpnext/workspace_sidebar/subcontracting.json @@ -9,369 +9,193 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "arrow-right", - "idx": 1, "indent": 1, "keep_closed": 0, "label": "Inward Order", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ru3f4m42r", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Sales Order", "link_to": "Sales Order", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5rufd6fnrf", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Subcontracting Order", "link_to": "Subcontracting Inward Order", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ruu4ab9mm", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Subcontracting Delivery", "link_to": "Stock Entry", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ru0ahc0om", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "arrow-left", - "idx": 5, "indent": 1, "keep_closed": 0, "label": "Outward Order", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ru17rg06a", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Purchase Order", "link_to": "Purchase Order", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5rutd50op6", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Subcontracting Order", "link_to": "Subcontracting Order", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ruv4hal5v", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "Subcontracting Receipt", "link_to": "Subcontracting Receipt", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ruo4p6qfm", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "tool", - "idx": 9, "indent": 1, "keep_closed": 1, "label": "Tools", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ru4f6fc0s", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 10, "indent": 0, "keep_closed": 0, "label": "Stock Entry", "link_to": "Stock Entry", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ruke08pt7", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 11, "indent": 0, "keep_closed": 0, "label": "Subcontracting BOM", "link_to": "Subcontracting BOM", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ru0egfkus", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 12, "indent": 1, "keep_closed": 1, "label": "Reports", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ruihseclg", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 13, "indent": 0, "keep_closed": 0, "label": "Subcontract Order Summary", "link_to": "Subcontract Order Summary", "link_type": "Report", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ru1pbp7iq", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 14, "indent": 0, "keep_closed": 0, "label": "Materials To Be Transferred", "link_to": "Subcontracted Raw Materials To Be Transferred", "link_type": "Report", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ruonpii2e", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "Items To Be Received", "link_to": "Subcontracted Item To Be Received", "link_type": "Report", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5rua4orr37", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-17 14:49:59.811213", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 16, "indent": 0, "keep_closed": 0, "label": "Settings", "link_to": "Buying Settings", "link_type": "DocType", - "modified": "2025-11-17 14:54:12.182016", - "modified_by": "Administrator", - "name": "5ruf3kbf0b", - "owner": "Administrator", - "parent": "Subcontracting", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-17 14:54:12.182016", + "modified": "2025-11-25 10:46:09.146438", "modified_by": "Administrator", "module": "Buying", "name": "Subcontracting", diff --git a/erpnext/workspace_sidebar/subscription.json b/erpnext/workspace_sidebar/subscription.json index 5d4696078c5..8e675086339 100644 --- a/erpnext/workspace_sidebar/subscription.json +++ b/erpnext/workspace_sidebar/subscription.json @@ -9,74 +9,41 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-10 16:08:50.904116", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "circle-dollar-sign", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Subscription", "link_to": "Subscription", "link_type": "DocType", - "modified": "2025-11-18 12:53:08.165220", - "modified_by": "Administrator", - "name": "1qdt685odc", - "owner": "Administrator", - "parent": "Subscription", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-10 16:08:50.904116", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "receipt-text", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Subscription Plan", "link_to": "Subscription Plan", "link_type": "DocType", - "modified": "2025-11-18 12:53:08.165220", - "modified_by": "Administrator", - "name": "1qd8adp7bp", - "owner": "Administrator", - "parent": "Subscription", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-10 16:08:50.904116", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Subscription Settings", "link_to": "Subscription Settings", "link_type": "DocType", - "modified": "2025-11-18 12:53:08.165220", - "modified_by": "Administrator", - "name": "1qdo9f7343", - "owner": "Administrator", - "parent": "Subscription", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 12:53:08.165220", + "modified": "2025-11-25 10:46:09.340108", "modified_by": "Administrator", "module": "Accounts", "name": "Subscription", diff --git a/erpnext/workspace_sidebar/support.json b/erpnext/workspace_sidebar/support.json index aef78453c45..98d70d91ae8 100644 --- a/erpnext/workspace_sidebar/support.json +++ b/erpnext/workspace_sidebar/support.json @@ -9,341 +9,176 @@ { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "home", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Home", "link_to": "Support", "link_type": "Workspace", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "kku03lupjv", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "file-question-mark", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Issues", "link_to": "Issue", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tcegph0hsl", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "calendar-check-2", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Maintenance Visit", "link_to": "Maintenance Visit", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tcevspsodh", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "receipt-text", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "SLA", "link_to": "Service Level Agreement", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tce6tokft5", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "grid-2x2-check", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Warranty Claim", "link_to": "Warranty Claim", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tce9cb6o95", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "tool", - "idx": 6, "indent": 1, "keep_closed": 1, "label": "Maintenance", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tce1eu54gl", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Maintenance Schedule", "link_to": "Maintenance Schedule", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tcemrhtkd1", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 8, "indent": 0, "keep_closed": 0, "label": "Maintenance Visit", "link_to": "Maintenance Visit", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tcef7jmu04", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 9, "indent": 0, "keep_closed": 0, "label": "Service Level Agreement", "link_to": "Service Level Agreement", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tcer29df09", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notepad-text", - "idx": 10, "indent": 1, "keep_closed": 1, "label": "Reports", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tcel4r8pv8", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 11, "indent": 0, "keep_closed": 0, "label": "First Response Time for Issues", "link_to": "First Response Time for Issues", "link_type": "Report", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tcenfvca3k", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "database", - "idx": 12, "indent": 1, "keep_closed": 1, "label": "Setup", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tcevcrdhf8", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Section Break" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 13, "indent": 0, "keep_closed": 0, "label": "Issue Type", "link_to": "Issue Type", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tcereiitol", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 1, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", - "idx": 14, "indent": 0, "keep_closed": 0, "label": "Issue Priority", "link_to": "Issue Priority", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tceav7gknl", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-10-26 21:53:46.636967", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "settings", - "idx": 15, "indent": 0, "keep_closed": 0, "label": "Support Settings", "link_to": "Support Settings", "link_type": "DocType", - "modified": "2025-11-18 13:12:15.885327", - "modified_by": "Administrator", - "name": "tcer2ou51f", - "owner": "Administrator", - "parent": "Support", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 13:12:15.885327", + "modified": "2025-11-25 10:46:09.414304", "modified_by": "Administrator", "module": "Support", "name": "Support", diff --git a/erpnext/workspace_sidebar/taxes.json b/erpnext/workspace_sidebar/taxes.json index 1fa7ea11e4a..4d831f3c998 100644 --- a/erpnext/workspace_sidebar/taxes.json +++ b/erpnext/workspace_sidebar/taxes.json @@ -9,166 +9,89 @@ { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:03:06.180114", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "panel-bottom-close", - "idx": 1, "indent": 0, "keep_closed": 0, "label": "Sales Template", "link_to": "Sales Taxes and Charges", "link_type": "DocType", - "modified": "2025-11-18 12:17:49.242078", - "modified_by": "Administrator", - "name": "ipl5vv3ddg", - "owner": "Administrator", - "parent": "Taxes", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:03:06.180114", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "panel-top-close", - "idx": 2, "indent": 0, "keep_closed": 0, "label": "Purchase Template", "link_to": "Purchase Taxes and Charges Template", "link_type": "DocType", - "modified": "2025-11-18 12:17:49.242078", - "modified_by": "Administrator", - "name": "ipljkkvli1", - "owner": "Administrator", - "parent": "Taxes", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:03:06.180114", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "triangle", - "idx": 3, "indent": 0, "keep_closed": 0, "label": "Tax Category", "link_to": "Tax Category", "link_type": "DocType", - "modified": "2025-11-18 12:17:49.242078", - "modified_by": "Administrator", - "name": "iplf3idfuj", - "owner": "Administrator", - "parent": "Taxes", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:03:06.180114", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "book-open-text", - "idx": 4, "indent": 0, "keep_closed": 0, "label": "Tax Rule", "link_to": "Tax Rule", "link_type": "DocType", - "modified": "2025-11-18 12:17:49.242078", - "modified_by": "Administrator", - "name": "j78fnrui7d", - "owner": "Administrator", - "parent": "Taxes", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:03:06.180114", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "stock", - "idx": 5, "indent": 0, "keep_closed": 0, "label": "Item Tax Template", "link_to": "Item Tax Template", "link_type": "DocType", - "modified": "2025-11-18 12:17:49.242078", - "modified_by": "Administrator", - "name": "iplib4vera", - "owner": "Administrator", - "parent": "Taxes", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:03:06.180114", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "book-text", - "idx": 6, "indent": 0, "keep_closed": 0, "label": "Tax Withholding", "link_to": "Tax Withholding Category", "link_type": "DocType", - "modified": "2025-11-18 12:17:49.242078", - "modified_by": "Administrator", - "name": "ipl237k92q", - "owner": "Administrator", - "parent": "Taxes", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" }, { "child": 0, "collapsible": 1, - "creation": "2025-11-12 15:03:06.180114", - "docstatus": 0, - "doctype": "Workspace Sidebar Item", "icon": "notebook-text", - "idx": 7, "indent": 0, "keep_closed": 0, "label": "Deduction Certificate", "link_to": "Lower Deduction Certificate", "link_type": "DocType", - "modified": "2025-11-18 12:17:49.242078", - "modified_by": "Administrator", - "name": "iplcq9ic5a", - "owner": "Administrator", - "parent": "Taxes", - "parentfield": "items", - "parenttype": "Workspace Sidebar", "show_arrow": 0, "type": "Link" } ], - "modified": "2025-11-18 12:17:49.242078", + "modified": "2025-11-25 10:46:09.268703", "modified_by": "Administrator", "module": "Accounts", "name": "Taxes", From ca47ae6fd81da665b15c7ea0751505a3bdba693c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 25 Nov 2025 12:01:51 +0530 Subject: [PATCH 034/328] fix: stock reservation validation --- erpnext/controllers/stock_controller.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 8d4aeffd9d5..6a47b4dfa40 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -25,6 +25,7 @@ from erpnext.controllers.sales_and_purchase_return import ( from erpnext.setup.doctype.brand.brand import get_brand_defaults from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults from erpnext.stock import get_warehouse_account_map +from erpnext.stock.doctype.batch.batch import get_batch_qty from erpnext.stock.doctype.inventory_dimension.inventory_dimension import ( get_evaluated_inventory_dimension, ) @@ -1216,6 +1217,12 @@ class StockController(AccountsController): ], }.get(self.doctype) + qty_field = { + "Sales Invoice": "qty", + "Delivery Note": "qty", + "Stock Entry": "fg_completed_qty", + }.get(self.doctype) + reserved_batches_data = self.get_reserved_batches(batches) items = self.items if self.doctype == "Stock Entry": @@ -1236,6 +1243,17 @@ class StockController(AccountsController): if row.voucher_no == value: continue + batch_qty = get_batch_qty( + row.batch_no, + row.warehouse, + posting_date=self.posting_date, + posting_time=self.posting_time, + consider_negative_batches=True, + ) + + if item.get(qty_field) < batch_qty: + continue + frappe.throw( _( "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." @@ -1264,6 +1282,7 @@ class StockController(AccountsController): doctype.voucher_type, doctype.voucher_no, doctype.item_code, + doctype.warehouse, ) .where((doctype.docstatus == 1) & (child_doc.batch_no.isin(batches))) ).run(as_dict=True) From 8235a551f0c56e92398358acc2d573821f39b999 Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Tue, 25 Nov 2025 12:08:31 +0530 Subject: [PATCH 035/328] refactor: further changes to adapt to query builder changes --- erpnext/manufacturing/doctype/bom_creator/bom_creator.py | 4 +++- erpnext/patches/v14_0/single_to_multi_dunning.py | 3 ++- erpnext/projects/doctype/timesheet/timesheet.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom_creator/bom_creator.py b/erpnext/manufacturing/doctype/bom_creator/bom_creator.py index d67f0c3536b..bb62c7a84da 100644 --- a/erpnext/manufacturing/doctype/bom_creator/bom_creator.py +++ b/erpnext/manufacturing/doctype/bom_creator/bom_creator.py @@ -360,6 +360,8 @@ class BOMCreator(Document): @frappe.whitelist() def get_children(doctype=None, parent=None, **kwargs): + from pypika.terms import ValueWrapper + if isinstance(kwargs, str): kwargs = frappe.parse_json(kwargs) @@ -373,7 +375,7 @@ def get_children(doctype=None, parent=None, **kwargs): "parent as parent_id", "qty", "idx", - "'BOM Creator Item' as doctype", + ValueWrapper("BOM Creator Item").as_("doctype"), "name", "uom", "rate", diff --git a/erpnext/patches/v14_0/single_to_multi_dunning.py b/erpnext/patches/v14_0/single_to_multi_dunning.py index 3def5922c07..3ddba8c76e6 100644 --- a/erpnext/patches/v14_0/single_to_multi_dunning.py +++ b/erpnext/patches/v14_0/single_to_multi_dunning.py @@ -1,4 +1,5 @@ import frappe +from pypika.terms import LiteralValue from erpnext.accounts.general_ledger import make_reverse_gl_entries @@ -39,7 +40,7 @@ def execute(): "payment_amount", # at the time of creating this dunning, the full amount was outstanding "payment_amount as outstanding", - "'0' as paid_amount", + LiteralValue(0).as_("paid_amount"), "discounted_amount", ], ) diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py index 2119d214a61..80552abe895 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.py +++ b/erpnext/projects/doctype/timesheet/timesheet.py @@ -383,7 +383,7 @@ def get_timesheet_data(name, project): data = frappe.get_all( "Timesheet", fields=[ - "(total_billable_amount - total_billed_amount) as billing_amt", + {"SUB": ["total_billable_amount", "total_billed_amount"], "as": "billing_amt"}, "total_billable_hours as billing_hours", ], filters={"name": name}, From a436c6a503463dfe804056db61141b08079120c4 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 25 Nov 2025 12:16:48 +0530 Subject: [PATCH 036/328] refactor: creation of purchase order from sales order --- .../doctype/sales_order/sales_order.js | 77 ++++---- .../doctype/sales_order/sales_order.py | 171 +++--------------- 2 files changed, 56 insertions(+), 192 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 235838f8f11..5c2f3666b48 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -1584,12 +1584,6 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex title: __("Select Items"), size: "large", fields: [ - { - fieldtype: "Check", - label: __("Against Default Supplier"), - fieldname: "against_default_supplier", - default: 0, - }, { fieldname: "items_for_po", fieldtype: "Table", @@ -1625,10 +1619,11 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex in_list_view: 1, }, { - fieldtype: "Data", + fieldtype: "Link", fieldname: "supplier", label: __("Supplier"), - read_only: 1, + reqd: 1, + options: "Supplier", in_list_view: 1, }, ], @@ -1647,13 +1642,17 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex }); } - dialog.hide(); + if (selected_items.some((item) => !item.supplier)) { + frappe.throw({ + message: "Supplier is required for all selected Items", + title: __("Supplier Required"), + indicator: "blue", + }); + } - var method = args.against_default_supplier - ? "make_purchase_order_for_default_supplier" - : "make_purchase_order"; + dialog.hide(); return frappe.call({ - method: "erpnext.selling.doctype.sales_order.sales_order." + method, + method: "erpnext.selling.doctype.sales_order.sales_order.make_purchase_order", freeze_message: __("Creating Purchase Order ..."), args: { source_name: me.frm.doc.name, @@ -1662,9 +1661,9 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex freeze: true, callback: function (r) { if (!r.exc) { - if (!args.against_default_supplier) { - frappe.model.sync(r.message); - frappe.set_route("Form", r.message.doctype, r.message.name); + if (r.message.length == 1) { + frappe.model.sync(r.message[0]); + frappe.set_route("Form", r.message[0].doctype, r.message[0].name); } else { frappe.route_options = { sales_order: me.frm.doc.name, @@ -1677,37 +1676,25 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex }, }); - dialog.fields_dict["against_default_supplier"].df.onchange = () => set_po_items_data(dialog); - function set_po_items_data(dialog) { - var against_default_supplier = dialog.get_value("against_default_supplier"); - var items_for_po = dialog.get_value("items_for_po"); + let po_items = []; + me.frm.doc.items.forEach((d) => { + let ordered_qty = me.get_ordered_qty(d, me.frm.doc); + let pending_qty = (flt(d.stock_qty) - ordered_qty) / flt(d.conversion_factor); + if (pending_qty > 0) { + po_items.push({ + name: d.name, + item_name: d.item_name, + item_code: d.item_code, + pending_qty: pending_qty, + uom: d.uom, + supplier: d.supplier, + }); + } + }); - if (against_default_supplier) { - let items_with_supplier = items_for_po.filter((item) => item.supplier); - - dialog.fields_dict["items_for_po"].df.data = items_with_supplier; - dialog.get_field("items_for_po").refresh(); - } else { - let po_items = []; - me.frm.doc.items.forEach((d) => { - let ordered_qty = me.get_ordered_qty(d, me.frm.doc); - let pending_qty = (flt(d.stock_qty) - ordered_qty) / flt(d.conversion_factor); - if (pending_qty > 0) { - po_items.push({ - name: d.name, - item_name: d.item_name, - item_code: d.item_code, - pending_qty: pending_qty, - uom: d.uom, - supplier: d.supplier, - }); - } - }); - - dialog.fields_dict["items_for_po"].df.data = po_items; - dialog.get_field("items_for_po").refresh(); - } + dialog.fields_dict["items_for_po"].df.data = po_items; + dialog.get_field("items_for_po").refresh(); } set_po_items_data(dialog); diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 811c7d0c08c..b3174b2bffa 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -1546,7 +1546,7 @@ def get_events(start, end, filters=None): @frappe.whitelist() -def make_purchase_order_for_default_supplier(source_name, selected_items=None, target_doc=None): +def make_purchase_order(source_name, selected_items=None, target_doc=None): """Creates Purchase Order for each Supplier. Returns a list of doc objects.""" from erpnext.setup.utils import get_exchange_rate @@ -1615,11 +1615,28 @@ def make_purchase_order_for_default_supplier(source_name, selected_items=None, t def update_item_for_packed_item(source, target, source_parent): target.qty = flt(source.qty) - flt(source.ordered_qty) + def filter_items(item, supplier): + if ( + item.ordered_qty < item.stock_qty + and item.item_code in item_codes + and not is_product_bundle(item.item_code) + ): + item_supp_comb = next(iter(d for d in items_to_map if d["item_code"] == item.item_code), None) + if item_supp_comb and item_supp_comb.get("supplier") == supplier: + items_to_map.remove(item_supp_comb) + return True + + return False + suppliers = [item.get("supplier") for item in selected_items if item.get("supplier")] suppliers = list(dict.fromkeys(suppliers)) # remove duplicates while preserving order - items_to_map = [item.get("item_code") for item in selected_items if item.get("item_code")] - items_to_map = list(set(items_to_map)) + item_codes = [item.get("item_code") for item in selected_items if item.get("item_code")] + items_to_map = [ + {"item_code": item.get("item_code"), "supplier": item.get("supplier")} + for item in selected_items + if item.get("item_code") + ] if not suppliers: frappe.throw(_("Please set a Supplier against the Items to be considered in the Purchase Order.")) @@ -1665,10 +1682,7 @@ def make_purchase_order_for_default_supplier(source_name, selected_items=None, t "margin_rate_or_amount", ], "postprocess": update_item, - "condition": lambda doc: doc.ordered_qty < doc.stock_qty - and doc.supplier == supplier - and doc.item_code in items_to_map - and not is_product_bundle(doc.item_code), + "condition": lambda doc: filter_items(doc, supplier), }, "Packed Item": { "doctype": "Purchase Order Item", @@ -1689,7 +1703,7 @@ def make_purchase_order_for_default_supplier(source_name, selected_items=None, t "pricing_rules", ], "postprocess": update_item_for_packed_item, - "condition": lambda doc: doc.parent_item in items_to_map + "condition": lambda doc: doc.parent_item in item_codes and flt(doc.ordered_qty) < flt(doc.qty), }, }, @@ -1698,150 +1712,13 @@ def make_purchase_order_for_default_supplier(source_name, selected_items=None, t ) set_delivery_date(doc.items, source_name) - doc.insert() - frappe.db.commit() + if len(suppliers) > 1: + doc.insert() purchase_orders.append(doc) return purchase_orders -@frappe.whitelist() -def make_purchase_order(source_name, selected_items=None, target_doc=None): - if not selected_items: - return - - if isinstance(selected_items, str): - selected_items = json.loads(selected_items) - - items_to_map = [item.get("item_code") for item in selected_items if item.get("item_code")] - items_to_map = list(set(items_to_map)) - - def is_drop_ship_order(target): - drop_ship = True - for item in target.items: - if not item.delivered_by_supplier: - drop_ship = False - break - - return drop_ship - - def set_missing_values(source, target): - target.supplier = "" - target.apply_discount_on = "" - target.additional_discount_percentage = 0.0 - target.discount_amount = 0.0 - target.inter_company_order_reference = "" - target.shipping_rule = "" - target.tc_name = "" - target.terms = "" - target.payment_terms_template = "" - target.payment_schedule = [] - - if is_drop_ship_order(target): - if source.shipping_address_name: - target.shipping_address = source.shipping_address_name - target.shipping_address_display = source.shipping_address - else: - target.shipping_address = source.customer_address - target.shipping_address_display = source.address_display - - target.customer_contact_person = source.contact_person - target.customer_contact_display = source.contact_display - target.customer_contact_mobile = source.contact_mobile - target.customer_contact_email = source.contact_email - else: - target.customer = target.customer_name = target.shipping_address = None - - target.run_method("set_missing_values") - if not target.taxes: - target.append_taxes_from_item_tax_template() - target.run_method("calculate_taxes_and_totals") - - def update_item(source, target, source_parent): - target.schedule_date = source.delivery_date - target.qty = flt(source.qty) - (flt(source.ordered_qty) / flt(source.conversion_factor)) - target.stock_qty = flt(source.stock_qty) - flt(source.ordered_qty) - target.project = source_parent.project - - def update_item_for_packed_item(source, target, source_parent): - target.qty = flt(source.qty) - flt(source.ordered_qty) - - # po = frappe.get_list("Purchase Order", filters={"sales_order":source_name, "supplier":supplier, "docstatus": ("<", "2")}) - doc = get_mapped_doc( - "Sales Order", - source_name, - { - "Sales Order": { - "doctype": "Purchase Order", - "field_map": {"dispatch_address_name": "dispatch_address"}, - "field_no_map": [ - "address_display", - "contact_display", - "contact_mobile", - "contact_email", - "contact_person", - "taxes_and_charges", - "shipping_address", - ], - "validation": {"docstatus": ["=", 1]}, - }, - "Sales Order Item": { - "doctype": "Purchase Order Item", - "field_map": [ - ["name", "sales_order_item"], - ["parent", "sales_order"], - ["stock_uom", "stock_uom"], - ["uom", "uom"], - ["conversion_factor", "conversion_factor"], - ["delivery_date", "schedule_date"], - ], - "field_no_map": [ - "rate", - "price_list_rate", - "item_tax_template", - "discount_percentage", - "discount_amount", - "supplier", - "pricing_rules", - ], - "postprocess": update_item, - "condition": lambda doc: doc.ordered_qty < doc.stock_qty - and doc.item_code in items_to_map - and not is_product_bundle(doc.item_code), - }, - "Packed Item": { - "doctype": "Purchase Order Item", - "field_map": [ - ["name", "sales_order_packed_item"], - ["parent", "sales_order"], - ["uom", "uom"], - ["conversion_factor", "conversion_factor"], - ["parent_item", "product_bundle"], - ["rate", "rate"], - ], - "field_no_map": [ - "price_list_rate", - "item_tax_template", - "discount_percentage", - "discount_amount", - "supplier", - "pricing_rules", - ], - "postprocess": update_item_for_packed_item, - "condition": lambda doc: doc.parent_item in items_to_map - and flt(doc.ordered_qty) < flt(doc.qty), - }, - }, - target_doc, - set_missing_values, - ) - - set_delivery_date(doc.items, source_name) - doc.set_onload("load_after_mapping", False) - - return doc - - def set_delivery_date(items, sales_order): delivery_dates = frappe.get_all( "Sales Order Item", filters={"parent": sales_order}, fields=["delivery_date", "item_code"] From c93dba289581456ab4537454d00492ef2bedb92c Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 25 Nov 2025 12:33:51 +0530 Subject: [PATCH 037/328] fix: coderabbit suggestions --- erpnext/selling/doctype/sales_order/sales_order.js | 2 +- erpnext/selling/doctype/sales_order/sales_order.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 5c2f3666b48..b1fc67e8d44 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -1644,7 +1644,7 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex if (selected_items.some((item) => !item.supplier)) { frappe.throw({ - message: "Supplier is required for all selected Items", + message: __("Supplier is required for all selected Items"), title: __("Supplier Required"), indicator: "blue", }); diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index b3174b2bffa..adbc9839512 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -1682,7 +1682,7 @@ def make_purchase_order(source_name, selected_items=None, target_doc=None): "margin_rate_or_amount", ], "postprocess": update_item, - "condition": lambda doc: filter_items(doc, supplier), + "condition": lambda doc, s=supplier: filter_items(doc, s), }, "Packed Item": { "doctype": "Purchase Order Item", From 5a17dd8d6d47019b8528c420245357d63e490e9f Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 25 Nov 2025 12:58:52 +0530 Subject: [PATCH 038/328] fix: addresses not being carried forward --- erpnext/public/js/controllers/buying.js | 9 +++++++-- erpnext/selling/doctype/sales_order/sales_order.js | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index 873edfb7165..1ffa778d0b8 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -176,9 +176,14 @@ erpnext.buying = { callback: (r) => { if (!r.message) return; - this.frm.set_value("billing_address", r.message.primary_address || ""); + if (!this.frm.doc.billing_address) { + this.frm.set_value("billing_address", r.message.primary_address || ""); + } - if (frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) { + if ( + frappe.meta.has_field(this.frm.doc.doctype, "shipping_address") && + !this.frm.doc.shipping_address + ) { this.frm.set_value("shipping_address", r.message.shipping_address || ""); } }, diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index b1fc67e8d44..b6c0c496889 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -1588,6 +1588,8 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex fieldname: "items_for_po", fieldtype: "Table", label: __("Select Items"), + cannot_add_rows: true, + cannot_delete_rows: true, fields: [ { fieldtype: "Data", @@ -1698,7 +1700,6 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex } set_po_items_data(dialog); - dialog.get_field("items_for_po").grid.only_sortable(); dialog.get_field("items_for_po").refresh(); dialog.wrapper.find(".grid-heading-row .grid-row-check").click(); dialog.show(); From f1f68ead7de22624dc5041c42ad52b7dca498c24 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Tue, 25 Nov 2025 11:44:55 +0530 Subject: [PATCH 039/328] chore: switched frankfurter api domain from api.frankfurter.app to api.frankfurter.dev --- .../currency_exchange_settings.js | 2 +- .../currency_exchange_settings.json | 7 ++++--- .../currency_exchange_settings.py | 10 +++++----- erpnext/patches.txt | 1 + ...ate_currency_exchange_settings_for_frankfurter.py | 12 ++++++++++++ .../currency_exchange/test_currency_exchange.py | 6 +++--- erpnext/setup/install.py | 2 +- 7 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 erpnext/patches/v16_0/update_currency_exchange_settings_for_frankfurter.py diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js index ad68352c2a4..c3531420ce1 100644 --- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js +++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js @@ -19,7 +19,7 @@ frappe.ui.form.on("Currency Exchange Settings", { to: "{to_currency}", }; add_param(frm, r.message, params, result); - } else if (frm.doc.service_provider == "frankfurter.app") { + } else if (frm.doc.service_provider == "frankfurter.dev") { let result = ["rates", "{to_currency}"]; let params = { base: "{from_currency}", diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json index 992d96167e5..614f4e6d3e5 100644 --- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json +++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json @@ -78,7 +78,7 @@ "fieldname": "service_provider", "fieldtype": "Select", "label": "Service Provider", - "options": "frankfurter.app\nexchangerate.host\nCustom", + "options": "frankfurter.dev\nexchangerate.host\nCustom", "reqd": 1 }, { @@ -104,7 +104,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2024-03-27 13:06:47.653110", + "modified": "2025-11-25 13:03:41.896424", "modified_by": "Administrator", "module": "Accounts", "name": "Currency Exchange Settings", @@ -141,8 +141,9 @@ "write": 1 } ], + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py index f5889510732..73f037a9e4d 100644 --- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py +++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py @@ -29,7 +29,7 @@ class CurrencyExchangeSettings(Document): disabled: DF.Check req_params: DF.Table[CurrencyExchangeSettingsDetails] result_key: DF.Table[CurrencyExchangeSettingsResult] - service_provider: DF.Literal["frankfurter.app", "exchangerate.host", "Custom"] + service_provider: DF.Literal["frankfurter.dev", "exchangerate.host", "Custom"] url: DF.Data | None use_http: DF.Check # end: auto-generated types @@ -60,7 +60,7 @@ class CurrencyExchangeSettings(Document): self.append("req_params", {"key": "date", "value": "{transaction_date}"}) self.append("req_params", {"key": "from", "value": "{from_currency}"}) self.append("req_params", {"key": "to", "value": "{to_currency}"}) - elif self.service_provider == "frankfurter.app": + elif self.service_provider == "frankfurter.dev": self.set("result_key", []) self.set("req_params", []) @@ -105,11 +105,11 @@ class CurrencyExchangeSettings(Document): @frappe.whitelist() def get_api_endpoint(service_provider: str | None = None, use_http: bool = False): - if service_provider and service_provider in ["exchangerate.host", "frankfurter.app"]: + if service_provider and service_provider in ["exchangerate.host", "frankfurter.dev"]: if service_provider == "exchangerate.host": api = "api.exchangerate.host/convert" - elif service_provider == "frankfurter.app": - api = "api.frankfurter.app/{transaction_date}" + elif service_provider == "frankfurter.dev": + api = "api.frankfurter.dev/v1/{transaction_date}" protocol = "https://" if use_http: diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 74f6e8a275b..1fda2b6f518 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -449,3 +449,4 @@ erpnext.patches.v16_0.set_company_wise_warehouses erpnext.patches.v16_0.set_valuation_method_on_companies erpnext.patches.v15_0.migrate_old_item_wise_tax_detail_data_to_table erpnext.patches.v16_0.migrate_budget_records_to_new_structure +erpnext.patches.v16_0.update_currency_exchange_settings_for_frankfurter \ No newline at end of file diff --git a/erpnext/patches/v16_0/update_currency_exchange_settings_for_frankfurter.py b/erpnext/patches/v16_0/update_currency_exchange_settings_for_frankfurter.py new file mode 100644 index 00000000000..68157b1a4ad --- /dev/null +++ b/erpnext/patches/v16_0/update_currency_exchange_settings_for_frankfurter.py @@ -0,0 +1,12 @@ +import frappe + + +def execute(): + settings = frappe.get_doc("Currency Exchange Settings") + if settings.service_provider != "frankfurter.app": + return + + settings.service_provider = "frankfurter.dev" + settings.set_parameters_and_result() + settings.flags.ignore_validate = True + settings.save() diff --git a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py index 859e01f2cec..c0fad18795e 100644 --- a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py +++ b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py @@ -66,9 +66,9 @@ def patched_requests_get(*args, **kwargs): if kwargs["params"].get("date") and kwargs["params"].get("from") and kwargs["params"].get("to"): if test_exchange_values.get(kwargs["params"]["date"]): return PatchResponse({"result": test_exchange_values[kwargs["params"]["date"]]}, 200) - elif args[0].startswith("https://api.frankfurter.app") and kwargs.get("params"): + elif args[0].startswith("https://api.frankfurter.dev") and kwargs.get("params"): if kwargs["params"].get("base") and kwargs["params"].get("symbols"): - date = args[0].replace("https://api.frankfurter.app/", "") + date = args[0].replace("https://api.frankfurter.dev/v1/", "") if test_exchange_values.get(date): return PatchResponse( {"rates": {kwargs["params"].get("symbols"): test_exchange_values.get(date)}}, 200 @@ -147,7 +147,7 @@ class TestCurrencyExchange(IntegrationTestCase): self.assertEqual(flt(exchange_rate, 3), 65.1) settings = frappe.get_single("Currency Exchange Settings") - settings.service_provider = "frankfurter.app" + settings.service_provider = "frankfurter.dev" settings.save() def test_exchange_rate_strict(self, mock_get): diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index 7dc7932470e..3a94e1dcf57 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -79,7 +79,7 @@ def setup_currency_exchange(): ces.set("result_key", []) ces.set("req_params", []) - ces.api_endpoint = "https://api.frankfurter.app/{transaction_date}" + ces.api_endpoint = "https://api.frankfurter.dev/v1/{transaction_date}" ces.append("result_key", {"key": "rates"}) ces.append("result_key", {"key": "{to_currency}"}) ces.append("req_params", {"key": "base", "value": "{from_currency}"}) From 88b262abc79b0b63e0e21235a8d73a98dae1b150 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 25 Nov 2025 13:14:14 +0530 Subject: [PATCH 040/328] fix: more coderabbit issues --- erpnext/public/js/controllers/buying.js | 9 ++----- .../doctype/sales_order/sales_order.py | 27 +++++++------------ .../doctype/sales_order/test_sales_order.py | 20 +++++++------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index 1ffa778d0b8..873edfb7165 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -176,14 +176,9 @@ erpnext.buying = { callback: (r) => { if (!r.message) return; - if (!this.frm.doc.billing_address) { - this.frm.set_value("billing_address", r.message.primary_address || ""); - } + this.frm.set_value("billing_address", r.message.primary_address || ""); - if ( - frappe.meta.has_field(this.frm.doc.doctype, "shipping_address") && - !this.frm.doc.shipping_address - ) { + if (frappe.meta.has_field(this.frm.doc.doctype, "shipping_address")) { this.frm.set_value("shipping_address", r.message.shipping_address || ""); } }, diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index adbc9839512..863bb74012b 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -1612,34 +1612,27 @@ def make_purchase_order(source_name, selected_items=None, target_doc=None): target.stock_qty = flt(source.stock_qty) - flt(source.ordered_qty) target.project = source_parent.project - def update_item_for_packed_item(source, target, source_parent): + def update_item_for_packed_item(source, target, _): target.qty = flt(source.qty) - flt(source.ordered_qty) def filter_items(item, supplier): if ( item.ordered_qty < item.stock_qty - and item.item_code in item_codes and not is_product_bundle(item.item_code) + and items_to_map.get(item.item_code) == supplier ): - item_supp_comb = next(iter(d for d in items_to_map if d["item_code"] == item.item_code), None) - if item_supp_comb and item_supp_comb.get("supplier") == supplier: - items_to_map.remove(item_supp_comb) - return True + return True return False - suppliers = [item.get("supplier") for item in selected_items if item.get("supplier")] - suppliers = list(dict.fromkeys(suppliers)) # remove duplicates while preserving order - - item_codes = [item.get("item_code") for item in selected_items if item.get("item_code")] - items_to_map = [ - {"item_code": item.get("item_code"), "supplier": item.get("supplier")} - for item in selected_items - if item.get("item_code") - ] + items_to_map = { + item.get("item_code"): item.get("supplier") for item in selected_items if item.get("item_code") + } + item_codes = list(set(items_to_map.keys())) + suppliers = list(set(items_to_map.values())) if not suppliers: - frappe.throw(_("Please set a Supplier against the Items to be considered in the Purchase Order.")) + suppliers = [None] purchase_orders = [] for supplier in suppliers: @@ -1712,7 +1705,7 @@ def make_purchase_order(source_name, selected_items=None, target_doc=None): ) set_delivery_date(doc.items, source_name) - if len(suppliers) > 1: + if doc.supplier: doc.insert() purchase_orders.append(doc) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index a75e6eca08f..acf0a19943f 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -1038,7 +1038,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): def test_drop_shipping(self): from erpnext.buying.doctype.purchase_order.purchase_order import update_status from erpnext.selling.doctype.sales_order.sales_order import ( - make_purchase_order_for_default_supplier, + make_purchase_order, ) from erpnext.selling.doctype.sales_order.sales_order import update_status as so_update_status @@ -1071,7 +1071,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): so = make_sales_order(item_list=so_items, do_not_submit=True) so.submit() - po = make_purchase_order_for_default_supplier(so.name, selected_items=[so_items[0]])[0] + po = make_purchase_order(so.name, selected_items=[so_items[0]])[0] po.submit() dn = create_dn_against_so(so.name, delivered_qty=2) @@ -1129,7 +1129,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): def test_drop_shipping_partial_order(self): from erpnext.selling.doctype.sales_order.sales_order import ( - make_purchase_order_for_default_supplier, + make_purchase_order, ) from erpnext.selling.doctype.sales_order.sales_order import update_status as so_update_status @@ -1165,7 +1165,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): so.submit() # create po for only one item - po1 = make_purchase_order_for_default_supplier(so.name, selected_items=[so_items[0]])[0] + po1 = make_purchase_order(so.name, selected_items=[so_items[0]])[0] po1.submit() self.assertEqual(so.customer, po1.customer) @@ -1175,7 +1175,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): self.assertEqual(len(po1.items), 1) # create po for remaining item - po2 = make_purchase_order_for_default_supplier(so.name, selected_items=[so_items[1]])[0] + po2 = make_purchase_order(so.name, selected_items=[so_items[1]])[0] po2.submit() # teardown @@ -1189,7 +1189,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): def test_drop_shipping_full_for_default_suppliers(self): """Test if multiple POs are generated in one go against different default suppliers.""" from erpnext.selling.doctype.sales_order.sales_order import ( - make_purchase_order_for_default_supplier, + make_purchase_order, ) if not frappe.db.exists("Item", "_Test Item for Drop Shipping 1"): @@ -1221,7 +1221,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): so = make_sales_order(item_list=so_items, do_not_submit=True) so.submit() - purchase_orders = make_purchase_order_for_default_supplier(so.name, selected_items=so_items) + purchase_orders = make_purchase_order(so.name, selected_items=so_items) self.assertEqual(len(purchase_orders), 2) self.assertEqual(purchase_orders[0].supplier, "_Test Supplier") @@ -1253,7 +1253,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): so = make_sales_order(item_list=so_items) - purchase_order = make_purchase_order(so.name, selected_items=so_items) + purchase_order = make_purchase_order(so.name, selected_items=so_items)[0] self.assertEqual(purchase_order.items[0].item_code, "_Test Bundle Item 1") self.assertEqual(purchase_order.items[1].item_code, "_Test Bundle Item 2") @@ -1283,7 +1283,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): so = make_sales_order(item_list=so_items) - purchase_order = make_purchase_order(so.name, selected_items=so_items) + purchase_order = make_purchase_order(so.name, selected_items=so_items)[0] purchase_order.supplier = "_Test Supplier" purchase_order.set_warehouse = "_Test Warehouse - _TC" purchase_order.save() @@ -2559,7 +2559,7 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): ) so.submit() - po = make_purchase_order(so.name, selected_items=so.items) + po = make_purchase_order(so.name, selected_items=so.items)[0] po.supplier = "_Test Supplier" po.items[0].rate = 100 po.submit() From 7b592d873721d32aa6017446a9e544db960f122b Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 25 Nov 2025 20:54:24 +0530 Subject: [PATCH 041/328] feat: add provision to mass select supplier --- .../doctype/sales_order/sales_order.js | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index b6c0c496889..6ad9f92c0ed 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -1584,6 +1584,28 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex title: __("Select Items"), size: "large", fields: [ + { + fieldname: "set_supplier", + fieldtype: "Link", + label: __("Set Supplier"), + options: "Supplier", + onchange: function () { + let supplier = dialog.get_value("set_supplier"); + let items_table = dialog.fields_dict.items_for_po.grid; + let selected_items = items_table.get_selected_children(); + + selected_items.forEach((item) => { + item.supplier = supplier; + items_table.refresh(); + }); + }, + }, + { + fieldtype: "Column Break", + }, + { + fieldtype: "Section Break", + }, { fieldname: "items_for_po", fieldtype: "Table", From e830cca88617dfd5d2622116a7bf44c4beb8c753 Mon Sep 17 00:00:00 2001 From: SowmyaArunachalam Date: Tue, 25 Nov 2025 22:28:26 +0530 Subject: [PATCH 042/328] feat(asset): make asset depreciation failure notification role configurable --- .../doctype/accounts_settings/accounts_settings.json | 10 +++++++++- .../doctype/accounts_settings/accounts_settings.py | 1 + erpnext/assets/doctype/asset/depreciation.py | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index 64b8b27cd76..a21e45b0729 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -73,6 +73,7 @@ "calculate_depr_using_total_days", "column_break_gjcc", "book_asset_depreciation_entry_automatically", + "role_used_for_depreciation_failure", "closing_settings_tab", "period_closing_settings_section", "acc_frozen_upto", @@ -658,6 +659,13 @@ "fieldname": "use_legacy_controller_for_pcv", "fieldtype": "Check", "label": "Use Legacy Controller For Period Closing Voucher" + }, + { + "description": "Users with this role will be notified if the asset depreciation gets failed", + "fieldname": "role_used_for_depreciation_failure", + "fieldtype": "Link", + "label": "Role used for Depreciation Failure", + "options": "Role" } ], "grid_page_length": 50, @@ -666,7 +674,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-10-20 14:06:08.870427", + "modified": "2025-11-24 23:36:21.829372", "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 bef862d85e0..3024d01cdcf 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py @@ -65,6 +65,7 @@ class AccountsSettings(Document): reconciliation_queue_size: DF.Int role_allowed_to_over_bill: DF.Link | None role_to_override_stop_action: DF.Link | None + role_used_for_depreciation_failure: DF.Link | None round_row_wise_tax: DF.Check show_balance_in_coa: DF.Check show_inclusive_tax_in_print: DF.Check diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index 25148dc0a18..fb46ec70c02 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -307,7 +307,8 @@ def set_depr_entry_posting_status_for_failed_assets(failed_asset_names): def notify_depr_entry_posting_error(failed_asset_names, error_log_names): - recipients = get_users_with_role("Accounts Manager") + user_role = frappe.db.get_single_value("Accounts Settings", "role_used_for_depreciation_failure") + recipients = get_users_with_role(user_role or "Accounts Manager") if not recipients: recipients = get_users_with_role("System Manager") From d52d98666fec429a153db14c85bb0cb98805a8cc Mon Sep 17 00:00:00 2001 From: SowmyaArunachalam Date: Tue, 25 Nov 2025 23:05:59 +0530 Subject: [PATCH 043/328] chore: update description --- .../accounts/doctype/accounts_settings/accounts_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index a21e45b0729..d139567a351 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -661,7 +661,7 @@ "label": "Use Legacy Controller For Period Closing Voucher" }, { - "description": "Users with this role will be notified if the asset depreciation gets failed", + "description": "Users with this role will be notified if the asset depreciation fails", "fieldname": "role_used_for_depreciation_failure", "fieldtype": "Link", "label": "Role used for Depreciation Failure", From 563c2998ca1bee4d342642117a35dd3f068adb42 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Wed, 26 Nov 2025 12:51:14 +0530 Subject: [PATCH 044/328] fix: enhance SalesOrderController setup method to call super.setup --- erpnext/selling/doctype/sales_order/sales_order.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 263b3010dc7..c2eb1b212df 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -917,8 +917,9 @@ frappe.ui.form.on("Sales Order Item", { }); erpnext.selling.SalesOrderController = class SalesOrderController extends erpnext.selling.SellingController { - setup() { + setup(doc) { this.setup_accounting_dimension_triggers(); + super.setup(doc); } onload(doc, dt, dn) { super.onload(doc, dt, dn); From 079218ffbf822dd46349038055068fa99ea1e8de Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Wed, 26 Nov 2025 14:20:05 +0530 Subject: [PATCH 045/328] fix: exchange_rate field visibility on invoice currency change --- erpnext/public/js/controllers/transaction.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index a46a273017f..468900847a0 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -1697,13 +1697,13 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe var company_currency = this.get_company_currency(); if ( - this._last_company_currency === company_currency && + this._last_currency === this.frm.doc.currency && this._last_price_list_currency === this.frm.doc.price_list_currency ) { return; } - this._last_company_currency = company_currency; + this._last_currency = this.frm.doc.currency; this._last_price_list_currency = this.frm.doc.price_list_currency; this.change_form_labels(company_currency); From 0e7f75f5c0ccbb756373d229874fe729eeee800e Mon Sep 17 00:00:00 2001 From: Jatin3128 <140256508+Jatin3128@users.noreply.github.com> Date: Wed, 26 Nov 2025 17:26:33 +0530 Subject: [PATCH 046/328] fix(journal-entry): auto-populate bank account when user selects account (#50744) * fix(journal-entry): auto-populate bank account when user selects account * refactor(journal-entry): simplify get_value call and return None by default --------- Co-authored-by: Jatin3128 --- .../accounts/doctype/journal_entry/journal_entry.js | 11 +++++++++++ .../accounts/doctype/journal_entry/journal_entry.py | 3 +++ 2 files changed, 14 insertions(+) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index c81acb57865..7d179e36a77 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -720,6 +720,8 @@ $.extend(erpnext.journal_entry, { } }, }); + } else { + erpnext.journal_entry.clear_fields(frm, dt, dn); } }, set_amount_on_last_row: function (frm, dt, dn) { @@ -744,4 +746,13 @@ $.extend(erpnext.journal_entry, { } refresh_field("accounts"); }, + clear_fields: function (frm, dt, dn) { + let row = locals[dt][dn]; + + row.party_type = null; + row.party = null; + row.bank_account = null; + + frm.refresh_field("accounts"); + }, }); diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index e4aaf4e7a5a..79cf582974a 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -1719,6 +1719,9 @@ def get_account_details_and_party_type(account, date, company, debit=None, credi "party_type": party_type, "account_type": account_details.account_type, "account_currency": account_details.account_currency or company_currency, + "bank_account": ( + frappe.db.get_value("Bank Account", {"account": account, "company": company}) or None + ), # The date used to retreive the exchange rate here is the date passed in # as an argument to this function. It is assumed to be the date on which the balance is sought "exchange_rate": get_exchange_rate( From 5391ca2a5592bb0d2c9f9a3592cfff06c9e213c2 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 26 Nov 2025 17:40:05 +0530 Subject: [PATCH 047/328] test: fix flaky test case --- erpnext/selling/doctype/sales_order/test_sales_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index acf0a19943f..ed0a1083e11 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -1224,8 +1224,8 @@ class TestSalesOrder(AccountsTestMixin, IntegrationTestCase): purchase_orders = make_purchase_order(so.name, selected_items=so_items) self.assertEqual(len(purchase_orders), 2) - self.assertEqual(purchase_orders[0].supplier, "_Test Supplier") - self.assertEqual(purchase_orders[1].supplier, "_Test Supplier 1") + supplier_list = sorted([purchase_orders[0].supplier, purchase_orders[1].supplier]) + self.assertEqual(supplier_list, ["_Test Supplier", "_Test Supplier 1"]) def test_product_bundles_in_so_are_replaced_with_bundle_items_in_po(self): """ From 95e6c725394c5fde3bb9775c4c705e16c03b87fc Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 25 Nov 2025 15:21:35 +0530 Subject: [PATCH 048/328] fix: inward same serial / batches in disassembly which were used --- .../doctype/work_order/work_order.js | 22 +--- .../serial_and_batch_bundle.py | 4 + .../stock/doctype/stock_entry/stock_entry.py | 124 +++++++++++++++--- 3 files changed, 113 insertions(+), 37 deletions(-) diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js index 82b26e28912..49f9877b5a2 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.js +++ b/erpnext/manufacturing/doctype/work_order/work_order.js @@ -225,7 +225,8 @@ frappe.ui.form.on("Work Order", { if ( frm.doc.docstatus === 1 && ["Closed", "Completed"].includes(frm.doc.status) && - frm.doc.produced_qty > 0 + frm.doc.produced_qty > 0 && + frm.doc.produced_qty > frm.doc.disassembled_qty ) { frm.add_custom_button( __("Disassemble Order"), @@ -436,7 +437,6 @@ frappe.ui.form.on("Work Order", { work_order_id: frm.doc.name, purpose: "Disassemble", qty: data.qty, - target_warehouse: data.target_warehouse, }); }) .then((stock_entry) => { @@ -993,24 +993,6 @@ erpnext.work_order = { }); } - if (purpose === "Disassemble") { - fields.push({ - fieldtype: "Link", - options: "Warehouse", - fieldname: "target_warehouse", - label: __("Target Warehouse"), - default: frm.doc.source_warehouse || frm.doc.wip_warehouse, - get_query() { - return { - filters: { - company: frm.doc.company, - is_group: 0, - }, - }; - }, - }); - } - return new Promise((resolve, reject) => { frm.qty_prompt = frappe.prompt( fields, diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py index c4e1b234926..5c15245c5f6 100644 --- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py +++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py @@ -2738,6 +2738,9 @@ def get_voucher_wise_serial_batch_from_bundle(**kwargs) -> dict[str, dict]: child_row = group_by_voucher[key] if row.serial_no: child_row["serial_nos"].append(row.serial_no) + child_row["item_row"].qty = len(child_row["serial_nos"]) * ( + -1 if row.type_of_transaction == "Outward" else 1 + ) if row.batch_no: child_row["batch_nos"][row.batch_no] += row.qty @@ -2859,6 +2862,7 @@ def get_ledgers_from_serial_batch_bundle(**kwargs) -> list[frappe._dict]: bundle_table.voucher_detail_no, bundle_table.voucher_no, bundle_table.posting_datetime, + bundle_table.type_of_transaction, ) .where( (bundle_table.docstatus == 1) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 9e7935a4abf..5f83b926510 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -275,7 +275,65 @@ class StockEntry(StockController, SubcontractingInwardController): super().validate_subcontracting_inward() + def set_serial_batch_for_disassembly(self): + if self.purpose != "Disassemble": + return + + available_materials = get_available_materials(self.work_order, self) + for row in self.items: + warehouse = row.s_warehouse or row.t_warehouse + materials = available_materials.get((row.item_code, warehouse)) + if not materials: + continue + + batches = defaultdict(float) + serial_nos = [] + qty = row.transfer_qty + for batch_no, batch_qty in materials.batch_details.items(): + if qty <= 0: + break + + batch_qty = abs(batch_qty) + if batch_qty <= qty: + batches[batch_no] = batch_qty + qty -= batch_qty + else: + batches[batch_no] = qty + qty = 0 + + if materials.serial_nos: + serial_nos = materials.serial_nos[: int(row.transfer_qty)] + + if not serial_nos and not batches: + continue + + bundle_doc = SerialBatchCreation( + { + "item_code": row.item_code, + "warehouse": warehouse, + "posting_datetime": get_combine_datetime(self.posting_date, self.posting_time), + "voucher_type": self.doctype, + "voucher_no": self.name, + "voucher_detail_no": row.name, + "qty": row.transfer_qty, + "type_of_transaction": "Inward" if row.t_warehouse else "Outward", + "company": self.company, + "do_not_submit": True, + } + ).make_serial_and_batch_bundle(serial_nos=serial_nos, batch_nos=batches) + + row.serial_and_batch_bundle = bundle_doc.name + row.use_serial_batch_fields = 0 + + row.db_set( + { + "serial_and_batch_bundle": bundle_doc.name, + "use_serial_batch_fields": 0, + } + ) + def on_submit(self): + self.set_serial_batch_for_disassembly() self.make_bundle_using_old_serial_batch_fields() self.update_work_order() self.update_disassembled_order() @@ -2096,7 +2154,13 @@ class StockEntry(StockController, SubcontractingInwardController): s_warehouse = frappe.db.get_value("Work Order", self.work_order, "fg_warehouse") - items_dict = get_bom_items_as_dict(self.bom_no, self.company, disassemble_qty) + items_dict = get_bom_items_as_dict( + self.bom_no, + self.company, + disassemble_qty, + fetch_exploded=self.use_multi_level_bom, + fetch_qty_in_stock_uom=False, + ) for row in items: child_row = self.append("items", {}) @@ -2114,7 +2178,7 @@ class StockEntry(StockController, SubcontractingInwardController): child_row.qty = disassemble_qty child_row.s_warehouse = (self.from_warehouse or s_warehouse) if row.is_finished_item else "" - child_row.t_warehouse = self.to_warehouse if not row.is_finished_item else "" + child_row.t_warehouse = row.s_warehouse child_row.is_finished_item = 0 if row.is_finished_item else 1 def get_items_from_manufacture_entry(self): @@ -2133,6 +2197,8 @@ class StockEntry(StockController, SubcontractingInwardController): "`tabStock Entry Detail`.`is_finished_item`", "`tabStock Entry Detail`.`batch_no`", "`tabStock Entry Detail`.`serial_no`", + "`tabStock Entry Detail`.`s_warehouse`", + "`tabStock Entry Detail`.`t_warehouse`", "`tabStock Entry Detail`.`use_serial_batch_fields`", ], filters=[ @@ -3686,8 +3752,8 @@ def get_items_from_subcontract_order(source_name, target_doc=None): return target_doc -def get_available_materials(work_order) -> dict: - data = get_stock_entry_data(work_order) +def get_available_materials(work_order, stock_entry_doc=None) -> dict: + data = get_stock_entry_data(work_order, stock_entry_doc=stock_entry_doc) available_materials = {} for row in data: @@ -3695,6 +3761,9 @@ def get_available_materials(work_order) -> dict: if row.purpose != "Material Transfer for Manufacture": key = (row.item_code, row.s_warehouse) + if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": + key = (row.item_code, row.s_warehouse or row.warehouse) + if key not in available_materials: available_materials.setdefault( key, @@ -3705,7 +3774,9 @@ def get_available_materials(work_order) -> dict: item_data = available_materials[key] - if row.purpose == "Material Transfer for Manufacture": + if row.purpose == "Material Transfer for Manufacture" or ( + stock_entry_doc and stock_entry_doc.purpose == "Disassemble" and row.purpose == "Manufacture" + ): item_data.qty += row.qty if row.batch_no: item_data.batch_details[row.batch_no] += row.qty @@ -3745,7 +3816,7 @@ def get_available_materials(work_order) -> dict: return available_materials -def get_stock_entry_data(work_order): +def get_stock_entry_data(work_order, stock_entry_doc=None): from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import ( get_voucher_wise_serial_batch_from_bundle, ) @@ -3777,19 +3848,35 @@ def get_stock_entry_data(work_order): (stock_entry.name == stock_entry_detail.parent) & (stock_entry.work_order == work_order) & (stock_entry.docstatus == 1) - & (stock_entry_detail.s_warehouse.isnotnull()) - & ( - stock_entry.purpose.isin( - [ - "Manufacture", - "Material Consumption for Manufacture", - "Material Transfer for Manufacture", - ] - ) - ) ) .orderby(stock_entry.creation, stock_entry_detail.item_code, stock_entry_detail.idx) - ).run(as_dict=1) + ) + + if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": + data = data.where( + stock_entry.purpose.isin( + [ + "Disassemble", + "Manufacture", + ] + ) + ) + + data = data.where(stock_entry.name != stock_entry_doc.name) + else: + data = data.where( + stock_entry.purpose.isin( + [ + "Manufacture", + "Material Consumption for Manufacture", + "Material Transfer for Manufacture", + ] + ) + ) + + data = data.where(stock_entry_detail.s_warehouse.isnotnull()) + + data = data.run(as_dict=1) if not data: return [] @@ -3802,6 +3889,9 @@ def get_stock_entry_data(work_order): if row.purpose != "Material Transfer for Manufacture": key = (row.item_code, row.s_warehouse, row.name) + if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": + key = (row.item_code, row.s_warehouse or row.warehouse, row.name) + if bundle_data.get(key): row.update(bundle_data.get(key)) From c2358c6b3f9c3531a1087f08d0da43b5e2aac358 Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Wed, 26 Nov 2025 22:19:50 +0530 Subject: [PATCH 049/328] fix: incorrect positional param for get_field_precision util --- .../exchange_rate_revaluation/exchange_rate_revaluation.py | 2 +- erpnext/accounts/doctype/gl_entry/gl_entry.py | 2 +- erpnext/accounts/general_ledger.py | 4 +++- erpnext/controllers/sales_and_purchase_return.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py index 17cdd2fd872..0c21bbb2e0b 100644 --- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py +++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py @@ -252,7 +252,7 @@ class ExchangeRateRevaluation(Document): company_currency = erpnext.get_company_currency(company) precision = get_field_precision( frappe.get_meta("Exchange Rate Revaluation Account").get_field("new_balance_in_base_currency"), - company_currency, + currency=company_currency, ) if account_details: diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index 80ba0f5563d..aefe293157b 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -442,7 +442,7 @@ def update_against_account(voucher_type, voucher_no): if not entries: return company_currency = erpnext.get_company_currency(entries[0].company) - precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"), company_currency) + precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"), currency=company_currency) accounts_debited, accounts_credited = [], [] for d in entries: diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py index 0bfecd989f2..a74b982754f 100644 --- a/erpnext/accounts/general_ledger.py +++ b/erpnext/accounts/general_ledger.py @@ -301,7 +301,9 @@ def merge_similar_entries(gl_map, precision=None): company_currency = erpnext.get_company_currency(company) if not precision: - precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"), company_currency) + precision = get_field_precision( + frappe.get_meta("GL Entry").get_field("debit"), currency=company_currency + ) # filter zero debit and credit entries merged_gl_map = filter( diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py index 5b4307f0ccf..a227c12ac05 100644 --- a/erpnext/controllers/sales_and_purchase_return.py +++ b/erpnext/controllers/sales_and_purchase_return.py @@ -186,7 +186,7 @@ def validate_quantity(doc, key, args, ref, valid_items, already_returned_items): frappe.get_meta(doc.doctype + " Item").get_field( "stock_qty" if doc.get("update_stock", "") else "qty" ), - company_currency, + currency=company_currency, ) for column in fields: From f68515210b989a4e0c36094530e8dd46d02f1c7b Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 27 Nov 2025 11:43:21 +0530 Subject: [PATCH 050/328] fix: two primary buttons --- erpnext/manufacturing/doctype/work_order/work_order.js | 4 ++-- erpnext/stock/doctype/serial_no/serial_no.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js index 49f9877b5a2..cfd6263ca3a 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.js +++ b/erpnext/manufacturing/doctype/work_order/work_order.js @@ -205,7 +205,7 @@ frappe.ui.form.on("Work Order", { if (frm.doc.__onload?.show_create_job_card_button) { frm.add_custom_button(__("Create Job Card"), () => { frm.trigger("make_job_card"); - }).addClass("btn-primary"); + }); } } } @@ -277,7 +277,7 @@ frappe.ui.form.on("Work Order", { if (non_consumed_items && non_consumed_items.length) { frm.add_custom_button(__("Return Components"), function () { frm.trigger("create_stock_return_entry"); - }).addClass("btn-primary"); + }); } } }, diff --git a/erpnext/stock/doctype/serial_no/serial_no.js b/erpnext/stock/doctype/serial_no/serial_no.js index 338ed61bfc5..b12bbbdb27c 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.js +++ b/erpnext/stock/doctype/serial_no/serial_no.js @@ -33,6 +33,6 @@ frappe.ui.form.on("Serial No", { posting_time: frappe.datetime.now_time(), }; frappe.set_route("query-report", "Serial No Ledger"); - }).addClass("btn-primary"); + }); }, }); From 6a66ce5a973792a6e3585a95508232d042e6528d Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 27 Nov 2025 13:40:23 +0530 Subject: [PATCH 051/328] fix: add is_tax_withholding_account field to JournalEntryAccount to avoid recursive tds --- .../doctype/journal_entry/journal_entry.py | 198 +++++++++++------- .../journal_entry_account.json | 10 +- .../journal_entry_account.py | 1 + .../test_tax_withholding_category.py | 10 +- 4 files changed, 143 insertions(+), 76 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index f114095d0ab..b828bcbdbe9 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -354,15 +354,14 @@ class JournalEntry(AccountsController): ) def apply_tax_withholding(self): - from erpnext.accounts.report.general_ledger.general_ledger import get_account_type_map - if not self.apply_tds or self.voucher_type not in ("Debit Note", "Credit Note"): return party = None party_type = None - party_row = None party_account = None + party_row = None + existing_tds_rows = [] for row in self.get("accounts"): if row.party_type in ("Customer", "Supplier") and row.party: @@ -375,64 +374,119 @@ class JournalEntry(AccountsController): party_account = row.account party_row = row + if row.get("is_tax_withholding_account"): + existing_tds_rows.append(row) + if not party: return - # debit or credit based on party type + party = party + party_type = party_type + party_account = party_account + party_row = party_row + dr_cr = "credit" if party_type == "Supplier" else "debit" rev_dr_cr = "debit" if party_type == "Supplier" else "credit" - precision = self.precision(dr_cr, party_row) + self._reset_existing_tds_rows(party_row, existing_tds_rows, dr_cr, rev_dr_cr, precision) + + net_total = self._calculate_tds_net_total(dr_cr, rev_dr_cr, party_account, precision) + if net_total <= 0: + return + + tds_details = get_party_tax_withholding_details( + frappe._dict( + { + "party_type": party_type, + "party": party, + "doctype": self.doctype, + "company": self.company, + "posting_date": self.posting_date, + "tax_withholding_net_total": net_total, + "base_tax_withholding_net_total": net_total, + "grand_total": net_total, + } + ), + self.tax_withholding_category, + ) + + if not tds_details or not tds_details.get("tax_amount"): + return + + tax_row = self._update_or_create_tds_row(tds_details, precision) + self._adjust_party_row_for_tds(party_row, tds_details, dr_cr, rev_dr_cr, precision) + self._remove_duplicate_tds_rows(tax_row) + + self.set_amounts_in_company_currency() + self.set_total_debit_credit() + self.set_against_account() + + def _reset_existing_tds_rows(self, party_row, existing_tds_rows, dr_cr, rev_dr_cr, precision): + for row in existing_tds_rows: + # Get the TDS amount from the row (TDS is always in credit) + tds_amount = flt(row.get("credit") - row.get("debit"), precision) + if not tds_amount: + continue + + tds_amount_in_party_currency = flt(tds_amount / party_row.get("exchange_rate", 1), precision) + + party_field = dr_cr if party_row.get(dr_cr) else rev_dr_cr + party_field_in_account_currency = f"{party_field}_in_account_currency" + + # For Supplier (dr_cr=credit): add back to credit + # For Customer (dr_cr=debit): subtract from debit (since TDS was added) + multiplier = 1 if dr_cr == "credit" else -1 + tds_amount *= multiplier + tds_amount_in_party_currency *= multiplier + + party_row.update( + { + party_field: flt(party_row.get(party_field) + tds_amount, precision), + party_field_in_account_currency: flt( + party_row.get(party_field_in_account_currency) + tds_amount_in_party_currency, + precision, + ), + } + ) + + row.update( + { + "credit": 0, + "credit_in_account_currency": 0, + "debit": 0, + "debit_in_account_currency": 0, + } + ) + + def _calculate_tds_net_total(self, tds_field, reverse_field, party_account, precision): + from erpnext.accounts.report.general_ledger.general_ledger import get_account_type_map + account_type_map = get_account_type_map(self.company) - # net total in company currency. - net_total = flt( + return flt( sum( - d.get(rev_dr_cr) - d.get(dr_cr) + d.get(reverse_field) - d.get(tds_field) for d in self.get("accounts") - if account_type_map.get(d.account) not in ("Tax", "Chargeable") and d.account != party_account + if account_type_map.get(d.account) not in ("Tax", "Chargeable") + and d.account != party_account + and not d.get("is_tax_withholding_account") ), precision, ) - # only apply tds if net total is positive - if net_total <= 0: - return + def _update_or_create_tds_row(self, tax_details, precision): + tax_account = tax_details.get("account_head") + account_currency = get_account_currency(tax_account) + company_currency = frappe.get_cached_value("Company", self.company, "default_currency") + exch_rate = _get_exchange_rate(account_currency, company_currency, self.posting_date) - inv = frappe._dict( - { - "party_type": party_type, - "party": party, - "doctype": self.doctype, - "company": self.company, - "posting_date": self.posting_date, - "tax_withholding_net_total": net_total, - "base_tax_withholding_net_total": net_total, - "grand_total": net_total, - } - ) + tax_amount = flt(tax_details.get("tax_amount"), precision) + tax_amount_in_account_currency = flt(tax_amount / exch_rate, precision) - tax_details = get_party_tax_withholding_details(inv, self.tax_withholding_category) - - if not tax_details: - return - - tax_acc = tax_details.get("account_head") - acc_curr = get_account_currency(tax_acc) - comp_curr = frappe.get_cached_value("Company", self.company, "default_currency") - - exch_rate = _get_exchange_rate(acc_curr, comp_curr, self.posting_date) - - tax_amt_in_comp_curr = flt(tax_details.get("tax_amount"), precision) - tax_amt_in_acc_curr = flt(tax_amt_in_comp_curr / exch_rate, precision) - tax_amt_in_party_curr = flt(tax_amt_in_comp_curr / party_row.get("exchange_rate", 1), precision) - - # Update or create tax account row tax_row = None - for row in self.get("accounts"): - if row.account == tax_acc: + if row.account == tax_account and row.get("is_tax_withholding_account"): tax_row = row break @@ -440,66 +494,64 @@ class JournalEntry(AccountsController): tax_row = self.append( "accounts", { - "account": tax_acc, - "account_currency": acc_curr, + "account": tax_account, + "account_currency": account_currency, "exchange_rate": exch_rate, "cost_center": tax_details.get("cost_center"), - "debit": 0, "credit": 0, - "debit_in_account_currency": 0, "credit_in_account_currency": 0, + "debit": 0, + "debit_in_account_currency": 0, + "is_tax_withholding_account": 1, }, ) - # TDS will always be credit tax_row.update( { - "credit": tax_amt_in_comp_curr, - "credit_in_account_currency": tax_amt_in_acc_curr, + "credit": tax_amount, + "credit_in_account_currency": tax_amount_in_account_currency, "debit": 0, "debit_in_account_currency": 0, } ) - # update party row - party_field = dr_cr + return tax_row - # sometime user may enter amount in opposite field as negative value + def _adjust_party_row_for_tds(self, party_row, tax_details, dr_cr, rev_dr_cr, precision): + tax_amount = flt(tax_details.get("tax_amount"), precision) + tax_amount_in_party_currency = flt(tax_amount / party_row.get("exchange_rate", 1), precision) + + party_field = dr_cr if not party_row.get(party_field): party_field = rev_dr_cr - tax_amt_in_comp_curr *= -1 - tax_amt_in_party_curr *= -1 + tax_amount *= -1 + tax_amount_in_party_currency *= -1 - # for customer amount will be added. if dr_cr == "debit": - tax_amt_in_comp_curr *= -1 - tax_amt_in_party_curr *= -1 + tax_amount *= -1 + tax_amount_in_party_currency *= -1 - party_field_in_acc_curr = f"{party_field}_in_account_currency" - party_amt_in_comp_curr = flt(party_row.get(party_field) - tax_amt_in_comp_curr, precision) - party_amt_in_acc_curr = flt(party_row.get(party_field_in_acc_curr) - tax_amt_in_party_curr, precision) + party_field_in_account_currency = f"{party_field}_in_account_currency" party_row.update( { - party_field: party_amt_in_comp_curr, - party_field_in_acc_curr: party_amt_in_acc_curr, + party_field: flt(party_row.get(party_field) - tax_amount, precision), + party_field_in_account_currency: flt( + party_row.get(party_field_in_account_currency) - tax_amount_in_party_currency, precision + ), } ) - # remove other tds rows if any - dup_rows = [] - for row in self.get("accounts"): - if row.account == tax_acc and row != tax_row: - dup_rows.append(row) + def _remove_duplicate_tds_rows(self, current_tax_row): + rows_to_remove = [ + row + for row in self.get("accounts") + if row.get("is_tax_withholding_account") and row != current_tax_row + ] - for row in dup_rows: + for row in rows_to_remove: self.remove(row) - # recalculate totals - self.set_amounts_in_company_currency() - self.set_total_debit_credit() - self.set_against_account() - def update_asset_value(self): self.update_asset_on_depreciation() self.update_asset_on_disposal() 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 f1832255122..675bfcf86c8 100644 --- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json +++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json @@ -34,6 +34,7 @@ "reference_detail_no", "advance_voucher_type", "advance_voucher_no", + "is_tax_withholding_account", "col_break3", "is_advance", "user_remark", @@ -281,12 +282,19 @@ "options": "advance_voucher_type", "read_only": 1, "search_index": 1 + }, + { + "default": "0", + "fieldname": "is_tax_withholding_account", + "fieldtype": "Check", + "label": "Is Tax Withholding Account", + "read_only": 1 } ], "idx": 1, "istable": 1, "links": [], - "modified": "2025-10-27 13:48:32.805100", + "modified": "2025-11-27 12:23:33.157655", "modified_by": "Administrator", "module": "Accounts", "name": "Journal Entry Account", 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 b801ac8c9a5..d26224103c0 100644 --- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.py +++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.py @@ -28,6 +28,7 @@ class JournalEntryAccount(Document): debit_in_account_currency: DF.Currency exchange_rate: DF.Float is_advance: DF.Literal["No", "Yes"] + is_tax_withholding_account: DF.Check parent: DF.Data parentfield: DF.Data parenttype: DF.Data diff --git a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py index f511658067b..453f4f5ceab 100644 --- a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py +++ b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py @@ -865,6 +865,10 @@ class TestTaxWithholdingCategory(IntegrationTestCase): jv.apply_tds = 1 jv.tax_withholding_category = "Cumulative Threshold TDS" jv.save() + + # Again saving should not change tds amount + jv.user_remark = "Test TDS on Journal Entry for Supplier" + jv.save() jv.submit() # TDS = 50000 * 10% = 5000 @@ -884,7 +888,6 @@ class TestTaxWithholdingCategory(IntegrationTestCase): # Supplier amount should be reduced by TDS self.assertEqual(supplier_row.credit, 45000) - jv.cancel() def test_tcs_on_journal_entry_for_customer(self): @@ -904,6 +907,10 @@ class TestTaxWithholdingCategory(IntegrationTestCase): jv.apply_tds = 1 jv.tax_withholding_category = "Cumulative Threshold TCS" jv.save() + + # Again saving should not change tds amount + jv.user_remark = "Test TCS on Journal Entry for Customer" + jv.save() jv.submit() # Assert TCS calculation (10% on amount above threshold of 30000) @@ -924,7 +931,6 @@ class TestTaxWithholdingCategory(IntegrationTestCase): # Customer amount should be increased by TCS self.assertEqual(customer_row.debit, 52000) - jv.cancel() From 6079bee3a33c08f3d2c9a725ea285ce5a313a6bf Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 27 Nov 2025 13:44:28 +0530 Subject: [PATCH 052/328] fix: remove redundant party variable assignments --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index b828bcbdbe9..b2289ada6ee 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -380,11 +380,6 @@ class JournalEntry(AccountsController): if not party: return - party = party - party_type = party_type - party_account = party_account - party_row = party_row - dr_cr = "credit" if party_type == "Supplier" else "debit" rev_dr_cr = "debit" if party_type == "Supplier" else "credit" precision = self.precision(dr_cr, party_row) From 145d40dec856b1ddbdf0a3ac4cd6698aa3631ac9 Mon Sep 17 00:00:00 2001 From: Navin S R Date: Thu, 27 Nov 2025 14:06:43 +0530 Subject: [PATCH 053/328] fix: use posting_date instead of bill_date from purchase invoice --- erpnext/assets/doctype/asset/asset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index 1d40abf2094..d0ed33279be 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -1212,7 +1212,7 @@ def get_values_from_purchase_doc(purchase_doc_name, item_code, doctype): return { "company": purchase_doc.company, - "purchase_date": purchase_doc.get("bill_date") or purchase_doc.get("posting_date"), + "purchase_date": purchase_doc.get("posting_date"), "net_purchase_amount": flt(first_item.base_net_amount), "asset_quantity": first_item.qty, "cost_center": first_item.cost_center or purchase_doc.get("cost_center"), From d8fc369e38a7860a18afdfcf280c766c8e8cadfd Mon Sep 17 00:00:00 2001 From: l0gesh29 Date: Thu, 27 Nov 2025 14:19:32 +0530 Subject: [PATCH 054/328] fix: add validation for cancelled reposting entries --- erpnext/controllers/accounts_controller.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 3902b2f7202..e3669145f7a 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -364,6 +364,24 @@ class AccountsController(TransactionBase): for _doctype in repost_doctypes: dt = frappe.qb.DocType(_doctype) + + cancelled_entries = ( + frappe.qb.from_(dt) + .select(dt.parent, dt.parenttype) + .where((dt.voucher_type == self.doctype) & (dt.voucher_no == self.name) & (dt.docstatus == 2)) + .run(as_dict=True) + ) + + if cancelled_entries: + entries = "
            ".join([get_link_to_form(d.parenttype, d.parent) for d in cancelled_entries]) + + frappe.throw( + _( + "The following cancelled repost entries exist for {0}:

            {1}

            " + "Kindly delete these entries before continuing." + ).format(self.name, entries) + ) + rows = ( frappe.qb.from_(dt) .select(dt.name, dt.parent, dt.parenttype) From c5d92d79996ed95e9c56f3ab21f1becb5120ce84 Mon Sep 17 00:00:00 2001 From: Sherin KR Date: Mon, 17 Nov 2025 12:41:44 +0530 Subject: [PATCH 055/328] fix: item price not considering based on valid_upto (cherry picked from commit dfda8e6241aaebc9ce48f0a81a82387976a67a37) # Conflicts: # erpnext/selling/page/point_of_sale/point_of_sale.py --- .../page/point_of_sale/point_of_sale.py | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py index 4b7c06dea39..06f81dadde2 100644 --- a/erpnext/selling/page/point_of_sale/point_of_sale.py +++ b/erpnext/selling/page/point_of_sale/point_of_sale.py @@ -5,7 +5,12 @@ import json import frappe +<<<<<<< HEAD from frappe.utils import cint, get_datetime +======= +from frappe.query_builder import DocType, Order +from frappe.utils import cint +>>>>>>> dfda8e6241 (fix: item price not considering based on valid_upto) from frappe.utils.nestedset import get_root_of from erpnext.accounts.doctype.pos_invoice.pos_invoice import get_item_group, get_stock_availability @@ -200,18 +205,24 @@ def get_items(start, page_length, price_list, item_group, pos_profile, search_te for item in items_data: item.actual_qty, _, is_negative_stock_allowed = get_stock_availability(item.item_code, warehouse) - item_prices = frappe.get_all( - "Item Price", - fields=["price_list_rate", "currency", "uom", "batch_no", "valid_from", "valid_upto"], - filters={ - "price_list": price_list, - "item_code": item.item_code, - "selling": True, - "valid_from": ["<=", current_date], - "valid_upto": ["in", [None, "", current_date]], - }, - order_by="valid_from desc", - ) + ItemPrice = DocType("Item Price") + item_prices = ( + frappe.qb.from_(ItemPrice) + .select( + ItemPrice.price_list_rate, + ItemPrice.currency, + ItemPrice.uom, + ItemPrice.batch_no, + ItemPrice.valid_from, + ItemPrice.valid_upto, + ) + .where(ItemPrice.price_list == price_list) + .where(ItemPrice.item_code == item.item_code) + .where(ItemPrice.selling == 1) + .where((ItemPrice.valid_from <= current_date) | (ItemPrice.valid_from.isnull())) + .where((ItemPrice.valid_upto >= current_date) | (ItemPrice.valid_upto.isnull())) + .orderby(ItemPrice.valid_from, order=Order.desc) + ).run(as_dict=True) stock_uom_price = next((d for d in item_prices if d.get("uom") == item.stock_uom), {}) item_uom = item.stock_uom From 31142b2f4794f570db7b474512e4179da6cd9e89 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Thu, 27 Nov 2025 16:40:55 +0530 Subject: [PATCH 056/328] chore: resolve conflict --- erpnext/selling/page/point_of_sale/point_of_sale.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py index 06f81dadde2..50ab2404078 100644 --- a/erpnext/selling/page/point_of_sale/point_of_sale.py +++ b/erpnext/selling/page/point_of_sale/point_of_sale.py @@ -5,12 +5,8 @@ import json import frappe -<<<<<<< HEAD -from frappe.utils import cint, get_datetime -======= from frappe.query_builder import DocType, Order -from frappe.utils import cint ->>>>>>> dfda8e6241 (fix: item price not considering based on valid_upto) +from frappe.utils import cint, get_datetime from frappe.utils.nestedset import get_root_of from erpnext.accounts.doctype.pos_invoice.pos_invoice import get_item_group, get_stock_availability From aab7cd1ae61e4d44b39c74e2e9b2a70b75482c41 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 27 Nov 2025 16:49:03 +0530 Subject: [PATCH 057/328] chore: make unnecessary field read only and show only when required --- .../purchase_receipt/purchase_receipt.js | 27 ------------------- .../purchase_receipt/purchase_receipt.json | 6 ++--- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index 29026969404..ce462f73039 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -35,15 +35,6 @@ frappe.ui.form.on("Purchase Receipt", { filters: { company: frm.doc.company }, }; }); - - frm.set_query("subcontracting_receipt", function () { - return { - filters: { - docstatus: 1, - supplier: frm.doc.supplier, - }, - }; - }); }, onload: function (frm) { erpnext.queries.setup_queries(frm, "Warehouse", function () { @@ -167,24 +158,6 @@ frappe.ui.form.on("Purchase Receipt", { erpnext.accounts.dimensions.update_dimension(frm, frm.doctype); }, - subcontracting_receipt: (frm) => { - if ( - frm.doc.is_subcontracted === 1 && - frm.doc.is_old_subcontracting_flow === 0 && - frm.doc.subcontracting_receipt - ) { - frm.set_value("items", null); - - erpnext.utils.map_current_doc({ - method: "erpnext.subcontracting.doctype.subcontracting_receipt.subcontracting_receipt.make_purchase_receipt", - source_name: frm.doc.subcontracting_receipt, - target_doc: frm, - freeze: true, - freeze_message: __("Mapping Purchase Receipt ..."), - }); - } - }, - toggle_display_account_head: function (frm) { var enabled = erpnext.is_perpetual_inventory_enabled(frm.doc.company); frm.fields_dict["items"].grid.set_column_disp(["cost_center"], enabled); diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 1c8fccf4849..077bda82e81 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -1249,11 +1249,12 @@ "label": "Named Place" }, { - "depends_on": "eval: (doc.is_subcontracted && !doc.is_old_subcontracting_flow)", + "depends_on": "subcontracting_receipt", "fieldname": "subcontracting_receipt", "fieldtype": "Link", "label": "Subcontracting Receipt", "options": "Subcontracting Receipt", + "read_only": 1, "search_index": 1 }, { @@ -1309,7 +1310,7 @@ "idx": 261, "is_submittable": 1, "links": [], - "modified": "2025-11-12 19:53:48.173096", + "modified": "2025-11-27 16:46:30.210628", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", @@ -1380,4 +1381,3 @@ "title_field": "title", "track_changes": 1 } - From 355aa52cb8e137ecff822d025401c649c0788570 Mon Sep 17 00:00:00 2001 From: Aadhil <36843795+aadhilpm@users.noreply.github.com> Date: Thu, 27 Nov 2025 16:10:20 +0300 Subject: [PATCH 058/328] feat: add Account Category field to Account (Chart of Accounts) (#50766) --- erpnext/accounts/doctype/account/account_tree.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js index 73bba325127..804cb473305 100644 --- a/erpnext/accounts/doctype/account/account_tree.js +++ b/erpnext/accounts/doctype/account/account_tree.js @@ -160,6 +160,14 @@ frappe.treeview_settings["Account"] = { .options, description: __("Optional. This setting will be used to filter in various transactions."), }, + { + fieldtype: "Link", + fieldname: "account_category", + label: __("Account Category"), + options: frappe.get_meta("Account").fields.filter((d) => d.fieldname == "account_category")[0] + .options, + description: __("Optional. Used with Financial Report Template"), + }, { fieldtype: "Float", fieldname: "tax_rate", From b7c7e0746e759a39a69f1662a0e65aa750922d65 Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Thu, 27 Nov 2025 19:15:46 +0530 Subject: [PATCH 059/328] fix: only show net gl balance as opening in general ledger --- .../report/general_ledger/general_ledger.py | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 0aff52c0431..fa4b4760c42 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -500,7 +500,7 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map): immutable_ledger = frappe.get_single_value("Accounts Settings", "enable_immutable_ledger") - def update_value_in_dict(data, key, gle): + def update_value_in_dict(data, key, gle, show_net_values=False): data[key].debit += gle.debit data[key].credit += gle.credit @@ -511,10 +511,14 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map): data[key].debit_in_transaction_currency += gle.debit_in_transaction_currency data[key].credit_in_transaction_currency += gle.credit_in_transaction_currency - if filters.get("show_net_values_in_party_account") and account_type_map.get(data[key].account) in ( - "Receivable", - "Payable", - ): + if ( + filters.get("show_net_values_in_party_account") + and account_type_map.get(data[key].account) + in ( + "Receivable", + "Payable", + ) + ) or show_net_values: net_value = data[key].debit - data[key].credit net_value_in_account_currency = ( data[key].debit_in_account_currency - data[key].credit_in_account_currency @@ -548,11 +552,11 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map): if gle.posting_date < from_date or (cstr(gle.is_opening) == "Yes" and not show_opening_entries): if not group_by_voucher_consolidated: - update_value_in_dict(gle_map[group_by_value].totals, "opening", gle) - update_value_in_dict(gle_map[group_by_value].totals, "closing", gle) + update_value_in_dict(gle_map[group_by_value].totals, "opening", gle, True) + update_value_in_dict(gle_map[group_by_value].totals, "closing", gle, True) - update_value_in_dict(totals, "opening", gle) - update_value_in_dict(totals, "closing", gle) + update_value_in_dict(totals, "opening", gle, True) + update_value_in_dict(totals, "closing", gle, True) elif gle.posting_date <= to_date or (cstr(gle.is_opening) == "Yes" and show_opening_entries): if not group_by_voucher_consolidated: From 9145bf55630286b1a21835ba520b0508ccf4c4fc Mon Sep 17 00:00:00 2001 From: Aadhil <36843795+aadhilpm@users.noreply.github.com> Date: Thu, 27 Nov 2025 16:53:02 +0300 Subject: [PATCH 060/328] fix: restore missing account number for Indirect Expenses in standard COA with Numbers (#50767) --- .../verified/standard_chart_of_accounts_with_account_number.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py index d175967c628..121263794c9 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py @@ -228,6 +228,7 @@ def get(): }, _("Impairment"): {"account_number": "5224", "account_category": "Operating Expenses"}, _("Tax Expense"): {"account_number": "5225", "account_category": "Tax Expense"}, + "account_number": "5200", }, "root_type": "Expense", "account_number": "5000", From d344be32a0d4a1de0225df0f6f9ddcf7949e900c Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Fri, 28 Nov 2025 11:37:25 +0530 Subject: [PATCH 061/328] fix: cascade projected quantity across multiple items in material requests --- .../production_plan/production_plan.py | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index 17ecc66e272..b5381a0ab54 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -1408,14 +1408,21 @@ def get_material_request_items( include_safety_stock, warehouse, bin_dict, - total_qty, + consumed_qty, ): required_qty = 0 + item_code = row.get("item_code") + if not ignore_existing_ordered_qty or bin_dict.get("projected_qty", 0) < 0: - required_qty = total_qty[row.get("item_code")] - elif total_qty[row.get("item_code")] > bin_dict.get("projected_qty", 0): - required_qty = total_qty[row.get("item_code")] - bin_dict.get("projected_qty", 0) - total_qty[row.get("item_code")] -= required_qty + required_qty = flt(row.get("qty")) + else: + key = (item_code, warehouse) + available_qty = flt(bin_dict.get("projected_qty", 0)) - consumed_qty[key] + if available_qty > 0: + required_qty = max(0, flt(row.get("qty")) - available_qty) + consumed_qty[key] += min(flt(row.get("qty")), available_qty) + else: + required_qty = flt(row.get("qty")) if doc.get("consider_minimum_order_qty") and required_qty > 0 and required_qty < row["min_order_qty"]: required_qty = row["min_order_qty"] @@ -1757,11 +1764,12 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d so_item_details[sales_order][key] = details mr_items = [] + consumed_qty = defaultdict(float) + for sales_order in so_item_details: item_dict = so_item_details[sales_order] - total_qty = defaultdict(float) for details in item_dict.values(): - total_qty[details.item_code] += flt(details.qty) + warehouse = warehouse or details.get("source_warehouse") or details.get("default_warehouse") bin_dict = get_bin_details(details, doc.company, warehouse) bin_dict = bin_dict[0] if bin_dict else {} @@ -1775,7 +1783,7 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d include_safety_stock, warehouse, bin_dict, - total_qty, + consumed_qty, ) if items: mr_items.append(items) From a7e43eddad96f2c7b01614d6c536342662041dd7 Mon Sep 17 00:00:00 2001 From: Navin S R Date: Fri, 28 Nov 2025 12:54:27 +0530 Subject: [PATCH 062/328] fix: use asset in against_voucher while posting gl entries for capitalized asset repairs --- erpnext/assets/doctype/asset_repair/asset_repair.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index dc74da28db4..afe17410e01 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -320,7 +320,8 @@ class AssetRepair(AccountsController): "voucher_no": self.name, "cost_center": self.cost_center, "posting_date": self.completion_date, - "against_voucher_type": "Purchase Invoice", + "against_voucher_type": "Asset", + "against_voucher": self.asset, "company": self.company, }, item=self, From da7f28a3c327eb30aa9f82619c46abddb4978e1f Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 28 Nov 2025 13:05:24 +0530 Subject: [PATCH 063/328] fix: add Stock Entry link to Asset Repair doctype. --- erpnext/assets/doctype/asset_repair/asset_repair.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json index d95e3e630a3..48b10575b8a 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.json +++ b/erpnext/assets/doctype/asset_repair/asset_repair.json @@ -260,8 +260,13 @@ ], "index_web_pages_for_search": 1, "is_submittable": 1, - "links": [], - "modified": "2025-11-04 23:06:43.644846", + "links": [ + { + "link_doctype": "Stock Entry", + "link_fieldname": "asset_repair" + } + ], + "modified": "2025-11-28 13:04:34.921098", "modified_by": "Administrator", "module": "Assets", "name": "Asset Repair", From a2fadd9347b8f5474ec4fc12321206ff25beacb8 Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Fri, 28 Nov 2025 13:33:24 +0530 Subject: [PATCH 064/328] fix: use `ValueWrapper` consistently --- erpnext/manufacturing/doctype/bom_creator/bom_creator.py | 3 +-- erpnext/patches/v14_0/single_to_multi_dunning.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom_creator/bom_creator.py b/erpnext/manufacturing/doctype/bom_creator/bom_creator.py index bb62c7a84da..18599b2c20c 100644 --- a/erpnext/manufacturing/doctype/bom_creator/bom_creator.py +++ b/erpnext/manufacturing/doctype/bom_creator/bom_creator.py @@ -7,6 +7,7 @@ import frappe from frappe import _ from frappe.model.document import Document from frappe.utils import cint, flt, sbool +from pypika.terms import ValueWrapper from erpnext.manufacturing.doctype.bom.bom import get_bom_item_rate @@ -360,8 +361,6 @@ class BOMCreator(Document): @frappe.whitelist() def get_children(doctype=None, parent=None, **kwargs): - from pypika.terms import ValueWrapper - if isinstance(kwargs, str): kwargs = frappe.parse_json(kwargs) diff --git a/erpnext/patches/v14_0/single_to_multi_dunning.py b/erpnext/patches/v14_0/single_to_multi_dunning.py index 3ddba8c76e6..47d13a0e383 100644 --- a/erpnext/patches/v14_0/single_to_multi_dunning.py +++ b/erpnext/patches/v14_0/single_to_multi_dunning.py @@ -1,5 +1,5 @@ import frappe -from pypika.terms import LiteralValue +from pypika.terms import ValueWrapper from erpnext.accounts.general_ledger import make_reverse_gl_entries @@ -40,7 +40,7 @@ def execute(): "payment_amount", # at the time of creating this dunning, the full amount was outstanding "payment_amount as outstanding", - LiteralValue(0).as_("paid_amount"), + ValueWrapper(0).as_("paid_amount"), "discounted_amount", ], ) From 147a5ee953f91cc943f5e28f732b490cdb4af437 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 28 Nov 2025 13:35:47 +0530 Subject: [PATCH 065/328] fix: include accounting dimensions in stock entries created during asset repair. --- erpnext/assets/doctype/asset_repair/asset_repair.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index dc74da28db4..ce942fe8249 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -7,6 +7,9 @@ from frappe.query_builder import DocType from frappe.utils import cint, flt, get_link_to_form, getdate, time_diff_in_hours import erpnext +from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import ( + get_accounting_dimensions, +) from erpnext.accounts.general_ledger import make_gl_entries from erpnext.assets.doctype.asset.asset import get_asset_account from erpnext.assets.doctype.asset_activity.asset_activity import add_asset_activity @@ -231,6 +234,12 @@ class AssetRepair(AccountsController): } ) + accounting_dimensions = { + "cost_center": self.cost_center, + "project": self.project, + **{dimension: self.get(dimension) for dimension in get_accounting_dimensions()}, + } + for stock_item in self.get("stock_items"): self.validate_serial_no(stock_item) @@ -242,8 +251,7 @@ class AssetRepair(AccountsController): "qty": stock_item.consumed_quantity, "basic_rate": stock_item.valuation_rate, "serial_and_batch_bundle": stock_item.serial_and_batch_bundle, - "cost_center": self.cost_center, - "project": self.project, + **accounting_dimensions, }, ) From 92fdec9b928a78a67b51dd58803598f3858346df Mon Sep 17 00:00:00 2001 From: Smit Vora Date: Fri, 28 Nov 2025 13:45:20 +0530 Subject: [PATCH 066/328] test: add test for projected quantity cascading across multiple sales orders --- .../production_plan/test_production_plan.py | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py index 03ff4beb339..1972a105a06 100644 --- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py @@ -151,6 +151,73 @@ class TestProductionPlan(IntegrationTestCase): sr2.cancel() pln.cancel() + def test_projected_qty_cascading_across_multiple_sales_orders(self): + rm_item = make_item( + "_Test RM For Cascading", + {"is_stock_item": 1, "valuation_rate": 100}, + ).name + + fg_item_a = make_item( + "_Test FG A For Cascading", + {"is_stock_item": 1, "valuation_rate": 200}, + ).name + + if not frappe.db.exists("BOM", {"item": fg_item_a, "docstatus": 1}): + make_bom(item=fg_item_a, raw_materials=[rm_item], rm_qty=1) + + # Stock for RM + sr = create_stock_reconciliation(item_code=rm_item, target="_Test Warehouse - _TC", qty=1, rate=100) + + # Sales orders + so1 = make_sales_order(item_code=fg_item_a, qty=1) + so2 = make_sales_order(item_code=fg_item_a, qty=1) + + # Production plan + pln = frappe.get_doc( + { + "doctype": "Production Plan", + "company": "_Test Company", + "posting_date": nowdate(), + "get_items_from": "Sales Order", + "ignore_existing_ordered_qty": 1, + } + ) + pln.append( + "sales_orders", + { + "sales_order": so1.name, + "sales_order_date": so1.transaction_date, + "customer": so1.customer, + "grand_total": so1.grand_total, + }, + ) + pln.append( + "sales_orders", + { + "sales_order": so2.name, + "sales_order_date": so2.transaction_date, + "customer": so2.customer, + "grand_total": so2.grand_total, + }, + ) + + pln.get_items() + pln.insert() + + mr_items = get_items_for_material_requests(pln.as_dict()) + quantities = [d["quantity"] for d in mr_items] + rm_qty = sum(quantities) + + self.assertEqual(len(mr_items), 2) # one for each SO + self.assertEqual(rm_qty, 1, "Cascading failed: total MR qty should be 1 (2 needed - 1 in stock)") + self.assertEqual( + quantities, + [0, 1], + "Cascading failed: first item should consume stock (qty=0), second should need procurement (qty=1)", + ) + + sr.cancel() + def test_production_plan_with_non_stock_item(self): "Test if MR Planning table includes Non Stock RM." pln = create_production_plan(item_code="Test Production Item 1", include_non_stock_items=1) From cdbe8b909b8e81af94cba05407cf6776f70a8a20 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 28 Nov 2025 14:13:24 +0530 Subject: [PATCH 067/328] refactor: show_general ledger for consistency with other doctyoes --- .../doctype/asset_repair/asset_repair.js | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.js b/erpnext/assets/doctype/asset_repair/asset_repair.js index 5dc32d363d4..f09f2fe2e17 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.js +++ b/erpnext/assets/doctype/asset_repair/asset_repair.js @@ -73,14 +73,7 @@ frappe.ui.form.on("Asset Repair", { }, refresh: function (frm) { - if (frm.doc.docstatus) { - frm.add_custom_button(__("View General Ledger"), function () { - frappe.route_options = { - voucher_no: frm.doc.name, - }; - frappe.set_route("query-report", "General Ledger"); - }); - } + frm.events.show_general_ledger(frm); let sbb_field = frm.get_docfield("stock_items", "serial_and_batch_bundle"); if (sbb_field) { @@ -144,6 +137,26 @@ frappe.ui.form.on("Asset Repair", { frm.set_value("repair_cost", 0); } }, + + show_general_ledger: (frm) => { + if (frm.doc.docstatus > 0) { + frm.add_custom_button( + __("Accounting Ledger"), + function () { + frappe.route_options = { + voucher_no: frm.doc.name, + from_date: frm.doc.posting_date, + to_date: moment(frm.doc.modified).format("YYYY-MM-DD"), + company: frm.doc.company, + categorize_by: "", + show_cancelled_entries: frm.doc.docstatus === 2, + }; + frappe.set_route("query-report", "General Ledger"); + }, + __("View") + ); + } + }, }); frappe.ui.form.on("Asset Repair Consumed Item", { From 765f9a9bbfe3f33a7d840e5c35a78c57aa232aa8 Mon Sep 17 00:00:00 2001 From: l0gesh29 Date: Fri, 28 Nov 2025 15:01:50 +0530 Subject: [PATCH 068/328] fix(payment-recon): add validation for outstanding of dr_cr --- .../payment_reconciliation/payment_reconciliation.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py index 4d0888f078e..e03db121473 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py @@ -765,6 +765,14 @@ class PaymentReconciliation(Document): def reconcile_dr_cr_note(dr_cr_notes, company, active_dimensions=None): for inv in dr_cr_notes: + if ( + abs(frappe.db.get_value(inv.voucher_type, inv.voucher_no, "outstanding_amount")) + < inv.allocated_amount + ): + frappe.throw( + _("{0} has been modified after you pulled it. Please pull it again.").format(inv.voucher_type) + ) + voucher_type = "Credit Note" if inv.voucher_type == "Sales Invoice" else "Debit Note" reconcile_dr_or_cr = ( From 71e46b3ef56f20ab0a60938e313a35162092a05f Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 28 Nov 2025 16:15:55 +0530 Subject: [PATCH 069/328] fix: negative batch in subcontracting receipt --- erpnext/controllers/subcontracting_controller.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py index 8eb494947c0..b0ddf29d18f 100644 --- a/erpnext/controllers/subcontracting_controller.py +++ b/erpnext/controllers/subcontracting_controller.py @@ -11,6 +11,7 @@ from frappe.model.mapper import get_mapped_doc from frappe.utils import cint, flt, get_link_to_form from erpnext.controllers.stock_controller import StockController +from erpnext.stock.doctype.batch.batch import get_batch_qty from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import ( combine_datetime, get_auto_batch_nos, @@ -758,7 +759,11 @@ class SubcontractingController(StockController): serial_nos = get_filtered_serial_nos(serial_nos, self, "supplied_items") row.serial_no = "\n".join(serial_nos) - elif item_details.has_batch_no and not row.serial_and_batch_bundle and not row.batch_no: + elif ( + item_details.has_batch_no + and not row.serial_and_batch_bundle + and (not row.batch_no or self.batch_has_not_available(row.batch_no, row.consumed_qty)) + ): batches = get_auto_batch_nos(kwargs) if batches: consumed_qty = row.consumed_qty @@ -783,6 +788,11 @@ class SubcontractingController(StockController): ) consumed_qty -= d.get("qty") + def batch_has_not_available(self, batch_no, qty_required): + batch_qty = get_batch_qty(batch_no, self.supplier_warehouse, consider_negative_batches=True) + + return batch_qty < qty_required + def update_rate_for_supplied_items(self): if self.doctype != "Subcontracting Receipt": return From e6160d1b634871ff37ea27cebc64b4d3575cc171 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 28 Nov 2025 18:30:51 +0530 Subject: [PATCH 070/328] fix: correct logic for repair cost in asset repair --- .../doctype/asset_repair/asset_repair.js | 55 ++-- .../doctype/asset_repair/asset_repair.py | 239 +++++++++++++----- .../doctype/asset_repair/test_asset_repair.py | 33 +++ 3 files changed, 249 insertions(+), 78 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.js b/erpnext/assets/doctype/asset_repair/asset_repair.js index 5dc32d363d4..05a1aaa4e43 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.js +++ b/erpnext/assets/doctype/asset_repair/asset_repair.js @@ -124,25 +124,46 @@ frappe.ui.form.on("Asset Repair", { frm.refresh_field("stock_items"); } }, +}); - purchase_invoice: function (frm) { - if (frm.doc.purchase_invoice) { - frappe.call({ - method: "frappe.client.get_value", - args: { - doctype: "Purchase Invoice", - fieldname: "base_net_total", - filters: { name: frm.doc.purchase_invoice }, - }, - callback: function (r) { - if (r.message) { - frm.set_value("repair_cost", r.message.base_net_total); - } - }, - }); - } else { - frm.set_value("repair_cost", 0); +frappe.ui.form.on("Asset Repair Purchase Invoice", { + purchase_invoice: function (frm, cdt, cdn) { + frappe.model.set_value(cdt, cdn, { + expense_account: "", + repair_cost: 0, + }); + }, + + expense_account: function (frm, cdt, cdn) { + var row = locals[cdt][cdn]; + + if (!row.purchase_invoice || !row.expense_account) { + frappe.model.set_value(cdt, cdn, "repair_cost", 0); + return; } + + frappe.call({ + method: "erpnext.assets.doctype.asset_repair.asset_repair.get_unallocated_repair_cost", + args: { + purchase_invoice: row.purchase_invoice, + expense_account: row.expense_account, + }, + callback: function (r) { + if (r.message !== undefined) { + frappe.model.set_value(cdt, cdn, "repair_cost", r.message); + + if (r.message <= 0) { + frappe.msgprint({ + title: __("No Available Amount"), + message: __( + "There is no available repair cost for this Purchase Invoice and Expense Account combination." + ), + indicator: "orange", + }); + } + } + }, + }); }, }); diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index dc74da28db4..401bff6beea 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -4,6 +4,7 @@ import frappe from frappe import _ from frappe.query_builder import DocType +from frappe.query_builder.functions import Sum from frappe.utils import cint, flt, get_link_to_form, getdate, time_diff_in_hours import erpnext @@ -83,10 +84,8 @@ class AssetRepair(AccountsController): def validate_purchase_invoices(self): for d in self.invoices: self.validate_purchase_invoice_status(d.purchase_invoice) - invoice_items = self.get_invoice_items(d.purchase_invoice) - self.validate_service_purchase_invoice(d.purchase_invoice, invoice_items) - self.validate_expense_account(d, invoice_items) - self.validate_purchase_invoice_repair_cost(d, invoice_items) + self.validate_expense_account(d) + self.validate_purchase_invoice_repair_cost(d) def validate_purchase_invoice_status(self, purchase_invoice): docstatus = frappe.db.get_value("Purchase Invoice", purchase_invoice, "docstatus") @@ -97,44 +96,37 @@ class AssetRepair(AccountsController): ) ) - def get_invoice_items(self, pi): - invoice_items = frappe.get_all( - "Purchase Invoice Item", - filters={"parent": pi}, - fields=["item_code", "expense_account", "base_net_amount"], + def validate_expense_account(self, row): + """Validate that the expense account exists in the purchase invoice for non-stock items.""" + valid_accounts = _get_expense_accounts_for_purchase_invoice(row.purchase_invoice) + if row.expense_account not in valid_accounts: + frappe.throw( + _( + "Row {0}: Expense account {1} is not valid for Purchase Invoice {2}. " + "Only expense accounts from non-stock items are allowed." + ).format( + row.idx, + frappe.bold(row.expense_account), + get_link_to_form("Purchase Invoice", row.purchase_invoice), + ) + ) + + def validate_purchase_invoice_repair_cost(self, row): + """Validate that repair cost doesn't exceed available amount.""" + available_amount = get_unallocated_repair_cost( + row.purchase_invoice, row.expense_account, exclude_asset_repair=self.name ) - return invoice_items - - def validate_service_purchase_invoice(self, purchase_invoice, invoice_items): - service_item_exists = False - for item in invoice_items: - if frappe.db.get_value("Item", item.item_code, "is_stock_item") == 0: - service_item_exists = True - break - - if not service_item_exists: + if flt(row.repair_cost) > available_amount: frappe.throw( - _("Service item not present in Purchase Invoice {0}").format( - get_link_to_form("Purchase Invoice", purchase_invoice) - ) - ) - - def validate_expense_account(self, row, invoice_items): - pi_expense_accounts = set([item.expense_account for item in invoice_items]) - if row.expense_account not in pi_expense_accounts: - frappe.throw( - _("Expense account {0} not present in Purchase Invoice {1}").format( - row.expense_account, get_link_to_form("Purchase Invoice", row.purchase_invoice) - ) - ) - - def validate_purchase_invoice_repair_cost(self, row, invoice_items): - pi_net_total = sum([flt(item.base_net_amount) for item in invoice_items]) - if flt(row.repair_cost) > pi_net_total: - frappe.throw( - _("Repair cost cannot be greater than purchase invoice base net total {0}").format( - pi_net_total + _( + "Row {0}: Repair cost {1} exceeds available amount {2} for Purchase Invoice {3} and Account {4}" + ).format( + row.idx, + frappe.bold(frappe.format_value(row.repair_cost, {"fieldtype": "Currency"})), + frappe.bold(frappe.format_value(available_amount, {"fieldtype": "Currency"})), + get_link_to_form("Purchase Invoice", row.purchase_invoice), + frappe.bold(row.expense_account), ) ) @@ -411,33 +403,158 @@ def get_downtime(failure_date, completion_date): @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def get_purchase_invoice(doctype, txt, searchfield, start, page_len, filters): - PurchaseInvoice = DocType("Purchase Invoice") - PurchaseInvoiceItem = DocType("Purchase Invoice Item") - Item = DocType("Item") + """ + Get Purchase Invoices that have expense accounts for non-stock items. + Only returns invoices with at least one non-stock, non-fixed-asset item with an expense account. + """ + pi = DocType("Purchase Invoice") + pi_item = DocType("Purchase Invoice Item") + item = DocType("Item") - return ( - frappe.qb.from_(PurchaseInvoice) - .join(PurchaseInvoiceItem) - .on(PurchaseInvoiceItem.parent == PurchaseInvoice.name) - .join(Item) - .on(Item.name == PurchaseInvoiceItem.item_code) - .select(PurchaseInvoice.name) + query = ( + frappe.qb.from_(pi) + .join(pi_item) + .on(pi_item.parent == pi.name) + .left_join(item) + .on(item.name == pi_item.item_code) + .select(pi.name) + .distinct() .where( - (Item.is_stock_item == 0) - & (Item.is_fixed_asset == 0) - & (PurchaseInvoice.company == filters.get("company")) - & (PurchaseInvoice.docstatus == 1) + (pi.company == filters.get("company")) + & (pi.docstatus == 1) + & (pi_item.is_fixed_asset == 0) + & (pi_item.expense_account.isnotnull()) + & (pi_item.expense_account != "") + & ((pi_item.item_code.isnull()) | (item.is_stock_item == 0)) ) - ).run(as_list=1) + ) + + if txt: + query = query.where(pi.name.like(f"%{txt}%")) + + return query.run(as_list=1) @frappe.whitelist() +@frappe.validate_and_sanitize_search_inputs def get_expense_accounts(doctype, txt, searchfield, start, page_len, filters): - PurchaseInvoiceItem = DocType("Purchase Invoice Item") - return ( - frappe.qb.from_(PurchaseInvoiceItem) - .select(PurchaseInvoiceItem.expense_account) - .distinct() - .where(PurchaseInvoiceItem.parent == filters.get("purchase_invoice")) - ).run(as_list=1) + """ + Get expense accounts for non-stock (service) items from the purchase invoice. + Used as a query function for link fields. + """ + purchase_invoice = filters.get("purchase_invoice") + if not purchase_invoice: + return [] + + expense_accounts = _get_expense_accounts_for_purchase_invoice(purchase_invoice) + + # Filter by search text if provided + if txt: + txt = txt.lower() + expense_accounts = [acc for acc in expense_accounts if txt in acc.lower()] + + return [[account] for account in expense_accounts] + + +def _get_expense_accounts_for_purchase_invoice(purchase_invoice: str) -> list[str]: + """ + Internal function to get expense accounts for non-stock items from the purchase invoice. + + Args: + purchase_invoice: The Purchase Invoice name + + Returns: + List of expense account names + """ + pi_items = frappe.db.get_all( + "Purchase Invoice Item", + filters={"parent": purchase_invoice}, + fields=["item_code", "expense_account", "is_fixed_asset"], + ) + + if not pi_items: + return [] + + # Get list of stock item codes from the invoice + item_codes = {item.item_code for item in pi_items if item.item_code} + stock_items = set() + if item_codes: + stock_items = set( + frappe.db.get_all( + "Item", filters={"name": ["in", list(item_codes)], "is_stock_item": 1}, pluck="name" + ) + ) + + expense_accounts = set() + + for item in pi_items: + # Skip stock items - they use warehouse accounts + if item.item_code and item.item_code in stock_items: + continue + + # Skip fixed assets - they use asset accounts + if item.is_fixed_asset: + continue + + # Use expense account from Purchase Invoice Item + if item.expense_account: + expense_accounts.add(item.expense_account) + + return list(expense_accounts) + + +@frappe.whitelist() +def get_unallocated_repair_cost( + purchase_invoice: str, expense_account: str, exclude_asset_repair: str | None = None +) -> float: + """ + Calculate the unused repair cost for a purchase invoice and expense account. + """ + used_amount = get_allocated_repair_cost(purchase_invoice, expense_account, exclude_asset_repair) + total_amount = get_total_expense_amount(purchase_invoice, expense_account) + + return flt(total_amount - used_amount) + + +def get_allocated_repair_cost( + purchase_invoice: str, expense_account: str, exclude_asset_repair: str | None = None +) -> float: + """Get the total repair cost already allocated from submitted Asset Repairs.""" + asset_repair_pi = DocType("Asset Repair Purchase Invoice") + + query = ( + frappe.qb.from_(asset_repair_pi) + .select(Sum(asset_repair_pi.repair_cost).as_("total")) + .where( + (asset_repair_pi.purchase_invoice == purchase_invoice) + & (asset_repair_pi.expense_account == expense_account) + & (asset_repair_pi.docstatus == 1) + ) + ) + + if exclude_asset_repair: + query = query.where(asset_repair_pi.parent != exclude_asset_repair) + + result = query.run(as_dict=True) + + return flt(result[0].total) if result else 0.0 + + +def get_total_expense_amount(purchase_invoice: str, expense_account: str) -> float: + """Get the total expense amount from GL entries for a purchase invoice and account.""" + gl_entry = DocType("GL Entry") + + result = ( + frappe.qb.from_(gl_entry) + .select((Sum(gl_entry.debit) - Sum(gl_entry.credit)).as_("total")) + .where( + (gl_entry.voucher_type == "Purchase Invoice") + & (gl_entry.voucher_no == purchase_invoice) + & (gl_entry.account == expense_account) + & (gl_entry.is_cancelled == 0) + ) + ).run(as_dict=True) + + return flt(result[0].total) if result else 0.0 diff --git a/erpnext/assets/doctype/asset_repair/test_asset_repair.py b/erpnext/assets/doctype/asset_repair/test_asset_repair.py index 0e4ea84df86..b66dafc2a0f 100644 --- a/erpnext/assets/doctype/asset_repair/test_asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.py @@ -173,6 +173,39 @@ class TestAssetRepair(IntegrationTestCase): ) self.assertTrue(asset_repair.invoices) + def test_repair_cost_exceeds_available_amount(self): + """Test that repair cost cannot exceed available amount from Purchase Invoice.""" + asset_repair1 = create_asset_repair( + capitalize_repair_cost=1, + item="_Test Non Stock Item", + submit=1, + ) + + pi_name = asset_repair1.invoices[0].purchase_invoice + expense_account = asset_repair1.invoices[0].expense_account + + asset_repair2 = frappe.new_doc("Asset Repair") + asset_repair2.update( + { + "asset": asset_repair1.asset, + "asset_name": asset_repair1.asset_name, + "failure_date": nowdate(), + "description": "Second Repair", + "company": asset_repair1.company, + "capitalize_repair_cost": 1, + } + ) + asset_repair2.append( + "invoices", + { + "purchase_invoice": pi_name, + "expense_account": expense_account, + "repair_cost": 10, # PI already fully used, so this should fail + }, + ) + + self.assertRaises(frappe.ValidationError, asset_repair2.save) + def test_gl_entries_with_perpetual_inventory(self): set_depreciation_settings_in_company(company="_Test Company with perpetual inventory") From b9aaae63435b289eaf54438c2a910c9858be2b5b Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 28 Nov 2025 18:36:13 +0530 Subject: [PATCH 071/328] fix: remove unnecessary filtering by search text in get_expense_accounts --- erpnext/assets/doctype/asset_repair/asset_repair.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 401bff6beea..066083a3b0f 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -450,11 +450,6 @@ def get_expense_accounts(doctype, txt, searchfield, start, page_len, filters): expense_accounts = _get_expense_accounts_for_purchase_invoice(purchase_invoice) - # Filter by search text if provided - if txt: - txt = txt.lower() - expense_accounts = [acc for acc in expense_accounts if txt in acc.lower()] - return [[account] for account in expense_accounts] From 00ffdee92875948ab76c0ccbfcc372c7b55a48b5 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 28 Nov 2025 18:45:07 +0530 Subject: [PATCH 072/328] fix: update repair cost logic to set value only for positive amounts --- .../doctype/asset_repair/asset_repair.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.js b/erpnext/assets/doctype/asset_repair/asset_repair.js index 05a1aaa4e43..fbbf16120a7 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.js +++ b/erpnext/assets/doctype/asset_repair/asset_repair.js @@ -135,7 +135,7 @@ frappe.ui.form.on("Asset Repair Purchase Invoice", { }, expense_account: function (frm, cdt, cdn) { - var row = locals[cdt][cdn]; + let row = locals[cdt][cdn]; if (!row.purchase_invoice || !row.expense_account) { frappe.model.set_value(cdt, cdn, "repair_cost", 0); @@ -150,13 +150,19 @@ frappe.ui.form.on("Asset Repair Purchase Invoice", { }, callback: function (r) { if (r.message !== undefined) { - frappe.model.set_value(cdt, cdn, "repair_cost", r.message); - - if (r.message <= 0) { + if (r.message > 0) { + frappe.model.set_value(cdt, cdn, "repair_cost", r.message); + } else { + frappe.model.set_value(cdt, cdn, "repair_cost", 0); + let pi_link = frappe.utils.get_form_link( + "Purchase Invoice", + row.purchase_invoice, + true + ); frappe.msgprint({ - title: __("No Available Amount"), message: __( - "There is no available repair cost for this Purchase Invoice and Expense Account combination." + "Row {0}: The entire expense amount for account {1} in {2} has already been allocated.", + [row.idx, row.expense_account.bold(), pi_link] ), indicator: "orange", }); From c2810ea799eeb56333eb64afe48ff50ca80606d3 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 28 Nov 2025 18:54:37 +0530 Subject: [PATCH 073/328] perf: replace get_doc with get_lazy_doc for asset retrieval and optimize stock entry fetching --- erpnext/assets/doctype/asset_repair/asset_repair.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 066083a3b0f..79e417200fd 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -57,7 +57,7 @@ class AssetRepair(AccountsController): # end: auto-generated types def validate(self): - self.asset_doc = frappe.get_doc("Asset", self.asset) + self.asset_doc = frappe.get_lazy_doc("Asset", self.asset) self.validate_asset() self.validate_dates() self.validate_purchase_invoices() @@ -188,7 +188,7 @@ class AssetRepair(AccountsController): self.cancel_sabb() def after_delete(self): - frappe.get_doc("Asset", self.asset).set_status() + frappe.get_lazy_doc("Asset", self.asset).set_status() def check_repair_status(self): if self.repair_status == "Pending" and self.docstatus == 1: @@ -324,7 +324,10 @@ class AssetRepair(AccountsController): return # creating GL Entries for each row in Stock Items based on the Stock Entry created for it - stock_entry = frappe.get_doc("Stock Entry", {"asset_repair": self.name}) + stock_entry_name = frappe.db.get_value("Stock Entry", {"asset_repair": self.name}, "name") + stock_entry_items = frappe.get_all( + "Stock Entry Detail", filters={"parent": stock_entry_name}, fields=["expense_account", "amount"] + ) default_expense_account = None if not erpnext.is_perpetual_inventory_enabled(self.company): @@ -334,7 +337,7 @@ class AssetRepair(AccountsController): if not default_expense_account: frappe.throw(_("Please set default Expense Account in Company {0}").format(self.company)) - for item in stock_entry.items: + for item in stock_entry_items: if flt(item.amount) > 0: gl_entries.append( self.get_gl_dict( @@ -365,7 +368,7 @@ class AssetRepair(AccountsController): "cost_center": self.cost_center, "posting_date": self.completion_date, "against_voucher_type": "Stock Entry", - "against_voucher": stock_entry.name, + "against_voucher": stock_entry_name, "company": self.company, }, item=self, From 0b84d116005f7ca81b0e04c405cc43c1bfe9c3e0 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 28 Nov 2025 19:09:54 +0530 Subject: [PATCH 074/328] perf: enhance validation for purchase invoices to check submission status for all invoices --- .../doctype/asset_repair/asset_repair.py | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 79e417200fd..ac172b9c42f 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -82,19 +82,37 @@ class AssetRepair(AccountsController): ) def validate_purchase_invoices(self): + self.validate_purchase_invoice_status() + for d in self.invoices: - self.validate_purchase_invoice_status(d.purchase_invoice) self.validate_expense_account(d) self.validate_purchase_invoice_repair_cost(d) - def validate_purchase_invoice_status(self, purchase_invoice): - docstatus = frappe.db.get_value("Purchase Invoice", purchase_invoice, "docstatus") - if docstatus == 0: - frappe.throw( - _("{0} is still in Draft. Please submit it before saving the Asset Repair.").format( - get_link_to_form("Purchase Invoice", purchase_invoice) - ) + def validate_purchase_invoice_status(self): + pi_names = [row.purchase_invoice for row in self.invoices] + docstatus = frappe._dict( + frappe.db.get_all( + "Purchase Invoice", + filters={"name": ["in", pi_names]}, + fields=["name", "docstatus"], + as_list=True, ) + ) + + invalid_invoice = [] + for row in self.invoices: + if docstatus.get(row.purchase_invoice) != 1: + invalid_invoice.append((row.idx, row.purchase_invoice)) + + if invalid_invoice: + invoice_links = "".join( + [ + f"
          • {_('Row #{0}:').format(idx)} {get_link_to_form('Purchase Invoice', pi)}
            • " + for idx, pi in invalid_invoice + ] + ) + msg = _("The following Purchase Invoices are not submitted:") + f"
              {invoice_links}
            " + frappe.throw(msg) def validate_expense_account(self, row): """Validate that the expense account exists in the purchase invoice for non-stock items.""" From ff9b39202447d18f84dc4173c4982e587b1cd927 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Fri, 28 Nov 2025 19:13:31 +0530 Subject: [PATCH 075/328] fix: add duplicate purchase invoice validation in asset repair --- .../doctype/asset_repair/asset_repair.py | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index ac172b9c42f..7686d72959b 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -82,12 +82,34 @@ class AssetRepair(AccountsController): ) def validate_purchase_invoices(self): + self.validate_duplicate_purchase_invoices() self.validate_purchase_invoice_status() for d in self.invoices: self.validate_expense_account(d) self.validate_purchase_invoice_repair_cost(d) + def validate_duplicate_purchase_invoices(self): + # account wise duplicate check + purchase_invoices = set() + duplicates = [] + for row in self.invoices: + key = (row.purchase_invoice, row.expense_account) + if key in purchase_invoices: + duplicates.append((row.idx, row.purchase_invoice, row.expense_account)) + else: + purchase_invoices.add(key) + + if duplicates: + duplicate_links = "".join( + [ + f"
          • {_('Row #{0}:').format(idx)} {get_link_to_form('Purchase Invoice', pi)} - {frappe.bold(account)}
            • " + for idx, pi, account in duplicates + ] + ) + msg = _("The following rows are duplicates:") + f"
              {duplicate_links}
            " + frappe.throw(msg) + def validate_purchase_invoice_status(self): pi_names = [row.purchase_invoice for row in self.invoices] docstatus = frappe._dict( @@ -120,7 +142,7 @@ class AssetRepair(AccountsController): if row.expense_account not in valid_accounts: frappe.throw( _( - "Row {0}: Expense account {1} is not valid for Purchase Invoice {2}. " + "Row #{0}: Expense account {1} is not valid for Purchase Invoice {2}. " "Only expense accounts from non-stock items are allowed." ).format( row.idx, @@ -138,7 +160,7 @@ class AssetRepair(AccountsController): if flt(row.repair_cost) > available_amount: frappe.throw( _( - "Row {0}: Repair cost {1} exceeds available amount {2} for Purchase Invoice {3} and Account {4}" + "Row #{0}: Repair cost {1} exceeds available amount {2} for Purchase Invoice {3} and Account {4}" ).format( row.idx, frappe.bold(frappe.format_value(row.repair_cost, {"fieldtype": "Currency"})), From 8a7e5d062613576f4ebbace3fa4dd67056f4d277 Mon Sep 17 00:00:00 2001 From: Jatin3128 Date: Fri, 28 Nov 2025 21:39:40 +0530 Subject: [PATCH 076/328] fix(accounts-payable-summary): add Show GL Balance check similar to Accounts Receivable Summary --- .../accounts_payable_summary.js | 5 +++++ .../accounts_receivable_summary.py | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js index 18a85af95be..6a043f5e185 100644 --- a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js +++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js @@ -102,6 +102,11 @@ frappe.query_reports["Accounts Payable Summary"] = { label: __("Revaluation Journals"), fieldtype: "Check", }, + { + fieldname: "show_gl_balance", + label: __("Show GL Balance"), + fieldtype: "Check", + }, ], onload: function (report) { diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py index 600a782c71b..a23a7d5a10b 100644 --- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py @@ -53,7 +53,7 @@ class AccountsReceivableSummary(ReceivablePayableReport): ) if self.filters.show_gl_balance: - gl_balance_map = get_gl_balance(self.filters.report_date, self.filters.company) + gl_balance_map = get_gl_balance(self.filters.report_date, self.filters.company, self.account_type) for party, party_dict in self.party_total.items(): if flt(party_dict.outstanding, self.currency_precision) == 0: @@ -206,11 +206,15 @@ class AccountsReceivableSummary(ReceivablePayableReport): ) -def get_gl_balance(report_date, company): +def get_gl_balance(report_date, company, account_type): + if account_type == "Payable": + balance_calc_fields = ["party", {"SUM": [{"SUB": ["credit", "debit"]}], "as": "balance"}] + else: + balance_calc_fields = ["party", {"SUM": [{"SUB": ["debit", "credit"]}], "as": "balance"}] return frappe._dict( frappe.db.get_all( "GL Entry", - fields=["party", {"SUM": [{"SUB": ["debit", "credit"]}], "as": "balance"}], + fields=balance_calc_fields, filters={"posting_date": ("<=", report_date), "is_cancelled": 0, "company": company}, group_by="party", as_list=1, From 945390502e26745a86dc3d80475b446cf59b60ce Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Sun, 30 Nov 2025 01:25:11 +0530 Subject: [PATCH 077/328] feat: standard print format for Purchase Order and Delivery Note --- .../purchase_order_standard/__init__.py | 0 .../purchase_order_standard.json | 33 +++++++++++++++++++ .../delivery_note_standard/__init__.py | 0 .../delivery_note_standard.json | 33 +++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 erpnext/buying/print_format/purchase_order_standard/__init__.py create mode 100644 erpnext/buying/print_format/purchase_order_standard/purchase_order_standard.json create mode 100644 erpnext/stock/print_format/delivery_note_standard/__init__.py create mode 100644 erpnext/stock/print_format/delivery_note_standard/delivery_note_standard.json diff --git a/erpnext/buying/print_format/purchase_order_standard/__init__.py b/erpnext/buying/print_format/purchase_order_standard/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/buying/print_format/purchase_order_standard/purchase_order_standard.json b/erpnext/buying/print_format/purchase_order_standard/purchase_order_standard.json new file mode 100644 index 00000000000..695c600409c --- /dev/null +++ b/erpnext/buying/print_format/purchase_order_standard/purchase_order_standard.json @@ -0,0 +1,33 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2025-11-29 00:57:28.988603", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Purchase Order", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 14, + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
            {{ letter_head }}
            \n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Payment Due Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.due_date) }}\n\t\t\t\t
            {{ _(\"Invoice Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Invoice Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
            {{ _(\"Bill From\") }}:
            \n\t\t\t\t\t{% if doc.company_address %}\n {% set company_address = frappe.db.get_value(\"Address\", doc.company_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.company }}
            \n {{ company_address.get(\"address_line1\") or \"\" }}
            \n {% if company_address.get(\"address_line2\") %}{{ company_address.get(\"address_line2\") }}
            {% endif %}\n {{ company_address.get(\"city\") or \"\" }}, {{ company_address.get(\"state\") or \"\" }} {{ company_address.get(\"pincode\") or \"\" }}, {{ company_address.get(\"country\") or \"\" }}
            \n {% endif %}\n\t\t\t\t            		{{ _(\"Bill To\") }}:
            \n\t\t\t\t {% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.customer_name }}
            \n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
            \n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
            {% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
            \n\t\t\t\t\t{% endif %}\n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
            \n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t

            {{ _(\"Total in words\") }}

            \n\t\t\t\t
            {{ doc.in_words }}
            \n\t\t\t            		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
            {{ _(\"Sub Total:\") }}            		{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):            		{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
            \n\t\t\t
            \n\n\t\t\n\t\t
            \n\t\t\t{% if doc.terms %}\n\t\t\t
            \n\t\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t\t{{ doc.terms}}\n\t\t\t
            \n\t\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2025-11-29 00:57:32.409130", + "modified_by": "Administrator", + "module": "Buying", + "name": "Purchase Order Standard", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "wkhtmltopdf", + "print_format_builder": 0, + "print_format_builder_beta": 0, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} diff --git a/erpnext/stock/print_format/delivery_note_standard/__init__.py b/erpnext/stock/print_format/delivery_note_standard/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/stock/print_format/delivery_note_standard/delivery_note_standard.json b/erpnext/stock/print_format/delivery_note_standard/delivery_note_standard.json new file mode 100644 index 00000000000..656a715e855 --- /dev/null +++ b/erpnext/stock/print_format/delivery_note_standard/delivery_note_standard.json @@ -0,0 +1,33 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2025-11-29 01:01:37.362065", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Delivery Note", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 14, + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
            {{ letter_head }}
            \n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Payment Due Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.due_date) }}\n\t\t\t\t
            {{ _(\"Invoice Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Invoice Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
            {{ _(\"Bill From\") }}:
            \n\t\t\t\t\t{% if doc.company_address %}\n {% set company_address = frappe.db.get_value(\"Address\", doc.company_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.company }}
            \n {{ company_address.get(\"address_line1\") or \"\" }}
            \n {% if company_address.get(\"address_line2\") %}{{ company_address.get(\"address_line2\") }}
            {% endif %}\n {{ company_address.get(\"city\") or \"\" }}, {{ company_address.get(\"state\") or \"\" }} {{ company_address.get(\"pincode\") or \"\" }}, {{ company_address.get(\"country\") or \"\" }}
            \n {% endif %}\n\t\t\t\t            		{{ _(\"Bill To\") }}:
            \n\t\t\t\t {% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.customer_name }}
            \n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
            \n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
            {% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
            \n\t\t\t\t\t{% endif %}\n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
            \n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t

            {{ _(\"Total in words\") }}

            \n\t\t\t\t
            {{ doc.in_words }}
            \n\t\t\t            		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
            {{ _(\"Sub Total:\") }}            		{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):            		{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
            \n\t\t\t
            \n\n\t\t\n\t\t
            \n\t\t\t{% if doc.terms %}\n\t\t\t
            \n\t\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t\t{{ doc.terms}}\n\t\t\t
            \n\t\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2025-11-29 01:02:00.693127", + "modified_by": "Administrator", + "module": "Stock", + "name": "Delivery Note Standard", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "wkhtmltopdf", + "print_format_builder": 0, + "print_format_builder_beta": 0, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} From 3a4c1a9f9a9f357405e939c1b8d971507f9b08e9 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Wed, 26 Nov 2025 11:09:26 +0530 Subject: [PATCH 078/328] refactor: Replace use publish_realtime with msgprint for cleaner flow --- .../doctype/sales_invoice/sales_invoice.py | 106 ------- erpnext/controllers/accounts_controller.py | 107 +++++++ erpnext/public/js/print.js | 280 ++++++++---------- 3 files changed, 238 insertions(+), 255 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index fdea1b2d29e..977177cbee4 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -282,59 +282,6 @@ class SalesInvoice(SellingController): self.indicator_color = "green" self.indicator_title = _("Paid") - def before_print(self, settings=None): - from frappe.contacts.doctype.address.address import get_address_display_list - - super().before_print(settings) - - company_details = frappe.get_value( - "Company", self.company, ["company_logo", "website", "phone_no", "email"], as_dict=True - ) - - required_fields = [ - company_details.get("company_logo"), - company_details.get("phone_no"), - company_details.get("email"), - ] - - if not all(required_fields) and not frappe.has_permission("Company", "write", throw=False): - frappe.msgprint( - _( - "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager." - ) - ) - return - - if not self.company_address and not frappe.has_permission("Sales Invoice", "write", throw=False): - frappe.msgprint( - _( - "Company Address is missing. You don't have permission to update it. Please contact your System Manager." - ) - ) - return - - address_display_list = get_address_display_list("Company", self.company) - address_line = address_display_list[0].get("address_line1") if address_display_list else "" - - required_fields.append(self.company_address) - required_fields.append(address_line) - - if not all(required_fields): - frappe.publish_realtime( - "sales_invoice_before_print", - { - "company_logo": company_details.get("company_logo"), - "website": company_details.get("website"), - "phone_no": company_details.get("phone_no"), - "email": company_details.get("email"), - "address_line": address_line, - "company": self.company, - "company_address": self.company_address, - "name": self.name, - }, - user=frappe.session.user, - ) - def validate(self): self.validate_auto_set_posting_time() super().validate() @@ -2948,59 +2895,6 @@ def get_loyalty_programs(customer): return lp_details -@frappe.whitelist() -def save_company_master_details(name, company, details): - from frappe.utils import validate_email_address - - if isinstance(details, str): - details = frappe.parse_json(details) - - if details.get("email"): - validate_email_address(details.get("email"), throw=True) - - company_fields = ["company_logo", "website", "phone_no", "email"] - company_fields_to_update = {field: details.get(field) for field in company_fields if details.get(field)} - - if company_fields_to_update: - frappe.db.set_value("Company", company, company_fields_to_update) - - company_address = details.get("company_address") - if details.get("address_line1"): - address_doc = frappe.get_doc( - { - "doctype": "Address", - "address_title": details.get("address_title"), - "address_type": details.get("address_type"), - "address_line1": details.get("address_line1"), - "address_line2": details.get("address_line2"), - "city": details.get("city"), - "state": details.get("state"), - "pincode": details.get("pincode"), - "country": details.get("country"), - "is_your_company_address": 1, - "links": [{"link_doctype": "Company", "link_name": company}], - } - ) - address_doc.insert() - company_address = address_doc.name - - if company_address: - company_address_display = frappe.db.get_value("Sales Invoice", name, "company_address_display") - if not company_address_display or details.get("address_line1"): - from frappe.query_builder import DocType - - SalesInvoice = DocType("Sales Invoice") - - ( - frappe.qb.update(SalesInvoice) - .set(SalesInvoice.company_address, company_address) - .set(SalesInvoice.company_address_display, get_address_display(company_address)) - .where(SalesInvoice.name == name) - ).run() - - return True - - @frappe.whitelist() def create_invoice_discounting(source_name, target_doc=None): invoice = frappe.get_doc("Sales Invoice", source_name) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 3902b2f7202..48e2adef651 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -7,6 +7,7 @@ from collections import defaultdict import frappe from frappe import _, bold, qb, throw +from frappe.contacts.doctype.address.address import get_address_display from frappe.model.workflow import get_workflow_name, is_transition_condition_satisfied from frappe.query_builder import Criterion, DocType from frappe.query_builder.custom import ConstantColumn @@ -4167,3 +4168,109 @@ def update_gl_dict_with_regional_fields(doc, gl_dict): def update_gl_dict_with_app_based_fields(doc, gl_dict): for method in frappe.get_hooks("update_gl_dict_with_app_based_fields", default=[]): frappe.get_attr(method)(doc, gl_dict) + + +@frappe.whitelist() +def get_missing_company_details(doctype, docname): + from frappe.contacts.doctype.address.address import get_address_display_list + + company = frappe.db.get_value(doctype, docname, "company") + company_address = frappe.db.get_value(doctype, docname, "company_address") + + company_details = frappe.get_value( + "Company", company, ["company_logo", "website", "phone_no", "email"], as_dict=True + ) + + required_fields = [ + company_details.get("company_logo"), + company_details.get("phone_no"), + company_details.get("email"), + ] + + if not all(required_fields) and not frappe.has_permission("Company", "write", throw=False): + frappe.msgprint( + _( + "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager." + ) + ) + return + + if not company_address and not frappe.has_permission("Sales Invoice", "write", throw=False): + frappe.msgprint( + _( + "Company Address is missing. You don't have permission to update it. Please contact your System Manager." + ) + ) + return + + address_display_list = get_address_display_list("Company", company) + address_line = address_display_list[0].get("address_line1") if address_display_list else "" + + required_fields.append(company_address) + required_fields.append(address_line) + + if all(required_fields): + return False + return { + "company_logo": company_details.get("company_logo"), + "website": company_details.get("website"), + "phone_no": company_details.get("phone_no"), + "email": company_details.get("email"), + "address_line": address_line, + "company": company, + "company_address": company_address, + "name": docname, + } + + +@frappe.whitelist() +def update_company_master_and_address(name, company, details): + from frappe.utils import validate_email_address + + if isinstance(details, str): + details = frappe.parse_json(details) + + if details.get("email"): + validate_email_address(details.get("email"), throw=True) + + company_fields = ["company_logo", "website", "phone_no", "email"] + company_fields_to_update = {field: details.get(field) for field in company_fields if details.get(field)} + + if company_fields_to_update: + frappe.db.set_value("Company", company, company_fields_to_update) + + company_address = details.get("company_address") + if details.get("address_line1"): + address_doc = frappe.get_doc( + { + "doctype": "Address", + "address_title": details.get("address_title"), + "address_type": details.get("address_type"), + "address_line1": details.get("address_line1"), + "address_line2": details.get("address_line2"), + "city": details.get("city"), + "state": details.get("state"), + "pincode": details.get("pincode"), + "country": details.get("country"), + "is_your_company_address": 1, + "links": [{"link_doctype": "Company", "link_name": company}], + } + ) + address_doc.insert() + company_address = address_doc.name + + if company_address: + company_address_display = frappe.db.get_value("Sales Invoice", name, "company_address_display") + if not company_address_display or details.get("address_line1"): + from frappe.query_builder import DocType + + SalesInvoice = DocType("Sales Invoice") + + ( + frappe.qb.update(SalesInvoice) + .set(SalesInvoice.company_address, company_address) + .set(SalesInvoice.company_address_display, get_address_display(company_address)) + .where(SalesInvoice.name == name) + ).run() + + return True diff --git a/erpnext/public/js/print.js b/erpnext/public/js/print.js index 53f03f83bda..55c90ad773f 100644 --- a/erpnext/public/js/print.js +++ b/erpnext/public/js/print.js @@ -1,155 +1,137 @@ -let beforePrintHandled = false; +const doctype_list = ["Sales Invoice"]; +const allowed_print_formats = ["Sales Invoice Standard", "Sales Invoice with Item Image"]; +const allowed_letterheads = ["Company Letterhead", "Company Letterhead - Grey"]; -frappe.realtime.on("sales_invoice_before_print", (data) => { - let print_format = $('input[data-fieldname="print_format"]').val(); - let letterhead = $('input[data-fieldname="letterhead"]').val(); - - let allowed_print_formats = ["Sales Invoice Standard", "Sales Invoice with Item Image"]; - let allowed_letterheads = ["Company Letterhead", "Company Letterhead - Grey"]; - - if (!allowed_print_formats.includes(print_format) && !allowed_letterheads.includes(letterhead)) { - return; - } +handle_route_event(); +function handle_route_event() { const route = frappe.get_route(); + const current_doctype = route[1]; + const current_docname = route[2]; - if (!beforePrintHandled && route[0] === "print" && route[1] === "Sales Invoice") { - beforePrintHandled = true; + if (!doctype_list.includes(current_doctype)) return; - let companyDetailsDialog = new frappe.ui.Dialog({ - title: "Enter Company Details", - fields: [ - { - label: "Company Logo", - fieldname: "company_logo", - fieldtype: "Attach Image", - reqd: data.company_logo ? 0 : 1, - hidden: data.company_logo ? 1 : 0, + setTimeout(() => { + if (should_fetch_company_details()) { + fetch_company_details(current_doctype, current_docname); + } + }, 500); +} + +function should_fetch_company_details() { + const print_format = $('input[data-fieldname="print_format"]').val(); + const letterhead = $('input[data-fieldname="letterhead"]').val(); + + return allowed_print_formats.includes(print_format) || allowed_letterheads.includes(letterhead); +} + +function fetch_company_details(doctype, docname) { + frappe.call({ + method: "erpnext.controllers.accounts_controller.get_missing_company_details", + args: { doctype, docname }, + callback: function (r) { + if (r && r.message) { + open_company_details_dialog(r.message); + } + }, + }); +} + +function open_company_details_dialog(data) { + const dialog = new frappe.ui.Dialog({ + title: "Enter Company Details", + fields: build_dialog_fields(data), + primary_action_label: "Save", + primary_action(values) { + save_company_details(dialog, data, values); + }, + }); + + dialog.show(); +} + +function build_dialog_fields(data) { + return [ + make_field("Company Logo", "company_logo", "Attach Image", data.company_logo), + make_field("Website", "website", "Data", data.website), + make_field("Phone No", "phone_no", "Data", data.phone_no), + { + label: "Email", + fieldname: "email", + fieldtype: "Data", + options: "Email", + reqd: data.email ? 0 : 1, + hidden: data.email ? 1 : 0, + }, + { fieldtype: "Section Break" }, + + make_field("Address Title", "address_title", "Data", data.address_line), + { + label: "Address Type", + fieldname: "address_type", + fieldtype: "Select", + options: ["Billing", "Shipping"], + default: "Billing", + reqd: data.address_line ? 0 : 1, + hidden: data.address_line ? 1 : 0, + }, + make_field("Address Line 1", "address_line1", "Data", data.address_line), + make_field("Address Line 2", "address_line2", "Data", data.address_line, false), + make_field("City", "city", "Data", data.address_line), + make_field("State", "state", "Data", data.address_line, false), + { + label: "Country", + fieldname: "country", + fieldtype: "Link", + options: "Country", + reqd: data.address_line ? 0 : 1, + hidden: data.address_line ? 1 : 0, + }, + make_field("Postal Code", "pincode", "Data", data.address_line, false), + + { + label: "Select Company Address", + fieldname: "company_address", + fieldtype: "Link", + options: "Address", + get_query: () => ({ + query: "frappe.contacts.doctype.address.address.address_query", + filters: { + link_doctype: "Company", + link_name: data.company, }, - { - label: "Website", - fieldname: "website", - fieldtype: "Data", - hidden: data.website ? 1 : 0, - }, - { - label: "Phone No", - fieldname: "phone_no", - fieldtype: "Data", - reqd: data.phone_no ? 0 : 1, - hidden: data.phone_no ? 1 : 0, - }, - { - label: "Email", - fieldname: "email", - fieldtype: "Data", - options: "Email", - reqd: data.email ? 0 : 1, - hidden: data.email ? 1 : 0, - }, - { - fieldname: "section_break_1", - fieldtype: "Section Break", - }, - { - label: "Address Title", - fieldname: "address_title", - fieldtype: "Data", - reqd: data.address_line ? 0 : 1, - hidden: data.address_line ? 1 : 0, - }, - { - label: "Address Type", - fieldname: "address_type", - fieldtype: "Select", - options: ["Billing", "Shipping"], - default: "Billing", - reqd: data.address_line ? 0 : 1, - hidden: data.address_line ? 1 : 0, - }, - { - label: "Address Line 1", - fieldname: "address_line1", - fieldtype: "Data", - reqd: data.address_line ? 0 : 1, - hidden: data.address_line ? 1 : 0, - }, - { - label: "Address Line 2", - fieldname: "address_line2", - fieldtype: "Data", - hidden: data.address_line ? 1 : 0, - }, - { - label: "City", - fieldname: "city", - fieldtype: "Data", - reqd: data.address_line ? 0 : 1, - hidden: data.address_line ? 1 : 0, - }, - { - label: "State", - fieldname: "state", - fieldtype: "Data", - hidden: data.address_line ? 1 : 0, - }, - { - label: "Country", - fieldname: "country", - fieldtype: "Link", - options: "Country", - reqd: data.address_line ? 0 : 1, - hidden: data.address_line ? 1 : 0, - }, - { - label: "Postal Code", - fieldname: "pincode", - fieldtype: "Data", - hidden: data.address_line ? 1 : 0, - }, - { - label: "Select Company Address", - fieldname: "company_address", - fieldtype: "Link", - options: "Address", - get_query: function () { - return { - query: "frappe.contacts.doctype.address.address.address_query", - filters: { - link_doctype: "Company", - link_name: data.company, - }, - }; - }, - reqd: data.address_line && !data.company_address ? 1 : 0, - hidden: data.address_line && !data.company_address ? 0 : 1, - }, - ], - primary_action_label: "Save", - primary_action(values) { - frappe.call({ - method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.save_company_master_details", - args: { - name: data.name, - company: data.company, - details: values, - }, - callback: function () { - companyDetailsDialog.hide(); - frappe.msgprint(__("Updating details.")); - setTimeout(() => { - window.location.reload(); - }, 1000); - }, - }); - }, - }); - companyDetailsDialog.show(); - } -}); -frappe.router.on("change", () => { - const route = frappe.get_route(); - if (route[0] !== "print" || route[1] !== "Sales Invoice") { - beforePrintHandled = false; - } -}); + }), + reqd: data.address_line && !data.company_address ? 1 : 0, + hidden: data.address_line && !data.company_address ? 0 : 1, + }, + ]; +} + +function make_field(label, fieldname, fieldtype, existing_value, required_if_empty = true) { + return { + label, + fieldname, + fieldtype, + reqd: existing_value ? 0 : required_if_empty ? 1 : 0, + hidden: existing_value ? 1 : 0, + }; +} + +function save_company_details(dialog, data, values) { + frappe.call({ + method: "erpnext.controllers.accounts_controller.update_company_master_and_address", + args: { + name: data.name, + company: data.company, + details: values, + }, + callback() { + dialog.hide(); + frappe.msgprint("Updating details."); + + setTimeout(() => { + location.reload(); + }, 1000); + }, + }); +} From ce1312764fead916fa4a6a486adcc58ce97aa014 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Sun, 30 Nov 2025 05:14:02 +0000 Subject: [PATCH 079/328] fix(stock entry): use fg item expense account for direct manufacturing entry --- erpnext/stock/doctype/stock_entry/stock_entry.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 5f83b926510..67016b81f3e 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -577,6 +577,7 @@ class StockEntry(StockController, SubcontractingInwardController): "project": self.project, "uom": item.uom, "s_warehouse": item.s_warehouse, + "is_finished_item": item.is_finished_item, } ), for_update=True, @@ -609,6 +610,9 @@ class StockEntry(StockController, SubcontractingInwardController): if self.purpose == "Subcontracting Delivery": item.expense_account = frappe.get_value("Company", self.company, "default_expense_account") + if self.purpose == "Manufacture": + item.set("expense_account", item_details.get("expense_account")) + def validate_fg_completed_qty(self): if self.purpose != "Manufacture": return @@ -2078,7 +2082,9 @@ class StockEntry(StockController, SubcontractingInwardController): if self.purpose == "Material Issue": ret["expense_account"] = item.get("expense_account") or item_group_defaults.get("expense_account") - if self.purpose == "Manufacture" or not ret.get("expense_account"): + if (self.purpose == "Manufacture" and not args.get("is_finished_item")) or not ret.get( + "expense_account" + ): ret["expense_account"] = frappe.get_cached_value( "Company", self.company, "stock_adjustment_account" ) From ba2411b4ee6f0b2b7abc546fde6baa791e178171 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Sun, 30 Nov 2025 05:17:17 +0000 Subject: [PATCH 080/328] test: add test for fg item expense account in direct manufacturing --- erpnext/stock/doctype/stock_entry/test_stock_entry.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 98205a7d8f3..5db69098f3c 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -1261,6 +1261,7 @@ class TestStockEntry(IntegrationTestCase): frappe._dict(item_code="_Test FG Item", qty=4, t_warehouse="_Test Warehouse 1 - _TC"), ], ) + frappe.db.set_value("Company", "_Test Company", "stock_adjustment_account", "Stock Adjustment - _TC") # SE must have atleast one FG self.assertRaises(FinishedGoodError, se.save) @@ -1278,6 +1279,9 @@ class TestStockEntry(IntegrationTestCase): self.assertEqual(se.value_difference, 0.0) self.assertEqual(se.total_incoming_value, se.total_outgoing_value) + self.assertEqual(se.items[0].expense_account, "Stock Adjustment - _TC") + self.assertEqual(se.items[1].expense_account, "_Test Account Cost for Goods Sold - _TC") + @IntegrationTestCase.change_settings("Stock Settings", {"allow_negative_stock": 0}) def test_future_negative_sle(self): # Initialize item, batch, warehouse, opening qty From 32cf6148aa1c28614ce00ac34f537d8e9856e04e Mon Sep 17 00:00:00 2001 From: MochaMind Date: Sun, 30 Nov 2025 02:24:24 -0800 Subject: [PATCH 081/328] chore: update POT file (#50810) --- erpnext/locale/main.pot | 1059 +++++++++++++++++++-------------------- 1 file changed, 516 insertions(+), 543 deletions(-) diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot index 8f9d886a0e3..3aa74693fcb 100644 --- a/erpnext/locale/main.pot +++ b/erpnext/locale/main.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ERPNext VERSION\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2025-11-23 09:35+0000\n" -"PO-Revision-Date: 2025-11-23 09:35+0000\n" +"POT-Creation-Date: 2025-11-30 09:36+0000\n" +"PO-Revision-Date: 2025-11-30 09:36+0000\n" "Last-Translator: hello@frappe.io\n" "Language-Team: hello@frappe.io\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgstr "" msgid " Item" msgstr "" -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:153 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:206 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107 #: erpnext/selling/report/sales_analytics/sales_analytics.py:128 @@ -1006,7 +1006,7 @@ msgstr "" msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1812 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1815 msgid "A Reverse Journal Entry {0} already exists for this Journal Entry." msgstr "" @@ -1200,7 +1200,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:870 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:928 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1212,6 +1212,7 @@ msgstr "" #. Label of the account_category (Link) field in DocType 'Account' #. Name of a DocType #: erpnext/accounts/doctype/account/account.json +#: erpnext/accounts/doctype/account/account_tree.js:166 #: erpnext/accounts/doctype/account_category/account_category.json msgid "Account Category" msgstr "" @@ -1539,7 +1540,7 @@ msgstr "" msgid "Account {0}: You can not assign itself as parent account" msgstr "" -#: erpnext/accounts/general_ledger.py:452 +#: erpnext/accounts/general_ledger.py:454 msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry" msgstr "" @@ -1830,12 +1831,12 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1814 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1834 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1872 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1892 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:812 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:867 msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" @@ -1852,12 +1853,12 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1229 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1465 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1487 -#: erpnext/controllers/stock_controller.py:682 -#: erpnext/controllers/stock_controller.py:699 +#: erpnext/controllers/stock_controller.py:683 +#: erpnext/controllers/stock_controller.py:700 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:927 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1773 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:647 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1817 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1831 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:702 msgid "Accounting Entry for Stock" msgstr "" @@ -1870,10 +1871,10 @@ msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}" msgstr "" #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js:193 -#: erpnext/buying/doctype/supplier/supplier.js:90 +#: erpnext/buying/doctype/supplier/supplier.js:92 #: erpnext/public/js/controllers/stock_controller.js:88 #: erpnext/public/js/utils/ledger_preview.js:8 -#: erpnext/selling/doctype/customer/customer.js:170 +#: erpnext/selling/doctype/customer/customer.js:173 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:50 msgid "Accounting Ledger" msgstr "" @@ -1963,12 +1964,12 @@ msgstr "" #. Label of a Link in the Payables Workspace #. Label of a shortcut in the Payables Workspace #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:154 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:255 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:256 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/report/accounts_payable/accounts_payable.json -#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:108 +#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:113 #: erpnext/accounts/workspace/payables/payables.json -#: erpnext/buying/doctype/supplier/supplier.js:102 +#: erpnext/buying/doctype/supplier/supplier.js:104 msgid "Accounts Payable" msgstr "" @@ -1994,7 +1995,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.json #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:136 #: erpnext/accounts/workspace/receivables/receivables.json -#: erpnext/selling/doctype/customer/customer.js:159 +#: erpnext/selling/doctype/customer/customer.js:162 msgid "Accounts Receivable" msgstr "" @@ -2055,7 +2056,7 @@ msgid "Accounts to Merge" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:264 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:265 msgid "Accrued Expenses" msgstr "" @@ -2941,6 +2942,10 @@ msgstr "" msgid "Additional information regarding the customer." msgstr "" +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:584 +msgid "Additional {0} {1} of item {2} required as per BOM to complete this transaction" +msgstr "" + #. Label of the address_and_contact_tab (Tab Break) field in DocType 'Dunning' #. Label of the contact_and_address_tab (Tab Break) field in DocType 'POS #. Invoice' @@ -3086,7 +3091,7 @@ msgstr "" msgid "Adjust Qty" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1111 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1112 msgid "Adjustment Against" msgstr "" @@ -3288,10 +3293,6 @@ msgstr "" msgid "Against Customer Order {0}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1589 -msgid "Against Default Supplier" -msgstr "" - #. Label of the dn_detail (Data) field in DocType 'Delivery Note Item' #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json msgid "Against Delivery Note Item" @@ -3697,7 +3698,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2912 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2978 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3723,7 +3724,7 @@ msgstr "" msgid "All the items have been already returned." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1179 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1161 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 "" @@ -5196,7 +5197,7 @@ msgstr "" msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1811 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1794 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}." msgstr "" @@ -5246,7 +5247,7 @@ msgstr "" #: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json #: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json #: erpnext/assets/workspace/assets/assets.json -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:215 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:189 #: erpnext/stock/doctype/serial_no/serial_no.json msgid "Asset" msgstr "" @@ -5437,7 +5438,7 @@ msgstr "" #. Label of a Link in the Assets Workspace #: erpnext/assets/doctype/asset_movement/asset_movement.json #: erpnext/assets/workspace/assets/assets.json -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:226 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:200 msgid "Asset Movement" msgstr "" @@ -5496,7 +5497,7 @@ msgstr "" #. Label of the asset_received_but_not_billed (Link) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:165 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:278 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:279 #: erpnext/accounts/report/account_balance/account_balance.js:38 #: erpnext/setup/doctype/company/company.json msgid "Asset Received But Not Billed" @@ -5802,11 +5803,11 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:704 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:762 msgid "At least one warehouse is mandatory" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:617 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:675 msgid "At row #{0}: the Difference Account must not be a Stock type account, please change the Account Type for the account {1} or select a different account" msgstr "" @@ -5814,7 +5815,7 @@ msgstr "" msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:628 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:686 msgid "At row #{0}: you have selected the Difference Account {1}, which is a Cost of Goods Sold type account. Please select a different account" msgstr "" @@ -5834,7 +5835,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:630 +#: erpnext/controllers/stock_controller.py:631 msgid "At row {0}: Serial and Batch Bundle {1} has already created. Please remove the values from the serial no or batch no fields." msgstr "" @@ -6291,7 +6292,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:837 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:895 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6415,7 +6416,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js:5 #: 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:1403 +#: erpnext/selling/doctype/sales_order/sales_order.js:1407 #: erpnext/stock/doctype/material_request/material_request.js:336 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.js:658 @@ -6430,7 +6431,7 @@ msgstr "" msgid "BOM 1" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1668 +#: erpnext/manufacturing/doctype/bom/bom.py:1670 msgid "BOM 1 {0} and BOM 2 {1} should not be same" msgstr "" @@ -6682,15 +6683,15 @@ msgstr "" msgid "BOM recursion: {1} cannot be parent or child of {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1407 +#: erpnext/manufacturing/doctype/bom/bom.py:1412 msgid "BOM {0} does not belong to Item {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1389 +#: erpnext/manufacturing/doctype/bom/bom.py:1394 msgid "BOM {0} must be active" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1392 +#: erpnext/manufacturing/doctype/bom/bom.py:1397 msgid "BOM {0} must be submitted" msgstr "" @@ -6727,7 +6728,7 @@ msgstr "" #. Order Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:361 +#: erpnext/manufacturing/doctype/work_order/work_order.js:362 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Backflush Materials From WIP Warehouse" msgstr "" @@ -7058,7 +7059,7 @@ msgid "Bank Name" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:308 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:309 msgid "Bank Overdraft Account" msgstr "" @@ -7429,7 +7430,7 @@ msgstr "" msgid "Batch No is mandatory" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3023 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3027 msgid "Batch No {0} does not exists" msgstr "" @@ -7484,7 +7485,7 @@ msgstr "" #. Label of the batch_size (Float) field in DocType 'Work Order Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/operation/operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:343 +#: erpnext/manufacturing/doctype/work_order/work_order.js:344 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Batch Size" @@ -7513,12 +7514,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3088 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3154 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:286 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3094 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3160 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -7582,7 +7583,7 @@ msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace -#: erpnext/manufacturing/doctype/bom/bom.py:1246 +#: erpnext/manufacturing/doctype/bom/bom.py:1251 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/material_request/material_request.js:126 #: erpnext/stock/doctype/stock_entry/stock_entry.js:644 @@ -7910,8 +7911,8 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:260 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:261 msgid "Block Invoice" msgstr "" @@ -8022,7 +8023,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:804 +#: erpnext/accounts/general_ledger.py:806 msgid "Books have been closed till the period ending on {0}" msgstr "" @@ -8843,7 +8844,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:394 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:452 msgid "Cannot cancel transaction for Completed Work Order." msgstr "" @@ -8895,7 +8896,7 @@ msgstr "" msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1979 +#: erpnext/selling/doctype/sales_order/sales_order.py:1849 #: erpnext/stock/doctype/pick_list/pick_list.py:205 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 "" @@ -8908,7 +8909,7 @@ msgstr "" msgid "Cannot create return for consolidated invoice {0}." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1103 +#: erpnext/manufacturing/doctype/bom/bom.py:1108 msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs" msgstr "" @@ -9089,7 +9090,7 @@ msgid "Capital Equipment" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:190 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:332 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:333 msgid "Capital Stock" msgstr "" @@ -9117,6 +9118,10 @@ msgstr "" msgid "Capitalize Repair Cost" msgstr "" +#: erpnext/assets/doctype/asset/asset.js:201 +msgid "Capitalize this asset to confirm" +msgstr "" + #. Option for the 'Status' (Select) field in DocType 'Asset' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset/asset_list.js:14 @@ -9388,7 +9393,7 @@ msgstr "" msgid "Change Amount" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:93 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:94 msgid "Change Release Date" msgstr "" @@ -9506,7 +9511,7 @@ msgid "Chart of Accounts Importer" msgstr "" #. Label of a Link in the Accounting Workspace -#: erpnext/accounts/doctype/account/account_tree.js:187 +#: erpnext/accounts/doctype/account/account_tree.js:195 #: erpnext/accounts/doctype/cost_center/cost_center.js:41 #: erpnext/accounts/workspace/accounting/accounting.json msgid "Chart of Cost Centers" @@ -9865,7 +9870,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json #: erpnext/accounts/doctype/process_period_closing_voucher_detail/process_period_closing_voucher_detail.json -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:201 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:232 msgid "Closing Balance" msgstr "" @@ -11424,7 +11429,7 @@ msgstr "" msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" -#: erpnext/controllers/stock_controller.py:85 +#: erpnext/controllers/stock_controller.py:86 msgid "Conversion factor for item {0} has been reset to 1.0 as the uom {1} is same as stock uom {2}." msgstr "" @@ -11806,7 +11811,7 @@ msgstr "" msgid "Cost of Goods Sold" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:631 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:689 msgid "Cost of Goods Sold Account in Items Table" msgstr "" @@ -12048,8 +12053,8 @@ msgstr "" msgid "Create Ledger Entries for Change Amount" msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:216 -#: erpnext/selling/doctype/customer/customer.js:266 +#: erpnext/buying/doctype/supplier/supplier.js:218 +#: erpnext/selling/doctype/customer/customer.js:269 msgid "Create Link" msgstr "" @@ -12107,7 +12112,7 @@ msgstr "" msgid "Create Prospect" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1637 +#: erpnext/selling/doctype/sales_order/sales_order.js:1660 #: erpnext/utilities/activation.py:106 msgid "Create Purchase Order" msgstr "" @@ -12235,7 +12240,7 @@ msgstr "" msgid "Creating Accounts..." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1531 +#: erpnext/selling/doctype/sales_order/sales_order.js:1535 msgid "Creating Delivery Note ..." msgstr "" @@ -12259,12 +12264,12 @@ msgstr "" msgid "Creating Purchase Invoices ..." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1657 +#: erpnext/selling/doctype/sales_order/sales_order.js:1684 msgid "Creating Purchase Order ..." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:738 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:559 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:739 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:560 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73 msgid "Creating Purchase Receipt ..." msgstr "" @@ -12278,11 +12283,11 @@ msgstr "" msgid "Creating Stock Entry" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1791 +#: erpnext/selling/doctype/sales_order/sales_order.js:1805 msgid "Creating Subcontracting Inward Order ..." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:574 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:575 msgid "Creating Subcontracting Order ..." msgstr "" @@ -12534,7 +12539,7 @@ msgid "Creditor Turnover Ratio" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:155 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:256 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:257 msgid "Creditors" msgstr "" @@ -12793,7 +12798,7 @@ msgid "Current Level" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:153 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:254 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:255 msgid "Current Liabilities" msgstr "" @@ -12979,7 +12984,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:303 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:304 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json #: erpnext/accounts/doctype/tax_rule/tax_rule.json @@ -12997,7 +13002,7 @@ msgstr "" #: erpnext/accounts/workspace/receivables/receivables.json #: erpnext/assets/doctype/asset/asset.json #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/buying/doctype/supplier/supplier.js:184 +#: erpnext/buying/doctype/supplier/supplier.js:186 #: erpnext/crm/doctype/contract/contract.json #: erpnext/crm/doctype/lead/lead.js:32 #: erpnext/crm/doctype/opportunity/opportunity.js:99 @@ -13021,7 +13026,7 @@ msgstr "" #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1179 +#: erpnext/selling/doctype/sales_order/sales_order.js:1183 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 #: erpnext/selling/doctype/sms_center/sms_center.json @@ -13049,8 +13054,8 @@ msgstr "" #: erpnext/setup/doctype/customer_group/customer_group.json #: erpnext/setup/doctype/territory/territory.json #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:218 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:489 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:219 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:490 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json #: erpnext/stock/doctype/item/item.json @@ -13135,7 +13140,7 @@ msgid "Customer Addresses And Contacts" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:268 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:269 msgid "Customer Advances" msgstr "" @@ -13254,7 +13259,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:85 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56 -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:228 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:165 #: erpnext/accounts/report/gross_profit/gross_profit.py:412 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:209 #: erpnext/accounts/report/sales_register/sales_register.js:27 @@ -13944,7 +13949,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1219 #: erpnext/controllers/sales_and_purchase_return.py:395 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:304 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:61 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:52 msgid "Debit Note" msgstr "" @@ -13978,7 +13983,7 @@ msgstr "" msgid "Debit To is required" msgstr "" -#: erpnext/accounts/general_ledger.py:523 +#: erpnext/accounts/general_ledger.py:525 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}." msgstr "" @@ -14694,6 +14699,11 @@ msgstr "" msgid "Delete all the Transactions for this Company" msgstr "" +#. Label of a Link in the Settings Workspace +#: erpnext/setup/workspace/settings/settings.json +msgid "Deleted Documents" +msgstr "" + #: erpnext/edi/doctype/code_list/code_list.js:28 msgid "Deleting {0} and all associated Common Code documents..." msgstr "" @@ -14723,7 +14733,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Stock Reservation Entry' #. Option for the 'Status' (Select) field in DocType 'Subcontracting Inward #. Order' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:400 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:401 #: 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 @@ -14812,7 +14822,7 @@ msgid "Delivered: {0}" msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Pick List' -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:124 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:125 #: erpnext/stock/doctype/pick_list/pick_list.json msgid "Delivery" msgstr "" @@ -14829,7 +14839,7 @@ msgstr "" #: erpnext/public/js/utils.js:791 #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:624 -#: erpnext/selling/doctype/sales_order/sales_order.js:1474 +#: erpnext/selling/doctype/sales_order/sales_order.js:1478 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:321 @@ -14868,21 +14878,21 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a shortcut in the Stock Workspace #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:326 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:327 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js:22 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:21 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:292 #: erpnext/accounts/report/sales_register/sales_register.py:245 -#: erpnext/selling/doctype/sales_order/sales_order.js:1038 +#: erpnext/selling/doctype/sales_order/sales_order.js:1042 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json #: erpnext/stock/doctype/delivery_trip/delivery_trip.js:52 #: erpnext/stock/doctype/packing_slip/packing_slip.json -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:75 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:66 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json #: erpnext/stock/doctype/shipment_delivery_note/shipment_delivery_note.json #: erpnext/stock/workspace/stock/stock.json @@ -14981,7 +14991,7 @@ msgstr "" #. Label of the delivery_trip (Link) field in DocType 'Delivery Note' #. Name of a DocType #. Label of a Link in the Stock Workspace -#: erpnext/stock/doctype/delivery_note/delivery_note.js:283 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:284 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_trip/delivery_trip.json #: erpnext/stock/workspace/stock/stock.json @@ -15320,11 +15330,11 @@ msgstr "" msgid "Difference Account" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:620 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:678 msgid "Difference Account in Items Table" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:609 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:667 msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" @@ -15388,7 +15398,7 @@ msgstr "" msgid "Difference Value" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:498 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:499 msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row." msgstr "" @@ -15448,7 +15458,7 @@ msgstr "" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:141 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:236 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:237 msgid "Direct Income" msgstr "" @@ -15560,7 +15570,7 @@ msgstr "" msgid "Disassemble" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:231 +#: erpnext/manufacturing/doctype/work_order/work_order.js:232 msgid "Disassemble Order" msgstr "" @@ -16049,7 +16059,7 @@ msgid "Distributor" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:191 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:337 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:338 msgid "Dividends Paid" msgstr "" @@ -16239,7 +16249,7 @@ msgstr "" msgid "Downtime Reason" msgstr "" -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:246 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:248 msgid "Dr/Cr" msgstr "" @@ -16332,7 +16342,7 @@ msgstr "" #. Label of a Card Break in the Receivables Workspace #. Label of a Link in the Receivables Workspace #: erpnext/accounts/doctype/dunning/dunning.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:150 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:151 #: erpnext/accounts/workspace/receivables/receivables.json msgid "Dunning" msgstr "" @@ -16456,7 +16466,7 @@ msgid "Duration in Days" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:170 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:285 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:286 #: erpnext/setup/setup_wizard/operations/taxes_setup.py:256 msgid "Duties and Taxes" msgstr "" @@ -16569,7 +16579,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:502 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:503 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -16828,7 +16838,7 @@ msgid "Employee Advances" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:184 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:321 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:322 msgid "Employee Benefits Obligation" msgstr "" @@ -17288,7 +17298,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:1141 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1123 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set." msgstr "" @@ -17321,7 +17331,7 @@ msgstr "" #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:189 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:331 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:332 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/report/account_balance/account_balance.js:29 #: erpnext/accounts/report/account_balance/account_balance.js:45 @@ -17775,7 +17785,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:896 +#: erpnext/controllers/stock_controller.py:897 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -17823,7 +17833,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:876 +#: erpnext/controllers/stock_controller.py:877 msgid "Expense Account Missing" msgstr "" @@ -17932,10 +17942,6 @@ msgstr "" msgid "Export E-Invoices" msgstr "" -#: erpnext/setup/setup_wizard/operations/install_fixtures.py:301 -msgid "External" -msgstr "" - #. Label of the external_work_history (Table) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "External Work History" @@ -18123,7 +18129,7 @@ msgstr "" msgid "Fetch Subscription Updates" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1050 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1051 msgid "Fetch Timesheet" msgstr "" @@ -18539,7 +18545,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1525 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1583 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -18844,7 +18850,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1527 +#: erpnext/controllers/stock_controller.py:1546 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -18875,7 +18881,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:721 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:779 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -18903,7 +18909,7 @@ msgstr "" #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/manufacturing/doctype/production_plan/production_plan.js:471 #: erpnext/manufacturing/doctype/production_plan/production_plan.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1395 +#: erpnext/selling/doctype/sales_order/sales_order.js:1399 #: erpnext/stock/doctype/material_request/material_request.js:346 #: erpnext/templates/form_grid/material_request_grid.html:36 msgid "For Warehouse" @@ -18968,7 +18974,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1557 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1615 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -18982,7 +18988,7 @@ msgstr "" msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1701 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1684 msgid "For row {0}: Enter Planned Qty" msgstr "" @@ -19001,7 +19007,7 @@ msgstr "" msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:861 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "For the item {0}, the quantity should be {1} according to the BOM {2}." msgstr "" @@ -19010,7 +19016,7 @@ msgctxt "Clear payment terms template and/or payment schedule when due date is c msgid "For the new {0} to take effect, would you like to clear the current {1}?" msgstr "" -#: erpnext/controllers/stock_controller.py:400 +#: erpnext/controllers/stock_controller.py:401 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -19843,7 +19849,7 @@ msgstr "" msgid "Get Current Stock" msgstr "" -#: erpnext/selling/doctype/customer/customer.js:186 +#: erpnext/selling/doctype/customer/customer.js:189 msgid "Get Customer Group Details" msgstr "" @@ -19883,14 +19889,14 @@ msgid "Get Item Locations" msgstr "" #. Label of the get_items_from (Select) field in DocType 'Production Plan' -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:165 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:190 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:287 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:319 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:353 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1106 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:602 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:625 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:166 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:191 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:288 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:320 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:354 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1107 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:603 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:626 #: 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 @@ -19904,13 +19910,13 @@ msgstr "" #: erpnext/public/js/controllers/buying.js:327 #: erpnext/selling/doctype/quotation/quotation.js:167 #: erpnext/selling/doctype/sales_order/sales_order.js:196 -#: erpnext/selling/doctype/sales_order/sales_order.js:1196 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:190 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:242 +#: erpnext/selling/doctype/sales_order/sales_order.js:1200 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:191 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:243 #: erpnext/stock/doctype/material_request/material_request.js:128 #: erpnext/stock/doctype/material_request/material_request.js:223 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:160 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:267 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:151 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:241 #: erpnext/stock/doctype/stock_entry/stock_entry.js:328 #: erpnext/stock/doctype/stock_entry/stock_entry.js:375 #: erpnext/stock/doctype/stock_entry/stock_entry.js:408 @@ -20032,7 +20038,7 @@ msgstr "" msgid "Get Sub Assembly Items" msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:113 +#: erpnext/buying/doctype/supplier/supplier.js:115 msgid "Get Supplier Group Details" msgstr "" @@ -20045,7 +20051,7 @@ msgstr "" msgid "Get Suppliers By" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1102 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1103 msgid "Get Timesheets" msgstr "" @@ -20115,7 +20121,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2130 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -20789,14 +20795,14 @@ msgstr "" msgid "History In Company" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:379 -#: erpnext/selling/doctype/sales_order/sales_order.js:985 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:380 +#: erpnext/selling/doctype/sales_order/sales_order.js:989 msgid "Hold" msgstr "" #. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice' #. Label of the on_hold (Check) field in DocType 'Purchase Invoice' -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:97 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json msgid "Hold Invoice" msgstr "" @@ -21290,7 +21296,7 @@ msgstr "" msgid "If set, the system does not use the user's Email or the standard outgoing Email account for sending request for quotations." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1174 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1156 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected." msgstr "" @@ -21303,7 +21309,7 @@ msgstr "" msgid "If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1193 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1175 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed." msgstr "" @@ -21394,7 +21400,7 @@ msgstr "" msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1816 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1799 msgid "If you still want to proceed, please enable {0}." msgstr "" @@ -21462,11 +21468,11 @@ msgstr "" msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1378 +#: erpnext/selling/doctype/sales_order/sales_order.js:1382 msgid "Ignore Existing Ordered Qty" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1808 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1791 msgid "Ignore Existing Projected Quantity" msgstr "" @@ -21552,6 +21558,13 @@ msgstr "" msgid "Import Chart of Accounts from a csv file" msgstr "" +#. Label of a Link in the Home Workspace +#. Label of a Link in the Settings Workspace +#: erpnext/setup/workspace/home/home.json +#: erpnext/setup/workspace/settings/settings.json +msgid "Import Data" +msgstr "" + #: erpnext/edi/doctype/code_list/code_list.js:7 #: erpnext/edi/doctype/code_list/code_list_list.js:3 #: erpnext/edi/doctype/common_code/common_code_list.js:3 @@ -21892,7 +21905,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1374 +#: erpnext/selling/doctype/sales_order/sales_order.js:1378 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json @@ -22005,7 +22018,7 @@ msgstr "" #. Accounting' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:235 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:236 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:467 @@ -22086,7 +22099,7 @@ msgstr "" msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:866 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:924 msgid "Incorrect Component Quantity" msgstr "" @@ -22190,12 +22203,6 @@ msgstr "" msgid "Increment for Attribute {0} cannot be 0" msgstr "" -#. Label of the indent (Int) field in DocType 'Production Plan Sub Assembly -#. Item' -#: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json -msgid "Indent" -msgstr "" - #. Label of the indentation_level (Int) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Indent Level" @@ -22225,7 +22232,7 @@ msgstr "" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:145 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:241 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242 msgid "Indirect Income" msgstr "" @@ -22293,13 +22300,13 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1421 +#: erpnext/controllers/stock_controller.py:1440 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1391 -#: erpnext/controllers/stock_controller.py:1393 +#: erpnext/controllers/stock_controller.py:1410 +#: erpnext/controllers/stock_controller.py:1412 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -22316,7 +22323,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1406 +#: erpnext/controllers/stock_controller.py:1425 msgid "Inspection Submission" msgstr "" @@ -22336,7 +22343,7 @@ msgstr "" #. 'Installation Note' #. Label of a Link in the Stock Workspace #: erpnext/selling/doctype/installation_note/installation_note.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:263 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:264 #: erpnext/stock/workspace/stock/stock.json msgid "Installation Note" msgstr "" @@ -22393,7 +22400,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:120 #: erpnext/stock/doctype/pick_list/pick_list.py:138 #: erpnext/stock/doctype/pick_list/pick_list.py:1013 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:841 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:899 #: erpnext/stock/serial_batch_bundle.py:1186 erpnext/stock/stock_ledger.py:1679 #: erpnext/stock/stock_ledger.py:2165 msgid "Insufficient Stock" @@ -22488,7 +22495,7 @@ msgstr "" msgid "Inter Company Order Reference" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1133 +#: erpnext/selling/doctype/sales_order/sales_order.js:1137 msgid "Inter Company Purchase Order" msgstr "" @@ -22500,7 +22507,7 @@ msgstr "" msgid "Inter Company Reference" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:485 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:486 msgid "Inter Company Sales Order" msgstr "" @@ -22527,7 +22534,7 @@ msgid "Interest Expense" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243 msgid "Interest Income" msgstr "" @@ -22536,7 +22543,7 @@ msgid "Interest and/or dunning fee" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:147 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:244 msgid "Interest on Fixed Deposits" msgstr "" @@ -22560,7 +22567,7 @@ msgstr "" msgid "Internal Customer for company {0} already exists" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1132 +#: erpnext/selling/doctype/sales_order/sales_order.js:1136 msgid "Internal Purchase Order" msgstr "" @@ -22568,7 +22575,7 @@ msgstr "" msgid "Internal Sale or Delivery Reference missing." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:484 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:485 msgid "Internal Sales Order" msgstr "" @@ -22616,7 +22623,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1488 +#: erpnext/controllers/stock_controller.py:1507 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -22728,7 +22735,7 @@ msgid "Invalid Net Purchase Amount" msgstr "" #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77 -#: erpnext/accounts/general_ledger.py:796 +#: erpnext/accounts/general_ledger.py:798 msgid "Invalid Opening Entry" msgstr "" @@ -22762,7 +22769,7 @@ msgstr "" msgid "Invalid Priority" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1152 +#: erpnext/manufacturing/doctype/bom/bom.py:1157 msgid "Invalid Process Loss Configuration" msgstr "" @@ -22799,12 +22806,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1600 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1658 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:900 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:922 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:958 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:980 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -22851,8 +22858,8 @@ msgstr "" #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118 -#: erpnext/accounts/general_ledger.py:839 -#: erpnext/accounts/general_ledger.py:849 +#: erpnext/accounts/general_ledger.py:841 +#: erpnext/accounts/general_ledger.py:851 msgid "Invalid value {0} for {1} against account {2}" msgstr "" @@ -22949,7 +22956,7 @@ msgstr "" #. Account' #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:140 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:141 msgid "Invoice Discounting" msgstr "" @@ -23066,7 +23073,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:144 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1213 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:164 -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:165 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:196 msgid "Invoiced Amount" msgstr "" @@ -23831,7 +23838,7 @@ msgstr "" #: erpnext/public/js/stock_analytics.js:92 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1601 +#: erpnext/selling/doctype/sales_order/sales_order.js:1623 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:46 #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js:14 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:36 @@ -24047,7 +24054,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1059 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1060 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:68 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:37 #: erpnext/accounts/report/gross_profit/gross_profit.py:301 @@ -24113,8 +24120,8 @@ msgstr "" #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:368 #: erpnext/selling/doctype/sales_order/sales_order.js:476 -#: erpnext/selling/doctype/sales_order/sales_order.js:1237 -#: erpnext/selling/doctype/sales_order/sales_order.js:1388 +#: erpnext/selling/doctype/sales_order/sales_order.js:1241 +#: erpnext/selling/doctype/sales_order/sales_order.js:1392 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:29 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:27 @@ -24578,7 +24585,7 @@ msgstr "" #: erpnext/public/js/controllers/transaction.js:2785 #: erpnext/public/js/utils.js:734 #: erpnext/selling/doctype/quotation_item/quotation_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1243 +#: erpnext/selling/doctype/sales_order/sales_order.js:1247 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:35 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:33 @@ -24950,7 +24957,7 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3067 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3133 msgid "Item for row {0} does not match Material Request" msgstr "" @@ -24971,7 +24978,7 @@ msgid "Item must be added using 'Get Items from Purchase Receipts' button" msgstr "" #: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42 -#: erpnext/selling/doctype/sales_order/sales_order.js:1608 +#: erpnext/selling/doctype/sales_order/sales_order.js:1630 msgid "Item name" msgstr "" @@ -24984,7 +24991,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1005 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1063 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -25027,7 +25034,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:514 +#: erpnext/controllers/stock_controller.py:515 msgid "Item {0} does not exist." msgstr "" @@ -25079,7 +25086,7 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2042 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -25099,7 +25106,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1338 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1396 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -25160,87 +25167,6 @@ msgstr "" msgid "Item: {0} does not exist in the system" msgstr "" -#. Label of the items_section (Section Break) field in DocType 'POS Invoice' -#. Label of the items (Table) field in DocType 'POS Invoice' -#. Label of the sec_warehouse (Section Break) field in DocType 'Purchase -#. Invoice' -#. Label of the items (Table) field in DocType 'Purchase Invoice' -#. Label of the items_section (Section Break) field in DocType 'Sales Invoice' -#. Label of the items (Table) field in DocType 'Sales Invoice' -#. Label of the items (Table) field in DocType 'Purchase Order' -#. Label of the items (Table) field in DocType 'Request for Quotation' -#. Label of the items (Table) field in DocType 'Supplier Quotation' -#. Label of the items_section (Tab Break) field in DocType 'Opportunity' -#. Label of the items (Table) field in DocType 'Opportunity' -#. Label of the items (Table) field in DocType 'Maintenance Schedule' -#. Label of the items (Table) field in DocType 'BOM' -#. Label of the items (Table) field in DocType 'BOM Creator' -#. Label of the items (Table) field in DocType 'Job Card' -#. Label of the items (Table) field in DocType 'Master Production Schedule' -#. Label of the items (Table) field in DocType 'Sales Forecast' -#. Label of the items (Table) field in DocType 'Installation Note' -#. Label of the item_section (Section Break) field in DocType 'Product Bundle' -#. Label of the items (Table) field in DocType 'Product Bundle' -#. Label of the items (Table) field in DocType 'Quotation' -#. Label of the sec_warehouse (Section Break) field in DocType 'Sales Order' -#. Label of the items (Table) field in DocType 'Sales Order' -#. Label of the items_section (Section Break) field in DocType 'Delivery Note' -#. Label of the purchase_receipt_items (Section Break) field in DocType 'Landed -#. Cost Voucher' -#. Label of the items (Table) field in DocType 'Material Request' -#. Label of the warehouse_section (Section Break) field in DocType 'Material -#. Request' -#. Label of the items (Table) field in DocType 'Packing Slip' -#. Label of the sec_warehouse (Section Break) field in DocType 'Purchase -#. Receipt' -#. Label of the items (Table) field in DocType 'Purchase Receipt' -#. Label of the items (Table) field in DocType 'Stock Entry' -#. Label of the items_section (Section Break) field in DocType 'Stock Entry' -#. Label of the items (Table) field in DocType 'Stock Reconciliation' -#. Label of the items (Table) field in DocType 'Subcontracting Inward Order' -#. Label of the items_section (Section Break) field in DocType 'Subcontracting -#. Inward Order' -#. Label of the items (Table) field in DocType 'Subcontracting Order' -#. Label of the items (Table) field in DocType 'Subcontracting Receipt' -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/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 -#: erpnext/crm/doctype/opportunity/opportunity.json -#: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json -#: erpnext/manufacturing/doctype/bom/bom.json -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json -#: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json -#: erpnext/manufacturing/doctype/sales_forecast/sales_forecast.json -#: erpnext/public/js/utils.js:466 -#: erpnext/selling/doctype/installation_note/installation_note.json -#: erpnext/selling/doctype/product_bundle/product_bundle.json -#: erpnext/selling/doctype/quotation/quotation.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1229 -#: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:19 -#: erpnext/setup/doctype/item_group/item_group.js:87 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:494 -#: erpnext/stock/doctype/delivery_note/delivery_note.json -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json -#: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/packing_slip/packing_slip.json -#: 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_inward_order/subcontracting_inward_order.json -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json -#: erpnext/templates/form_grid/item_grid.html:6 -#: erpnext/templates/generators/bom.html:38 erpnext/templates/pages/rfq.html:37 -msgid "Items" -msgstr "" - #. Label of a Card Break in the Buying Workspace #: erpnext/buying/workspace/buying/buying.json msgid "Items & Pricing" @@ -25256,7 +25182,7 @@ msgid "Items Filter" msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.py:1646 -#: erpnext/selling/doctype/sales_order/sales_order.js:1645 +#: erpnext/selling/doctype/sales_order/sales_order.js:1668 msgid "Items Required" msgstr "" @@ -25280,11 +25206,11 @@ msgstr "" msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1424 +#: erpnext/selling/doctype/sales_order/sales_order.js:1428 msgid "Items for Raw Material Request" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1001 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1059 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -25314,7 +25240,7 @@ msgstr "" msgid "Items under this warehouse will be suggested" msgstr "" -#: erpnext/controllers/stock_controller.py:124 +#: erpnext/controllers/stock_controller.py:125 msgid "Items {0} do not exist in the Item master." msgstr "" @@ -25359,7 +25285,7 @@ msgstr "" #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/job_card/job_card.py:882 #: erpnext/manufacturing/doctype/operation/operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:389 +#: erpnext/manufacturing/doctype/work_order/work_order.js:390 #: 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 @@ -25782,9 +25708,9 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Stock Workspace -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:677 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:678 #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:104 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:95 #: erpnext/stock/workspace/stock/stock.json msgid "Landed Cost Voucher" msgstr "" @@ -26285,7 +26211,7 @@ msgstr "" msgid "Link existing Quality Procedure." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:644 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:645 msgid "Link to Material Request" msgstr "" @@ -26294,11 +26220,11 @@ msgstr "" msgid "Link to Material Requests" msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:125 +#: erpnext/buying/doctype/supplier/supplier.js:127 msgid "Link with Customer" msgstr "" -#: erpnext/selling/doctype/customer/customer.js:198 +#: erpnext/selling/doctype/customer/customer.js:201 msgid "Link with Supplier" msgstr "" @@ -26323,16 +26249,16 @@ msgstr "" msgid "Linked with submitted documents" msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:210 -#: erpnext/selling/doctype/customer/customer.js:260 +#: erpnext/buying/doctype/supplier/supplier.js:212 +#: erpnext/selling/doctype/customer/customer.js:263 msgid "Linking Failed" msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:209 +#: erpnext/buying/doctype/supplier/supplier.js:211 msgid "Linking to Customer Failed. Please try again." msgstr "" -#: erpnext/selling/doctype/customer/customer.js:259 +#: erpnext/selling/doctype/customer/customer.js:262 msgid "Linking to Supplier Failed. Please try again." msgstr "" @@ -26391,7 +26317,7 @@ msgid "Loan Start Date and Loan Period are mandatory to save the Invoice Discoun msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:176 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:299 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:300 msgid "Loans (Liabilities)" msgstr "" @@ -26437,7 +26363,7 @@ msgid "Logo" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:317 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:318 msgid "Long-term Provisions" msgstr "" @@ -26592,7 +26518,7 @@ msgstr "" #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/loyalty_program/loyalty_program.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1157 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1158 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:952 @@ -26782,12 +26708,12 @@ msgstr "" #. Label of the maintenance_schedule (Link) field in DocType 'Maintenance #. Visit' #. Label of a Link in the Support Workspace -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:156 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:157 #: erpnext/crm/workspace/crm/crm.json #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js:81 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1110 +#: erpnext/selling/doctype/sales_order/sales_order.js:1114 #: erpnext/support/workspace/support/support.json msgid "Maintenance Schedule" msgstr "" @@ -26893,7 +26819,7 @@ msgstr "" #: erpnext/crm/workspace/crm/crm.json #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js:87 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1103 +#: erpnext/selling/doctype/sales_order/sales_order.js:1107 #: erpnext/support/doctype/warranty_claim/warranty_claim.js:47 #: erpnext/support/workspace/support/support.json msgid "Maintenance Visit" @@ -26959,7 +26885,7 @@ msgstr "" msgid "Make Quotation" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:353 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:327 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:127 msgid "Make Return Entry" msgstr "" @@ -26976,7 +26902,7 @@ msgid "Make Serial No / Batch from Work Order" msgstr "" #: erpnext/manufacturing/doctype/job_card/job_card.js:101 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:253 msgid "Make Stock Entry" msgstr "" @@ -27145,8 +27071,8 @@ msgstr "" #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1082 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1098 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1140 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1156 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json @@ -27285,7 +27211,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2208 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2274 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -27347,10 +27273,6 @@ msgstr "" msgid "Manufacturing User" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:183 -msgid "Mapping Purchase Receipt ..." -msgstr "" - #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:106 msgid "Mapping Subcontracting Inward Order ..." msgstr "" @@ -27511,7 +27433,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1083 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1141 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -27578,7 +27500,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:581 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:582 #: 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 @@ -27594,7 +27516,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/doctype/work_order/work_order.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1074 +#: erpnext/selling/doctype/sales_order/sales_order.js:1078 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:36 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -27683,7 +27605,7 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1925 +#: erpnext/selling/doctype/sales_order/sales_order.py:1795 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -27701,7 +27623,7 @@ msgstr "" msgid "Material Request {0} is cancelled or stopped" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1440 +#: erpnext/selling/doctype/sales_order/sales_order.js:1444 msgid "Material Request {0} submitted." msgstr "" @@ -27806,7 +27728,7 @@ msgstr "" msgid "Material from Customer" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:430 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:431 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:536 msgid "Material to Supplier" msgstr "" @@ -27906,11 +27828,11 @@ msgstr "" msgid "Maximum Payment Amount" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3627 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3693 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3618 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3684 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -28365,7 +28287,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1535 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1593 msgid "Missing Finished Good" msgstr "" @@ -28373,7 +28295,7 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:931 msgid "Missing Item" msgstr "" @@ -28393,7 +28315,7 @@ msgstr "" msgid "Missing required filter: {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1111 +#: erpnext/manufacturing/doctype/bom/bom.py:1116 #: erpnext/manufacturing/doctype/work_order/work_order.py:1448 msgid "Missing value" msgstr "" @@ -28664,7 +28586,7 @@ msgstr "" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1542 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1600 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -29191,6 +29113,10 @@ msgstr "" msgid "New Invoice" msgstr "" +#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:337 +msgid "New Journal Entry will be posted for the difference amount. The Posting Date can be modified." +msgstr "" + #: erpnext/assets/doctype/location/location_tree.js:23 msgid "New Location" msgstr "" @@ -29268,7 +29194,7 @@ msgstr "" msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:250 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:251 msgid "New release date should be in the future" msgstr "" @@ -29359,11 +29285,11 @@ msgstr "" msgid "No Items selected for transfer." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1222 +#: erpnext/selling/doctype/sales_order/sales_order.js:1226 msgid "No Items with Bill of Materials to Manufacture" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1360 +#: erpnext/selling/doctype/sales_order/sales_order.js:1364 msgid "No Items with Bill of Materials." msgstr "" @@ -29446,7 +29372,7 @@ msgid "No Work Orders were created" msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:823 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:799 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:854 msgid "No accounting entries for the following warehouses" msgstr "" @@ -29715,12 +29641,12 @@ msgstr "" msgid "Non Profit" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1504 +#: erpnext/manufacturing/doctype/bom/bom.py:1506 msgid "Non stock items" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:316 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:317 msgid "Non-Current Liabilities" msgstr "" @@ -30296,7 +30222,7 @@ msgstr "" msgid "Only leaf nodes are allowed in transaction" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1097 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1155 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -30491,7 +30417,7 @@ msgstr "" #. Option for the 'Balance Type' (Select) field in DocType 'Financial Report #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:158 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:189 msgid "Opening Balance" msgstr "" @@ -30508,7 +30434,7 @@ msgid "Opening Balance Details" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:192 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:342 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:343 msgid "Opening Balance Equity" msgstr "" @@ -30531,7 +30457,7 @@ msgstr "" msgid "Opening Entry" msgstr "" -#: erpnext/accounts/general_ledger.py:795 +#: erpnext/accounts/general_ledger.py:797 msgid "Opening Entry can not be created after Period Closing Voucher is created." msgstr "" @@ -30542,7 +30468,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Accounting Workspace #. Label of a Link in the Home Workspace -#: erpnext/accounts/doctype/account/account_tree.js:197 +#: erpnext/accounts/doctype/account/account_tree.js:205 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/setup/workspace/home/home.json @@ -30647,7 +30573,7 @@ msgstr "" msgid "Operating Cost Per BOM Quantity" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1588 +#: erpnext/manufacturing/doctype/bom/bom.py:1590 msgid "Operating Cost as per Work Order / BOM" msgstr "" @@ -30695,7 +30621,7 @@ msgstr "" msgid "Operation ID" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:326 +#: erpnext/manufacturing/doctype/work_order/work_order.js:327 msgid "Operation Id" msgstr "" @@ -30758,7 +30684,7 @@ msgstr "" #. Label of the operations (Table) field in DocType 'Work Order' #. Label of the operation (Section Break) field in DocType 'Email Digest' #: erpnext/manufacturing/doctype/bom/bom.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:307 +#: erpnext/manufacturing/doctype/work_order/work_order.js:308 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/setup/doctype/company/company.py:455 #: erpnext/setup/doctype/email_digest/email_digest.json @@ -30772,7 +30698,7 @@ msgstr "" msgid "Operations Routing" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1120 +#: erpnext/manufacturing/doctype/bom/bom.py:1125 msgid "Operations cannot be left blank" msgstr "" @@ -30930,7 +30856,7 @@ msgstr "" msgid "Optimize Route" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:174 +#: erpnext/accounts/doctype/account/account_tree.js:182 msgid "Optional. Sets company's default currency, if not specified." msgstr "" @@ -30938,6 +30864,10 @@ msgstr "" msgid "Optional. This setting will be used to filter in various transactions." msgstr "" +#: erpnext/accounts/doctype/account/account_tree.js:169 +msgid "Optional. Used with Financial Report Template" +msgstr "" + #: erpnext/selling/report/territory_wise_sales/territory_wise_sales.py:43 msgid "Order Amount" msgstr "" @@ -31320,7 +31250,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1654 +#: erpnext/controllers/stock_controller.py:1673 msgid "Over Receipt" msgstr "" @@ -31799,7 +31729,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1492 +#: erpnext/controllers/stock_controller.py:1511 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -31823,7 +31753,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Stock Workspace -#: erpnext/stock/doctype/delivery_note/delivery_note.js:299 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:300 #: erpnext/stock/doctype/packing_slip/packing_slip.json #: erpnext/stock/workspace/stock/stock.json msgid "Packing Slip" @@ -31878,7 +31808,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:146 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1214 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165 -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:203 #: erpnext/accounts/report/pos_register/pos_register.py:209 #: erpnext/selling/page/point_of_sale/pos_payment.js:691 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56 @@ -32669,15 +32599,15 @@ msgstr "" #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10 #: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:82 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:118 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:119 #: 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:95 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:96 #: 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:462 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:463 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:24 -#: erpnext/selling/doctype/sales_order/sales_order.js:1155 +#: erpnext/selling/doctype/sales_order/sales_order.js:1159 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:31 msgid "Payment" msgstr "" @@ -33013,11 +32943,11 @@ msgstr "" #: erpnext/accounts/doctype/payment_order/payment_order.json #: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:134 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:133 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:135 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:134 #: erpnext/accounts/workspace/receivables/receivables.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:470 -#: erpnext/selling/doctype/sales_order/sales_order.js:1148 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:471 +#: erpnext/selling/doctype/sales_order/sales_order.js:1152 msgid "Payment Request" msgstr "" @@ -33281,7 +33211,7 @@ msgid "Payroll Entry" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:261 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262 msgid "Payroll Payable" msgstr "" @@ -33331,9 +33261,9 @@ msgstr "" #. Label of the pending_qty (Float) field in DocType 'Production Plan Item' #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:254 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:331 +#: erpnext/manufacturing/doctype/work_order/work_order.js:332 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:182 -#: erpnext/selling/doctype/sales_order/sales_order.js:1615 +#: erpnext/selling/doctype/sales_order/sales_order.js:1637 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45 msgid "Pending Qty" msgstr "" @@ -33465,7 +33395,7 @@ msgstr "" msgid "Period Based On" msgstr "" -#: erpnext/accounts/general_ledger.py:807 +#: erpnext/accounts/general_ledger.py:809 msgid "Period Closed" msgstr "" @@ -33690,8 +33620,8 @@ msgstr "" #. Option for the 'From Voucher Type' (Select) field in DocType 'Stock #. Reservation Entry' #. Label of a Link in the Stock Workspace -#: erpnext/selling/doctype/sales_order/sales_order.js:1018 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:202 +#: erpnext/selling/doctype/sales_order/sales_order.js:1022 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:203 #: erpnext/stock/doctype/material_request/material_request.js:142 #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -34027,13 +33957,13 @@ msgstr "" msgid "Please Select a Company." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:165 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:207 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:166 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:208 msgid "Please Select a Customer" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:139 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:245 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:130 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:219 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:145 msgid "Please Select a Supplier" msgstr "" @@ -34078,7 +34008,7 @@ msgstr "" msgid "Please add the Bank Account column" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:235 +#: erpnext/accounts/doctype/account/account_tree.js:243 msgid "Please add the account to root level Company - {0}" msgstr "" @@ -34090,7 +34020,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1665 +#: erpnext/controllers/stock_controller.py:1684 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -34240,7 +34170,7 @@ msgstr "" msgid "Please ensure {} account {} is a Receivable account." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:595 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:653 msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}" msgstr "" @@ -34443,8 +34373,8 @@ msgstr "" msgid "Please mention 'Weight UOM' along with Weight." msgstr "" -#: erpnext/accounts/general_ledger.py:641 -#: erpnext/accounts/general_ledger.py:648 +#: erpnext/accounts/general_ledger.py:643 +#: erpnext/accounts/general_ledger.py:650 msgid "Please mention '{0}' in Company: {1}" msgstr "" @@ -34490,7 +34420,7 @@ msgstr "" msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1871 +#: erpnext/selling/doctype/sales_order/sales_order.py:1741 msgid "Please select BOM against item {0}" msgstr "" @@ -34578,11 +34508,11 @@ msgstr "" msgid "Please select Posting Date first" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1165 +#: erpnext/manufacturing/doctype/bom/bom.py:1170 msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1873 +#: erpnext/selling/doctype/sales_order/sales_order.py:1743 msgid "Please select Qty against item {0}" msgstr "" @@ -34602,7 +34532,7 @@ msgstr "" msgid "Please select Stock Asset Account" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1459 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1517 msgid "Please select Subcontracting Order instead of Purchase Order {0}" msgstr "" @@ -34610,7 +34540,7 @@ msgstr "" msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1413 +#: erpnext/manufacturing/doctype/bom/bom.py:1418 msgid "Please select a BOM" msgstr "" @@ -34623,7 +34553,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom/bom.js:639 #: erpnext/manufacturing/doctype/bom/bom.py:264 #: erpnext/public/js/controllers/accounts.js:277 -#: erpnext/public/js/controllers/transaction.js:3219 +#: erpnext/public/js/controllers/transaction.js:3236 msgid "Please select a Company first." msgstr "" @@ -34712,15 +34642,15 @@ msgstr "" msgid "Please select at least one row to fix" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1284 +#: erpnext/selling/doctype/sales_order/sales_order.js:1288 msgid "Please select atleast one item to continue" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:374 +#: erpnext/manufacturing/doctype/work_order/work_order.js:375 msgid "Please select atleast one operation to create Job Card" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1761 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1764 msgid "Please select correct account" msgstr "" @@ -34807,7 +34737,7 @@ msgstr "" msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}" msgstr "" -#: erpnext/accounts/general_ledger.py:547 +#: erpnext/accounts/general_ledger.py:549 msgid "Please set '{0}' in Company: {1}" msgstr "" @@ -34837,7 +34767,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:58 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:68 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:78 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:780 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:781 msgid "Please set Company" msgstr "" @@ -34909,10 +34839,6 @@ 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:1625 -msgid "Please set a Supplier against the Items to be considered in the Purchase Order." -msgstr "" - #: erpnext/projects/doctype/project/project.py:728 msgid "Please set a default Holiday List for Company {0}" msgstr "" @@ -34934,7 +34860,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:871 +#: erpnext/controllers/stock_controller.py:872 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -34978,11 +34904,11 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:730 +#: erpnext/controllers/stock_controller.py:731 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" -#: erpnext/controllers/stock_controller.py:189 +#: erpnext/controllers/stock_controller.py:190 msgid "Please set default inventory account for item {0}, or their item group or brand." msgstr "" @@ -35079,8 +35005,8 @@ msgid "Please specify Company" msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:120 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:439 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:517 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:440 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:518 msgid "Please specify Company to proceed" msgstr "" @@ -35333,7 +35259,7 @@ msgid "Posting Date Inheritance for Exchange Gain / Loss" msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:266 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:136 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:142 msgid "Posting Date cannot be future date" msgstr "" @@ -35398,7 +35324,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2156 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2222 msgid "Posting date and posting time is mandatory" msgstr "" @@ -36166,7 +36092,7 @@ msgstr "" msgid "Process Loss" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1148 +#: erpnext/manufacturing/doctype/bom/bom.py:1153 msgid "Process Loss Percentage cannot be greater than 100" msgstr "" @@ -37078,7 +37004,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:453 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:454 #: 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 @@ -37086,8 +37012,8 @@ msgstr "" #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json #: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:134 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:125 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:260 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:30 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/quality_inspection/quality_inspection.json @@ -37155,7 +37081,7 @@ msgstr "" #. Item' #. Label of a shortcut in the Subcontracting Workspace #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:144 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:145 #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:242 @@ -37174,12 +37100,12 @@ msgstr "" #: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:54 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:174 -#: erpnext/selling/doctype/sales_order/sales_order.js:1093 +#: erpnext/selling/doctype/sales_order/sales_order.js:1097 #: 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:181 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:240 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:214 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json @@ -37243,7 +37169,7 @@ msgstr "" msgid "Purchase Order Item Supplied" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:914 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:969 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}" msgstr "" @@ -37272,7 +37198,7 @@ msgstr "" msgid "Purchase Order Trends" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1577 +#: erpnext/selling/doctype/sales_order/sales_order.js:1581 msgid "Purchase Order already created for all Sales Order items" msgstr "" @@ -37336,9 +37262,9 @@ msgstr "" #. Reservation Entry' #. Label of a Link in the Stock Workspace #. Label of a shortcut in the Stock Workspace -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:169 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:653 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:663 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:170 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:654 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:664 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49 #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:249 @@ -37346,7 +37272,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:420 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:421 #: 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 @@ -37412,11 +37338,11 @@ msgstr "" msgid "Purchase Receipt Trends" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:381 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:355 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled." msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:991 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1046 msgid "Purchase Receipt {0} created." msgstr "" @@ -37431,7 +37357,7 @@ msgstr "" msgid "Purchase Register" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250 msgid "Purchase Return" msgstr "" @@ -37537,7 +37463,7 @@ msgstr "" msgid "Purpose" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:414 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:472 msgid "Purpose must be one of {0}" msgstr "" @@ -37625,8 +37551,8 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:494 #: erpnext/selling/doctype/sales_order/sales_order.js:584 #: erpnext/selling/doctype/sales_order/sales_order.js:631 -#: erpnext/selling/doctype/sales_order/sales_order.js:1261 -#: erpnext/selling/doctype/sales_order/sales_order.js:1413 +#: erpnext/selling/doctype/sales_order/sales_order.js:1265 +#: erpnext/selling/doctype/sales_order/sales_order.js:1417 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:255 #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json @@ -38301,7 +38227,7 @@ msgstr "" msgid "Quantity must be greater than zero, and less or equal to {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1021 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1003 #: erpnext/stock/doctype/pick_list/pick_list.js:204 msgid "Quantity must not be more than {0}" msgstr "" @@ -38326,7 +38252,7 @@ msgstr "" msgid "Quantity to Make" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:336 +#: erpnext/manufacturing/doctype/work_order/work_order.js:337 msgid "Quantity to Manufacture" msgstr "" @@ -38418,7 +38344,7 @@ msgstr "" #. Label of the prevdoc_docname (Link) field in DocType 'Sales Order Item' #. Label of a Link in the Selling Workspace #. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule' -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:294 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:295 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:36 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20 #: erpnext/crm/doctype/contract/contract.json @@ -38429,7 +38355,7 @@ msgstr "" #: erpnext/crm/report/lead_details/lead_details.js:37 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:38 #: erpnext/selling/doctype/quotation/quotation.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1171 +#: erpnext/selling/doctype/sales_order/sales_order.js:1175 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -39000,10 +38926,16 @@ msgstr "" msgid "Raw SQL" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:410 +#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Raw materials consumed qty will be validated based on FG BOM required qty" +msgstr "" + +#: erpnext/buying/doctype/purchase_order/purchase_order.js:411 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:124 #: erpnext/manufacturing/doctype/work_order/work_order.js:726 -#: erpnext/selling/doctype/sales_order/sales_order.js:964 +#: erpnext/selling/doctype/sales_order/sales_order.js:968 #: erpnext/selling/doctype/sales_order/sales_order_list.js:70 #: erpnext/stock/doctype/material_request/material_request.js:228 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:116 @@ -39091,7 +39023,7 @@ msgid "Real Estate" msgstr "" #. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice' -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:274 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:275 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json msgid "Reason For Putting On Hold" msgstr "" @@ -39101,8 +39033,8 @@ msgstr "" msgid "Reason for Failure" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:741 -#: erpnext/selling/doctype/sales_order/sales_order.js:1738 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:742 +#: erpnext/selling/doctype/sales_order/sales_order.js:1752 msgid "Reason for Hold" msgstr "" @@ -39111,7 +39043,7 @@ msgstr "" msgid "Reason for Leaving" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1753 +#: erpnext/selling/doctype/sales_order/sales_order.js:1767 msgid "Reason for hold:" msgstr "" @@ -39374,7 +39306,7 @@ msgstr "" msgid "Reconcile Effect On" msgstr "" -#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:361 +#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:363 msgid "Reconcile Entries" msgstr "" @@ -39816,8 +39748,8 @@ msgstr "" #. Label of the release_date (Date) field in DocType 'Purchase Invoice' #. Label of the release_date (Date) field in DocType 'Supplier' -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:266 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:310 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:267 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:311 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1061 @@ -40332,7 +40264,7 @@ msgstr "" msgid "Request for Quotation Supplier" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1080 +#: erpnext/selling/doctype/sales_order/sales_order.js:1084 msgid "Request for Raw Materials" msgstr "" @@ -40576,7 +40508,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1251 +#: erpnext/controllers/stock_controller.py:1269 msgid "Reserved Batch Conflict" msgstr "" @@ -40922,9 +40854,9 @@ msgid "Result Title Field" msgstr "" #: erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.js:43 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:385 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:386 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:63 -#: erpnext/selling/doctype/sales_order/sales_order.js:950 +#: erpnext/selling/doctype/sales_order/sales_order.js:954 msgid "Resume" msgstr "" @@ -40954,11 +40886,11 @@ msgid "Retain Sample" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:196 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:347 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:348 msgid "Retained Earnings" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:292 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:266 msgid "Retention Stock Entry" msgstr "" @@ -40995,11 +40927,11 @@ msgstr "" msgid "Return" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:108 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:109 msgid "Return / Credit Note" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:125 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126 msgid "Return / Debit Note" msgstr "" @@ -41035,7 +40967,7 @@ msgstr "" msgid "Return Against Subcontracting Receipt" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:277 +#: erpnext/manufacturing/doctype/work_order/work_order.js:278 msgid "Return Components" msgstr "" @@ -41050,14 +40982,14 @@ msgstr "" msgid "Return Issued" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:352 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:326 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:126 msgid "Return Qty" msgstr "" #. Label of the return_qty_from_rejected_warehouse (Check) field in DocType #. 'Purchase Receipt Item' -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:328 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:302 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:102 msgid "Return Qty from Rejected Warehouse" @@ -41166,7 +41098,7 @@ msgid "Revaluation Journals" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:197 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:352 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:353 msgid "Revaluation Surplus" msgstr "" @@ -41504,8 +41436,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:742 -#: erpnext/controllers/stock_controller.py:757 +#: erpnext/controllers/stock_controller.py:743 +#: erpnext/controllers/stock_controller.py:758 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -41577,11 +41509,11 @@ msgid "Row #{0}: Acceptance Criteria Formula is required." msgstr "" #: erpnext/controllers/subcontracting_controller.py:124 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:527 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:534 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:520 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:527 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}" msgstr "" @@ -41761,7 +41693,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:873 +#: erpnext/controllers/stock_controller.py:874 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -41780,11 +41712,11 @@ msgstr "" msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:370 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:428 msgid "Row #{0}: Finished Good must be {1}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:508 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:515 msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}." msgstr "" @@ -41821,7 +41753,7 @@ msgstr "" msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List." msgstr "" -#: erpnext/controllers/stock_controller.py:108 +#: erpnext/controllers/stock_controller.py:109 msgid "Row #{0}: Item {1} has zero rate but 'Allow Zero Valuation Rate' is not enabled." msgstr "" @@ -41878,7 +41810,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:753 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:811 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -41924,15 +41856,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1387 +#: erpnext/controllers/stock_controller.py:1406 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1402 +#: erpnext/controllers/stock_controller.py:1421 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1417 +#: erpnext/controllers/stock_controller.py:1436 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -41968,7 +41900,7 @@ msgstr "" msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:501 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:508 msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}." msgstr "" @@ -41988,7 +41920,7 @@ msgstr "" msgid "Row #{0}: Returned quantity cannot be greater than available quantity to return for Item {1}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:496 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:503 msgid "Row #{0}: Scrap Item Qty cannot be zero" msgstr "" @@ -42004,7 +41936,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:260 +#: erpnext/controllers/stock_controller.py:261 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -42052,11 +41984,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:897 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:977 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -42113,7 +42045,7 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:273 +#: erpnext/controllers/stock_controller.py:274 msgid "Row #{0}: The batch {1} has already expired." msgstr "" @@ -42274,15 +42206,15 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1390 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1448 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1414 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1472 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:266 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:273 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time." msgstr "" @@ -42310,7 +42242,7 @@ msgstr "" msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1077 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1135 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -42322,6 +42254,12 @@ msgstr "" msgid "Row {0}: Both Debit and Credit values cannot be zero" msgstr "" +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:550 +msgid "" +"Row {0}: Consumed Qty {1} {2} must be less than or equal to Available Qty For Consumption\n" +"\t\t\t\t\t{3} {4} in Consumed Items Table." +msgstr "" + #: erpnext/controllers/selling_controller.py:275 msgid "Row {0}: Conversion Factor is mandatory" msgstr "" @@ -42396,7 +42334,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1483 +#: erpnext/controllers/stock_controller.py:1502 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -42500,7 +42438,7 @@ msgstr "" msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:461 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:519 msgid "Row {0}: Qty in Stock UOM can not be zero." msgstr "" @@ -42512,7 +42450,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:827 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:885 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -42520,11 +42458,11 @@ msgstr "" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1427 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1485 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1474 +#: erpnext/controllers/stock_controller.py:1493 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -42532,7 +42470,7 @@ msgstr "" msgid "Row {0}: Task {1} does not belong to Project {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:506 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:564 msgid "Row {0}: The item {1}, quantity must be positive number" msgstr "" @@ -42544,11 +42482,11 @@ msgstr "" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:455 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:513 msgid "Row {0}: UOM Conversion Factor is mandatory" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1131 +#: erpnext/manufacturing/doctype/bom/bom.py:1136 #: erpnext/manufacturing/doctype/work_order/work_order.py:397 msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}" msgstr "" @@ -42771,7 +42709,7 @@ msgstr "" #. Option for the 'Order Type' (Select) field in DocType 'Sales Order' #. Label of the sales_details (Tab Break) field in DocType 'Item' #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:142 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:237 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:238 #: erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py:9 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/doctype/payment_term/payment_term_dashboard.py:8 @@ -42896,12 +42834,12 @@ msgstr "" #: erpnext/projects/doctype/timesheet/timesheet.json #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.json #: erpnext/selling/doctype/quotation/quotation_list.js:22 -#: erpnext/selling/doctype/sales_order/sales_order.js:1059 +#: erpnext/selling/doctype/sales_order/sales_order.js:1063 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:350 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:351 #: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json msgid "Sales Invoice" @@ -43037,7 +42975,7 @@ msgstr "" #. Label of a shortcut in the Subcontracting Workspace #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:272 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:273 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:285 #: erpnext/accounts/report/sales_register/sales_register.py:238 @@ -43069,8 +43007,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:222 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:160 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:226 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:161 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:227 #: erpnext/stock/doctype/material_request/material_request.js:221 #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -43130,7 +43068,7 @@ msgstr "" #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:336 -#: erpnext/selling/doctype/sales_order/sales_order.js:1268 +#: erpnext/selling/doctype/sales_order/sales_order.js:1272 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -43426,7 +43364,7 @@ msgid "Sales Representative" msgstr "" #: erpnext/accounts/report/gross_profit/gross_profit.py:893 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:273 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:274 msgid "Sales Return" msgstr "" @@ -43588,7 +43526,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3609 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3675 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -43914,7 +43852,7 @@ msgid "Section Code" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:177 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:300 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301 msgid "Secured Loans" msgstr "" @@ -43955,15 +43893,15 @@ msgstr "" msgid "Select Attribute Values" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1251 +#: erpnext/selling/doctype/sales_order/sales_order.js:1255 msgid "Select BOM" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1232 +#: erpnext/selling/doctype/sales_order/sales_order.js:1236 msgid "Select BOM and Qty for Production" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1383 +#: erpnext/selling/doctype/sales_order/sales_order.js:1387 msgid "Select BOM, Qty and For Warehouse" msgstr "" @@ -44044,12 +43982,12 @@ msgstr "" #. Forecast' #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json #: erpnext/manufacturing/doctype/sales_forecast/sales_forecast.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1584 -#: erpnext/selling/doctype/sales_order/sales_order.js:1596 +#: erpnext/selling/doctype/sales_order/sales_order.js:1588 +#: erpnext/selling/doctype/sales_order/sales_order.js:1616 msgid "Select Items" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1470 +#: erpnext/selling/doctype/sales_order/sales_order.js:1474 msgid "Select Items based on Delivery Date" msgstr "" @@ -44060,7 +43998,7 @@ msgstr "" #. Label of the select_items_to_manufacture_section (Section Break) field in #. DocType 'Production Plan' #: erpnext/manufacturing/doctype/production_plan/production_plan.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1279 +#: erpnext/selling/doctype/sales_order/sales_order.js:1283 msgid "Select Items to Manufacture" msgstr "" @@ -44074,7 +44012,7 @@ msgstr "" msgid "Select Job Worker Address" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1154 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1155 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:955 msgid "Select Loyalty Program" msgstr "" @@ -44083,7 +44021,7 @@ msgstr "" msgid "Select Possible Supplier" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1027 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1009 #: erpnext/stock/doctype/pick_list/pick_list.js:214 msgid "Select Quantity" msgstr "" @@ -44146,7 +44084,7 @@ msgstr "" msgid "Select a Company this Employee belongs to." msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:180 +#: erpnext/buying/doctype/supplier/supplier.js:182 msgid "Select a Customer" msgstr "" @@ -44158,7 +44096,7 @@ msgstr "" msgid "Select a Payment Method." msgstr "" -#: erpnext/selling/doctype/customer/customer.js:230 +#: erpnext/selling/doctype/customer/customer.js:233 msgid "Select a Supplier" msgstr "" @@ -44221,7 +44159,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:1129 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1111 msgid "Select the Item to be manufactured." msgstr "" @@ -44673,7 +44611,7 @@ msgstr "" msgid "Serial No {0} does not exist" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3017 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3021 msgid "Serial No {0} does not exists" msgstr "" @@ -44816,7 +44754,7 @@ msgstr "" msgid "Serial and Batch Bundle updated" msgstr "" -#: erpnext/controllers/stock_controller.py:154 +#: erpnext/controllers/stock_controller.py:155 msgid "Serial and Batch Bundle {0} is already used in {1} {2}." msgstr "" @@ -45257,11 +45195,11 @@ msgstr "" msgid "Set Landed Cost Based on Purchase Invoice Rate" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1166 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1167 msgid "Set Loyalty Program" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:304 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:305 msgid "Set New Release Date" msgstr "" @@ -45329,6 +45267,10 @@ msgstr "" msgid "Set Source Warehouse" msgstr "" +#: erpnext/selling/doctype/sales_order/sales_order.js:1594 +msgid "Set Supplier" +msgstr "" + #. Label of the set_target_warehouse (Link) field in DocType 'Sales Invoice' #. Label of the set_warehouse (Link) field in DocType 'Purchase Order' #. Label of the set_target_warehouse (Link) field in DocType 'Delivery Note' @@ -45421,7 +45363,7 @@ msgstr "" msgid "Set targets Item Group-wise for this Sales Person." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1186 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1168 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)" msgstr "" @@ -45510,7 +45452,7 @@ msgstr "" msgid "Setting up company" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1110 +#: erpnext/manufacturing/doctype/bom/bom.py:1115 #: erpnext/manufacturing/doctype/work_order/work_order.py:1447 msgid "Setting {0} is required" msgstr "" @@ -45620,7 +45562,7 @@ msgid "Shift Time (In Hours)" msgstr "" #. Name of a DocType -#: erpnext/stock/doctype/delivery_note/delivery_note.js:249 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:250 #: erpnext/stock/doctype/shipment/shipment.json msgid "Shipment" msgstr "" @@ -45848,7 +45790,7 @@ msgid "Short-term Investments" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:175 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:295 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:296 msgid "Short-term Provisions" msgstr "" @@ -45914,6 +45856,7 @@ msgstr "" msgid "Show Future Payments" msgstr "" +#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:107 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:125 msgid "Show GL Balance" msgstr "" @@ -46167,7 +46110,7 @@ msgstr "" msgid "Simultaneous" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:583 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:641 msgid "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table." msgstr "" @@ -46203,7 +46146,7 @@ msgstr "" #. Label of the skip_material_transfer (Check) field in DocType 'Work Order #. Operation' -#: erpnext/manufacturing/doctype/work_order/work_order.js:355 +#: erpnext/manufacturing/doctype/work_order/work_order.js:356 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.js:454 msgid "Skip Material Transfer" @@ -46394,7 +46337,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:701 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:759 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -46403,12 +46346,12 @@ msgid "Source and target warehouse must be different" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:152 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:253 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:254 msgid "Source of Funds (Liabilities)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:678 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:695 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:736 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:753 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -46855,7 +46798,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:795 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -47000,7 +46943,7 @@ msgid "Stock Levels" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:160 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:272 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:273 msgid "Stock Liabilities" msgstr "" @@ -47093,7 +47036,7 @@ msgstr "" #. Label of the stock_received_but_not_billed (Link) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:161 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:273 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:274 #: erpnext/accounts/report/account_balance/account_balance.js:59 #: erpnext/setup/doctype/company/company.json msgid "Stock Received But Not Billed" @@ -47176,7 +47119,7 @@ msgid "Stock Reservation Entries Cancelled" msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:995 -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2229 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2211 #: erpnext/manufacturing/doctype/work_order/work_order.py:2029 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1773 msgid "Stock Reservation Entries Created" @@ -47766,7 +47709,7 @@ msgstr "" #. Name of a DocType #. Label of a shortcut in the Subcontracting Workspace #: erpnext/manufacturing/doctype/work_order/work_order.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1001 +#: erpnext/selling/doctype/sales_order/sales_order.js:1005 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json @@ -47813,7 +47756,7 @@ msgstr "" #. Label of the subcontracting_order (Link) field in DocType 'Subcontracting #. Receipt Supplied Item' #. Label of a shortcut in the Subcontracting Workspace -#: erpnext/buying/doctype/purchase_order/purchase_order.js:440 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:441 #: erpnext/controllers/subcontracting_controller.py:1123 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -47922,7 +47865,7 @@ msgid "Subdivision" msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.py:963 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:987 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1042 msgid "Submit Action Failed" msgstr "" @@ -48118,11 +48061,11 @@ msgstr "" msgid "Successfully imported {0} records." msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:202 +#: erpnext/buying/doctype/supplier/supplier.js:204 msgid "Successfully linked to Customer" msgstr "" -#: erpnext/selling/doctype/customer/customer.js:252 +#: erpnext/selling/doctype/customer/customer.js:255 msgid "Successfully linked to Supplier" msgstr "" @@ -48272,10 +48215,10 @@ msgstr "" #: erpnext/public/js/purchase_trends_filters.js:63 #: erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json #: erpnext/regional/report/irs_1099/irs_1099.py:77 -#: erpnext/selling/doctype/customer/customer.js:234 +#: erpnext/selling/doctype/customer/customer.js:237 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:182 -#: erpnext/selling/doctype/sales_order/sales_order.js:1630 +#: erpnext/selling/doctype/sales_order/sales_order.js:1652 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/setup/workspace/home/home.json @@ -48368,7 +48311,7 @@ msgstr "" #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:91 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1257 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:198 -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:238 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:180 #: erpnext/accounts/report/purchase_register/purchase_register.js:27 #: erpnext/accounts/report/purchase_register/purchase_register.py:186 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:55 @@ -48546,7 +48489,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:606 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:607 #: 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 @@ -48585,6 +48528,10 @@ msgstr "" msgid "Supplier Reference" msgstr "" +#: erpnext/selling/doctype/sales_order/sales_order.js:1676 +msgid "Supplier Required" +msgstr "" + #. Label of the supplier_score (Data) field in DocType 'Supplier Scorecard' #: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json msgid "Supplier Score" @@ -48667,6 +48614,10 @@ msgstr "" msgid "Supplier delivers to Customer" msgstr "" +#: erpnext/selling/doctype/sales_order/sales_order.js:1675 +msgid "Supplier is required for all selected Items" +msgstr "" + #. Description of the 'Supplier Numbers' (Table) field in DocType 'Customer' #: erpnext/selling/doctype/customer/customer.json msgid "Supplier numbers assigned by the customer" @@ -48838,7 +48789,7 @@ msgstr "" msgid "TDS Deducted" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:286 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:287 msgid "TDS Payable" msgstr "" @@ -49009,7 +48960,6 @@ 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:1001 #: 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 @@ -49050,8 +49000,8 @@ msgstr "" msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcontracting Inward Order Item." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:684 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:691 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:742 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:749 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -49303,7 +49253,7 @@ msgstr "" #. Label of the rate (Float) field in DocType 'Purchase Taxes and Charges' #. Label of the rate (Float) field in DocType 'Sales Taxes and Charges' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:166 +#: erpnext/accounts/doctype/account/account_tree.js:174 #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json @@ -49878,7 +49828,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:97 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68 -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:221 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:171 #: erpnext/accounts/report/gross_profit/gross_profit.py:425 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:8 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:21 @@ -50024,7 +49974,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2432 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2498 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -50040,7 +49990,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1597 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1655 msgid "The Serial and Batch Bundle {0} is not valid for this transaction. The 'Type of Transaction' should be 'Outward' instead of 'Inward' in Serial and Batch Bundle {0}" msgstr "" @@ -50048,7 +49998,7 @@ msgstr "" msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing.

            When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2093 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2151 msgid "The Work Order is mandatory for Disassembly Order" msgstr "" @@ -50066,7 +50016,7 @@ msgstr "" msgid "The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document." msgstr "" -#: erpnext/controllers/stock_controller.py:1240 +#: erpnext/controllers/stock_controller.py:1258 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -50078,7 +50028,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:1134 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1116 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM." msgstr "" @@ -50358,15 +50308,15 @@ msgstr "" msgid "The value {0} is already assigned to an existing Item {1}." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1162 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1144 msgid "The warehouse where you store finished Items before they are shipped." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1155 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1137 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:1167 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1149 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 "" @@ -50374,7 +50324,7 @@ msgstr "" msgid "The {0} ({1}) must be equal to {2} ({3})" msgstr "" -#: erpnext/public/js/controllers/transaction.js:3258 +#: erpnext/public/js/controllers/transaction.js:3275 msgid "The {0} contains Unit Price Items." msgstr "" @@ -50450,7 +50400,7 @@ msgstr "" msgid "There is no batch found against the {0}: {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1534 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1592 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -50497,7 +50447,7 @@ msgstr "" msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2135 +#: erpnext/selling/doctype/sales_order/sales_order.py:2005 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -50525,7 +50475,7 @@ msgstr "" msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:490 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:491 msgid "This field is used to set the 'Customer'." msgstr "" @@ -50616,7 +50566,7 @@ msgstr "" msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1148 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1130 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 "" @@ -50628,7 +50578,7 @@ msgstr "" msgid "This item filter has already been applied for the {0}" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:503 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:504 msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields." msgstr "" @@ -50686,7 +50636,7 @@ msgstr "" msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:496 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:497 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc." msgstr "" @@ -50841,7 +50791,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Projects Workspace #. Label of a shortcut in the Projects Workspace -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1047 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1048 #: erpnext/projects/doctype/timesheet/timesheet.json #: erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py:26 #: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:59 @@ -51261,6 +51211,23 @@ msgstr "" msgid "Too many columns. Export the report and print it using a spreadsheet application." 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:641 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:717 +#: 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 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:451 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:69 +#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:123 +#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json +#: erpnext/setup/doctype/email_digest/email_digest.json +#: erpnext/stock/workspace/stock/stock.json +msgid "Tools" +msgstr "" + #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Torr" @@ -52304,7 +52271,7 @@ msgstr "" #. Option for the 'Asset Status' (Select) field in DocType 'Serial No' #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/assets/doctype/asset_movement/asset_movement.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:434 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:435 #: erpnext/stock/doctype/item_reorder/item_reorder.json #: erpnext/stock/doctype/serial_no/serial_no.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:538 @@ -52675,7 +52642,7 @@ msgstr "" #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json #: erpnext/selling/doctype/quotation_item/quotation_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1623 +#: erpnext/selling/doctype/sales_order/sales_order.js:1645 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43 #: erpnext/selling/report/sales_analytics/sales_analytics.py:138 @@ -52763,7 +52730,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3531 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3597 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -52843,7 +52810,7 @@ msgstr "" msgid "Unbilled Orders" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:100 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101 msgid "Unblock Invoice" msgstr "" @@ -53075,7 +53042,7 @@ msgid "Unscheduled" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:178 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:304 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:305 msgid "Unsecured Loans" msgstr "" @@ -53236,10 +53203,10 @@ msgstr "" msgid "Update Existing Price List Rate" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:365 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:366 #: erpnext/public/js/utils.js:842 #: erpnext/selling/doctype/sales_order/sales_order.js:75 -#: erpnext/selling/doctype/sales_order/sales_order.js:936 +#: erpnext/selling/doctype/sales_order/sales_order.js:940 msgid "Update Items" msgstr "" @@ -53268,7 +53235,7 @@ msgstr "" msgid "Update Rate and Availability" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:629 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:630 msgid "Update Rate as per Last Purchase" msgstr "" @@ -53338,7 +53305,7 @@ msgstr "" msgid "Updating Variants..." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1110 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1092 msgid "Updating Work Order status" msgstr "" @@ -53757,6 +53724,12 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate Consumed Qty (as per BOM)" +msgstr "" + #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -54226,7 +54199,7 @@ msgstr "" msgid "View Leads" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:270 +#: erpnext/accounts/doctype/account/account_tree.js:278 #: erpnext/stock/doctype/batch/batch.js:18 msgid "View Ledger" msgstr "" @@ -54664,7 +54637,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:770 +#: erpnext/controllers/stock_controller.py:771 msgid "Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}." msgstr "" @@ -55143,7 +55116,7 @@ msgstr "" #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:29 #: 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:1046 +#: erpnext/selling/doctype/sales_order/sales_order.js:1050 #: erpnext/stock/doctype/material_request/material_request.js:201 #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/stock/doctype/material_request/material_request.py:891 @@ -55219,7 +55192,7 @@ msgstr "" msgid "Work Order has been {0}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1221 +#: erpnext/selling/doctype/sales_order/sales_order.js:1225 msgid "Work Order not created" msgstr "" @@ -55227,7 +55200,7 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:745 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:803 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -55236,7 +55209,7 @@ msgstr "" msgid "Work Orders" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1306 +#: erpnext/selling/doctype/sales_order/sales_order.js:1310 msgid "Work Orders Created: {0}" msgstr "" @@ -55302,7 +55275,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:319 +#: erpnext/manufacturing/doctype/work_order/work_order.js:320 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.json #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:35 @@ -55548,7 +55521,7 @@ msgstr "" msgid "You are not allowed to update as per the conditions set in {} Workflow." msgstr "" -#: erpnext/accounts/general_ledger.py:786 +#: erpnext/accounts/general_ledger.py:788 msgid "You are not authorized to add or update entries before {0}" msgstr "" @@ -55589,7 +55562,7 @@ msgid "You can only have Plans with the same billing cycle in a Subscription" msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:423 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:909 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:910 msgid "You can only redeem max {0} points in this order." msgstr "" @@ -55629,7 +55602,7 @@ msgstr "" msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}" msgstr "" -#: erpnext/accounts/general_ledger.py:806 +#: erpnext/accounts/general_ledger.py:808 msgid "You cannot create/amend any accounting entries till this date." msgstr "" @@ -55776,7 +55749,7 @@ msgstr "" msgid "Zero Rated" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:461 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:519 msgid "Zero quantity" msgstr "" @@ -55885,7 +55858,7 @@ msgstr "" #. Option for the 'Service Provider' (Select) field in DocType 'Currency #. Exchange Settings' #: erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json -msgid "frankfurter.app" +msgid "frankfurter.dev" msgstr "" #: erpnext/templates/form_grid/item_grid.html:66 @@ -56141,7 +56114,7 @@ msgstr "" msgid "{0} Number {1} is already used in {2} {3}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1546 +#: erpnext/manufacturing/doctype/bom/bom.py:1548 msgid "{0} Operating Cost for operation {1}" msgstr "" @@ -56293,7 +56266,7 @@ msgid "{0} is mandatory for Item {1}" msgstr "" #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99 -#: erpnext/accounts/general_ledger.py:830 +#: erpnext/accounts/general_ledger.py:832 msgid "{0} is mandatory for account {1}" msgstr "" @@ -56313,7 +56286,7 @@ msgstr "" msgid "{0} is not a group node. Please select a group node as parent cost center" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:512 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:570 msgid "{0} is not a stock Item" msgstr "" @@ -56385,7 +56358,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1657 +#: erpnext/controllers/stock_controller.py:1676 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -56591,7 +56564,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:902 +#: erpnext/controllers/stock_controller.py:903 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -56673,7 +56646,7 @@ msgstr "" msgid "{field_label} is mandatory for sub-contracted {doctype}." msgstr "" -#: erpnext/controllers/stock_controller.py:2062 +#: erpnext/controllers/stock_controller.py:2081 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" From 725a4fcf2d01d76eb5c249587e458749ffd04eee Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Sun, 30 Nov 2025 17:00:55 +0530 Subject: [PATCH 082/328] feat: standard print format for POS Invoice --- .../letterhead/company_letterhead.html | 198 +++++++++--------- .../letterhead/company_letterhead_grey.html | 56 ++--- .../pos_invoice_standard/__init__.py | 0 .../pos_invoice_standard.json | 33 +++ .../purchase_order_standard.json | 6 +- .../delivery_note_standard.json | 6 +- 6 files changed, 167 insertions(+), 132 deletions(-) create mode 100644 erpnext/accounts/print_format/pos_invoice_standard/__init__.py create mode 100644 erpnext/accounts/print_format/pos_invoice_standard/pos_invoice_standard.json diff --git a/erpnext/accounts/letterhead/company_letterhead.html b/erpnext/accounts/letterhead/company_letterhead.html index f4b8db863f6..7cdf58cb6e0 100644 --- a/erpnext/accounts/letterhead/company_letterhead.html +++ b/erpnext/accounts/letterhead/company_letterhead.html @@ -1,108 +1,108 @@ - - - + + + - - {{ company_address.get("address_line1") or "" }}
            - {% if company_address.get("address_line2") %}{{ company_address.get("address_line2") }}
            {% endif %} - {{ company_address.get("city") or "" }}, {{ company_address.get("state") or "" }} {{ company_address.get("pincode") or "" }}, {{ company_address.get("country") or "" }}
            - {% endif %} - + - - +
            + {{ doc.doctype }} + {{ doc.name }} +
            + {% if website %} +
            + {{ _("Website:") }} + {{ website }} +
            + {% endif %} {% if email %} +
            + {{ _("Email:") }} + {{ email }} +
            + {% endif %} {% if phone_no %} +
            + {{ _("Contact:") }} + {{ phone_no }} +
            + {% endif %} + + +
            -
            - {% set company_logo = frappe.db.get_value("Company", doc.company, "company_logo") %} - {% if company_logo %} - Company Logo - {% endif %} -
            -
            +
            + {% set company_logo = frappe.db.get_value("Company", doc.company, "company_logo") %} {% if + company_logo %} + Company Logo + {% endif %} +
            +             		-
            - {{ doc.company }} -
            - {% if doc.company_address %} - {% set company_address = frappe.db.get_value("Address", doc.company_address, ["address_line1", "address_line2", "city", "state", "pincode", "country"], as_dict=True) %} +             		+
            {{ doc.company }}
            + {% if doc.company_address %} {% set company_address = frappe.db.get_value("Address", + doc.company_address, ["address_line1", "address_line2", "city", "state", "pincode", + "country"], as_dict=True) %} {% elif doc.billing_address %} {% set company_address = + frappe.db.get_value("Address", doc.billing_address, ["address_line1", "address_line2", "city", + "state", "pincode", "country"], as_dict=True) %} {% endif %} {% if company_address %} {{ + company_address.address_line1 or "" }}
            + {% if company_address.address_line2 %} {{ company_address.address_line2 }}
            + {% endif %} {{ company_address.city or "" }}, {{ company_address.state or "" }} {{ + company_address.pincode or "" }}, {{ company_address.country or ""}}
            + {% endif %} +             		+ {% set website = frappe.db.get_value("Company", doc.company, "website") %} {% set email = + frappe.db.get_value("Company", doc.company, "email") %} {% set phone_no = + frappe.db.get_value("Company", doc.company, "phone_no") %} - - {% set company_details = frappe.db.get_value("Company", doc.company, ["website", "email", "phone_no"], as_dict=True) %} - -
            - {{ _("Invoice:") }} - {{ doc.name }} -
            - {% if company_details.website %} -
            - {{ _("Website:") }} - {{ company_details.website }} -
            - {% endif %} - {% if company_details.email %} -
            - {{ _("Email:") }} - {{ company_details.email }} -
            - {% endif %} - {% if company_details.phone_no %} -
            - {{ _("Contact:") }} - {{ company_details.phone_no }} -
            - {% endif %} -
            diff --git a/erpnext/accounts/letterhead/company_letterhead_grey.html b/erpnext/accounts/letterhead/company_letterhead_grey.html index 3736c19084f..a46d33ebd95 100644 --- a/erpnext/accounts/letterhead/company_letterhead_grey.html +++ b/erpnext/accounts/letterhead/company_letterhead_grey.html @@ -1,7 +1,7 @@ \n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n \n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Payment Due Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.due_date) }}\n\t\t\t\t
            {{ _(\"Invoice Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Invoice Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
            {{ _(\"Bill From\") }}:
            \n\t\t\t\t\t{% if doc.company_address %}\n {% set company_address = frappe.db.get_value(\"Address\", doc.company_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.company }}
            \n {{ company_address.get(\"address_line1\") or \"\" }}
            \n {% if company_address.get(\"address_line2\") %}{{ company_address.get(\"address_line2\") }}
            {% endif %}\n {{ company_address.get(\"city\") or \"\" }}, {{ company_address.get(\"state\") or \"\" }} {{ company_address.get(\"pincode\") or \"\" }}, {{ company_address.get(\"country\") or \"\" }}
            \n {% endif %}\n\t\t\t\t            		{{ _(\"Bill To\") }}:
            \n\t\t\t\t {% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.customer_name }}
            \n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
            \n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
            {% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
            \n\t\t\t\t\t{% endif %}\n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
            \n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t

            {{ _(\"Total in words\") }}

            \n\t\t\t\t
            {{ doc.in_words }}
            \n\t\t\t            		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
            {{ _(\"Sub Total:\") }}            		{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):            		{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
            \n\t\t\t
            \n\n\t\t\n\t\t
            \n\t\t\t{% if doc.terms %}\n\t\t\t
            \n\t\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t\t{{ doc.terms}}\n\t\t\t
            \n\t\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2025-11-30 16:58:32.571054", + "modified_by": "Administrator", + "module": "Accounts", + "name": "POS Invoice Standard", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "wkhtmltopdf", + "print_format_builder": 0, + "print_format_builder_beta": 0, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} diff --git a/erpnext/buying/print_format/purchase_order_standard/purchase_order_standard.json b/erpnext/buying/print_format/purchase_order_standard/purchase_order_standard.json index 695c600409c..c5ee7381d5f 100644 --- a/erpnext/buying/print_format/purchase_order_standard/purchase_order_standard.json +++ b/erpnext/buying/print_format/purchase_order_standard/purchase_order_standard.json @@ -1,7 +1,7 @@ { "absolute_value": 0, "align_labels_right": 0, - "creation": "2025-11-29 00:57:28.988603", + "creation": "2025-11-30 16:55:52.799647", "custom_format": 1, "default_print_language": "en", "disabled": 0, @@ -9,14 +9,14 @@ "docstatus": 0, "doctype": "Print Format", "font_size": 14, - "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
            {{ letter_head }}
            \n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Payment Due Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.due_date) }}\n\t\t\t\t
            {{ _(\"Invoice Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Invoice Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
            {{ _(\"Bill From\") }}:
            \n\t\t\t\t\t{% if doc.company_address %}\n {% set company_address = frappe.db.get_value(\"Address\", doc.company_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.company }}
            \n {{ company_address.get(\"address_line1\") or \"\" }}
            \n {% if company_address.get(\"address_line2\") %}{{ company_address.get(\"address_line2\") }}
            {% endif %}\n {{ company_address.get(\"city\") or \"\" }}, {{ company_address.get(\"state\") or \"\" }} {{ company_address.get(\"pincode\") or \"\" }}, {{ company_address.get(\"country\") or \"\" }}
            \n {% endif %}\n\t\t\t\t            		{{ _(\"Bill To\") }}:
            \n\t\t\t\t {% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.customer_name }}
            \n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
            \n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
            {% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
            \n\t\t\t\t\t{% endif %}\n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
            \n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t

            {{ _(\"Total in words\") }}

            \n\t\t\t\t
            {{ doc.in_words }}
            \n\t\t\t            		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
            {{ _(\"Sub Total:\") }}            		{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):            		{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
            \n\t\t\t
            \n\n\t\t\n\t\t
            \n\t\t\t{% if doc.terms %}\n\t\t\t
            \n\t\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t\t{{ doc.terms}}\n\t\t\t
            \n\t\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
            {{ letter_head }}
            \n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t{{ _(\"Supplier Name\") }}: {{doc.supplier_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Required By\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.schedule_date) }}\n\t\t\t\t
            {{ _(\"Order Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Order Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.transaction_date) }}\n\t\t\t\t
            {{ _(\"Supplier Address\") }}:
            \n\t\t\t\t\t{% if doc.supplier_address %}\n\t\t\t\t\t\t{% set supplier_address = frappe.db.get_value(\"Address\", doc.supplier_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.supplier_name }}
            \n\t\t\t\t\t\t{{ supplier_address.address_line1 or \"\" }}
            \n\t\t\t\t\t\t{% if supplier_address.address_line2 %}{{ supplier_address.address_line2 }}
            {% endif %}\n\t\t\t\t\t\t{{ supplier_address.city or \"\" }} {{ supplier_address.state or \"\" }} {{ supplier_address.pincode or \"\" }} {{ supplier_address.country or \"\" }}
            \n\t\t\t\t\t{% endif %}\n\t\t\t\t            		{{ _(\"Company Address\") }}:
            \n {% if doc.billing_address %}\n {% set billing_address = frappe.db.get_value(\"Address\", doc.billing_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.company }}
            \n {{ billing_address.get(\"address_line1\") or \"\" }}
            \n {% if billing_address.get(\"address_line2\") %}{{ billing_address.get(\"address_line2\") }}
            {% endif %}\n {{ billing_address.get(\"city\") or \"\" }}, {{ billing_address.get(\"state\") or \"\" }} {{ billing_address.get(\"pincode\") or \"\" }}, {{ billing_address.get(\"country\") or \"\" }}
            \n {% endif %}\n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
            \n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t

            {{ _(\"Total in words\") }}

            \n\t\t\t\t
            {{ doc.in_words }}
            \n\t\t\t            		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
            {{ _(\"Sub Total:\") }}            		{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):            		{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
            \n\t\t\t
            \n\n\t\t\n\t\t
            \n\t\t\t{% if doc.terms %}\n\t\t\t
            \n\t\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t\t{{ doc.terms}}\n\t\t\t
            \n\t\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", "idx": 0, "line_breaks": 0, "margin_bottom": 15.0, "margin_left": 15.0, "margin_right": 15.0, "margin_top": 15.0, - "modified": "2025-11-29 00:57:32.409130", + "modified": "2025-11-30 16:55:52.799647", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order Standard", diff --git a/erpnext/stock/print_format/delivery_note_standard/delivery_note_standard.json b/erpnext/stock/print_format/delivery_note_standard/delivery_note_standard.json index 656a715e855..691c0403f72 100644 --- a/erpnext/stock/print_format/delivery_note_standard/delivery_note_standard.json +++ b/erpnext/stock/print_format/delivery_note_standard/delivery_note_standard.json @@ -1,7 +1,7 @@ { "absolute_value": 0, "align_labels_right": 0, - "creation": "2025-11-29 01:01:37.362065", + "creation": "2025-11-30 16:53:24.456411", "custom_format": 1, "default_print_language": "en", "disabled": 0, @@ -9,14 +9,14 @@ "docstatus": 0, "doctype": "Print Format", "font_size": 14, - "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
            {{ letter_head }}
            \n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Payment Due Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.due_date) }}\n\t\t\t\t
            {{ _(\"Invoice Number\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Invoice Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
            {{ _(\"Bill From\") }}:
            \n\t\t\t\t\t{% if doc.company_address %}\n {% set company_address = frappe.db.get_value(\"Address\", doc.company_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.company }}
            \n {{ company_address.get(\"address_line1\") or \"\" }}
            \n {% if company_address.get(\"address_line2\") %}{{ company_address.get(\"address_line2\") }}
            {% endif %}\n {{ company_address.get(\"city\") or \"\" }}, {{ company_address.get(\"state\") or \"\" }} {{ company_address.get(\"pincode\") or \"\" }}, {{ company_address.get(\"country\") or \"\" }}
            \n {% endif %}\n\t\t\t\t            		{{ _(\"Bill To\") }}:
            \n\t\t\t\t {% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.customer_name }}
            \n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
            \n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
            {% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
            \n\t\t\t\t\t{% endif %}\n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
            \n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t

            {{ _(\"Total in words\") }}

            \n\t\t\t\t
            {{ doc.in_words }}
            \n\t\t\t            		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
            {{ _(\"Sub Total:\") }}            		{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):            		{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
            \n\t\t\t
            \n\n\t\t\n\t\t
            \n\t\t\t{% if doc.terms %}\n\t\t\t
            \n\t\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t\t{{ doc.terms}}\n\t\t\t
            \n\t\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\t{% if letter_head and not no_letterhead %}\n\t\t
            {{ letter_head }}
            \n\t{% endif %}\n\t{% if print_heading_template %}\n\t\t{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n\t{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t{{ _(\"Customer Name\") }}: {{doc.customer_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Status\") }}: {{ doc.status }}\n\t\t\t\t
            {{ _(\"Delivery Note\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.posting_date) }}\n\t\t\t\t
            {{ _(\"Company Address\") }}:
            \n\t\t\t\t\t{% if doc.company_address %}\n {% set company_address = frappe.db.get_value(\"Address\", doc.company_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.company }}
            \n {{ company_address.get(\"address_line1\") or \"\" }}
            \n {% if company_address.get(\"address_line2\") %}{{ company_address.get(\"address_line2\") }}
            {% endif %}\n {{ company_address.get(\"city\") or \"\" }}, {{ company_address.get(\"state\") or \"\" }} {{ company_address.get(\"pincode\") or \"\" }}, {{ company_address.get(\"country\") or \"\" }}
            \n {% endif %}\n\t\t\t\t            		{{ _(\"Customer Address\") }}:
            \n\t\t\t\t {% if doc.customer_address %}\n\t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.customer_name }}
            \n\t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
            \n\t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
            {% endif %}\n\t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
            \n\t\t\t\t\t{% endif %}\n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}{{ item.item_name }}{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}\n\t\t\t\t\t\t{{ item.get_formatted(\"net_amount\", doc) }}\n\t\t\t\t\t
            \n\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t

            {{ _(\"Total in words\") }}

            \n\t\t\t\t
            {{ doc.in_words }}
            \n\t\t\t            		\n\t\t\t\t \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t{%- endfor -%}\n\t\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t
            {{ _(\"Sub Total:\") }}            		{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):            		{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t\t
            {{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t\t            		{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ _(\"Grand Total:\") }}{{ doc.get_formatted(\"grand_total\", doc) }}
            \n\t\t\t
            \n\n\t\t\n\t\t
            \n\t\t\t{% if doc.terms %}\n\t\t\t
            \n\t\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t\t{{ doc.terms}}\n\t\t\t
            \n\t\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", "idx": 0, "line_breaks": 0, "margin_bottom": 15.0, "margin_left": 15.0, "margin_right": 15.0, "margin_top": 15.0, - "modified": "2025-11-29 01:02:00.693127", + "modified": "2025-11-30 16:53:24.456411", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note Standard", From 1125f963166e2ec7f315b0f3fedd2ad5078ca571 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Sun, 30 Nov 2025 17:25:02 +0530 Subject: [PATCH 083/328] feat: print format with images for PO, Delivery Note and POS Invoice --- .../pos_invoice_with_item_image/__init__.py | 0 .../pos_invoice_with_item_image.json | 33 +++++++++++++++++++ .../__init__.py | 0 .../purchase_order_with_item_image.json | 33 +++++++++++++++++++ .../delivery_note_with_item_image/__init__.py | 0 .../delivery_note_with_item_image.json | 33 +++++++++++++++++++ 6 files changed, 99 insertions(+) create mode 100644 erpnext/accounts/print_format/pos_invoice_with_item_image/__init__.py create mode 100644 erpnext/accounts/print_format/pos_invoice_with_item_image/pos_invoice_with_item_image.json create mode 100644 erpnext/buying/print_format/purchase_order_with_item_image/__init__.py create mode 100644 erpnext/buying/print_format/purchase_order_with_item_image/purchase_order_with_item_image.json create mode 100644 erpnext/stock/print_format/delivery_note_with_item_image/__init__.py create mode 100644 erpnext/stock/print_format/delivery_note_with_item_image/delivery_note_with_item_image.json diff --git a/erpnext/accounts/print_format/pos_invoice_with_item_image/__init__.py b/erpnext/accounts/print_format/pos_invoice_with_item_image/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/accounts/print_format/pos_invoice_with_item_image/pos_invoice_with_item_image.json b/erpnext/accounts/print_format/pos_invoice_with_item_image/pos_invoice_with_item_image.json new file mode 100644 index 00000000000..ae878a47c77 --- /dev/null +++ b/erpnext/accounts/print_format/pos_invoice_with_item_image/pos_invoice_with_item_image.json @@ -0,0 +1,33 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2025-11-30 17:22:25.000765", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "POS Invoice", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 14, + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n
            {{ letter_head }}
            \n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            Customer Name:
            \n\t\t\t\t\t\t
            Bill to:
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.customer_name }}
            \n\t\t\t\t\t\t
            \n \t\t\t\t\t{% if doc.customer_address %}\n \t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n \t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
            \n \t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
            {% endif %}\n \t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
            \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t
            \n\n\t\t\t\t\t
            \n\t\t\t\t            		\n\t\t\t\t\t
            \n\t\t\t\t\t\t
            Invoice Number:
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.name }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            Invoice Date:
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ frappe.utils.format_date(doc.posting_date) }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            Payment Due Date:
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ frappe.utils.format_date(doc.due_date) }}
            \n\t\t\t\t\t
            \n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% if item.image %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% endif %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t{{ item.item_name }}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t
            \n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t
            \n\t\t\t\t\t            		{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}{{ item.get_formatted(\"net_amount\", doc) }}
            \n\n\t\t
            \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\n\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t{%- endfor -%}\n\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t
            {{ _(\"Sub Total:\") }}{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
            \n\t\t
            \n\n\t\t
            \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
            \n\t\t\t\t\t\t
            \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t
            \n\t\t\t\t\t            		{{ _(\"Grand Total:\") }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t
            \n\t\t
            \n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t
            \n\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t{{ doc.terms}}\n\t\t
            \n\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2025-11-30 17:22:25.000765", + "modified_by": "Administrator", + "module": "Accounts", + "name": "POS Invoice with Item Image", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "wkhtmltopdf", + "print_format_builder": 0, + "print_format_builder_beta": 0, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} diff --git a/erpnext/buying/print_format/purchase_order_with_item_image/__init__.py b/erpnext/buying/print_format/purchase_order_with_item_image/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/buying/print_format/purchase_order_with_item_image/purchase_order_with_item_image.json b/erpnext/buying/print_format/purchase_order_with_item_image/purchase_order_with_item_image.json new file mode 100644 index 00000000000..6196baef40f --- /dev/null +++ b/erpnext/buying/print_format/purchase_order_with_item_image/purchase_order_with_item_image.json @@ -0,0 +1,33 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2025-11-30 17:07:51.896474", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Purchase Order", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 14, + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n
            {{ letter_head }}
            \n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            Customer Name:
            \n\t\t\t\t\t\t
            Bill to:
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.supplier_name }}
            \n\t\t\t\t\t\t
            \n \t\t\t\t\t{% if doc.supplier_address %}\n \t\t\t\t\t\t{% set supplier_address = frappe.db.get_value(\"Address\", doc.supplier_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.supplier_name }}
            \n \t\t\t\t\t\t{{ supplier_address.address_line1 or \"\" }}
            \n \t\t\t\t\t\t{% if supplier_address.address_line2 %}{{ supplier_address.address_line2 }}
            {% endif %}\n \t\t\t\t\t\t{{ supplier_address.city or \"\" }} {{ supplier_address.state or \"\" }} {{ supplier_address.pincode or \"\" }} {{ supplier_address.country or \"\" }}
            \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t
            \n\n\t\t\t\t\t
            \n\t\t\t\t            		\n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Purchase Order:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.name }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Order Date:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ frappe.utils.format_date(doc.transaction_date) }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Required By:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ frappe.utils.format_date(doc.schedule_date) }}
            \n\t\t\t\t\t
            \n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% if item.image %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% endif %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t{{ item.item_name }}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t
            \n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t
            \n\t\t\t\t\t            		{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}{{ item.get_formatted(\"net_amount\", doc) }}
            \n\n\t\t
            \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\n\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t{%- endfor -%}\n\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t
            {{ _(\"Sub Total:\") }}{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
            \n\t\t
            \n\n\t\t
            \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
            \n\t\t\t\t\t\t
            \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t
            \n\t\t\t\t\t            		{{ _(\"Grand Total:\") }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t
            \n\t\t
            \n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t
            \n\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t{{ doc.terms}}\n\t\t
            \n\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2025-11-30 17:07:51.896474", + "modified_by": "Administrator", + "module": "Buying", + "name": "Purchase Order with Item Image", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "wkhtmltopdf", + "print_format_builder": 0, + "print_format_builder_beta": 0, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} diff --git a/erpnext/stock/print_format/delivery_note_with_item_image/__init__.py b/erpnext/stock/print_format/delivery_note_with_item_image/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/stock/print_format/delivery_note_with_item_image/delivery_note_with_item_image.json b/erpnext/stock/print_format/delivery_note_with_item_image/delivery_note_with_item_image.json new file mode 100644 index 00000000000..d59b9bcba9d --- /dev/null +++ b/erpnext/stock/print_format/delivery_note_with_item_image/delivery_note_with_item_image.json @@ -0,0 +1,33 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2025-11-30 17:17:23.062996", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Delivery Note", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 14, + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n
            {{ letter_head }}
            \n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Customer Name:\") }}
            \n\t\t\t\t\t\t
            {{ _(\"Address:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.customer_name }}
            \n\t\t\t\t\t\t
            \n \t\t\t\t\t{% if doc.customer_address %}\n \t\t\t\t\t\t{% set customer_address = frappe.db.get_value(\"Address\", doc.customer_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n \t\t\t\t\t\t{{ customer_address.address_line1 or \"\" }}
            \n \t\t\t\t\t\t{% if customer_address.address_line2 %}{{ customer_address.address_line2 }}
            {% endif %}\n \t\t\t\t\t\t{{ customer_address.city or \"\" }} {{ customer_address.state or \"\" }} {{ customer_address.pincode or \"\" }} {{ customer_address.country or \"\" }}
            \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t
            \n\n\t\t\t\t\t
            \n\t\t\t\t            		\n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Delivery Note:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.name }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Delivery Date:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ frappe.utils.format_date(doc.posting_date) }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Status:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.status }}
            \n\t\t\t\t\t
            \n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% if item.image %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% endif %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t{{ item.item_name }}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t
            \n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t
            \n\t\t\t\t\t            		{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}{{ item.get_formatted(\"net_amount\", doc) }}
            \n\n\t\t
            \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\n\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t{%- endfor -%}\n\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t
            {{ _(\"Sub Total:\") }}{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
            \n\t\t
            \n\n\t\t
            \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
            \n\t\t\t\t\t\t
            \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t
            \n\t\t\t\t\t            		{{ _(\"Grand Total:\") }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t
            \n\t\t
            \n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t
            \n\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t{{ doc.terms}}\n\t\t
            \n\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2025-11-30 17:17:23.062996", + "modified_by": "Administrator", + "module": "Stock", + "name": "Delivery Note with Item Image", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "wkhtmltopdf", + "print_format_builder": 0, + "print_format_builder_beta": 0, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} From b808a51d8f6a664f8cbb8fa4ad657f7fef5e80f8 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Sun, 30 Nov 2025 17:38:50 +0530 Subject: [PATCH 084/328] refactor: Make labels translatable --- erpnext/public/js/print.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/erpnext/public/js/print.js b/erpnext/public/js/print.js index 55c90ad773f..4afd34e16dd 100644 --- a/erpnext/public/js/print.js +++ b/erpnext/public/js/print.js @@ -39,9 +39,9 @@ function fetch_company_details(doctype, docname) { function open_company_details_dialog(data) { const dialog = new frappe.ui.Dialog({ - title: "Enter Company Details", + title: __("Enter Company Details"), fields: build_dialog_fields(data), - primary_action_label: "Save", + primary_action_label: __("Save"), primary_action(values) { save_company_details(dialog, data, values); }, @@ -52,11 +52,11 @@ function open_company_details_dialog(data) { function build_dialog_fields(data) { return [ - make_field("Company Logo", "company_logo", "Attach Image", data.company_logo), - make_field("Website", "website", "Data", data.website), - make_field("Phone No", "phone_no", "Data", data.phone_no), + make_field(__("Company Logo"), "company_logo", "Attach Image", data.company_logo), + make_field(__("Website"), "website", "Data", data.website), + make_field(__("Phone No"), "phone_no", "Data", data.phone_no), { - label: "Email", + label: __("Email"), fieldname: "email", fieldtype: "Data", options: "Email", @@ -65,9 +65,9 @@ function build_dialog_fields(data) { }, { fieldtype: "Section Break" }, - make_field("Address Title", "address_title", "Data", data.address_line), + make_field(__("Address Title"), "address_title", "Data", data.address_line), { - label: "Address Type", + label: __("Address Type"), fieldname: "address_type", fieldtype: "Select", options: ["Billing", "Shipping"], @@ -75,22 +75,22 @@ function build_dialog_fields(data) { reqd: data.address_line ? 0 : 1, hidden: data.address_line ? 1 : 0, }, - make_field("Address Line 1", "address_line1", "Data", data.address_line), - make_field("Address Line 2", "address_line2", "Data", data.address_line, false), - make_field("City", "city", "Data", data.address_line), - make_field("State", "state", "Data", data.address_line, false), + make_field(__("Address Line 1"), "address_line1", "Data", data.address_line), + make_field(__("Address Line 2"), "address_line2", "Data", data.address_line, false), + make_field(__("City"), "city", "Data", data.address_line), + make_field(__("State"), "state", "Data", data.address_line, false), { - label: "Country", + label: __("Country"), fieldname: "country", fieldtype: "Link", options: "Country", reqd: data.address_line ? 0 : 1, hidden: data.address_line ? 1 : 0, }, - make_field("Postal Code", "pincode", "Data", data.address_line, false), + make_field(__("Postal Code"), "pincode", "Data", data.address_line, false), { - label: "Select Company Address", + label: __("Select Company Address"), fieldname: "company_address", fieldtype: "Link", options: "Address", @@ -127,7 +127,7 @@ function save_company_details(dialog, data, values) { }, callback() { dialog.hide(); - frappe.msgprint("Updating details."); + frappe.msgprint(__("Updating details.")); setTimeout(() => { location.reload(); From 5cfd7ec32aecd1a4df8b378599b425c177c1cf7c Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Sun, 30 Nov 2025 18:30:47 +0530 Subject: [PATCH 085/328] refactor: generalize popup for multiple doctypes --- erpnext/controllers/accounts_controller.py | 51 +++++++++++++++------- erpnext/public/js/print.js | 26 +++++++---- 2 files changed, 54 insertions(+), 23 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 48e2adef651..fb809473962 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -4175,7 +4175,10 @@ def get_missing_company_details(doctype, docname): from frappe.contacts.doctype.address.address import get_address_display_list company = frappe.db.get_value(doctype, docname, "company") - company_address = frappe.db.get_value(doctype, docname, "company_address") + if doctype == "Purchase Order": + company_address = frappe.db.get_value(doctype, docname, "billing_address") + else: + company_address = frappe.db.get_value(doctype, docname, "company_address") company_details = frappe.get_value( "Company", company, ["company_logo", "website", "phone_no", "email"], as_dict=True @@ -4195,7 +4198,7 @@ def get_missing_company_details(doctype, docname): ) return - if not company_address and not frappe.has_permission("Sales Invoice", "write", throw=False): + if not company_address and not frappe.has_permission(doctype, "write", throw=False): frappe.msgprint( _( "Company Address is missing. You don't have permission to update it. Please contact your System Manager." @@ -4224,7 +4227,7 @@ def get_missing_company_details(doctype, docname): @frappe.whitelist() -def update_company_master_and_address(name, company, details): +def update_company_master_and_address(current_doctype, name, company, details): from frappe.utils import validate_email_address if isinstance(details, str): @@ -4259,18 +4262,36 @@ def update_company_master_and_address(name, company, details): address_doc.insert() company_address = address_doc.name - if company_address: - company_address_display = frappe.db.get_value("Sales Invoice", name, "company_address_display") - if not company_address_display or details.get("address_line1"): - from frappe.query_builder import DocType + update_doc_company_address(current_doctype, name, company_address, details) - SalesInvoice = DocType("Sales Invoice") - ( - frappe.qb.update(SalesInvoice) - .set(SalesInvoice.company_address, company_address) - .set(SalesInvoice.company_address_display, get_address_display(company_address)) - .where(SalesInvoice.name == name) - ).run() +def update_doc_company_address(current_doctype, docname, company_address, details): + if not company_address: + return - return True + address_field_map = { + "Purchase Order": ("billing_address", "billing_address_display"), + "Sales Invoice": ("company_address", "company_address_display"), + "Delivery Note": ("company_address", "company_address_display"), + "POS Invoice": ("company_address", "company_address_display"), + } + + address_field, display_field = address_field_map.get( + current_doctype, ("company_address", "company_address_display") + ) + + current_display = frappe.db.get_value(current_doctype, docname, display_field) + + if current_display and not details.get("address_line1"): + return + + from frappe.query_builder import DocType + + DocType = DocType(current_doctype) + + ( + frappe.qb.update(DocType) + .set(getattr(DocType, address_field), company_address) + .set(getattr(DocType, display_field), get_address_display(company_address)) + .where(DocType.name == docname) + ).run() diff --git a/erpnext/public/js/print.js b/erpnext/public/js/print.js index 4afd34e16dd..105a580aed6 100644 --- a/erpnext/public/js/print.js +++ b/erpnext/public/js/print.js @@ -1,5 +1,14 @@ -const doctype_list = ["Sales Invoice"]; -const allowed_print_formats = ["Sales Invoice Standard", "Sales Invoice with Item Image"]; +const doctype_list = ["Sales Invoice", "Delivery Note", "Purchase Order", "POS Invoice"]; +const allowed_print_formats = [ + "Sales Invoice Standard", + "Sales Invoice with Item Image", + "Delivery Note Standard", + "Delivery Note with Item Image", + "Purchase Order Standard", + "Purchase Order with Item Image", + "POS Invoice Standard", + "POS Invoice with Item Image", +]; const allowed_letterheads = ["Company Letterhead", "Company Letterhead - Grey"]; handle_route_event(); @@ -25,25 +34,25 @@ function should_fetch_company_details() { return allowed_print_formats.includes(print_format) || allowed_letterheads.includes(letterhead); } -function fetch_company_details(doctype, docname) { +function fetch_company_details(current_doctype, current_docname) { frappe.call({ method: "erpnext.controllers.accounts_controller.get_missing_company_details", - args: { doctype, docname }, + args: { doctype: current_doctype, docname: current_docname }, callback: function (r) { if (r && r.message) { - open_company_details_dialog(r.message); + open_company_details_dialog(r.message, current_doctype); } }, }); } -function open_company_details_dialog(data) { +function open_company_details_dialog(data, current_doctype) { const dialog = new frappe.ui.Dialog({ title: __("Enter Company Details"), fields: build_dialog_fields(data), primary_action_label: __("Save"), primary_action(values) { - save_company_details(dialog, data, values); + save_company_details(dialog, data, values, current_doctype); }, }); @@ -117,13 +126,14 @@ function make_field(label, fieldname, fieldtype, existing_value, required_if_emp }; } -function save_company_details(dialog, data, values) { +function save_company_details(dialog, data, values, current_doctype) { frappe.call({ method: "erpnext.controllers.accounts_controller.update_company_master_and_address", args: { name: data.name, company: data.company, details: values, + current_doctype: current_doctype, }, callback() { dialog.hide(); From d050cd221d156b2c4e3f7c2f4e0bb7559afe2597 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Sun, 30 Nov 2025 21:29:26 +0530 Subject: [PATCH 086/328] fix: minor change --- .../purchase_order_with_item_image.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/buying/print_format/purchase_order_with_item_image/purchase_order_with_item_image.json b/erpnext/buying/print_format/purchase_order_with_item_image/purchase_order_with_item_image.json index 6196baef40f..2f4c09b0cb6 100644 --- a/erpnext/buying/print_format/purchase_order_with_item_image/purchase_order_with_item_image.json +++ b/erpnext/buying/print_format/purchase_order_with_item_image/purchase_order_with_item_image.json @@ -9,14 +9,14 @@ "docstatus": 0, "doctype": "Print Format", "font_size": 14, - "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n
            {{ letter_head }}
            \n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            Customer Name:
            \n\t\t\t\t\t\t
            Bill to:
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.supplier_name }}
            \n\t\t\t\t\t\t
            \n \t\t\t\t\t{% if doc.supplier_address %}\n \t\t\t\t\t\t{% set supplier_address = frappe.db.get_value(\"Address\", doc.supplier_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.supplier_name }}
            \n \t\t\t\t\t\t{{ supplier_address.address_line1 or \"\" }}
            \n \t\t\t\t\t\t{% if supplier_address.address_line2 %}{{ supplier_address.address_line2 }}
            {% endif %}\n \t\t\t\t\t\t{{ supplier_address.city or \"\" }} {{ supplier_address.state or \"\" }} {{ supplier_address.pincode or \"\" }} {{ supplier_address.country or \"\" }}
            \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t
            \n\n\t\t\t\t\t
            \n\t\t\t\t            		\n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Purchase Order:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.name }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Order Date:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ frappe.utils.format_date(doc.transaction_date) }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Required By:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ frappe.utils.format_date(doc.schedule_date) }}
            \n\t\t\t\t\t
            \n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% if item.image %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% endif %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t{{ item.item_name }}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t
            \n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t
            \n\t\t\t\t\t            		{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}{{ item.get_formatted(\"net_amount\", doc) }}
            \n\n\t\t
            \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\n\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t{%- endfor -%}\n\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t
            {{ _(\"Sub Total:\") }}{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
            \n\t\t
            \n\n\t\t
            \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
            \n\t\t\t\t\t\t
            \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t
            \n\t\t\t\t\t            		{{ _(\"Grand Total:\") }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t
            \n\t\t
            \n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t
            \n\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t{{ doc.terms}}\n\t\t
            \n\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", + "html": "{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}\n\n{% if letter_head and not no_letterhead %}\n
            {{ letter_head }}
            \n{% endif %}\n{% if print_heading_template %}\n{{ frappe.render_template(print_heading_template, {\"doc\":doc}) }}\n{% endif %}\n{%- endmacro -%}\n\n{% for page in layout %}\n
            \n\t
            \n\t\t{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}\n\t
            \n\t{%- if doc.meta.is_submittable and doc.docstatus==2-%}\n\t\t
            \n\t\t\t

            {{ _(\"CANCELLED\") }}

            \n\t\t
            \n\t{%- endif -%}\n\t{%- if doc.meta.is_submittable and doc.docstatus==0 and (print_settings==None or print_settings.add_draft_heading) -%}\n\t\t
            \n\t\t\t

            {{ _(\"DRAFT\") }}

            \n\t\t
            \n\t{%- endif -%}\n\n\t\n\n\t
            \n\t\t\n\t\t\t\n\t\t\t\t\n\n\t\t\t\t\n\t\t\t\n\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            Customer Name:
            \n\t\t\t\t\t\t
            Supplier Address:
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.supplier_name }}
            \n\t\t\t\t\t\t
            \n \t\t\t\t\t{% if doc.supplier_address %}\n \t\t\t\t\t\t{% set supplier_address = frappe.db.get_value(\"Address\", doc.supplier_address, [\"address_line1\", \"address_line2\", \"city\", \"state\", \"pincode\", \"country\"], as_dict=True) %}\n {{ doc.supplier_name }}
            \n \t\t\t\t\t\t{{ supplier_address.address_line1 or \"\" }}
            \n \t\t\t\t\t\t{% if supplier_address.address_line2 %}{{ supplier_address.address_line2 }}
            {% endif %}\n \t\t\t\t\t\t{{ supplier_address.city or \"\" }} {{ supplier_address.state or \"\" }} {{ supplier_address.pincode or \"\" }} {{ supplier_address.country or \"\" }}
            \n \t\t\t\t\t{% endif %}\n\t\t\t\t\t\t
            \n\n\t\t\t\t\t
            \n\t\t\t\t            		\n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Purchase Order:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ doc.name }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Order Date:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ frappe.utils.format_date(doc.transaction_date) }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ _(\"Required By:\") }}
            \n\t\t\t\t\t
            \n\t\t\t\t\t
            \n\t\t\t\t\t\t
            {{ frappe.utils.format_date(doc.schedule_date) }}
            \n\t\t\t\t\t
            \n\t\t\t\t
            \n\n\t\t\n\t\t{% set item_naming_by = frappe.db.get_single_value(\"Stock Settings\", \"item_naming_by\") %}\n\t\t\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\n\t\t\t\n\t\t\t\t{% for item in doc.items %}\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t{% if item_naming_by != \"Item Code\" %}\n\t\t\t\t\t\t\n\t\t\t\t\t{% endif %}\n\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t{% endfor %}\n\t\t\t\n\t\t
            {{ _(\"No\") }}{{ _(\"Item\") }}{{ _(\"Item Code\") }}{{ _(\"Quantity\") }}{{ _(\"Rate\") }}{{ _(\"Amount\") }}
            {{ loop.index }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% if item.image %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t{% endif %}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t{{ item.item_name }}\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t
            \n\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t
            \n\t\t\t\t\t            		{{ item.item_code }}{{ item.get_formatted(\"qty\", 0) }} {{ item.uom }}{{ item.get_formatted(\"net_rate\", doc) }}{{ item.get_formatted(\"net_amount\", doc) }}
            \n\n\t\t
            \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\n\t\t\t\t{%- if doc.apply_discount_on == \"Net Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- for tax in doc.taxes -%}\n\t\t\t\t\t{%- if (tax.tax_amount or print_settings.print_taxes_with_zero_amount) and (not tax.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) -%}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t{%- endif -%}\n\t\t\t\t{%- endfor -%}\n\t\t\t\t{%- if doc.apply_discount_on == \"Grand Total\" -%}\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t{%- endif -%}\n\t\t\t
            {{ _(\"Sub Total:\") }}{{ doc.get_formatted(\"total\", doc) }}
            \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
            {{ tax.get_formatted(\"description\") }} ({{ tax.get_formatted(\"rate\") }}%):{{ tax.get_formatted(\"tax_amount\") }}
            \n\t\t\t\t\t\t\t{{ _(\"Discount\") }} ({{ doc.additional_discount_percentage }}%):\n\t\t\t\t\t\t{{ doc.get_formatted(\"discount_amount\", doc) }}
            \n\t\t
            \n\n\t\t
            \n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t
            \n\t\t\t\t\t\t
            \n\t\t\t\t\t\t\t {{ _(\"In Words: \") }}{{ doc.in_words }}\n\t\t\t\t\t\t
            \n\t\t\t\t\t            		{{ _(\"Grand Total:\") }}\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t{{ doc.get_formatted(\"grand_total\", doc) }}\n\t\t\t\t\t\t\n\t\t\t\t\t
            \n\t\t
            \n\n\n\t\t\n\t\t{% if doc.terms %}\n\t\t
            \n\t\t\t
            {{ _(\"Terms and Conditions\") }}
            \n\t\t\t{{ doc.terms}}\n\t\t
            \n\t\t{% endif %}\n\t
            \n
            \n{% endfor %}\n", "idx": 0, "line_breaks": 0, "margin_bottom": 15.0, "margin_left": 15.0, "margin_right": 15.0, "margin_top": 15.0, - "modified": "2025-11-30 17:07:51.896474", + "modified": "2025-11-30 20:07:51.896474", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order with Item Image", From 7e8d19b0c8deaee68dcf2aa617f7334e958a5b12 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Sun, 30 Nov 2025 23:30:15 +0530 Subject: [PATCH 087/328] fix(email campaign): send emails using bcc --- erpnext/crm/doctype/email_campaign/email_campaign.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/crm/doctype/email_campaign/email_campaign.py b/erpnext/crm/doctype/email_campaign/email_campaign.py index 6bfa4f8b3cb..a5a2132dc0c 100644 --- a/erpnext/crm/doctype/email_campaign/email_campaign.py +++ b/erpnext/crm/doctype/email_campaign/email_campaign.py @@ -123,7 +123,7 @@ def send_mail(entry, email_campaign): subject=frappe.render_template(email_template.get("subject"), context), content=frappe.render_template(email_template.response_, context), sender=sender, - recipients=recipient_list, + bcc=recipient_list, communication_medium="Email", sent_or_received="Sent", send_email=True, From 0c1df307718d92e1b50258d9bf4625a95268ef39 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Mon, 1 Dec 2025 13:13:55 +0530 Subject: [PATCH 088/328] fix: add permission check --- erpnext/assets/doctype/asset_repair/asset_repair.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 7686d72959b..9a58ce286c1 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -550,6 +550,11 @@ def get_unallocated_repair_cost( """ Calculate the unused repair cost for a purchase invoice and expense account. """ + if not purchase_invoice or not expense_account: + return 0.0 + + frappe.has_permission("Purchase Invoice","read", purchase_invoice, throw=True) + used_amount = get_allocated_repair_cost(purchase_invoice, expense_account, exclude_asset_repair) total_amount = get_total_expense_amount(purchase_invoice, expense_account) From 2a0ba84f693c33a3b6c8ee6d684f205bacfae576 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Mon, 1 Dec 2025 13:17:47 +0530 Subject: [PATCH 089/328] refactor: linters --- erpnext/assets/doctype/asset_repair/asset_repair.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 9a58ce286c1..d9a6742a59a 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -553,7 +553,7 @@ def get_unallocated_repair_cost( if not purchase_invoice or not expense_account: return 0.0 - frappe.has_permission("Purchase Invoice","read", purchase_invoice, throw=True) + frappe.has_permission("Purchase Invoice", "read", purchase_invoice, throw=True) used_amount = get_allocated_repair_cost(purchase_invoice, expense_account, exclude_asset_repair) total_amount = get_total_expense_amount(purchase_invoice, expense_account) From 25458d6ba683e5f6d90c06a8d92669372497d254 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 1 Dec 2025 16:04:05 +0530 Subject: [PATCH 091/328] fix: flaky production plan test --- .../production_plan/test_production_plan.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py index 03ff4beb339..ec52031513f 100644 --- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py @@ -1143,7 +1143,7 @@ class TestProductionPlan(IntegrationTestCase): for item_code in mr_items: self.assertTrue(item_code in validate_mr_items) - def test_resered_qty_for_production_plan_for_material_requests(self): + def test_reserved_qty_for_production_plan_for_material_requests(self): from erpnext.stock.utils import get_or_make_bin bin_name = get_or_make_bin("Raw Material Item 1", "_Test Warehouse - _TC") @@ -1165,7 +1165,7 @@ class TestProductionPlan(IntegrationTestCase): self.assertEqual(pln.docstatus, 2) self.assertEqual(after_qty, before_qty) - def test_resered_qty_for_production_plan_for_work_order(self): + def test_reserved_qty_for_production_plan_for_work_order(self): from erpnext.stock.utils import get_or_make_bin bin_name = get_or_make_bin("Raw Material Item 1", "_Test Warehouse - _TC") @@ -1218,7 +1218,7 @@ class TestProductionPlan(IntegrationTestCase): self.assertEqual(after_qty, before_qty) - def test_resered_qty_for_production_plan_for_less_rm_qty(self): + def test_reserved_qty_for_production_plan_for_less_rm_qty(self): from erpnext.stock.utils import get_or_make_bin bin_name = get_or_make_bin("Raw Material Item 1", "_Test Warehouse - _TC") @@ -1256,11 +1256,12 @@ class TestProductionPlan(IntegrationTestCase): after_qty = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan")) self.assertEqual(after_qty, before_qty) - completed_plans = get_non_completed_production_plans() - for plan in plans: - self.assertFalse(plan in completed_plans) + non_completed_plans = get_non_completed_production_plans() - def test_resered_qty_for_production_plan_for_material_requests_with_multi_UOM(self): + for plan in plans: + self.assertTrue(plan in non_completed_plans) + + def test_reserved_qty_for_production_plan_for_material_requests_with_multi_UOM(self): from erpnext.stock.utils import get_or_make_bin fg_item = make_item(properties={"is_stock_item": 1, "stock_uom": "_Test UOM 1"}).name From 8ee2cbf259abf9d1357f28ebd2b0bf8945b2c0d8 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Mon, 1 Dec 2025 17:05:00 +0530 Subject: [PATCH 092/328] chore: remove unwanted strings --- erpnext/assets/doctype/asset_repair/asset_repair.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index d9a6742a59a..0869f80dc79 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -498,13 +498,7 @@ def get_expense_accounts(doctype, txt, searchfield, start, page_len, filters): def _get_expense_accounts_for_purchase_invoice(purchase_invoice: str) -> list[str]: """ - Internal function to get expense accounts for non-stock items from the purchase invoice. - - Args: - purchase_invoice: The Purchase Invoice name - - Returns: - List of expense account names + Get expense accounts for non-stock items from the purchase invoice. """ pi_items = frappe.db.get_all( "Purchase Invoice Item", From e1fd90f731c48780929b7938fb40297e1b9a63b0 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Mon, 1 Dec 2025 17:06:42 +0530 Subject: [PATCH 093/328] chore: remove unused import for depreciation schedule --- erpnext/assets/doctype/asset_repair/asset_repair.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 0869f80dc79..cbe0f711f15 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -12,7 +12,6 @@ from erpnext.accounts.general_ledger import make_gl_entries from erpnext.assets.doctype.asset.asset import get_asset_account from erpnext.assets.doctype.asset_activity.asset_activity import add_asset_activity from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_schedule import ( - get_depr_schedule, reschedule_depreciation, ) from erpnext.controllers.accounts_controller import AccountsController From cfdbeb6a1a6810852b1b517edb261c68cf55d3a4 Mon Sep 17 00:00:00 2001 From: Jatin3128 Date: Mon, 1 Dec 2025 17:33:49 +0530 Subject: [PATCH 094/328] feat(accounting-period): add role-based bypass for accounting period restrictions --- .../doctype/accounting_period/accounting_period.json | 11 ++++++++++- .../doctype/accounting_period/accounting_period.py | 8 +++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/accounting_period/accounting_period.json b/erpnext/accounts/doctype/accounting_period/accounting_period.json index 4e7313984b8..2fb69f6b97c 100644 --- a/erpnext/accounts/doctype/accounting_period/accounting_period.json +++ b/erpnext/accounts/doctype/accounting_period/accounting_period.json @@ -12,6 +12,7 @@ "column_break_4", "company", "disabled", + "exempted_role", "section_break_7", "closed_documents" ], @@ -67,10 +68,18 @@ "label": "Closed Documents", "options": "Closed Document", "reqd": 1 + }, + { + "description": "Role allowed to bypass period restrictions.", + "fieldname": "exempted_role", + "fieldtype": "Link", + "label": "Exempted Role", + "link_filters": "[[\"Role\",\"disabled\",\"=\",0]]", + "options": "Role" } ], "links": [], - "modified": "2025-10-06 15:00:15.568067", + "modified": "2025-12-01 16:53:44.631299", "modified_by": "Administrator", "module": "Accounts", "name": "Accounting Period", diff --git a/erpnext/accounts/doctype/accounting_period/accounting_period.py b/erpnext/accounts/doctype/accounting_period/accounting_period.py index b0fccf7c524..c4e51d813b2 100644 --- a/erpnext/accounts/doctype/accounting_period/accounting_period.py +++ b/erpnext/accounts/doctype/accounting_period/accounting_period.py @@ -30,6 +30,7 @@ class AccountingPeriod(Document): company: DF.Link disabled: DF.Check end_date: DF.Date + exempted_role: DF.Link | None period_name: DF.Data start_date: DF.Date # end: auto-generated types @@ -113,7 +114,7 @@ def validate_accounting_period_on_doc_save(doc, method=None): accounting_period = ( frappe.qb.from_(ap) .from_(cd) - .select(ap.name) + .select(ap.name, ap.exempted_role) .where( (ap.name == cd.parent) & (ap.company == doc.company) @@ -126,6 +127,11 @@ def validate_accounting_period_on_doc_save(doc, method=None): ).run(as_dict=1) if accounting_period: + if ( + accounting_period[0].get("exempted_role") + and accounting_period[0].get("exempted_role") in frappe.get_roles() + ): + return frappe.throw( _("You cannot create a {0} within the closed Accounting Period {1}").format( doc.doctype, frappe.bold(accounting_period[0]["name"]) From 38b453630044ec4151da5aef3dcbae944e2c9013 Mon Sep 17 00:00:00 2001 From: Sudharsanan11 Date: Mon, 1 Dec 2025 19:23:35 +0530 Subject: [PATCH 095/328] fix(pos): add negative stock validation for product bundle --- .../doctype/pos_invoice/pos_invoice.py | 101 +++++++++++++----- 1 file changed, 77 insertions(+), 24 deletions(-) diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py index d4825b87212..9f2d6431fba 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py @@ -20,6 +20,7 @@ from erpnext.accounts.party import get_due_date, get_party_account from erpnext.controllers.queries import item_query as _item_query from erpnext.controllers.sales_and_purchase_return import get_sales_invoice_item_from_consolidated_invoice from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos +from erpnext.stock.stock_ledger import is_negative_stock_allowed class POSInvoice(SalesInvoice): @@ -395,32 +396,66 @@ class POSInvoice(SalesInvoice): for d in self.get("items"): if not d.serial_and_batch_bundle: - available_stock, is_stock_item, is_negative_stock_allowed = get_stock_availability( - d.item_code, d.warehouse - ) + if frappe.db.exists("Product Bundle", d.item_code): + ( + availability, + is_stock_item, + is_negative_stock_allowed, + ) = get_product_bundle_stock_availability(d.item_code, d.warehouse, d.stock_qty) + + else: + availability, is_stock_item, is_negative_stock_allowed = get_stock_availability( + d.item_code, d.warehouse + ) if is_negative_stock_allowed: continue - item_code, warehouse, _qty = ( - frappe.bold(d.item_code), - frappe.bold(d.warehouse), - frappe.bold(d.qty), - ) - if is_stock_item and flt(available_stock) <= 0: - frappe.throw( - _("Row #{}: Item Code: {} is not available under warehouse {}.").format( - d.idx, item_code, warehouse - ), - title=_("Item Unavailable"), - ) - elif is_stock_item and flt(available_stock) < flt(d.stock_qty): - frappe.throw( - _("Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}.").format( - d.idx, item_code, warehouse - ), - title=_("Item Unavailable"), - ) + if isinstance(availability, list): + error_msgs = [] + for item in availability: + if flt(item["available"]) < flt(item["required"]): + error_msgs.append( + _("
          • Packed Item {0}: Required {1}, Available {2}
            • ").format( + frappe.bold(item["item_code"]), + frappe.bold(flt(item["required"], 2)), + frappe.bold(flt(item["available"], 2)), + ) + ) + + if error_msgs: + frappe.throw( + _( + "Row #{0}: Bundle {1} in warehouse {2} has insufficient packed items:
              {3}
            " + ).format( + d.idx, + frappe.bold(d.item_code), + frappe.bold(d.warehouse), + "
            ".join(error_msgs), + ), + title=_("Insufficient Stock for Product Bundle Items"), + ) + + else: + item_code, warehouse = frappe.bold(d.item_code), frappe.bold(d.warehouse) + if is_stock_item and flt(availability) <= 0: + frappe.throw( + _("Row #{0}: Item {1} has no stock in warehouse {2}.").format( + d.idx, item_code, warehouse + ), + title=_("Item Out of Stock"), + ) + elif is_stock_item and flt(availability) < flt(d.stock_qty): + frappe.throw( + _("Row #{0}: Item {1} in warehouse {2}: Available {3}, Needed {4}.").format( + d.idx, + item_code, + warehouse, + frappe.bold(flt(availability, 2)), + frappe.bold(flt(d.stock_qty, 2)), + ), + title=_("Insufficient Stock"), + ) def validate_is_pos_using_sales_invoice(self): self.invoice_type_in_pos = frappe.db.get_single_value("POS Settings", "invoice_type") @@ -858,8 +893,6 @@ class POSInvoice(SalesInvoice): @frappe.whitelist() def get_stock_availability(item_code, warehouse): - from erpnext.stock.stock_ledger import is_negative_stock_allowed - if frappe.db.get_value("Item", item_code, "is_stock_item"): is_stock_item = True bin_qty = get_bin_qty(item_code, warehouse) @@ -876,6 +909,26 @@ def get_stock_availability(item_code, warehouse): return 0, is_stock_item, False +def get_product_bundle_stock_availability(item_code, warehouse, item_qty): + is_stock_item = True + bundle = frappe.get_doc("Product Bundle", item_code) + availabilities = [] + for bundle_item in bundle.items: + if frappe.get_value("Item", bundle_item.item_code, "is_stock_item"): + bin_qty = get_bin_qty(bundle_item.item_code, warehouse) + reserved_qty = get_pos_reserved_qty(bundle_item.item_code, warehouse) + available = bin_qty - reserved_qty + availabilities.append( + { + "item_code": bundle_item.item_code, + "required": bundle_item.qty * item_qty, + "available": available, + } + ) + + return availabilities, is_stock_item, is_negative_stock_allowed(item_code=item_code) + + def get_bundle_availability(bundle_item_code, warehouse): product_bundle = frappe.get_doc("Product Bundle", bundle_item_code) From 699e9b44520ffe2963c13dfc41fc88e45b1eec2d Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 1 Dec 2025 18:48:53 +0530 Subject: [PATCH 096/328] fix: label for warehouse based on material request type --- .../material_request/material_request.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 6614ca1f03f..1a269648ce3 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -105,6 +105,7 @@ frappe.ui.form.on("Material Request", { frm.events.make_custom_buttons(frm); frm.toggle_reqd("customer", frm.doc.material_request_type == "Customer Provided"); prevent_past_schedule_dates(frm); + frm.trigger("set_warehouse_label"); }, transaction_date(frm) { @@ -514,6 +515,23 @@ frappe.ui.form.on("Material Request", { if (frm.doc.material_request_type !== "Material Transfer" && frm.doc.set_from_warehouse) { frm.set_value("set_from_warehouse", ""); } + + frm.trigger("set_warehouse_label"); + }, + + set_warehouse_label(frm) { + let warehouse_label = + frm.doc.material_request_type === "Material Transfer" ? "Target Warehouse" : "Warehouse"; + if (frm.doc.material_request_type === "Material Issue") { + warehouse_label = "From Warehouse"; + } + + frm.fields_dict["items"].grid.update_docfield_property("warehouse", "label", __(warehouse_label)); + + warehouse_label = "Set " + warehouse_label; + frm.set_df_property("set_warehouse", "label", __(warehouse_label)); + + refresh_field("items"); }, }); From 35379294c30d8e6d80f7ec07d12254244f9ecad4 Mon Sep 17 00:00:00 2001 From: MochaMind Date: Mon, 1 Dec 2025 07:58:29 -0800 Subject: [PATCH 097/328] fix: sync translations from crowdin (#50723) --- erpnext/locale/ar.po | 3674 ++++++++++++++-------------- erpnext/locale/bs.po | 3687 +++++++++++++++-------------- erpnext/locale/cs.po | 3670 ++++++++++++++-------------- erpnext/locale/da.po | 3672 ++++++++++++++-------------- erpnext/locale/de.po | 3678 ++++++++++++++-------------- erpnext/locale/eo.po | 3678 ++++++++++++++-------------- erpnext/locale/es.po | 3676 ++++++++++++++-------------- erpnext/locale/fa.po | 3826 ++++++++++++++++-------------- erpnext/locale/fr.po | 3676 ++++++++++++++-------------- erpnext/locale/hr.po | 3687 +++++++++++++++-------------- erpnext/locale/hu.po | 3670 ++++++++++++++-------------- erpnext/locale/id.po | 3676 ++++++++++++++-------------- erpnext/locale/it.po | 3670 ++++++++++++++-------------- erpnext/locale/my.po | 3670 ++++++++++++++-------------- erpnext/locale/nb.po | 3670 ++++++++++++++-------------- erpnext/locale/nl.po | 3670 ++++++++++++++-------------- erpnext/locale/pl.po | 3670 ++++++++++++++-------------- erpnext/locale/pt.po | 3670 ++++++++++++++-------------- erpnext/locale/pt_BR.po | 3674 ++++++++++++++-------------- erpnext/locale/ru.po | 3670 ++++++++++++++-------------- erpnext/locale/sl.po | 5002 ++++++++++++++++++++------------------- erpnext/locale/sr.po | 3681 ++++++++++++++-------------- erpnext/locale/sr_CS.po | 3681 ++++++++++++++-------------- erpnext/locale/sv.po | 3705 +++++++++++++++-------------- erpnext/locale/ta.po | 3670 ++++++++++++++-------------- erpnext/locale/th.po | 3672 ++++++++++++++-------------- erpnext/locale/tr.po | 3678 ++++++++++++++-------------- erpnext/locale/vi.po | 3670 ++++++++++++++-------------- erpnext/locale/zh.po | 3678 ++++++++++++++-------------- 29 files changed, 56397 insertions(+), 51674 deletions(-) diff --git a/erpnext/locale/ar.po b/erpnext/locale/ar.po index d541c90d93d..f843346fd33 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-11-16 09:35+0000\n" -"PO-Revision-Date: 2025-11-20 22:23\n" +"POT-Creation-Date: 2025-11-30 09:36+0000\n" +"PO-Revision-Date: 2025-12-01 00:22\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:677 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:603 msgid " Amount" msgstr "" @@ -35,6 +35,11 @@ msgstr "" msgid " BOM" msgstr "" +#. Label of the default_wip_warehouse (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid " Default Work In Progress Warehouse " +msgstr " افتراضي العمل في مستودع التقدم " + #. Label of the istable (Check) field in DocType 'Inventory Dimension' #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json msgid " Is Child Table" @@ -45,18 +50,23 @@ msgstr "" msgid " Is Subcontracted" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:174 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:196 msgid " Item" msgstr "" -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:153 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:206 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107 #: erpnext/selling/report/sales_analytics/sales_analytics.py:128 msgid " Name" msgstr "" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:668 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:144 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:185 +msgid " Phantom Item" +msgstr "" + +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:594 msgid " Rate" msgstr "" @@ -70,7 +80,7 @@ msgid " Skip Material Transfer" msgstr "" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:133 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:163 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:174 msgid " Sub Assembly" msgstr "" @@ -141,7 +151,7 @@ msgstr "" msgid "% Delivered" msgstr "% تسليم" -#: erpnext/manufacturing/doctype/bom/bom.js:945 +#: erpnext/manufacturing/doctype/bom/bom.js:953 #, python-format msgid "% Finished Item Quantity" msgstr "" @@ -156,8 +166,8 @@ msgstr "" msgid "% Occupied" msgstr "" -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:285 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:340 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:288 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:338 msgid "% Of Grand Total" msgstr "" @@ -246,11 +256,11 @@ msgstr "" msgid "% of materials delivered against this Sales Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:2295 +#: erpnext/controllers/accounts_controller.py:2303 msgid "'Account' in the Accounting section of Customer {0}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:346 +#: erpnext/selling/doctype/sales_order/sales_order.py:348 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'" msgstr "" @@ -262,7 +272,7 @@ msgstr "'على أساس' و 'المجموعة حسب' لا يمكن أن يكو msgid "'Days Since Last Order' must be greater than or equal to zero" msgstr "يجب أن تكون \"الأيام منذ آخر طلب\" أكبر من أو تساوي الصفر" -#: erpnext/controllers/accounts_controller.py:2300 +#: erpnext/controllers/accounts_controller.py:2308 msgid "'Default {0} Account' in Company {1}" msgstr "" @@ -292,8 +302,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:598 -#: erpnext/stock/report/stock_ledger/stock_ledger.py:631 +#: erpnext/stock/report/stock_ledger/stock_ledger.py:601 +#: erpnext/stock/report/stock_ledger/stock_ledger.py:634 msgid "'Opening'" msgstr "'افتتاحي'" @@ -307,11 +317,11 @@ msgstr "' إلى تاريخ ' مطلوب" msgid "'To Package No.' cannot be less than 'From Package No.'" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:81 +#: erpnext/controllers/sales_and_purchase_return.py:80 msgid "'Update Stock' can not be checked because items are not delivered via {0}" msgstr ""الأوراق المالية التحديث" لا يمكن التحقق من أنه لم يتم تسليم المواد عن طريق {0}" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:439 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:441 msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "لا يمكن التحقق من ' تحديث المخزون ' لبيع الأصول الثابتة\\n
            \\n'Update Stock' cannot be checked for fixed asset sale" @@ -323,8 +333,8 @@ msgstr "" msgid "'{0}' has been already added." msgstr "" -#: erpnext/setup/doctype/company/company.py:259 -#: erpnext/setup/doctype/company/company.py:270 +#: erpnext/setup/doctype/company/company.py:290 +#: erpnext/setup/doctype/company/company.py:301 msgid "'{0}' should be in company currency {1}." msgstr "" @@ -708,7 +718,7 @@ msgstr "" msgid "
          • Clearance date must be after cheque date for row(s): {0}
            • " msgstr "" -#: erpnext/controllers/accounts_controller.py:2188 +#: erpnext/controllers/accounts_controller.py:2196 msgid "
          • Item {0} in row(s) {1} billed more than {2}
            • " msgstr "" @@ -720,7 +730,7 @@ msgstr "" msgid "
          • {}
            • " msgstr "" -#: erpnext/controllers/accounts_controller.py:2185 +#: erpnext/controllers/accounts_controller.py:2193 msgid "

            Cannot overbill for the following Items:

            " msgstr "" @@ -764,7 +774,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:2197 +#: erpnext/controllers/accounts_controller.py:2205 msgid "

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

            " msgstr "" @@ -816,6 +826,7 @@ msgstr "" #. Header text in the Projects Workspace #. Header text in the Selling Workspace #. Header text in the Home Workspace +#. Header text in the Subcontracting Workspace #. Header text in the Support Workspace #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/payables/payables.json @@ -826,19 +837,13 @@ msgstr "" #: erpnext/projects/workspace/projects/projects.json #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/workspace/home/home.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json #: erpnext/support/workspace/support/support.json msgid "Reports & Masters" msgstr "" -#. Header text in the Settings Workspace -#: erpnext/setup/workspace/settings/settings.json -msgid "Settings" -msgstr "" - -#. Header text in the Accounting Workspace #. Header text in the Payables Workspace #. Header text in the Receivables Workspace -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/payables/payables.json #: erpnext/accounts/workspace/receivables/receivables.json msgid "Shortcuts" @@ -862,6 +867,7 @@ msgstr "" #. Header text in the Projects Workspace #. Header text in the Quality Workspace #. Header text in the Home Workspace +#. Header text in the Subcontracting Workspace #. Header text in the Support Workspace #: erpnext/assets/workspace/assets/assets.json #: erpnext/buying/workspace/buying/buying.json @@ -870,6 +876,7 @@ msgstr "" #: erpnext/projects/workspace/projects/projects.json #: erpnext/quality_management/workspace/quality/quality.json #: erpnext/setup/workspace/home/home.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json #: erpnext/support/workspace/support/support.json msgid "Your Shortcuts" msgstr "" @@ -923,7 +930,7 @@ msgstr "" msgid "A - C" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:314 +#: erpnext/selling/doctype/customer/customer.py:323 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group" msgstr "مجموعة الزبائن موجودة بنفس الاسم أرجو تغير اسم العميل أو اعادة تسمية مجموعة الزبائن\\n
            \\nA Customer Group exists with same name please change the Customer name or rename the Customer Group" @@ -953,11 +960,11 @@ msgstr "" msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1812 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1815 msgid "A Reverse Journal Entry {0} already exists for this Journal Entry." msgstr "" -#: erpnext/setup/doctype/company/company.py:1037 +#: erpnext/setup/doctype/company/company.py:1068 msgid "A Transaction Deletion Document: {0} is triggered for {0}" msgstr "" @@ -1057,11 +1064,11 @@ msgstr "" msgid "Abbreviation" msgstr "اسم مختصر" -#: erpnext/setup/doctype/company/company.py:194 +#: erpnext/setup/doctype/company/company.py:225 msgid "Abbreviation already used for another company" msgstr "الاختصار يستخدم بالفعل لشركة أخرى\\n
            \\nAbbreviation already used for another company" -#: erpnext/setup/doctype/company/company.py:191 +#: erpnext/setup/doctype/company/company.py:222 msgid "Abbreviation is mandatory" msgstr "الاسم المختصر إلزامي" @@ -1147,7 +1154,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:870 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:928 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1159,6 +1166,7 @@ msgstr "رصيد حسابك" #. Label of the account_category (Link) field in DocType 'Account' #. Name of a DocType #: erpnext/accounts/doctype/account/account.json +#: erpnext/accounts/doctype/account/account_tree.js:166 #: erpnext/accounts/doctype/account_category/account_category.json msgid "Account Category" msgstr "" @@ -1264,8 +1272,8 @@ msgstr "" msgid "Account Manager" msgstr "إدارة حساب المستخدم" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1034 -#: erpnext/controllers/accounts_controller.py:2304 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1036 +#: erpnext/controllers/accounts_controller.py:2312 msgid "Account Missing" msgstr "الحساب مفقود" @@ -1347,7 +1355,7 @@ msgstr "نوع الحساب الفرعي" msgid "Account Type" msgstr "نوع الحساب" -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:125 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:128 msgid "Account Value" msgstr "قيمة الحساب" @@ -1369,6 +1377,10 @@ msgstr "رصيد الحساب رصيد مدين، لا يسمح لك بتغيي msgid "Account for Change Amount" msgstr "حساب لتغيير المبلغ" +#: erpnext/accounts/doctype/budget/budget.py:149 +msgid "Account is mandatory" +msgstr "" + #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:46 msgid "Account is mandatory to get payment entries" msgstr "الحساب إلزامي للحصول على إدخالات الدفع" @@ -1414,14 +1426,14 @@ msgstr "" msgid "Account {0} cannot be disabled as it is already set as {1} for {2}." msgstr "" -#: erpnext/setup/doctype/company/company.py:241 +#: erpnext/accounts/doctype/budget/budget.py:158 +msgid "Account {0} does not belong to company {1}" +msgstr "" + +#: erpnext/setup/doctype/company/company.py:272 msgid "Account {0} does not belong to company: {1}" msgstr "الحساب {0} لا يتنمى للشركة {1}\\n
            \\nAccount {0} does not belong to company: {1}" -#: erpnext/accounts/doctype/budget/budget.py:104 -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:585 msgid "Account {0} does not exist" msgstr "حساب {0} غير موجود" @@ -1446,15 +1458,11 @@ msgstr "" msgid "Account {0} exists in parent company {1}." msgstr "الحساب {0} موجود في الشركة الأم {1}." -#: erpnext/accounts/doctype/budget/budget.py:114 -msgid "Account {0} has been entered multiple times" -msgstr "الحساب {0} تم إدخاله عدة مرات\\n
            \\nAccount {0} has been entered multiple times" - #: erpnext/accounts/doctype/account/account.py:409 msgid "Account {0} is added in the child company {1}" msgstr "تتم إضافة الحساب {0} في الشركة التابعة {1}" -#: erpnext/setup/doctype/company/company.py:230 +#: erpnext/setup/doctype/company/company.py:261 msgid "Account {0} is disabled." msgstr "" @@ -1462,7 +1470,7 @@ msgstr "" msgid "Account {0} is frozen" msgstr "الحساب {0} مجمد\\n
            \\nAccount {0} is frozen" -#: erpnext/controllers/accounts_controller.py:1391 +#: erpnext/controllers/accounts_controller.py:1399 msgid "Account {0} is invalid. Account Currency must be {1}" msgstr "الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}" @@ -1486,7 +1494,7 @@ msgstr "الحساب {0}: الحسابه الأب {1} غير موجود" msgid "Account {0}: You can not assign itself as parent account" msgstr "الحساب {0}: لا يمكنك جعله حساب رئيسي" -#: erpnext/accounts/general_ledger.py:452 +#: erpnext/accounts/general_ledger.py:454 msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry" msgstr "الحساب: {0} عبارة "Capital work" قيد التقدم ولا يمكن تحديثها بواسطة "إدخال دفتر اليومية"" @@ -1494,11 +1502,11 @@ msgstr "الحساب: {0} عبارة "Capital work" قيد ال msgid "Account: {0} can only be updated via Stock Transactions" msgstr "الحساب: {0} لا يمكن تحديثه إلا من خلال معاملات المخزون" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2786 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2787 msgid "Account: {0} is not permitted under Payment Entry" msgstr "الحساب: {0} غير مسموح به بموجب إدخال الدفع" -#: erpnext/controllers/accounts_controller.py:3188 +#: erpnext/controllers/accounts_controller.py:3196 msgid "Account: {0} with currency: {1} can not be selected" msgstr "الحساب: {0} مع العملة: {1} لا يمكن اختياره" @@ -1777,50 +1785,50 @@ msgstr "القيود المحاسبة" msgid "Accounting Entry for Asset" msgstr "المدخلات الحسابية للأصول" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1812 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1832 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1872 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1892 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:812 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:867 msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:824 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:834 msgid "Accounting Entry for Service" msgstr "القيد المحاسبي للخدمة" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1011 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1032 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1050 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1071 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1092 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1120 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1227 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1463 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1485 -#: erpnext/controllers/stock_controller.py:681 -#: erpnext/controllers/stock_controller.py:698 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:917 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1757 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1771 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:647 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1013 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1034 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1052 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1073 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1094 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1122 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1229 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1465 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1487 +#: erpnext/controllers/stock_controller.py:683 +#: erpnext/controllers/stock_controller.py:700 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1817 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1831 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:702 msgid "Accounting Entry for Stock" msgstr "القيود المحاسبية للمخزون" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:721 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:731 msgid "Accounting Entry for {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:2345 +#: erpnext/controllers/accounts_controller.py:2353 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}" #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js:193 -#: erpnext/buying/doctype/supplier/supplier.js:90 +#: erpnext/buying/doctype/supplier/supplier.js:92 #: erpnext/public/js/controllers/stock_controller.js:88 #: erpnext/public/js/utils/ledger_preview.js:8 -#: erpnext/selling/doctype/customer/customer.js:170 +#: erpnext/selling/doctype/customer/customer.js:173 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:50 msgid "Accounting Ledger" msgstr "موازنة دفتر الأستاذ" @@ -1871,7 +1879,7 @@ msgstr "تم تجميد قيود المحاسبة حتى هذا التاريخ. #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/selling/doctype/customer/customer.json #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:400 +#: erpnext/setup/doctype/company/company.py:431 #: erpnext/setup/doctype/customer_group/customer_group.json #: erpnext/setup/doctype/email_digest/email_digest.json #: erpnext/setup/doctype/incoterm/incoterm.json @@ -1895,7 +1903,7 @@ msgstr "الحسابات المجمدة حتى تاريخ" msgid "Accounts Included in Report" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:348 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:362 msgid "Accounts Missing Error" msgstr "" @@ -1910,12 +1918,12 @@ msgstr "" #. Label of a Link in the Payables Workspace #. Label of a shortcut in the Payables Workspace #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:154 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:255 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:256 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/report/accounts_payable/accounts_payable.json -#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:108 +#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:113 #: erpnext/accounts/workspace/payables/payables.json -#: erpnext/buying/doctype/supplier/supplier.js:102 +#: erpnext/buying/doctype/supplier/supplier.js:104 msgid "Accounts Payable" msgstr "الحسابات الدائنة" @@ -1932,7 +1940,6 @@ msgstr "ملخص الحسابات المستحقة للدفع" #. Option for the 'Report' (Select) field in DocType 'Process Statement Of #. Accounts' #. Name of a report -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Receivables Workspace #. Label of a shortcut in the Receivables Workspace #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:12 @@ -1941,9 +1948,8 @@ msgstr "ملخص الحسابات المستحقة للدفع" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.json #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:136 -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/receivables/receivables.json -#: erpnext/selling/doctype/customer/customer.js:159 +#: erpnext/selling/doctype/customer/customer.js:162 msgid "Accounts Receivable" msgstr "الحسابات المدينة" @@ -1987,7 +1993,6 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Accounting Workspace -#. Label of a Link in the Settings Workspace #. Label of a shortcut in the Settings Workspace #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json #: erpnext/accounts/workspace/accounting/accounting.json @@ -2005,7 +2010,7 @@ msgid "Accounts to Merge" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:264 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:265 msgid "Accrued Expenses" msgstr "" @@ -2039,15 +2044,15 @@ msgstr "قيمة الاستهلاك المتراكمة" msgid "Accumulated Depreciation as on" msgstr "الاستهلاك المتراكم كما في" -#: erpnext/accounts/doctype/budget/budget.py:253 +#: erpnext/accounts/doctype/budget/budget.py:489 msgid "Accumulated Monthly" msgstr "متراكمة شهريا" -#: erpnext/controllers/budget_controller.py:422 +#: erpnext/controllers/budget_controller.py:425 msgid "Accumulated Monthly Budget for Account {0} against {1} {2} is {3}. It will be collectively ({4}) exceeded by {5}" msgstr "" -#: erpnext/controllers/budget_controller.py:324 +#: erpnext/controllers/budget_controller.py:327 msgid "Accumulated Monthly Budget for Account {0} against {1}: {2} is {3}. It will be exceeded by {4}" msgstr "" @@ -2283,7 +2288,7 @@ msgstr "تاريخ الإنتهاء الفعلي" msgid "Actual End Date (via Timesheet)" msgstr "تاريخ الإنتهاء الفعلي (عبر ورقة الوقت)" -#: erpnext/manufacturing/doctype/work_order/work_order.py:221 +#: erpnext/manufacturing/doctype/work_order/work_order.py:222 msgid "Actual End Date cannot be before Actual Start Date" msgstr "" @@ -2297,7 +2302,7 @@ msgstr "الفعلي وقت الانتهاء" msgid "Actual Expense" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:319 +#: erpnext/accounts/doctype/budget/budget.py:569 msgid "Actual Expenses" msgstr "" @@ -2405,7 +2410,7 @@ msgstr "الوقت الفعلي (بالساعات)" msgid "Actual qty in stock" msgstr "الكمية الفعلية في المخزون" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1526 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "نوع الضريبة الفعلي لا يمكن تضمينه في معدل الصنف في الصف {0}" @@ -2447,7 +2452,7 @@ msgstr "" msgid "Add Employees" msgstr "إضافة موظفين" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:234 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:256 #: erpnext/selling/doctype/sales_order/sales_order.js:277 #: erpnext/stock/dashboard/item_dashboard.js:216 msgid "Add Item" @@ -2495,13 +2500,18 @@ msgstr "" msgid "Add Order Discount" msgstr "أضف خصم الطلب" +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:281 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:416 +msgid "Add Phantom Item" +msgstr "" + #. Label of the add_quote (Check) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Add Quote" msgstr "إضافة عرض سعر" #. Label of the add_raw_materials (Button) field in DocType 'BOM Operation' -#: erpnext/manufacturing/doctype/bom/bom.js:973 +#: erpnext/manufacturing/doctype/bom/bom.js:981 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json msgid "Add Raw Materials" msgstr "" @@ -2557,8 +2567,8 @@ msgstr "" msgid "Add Stock" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:259 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:390 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:281 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:416 msgid "Add Sub Assembly" msgstr "" @@ -2586,7 +2596,7 @@ msgid "Add details" msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:86 -#: erpnext/stock/doctype/pick_list/pick_list.py:859 +#: erpnext/stock/doctype/pick_list/pick_list.py:863 msgid "Add items in the Item Locations table" msgstr "أضف عناصر في جدول "مواقع العناصر"" @@ -2773,7 +2783,7 @@ msgstr "مبلغ الخصم الإضافي" msgid "Additional Discount Amount (Company Currency)" msgstr "مقدار الخصم الاضافي (بعملة الشركة)" -#: erpnext/controllers/taxes_and_totals.py:731 +#: erpnext/controllers/taxes_and_totals.py:785 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -2872,7 +2882,7 @@ msgstr "تكاليف تشغيل اضافية" msgid "Additional Transferred Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:664 +#: erpnext/manufacturing/doctype/work_order/work_order.py:665 msgid "Additional Transferred Qty {0}\n" "\t\t\t\t\tcannot be greater than {1}.\n" "\t\t\t\t\tTo fix this, increase the percentage value\n" @@ -2885,6 +2895,10 @@ msgstr "" msgid "Additional information regarding the customer." msgstr "معلومات إضافية عن الزبون." +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:584 +msgid "Additional {0} {1} of item {2} required as per BOM to complete this transaction" +msgstr "" + #. Label of the address_and_contact_tab (Tab Break) field in DocType 'Dunning' #. Label of the contact_and_address_tab (Tab Break) field in DocType 'POS #. Invoice' @@ -3030,11 +3044,11 @@ msgstr "" msgid "Adjust Qty" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1111 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1112 msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:649 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:659 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3108,7 +3122,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/controllers/accounts_controller.py:279 +#: erpnext/controllers/accounts_controller.py:284 #: erpnext/setup/doctype/company/company.json msgid "Advance Payments" msgstr "دفعات مقدمة" @@ -3151,7 +3165,7 @@ msgstr "" msgid "Advance amount" msgstr "المبلغ مقدما" -#: erpnext/controllers/taxes_and_totals.py:868 +#: erpnext/controllers/taxes_and_totals.py:922 msgid "Advance amount cannot be greater than {0} {1}" msgstr "قيمة الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}" @@ -3213,7 +3227,7 @@ msgstr "مقابل" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:39 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:91 -#: erpnext/accounts/report/general_ledger/general_ledger.py:741 +#: erpnext/accounts/report/general_ledger/general_ledger.py:748 msgid "Against Account" msgstr "مقابل الحساب" @@ -3228,14 +3242,10 @@ msgstr "مقابل الحساب" msgid "Against Blanket Order" msgstr "ضد بطانية النظام" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1127 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1129 msgid "Against Customer Order {0}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1589 -msgid "Against Default Supplier" -msgstr "ضد المورد الافتراضي" - #. Label of the dn_detail (Data) field in DocType 'Delivery Note Item' #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json msgid "Against Delivery Note Item" @@ -3329,13 +3339,13 @@ msgstr "مقابل بند طلب مبيعات" msgid "Against Stock Entry" msgstr "ضد دخول الأسهم" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:330 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:332 msgid "Against Supplier Invoice {0}" msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:774 +#: erpnext/accounts/report/general_ledger/general_ledger.py:781 msgid "Against Voucher" msgstr "مقابل إيصال" @@ -3359,7 +3369,7 @@ msgstr "" #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:772 +#: erpnext/accounts/report/general_ledger/general_ledger.py:779 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "مقابل إيصال نوع" @@ -3377,7 +3387,7 @@ msgstr "عمر" msgid "Age (Days)" msgstr "(العمر (أيام" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:218 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:220 msgid "Age ({0})" msgstr "" @@ -3473,7 +3483,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:1483 erpnext/public/js/setup_wizard.js:184 +#: erpnext/accounts/utils.py:1490 erpnext/public/js/setup_wizard.js:184 msgid "All Accounts" msgstr "جميع الحسابات" @@ -3497,7 +3507,7 @@ msgstr "" msgid "All Activities HTML" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:303 +#: erpnext/manufacturing/doctype/bom/bom.py:306 msgid "All BOMs" msgstr "كل الأصناف المركبة" @@ -3525,21 +3535,21 @@ msgstr "جميع مجموعات العملاء" #: erpnext/patches/v11_0/update_department_lft_rgt.py:9 #: erpnext/patches/v11_0/update_department_lft_rgt.py:11 #: erpnext/patches/v11_0/update_department_lft_rgt.py:16 -#: erpnext/setup/doctype/company/company.py:393 -#: erpnext/setup/doctype/company/company.py:396 -#: erpnext/setup/doctype/company/company.py:401 -#: erpnext/setup/doctype/company/company.py:407 -#: erpnext/setup/doctype/company/company.py:413 -#: erpnext/setup/doctype/company/company.py:419 -#: erpnext/setup/doctype/company/company.py:425 -#: erpnext/setup/doctype/company/company.py:431 -#: erpnext/setup/doctype/company/company.py:437 -#: erpnext/setup/doctype/company/company.py:443 -#: erpnext/setup/doctype/company/company.py:449 -#: erpnext/setup/doctype/company/company.py:455 -#: erpnext/setup/doctype/company/company.py:461 -#: erpnext/setup/doctype/company/company.py:467 -#: erpnext/setup/doctype/company/company.py:473 +#: erpnext/setup/doctype/company/company.py:424 +#: erpnext/setup/doctype/company/company.py:427 +#: erpnext/setup/doctype/company/company.py:432 +#: erpnext/setup/doctype/company/company.py:438 +#: erpnext/setup/doctype/company/company.py:444 +#: erpnext/setup/doctype/company/company.py:450 +#: erpnext/setup/doctype/company/company.py:456 +#: erpnext/setup/doctype/company/company.py:462 +#: erpnext/setup/doctype/company/company.py:468 +#: erpnext/setup/doctype/company/company.py:474 +#: erpnext/setup/doctype/company/company.py:480 +#: erpnext/setup/doctype/company/company.py:486 +#: erpnext/setup/doctype/company/company.py:492 +#: erpnext/setup/doctype/company/company.py:498 +#: erpnext/setup/doctype/company/company.py:504 msgid "All Departments" msgstr "جميع الاقسام" @@ -3615,7 +3625,7 @@ msgstr "جميع مجموعات الموردين" msgid "All Territories" msgstr "جميع الأقاليم" -#: erpnext/setup/doctype/company/company.py:338 +#: erpnext/setup/doctype/company/company.py:369 msgid "All Warehouses" msgstr "جميع المخازن" @@ -3633,15 +3643,15 @@ msgstr "يجب نقل جميع الاتصالات بما في ذلك وما فو msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1354 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1364 msgid "All items have already been Invoiced/Returned" msgstr "تم بالفعل تحرير / إرجاع جميع العناصر" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:1202 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:1205 msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2910 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2978 msgid "All items have already been transferred for this Work Order." msgstr "جميع الإصناف تم نقلها لأمر العمل" @@ -3649,11 +3659,11 @@ msgstr "جميع الإصناف تم نقلها لأمر العمل" msgid "All items in this document already have a linked Quality Inspection." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1266 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1268 msgid "All items must be linked to a Sales Order or Subcontracting Inward Order for this Sales Invoice." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1277 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1279 msgid "All linked Sales Orders must be subcontracted." msgstr "" @@ -3667,11 +3677,11 @@ msgstr "" msgid "All the items have been already returned." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1176 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1161 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:853 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:855 msgid "All these items have already been Invoiced/Returned" msgstr "تم بالفعل إصدار فاتورة / إرجاع جميع هذه العناصر" @@ -3700,7 +3710,7 @@ msgstr "تخصيص مبلغ الدفع" msgid "Allocate Payment Based On Payment Terms" msgstr "تخصيص الدفع على أساس شروط الدفع" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1716 msgid "Allocate Payment Request" msgstr "" @@ -3731,7 +3741,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:1708 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1707 #: 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 @@ -3757,11 +3767,11 @@ msgstr "" msgid "Allocated amount" msgstr "المبلغ المخصص" -#: erpnext/accounts/utils.py:617 +#: erpnext/accounts/utils.py:621 msgid "Allocated amount cannot be greater than unadjusted amount" msgstr "لا يمكن أن يكون المبلغ المخصص أكبر من المبلغ غير المعدل" -#: erpnext/accounts/utils.py:615 +#: erpnext/accounts/utils.py:619 msgid "Allocated amount cannot be negative" msgstr "لا يمكن أن يكون المبلغ المخصص سالبًا" @@ -3782,7 +3792,7 @@ msgstr "توزيع" msgid "Allocations" msgstr "" -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:422 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:427 msgid "Allotted Qty" msgstr "الكمية المخصصة" @@ -3863,7 +3873,7 @@ msgstr "" msgid "Allow Item To Be Added Multiple Times in a Transaction" msgstr "السماح بإضافة العنصر عدة مرات في المعاملة" -#: erpnext/controllers/selling_controller.py:813 +#: erpnext/controllers/selling_controller.py:825 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" @@ -4203,7 +4213,7 @@ msgstr "" msgid "Allows users to submit Supplier Quotations with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:1001 +#: erpnext/stock/doctype/pick_list/pick_list.py:1005 msgid "Already Picked" msgstr "" @@ -4239,7 +4249,7 @@ msgstr "رمز الصنف البديل" msgid "Alternative Item Name" msgstr "اسم الصنف البديل" -#: erpnext/selling/doctype/quotation/quotation.js:361 +#: erpnext/selling/doctype/quotation/quotation.js:362 msgid "Alternative Items" msgstr "" @@ -4263,6 +4273,7 @@ msgstr "" #. Charges' #. Label of the amount (Data) field in DocType 'Bank Clearance Detail' #. Label of the amount (Currency) field in DocType 'Bank Guarantee' +#. Label of the amount (Currency) field in DocType 'Budget Distribution' #. Label of the amount (Float) field in DocType 'Cashier Closing Payments' #. Label of the sec_break1 (Section Break) field in DocType 'Journal Entry #. Account' @@ -4360,8 +4371,9 @@ msgstr "" #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json #: erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json +#: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:588 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:592 #: 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 @@ -4394,8 +4406,8 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:45 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:44 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:275 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:330 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:278 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:328 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:201 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:111 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:44 @@ -4416,7 +4428,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/selling/doctype/quotation/quotation.js:299 +#: erpnext/selling/doctype/quotation/quotation.js:300 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:46 @@ -4455,6 +4467,8 @@ msgstr "كمية" msgid "Amount (AED)" msgstr "" +#. Label of the base_amount (Currency) field in DocType 'Advance Payment Ledger +#. Entry' #. Label of the base_tax_amount (Currency) field in DocType 'Advance Taxes and #. Charges' #. Label of the amount (Currency) field in DocType 'Payment Entry Deduction' @@ -4477,6 +4491,7 @@ msgstr "" #. 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_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json @@ -4616,12 +4631,12 @@ msgstr "الإجمالي" msgid "An Item Group is a way to classify items based on types." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:446 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:517 msgid "An error has been appeared while reposting item valuation via {0}" msgstr "" #: erpnext/public/js/controllers/buying.js:380 -#: erpnext/public/js/utils/sales_common.js:464 +#: erpnext/public/js/utils/sales_common.js:486 msgid "An error occurred during the update process" msgstr "حدث خطأ أثناء عملية التحديث" @@ -4641,11 +4656,11 @@ msgstr "" msgid "Annual Billing: {0}" msgstr "الفواتير السنوية: {0}" -#: erpnext/controllers/budget_controller.py:446 +#: erpnext/controllers/budget_controller.py:449 msgid "Annual Budget for Account {0} against {1} {2} is {3}. It will be collectively ({4}) exceeded by {5}" msgstr "" -#: erpnext/controllers/budget_controller.py:311 +#: erpnext/controllers/budget_controller.py:314 msgid "Annual Budget for Account {0} against {1}: {2} is {3}. It will be exceeded by {4}" msgstr "" @@ -4668,9 +4683,9 @@ msgstr "الدخل السنوي" msgid "Annual Revenue" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:86 -msgid "Another Budget record '{0}' already exists against {1} '{2}' and account '{3}' for fiscal year {4}" -msgstr "سجل الموازنة الآخر '{0}' موجود بالفعل مقابل {1} '{2}' وحساب '{3}' للسنة المالية {4}" +#: erpnext/accounts/doctype/budget/budget.py:141 +msgid "Another Budget record '{0}' already exists against {1} '{2}' and account '{3}' with overlapping fiscal years." +msgstr "" #: erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py:107 msgid "Another Cost Center Allocation record {0} applicable from {1}, hence this allocation will be applicable upto {2}" @@ -5060,7 +5075,7 @@ msgstr "" msgid "Are you sure you want to clear all demo data?" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:451 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:480 msgid "Are you sure you want to delete this Item?" msgstr "" @@ -5072,6 +5087,10 @@ msgstr "" msgid "Are you sure you want to restart this subscription?" msgstr "" +#: erpnext/accounts/doctype/budget/budget.js:76 +msgid "Are you sure you want to revise this budget? The current budget will be cancelled and a new draft will be created." +msgstr "" + #. Label of the area (Float) field in DocType 'Location' #. Name of a UOM #: erpnext/assets/doctype/location/location.json @@ -5084,7 +5103,7 @@ msgstr "منطقة" msgid "Area UOM" msgstr "وحدة قياس المساحة" -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:430 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:435 msgid "Arrival Quantity" msgstr "كمية الوصول" @@ -5119,7 +5138,7 @@ msgstr "نظرًا لتمكين الحقل {0} ، يكون الحقل {1} إلز msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "أثناء تمكين الحقل {0} ، يجب أن تكون قيمة الحقل {1} أكثر من 1." -#: erpnext/stock/doctype/item/item.py:984 +#: erpnext/stock/doctype/item/item.py:965 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5131,7 +5150,7 @@ msgstr "" msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1788 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1794 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}." msgstr "نظرًا لوجود مواد خام كافية ، فإن طلب المواد ليس مطلوبًا للمستودع {0}." @@ -5181,7 +5200,7 @@ msgstr "" #: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json #: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json #: erpnext/assets/workspace/assets/assets.json -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:215 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:189 #: erpnext/stock/doctype/serial_no/serial_no.json msgid "Asset" msgstr "الأصول" @@ -5372,7 +5391,7 @@ msgstr "فريق صيانة الأصول" #. Label of a Link in the Assets Workspace #: erpnext/assets/doctype/asset_movement/asset_movement.json #: erpnext/assets/workspace/assets/assets.json -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:226 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:200 msgid "Asset Movement" msgstr "حركة الأصول" @@ -5431,7 +5450,7 @@ msgstr "" #. Label of the asset_received_but_not_billed (Link) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:165 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:278 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:279 #: erpnext/accounts/report/account_balance/account_balance.js:38 #: erpnext/setup/doctype/company/company.json msgid "Asset Received But Not Billed" @@ -5560,7 +5579,7 @@ msgstr "" msgid "Asset restored after Asset Capitalization {0} was cancelled" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1496 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1498 msgid "Asset returned" msgstr "" @@ -5572,8 +5591,8 @@ msgstr "" msgid "Asset scrapped via Journal Entry {0}" msgstr "ألغت الأصول عن طريق قيد اليومية {0}\\n
            \\n Asset scrapped via Journal Entry {0}" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1496 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1499 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1498 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1501 msgid "Asset sold" msgstr "" @@ -5676,7 +5695,7 @@ msgstr "لم يتم إنشاء الأصول لـ {item_code}. سيكون علي msgid "Assets {assets_link} created for {item_code}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:219 +#: erpnext/manufacturing/doctype/job_card/job_card.js:228 msgid "Assign Job to Employee" msgstr "" @@ -5712,16 +5731,16 @@ msgstr "" msgid "At least one asset has to be selected." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:972 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:979 msgid "At least one invoice has to be selected." msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:169 +#: erpnext/controllers/sales_and_purchase_return.py:168 msgid "At least one item should be entered with negative quantity in return document" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:485 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:599 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:490 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:601 msgid "At least one mode of payment is required for POS invoice." msgstr "يلزم وضع واحد نمط واحد للدفع لفاتورة نقطة البيع.\\n
            \\nAt least one mode of payment is required for POS invoice." @@ -5737,11 +5756,11 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:704 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:762 msgid "At least one warehouse is mandatory" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:617 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:675 msgid "At row #{0}: the Difference Account must not be a Stock type account, please change the Account Type for the account {1} or select a different account" msgstr "" @@ -5749,7 +5768,7 @@ msgstr "" msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}" msgstr "في الصف # {0}: لا يمكن أن يكون معرف التسلسل {1} أقل من معرف تسلسل الصف السابق {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:628 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:686 msgid "At row #{0}: you have selected the Difference Account {1}, which is a Cost of Goods Sold type account. Please select a different account" msgstr "" @@ -5757,7 +5776,7 @@ msgstr "" msgid "At row {0}: Batch No is mandatory for Item {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:93 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:94 msgid "At row {0}: Parent Row No cannot be set for item {1}" msgstr "" @@ -5769,11 +5788,11 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:629 +#: erpnext/controllers/stock_controller.py:631 msgid "At row {0}: Serial and Batch Bundle {1} has already created. Please remove the values from the serial no or batch no fields." msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:87 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:88 msgid "At row {0}: set Parent Row No for item {1}" msgstr "" @@ -5833,7 +5852,7 @@ msgstr "السمة اسم" msgid "Attribute Value" msgstr "السمة القيمة" -#: erpnext/stock/doctype/item/item.py:920 +#: erpnext/stock/doctype/item/item.py:901 msgid "Attribute table is mandatory" msgstr "جدول الخصائص إلزامي" @@ -5841,11 +5860,11 @@ msgstr "جدول الخصائص إلزامي" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:924 +#: erpnext/stock/doctype/item/item.py:905 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "تم تحديد السمة {0} عدة مرات في جدول السمات\\n
            \\nAttribute {0} selected multiple times in Attributes Table" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:833 msgid "Attributes" msgstr "سمات" @@ -6047,7 +6066,7 @@ msgid "Auto re-order" msgstr "إعادة ترتيب تلقائي" #: erpnext/public/js/controllers/buying.js:375 -#: erpnext/public/js/utils/sales_common.js:459 +#: erpnext/public/js/utils/sales_common.js:481 msgid "Auto repeat document updated" msgstr "تكرار تلقائي للمستندات المحدثة" @@ -6110,7 +6129,7 @@ msgid "Availability Of Slots" msgstr "توافر فتحات" #: erpnext/manufacturing/doctype/workstation/workstation.js:513 -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:379 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:384 msgid "Available" msgstr "متاح" @@ -6140,11 +6159,11 @@ msgstr "متاح للاستخدام تاريخ" #. Label of the available_quantity_section (Section Break) field in DocType #. 'Pick List Item' #: erpnext/manufacturing/doctype/workstation/workstation.js:505 -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:80 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:88 #: erpnext/public/js/utils.js:556 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json -#: erpnext/stock/report/stock_ageing/stock_ageing.py:167 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:169 msgid "Available Qty" msgstr "الكمية المتاحة" @@ -6226,7 +6245,7 @@ msgstr "المخزون المتاج للأصناف المعبأة" msgid "Available for use date is required" msgstr "مطلوب تاريخ متاح للاستخدام" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:837 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:895 msgid "Available quantity is {0}, you need {1}" msgstr "الكمية المتاحة هي {0} ، تحتاج إلى {1}" @@ -6243,8 +6262,8 @@ msgstr "التاريخ المتاح للاستخدام" msgid "Available-for-use Date should be after purchase date" msgstr "يجب أن يكون التاريخ متاحًا بعد تاريخ الشراء" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:168 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:202 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:170 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:204 #: erpnext/stock/report/stock_balance/stock_balance.py:515 msgid "Average Age" msgstr "متوسط العمر" @@ -6345,12 +6364,12 @@ msgstr "" #: erpnext/manufacturing/doctype/work_order/work_order.js:216 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/report/bom_explorer/bom_explorer.js:8 -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:56 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:67 #: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:8 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js:5 #: 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:1403 +#: erpnext/selling/doctype/sales_order/sales_order.js:1407 #: erpnext/stock/doctype/material_request/material_request.js:336 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.js:658 @@ -6365,7 +6384,7 @@ msgstr "قائمة مكونات المواد" msgid "BOM 1" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1628 +#: erpnext/manufacturing/doctype/bom/bom.py:1670 msgid "BOM 1 {0} and BOM 2 {1} should not be same" msgstr "يجب ألا يكون BOM 1 {0} و BOM 2 {1} متطابقين" @@ -6443,7 +6462,7 @@ msgstr "" msgid "BOM Item" msgstr "صنف قائمة المواد" -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:59 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:71 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:174 msgid "BOM Level" msgstr "" @@ -6502,7 +6521,7 @@ msgstr "عملية قائمة المواد" msgid "BOM Operations Time" msgstr "وقت عمليات BOM" -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:25 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:26 msgid "BOM Qty" msgstr "BOM الكمية" @@ -6541,8 +6560,8 @@ msgstr "تقرير مخزون فاتورة المواد" msgid "BOM Tree" msgstr "" -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:26 -msgid "BOM UoM" +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:27 +msgid "BOM UOM" msgstr "" #. Name of a DocType @@ -6594,7 +6613,7 @@ msgstr "صنف الموقع الالكتروني بقائمة المواد" msgid "BOM Website Operation" msgstr "عملية الموقع الالكتروني بقائمة المواد" -#: erpnext/stock/doctype/stock_entry/stock_entry.js:1299 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:1297 msgid "BOM and Manufacturing Quantity are required" msgstr "مطلوب، قائمة مكونات المواد و كمية التصنيع" @@ -6604,7 +6623,7 @@ msgstr "مطلوب، قائمة مكونات المواد و كمية التصن msgid "BOM and Production" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:368 +#: erpnext/stock/doctype/material_request/material_request.js:371 #: erpnext/stock/doctype/stock_entry/stock_entry.js:710 msgid "BOM does not contain any stock item" msgstr "فاتورة الموارد لا تحتوي على أي صنف مخزون" @@ -6613,23 +6632,23 @@ msgstr "فاتورة الموارد لا تحتوي على أي صنف مخزو msgid "BOM recursion: {0} cannot be child of {1}" msgstr "تكرار BOM: {0} لا يمكن أن يكون تابعًا لـ {1}" -#: erpnext/manufacturing/doctype/bom/bom.py:677 +#: erpnext/manufacturing/doctype/bom/bom.py:688 msgid "BOM recursion: {1} cannot be parent or child of {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1378 +#: erpnext/manufacturing/doctype/bom/bom.py:1412 msgid "BOM {0} does not belong to Item {1}" msgstr "قائمة المواد {0} لا تنتمي إلى الصنف {1}" -#: erpnext/manufacturing/doctype/bom/bom.py:1360 +#: erpnext/manufacturing/doctype/bom/bom.py:1394 msgid "BOM {0} must be active" msgstr "قائمة مكونات المواد {0} يجب أن تكون نشطة\\n
            \\nBOM {0} must be active" -#: erpnext/manufacturing/doctype/bom/bom.py:1363 +#: erpnext/manufacturing/doctype/bom/bom.py:1397 msgid "BOM {0} must be submitted" msgstr "قائمة مكونات المواد {0} يجب أن تكون مسجلة\\n
            \\nBOM {0} must be submitted" -#: erpnext/manufacturing/doctype/bom/bom.py:765 +#: erpnext/manufacturing/doctype/bom/bom.py:776 msgid "BOM {0} not found for the item {1}" msgstr "" @@ -6638,15 +6657,15 @@ msgstr "" msgid "BOMs Updated" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:274 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:275 msgid "BOMs created successfully" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:284 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:285 msgid "BOMs creation failed" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:224 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:225 msgid "BOMs creation has been enqueued, kindly check the status after some time" msgstr "" @@ -6662,7 +6681,7 @@ msgstr "إدخال مخزون مؤرخ" #. Order Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:361 +#: erpnext/manufacturing/doctype/work_order/work_order.js:362 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Backflush Materials From WIP Warehouse" msgstr "" @@ -6700,7 +6719,7 @@ msgstr "الموازنة" msgid "Balance (Dr - Cr)" msgstr "الرصيد (مدين - دائن)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:693 +#: erpnext/accounts/report/general_ledger/general_ledger.py:700 msgid "Balance ({0})" msgstr "الرصيد ({0})" @@ -6745,7 +6764,7 @@ msgstr "الرقم التسلسلي للميزان" #: erpnext/accounts/doctype/process_period_closing_voucher_detail/process_period_closing_voucher_detail.json #: erpnext/accounts/report/balance_sheet/balance_sheet.json #: erpnext/accounts/workspace/financial_reports/financial_reports.json -#: erpnext/public/js/financial_statements.js:256 +#: erpnext/public/js/financial_statements.js:267 #: erpnext/setup/doctype/email_digest/email_digest.json msgid "Balance Sheet" msgstr "المركز المالي" @@ -6993,7 +7012,7 @@ msgid "Bank Name" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:308 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:309 msgid "Bank Overdraft Account" msgstr "حساب السحب من البنك بدون رصيد" @@ -7171,7 +7190,7 @@ msgstr "" msgid "Base Tax Withholding Net Total" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:247 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:261 msgid "Base Total" msgstr "" @@ -7364,11 +7383,11 @@ msgstr "رقم دفعة" msgid "Batch No is mandatory" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2994 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3027 msgid "Batch No {0} does not exists" msgstr "" -#: erpnext/stock/utils.py:640 +#: erpnext/stock/utils.py:644 msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead." msgstr "" @@ -7387,11 +7406,11 @@ msgstr "" msgid "Batch Nos" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1658 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1687 msgid "Batch Nos are created successfully" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:1071 +#: erpnext/controllers/sales_and_purchase_return.py:1072 msgid "Batch Not Available for Return" msgstr "" @@ -7419,7 +7438,7 @@ msgstr "كمية الدفعة" #. Label of the batch_size (Float) field in DocType 'Work Order Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/operation/operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:343 +#: erpnext/manufacturing/doctype/work_order/work_order.js:344 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Batch Size" @@ -7436,7 +7455,7 @@ msgstr "دفعة UOM" msgid "Batch and Serial No" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:881 +#: erpnext/manufacturing/doctype/work_order/work_order.py:882 msgid "Batch not created for item {} since it does not have a batch series." msgstr "" @@ -7444,16 +7463,16 @@ msgstr "" msgid "Batch {0} and Warehouse" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:1070 +#: erpnext/controllers/sales_and_purchase_return.py:1071 msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3086 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3154 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:286 msgid "Batch {0} of Item {1} has expired." msgstr "الدفعة {0} للعنصر {1} انتهت صلاحيتها\\n
            \\nBatch {0} of Item {1} has expired." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3092 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3160 msgid "Batch {0} of Item {1} is disabled." msgstr "تم تعطيل الدفعة {0} من الصنف {1}." @@ -7517,7 +7536,7 @@ msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace -#: erpnext/manufacturing/doctype/bom/bom.py:1234 +#: erpnext/manufacturing/doctype/bom/bom.py:1251 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/material_request/material_request.js:126 #: erpnext/stock/doctype/stock_entry/stock_entry.js:644 @@ -7620,7 +7639,7 @@ msgstr "" msgid "Billing Address Name" msgstr "اسم عنوان تقديم الفواتير" -#: erpnext/controllers/accounts_controller.py:503 +#: erpnext/controllers/accounts_controller.py:508 msgid "Billing Address does not belong to the {0}" msgstr "" @@ -7845,8 +7864,8 @@ msgstr "صنف أمر بطانية" msgid "Blanket Order Rate" msgstr "بطالة سعر النظام" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:108 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:260 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:109 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:261 msgid "Block Invoice" msgstr "حظر الفاتورة" @@ -7953,11 +7972,11 @@ msgstr "حجز" msgid "Booked Fixed Asset" msgstr "حجز الأصول الثابتة" -#: erpnext/stock/doctype/warehouse/warehouse.py:144 +#: erpnext/stock/doctype/warehouse/warehouse.py:146 msgid "Booking stock value across multiple accounts will make it harder to track stock and account value." msgstr "" -#: erpnext/accounts/general_ledger.py:804 +#: erpnext/accounts/general_ledger.py:806 msgid "Books have been closed till the period ending on {0}" msgstr "" @@ -8101,38 +8120,60 @@ msgstr "ميزانية" msgid "Budget Account" msgstr "حساب الميزانية" -#. Label of the accounts (Table) field in DocType 'Budget' -#: erpnext/accounts/doctype/budget/budget.json -msgid "Budget Accounts" -msgstr "حسابات الميزانية" - #. Label of the budget_against (Select) field in DocType 'Budget' #: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:80 msgid "Budget Against" msgstr "الميزانية مقابل" +#. Label of the budget_amount (Currency) field in DocType 'Budget' #. Label of the budget_amount (Currency) field in DocType 'Budget Account' +#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/doctype/budget_account/budget_account.json msgid "Budget Amount" msgstr "قيمة الميزانية" +#: erpnext/accounts/doctype/budget/budget.py:83 +msgid "Budget Amount can not be {0}." +msgstr "" + #. Label of the budget_detail (Section Break) field in DocType 'Company' #: erpnext/setup/doctype/company/company.json msgid "Budget Detail" msgstr "تفاصيل الميزانية" -#: erpnext/accounts/doctype/budget/budget.py:299 -#: erpnext/accounts/doctype/budget/budget.py:301 -#: erpnext/controllers/budget_controller.py:286 +#. Label of the budget_distribution (Table) field in DocType 'Budget' +#. Name of a DocType +#: erpnext/accounts/doctype/budget/budget.json +#: erpnext/accounts/doctype/budget_distribution/budget_distribution.json +msgid "Budget Distribution" +msgstr "" + +#. Label of the budget_end_date (Date) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json +msgid "Budget End Date" +msgstr "" + +#: erpnext/accounts/doctype/budget/budget.py:538 +#: erpnext/accounts/doctype/budget/budget.py:540 #: erpnext/controllers/budget_controller.py:289 +#: erpnext/controllers/budget_controller.py:292 msgid "Budget Exceeded" msgstr "" +#: erpnext/accounts/doctype/budget/budget.py:228 +msgid "Budget Limit Exceeded" +msgstr "" + #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:61 msgid "Budget List" msgstr "قائمة الميزانية" +#. Label of the budget_start_date (Date) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json +msgid "Budget Start Date" +msgstr "" + #. Name of a report #. Label of a Link in the Accounting Workspace #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:77 @@ -8141,11 +8182,11 @@ msgstr "قائمة الميزانية" msgid "Budget Variance Report" msgstr "تقرير إنحرافات الموازنة" -#: erpnext/accounts/doctype/budget/budget.py:101 +#: erpnext/accounts/doctype/budget/budget.py:156 msgid "Budget cannot be assigned against Group Account {0}" msgstr "لايمكن أسناد الميزانية للمجموعة Account {0}" -#: erpnext/accounts/doctype/budget/budget.py:108 +#: erpnext/accounts/doctype/budget/budget.py:161 msgid "Budget cannot be assigned against {0}, as it's not an Income or Expense account" msgstr "لا يمكن تعيين الميزانية مقابل {0}، حيث إنها ليست حسابا للدخل أو للمصروفات" @@ -8281,7 +8322,6 @@ msgstr "معدل الشراء" #. Name of a DocType #. Label of a Link in the Buying Workspace -#. Label of a Link in the Settings Workspace #. Label of a shortcut in the Settings Workspace #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/workspace/buying/buying.json @@ -8345,10 +8385,8 @@ msgstr "" #. Name of a DocType #. Label of a Link in the CRM Workspace -#. Label of a Link in the Settings Workspace #: erpnext/crm/doctype/crm_settings/crm_settings.json #: erpnext/crm/workspace/crm/crm.json -#: erpnext/setup/workspace/settings/settings.json msgid "CRM Settings" msgstr "" @@ -8599,7 +8637,7 @@ msgstr "جداول الحملة" msgid "Can be approved by {0}" msgstr "يمكن الموافقة عليها بواسطة {0}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2418 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2420 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state." msgstr "" @@ -8628,16 +8666,17 @@ msgid "Can not filter based on Voucher No, if grouped by Voucher" msgstr "لا يمكن الفلتره علي اساس (رقم الأيصال)، إذا تم وضعه في مجموعة على اساس (ايصال)" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1441 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2940 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2941 msgid "Can only make payment against unbilled {0}" msgstr "يمكن إجراء دفعة فقط مقابل فاتورة غير مدفوعة {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1495 -#: erpnext/controllers/accounts_controller.py:3097 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1494 +#: erpnext/controllers/accounts_controller.py:3105 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" msgstr "" +#: erpnext/setup/doctype/company/company.py:193 #: erpnext/stock/doctype/stock_settings/stock_settings.py:144 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method" msgstr "" @@ -8688,17 +8727,17 @@ msgstr "" msgid "Cannot Calculate Arrival Time as Driver Address is Missing." msgstr "لا يمكن حساب وقت الوصول حيث أن عنوان برنامج التشغيل مفقود." -#: erpnext/setup/doctype/company/company.py:181 +#: erpnext/setup/doctype/company/company.py:212 msgid "Cannot Change Inventory Account Setting" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:375 +#: erpnext/controllers/sales_and_purchase_return.py:376 msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:627 -#: erpnext/stock/doctype/item/item.py:640 -#: erpnext/stock/doctype/item/item.py:654 +#: erpnext/stock/doctype/item/item.py:608 +#: erpnext/stock/doctype/item/item.py:621 +#: erpnext/stock/doctype/item/item.py:635 msgid "Cannot Merge" msgstr "" @@ -8738,11 +8777,11 @@ msgstr "" msgid "Cannot cancel Stock Reservation Entry {0}, as it has used in the work order {1}. Please cancel the work order first or unreserved the stock" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:234 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:243 msgid "Cannot cancel as processing of cancelled documents is pending." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1066 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1067 msgid "Cannot cancel because submitted Stock Entry {0} exists" msgstr "لا يمكن الإلغاء لان هناك تدوينات مخزون مقدمة {0} موجوده" @@ -8758,11 +8797,11 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:394 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:452 msgid "Cannot cancel transaction for Completed Work Order." msgstr "لا يمكن إلغاء المعاملة لأمر العمل المكتمل." -#: erpnext/stock/doctype/item/item.py:872 +#: erpnext/stock/doctype/item/item.py:853 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "لا يمكن تغيير سمات بعد معاملة الأسهم. جعل عنصر جديد ونقل الأسهم إلى البند الجديد" @@ -8778,11 +8817,11 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "لا يمكن تغيير تاريخ إيقاف الخدمة للعنصر الموجود في الصف {0}" -#: erpnext/stock/doctype/item/item.py:863 +#: erpnext/stock/doctype/item/item.py:844 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "لا يمكن تغيير خصائص المتغير بعد معاملة المخزون. سيكون عليك عمل عنصر جديد للقيام بذلك." -#: erpnext/setup/doctype/company/company.py:286 +#: erpnext/setup/doctype/company/company.py:317 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency." msgstr "لا يمكن تغيير العملة الافتراضية للشركة، لأن هناك معاملات موجودة. يجب إلغاء المعاملات لتغيير العملة الافتراضية." @@ -8806,11 +8845,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "لا يمكن تحويل الحساب إلى تصنيف مجموعة لأن نوع الحساب تم اختياره." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:998 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1008 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1976 +#: erpnext/selling/doctype/sales_order/sales_order.py:1849 #: erpnext/stock/doctype/pick_list/pick_list.py:205 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 "" @@ -8819,11 +8858,11 @@ msgstr "" msgid "Cannot create accounting entries against disabled accounts: {0}" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:374 +#: erpnext/controllers/sales_and_purchase_return.py:375 msgid "Cannot create return for consolidated invoice {0}." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1090 +#: erpnext/manufacturing/doctype/bom/bom.py:1108 msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs" msgstr "لا يمكن تعطيل أو إلغاء قائمة المواد لانها مترابطة مع قوائم مواد اخرى" @@ -8836,7 +8875,7 @@ msgstr "لا يمكن ان تعلن بانها فقدت ، لأنه تم تقد msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "لا يمكن الخصم عندما تكون الفئة \"التقييم\" أو \"التقييم والإجمالي\"" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1813 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -8844,15 +8883,15 @@ msgstr "" msgid "Cannot delete Serial No {0}, as it is used in stock transactions" msgstr "لا يمكن حذف الرقم التسلسلي {0}، لانه يتم استخدامها في قيود المخزون" -#: erpnext/setup/doctype/company/company.py:516 +#: erpnext/setup/doctype/company/company.py:547 msgid "Cannot disable perpetual inventory, as there are existing Stock Ledger Entries for the company {0}. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:681 +#: erpnext/manufacturing/doctype/work_order/work_order.py:682 msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/setup/doctype/company/company.py:178 +#: erpnext/setup/doctype/company/company.py:209 msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" @@ -8860,8 +8899,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:772 -#: erpnext/selling/doctype/sales_order/sales_order.py:795 +#: erpnext/selling/doctype/sales_order/sales_order.py:771 +#: erpnext/selling/doctype/sales_order/sales_order.py:794 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." @@ -8873,7 +8912,7 @@ msgstr "" msgid "Cannot find Item with this Barcode" msgstr "لا يمكن العثور على عنصر بهذا الرمز الشريطي" -#: erpnext/controllers/accounts_controller.py:3645 +#: erpnext/controllers/accounts_controller.py:3653 msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings." msgstr "" @@ -8881,15 +8920,15 @@ msgstr "" msgid "Cannot make any transactions until the deletion job is completed" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:529 +#: erpnext/manufacturing/doctype/work_order/work_order.py:530 msgid "Cannot produce more Item {0} than Sales Order quantity {1}" msgstr "لا يمكن أن تنتج المزيد من البند {0} اكثر من كمية طلب المبيعات {1}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1421 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1422 msgid "Cannot produce more item for {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1425 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1426 msgid "Cannot produce more than {0} items for {1}" msgstr "" @@ -8897,8 +8936,8 @@ msgstr "" msgid "Cannot receive from customer against negative outstanding" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 -#: erpnext/controllers/accounts_controller.py:3112 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1511 +#: erpnext/controllers/accounts_controller.py:3120 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" msgstr "لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول" @@ -8911,16 +8950,16 @@ msgstr "" msgid "Cannot retrieve link token. Check Error Log for more information" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1504 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1888 -#: erpnext/controllers/accounts_controller.py:3102 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1503 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1682 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1889 +#: erpnext/controllers/accounts_controller.py:3110 #: erpnext/public/js/controllers/accounts.js:112 #: erpnext/public/js/controllers/taxes_and_totals.js:521 msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row" msgstr "لا يمكن تحديد نوع التهمة باسم ' في الصف السابق المبلغ ' أو ' في السابق صف إجمالي \" ل لصف الأول" -#: erpnext/selling/doctype/quotation/quotation.py:285 +#: erpnext/selling/doctype/quotation/quotation.py:287 msgid "Cannot set as Lost as Sales Order is made." msgstr "لا يمكن أن تعين كخسارة لأنه تم تقديم أمر البيع.
            Cannot set as Lost as Sales Order is made." @@ -8928,15 +8967,15 @@ msgstr "لا يمكن أن تعين كخسارة لأنه تم تقديم أمر msgid "Cannot set authorization on basis of Discount for {0}" msgstr "لا يمكن تحديد التخويل على أساس الخصم ل {0}" -#: erpnext/stock/doctype/item/item.py:718 +#: erpnext/stock/doctype/item/item.py:699 msgid "Cannot set multiple Item Defaults for a company." msgstr "لا يمكن تعيين عدة عناصر افتراضية لأي شركة." -#: erpnext/controllers/accounts_controller.py:3800 +#: erpnext/controllers/accounts_controller.py:3808 msgid "Cannot set quantity less than delivered quantity" msgstr "لا يمكن ضبط كمية أقل من الكمية المسلمة" -#: erpnext/controllers/accounts_controller.py:3803 +#: erpnext/controllers/accounts_controller.py:3811 msgid "Cannot set quantity less than received quantity" msgstr "لا يمكن تعيين كمية أقل من الكمية المستلمة" @@ -8944,7 +8983,7 @@ msgstr "لا يمكن تعيين كمية أقل من الكمية المستل msgid "Cannot set the field {0} for copying in variants" msgstr "لا يمكن تعيين الحقل {0} للنسخ في المتغيرات" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1998 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1999 msgid "Cannot {0} from {1} without any negative outstanding invoice" msgstr "" @@ -8979,7 +9018,7 @@ msgstr "" msgid "Capacity Planning" msgstr "القدرة على التخطيط" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1052 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1053 msgid "Capacity Planning Error, planned start time can not be same as end time" msgstr "خطأ في تخطيط السعة ، لا يمكن أن يكون وقت البدء المخطط له هو نفسه وقت الانتهاء" @@ -9004,7 +9043,7 @@ msgid "Capital Equipment" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:190 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:332 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:333 msgid "Capital Stock" msgstr "رأس المال" @@ -9032,6 +9071,10 @@ msgstr "" msgid "Capitalize Repair Cost" msgstr "" +#: erpnext/assets/doctype/asset/asset.js:201 +msgid "Capitalize this asset to confirm" +msgstr "" + #. Option for the 'Status' (Select) field in DocType 'Asset' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset/asset_list.js:14 @@ -9100,7 +9143,7 @@ msgstr "الدخول النقدية" msgid "Cash Flow" msgstr "التدفق النقدي" -#: erpnext/public/js/financial_statements.js:266 +#: erpnext/public/js/financial_statements.js:277 msgid "Cash Flow Statement" msgstr "بيان التدفق النقدي" @@ -9121,7 +9164,7 @@ msgstr "التدفق النقدي من العمليات" msgid "Cash In Hand" msgstr "النقدية الحاضرة" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:320 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:322 msgid "Cash or Bank Account is mandatory for making payment entry" msgstr "الحساب النقدي أو البنكي مطلوب لعمل مدخل بيع
            Cash or Bank Account is mandatory for making payment entry" @@ -9215,12 +9258,12 @@ msgstr "تفاصيل التصنيف" msgid "Category-wise Asset Value" msgstr "قيمة الأصول حسب الفئة" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:333 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:335 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:115 msgid "Caution" msgstr "الحذر" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:169 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:178 msgid "Caution: This might alter frozen accounts." msgstr "" @@ -9303,7 +9346,7 @@ msgstr "" msgid "Change Amount" msgstr "تغيير المبلغ" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:93 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:94 msgid "Change Release Date" msgstr "تغيير تاريخ الإصدار" @@ -9320,7 +9363,7 @@ msgstr "تغيير تاريخ الإصدار" msgid "Change in Stock Value" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1053 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1055 msgid "Change the account type to Receivable or select a different account." msgstr "قم بتغيير نوع الحساب إلى "ذمم مدينة" أو حدد حسابًا مختلفًا." @@ -9330,7 +9373,7 @@ msgstr "قم بتغيير نوع الحساب إلى "ذمم مدينة&quo msgid "Change this date manually to setup the next synchronization start date" msgstr "قم بتغيير هذا التاريخ يدويًا لإعداد تاريخ بدء المزامنة التالي" -#: erpnext/selling/doctype/customer/customer.py:126 +#: erpnext/selling/doctype/customer/customer.py:127 msgid "Changed customer name to '{}' as '{}' already exists." msgstr "" @@ -9352,8 +9395,8 @@ msgstr "" msgid "Channel Partner" msgstr "شريك القناة" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2317 -#: erpnext/controllers/accounts_controller.py:3165 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2318 +#: erpnext/controllers/accounts_controller.py:3173 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount" msgstr "" @@ -9398,7 +9441,6 @@ msgid "Chart Tree" msgstr "شجرة الرسم البياني" #. Label of a Link in the Accounting Workspace -#. Label of a shortcut in the Accounting Workspace #. Label of the section_break_28 (Section Break) field in DocType 'Company' #. Label of a Link in the Home Workspace #: erpnext/accounts/doctype/account/account.js:69 @@ -9406,7 +9448,7 @@ msgstr "شجرة الرسم البياني" #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:52 #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/public/js/setup_wizard.js:43 -#: erpnext/setup/doctype/company/company.js:116 +#: erpnext/setup/doctype/company/company.js:123 #: erpnext/setup/doctype/company/company.json #: erpnext/setup/workspace/home/home.json msgid "Chart of Accounts" @@ -9422,7 +9464,7 @@ msgid "Chart of Accounts Importer" msgstr "مخطط حسابات المستورد" #. Label of a Link in the Accounting Workspace -#: erpnext/accounts/doctype/account/account_tree.js:187 +#: erpnext/accounts/doctype/account/account_tree.js:195 #: erpnext/accounts/doctype/cost_center/cost_center.js:41 #: erpnext/accounts/workspace/accounting/accounting.json msgid "Chart of Cost Centers" @@ -9587,7 +9629,7 @@ msgstr "مهمة تابعة موجودة لهذه المهمة. لا يمكنك msgid "Child nodes can be only created under 'Group' type nodes" msgstr "العقد التابعة يمكن أن تنشأ إلا في إطار 'مجموعة' نوع العُقد" -#: erpnext/stock/doctype/warehouse/warehouse.py:101 +#: erpnext/stock/doctype/warehouse/warehouse.py:103 msgid "Child warehouse exists for this warehouse. You can not delete this warehouse." msgstr "مستودع فرعي موجود لهذا المستودع. لا يمكنك حذف هذا المستودع.\\n
            \\nChild warehouse exists for this warehouse. You can not delete this warehouse." @@ -9727,11 +9769,11 @@ msgstr "وثيقة مغلقة" msgid "Closed Documents" msgstr "وثائق مغلقة" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2341 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2343 msgid "Closed Work Order can not be stopped or Re-opened" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:523 +#: erpnext/selling/doctype/sales_order/sales_order.py:525 msgid "Closed order cannot be cancelled. Unclose to cancel." msgstr "الطلب المغلق لايمكن إلغاؤه. ازالة الاغلاق لكي تتمكن من الالغاء" @@ -9781,7 +9823,7 @@ msgstr "مبلغ الإغلاق" #: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json #: erpnext/accounts/doctype/process_period_closing_voucher_detail/process_period_closing_voucher_detail.json -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:201 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:232 msgid "Closing Balance" msgstr "الرصيد الختامي" @@ -10146,7 +10188,7 @@ msgstr "شركات" #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json #: erpnext/accounts/doctype/item_tax_template/item_tax_template.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:137 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:141 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.json @@ -10212,9 +10254,9 @@ msgstr "شركات" #: erpnext/accounts/report/gross_profit/gross_profit.js:8 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:8 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:40 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:232 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:235 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:28 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:280 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:278 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:8 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:8 #: erpnext/accounts/report/pos_register/pos_register.js:8 @@ -10298,7 +10340,7 @@ msgstr "شركات" #: erpnext/projects/doctype/timesheet/timesheet.json #: erpnext/projects/report/project_summary/project_summary.js:8 #: erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:44 -#: erpnext/public/js/financial_statements.js:278 +#: erpnext/public/js/financial_statements.js:289 #: erpnext/public/js/purchase_trends_filters.js:8 #: erpnext/public/js/sales_trends_filters.js:51 #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json @@ -10474,7 +10516,7 @@ msgstr "" msgid "Company Address Name" msgstr "اسم عنوان الشركة" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:308 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:310 msgid "Company Address is missing. You don't have permission to update it. Please contact your System Manager." msgstr "" @@ -10564,11 +10606,11 @@ msgstr "" msgid "Company and Posting Date is mandatory" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2547 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2549 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:362 +#: erpnext/stock/doctype/material_request/material_request.js:365 #: erpnext/stock/doctype/stock_entry/stock_entry.js:704 msgid "Company field is required" msgstr "حقل الشركة مطلوب" @@ -10585,7 +10627,7 @@ msgstr "" msgid "Company is mandatory for generating an invoice. Please set a default company in Global Defaults." msgstr "" -#: erpnext/setup/doctype/company/company.js:215 +#: erpnext/setup/doctype/company/company.js:222 msgid "Company name not same" msgstr "اسم الشركة ليس مماثل\\n
            \\nCompany name not same" @@ -10633,7 +10675,7 @@ msgstr "" msgid "Company {} does not exist yet. Taxes setup aborted." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:529 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:534 msgid "Company {} does not match with POS Profile Company {}" msgstr "" @@ -10658,12 +10700,12 @@ msgstr "" #. Label of the competitors (Table MultiSelect) field in DocType 'Opportunity' #. Label of the competitors (Table MultiSelect) field in DocType 'Quotation' #: erpnext/crm/doctype/opportunity/opportunity.json -#: erpnext/public/js/utils/sales_common.js:558 +#: erpnext/public/js/utils/sales_common.js:580 #: erpnext/selling/doctype/quotation/quotation.json msgid "Competitors" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:256 +#: erpnext/manufacturing/doctype/job_card/job_card.js:265 #: erpnext/manufacturing/doctype/workstation/workstation.js:151 msgid "Complete Job" msgstr "" @@ -10701,12 +10743,12 @@ msgstr "العملية المكتملة" msgid "Completed Qty" msgstr "الكمية المكتملة" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1335 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1336 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'" msgstr "لا يمكن أن تكون الكمية المكتملة أكبر من "الكمية إلى التصنيع"" -#: erpnext/manufacturing/doctype/job_card/job_card.js:304 -#: erpnext/manufacturing/doctype/job_card/job_card.js:425 +#: erpnext/manufacturing/doctype/job_card/job_card.js:313 +#: erpnext/manufacturing/doctype/job_card/job_card.js:434 #: erpnext/manufacturing/doctype/workstation/workstation.js:296 msgid "Completed Quantity" msgstr "الكمية المكتملة" @@ -10838,7 +10880,7 @@ msgstr "" msgid "Consider Minimum Order Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:980 +#: erpnext/manufacturing/doctype/work_order/work_order.js:983 msgid "Consider Process Loss" msgstr "" @@ -10910,7 +10952,7 @@ msgstr "القوائم المالية الموحدة" #. Log' #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:612 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:614 msgid "Consolidated Sales Invoice" msgstr "فاتورة المبيعات الموحدة" @@ -11004,7 +11046,7 @@ msgstr "" msgid "Consumed Qty" msgstr "تستهلك الكمية" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1710 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1711 msgid "Consumed Qty cannot be greater than Reserved Qty for item {0}" msgstr "" @@ -11157,7 +11199,7 @@ msgstr "" msgid "Contact Person" msgstr "الشخص الذي يمكن الاتصال به" -#: erpnext/controllers/accounts_controller.py:515 +#: erpnext/controllers/accounts_controller.py:520 msgid "Contact Person does not belong to the {0}" msgstr "" @@ -11340,19 +11382,19 @@ msgstr "معدل التحويل" msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "معامل التحويل الافتراضي لوحدة القياس يجب أن يكون 1 في الصف {0}" -#: erpnext/controllers/stock_controller.py:84 +#: erpnext/controllers/stock_controller.py:86 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:2880 +#: erpnext/controllers/accounts_controller.py:2888 msgid "Conversion rate cannot be 0" msgstr "" -#: erpnext/controllers/accounts_controller.py:2887 +#: erpnext/controllers/accounts_controller.py:2895 msgid "Conversion rate is 1.00, but document currency is different from company currency" msgstr "" -#: erpnext/controllers/accounts_controller.py:2883 +#: erpnext/controllers/accounts_controller.py:2891 msgid "Conversion rate must be 1.00 if document currency is same as company currency" msgstr "" @@ -11406,11 +11448,6 @@ msgstr "تم نسخها من" msgid "Copy Fields to Variant" msgstr "نسخ الحقول إلى متغير" -#. Label of a Card Break in the Settings Workspace -#: erpnext/setup/workspace/settings/settings.json -msgid "Core" -msgstr "" - #. Option for the 'Corrective/Preventive' (Select) field in DocType 'Quality #. Action' #: erpnext/quality_management/doctype/quality_action/quality_action.json @@ -11423,13 +11460,13 @@ msgstr "تصحيحي" msgid "Corrective Action" msgstr "اجراء تصحيحي" -#: erpnext/manufacturing/doctype/job_card/job_card.js:482 +#: erpnext/manufacturing/doctype/job_card/job_card.js:491 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:489 +#: erpnext/manufacturing/doctype/job_card/job_card.js:498 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Corrective Operation" msgstr "" @@ -11573,10 +11610,10 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:153 -#: erpnext/accounts/report/general_ledger/general_ledger.py:767 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:384 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:308 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:306 #: erpnext/accounts/report/purchase_register/purchase_register.js:46 #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py:29 #: erpnext/accounts/report/sales_register/sales_register.js:52 @@ -11599,7 +11636,7 @@ msgstr "" #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json #: erpnext/buying/report/procurement_tracker/procurement_tracker.js:15 #: erpnext/buying/report/procurement_tracker/procurement_tracker.py:32 -#: erpnext/public/js/financial_statements.js:371 +#: erpnext/public/js/financial_statements.js:382 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/delivery_note/delivery_note.json @@ -11652,7 +11689,7 @@ msgstr "رقم مركز التكلفة" msgid "Cost Center and Budgeting" msgstr "مركز التكلفة والميزانية" -#: erpnext/public/js/utils/sales_common.js:492 +#: erpnext/public/js/utils/sales_common.js:514 msgid "Cost Center for Item rows has been updated to {0}" msgstr "" @@ -11660,8 +11697,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:1428 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:883 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1430 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:893 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}" @@ -11693,7 +11730,7 @@ msgstr "" msgid "Cost Center: {0} does not exist" msgstr "مركز التكلفة: {0} غير موجود" -#: erpnext/setup/doctype/company/company.js:106 +#: erpnext/setup/doctype/company/company.js:113 msgid "Cost Centers" msgstr "مراكز التكلفة" @@ -11727,7 +11764,7 @@ msgstr "تكلفة السلع والمواد المسلمة" msgid "Cost of Goods Sold" msgstr "تكلفة البضاعة المباعة" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:631 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:689 msgid "Cost of Goods Sold Account in Items Table" msgstr "" @@ -11804,11 +11841,11 @@ msgstr "" msgid "Could Not Delete Demo Data" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.py:606 +#: erpnext/selling/doctype/quotation/quotation.py:608 msgid "Could not auto create Customer due to the following missing mandatory field(s):" msgstr "تعذر إنشاء العميل تلقائيًا بسبب الحقول الإلزامية التالية المفقودة:" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:676 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:678 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again" msgstr "تعذر إنشاء إشعار دائن تلقائيًا ، يُرجى إلغاء تحديد "إشعار ائتمان الإصدار" وإرساله مرة أخرى" @@ -11969,8 +12006,8 @@ msgstr "إنشاء زبائن محتملين" msgid "Create Ledger Entries for Change Amount" msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:216 -#: erpnext/selling/doctype/customer/customer.js:266 +#: erpnext/buying/doctype/supplier/supplier.js:218 +#: erpnext/selling/doctype/customer/customer.js:269 msgid "Create Link" msgstr "" @@ -12012,7 +12049,7 @@ msgstr "إنشاء مدخل فتح نقطة البيع" msgid "Create Payment Entry" msgstr "إنشاء إدخال الدفع" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:814 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:819 msgid "Create Payment Entry for Consolidated POS Invoices." msgstr "" @@ -12028,7 +12065,7 @@ msgstr "إنشاء تنسيق طباعة" msgid "Create Prospect" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1637 +#: erpnext/selling/doctype/sales_order/sales_order.js:1660 #: erpnext/utilities/activation.py:106 msgid "Create Purchase Order" msgstr "إنشاء أمر الشراء" @@ -12074,7 +12111,7 @@ msgid "Create Sample Retention Stock Entry" msgstr "إنشاء نموذج إدخال مخزون الاحتفاظ" #: erpnext/stock/dashboard/item_dashboard.js:283 -#: erpnext/stock/doctype/material_request/material_request.js:482 +#: erpnext/stock/doctype/material_request/material_request.js:485 #: erpnext/stock/doctype/pick_list/pick_list.js:138 msgid "Create Stock Entry" msgstr "" @@ -12083,7 +12120,7 @@ msgstr "" msgid "Create Supplier Quotation" msgstr "إنشاء اقتباس مورد" -#: erpnext/setup/doctype/company/company.js:150 +#: erpnext/setup/doctype/company/company.js:157 msgid "Create Tax Template" msgstr "إنشاء قالب الضريبة" @@ -12156,7 +12193,7 @@ msgstr "" msgid "Creating Accounts..." msgstr "إنشاء حسابات ..." -#: erpnext/selling/doctype/sales_order/sales_order.js:1531 +#: erpnext/selling/doctype/sales_order/sales_order.js:1535 msgid "Creating Delivery Note ..." msgstr "" @@ -12180,12 +12217,12 @@ msgstr "" msgid "Creating Purchase Invoices ..." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1657 +#: erpnext/selling/doctype/sales_order/sales_order.js:1684 msgid "Creating Purchase Order ..." msgstr "إنشاء أمر شراء ..." -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:738 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:559 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:739 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:560 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73 msgid "Creating Purchase Receipt ..." msgstr "" @@ -12199,11 +12236,11 @@ msgstr "" msgid "Creating Stock Entry" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1791 +#: erpnext/selling/doctype/sales_order/sales_order.js:1805 msgid "Creating Subcontracting Inward Order ..." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:574 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:575 msgid "Creating Subcontracting Order ..." msgstr "" @@ -12258,15 +12295,15 @@ msgstr "" msgid "Credit" msgstr "دائن" -#: erpnext/accounts/report/general_ledger/general_ledger.py:711 +#: erpnext/accounts/report/general_ledger/general_ledger.py:718 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:686 +#: erpnext/accounts/report/general_ledger/general_ledger.py:693 msgid "Credit ({0})" msgstr "الائتمان ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:602 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:606 msgid "Credit Account" msgstr "حساب دائن" @@ -12344,7 +12381,7 @@ msgstr "الائتمان أيام" msgid "Credit Limit" msgstr "الحد الائتماني" -#: erpnext/selling/doctype/customer/customer.py:584 +#: erpnext/selling/doctype/customer/customer.py:593 msgid "Credit Limit Crossed" msgstr "" @@ -12392,7 +12429,7 @@ msgstr "أشهر الائتمان" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:176 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:147 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1216 -#: erpnext/controllers/sales_and_purchase_return.py:390 +#: erpnext/controllers/sales_and_purchase_return.py:391 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:303 #: erpnext/stock/doctype/delivery_note/delivery_note.js:89 #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -12408,7 +12445,7 @@ msgstr "ملاحظة الائتمان المبلغ" #. Option for the 'Status' (Select) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:268 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:270 msgid "Credit Note Issued" msgstr "الائتمان مذكرة صادرة" @@ -12418,15 +12455,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:673 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:675 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:375 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:383 -#: erpnext/controllers/accounts_controller.py:2284 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:377 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:385 +#: erpnext/controllers/accounts_controller.py:2292 msgid "Credit To" msgstr "دائن الى" @@ -12435,16 +12472,16 @@ msgstr "دائن الى" msgid "Credit in Company Currency" msgstr "المدين في عملة الشركة" -#: erpnext/selling/doctype/customer/customer.py:550 -#: erpnext/selling/doctype/customer/customer.py:605 +#: erpnext/selling/doctype/customer/customer.py:559 +#: erpnext/selling/doctype/customer/customer.py:614 msgid "Credit limit has been crossed for customer {0} ({1}/{2})" msgstr "تم تجاوز حد الائتمان للعميل {0} ({1} / {2})" -#: erpnext/selling/doctype/customer/customer.py:343 +#: erpnext/selling/doctype/customer/customer.py:352 msgid "Credit limit is already defined for the Company {0}" msgstr "تم تحديد حد الائتمان بالفعل للشركة {0}" -#: erpnext/selling/doctype/customer/customer.py:604 +#: erpnext/selling/doctype/customer/customer.py:613 msgid "Credit limit reached for customer {0}" msgstr "تم بلوغ حد الائتمان للعميل {0}" @@ -12453,7 +12490,7 @@ msgid "Creditor Turnover Ratio" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:155 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:256 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:257 msgid "Creditors" msgstr "الدائنين" @@ -12621,9 +12658,9 @@ msgstr "لا يمكن تغيير العملة بعد إجراء إدخالات msgid "Currency filters are currently unsupported in Custom Financial Report." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1665 -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1733 -#: erpnext/accounts/utils.py:2364 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1666 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:1734 +#: erpnext/accounts/utils.py:2390 msgid "Currency for {0} must be {1}" msgstr "العملة ل {0} يجب أن تكون {1} \\n
            \\nCurrency for {0} must be {1}" @@ -12631,7 +12668,7 @@ msgstr "العملة ل {0} يجب أن تكون {1} \\n
            \\nCurrency for {0} msgid "Currency of the Closing Account must be {0}" msgstr "عملة الحساب الختامي يجب أن تكون {0}" -#: erpnext/manufacturing/doctype/bom/bom.py:611 +#: erpnext/manufacturing/doctype/bom/bom.py:622 msgid "Currency of the price list {0} must be {1} or {2}" msgstr "العملة من قائمة الأسعار {0} يجب أن تكون {1} أو {2}" @@ -12712,7 +12749,7 @@ msgid "Current Level" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:153 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:254 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:255 msgid "Current Liabilities" msgstr "الخصوم المتداولة" @@ -12898,7 +12935,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:303 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:304 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/sales_invoice_reference/sales_invoice_reference.json #: erpnext/accounts/doctype/tax_rule/tax_rule.json @@ -12907,7 +12944,7 @@ msgstr "" #: erpnext/accounts/report/gross_profit/gross_profit.py:405 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:37 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:22 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:224 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:222 #: erpnext/accounts/report/pos_register/pos_register.js:44 #: erpnext/accounts/report/pos_register/pos_register.py:120 #: erpnext/accounts/report/pos_register/pos_register.py:181 @@ -12916,7 +12953,7 @@ msgstr "" #: erpnext/accounts/workspace/receivables/receivables.json #: erpnext/assets/doctype/asset/asset.json #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/buying/doctype/supplier/supplier.js:184 +#: erpnext/buying/doctype/supplier/supplier.js:186 #: erpnext/crm/doctype/contract/contract.json #: erpnext/crm/doctype/lead/lead.js:32 #: erpnext/crm/doctype/opportunity/opportunity.js:99 @@ -12926,7 +12963,7 @@ msgstr "" #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:88 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:98 #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json #: erpnext/projects/doctype/project/project.json @@ -12940,7 +12977,7 @@ msgstr "" #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1179 +#: erpnext/selling/doctype/sales_order/sales_order.js:1183 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 #: erpnext/selling/doctype/sms_center/sms_center.json @@ -12968,8 +13005,8 @@ msgstr "" #: erpnext/setup/doctype/customer_group/customer_group.json #: erpnext/setup/doctype/territory/territory.json #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:218 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:489 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:219 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:490 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json #: erpnext/stock/doctype/item/item.json @@ -13054,7 +13091,7 @@ msgid "Customer Addresses And Contacts" msgstr "عناوين العملاء وجهات الإتصال" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:268 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:269 msgid "Customer Advances" msgstr "" @@ -13173,9 +13210,9 @@ msgstr "ملاحظات العميل" #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:85 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56 -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:228 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:165 #: erpnext/accounts/report/gross_profit/gross_profit.py:412 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:211 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:209 #: erpnext/accounts/report/sales_register/sales_register.js:27 #: erpnext/accounts/report/sales_register/sales_register.py:202 #: erpnext/crm/doctype/opportunity/opportunity.json @@ -13285,7 +13322,7 @@ msgstr "رقم محمول العميل" #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:92 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:35 #: erpnext/accounts/report/gross_profit/gross_profit.py:419 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:231 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:229 #: erpnext/accounts/report/sales_register/sales_register.py:193 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/crm/doctype/opportunity/opportunity.json @@ -13390,7 +13427,7 @@ msgstr "العملاء المقدمة" msgid "Customer Provided Item Cost" msgstr "" -#: erpnext/setup/doctype/company/company.py:442 +#: erpnext/setup/doctype/company/company.py:473 msgid "Customer Service" msgstr "خدمة العملاء" @@ -13447,9 +13484,9 @@ msgstr "عميل أو بند" msgid "Customer required for 'Customerwise Discount'" msgstr "الزبون مطلوب للخصم المعني بالزبائن" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1170 -#: erpnext/selling/doctype/sales_order/sales_order.py:420 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:420 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1172 +#: erpnext/selling/doctype/sales_order/sales_order.py:422 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:422 msgid "Customer {0} does not belong to project {1}" msgstr "العميل {0} لا ينتمي الى المشروع {1}\\n
            \\nCustomer {0} does not belong to project {1}" @@ -13559,7 +13596,7 @@ msgstr "" msgid "DFS" msgstr "" -#: erpnext/projects/doctype/project/project.py:673 +#: erpnext/projects/doctype/project/project.py:672 msgid "Daily Project Summary for {0}" msgstr "ملخص المشروع اليومي لـ {0}" @@ -13648,7 +13685,7 @@ msgstr "تاريخ الميلاد لا يمكن أن يكون بعد تاريخ msgid "Date of Commencement" msgstr "تاريخ البدء" -#: erpnext/setup/doctype/company/company.js:87 +#: erpnext/setup/doctype/company/company.js:94 msgid "Date of Commencement should be greater than Date of Incorporation" msgstr "يجب أن يكون تاريخ البدء أكبر من تاريخ التأسيس" @@ -13672,7 +13709,7 @@ msgstr "تاريخ الإصدار" msgid "Date of Joining" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:287 msgid "Date of Transaction" msgstr "تاريخ المعاملة" @@ -13804,11 +13841,11 @@ msgstr "" msgid "Debit" msgstr "مدين" -#: erpnext/accounts/report/general_ledger/general_ledger.py:704 +#: erpnext/accounts/report/general_ledger/general_ledger.py:711 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:679 +#: erpnext/accounts/report/general_ledger/general_ledger.py:686 msgid "Debit ({0})" msgstr "مدين ({0})" @@ -13818,7 +13855,7 @@ msgstr "مدين ({0})" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:592 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:596 msgid "Debit Account" msgstr "حساب مدين" @@ -13861,9 +13898,9 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:178 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:147 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1219 -#: erpnext/controllers/sales_and_purchase_return.py:394 +#: erpnext/controllers/sales_and_purchase_return.py:395 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:304 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:61 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:52 msgid "Debit Note" msgstr "إشعار مدين" @@ -13887,17 +13924,17 @@ msgstr "" #. Label of the debit_to (Link) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1038 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1049 -#: erpnext/controllers/accounts_controller.py:2284 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1040 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1051 +#: erpnext/controllers/accounts_controller.py:2292 msgid "Debit To" msgstr "الخصم ل" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1034 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1036 msgid "Debit To is required" msgstr "مدين الى مطلوب" -#: erpnext/accounts/general_ledger.py:523 +#: erpnext/accounts/general_ledger.py:525 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}." msgstr "المدين و الدائن غير متساوي ل {0} # {1}. الفرق هو {2}." @@ -13958,7 +13995,7 @@ msgstr "" msgid "Decimeter" msgstr "" -#: erpnext/public/js/utils/sales_common.js:585 +#: erpnext/public/js/utils/sales_common.js:607 msgid "Declare Lost" msgstr "أعلن فقدت" @@ -14020,14 +14057,14 @@ msgstr "" #. Label of the default_advance_paid_account (Link) field in DocType 'Company' #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:271 +#: erpnext/setup/doctype/company/company.py:302 msgid "Default Advance Paid Account" msgstr "" #. Label of the default_advance_received_account (Link) field in DocType #. 'Company' #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:260 +#: erpnext/setup/doctype/company/company.py:291 msgid "Default Advance Received Account" msgstr "" @@ -14040,15 +14077,15 @@ msgstr "الافتراضي BOM" msgid "Default BOM ({0}) must be active for this item or its template" msgstr "يجب أن تكون قائمة المواد الافتراضية ({0}) نشطة لهذا الصنف أو قوالبه" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2151 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2152 msgid "Default BOM for {0} not found" msgstr "فاتورة المواد ل {0} غير موجودة\\n
            \\nDefault BOM for {0} not found" -#: erpnext/controllers/accounts_controller.py:3841 +#: erpnext/controllers/accounts_controller.py:3849 msgid "Default BOM not found for FG Item {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2148 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2149 msgid "Default BOM not found for Item {0} and Project {1}" msgstr "لم يتم العثور على قائمة المواد الافتراضية للمادة {0} والمشروع {1}" @@ -14176,9 +14213,8 @@ msgstr "حساب النفقات الإفتراضي" msgid "Default Finance Book" msgstr "دفتر المالية الافتراضي" -#. Label of the default_fg_warehouse (Link) field in DocType 'Manufacturing -#. Settings' -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json +#. Label of the default_fg_warehouse (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json msgid "Default Finished Goods Warehouse" msgstr "المخزن الافتراضي للبضائع التامة الصنع" @@ -14313,14 +14349,18 @@ msgstr "عدد أيام صلاحية عرض الأسعار الافتراضي" msgid "Default Receivable Account" msgstr "حساب المدينون الافتراضي" +#. Label of the default_sales_contact (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid "Default Sales Contact" +msgstr "" + #. Label of the sales_uom (Link) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Default Sales Unit of Measure" msgstr "وحدة قياس المبيعات الافتراضية" -#. Label of the default_scrap_warehouse (Link) field in DocType 'Manufacturing -#. Settings' -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json +#. Label of the default_scrap_warehouse (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json msgid "Default Scrap Warehouse" msgstr "مستودع الخردة الافتراضي" @@ -14358,6 +14398,11 @@ msgstr "المستودع المصدر الافتراضي" msgid "Default Stock UOM" msgstr "افتراضي وحدة قياس السهم" +#. Label of the valuation_method (Select) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid "Default Stock Valuation Method" +msgstr "" + #. Label of the default_supplier (Link) field in DocType 'Item Default' #: erpnext/stock/doctype/item_default/item_default.json msgid "Default Supplier" @@ -14385,15 +14430,15 @@ msgstr "الإقليم الافتراضي" msgid "Default Unit of Measure" msgstr "وحدة القياس الافتراضية" -#: erpnext/stock/doctype/item/item.py:1267 +#: erpnext/stock/doctype/item/item.py:1248 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1250 +#: erpnext/stock/doctype/item/item.py:1231 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "لا يمكن تغيير وحدة القياس الافتراضية للبند {0} مباشرة لأنك قمت بالفعل ببعض المعاملات (المعاملة) مع UOM أخرى. ستحتاج إلى إنشاء عنصر جديد لاستخدام واجهة مستخدم افتراضية مختلفة.\\n
            \\nDefault Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." -#: erpnext/stock/doctype/item/item.py:898 +#: erpnext/stock/doctype/item/item.py:879 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "وحدة القياس الافتراضية للمتغير '{0}' يجب أن تكون كما في النمودج '{1}'" @@ -14420,18 +14465,6 @@ msgstr "النماذج الافتراضية" msgid "Default Warehouse for Sales Return" msgstr "المستودع الافتراضي لعائد المبيعات" -#. Label of the section_break_6 (Section Break) field in DocType 'Manufacturing -#. Settings' -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json -msgid "Default Warehouses for Production" -msgstr "المستودعات الافتراضية للإنتاج" - -#. Label of the default_wip_warehouse (Link) field in DocType 'Manufacturing -#. Settings' -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json -msgid "Default Work In Progress Warehouse" -msgstr "افتراضي العمل في مستودع التقدم" - #. Label of the workstation (Link) field in DocType 'Operation' #: erpnext/manufacturing/doctype/operation/operation.json msgid "Default Workstation" @@ -14448,7 +14481,7 @@ msgstr "سيتم تحديث الحساب الافتراضي تلقائيا في msgid "Default settings for your stock-related transactions" msgstr "" -#: erpnext/setup/doctype/company/company.js:184 +#: erpnext/setup/doctype/company/company.js:191 msgid "Default tax templates for sales, purchase and items are created." msgstr "" @@ -14608,15 +14641,20 @@ msgstr "" #. Label of the delete_transactions (Check) field in DocType 'Transaction #. Deletion Record' -#: erpnext/setup/doctype/company/company.js:161 +#: erpnext/setup/doctype/company/company.js:168 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json msgid "Delete Transactions" msgstr "" -#: erpnext/setup/doctype/company/company.js:230 +#: erpnext/setup/doctype/company/company.js:237 msgid "Delete all the Transactions for this Company" msgstr "حذف كل المعاملات المتعلقة بالشركة\\n
            \\nDelete all the Transactions for this Company" +#. Label of a Link in the Settings Workspace +#: erpnext/setup/workspace/settings/settings.json +msgid "Deleted Documents" +msgstr "" + #: erpnext/edi/doctype/code_list/code_list.js:28 msgid "Deleting {0} and all associated Common Code documents..." msgstr "" @@ -14646,7 +14684,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Stock Reservation Entry' #. Option for the 'Status' (Select) field in DocType 'Subcontracting Inward #. Order' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:400 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:401 #: 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 @@ -14735,7 +14773,7 @@ msgid "Delivered: {0}" msgstr "تسليم: {0}" #. Option for the 'Purpose' (Select) field in DocType 'Pick List' -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:124 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:125 #: erpnext/stock/doctype/pick_list/pick_list.json msgid "Delivery" msgstr "تسليم" @@ -14752,7 +14790,7 @@ msgstr "تسليم" #: erpnext/public/js/utils.js:791 #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:624 -#: erpnext/selling/doctype/sales_order/sales_order.js:1474 +#: erpnext/selling/doctype/sales_order/sales_order.js:1478 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:321 @@ -14765,7 +14803,7 @@ msgstr "تاريخ التسليم" msgid "Delivery Details" msgstr "تفاصيل التسليم" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:109 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:119 msgid "Delivery From Date" msgstr "" @@ -14791,21 +14829,21 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a shortcut in the Stock Workspace #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:326 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:327 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js:22 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:21 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:294 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:292 #: erpnext/accounts/report/sales_register/sales_register.py:245 -#: erpnext/selling/doctype/sales_order/sales_order.js:1038 +#: erpnext/selling/doctype/sales_order/sales_order.js:1042 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json #: erpnext/stock/doctype/delivery_trip/delivery_trip.js:52 #: erpnext/stock/doctype/packing_slip/packing_slip.json -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:75 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:66 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json #: erpnext/stock/doctype/shipment_delivery_note/shipment_delivery_note.json #: erpnext/stock/workspace/stock/stock.json @@ -14847,7 +14885,7 @@ msgstr "" msgid "Delivery Note Trends" msgstr "توجهات إشعارات التسليم" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1426 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1428 msgid "Delivery Note {0} is not submitted" msgstr "لم يتم اعتماد ملاحظه التسليم {0}\\n
            \\nDelivery Note {0} is not submitted" @@ -14897,14 +14935,14 @@ msgstr "توقف التسليم" msgid "Delivery To" msgstr "التسليم إلى" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:115 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:125 msgid "Delivery To Date" msgstr "" #. Label of the delivery_trip (Link) field in DocType 'Delivery Note' #. Name of a DocType #. Label of a Link in the Stock Workspace -#: erpnext/stock/doctype/delivery_note/delivery_note.js:283 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:284 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_trip/delivery_trip.json #: erpnext/stock/workspace/stock/stock.json @@ -14934,7 +14972,7 @@ msgstr "مستودع تسليم" msgid "Delivery to" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:439 +#: erpnext/selling/doctype/sales_order/sales_order.py:441 msgid "Delivery warehouse required for stock item {0}" msgstr "مستودع التسليم مطلوب للبند المستودعي {0}\\n
            \\nDelivery warehouse required for stock item {0}" @@ -15190,7 +15228,7 @@ msgstr "" #. Label of the order_lost_reason (Small Text) field in DocType 'Opportunity' #. Label of the order_lost_reason (Small Text) field in DocType 'Quotation' #: erpnext/crm/doctype/opportunity/opportunity.json -#: erpnext/public/js/utils/sales_common.js:564 +#: erpnext/public/js/utils/sales_common.js:586 #: erpnext/selling/doctype/quotation/quotation.json msgid "Detailed Reason" msgstr "سبب مفصل" @@ -15243,11 +15281,11 @@ msgstr "الفرق ( المدين - الدائن )" msgid "Difference Account" msgstr "حساب الفرق" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:620 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:678 msgid "Difference Account in Items Table" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:609 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:667 msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" @@ -15302,16 +15340,16 @@ msgstr "" msgid "Difference Posting Date" msgstr "" -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:92 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:100 msgid "Difference Qty" msgstr "" #: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:136 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:131 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:134 msgid "Difference Value" msgstr "قيمة الفرق" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:498 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:499 msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row." msgstr "" @@ -15371,7 +15409,7 @@ msgstr "النفقات المباشرة" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:141 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:236 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:237 msgid "Direct Income" msgstr "إيراد مباشر" @@ -15454,15 +15492,15 @@ msgstr "" msgid "Disabled Account Selected" msgstr "" -#: erpnext/stock/utils.py:446 +#: erpnext/stock/utils.py:450 msgid "Disabled Warehouse {0} cannot be used for this transaction." msgstr "" -#: erpnext/controllers/accounts_controller.py:833 +#: erpnext/controllers/accounts_controller.py:838 msgid "Disabled pricing rules since this {} is an internal transfer" msgstr "" -#: erpnext/controllers/accounts_controller.py:847 +#: erpnext/controllers/accounts_controller.py:852 msgid "Disabled tax included prices since this {} is an internal transfer" msgstr "" @@ -15483,7 +15521,7 @@ msgstr "" msgid "Disassemble" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:231 +#: erpnext/manufacturing/doctype/work_order/work_order.js:232 msgid "Disassemble Order" msgstr "" @@ -15698,7 +15736,7 @@ msgstr "" msgid "Discount must be less than 100" msgstr "يجب أن يكون الخصم أقل من 100" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3418 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3419 msgid "Discount of {} applied as per Payment Term" msgstr "" @@ -15770,7 +15808,7 @@ msgstr "" msgid "Dislikes" msgstr "يكره" -#: erpnext/setup/doctype/company/company.py:436 +#: erpnext/setup/doctype/company/company.py:467 msgid "Dispatch" msgstr "ارسال" @@ -15915,6 +15953,11 @@ msgstr "" msgid "Distribute Charges Based On" msgstr "توزيع الرسوم بناء على" +#. Label of the distribute_equally (Check) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json +msgid "Distribute Equally" +msgstr "" + #. Option for the 'Distribute Charges Based On' (Select) field in DocType #. 'Landed Cost Voucher' #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json @@ -15951,6 +15994,11 @@ msgstr "" msgid "Distributed Discount Amount" msgstr "" +#. Label of the distribution_frequency (Select) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json +msgid "Distribution Frequency" +msgstr "" + #. Label of the distribution_id (Data) field in DocType 'Monthly Distribution' #: erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json msgid "Distribution Name" @@ -15962,7 +16010,7 @@ msgid "Distributor" msgstr "موزع" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:191 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:337 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:338 msgid "Dividends Paid" msgstr "توزيع الأرباح" @@ -16032,7 +16080,7 @@ msgstr "هل تريد أن تخطر جميع العملاء عن طريق الب msgid "Do you want to submit the material request" msgstr "هل ترغب في تقديم طلب المواد" -#: erpnext/manufacturing/doctype/job_card/job_card.js:94 +#: erpnext/manufacturing/doctype/job_card/job_card.js:103 msgid "Do you want to submit the stock entry?" msgstr "" @@ -16063,7 +16111,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:254 +#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:257 msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost." msgstr "" @@ -16152,7 +16200,7 @@ msgstr "دخول وقت التوقف" msgid "Downtime Reason" msgstr "سبب التوقف" -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:246 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:248 msgid "Dr/Cr" msgstr "" @@ -16237,7 +16285,7 @@ msgstr "" msgid "Due Date cannot be before {0}" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:129 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:138 msgid "Due to stock closing entry {0}, you cannot repost item valuation before {1}" msgstr "" @@ -16245,7 +16293,7 @@ msgstr "" #. Label of a Card Break in the Receivables Workspace #. Label of a Link in the Receivables Workspace #: erpnext/accounts/doctype/dunning/dunning.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:150 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:151 #: erpnext/accounts/workspace/receivables/receivables.json msgid "Dunning" msgstr "إنذار بالدفع" @@ -16319,7 +16367,7 @@ msgid "Duplicate POS Fields" msgstr "" #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:104 -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:65 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:64 msgid "Duplicate POS Invoices found" msgstr "" @@ -16369,7 +16417,7 @@ msgid "Duration in Days" msgstr "المدة في أيام" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:170 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:285 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:286 #: erpnext/setup/setup_wizard/operations/taxes_setup.py:256 msgid "Duties and Taxes" msgstr "الرسوم والضرائب" @@ -16385,12 +16433,12 @@ msgstr "" msgid "Dyne" msgstr "" -#: erpnext/regional/italy/utils.py:248 erpnext/regional/italy/utils.py:268 -#: erpnext/regional/italy/utils.py:278 erpnext/regional/italy/utils.py:286 -#: erpnext/regional/italy/utils.py:293 erpnext/regional/italy/utils.py:297 -#: erpnext/regional/italy/utils.py:304 erpnext/regional/italy/utils.py:313 -#: erpnext/regional/italy/utils.py:338 erpnext/regional/italy/utils.py:345 -#: erpnext/regional/italy/utils.py:450 +#: erpnext/regional/italy/utils.py:221 erpnext/regional/italy/utils.py:241 +#: erpnext/regional/italy/utils.py:251 erpnext/regional/italy/utils.py:259 +#: erpnext/regional/italy/utils.py:266 erpnext/regional/italy/utils.py:270 +#: erpnext/regional/italy/utils.py:277 erpnext/regional/italy/utils.py:286 +#: erpnext/regional/italy/utils.py:311 erpnext/regional/italy/utils.py:318 +#: erpnext/regional/italy/utils.py:423 msgid "E-Invoicing Information Missing" msgstr "الفواتير الإلكترونية معلومات مفقودة" @@ -16433,7 +16481,7 @@ msgstr "معرف المستخدم ERPNext" msgid "Each Transaction" msgstr "كل عملية" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:174 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:176 msgid "Earliest" msgstr "أولا" @@ -16446,7 +16494,7 @@ msgstr "أقدم عمر" msgid "Earnest Money" msgstr "العربون" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:499 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:528 msgid "Edit BOM" msgstr "" @@ -16482,7 +16530,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/assets/doctype/asset_capitalization/asset_capitalization.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:502 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:503 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -16515,8 +16563,8 @@ msgstr "المؤهلات العلمية" msgid "Either 'Selling' or 'Buying' must be selected" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:268 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:413 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:290 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:441 msgid "Either Workstation or Workstation Type is mandatory" msgstr "" @@ -16566,11 +16614,6 @@ msgstr "" msgid "Ells (UK)" msgstr "" -#. Label of a Card Break in the Settings Workspace -#: erpnext/setup/workspace/settings/settings.json -msgid "Email / Notifications" -msgstr "" - #: erpnext/www/book_appointment/index.html:52 msgid "Email Address (required)" msgstr "" @@ -16746,7 +16789,7 @@ msgid "Employee Advances" msgstr "سلف الموظفين" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:184 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:321 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:322 msgid "Employee Benefits Obligation" msgstr "" @@ -16859,7 +16902,7 @@ msgstr "تمكين جدولة موعد" msgid "Enable Auto Email" msgstr "تفعيل البريد الإلكتروني التلقائي" -#: erpnext/stock/doctype/item/item.py:1059 +#: erpnext/stock/doctype/item/item.py:1040 msgid "Enable Auto Re-Order" msgstr "تمكين إعادة الطلب التلقائي" @@ -17033,8 +17076,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:362 -#: erpnext/manufacturing/doctype/job_card/job_card.js:432 +#: erpnext/manufacturing/doctype/job_card/job_card.js:371 +#: erpnext/manufacturing/doctype/job_card/job_card.js:441 #: 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 @@ -17050,7 +17093,7 @@ msgstr "" #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64 #: erpnext/accounts/report/financial_ratios/financial_ratios.js:25 #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:89 -#: erpnext/public/js/financial_statements.js:340 +#: erpnext/public/js/financial_statements.js:351 msgid "End Year" msgstr "نهاية السنة" @@ -17095,7 +17138,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:13 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:23 -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:29 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:30 msgid "Enough Parts to Build" msgstr "يكفي لبناء أجزاء" @@ -17121,12 +17164,12 @@ msgstr "" msgid "Enter Serial Nos" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:419 +#: erpnext/stock/doctype/material_request/material_request.js:422 msgid "Enter Supplier" msgstr "أدخل المورد" -#: erpnext/manufacturing/doctype/job_card/job_card.js:389 -#: erpnext/manufacturing/doctype/job_card/job_card.js:458 +#: erpnext/manufacturing/doctype/job_card/job_card.js:398 +#: erpnext/manufacturing/doctype/job_card/job_card.js:467 #: erpnext/manufacturing/doctype/workstation/workstation.js:312 msgid "Enter Value" msgstr "أدخل القيمة" @@ -17135,7 +17178,7 @@ msgstr "أدخل القيمة" msgid "Enter Visit Details" msgstr "" -#: erpnext/manufacturing/doctype/routing/routing.js:78 +#: erpnext/manufacturing/doctype/routing/routing.js:88 msgid "Enter a name for Routing." msgstr "" @@ -17183,7 +17226,7 @@ msgstr "" msgid "Enter the Bank Guarantee Number before submitting." msgstr "" -#: erpnext/manufacturing/doctype/routing/routing.js:83 +#: erpnext/manufacturing/doctype/routing/routing.js:93 msgid "Enter the Operation, the table will fetch the Operation details like Hourly Rate, Workstation automatically.\n\n" " After that, set the Operation Time in minutes and the table will calculate the Operation Costs based on the Hourly Rate and Operation Time." msgstr "" @@ -17200,11 +17243,11 @@ msgstr "" msgid "Enter the opening stock units." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:918 +#: erpnext/manufacturing/doctype/bom/bom.js:926 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:1138 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1123 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set." msgstr "" @@ -17237,7 +17280,7 @@ msgstr "نوع الدخول" #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:189 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:331 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:332 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/report/account_balance/account_balance.js:29 #: erpnext/accounts/report/account_balance/account_balance.js:45 @@ -17289,7 +17332,7 @@ msgstr "" msgid "Error while processing deferred accounting for {0}" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:442 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:513 msgid "Error while reposting item valuation" msgstr "" @@ -17345,7 +17388,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:990 +#: erpnext/stock/doctype/item/item.py:971 msgid "Example of a linked document: {0}" msgstr "" @@ -17410,15 +17453,17 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json #: erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json -#: erpnext/setup/doctype/company/company.py:624 +#: erpnext/setup/doctype/company/company.py:655 msgid "Exchange Gain/Loss" msgstr "أرباح / خسائر الناتجة عن صرف العملة" -#: erpnext/controllers/accounts_controller.py:1696 -#: erpnext/controllers/accounts_controller.py:1780 +#: erpnext/controllers/accounts_controller.py:1704 +#: erpnext/controllers/accounts_controller.py:1788 msgid "Exchange Gain/Loss amount has been booked through {0}" msgstr "" +#. Label of the exchange_rate (Float) field in DocType 'Advance Payment Ledger +#. Entry' #. Label of the exchange_rate (Float) field in DocType 'Journal Entry Account' #. Label of the exchange_rate (Float) field in DocType 'Payment Entry #. Reference' @@ -17446,6 +17491,7 @@ msgstr "" #. Label of the exchange_rate (Float) field in DocType 'Landed Cost Taxes and #. Charges' #. Label of the conversion_rate (Float) field in DocType 'Purchase Receipt' +#: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json @@ -17497,7 +17543,7 @@ msgstr "حساب إعادة تقييم سعر الصرف" msgid "Exchange Rate Revaluation Settings" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:73 +#: erpnext/controllers/sales_and_purchase_return.py:72 msgid "Exchange Rate must be same as {0} {1} ({2})" msgstr "يجب أن يكون سعر الصرف نفس {0} {1} ({2})" @@ -17509,7 +17555,7 @@ msgstr "يجب أن يكون سعر الصرف نفس {0} {1} ({2})" msgid "Excise Entry" msgstr "الدخول المكوس" -#: erpnext/stock/doctype/stock_entry/stock_entry.js:1367 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:1365 msgid "Excise Invoice" msgstr "المكوس الفاتورة" @@ -17574,7 +17620,7 @@ msgstr "" msgid "Expected Amount" msgstr "المبلغ المتوقع" -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:424 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:429 msgid "Expected Arrival Date" msgstr "وصول التاريخ المتوقع" @@ -17604,7 +17650,7 @@ msgstr "تاريخ الإغلاق المتوقع" msgid "Expected Delivery Date" msgstr "تاريخ التسليم المتوقع" -#: erpnext/selling/doctype/sales_order/sales_order.py:401 +#: erpnext/selling/doctype/sales_order/sales_order.py:403 msgid "Expected Delivery Date should be after Sales Order Date" msgstr "يجب أن يكون تاريخ التسليم المتوقع بعد تاريخ أمر المبيعات" @@ -17678,7 +17724,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:601 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:603 #: 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:184 @@ -17686,7 +17732,7 @@ msgstr "القيمة المتوقعة بعد حياة مفيدة" msgid "Expense" msgstr "نفقة" -#: erpnext/controllers/stock_controller.py:895 +#: erpnext/controllers/stock_controller.py:897 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "حساب نفقات / قروق ({0}) يجب ان يكون حساب ارباح و خسائر" @@ -17719,7 +17765,7 @@ msgstr "حساب نفقات / قروق ({0}) يجب ان يكون حساب ار #: erpnext/accounts/doctype/pos_profile/pos_profile.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/account_balance/account_balance.js:46 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:253 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:256 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -17734,7 +17780,7 @@ msgstr "حساب نفقات / قروق ({0}) يجب ان يكون حساب ار msgid "Expense Account" msgstr "حساب النفقات" -#: erpnext/controllers/stock_controller.py:875 +#: erpnext/controllers/stock_controller.py:877 msgid "Expense Account Missing" msgstr "حساب المصاريف مفقود" @@ -17749,13 +17795,13 @@ msgstr "" msgid "Expense Head" msgstr "عنوان المصروف" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:495 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:519 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:539 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:497 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:521 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:541 msgid "Expense Head Changed" msgstr "تغيير رأس المصاريف" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:597 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:599 msgid "Expense account is mandatory for item {0}" msgstr "اجباري حساب النفقات للصنف {0}" @@ -17843,10 +17889,6 @@ msgstr "تنبؤ تجانس أسي" msgid "Export E-Invoices" msgstr "تصدير الفواتير الإلكترونية" -#: erpnext/setup/setup_wizard/operations/install_fixtures.py:301 -msgid "External" -msgstr "" - #. Label of the external_work_history (Table) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "External Work History" @@ -17879,11 +17921,14 @@ msgstr "صغير جدا" msgid "FG / Semi FG Item" msgstr "" +#. Option for the 'Default Stock Valuation Method' (Select) field in DocType +#. 'Company' #. Option for the 'Valuation Method' (Select) field in DocType 'Item' #. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock #. Settings' #. Option for the 'Pick Serial / Batch Based On' (Select) field in DocType #. 'Stock Settings' +#: erpnext/setup/doctype/company/company.json #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "FIFO" @@ -17942,7 +17987,7 @@ msgstr "فشل في تثبيت الإعدادات المسبقة" msgid "Failed to login" msgstr "فشل في تسجيل الدخول" -#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:163 +#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:164 msgid "Failed to parse MT940 format. Error: {0}" msgstr "" @@ -17959,7 +18004,7 @@ msgstr "أخفق إعداد الشركة" msgid "Failed to setup defaults" msgstr "فشل في إعداد الإعدادات الافتراضية" -#: erpnext/setup/doctype/company/company.py:821 +#: erpnext/setup/doctype/company/company.py:852 msgid "Failed to setup defaults for country {0}. Please contact support." msgstr "" @@ -18031,7 +18076,7 @@ msgstr "" msgid "Fetch Subscription Updates" msgstr "جلب تحديثات الاشتراك" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1050 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1051 msgid "Fetch Timesheet" msgstr "" @@ -18053,7 +18098,7 @@ msgstr "" msgid "Fetch Value From" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:354 +#: erpnext/stock/doctype/material_request/material_request.js:357 #: erpnext/stock/doctype/stock_entry/stock_entry.js:681 msgid "Fetch exploded BOM (including sub-assemblies)" msgstr "جلب BOM انفجرت (بما في ذلك المجالس الفرعية)" @@ -18072,11 +18117,11 @@ msgstr "" msgid "Fetching Error" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:188 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:198 msgid "Fetching Material Requests..." msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:135 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:145 msgid "Fetching Sales Orders..." msgstr "" @@ -18114,7 +18159,7 @@ msgstr "إعادة تسمية الملف" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:16 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:16 -#: erpnext/public/js/financial_statements.js:292 +#: erpnext/public/js/financial_statements.js:303 msgid "Filter Based On" msgstr "عامل التصفية على أساس" @@ -18148,11 +18193,11 @@ msgstr "" msgid "Filter on Payment" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:148 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:158 msgid "Filters for Material Requests" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:82 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:92 msgid "Filters for Sales Orders" msgstr "" @@ -18219,7 +18264,7 @@ msgstr "" #: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json #: erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:48 -#: erpnext/public/js/financial_statements.js:286 +#: erpnext/public/js/financial_statements.js:297 msgid "Finance Book" msgstr "كتاب المالية" @@ -18280,7 +18325,7 @@ msgstr "" #. Label of a Card Break in the Financial Reports Workspace #: erpnext/accounts/workspace/financial_reports/financial_reports.json -#: erpnext/public/js/financial_statements.js:254 +#: erpnext/public/js/financial_statements.js:265 msgid "Financial Statements" msgstr "البيانات المالية" @@ -18353,15 +18398,15 @@ msgstr "" msgid "Finished Good Item Quantity" msgstr "" -#: erpnext/controllers/accounts_controller.py:3827 +#: erpnext/controllers/accounts_controller.py:3835 msgid "Finished Good Item is not specified for service item {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:3844 +#: erpnext/controllers/accounts_controller.py:3852 msgid "Finished Good Item {0} Qty can not be zero" msgstr "" -#: erpnext/controllers/accounts_controller.py:3838 +#: erpnext/controllers/accounts_controller.py:3846 msgid "Finished Good Item {0} must be a sub-contracted item" msgstr "" @@ -18406,7 +18451,7 @@ msgstr "" msgid "Finished Good {0} must be a sub-contracted item." msgstr "" -#: erpnext/setup/doctype/company/company.py:341 +#: erpnext/setup/doctype/company/company.py:372 msgid "Finished Goods" msgstr "السلع تامة الصنع" @@ -18437,7 +18482,6 @@ msgstr "" #. Label of the warehouse (Link) field in DocType 'Production Plan Item' #. Label of the fg_warehouse (Link) field in DocType 'Work Order Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Finished Goods Warehouse" @@ -18448,7 +18492,7 @@ msgstr "مستودع البضائع الجاهزة" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1523 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1583 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -18502,11 +18546,10 @@ msgstr "وقت الاستجابة الأول للمشكلات" msgid "First Response Time for Opportunity" msgstr "وقت الاستجابة الأول للفرصة" -#: erpnext/regional/italy/utils.py:256 +#: erpnext/regional/italy/utils.py:229 msgid "Fiscal Regime is mandatory, kindly set the fiscal regime in the company {0}" msgstr "النظام المالي إلزامي ، يرجى تعيين النظام المالي في الشركة {0}" -#. Label of the fiscal_year (Link) field in DocType 'Budget' #. Name of a DocType #. Label of the fiscal_year (Link) field in DocType 'GL Entry' #. Label of the fiscal_year (Link) field in DocType 'Monthly Distribution' @@ -18516,7 +18559,6 @@ msgstr "النظام المالي إلزامي ، يرجى تعيين النظا #. Certificate' #. Label of the fiscal_year (Link) field in DocType 'Target Detail' #. Label of the fiscal_year (Data) field in DocType 'Stock Ledger Entry' -#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json @@ -18562,6 +18604,10 @@ msgstr "السنة المالية {0} غير موجودة" msgid "Fiscal Year {0} does not exist" msgstr "السنة المالية {0} غير موجودة" +#: erpnext/accounts/doctype/budget/budget.py:96 +msgid "Fiscal Year {0} is not available for Company {1}." +msgstr "" + #: erpnext/accounts/report/trial_balance/trial_balance.py:43 msgid "Fiscal Year {0} is required" msgstr "السنة المالية {0} مطلوبة" @@ -18612,7 +18658,7 @@ msgstr "سجل الأصول الثابتة" msgid "Fixed Asset Turnover Ratio" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:668 +#: erpnext/manufacturing/doctype/bom/bom.py:679 msgid "Fixed Asset item {0} cannot be used in BOMs." msgstr "" @@ -18690,7 +18736,7 @@ msgstr "اتبع التقويم الأشهر" msgid "Following Material Requests have been raised automatically based on Item's re-order level" msgstr "تم رفع طلبات المواد التالية تلقائيا بناء على مستوى اعادة الطلب للبنود" -#: erpnext/selling/doctype/customer/customer.py:775 +#: erpnext/selling/doctype/customer/customer.py:784 msgid "Following fields are mandatory to create address:" msgstr "الحقول التالية إلزامية لإنشاء العنوان:" @@ -18722,7 +18768,7 @@ msgstr "" msgid "For" msgstr "لأجل" -#: erpnext/public/js/utils/sales_common.js:367 +#: erpnext/public/js/utils/sales_common.js:389 msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table." msgstr "لبنود حزمة المنتج والمستودع والرقم المتسلسل ورقم الدفعة ستأخذ بعين الاعتبار من جدول قائمة التغليف. اذا كان للمستودع ورقم الدفعة نفس البند من بنود التغليف لأي بند من حزمة المنتج. هذه القيم يمكن ادخالها في جدول البند الرئيسي. والقيم سيتم نسخها الى جدول قائمة التغليف." @@ -18742,7 +18788,7 @@ msgstr "للشراء" msgid "For Company" msgstr "للشركة" -#: erpnext/stock/doctype/material_request/material_request.js:397 +#: erpnext/stock/doctype/material_request/material_request.js:400 msgid "For Default Supplier (Optional)" msgstr "للمورد الافتراضي (اختياري)" @@ -18751,7 +18797,7 @@ msgstr "للمورد الافتراضي (اختياري)" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1441 +#: erpnext/controllers/stock_controller.py:1546 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -18761,7 +18807,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:502 +#: erpnext/manufacturing/doctype/job_card/job_card.js:511 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "For Operation" msgstr "" @@ -18782,7 +18828,7 @@ msgstr "لائحة الأسعار" msgid "For Production" msgstr "للإنتاج" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:721 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:779 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "للكمية (الكمية المصنعة) إلزامية\\n
            \\nFor Quantity (Manufactured Qty) is mandatory" @@ -18792,7 +18838,7 @@ msgstr "للكمية (الكمية المصنعة) إلزامية\\n
            \\nFor Q msgid "For Raw Materials" msgstr "" -#: erpnext/controllers/accounts_controller.py:1362 +#: erpnext/controllers/accounts_controller.py:1370 msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}" msgstr "" @@ -18810,7 +18856,7 @@ msgstr "للمورد" #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/manufacturing/doctype/production_plan/production_plan.js:471 #: erpnext/manufacturing/doctype/production_plan/production_plan.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1395 +#: erpnext/selling/doctype/sales_order/sales_order.js:1399 #: erpnext/stock/doctype/material_request/material_request.js:346 #: erpnext/templates/form_grid/material_request_grid.html:36 msgid "For Warehouse" @@ -18820,11 +18866,11 @@ msgstr "لمستودع" msgid "For Work Order" msgstr "" -#: erpnext/controllers/status_updater.py:276 +#: erpnext/controllers/status_updater.py:277 msgid "For an item {0}, quantity must be negative number" msgstr "بالنسبة إلى عنصر {0} ، يجب أن تكون الكمية رقمًا سالبًا" -#: erpnext/controllers/status_updater.py:273 +#: erpnext/controllers/status_updater.py:274 msgid "For an item {0}, quantity must be positive number" msgstr "بالنسبة إلى عنصر {0} ، يجب أن تكون الكمية رقمًا موجبًا" @@ -18854,11 +18900,11 @@ msgstr "عن مورد فردي" msgid "For item {0}, only {1} asset have been created or linked to {2}. Please create or link {3} more asset with the respective document." msgstr "" -#: erpnext/controllers/status_updater.py:281 +#: erpnext/controllers/status_updater.py:282 msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2488 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2490 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})" msgstr "" @@ -18875,7 +18921,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1555 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1615 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -18884,12 +18930,12 @@ msgstr "" msgid "For reference" msgstr "للرجوع إليها" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1533 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1677 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1684 msgid "For row {0}: Enter Planned Qty" msgstr "بالنسبة إلى الصف {0}: أدخل الكمية المخطط لها" @@ -18908,7 +18954,7 @@ msgstr "بالنسبة لشرط "تطبيق القاعدة على أخرى& msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:861 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "For the item {0}, the quantity should be {1} according to the BOM {2}." msgstr "" @@ -18917,11 +18963,11 @@ msgctxt "Clear payment terms template and/or payment schedule when due date is c msgid "For the new {0} to take effect, would you like to clear the current {1}?" msgstr "" -#: erpnext/controllers/stock_controller.py:399 +#: erpnext/controllers/stock_controller.py:401 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:1122 +#: erpnext/controllers/sales_and_purchase_return.py:1123 msgid "For the {0}, the quantity is required to make the return entry" msgstr "" @@ -19030,7 +19076,7 @@ msgstr "" msgid "Free item code is not selected" msgstr "لم يتم تحديد رمز العنصر المجاني" -#: erpnext/accounts/doctype/pricing_rule/utils.py:651 +#: erpnext/accounts/doctype/pricing_rule/utils.py:654 msgid "Free item not set in the pricing rule {0}" msgstr "عنصر حر غير مضبوط في قاعدة التسعير {0}" @@ -19071,6 +19117,11 @@ msgstr "اقرأ المقالات بشكل متكرر" msgid "From BOM" msgstr "من BOM" +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:63 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:25 +msgid "From BOM No" +msgstr "" + #. Label of the from_company (Data) field in DocType 'Warranty Claim' #: erpnext/support/doctype/warranty_claim/warranty_claim.json msgid "From Company" @@ -19115,14 +19166,14 @@ msgstr "من التاريخ والوقت تكمن في السنة المالية msgid "From Date cannot be greater than To Date" msgstr "(من تاريخ) لا يمكن أن يكون أكبر (الي التاريخ)" -#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:26 +#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:27 msgid "From Date is mandatory" msgstr "" #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:53 #: erpnext/accounts/report/general_ledger/general_ledger.py:86 #: erpnext/accounts/report/pos_register/pos_register.py:115 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:39 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:41 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:41 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:34 #: erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py:38 @@ -19175,10 +19226,16 @@ msgstr "" msgid "From External Ecomm Platform" msgstr "" +#. Label of the from_fiscal_year (Link) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:43 msgid "From Fiscal Year" msgstr "من السنة المالية" +#: erpnext/accounts/doctype/budget/budget.py:109 +msgid "From Fiscal Year cannot be greater than To Fiscal Year" +msgstr "" + #. Label of the from_folio_no (Data) field in DocType 'Share Transfer' #: erpnext/accounts/doctype/share_transfer/share_transfer.json msgid "From Folio No" @@ -19521,7 +19578,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:664 +#: erpnext/accounts/report/general_ledger/general_ledger.py:671 msgid "GL Entry" msgstr "GL الدخول" @@ -19578,7 +19635,7 @@ msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:134 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:220 -#: erpnext/setup/doctype/company/company.py:632 +#: erpnext/setup/doctype/company/company.py:663 msgid "Gain/Loss on Asset Disposal" msgstr "الربح / الخسارة عند التخلص من الأصول" @@ -19620,13 +19677,11 @@ msgstr "" #. Option for the 'Report' (Select) field in DocType 'Process Statement Of #. Accounts' #. Name of a report -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Financial Reports Workspace #: erpnext/accounts/doctype/account/account.js:92 #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/general_ledger/general_ledger.json -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/financial_reports/financial_reports.json msgid "General Ledger" msgstr "دفتر الأستاذ العام" @@ -19696,7 +19751,7 @@ msgstr "" msgid "Generated" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:46 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:56 msgid "Generating Master Production Schedule..." msgstr "" @@ -19741,7 +19796,7 @@ msgstr "" msgid "Get Current Stock" msgstr "الحصول على المخزون الحالي" -#: erpnext/selling/doctype/customer/customer.js:186 +#: erpnext/selling/doctype/customer/customer.js:189 msgid "Get Customer Group Details" msgstr "" @@ -19781,14 +19836,14 @@ msgid "Get Item Locations" msgstr "الحصول على مواقع البند" #. Label of the get_items_from (Select) field in DocType 'Production Plan' -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:165 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:190 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:287 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:319 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:353 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1106 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:602 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:625 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:166 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:191 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:288 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:320 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:354 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1107 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:603 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:626 #: 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 @@ -19802,13 +19857,13 @@ msgstr "الحصول على مواقع البند" #: erpnext/public/js/controllers/buying.js:327 #: erpnext/selling/doctype/quotation/quotation.js:167 #: erpnext/selling/doctype/sales_order/sales_order.js:196 -#: erpnext/selling/doctype/sales_order/sales_order.js:1196 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:190 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:242 +#: erpnext/selling/doctype/sales_order/sales_order.js:1200 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:191 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:243 #: erpnext/stock/doctype/material_request/material_request.js:128 #: erpnext/stock/doctype/material_request/material_request.js:223 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:160 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:267 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:151 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:241 #: erpnext/stock/doctype/stock_entry/stock_entry.js:328 #: erpnext/stock/doctype/stock_entry/stock_entry.js:375 #: erpnext/stock/doctype/stock_entry/stock_entry.js:408 @@ -19861,8 +19916,8 @@ msgstr "الحصول على المواد طلب" #. Label of the get_material_requests (Button) field in DocType 'Master #. Production Schedule' -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:171 -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:173 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:181 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:183 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json msgid "Get Material Requests" msgstr "" @@ -19902,8 +19957,8 @@ msgstr "" #. Label of the get_sales_orders (Button) field in DocType 'Master Production #. Schedule' #. Label of the get_sales_orders (Button) field in DocType 'Production Plan' -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:118 -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:120 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:128 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:130 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json #: erpnext/manufacturing/doctype/production_plan/production_plan.json msgid "Get Sales Orders" @@ -19930,7 +19985,7 @@ msgstr "" msgid "Get Sub Assembly Items" msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:113 +#: erpnext/buying/doctype/supplier/supplier.js:115 msgid "Get Supplier Group Details" msgstr "" @@ -19943,7 +19998,7 @@ msgstr "الحصول على الموردين" msgid "Get Suppliers By" msgstr "الحصول على الموردين من قبل" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1102 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1103 msgid "Get Timesheets" msgstr "" @@ -19979,7 +20034,6 @@ msgid "Give free item for every N quantity" msgstr "" #. Name of a DocType -#. Label of a Link in the Settings Workspace #. Label of a shortcut in the Settings Workspace #: erpnext/setup/doctype/global_defaults/global_defaults.json #: erpnext/setup/workspace/settings/settings.json @@ -20005,7 +20059,7 @@ msgstr "" msgid "Goods" msgstr "" -#: erpnext/setup/doctype/company/company.py:342 +#: erpnext/setup/doctype/company/company.py:373 #: erpnext/stock/doctype/stock_entry/stock_entry_list.js:21 msgid "Goods In Transit" msgstr "البضائع في العبور" @@ -20014,7 +20068,7 @@ msgstr "البضائع في العبور" msgid "Goods Transferred" msgstr "نقل البضائع" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2070 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2130 msgid "Goods are already received against the outward entry {0}" msgstr "تم استلام البضائع بالفعل مقابل الإدخال الخارجي {0}" @@ -20135,7 +20189,7 @@ msgstr "" #: erpnext/accounts/report/pos_register/pos_register.py:202 #: erpnext/accounts/report/purchase_register/purchase_register.py:275 #: erpnext/accounts/report/sales_register/sales_register.py:305 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:259 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:273 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json #: erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json @@ -20318,7 +20372,7 @@ msgstr "التجميع حسب طلب المبيعات" msgid "Group by Voucher" msgstr "المجموعة بواسطة قسيمة" -#: erpnext/stock/utils.py:440 +#: erpnext/stock/utils.py:444 msgid "Group node warehouse is not allowed to select for transactions" msgstr "لا يسمح مستودع عقدة مجموعة لتحديد للمعاملات" @@ -20380,10 +20434,12 @@ msgstr "مدير الموارد البشرية" msgid "HR User" msgstr "مستخدم الموارد البشرية" +#. Option for the 'Distribution Frequency' (Select) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:64 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77 #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59 -#: erpnext/public/js/financial_statements.js:353 +#: erpnext/public/js/financial_statements.js:364 #: erpnext/public/js/purchase_trends_filters.js:21 #: erpnext/public/js/sales_trends_filters.js:13 #: erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34 @@ -20457,6 +20513,12 @@ msgstr "تاريخ انتهاء الصلاحية" msgid "Has Item Scanned" msgstr "" +#. Label of the has_operating_cost (Check) field in DocType 'Landed Cost Taxes +#. and Charges' +#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json +msgid "Has Operating Cost" +msgstr "" + #. Label of the has_print_format (Check) field in DocType 'Cheque Print #. Template' #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json @@ -20614,7 +20676,7 @@ msgstr "" msgid "Hertz" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:444 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:515 msgid "Hi," msgstr "" @@ -20680,14 +20742,14 @@ msgstr "الرقم الأعلى له أولوية أكبر" msgid "History In Company" msgstr "الحركة التاريخيه في الشركة" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:379 -#: erpnext/selling/doctype/sales_order/sales_order.js:985 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:380 +#: erpnext/selling/doctype/sales_order/sales_order.js:989 msgid "Hold" msgstr "معلق" #. Label of the sb_14 (Section Break) field in DocType 'Purchase Invoice' #. Label of the on_hold (Check) field in DocType 'Purchase Invoice' -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:97 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:98 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json msgid "Hold Invoice" msgstr "عقد الفاتورة" @@ -20702,7 +20764,7 @@ msgstr "نوع التعليق" msgid "Holiday" msgstr "عطلة" -#: erpnext/setup/doctype/holiday_list/holiday_list.py:153 +#: erpnext/setup/doctype/holiday_list/holiday_list.py:162 msgid "Holiday Date {0} added multiple times" msgstr "" @@ -20814,7 +20876,7 @@ msgstr "" msgid "Hrs" msgstr "ساعات" -#: erpnext/setup/doctype/company/company.py:448 +#: erpnext/setup/doctype/company/company.py:479 msgid "Human Resources" msgstr "الموارد البشرية" @@ -21177,7 +21239,7 @@ msgstr "" msgid "If set, the system does not use the user's Email or the standard outgoing Email account for sending request for quotations." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1171 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1156 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected." msgstr "" @@ -21190,7 +21252,7 @@ msgstr "إذا الحساب مجمد، يسمح بالدخول إلى المست msgid "If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table." msgstr "إذا كان العنصر يتعامل كعنصر سعر تقييم صفري في هذا الإدخال ، فالرجاء تمكين "السماح بمعدل تقييم صفري" في جدول العناصر {0}." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1190 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1175 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed." msgstr "" @@ -21249,7 +21311,7 @@ msgstr "إذا تم تكوين هذا الخيار "نعم" ، سيم msgid "If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured." msgstr "إذا تم تحديده ، يمكن استخدام مواد متعددة لطلب عمل واحد. يكون هذا مفيدًا إذا تم تصنيع منتج أو أكثر من المنتجات التي تستغرق وقتًا طويلاً." -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:36 +#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24 msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials." msgstr "إذا تم تحديدها ، فسيتم تحديث تكلفة قائمة مكونات الصنف تلقائيًا استنادًا إلى معدل التقييم / سعر قائمة الأسعار / معدل الشراء الأخير للمواد الخام." @@ -21281,15 +21343,15 @@ msgstr "" msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1793 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1799 msgid "If you still want to proceed, please enable {0}." msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:373 +#: erpnext/accounts/doctype/pricing_rule/utils.py:376 msgid "If you {0} {1} quantities of the item {2}, the scheme {3} will be applied on the item." msgstr "إذا قمت {0} {1} بكميات العنصر {2} ، فسيتم تطبيق المخطط {3} على العنصر." -#: erpnext/accounts/doctype/pricing_rule/utils.py:378 +#: erpnext/accounts/doctype/pricing_rule/utils.py:381 msgid "If you {0} {1} worth item {2}, the scheme {3} will be applied on the item." msgstr "إذا كنت {0} {1} تستحق العنصر {2} ، فسيتم تطبيق النظام {3} على العنصر." @@ -21349,11 +21411,11 @@ msgstr "" msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1378 +#: erpnext/selling/doctype/sales_order/sales_order.js:1382 msgid "Ignore Existing Ordered Qty" msgstr "تجاهل الكمية الموجودة المطلوبة" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1785 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1791 msgid "Ignore Existing Projected Quantity" msgstr "تجاهل الكمية الموجودة المتوقعة" @@ -21439,6 +21501,13 @@ msgstr "" msgid "Import Chart of Accounts from a csv file" msgstr "" +#. Label of a Link in the Home Workspace +#. Label of a Link in the Settings Workspace +#: erpnext/setup/workspace/home/home.json +#: erpnext/setup/workspace/settings/settings.json +msgid "Import Data" +msgstr "" + #: erpnext/edi/doctype/code_list/code_list.js:7 #: erpnext/edi/doctype/code_list/code_list_list.js:3 #: erpnext/edi/doctype/common_code/common_code_list.js:3 @@ -21544,7 +21613,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:12 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:22 -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:28 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:29 msgid "In Stock Qty" msgstr "في سوق الأسهم الكمية" @@ -21557,11 +21626,11 @@ msgstr "في سوق الأسهم الكمية" msgid "In Transit" msgstr "في مرحلة انتقالية" -#: erpnext/stock/doctype/material_request/material_request.js:481 +#: erpnext/stock/doctype/material_request/material_request.js:484 msgid "In Transit Transfer" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.js:450 +#: erpnext/stock/doctype/material_request/material_request.js:453 msgid "In Transit Warehouse" msgstr "" @@ -21779,7 +21848,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1374 +#: erpnext/selling/doctype/sales_order/sales_order.js:1378 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json @@ -21814,7 +21883,7 @@ msgstr "تشمل الاصناف الغير مخزنية" msgid "Include POS Transactions" msgstr "تشمل معاملات نقطه البيع" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:194 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:199 msgid "Include Payment" msgstr "" @@ -21892,10 +21961,10 @@ msgstr "بما في ذلك السلع للمجموعات الفرعية" #. Accounting' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:235 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:236 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:465 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:467 #: erpnext/accounts/report/account_balance/account_balance.js:27 #: erpnext/accounts/report/financial_statements.py:776 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:182 @@ -21917,7 +21986,7 @@ msgstr "الإيرادات" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/account_balance/account_balance.js:53 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:77 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:301 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:299 msgid "Income Account" msgstr "حساب الدخل" @@ -21965,7 +22034,7 @@ msgstr "" msgid "Incorrect Balance Qty After Transaction" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1006 +#: erpnext/controllers/subcontracting_controller.py:1027 msgid "Incorrect Batch Consumed" msgstr "" @@ -21973,7 +22042,7 @@ msgstr "" msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:866 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:924 msgid "Incorrect Component Quantity" msgstr "" @@ -21999,7 +22068,7 @@ msgstr "" msgid "Incorrect Serial No Valuation" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1019 +#: erpnext/controllers/subcontracting_controller.py:1040 msgid "Incorrect Serial Number Consumed" msgstr "" @@ -22077,12 +22146,6 @@ msgstr "لا يمكن أن تكون الزيادة 0\\n
            \\nIncrement cannot b msgid "Increment for Attribute {0} cannot be 0" msgstr "الاضافة للخاصية {0} لا يمكن أن تكون 0" -#. Label of the indent (Int) field in DocType 'Production Plan Sub Assembly -#. Item' -#: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json -msgid "Indent" -msgstr "" - #. Label of the indentation_level (Int) field in DocType 'Financial Report Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json msgid "Indent Level" @@ -22112,7 +22175,7 @@ msgstr "نفقات غير مباشرة" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:145 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:241 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242 msgid "Indirect Income" msgstr "دخل غير مباشرة" @@ -22180,13 +22243,13 @@ msgstr "بدأت" msgid "Inspected By" msgstr "تفتيش من قبل" -#: erpnext/controllers/stock_controller.py:1335 +#: erpnext/controllers/stock_controller.py:1440 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1305 -#: erpnext/controllers/stock_controller.py:1307 +#: erpnext/controllers/stock_controller.py:1410 +#: erpnext/controllers/stock_controller.py:1412 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "التفتيش مطلوب" @@ -22203,7 +22266,7 @@ msgstr "التفتيش المطلوبة قبل تسليم" msgid "Inspection Required before Purchase" msgstr "التفتيش المطلوبة قبل الشراء" -#: erpnext/controllers/stock_controller.py:1320 +#: erpnext/controllers/stock_controller.py:1425 msgid "Inspection Submission" msgstr "" @@ -22223,7 +22286,7 @@ msgstr "تثبيت تاريخ" #. 'Installation Note' #. Label of a Link in the Stock Workspace #: erpnext/selling/doctype/installation_note/installation_note.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:263 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:264 #: erpnext/stock/workspace/stock/stock.json msgid "Installation Note" msgstr "ملاحظة التثبيت" @@ -22233,7 +22296,7 @@ msgstr "ملاحظة التثبيت" msgid "Installation Note Item" msgstr "ملاحظة تثبيت الإغلاق" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:627 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:629 msgid "Installation Note {0} has already been submitted" msgstr "مذكرة التسليم {0} ارسلت\\n
            \\nInstallation Note {0} has already been submitted" @@ -22272,15 +22335,15 @@ msgstr "" msgid "Insufficient Capacity" msgstr "" -#: erpnext/controllers/accounts_controller.py:3752 -#: erpnext/controllers/accounts_controller.py:3776 +#: erpnext/controllers/accounts_controller.py:3760 +#: erpnext/controllers/accounts_controller.py:3784 msgid "Insufficient Permissions" msgstr "أذونات غير كافية" #: erpnext/stock/doctype/pick_list/pick_list.py:120 #: erpnext/stock/doctype/pick_list/pick_list.py:138 -#: erpnext/stock/doctype/pick_list/pick_list.py:1009 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:841 +#: erpnext/stock/doctype/pick_list/pick_list.py:1013 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:899 #: erpnext/stock/serial_batch_bundle.py:1186 erpnext/stock/stock_ledger.py:1679 #: erpnext/stock/stock_ledger.py:2165 msgid "Insufficient Stock" @@ -22375,7 +22438,7 @@ msgstr "انتر دخول الشركة مجلة الدخول" msgid "Inter Company Order Reference" msgstr "مرجع طلب شركة Inter" -#: erpnext/selling/doctype/sales_order/sales_order.js:1133 +#: erpnext/selling/doctype/sales_order/sales_order.js:1137 msgid "Inter Company Purchase Order" msgstr "" @@ -22387,7 +22450,7 @@ msgstr "" msgid "Inter Company Reference" msgstr "بين شركة مرجع" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:485 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:486 msgid "Inter Company Sales Order" msgstr "" @@ -22414,16 +22477,16 @@ msgid "Interest Expense" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243 msgid "Interest Income" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3052 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3053 msgid "Interest and/or dunning fee" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:147 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:244 msgid "Interest on Fixed Deposits" msgstr "" @@ -22443,23 +22506,23 @@ msgstr "" msgid "Internal Customer" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:223 +#: erpnext/selling/doctype/customer/customer.py:224 msgid "Internal Customer for company {0} already exists" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1132 +#: erpnext/selling/doctype/sales_order/sales_order.js:1136 msgid "Internal Purchase Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:733 +#: erpnext/controllers/accounts_controller.py:738 msgid "Internal Sale or Delivery Reference missing." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:484 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:485 msgid "Internal Sales Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:735 +#: erpnext/controllers/accounts_controller.py:740 msgid "Internal Sales Reference Missing" msgstr "" @@ -22490,7 +22553,7 @@ msgstr "" msgid "Internal Transfer" msgstr "نقل داخلي" -#: erpnext/controllers/accounts_controller.py:744 +#: erpnext/controllers/accounts_controller.py:749 msgid "Internal Transfer Reference Missing" msgstr "" @@ -22503,7 +22566,7 @@ msgstr "" msgid "Internal Work History" msgstr "سجل العمل الداخلي" -#: erpnext/controllers/stock_controller.py:1402 +#: erpnext/controllers/stock_controller.py:1507 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -22517,14 +22580,14 @@ msgstr "" msgid "Interval should be between 1 to 59 MInutes" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:384 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1044 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1054 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:378 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:386 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1046 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1056 #: erpnext/assets/doctype/asset_category/asset_category.py:69 #: erpnext/assets/doctype/asset_category/asset_category.py:97 -#: erpnext/controllers/accounts_controller.py:3126 #: erpnext/controllers/accounts_controller.py:3134 +#: erpnext/controllers/accounts_controller.py:3142 msgid "Invalid Account" msgstr "حساب غير صالح" @@ -22541,7 +22604,7 @@ msgstr "" msgid "Invalid Attribute" msgstr "خاصية غير صالحة" -#: erpnext/controllers/accounts_controller.py:555 +#: erpnext/controllers/accounts_controller.py:560 msgid "Invalid Auto Repeat Date" msgstr "" @@ -22557,17 +22620,17 @@ msgstr "طلب فارغ غير صالح للعميل والعنصر المحدد msgid "Invalid Child Procedure" msgstr "إجراء الطفل غير صالح" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2326 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2328 msgid "Invalid Company for Inter Company Transaction." msgstr "شركة غير صالحة للمعاملات بين الشركات." #: erpnext/assets/doctype/asset/asset.py:296 #: erpnext/assets/doctype/asset/asset.py:303 -#: erpnext/controllers/accounts_controller.py:3149 +#: erpnext/controllers/accounts_controller.py:3157 msgid "Invalid Cost Center" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:403 +#: erpnext/selling/doctype/sales_order/sales_order.py:405 msgid "Invalid Delivery Date" msgstr "" @@ -22575,7 +22638,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:738 +#: erpnext/controllers/taxes_and_totals.py:792 msgid "Invalid Discount Amount" msgstr "" @@ -22596,12 +22659,12 @@ msgstr "" msgid "Invalid Group By" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:454 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:459 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:934 msgid "Invalid Item" msgstr "عنصر غير صالح" -#: erpnext/stock/doctype/item/item.py:1405 +#: erpnext/stock/doctype/item/item.py:1386 msgid "Invalid Item Defaults" msgstr "" @@ -22615,7 +22678,7 @@ msgid "Invalid Net Purchase Amount" msgstr "" #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77 -#: erpnext/accounts/general_ledger.py:796 +#: erpnext/accounts/general_ledger.py:798 msgid "Invalid Opening Entry" msgstr "إدخال فتح غير صالح" @@ -22649,7 +22712,7 @@ msgstr "" msgid "Invalid Priority" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1139 +#: erpnext/manufacturing/doctype/bom/bom.py:1157 msgid "Invalid Process Loss Configuration" msgstr "" @@ -22657,11 +22720,11 @@ msgstr "" msgid "Invalid Purchase Invoice" msgstr "" -#: erpnext/controllers/accounts_controller.py:3796 +#: erpnext/controllers/accounts_controller.py:3804 msgid "Invalid Qty" msgstr "" -#: erpnext/controllers/accounts_controller.py:1380 +#: erpnext/controllers/accounts_controller.py:1388 msgid "Invalid Quantity" msgstr "كمية غير صحيحة" @@ -22682,16 +22745,16 @@ msgstr "" msgid "Invalid Schedule" msgstr "" -#: erpnext/controllers/selling_controller.py:287 +#: erpnext/controllers/selling_controller.py:296 msgid "Invalid Selling Price" msgstr "سعر البيع غير صالح" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1598 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1658 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:900 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:922 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:958 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:980 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -22716,7 +22779,7 @@ msgstr "تعبير شرط غير صالح" msgid "Invalid filter formula. Please check the syntax." msgstr "" -#: erpnext/selling/doctype/quotation/quotation.py:272 +#: erpnext/selling/doctype/quotation/quotation.py:274 msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "سبب ضائع غير صالح {0} ، يرجى إنشاء سبب ضائع جديد" @@ -22738,8 +22801,8 @@ msgstr "" #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:108 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:118 -#: erpnext/accounts/general_ledger.py:839 -#: erpnext/accounts/general_ledger.py:849 +#: erpnext/accounts/general_ledger.py:841 +#: erpnext/accounts/general_ledger.py:851 msgid "Invalid value {0} for {1} against account {2}" msgstr "" @@ -22747,12 +22810,12 @@ msgstr "" msgid "Invalid {0}" msgstr "غير صالح {0}" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2324 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2326 msgid "Invalid {0} for Inter Company Transaction." msgstr "غير صالح {0} للمعاملات بين الشركات." #: erpnext/accounts/report/general_ledger/general_ledger.py:101 -#: erpnext/controllers/sales_and_purchase_return.py:35 +#: erpnext/controllers/sales_and_purchase_return.py:34 msgid "Invalid {0}: {1}" msgstr "{0} غير صالح : {1}\\n
            \\nInvalid {0}: {1}" @@ -22812,8 +22875,8 @@ msgstr "الاستثمارات" #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/subscription_invoice/subscription_invoice.json -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:177 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:197 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:180 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:195 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:97 msgid "Invoice" msgstr "فاتورة" @@ -22836,7 +22899,7 @@ msgstr "تاريخ الفاتورة" #. Account' #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:140 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:141 msgid "Invoice Discounting" msgstr "خصم الفواتير" @@ -22872,7 +22935,7 @@ msgstr "" msgid "Invoice Number" msgstr "رقم الفاتورة" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:820 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:825 msgid "Invoice Paid" msgstr "" @@ -22953,7 +23016,7 @@ msgstr "فاتورة:" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:144 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1213 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:164 -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:165 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:196 msgid "Invoiced Amount" msgstr "قيمة الفواتير" @@ -22971,7 +23034,7 @@ msgstr "" #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json #: erpnext/accounts/doctype/pos_profile/pos_profile.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2375 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2377 #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62 msgid "Invoices" @@ -23051,7 +23114,7 @@ msgid "Is Advance" msgstr "هل مقدم" #. Label of the is_alternative (Check) field in DocType 'Quotation Item' -#: erpnext/selling/doctype/quotation/quotation.js:307 +#: erpnext/selling/doctype/quotation/quotation.js:308 #: erpnext/selling/doctype/quotation_item/quotation_item.json msgid "Is Alternative" msgstr "" @@ -23247,6 +23310,13 @@ msgstr "" msgid "Is Group Warehouse" msgstr "" +#. Label of the is_half_day (Check) field in DocType 'Holiday' +#. Label of the is_half_day (Check) field in DocType 'Holiday List' +#: erpnext/setup/doctype/holiday/holiday.json +#: erpnext/setup/doctype/holiday_list/holiday_list.json +msgid "Is Half Day" +msgstr "" + #. Label of the is_internal_customer (Check) field in DocType 'Sales Invoice' #. Label of the is_internal_customer (Check) field in DocType 'Customer' #. Label of the is_internal_customer (Check) field in DocType 'Sales Order' @@ -23341,6 +23411,19 @@ msgstr "" msgid "Is Period Closing Voucher Entry" msgstr "" +#. Label of the is_phantom_bom (Check) field in DocType 'BOM' +#: erpnext/manufacturing/doctype/bom/bom.json +msgid "Is Phantom BOM" +msgstr "" + +#. Label of the is_phantom_item (Check) field in DocType 'BOM Creator Item' +#. Label of the is_phantom_item (Check) field in DocType 'BOM Item' +#: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json +#: erpnext/manufacturing/doctype/bom_item/bom_item.json +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:68 +msgid "Is Phantom Item" +msgstr "" + #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" @@ -23675,13 +23758,13 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:204 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1148 +#: erpnext/controllers/taxes_and_totals.py:1202 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json -#: erpnext/manufacturing/doctype/bom/bom.js:1011 +#: erpnext/manufacturing/doctype/bom/bom.js:1019 #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25 -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:49 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:50 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:9 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:19 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:22 @@ -23689,8 +23772,8 @@ msgstr "" #: erpnext/manufacturing/report/process_loss_report/process_loss_report.js:15 #: erpnext/manufacturing/report/process_loss_report/process_loss_report.py:74 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:212 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:359 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:234 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:385 #: erpnext/public/js/purchase_trends_filters.js:48 #: erpnext/public/js/purchase_trends_filters.js:63 #: erpnext/public/js/sales_trends_filters.js:23 @@ -23698,7 +23781,7 @@ msgstr "" #: erpnext/public/js/stock_analytics.js:92 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1601 +#: erpnext/selling/doctype/sales_order/sales_order.js:1623 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:46 #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.js:14 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.js:36 @@ -23914,12 +23997,12 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1059 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1060 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:68 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:37 #: erpnext/accounts/report/gross_profit/gross_profit.py:301 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:150 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:170 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:153 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:168 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:37 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json @@ -23955,7 +24038,7 @@ msgstr "" #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json #: erpnext/manufacturing/doctype/workstation/workstation.js:471 #: erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155 -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:49 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:60 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:8 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:103 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:100 @@ -23964,7 +24047,7 @@ msgstr "" #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.js:30 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:935 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:971 -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:359 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:364 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:27 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:86 #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:119 @@ -23976,12 +24059,12 @@ msgstr "" #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json #: erpnext/selling/doctype/installation_note_item/installation_note_item.json -#: erpnext/selling/doctype/quotation/quotation.js:281 +#: erpnext/selling/doctype/quotation/quotation.js:282 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:368 #: erpnext/selling/doctype/sales_order/sales_order.js:476 -#: erpnext/selling/doctype/sales_order/sales_order.js:1237 -#: erpnext/selling/doctype/sales_order/sales_order.js:1388 +#: erpnext/selling/doctype/sales_order/sales_order.js:1241 +#: erpnext/selling/doctype/sales_order/sales_order.js:1392 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:29 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:27 @@ -24027,7 +24110,7 @@ msgstr "" #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:429 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:130 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:132 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:26 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json @@ -24058,11 +24141,11 @@ msgstr "" msgid "Item Code cannot be changed for Serial No." msgstr "لا يمكن تغيير رمز السلعة للرقم التسلسلي" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:451 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:453 msgid "Item Code required at Row No {0}" msgstr "رمز العنصر المطلوب في الصف رقم {0}\\n
            \\nItem Code required at Row No {0}" -#: erpnext/selling/page/point_of_sale/pos_controller.js:845 +#: erpnext/selling/page/point_of_sale/pos_controller.js:849 #: erpnext/selling/page/point_of_sale/pos_item_details.js:275 msgid "Item Code: {0} is not available under warehouse {1}." msgstr "رمز العنصر: {0} غير متوفر ضمن المستودع {1}." @@ -24169,9 +24252,9 @@ msgstr "بيانات الصنف" #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:21 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:28 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:28 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:164 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:167 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js:65 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:184 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:182 #: erpnext/accounts/report/purchase_register/purchase_register.js:58 #: erpnext/accounts/report/sales_register/sales_register.js:70 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -24223,7 +24306,7 @@ msgstr "بيانات الصنف" #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:37 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:100 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:139 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:141 #: 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 @@ -24394,8 +24477,8 @@ msgstr "مادة المصنع" #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:71 #: erpnext/accounts/report/gross_profit/gross_profit.py:308 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:33 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:156 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:176 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:159 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:174 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:71 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json @@ -24431,7 +24514,7 @@ msgstr "مادة المصنع" #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json #: erpnext/manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:8 -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:55 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:66 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:109 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:23 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:106 @@ -24439,13 +24522,13 @@ msgstr "مادة المصنع" #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:942 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:978 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:153 -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:366 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:371 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:138 #: erpnext/public/js/controllers/transaction.js:2785 #: erpnext/public/js/utils.js:734 #: erpnext/selling/doctype/quotation_item/quotation_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1243 +#: erpnext/selling/doctype/sales_order/sales_order.js:1247 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:35 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:33 @@ -24481,7 +24564,7 @@ msgstr "مادة المصنع" #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:131 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:436 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:136 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:138 #: erpnext/stock/report/stock_analytics/stock_analytics.py:31 #: erpnext/stock/report/stock_balance/stock_balance.py:404 #: erpnext/stock/report/stock_ledger/stock_ledger.py:213 @@ -24576,6 +24659,11 @@ msgstr "" msgid "Item Reorder" msgstr "البند إعادة ترتيب" +#. Label of the item_row (Data) field in DocType 'Item Wise Tax Detail' +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json +msgid "Item Row" +msgstr "" + #: 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}' أعلاه" @@ -24689,8 +24777,8 @@ msgstr "الصنف لتصنيع" msgid "Item UOM" msgstr "وحدة قياس الصنف" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:410 -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:417 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:415 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:422 msgid "Item Unavailable" msgstr "العنصر غير متوفر" @@ -24723,7 +24811,7 @@ msgstr "إعدادات متنوع السلعة" msgid "Item Variant {0} already exists with same attributes" msgstr "متغير الصنف {0} موجود بالفعل مع نفس الخصائص" -#: erpnext/stock/doctype/item/item.py:768 +#: erpnext/stock/doctype/item/item.py:749 msgid "Item Variants updated" msgstr "تم تحديث متغيرات العنصر" @@ -24766,15 +24854,39 @@ msgstr "مواصفات الموقع الإلكتروني للصنف" msgid "Item Weight Details" msgstr "تفاصيل وزن الصنف" -#. Label of the item_wise_tax_detail (Code) field in DocType 'Purchase Taxes -#. and Charges' -#. Label of the item_wise_tax_detail (Code) field in DocType 'Sales Taxes and -#. Charges' -#: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json -#: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json +#. Name of a DocType +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" msgstr "تفصيل ضريبة وفقاً للصنف" +#. Label of the item_wise_tax_details (Table) field in DocType 'POS Invoice' +#. Label of the item_wise_tax_details (Table) field in DocType 'Purchase +#. Invoice' +#. Label of the item_wise_tax_details (Table) field in DocType 'Sales Invoice' +#. Label of the item_wise_tax_details (Table) field in DocType 'Purchase Order' +#. Label of the item_wise_tax_details (Table) field in DocType 'Supplier +#. Quotation' +#. Label of the item_wise_tax_details (Table) field in DocType 'Quotation' +#. Label of the item_wise_tax_details (Table) field in DocType 'Sales Order' +#. Label of the item_wise_tax_details (Table) field in DocType 'Delivery Note' +#. Label of the item_wise_tax_details (Table) field in DocType 'Purchase +#. Receipt' +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json +#: erpnext/buying/doctype/purchase_order/purchase_order.json +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +#: 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/purchase_receipt/purchase_receipt.json +msgid "Item Wise Tax Details" +msgstr "" + +#: erpnext/controllers/taxes_and_totals.py:538 +msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" +msgstr "" + #. Label of the section_break_rrrx (Section Break) field in DocType 'Sales #. Forecast' #. Option for the 'Based On' (Select) field in DocType 'Repost Item Valuation' @@ -24788,15 +24900,15 @@ msgstr "" msgid "Item and Warranty Details" msgstr "البند والضمان تفاصيل" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3133 msgid "Item for row {0} does not match Material Request" msgstr "عنصر الصف {0} لا يتطابق مع طلب المواد" -#: erpnext/stock/doctype/item/item.py:785 +#: erpnext/stock/doctype/item/item.py:766 msgid "Item has variants." msgstr "البند لديه متغيرات." -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:408 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:436 msgid "Item is mandatory in Raw Materials table." msgstr "" @@ -24809,7 +24921,7 @@ msgid "Item must be added using 'Get Items from Purchase Receipts' button" msgstr "الصنف يجب اضافته مستخدما مفتاح \"احصل علي الأصناف من المشتريات المستلمة \"" #: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42 -#: erpnext/selling/doctype/sales_order/sales_order.js:1608 +#: erpnext/selling/doctype/sales_order/sales_order.js:1630 msgid "Item name" msgstr "اسم السلعة" @@ -24818,11 +24930,11 @@ msgstr "اسم السلعة" msgid "Item operation" msgstr "عملية الصنف" -#: erpnext/controllers/accounts_controller.py:3819 +#: erpnext/controllers/accounts_controller.py:3827 msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1005 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1063 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -24840,15 +24952,15 @@ msgstr "الصنف الذي سيتم تصنيعه أو إعادة تعبئته" msgid "Item valuation rate is recalculated considering landed cost voucher amount" msgstr "" -#: erpnext/stock/utils.py:555 +#: erpnext/stock/utils.py:559 msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:942 +#: erpnext/stock/doctype/item/item.py:923 msgid "Item variant {0} exists with same attributes" msgstr "متغير العنصر {0} موجود بنفس السمات\\n
            \\nItem variant {0} exists with same attributes" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:83 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:84 msgid "Item {0} cannot be added as a sub-assembly of itself" msgstr "" @@ -24857,23 +24969,23 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:278 -#: erpnext/stock/doctype/item/item.py:632 +#: erpnext/stock/doctype/item/item.py:613 msgid "Item {0} does not exist" msgstr "العنصر {0} غير موجود\\n
            \\nItem {0} does not exist" -#: erpnext/manufacturing/doctype/bom/bom.py:596 +#: erpnext/manufacturing/doctype/bom/bom.py:607 msgid "Item {0} does not exist in the system or has expired" msgstr "الصنف{0} غير موجود في النظام أو انتهت صلاحيته" -#: erpnext/controllers/stock_controller.py:513 +#: erpnext/controllers/stock_controller.py:515 msgid "Item {0} does not exist." msgstr "العنصر {0} غير موجود\\n
            \\nItem {0} does not exist." -#: erpnext/controllers/selling_controller.py:810 +#: erpnext/controllers/selling_controller.py:822 msgid "Item {0} entered multiple times." msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:222 +#: erpnext/controllers/sales_and_purchase_return.py:221 msgid "Item {0} has already been returned" msgstr "تمت إرجاع الصنف{0} من قبل" @@ -24881,11 +24993,11 @@ msgstr "تمت إرجاع الصنف{0} من قبل" msgid "Item {0} has been disabled" msgstr "الصنف{0} تم تعطيله" -#: erpnext/selling/doctype/sales_order/sales_order.py:779 +#: erpnext/selling/doctype/sales_order/sales_order.py:778 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/stock/doctype/item/item.py:1121 +#: erpnext/stock/doctype/item/item.py:1102 msgid "Item {0} has reached its end of life on {1}" msgstr "الصنف{0} قد وصل إلى نهاية عمره في {1}" @@ -24897,11 +25009,11 @@ msgstr "تم تجاهل الصنف {0} لأنه ليس بند مخزون" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1141 +#: erpnext/stock/doctype/item/item.py:1122 msgid "Item {0} is cancelled" msgstr "تم إلغاء العنصر {0}\\n
            \\nItem {0} is cancelled" -#: erpnext/stock/doctype/item/item.py:1125 +#: erpnext/stock/doctype/item/item.py:1106 msgid "Item {0} is disabled" msgstr "تم تعطيل البند {0}" @@ -24909,7 +25021,7 @@ msgstr "تم تعطيل البند {0}" msgid "Item {0} is not a serialized Item" msgstr "البند {0} ليس بند لديه رقم تسلسلي" -#: erpnext/stock/doctype/item/item.py:1133 +#: erpnext/stock/doctype/item/item.py:1114 msgid "Item {0} is not a stock Item" msgstr "العنصر {0} ليس عنصر مخزون\\n
            \\nItem {0} is not a stock Item" @@ -24917,7 +25029,7 @@ msgstr "العنصر {0} ليس عنصر مخزون\\n
            \\nItem {0} is not a s msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1982 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2042 msgid "Item {0} is not active or end of life has been reached" msgstr "البند {0} غير نشط أو تم التوصل إلى نهاية الحياة" @@ -24937,7 +25049,7 @@ msgstr "البند {0} يجب أن يكون عنصر التعاقد الفرعي msgid "Item {0} must be a non-stock item" msgstr "الصنف {0} يجب ألا يكون صنف مخزن
            Item {0} must be a non-stock item" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1396 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -24945,7 +25057,7 @@ msgstr "" msgid "Item {0} not found." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:360 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:362 msgid "Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item)." msgstr "البند {0} الكمية المطلوبة {1} لا يمكن أن تكون أقل من الحد الأدنى للطلب {2} (المحددة في البند)." @@ -24953,7 +25065,7 @@ msgstr "البند {0} الكمية المطلوبة {1} لا يمكن أن تك msgid "Item {0}: {1} qty produced. " msgstr "العنصر {0}: {1} الكمية المنتجة." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1441 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1442 msgid "Item {} does not exist." msgstr "" @@ -24994,91 +25106,10 @@ msgstr "سجل حركة مبيعات وفقاً للصنف" msgid "Item/Item Code required to get Item Tax Template." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:346 +#: erpnext/manufacturing/doctype/bom/bom.py:349 msgid "Item: {0} does not exist in the system" msgstr "الصنف: {0} غير موجود في النظام" -#. Label of the items_section (Section Break) field in DocType 'POS Invoice' -#. Label of the items (Table) field in DocType 'POS Invoice' -#. Label of the sec_warehouse (Section Break) field in DocType 'Purchase -#. Invoice' -#. Label of the items (Table) field in DocType 'Purchase Invoice' -#. Label of the items_section (Section Break) field in DocType 'Sales Invoice' -#. Label of the items (Table) field in DocType 'Sales Invoice' -#. Label of the items (Table) field in DocType 'Purchase Order' -#. Label of the items (Table) field in DocType 'Request for Quotation' -#. Label of the items (Table) field in DocType 'Supplier Quotation' -#. Label of the items_section (Tab Break) field in DocType 'Opportunity' -#. Label of the items (Table) field in DocType 'Opportunity' -#. Label of the items (Table) field in DocType 'Maintenance Schedule' -#. Label of the items (Table) field in DocType 'BOM' -#. Label of the items (Table) field in DocType 'BOM Creator' -#. Label of the items (Table) field in DocType 'Job Card' -#. Label of the items (Table) field in DocType 'Master Production Schedule' -#. Label of the items (Table) field in DocType 'Sales Forecast' -#. Label of the items (Table) field in DocType 'Installation Note' -#. Label of the item_section (Section Break) field in DocType 'Product Bundle' -#. Label of the items (Table) field in DocType 'Product Bundle' -#. Label of the items (Table) field in DocType 'Quotation' -#. Label of the sec_warehouse (Section Break) field in DocType 'Sales Order' -#. Label of the items (Table) field in DocType 'Sales Order' -#. Label of the items_section (Section Break) field in DocType 'Delivery Note' -#. Label of the purchase_receipt_items (Section Break) field in DocType 'Landed -#. Cost Voucher' -#. Label of the items (Table) field in DocType 'Material Request' -#. Label of the warehouse_section (Section Break) field in DocType 'Material -#. Request' -#. Label of the items (Table) field in DocType 'Packing Slip' -#. Label of the sec_warehouse (Section Break) field in DocType 'Purchase -#. Receipt' -#. Label of the items (Table) field in DocType 'Purchase Receipt' -#. Label of the items (Table) field in DocType 'Stock Entry' -#. Label of the items_section (Section Break) field in DocType 'Stock Entry' -#. Label of the items (Table) field in DocType 'Stock Reconciliation' -#. Label of the items (Table) field in DocType 'Subcontracting Inward Order' -#. Label of the items_section (Section Break) field in DocType 'Subcontracting -#. Inward Order' -#. Label of the items (Table) field in DocType 'Subcontracting Order' -#. Label of the items (Table) field in DocType 'Subcontracting Receipt' -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/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 -#: erpnext/crm/doctype/opportunity/opportunity.json -#: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json -#: erpnext/manufacturing/doctype/bom/bom.json -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.json -#: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json -#: erpnext/manufacturing/doctype/sales_forecast/sales_forecast.json -#: erpnext/public/js/utils.js:466 -#: erpnext/selling/doctype/installation_note/installation_note.json -#: erpnext/selling/doctype/product_bundle/product_bundle.json -#: erpnext/selling/doctype/quotation/quotation.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1229 -#: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:19 -#: erpnext/setup/doctype/item_group/item_group.js:87 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:494 -#: erpnext/stock/doctype/delivery_note/delivery_note.json -#: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json -#: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/packing_slip/packing_slip.json -#: 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_inward_order/subcontracting_inward_order.json -#: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json -#: erpnext/templates/form_grid/item_grid.html:6 -#: erpnext/templates/generators/bom.html:38 erpnext/templates/pages/rfq.html:37 -msgid "Items" -msgstr "الاصناف" - #. Label of a Card Break in the Buying Workspace #: erpnext/buying/workspace/buying/buying.json msgid "Items & Pricing" @@ -25093,8 +25124,8 @@ msgstr "" msgid "Items Filter" msgstr "تصفية الاصناف" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1639 -#: erpnext/selling/doctype/sales_order/sales_order.js:1645 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1646 +#: erpnext/selling/doctype/sales_order/sales_order.js:1668 msgid "Items Required" msgstr "العناصر المطلوبة" @@ -25110,19 +25141,19 @@ msgstr "اصناف يمكن طلبه" msgid "Items and Pricing" msgstr "السلع والتسعيرات" -#: erpnext/controllers/accounts_controller.py:4053 +#: erpnext/controllers/accounts_controller.py:4061 msgid "Items cannot be updated as Subcontracting Inward Order(s) exist against this Subcontracted Sales Order." msgstr "" -#: erpnext/controllers/accounts_controller.py:4046 +#: erpnext/controllers/accounts_controller.py:4054 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1424 +#: erpnext/selling/doctype/sales_order/sales_order.js:1428 msgid "Items for Raw Material Request" msgstr "عناصر لطلب المواد الخام" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1001 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1059 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -25132,7 +25163,7 @@ msgstr "" msgid "Items to Be Repost" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1638 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1645 msgid "Items to Manufacture are required to pull the Raw Materials associated with it." msgstr "العناصر المطلوب تصنيعها لسحب المواد الخام المرتبطة بها." @@ -25152,7 +25183,7 @@ msgstr "" msgid "Items under this warehouse will be suggested" msgstr "وسيتم اقتراح العناصر الموجودة تحت هذا المستودع" -#: erpnext/controllers/stock_controller.py:123 +#: erpnext/controllers/stock_controller.py:125 msgid "Items {0} do not exist in the Item master." msgstr "" @@ -25197,7 +25228,7 @@ msgstr "" #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/job_card/job_card.py:882 #: erpnext/manufacturing/doctype/operation/operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:389 +#: erpnext/manufacturing/doctype/work_order/work_order.js:390 #: 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 @@ -25332,7 +25363,7 @@ msgstr "" msgid "Job Worker Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2539 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2541 msgid "Job card {0} created" msgstr "تم إنشاء بطاقة العمل {0}" @@ -25359,7 +25390,7 @@ msgstr "" msgid "Journal Entries" msgstr "" -#: erpnext/accounts/utils.py:1023 +#: erpnext/accounts/utils.py:1027 msgid "Journal Entries {0} are un-linked" msgstr "إدخالات قيد اليومية {0} غير مترابطة" @@ -25372,7 +25403,6 @@ msgstr "إدخالات قيد اليومية {0} غير مترابطة" #. Option for the 'Invoice Type' (Select) field in DocType 'Payment #. Reconciliation Invoice' #. Label of a Link in the Accounting Workspace -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Payables Workspace #. Label of a shortcut in the Payables Workspace #. Label of a shortcut in the Receivables Workspace @@ -25567,11 +25597,14 @@ msgstr "" msgid "Knot" msgstr "" +#. Option for the 'Default Stock Valuation Method' (Select) field in DocType +#. 'Company' #. Option for the 'Valuation Method' (Select) field in DocType 'Item' #. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock #. Settings' #. Option for the 'Pick Serial / Batch Based On' (Select) field in DocType #. 'Stock Settings' +#: erpnext/setup/doctype/company/company.json #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "LIFO" @@ -25618,9 +25651,9 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Stock Workspace -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:677 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:678 #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:104 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:95 #: erpnext/stock/workspace/stock/stock.json msgid "Landed Cost Voucher" msgstr "هبطت التكلفة قسيمة" @@ -25703,7 +25736,7 @@ msgstr "تاريخ أخر أمر بيع" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:98 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:106 #: erpnext/stock/doctype/item/item.json #: erpnext/stock/report/item_prices/item_prices.py:56 msgid "Last Purchase Rate" @@ -25750,7 +25783,7 @@ msgstr "لا يمكن أن يكون تاريخ فحص الكربون الأخي msgid "Last transacted" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:175 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:177 msgid "Latest" msgstr "اخير" @@ -25893,11 +25926,6 @@ msgstr "" msgid "Leads help you get business, add all your contacts and more as your leads" msgstr "العروض تساعدك للحصول على الأعمال التجارية،وإضافة كافة جهات الاتصال الخاصة بك والمزيد من عروضك" -#. Label of a shortcut in the Accounting Workspace -#: erpnext/accounts/workspace/accounting/accounting.json -msgid "Learn Accounting" -msgstr "" - #. Label of a shortcut in the Stock Workspace #: erpnext/stock/workspace/stock/stock.json msgid "Learn Inventory Management" @@ -26077,7 +26105,7 @@ msgstr "رقم الرخصة" msgid "License Plate" msgstr "" -#: erpnext/controllers/status_updater.py:459 +#: erpnext/controllers/status_updater.py:460 msgid "Limit Crossed" msgstr "الحدود تجاوزت" @@ -26125,7 +26153,7 @@ msgstr "" msgid "Link existing Quality Procedure." msgstr "ربط إجراءات الجودة الحالية." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:644 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:645 msgid "Link to Material Request" msgstr "رابط لطلب المواد" @@ -26134,11 +26162,11 @@ msgstr "رابط لطلب المواد" msgid "Link to Material Requests" msgstr "رابط لطلبات المواد" -#: erpnext/buying/doctype/supplier/supplier.js:125 +#: erpnext/buying/doctype/supplier/supplier.js:127 msgid "Link with Customer" msgstr "" -#: erpnext/selling/doctype/customer/customer.js:198 +#: erpnext/selling/doctype/customer/customer.js:201 msgid "Link with Supplier" msgstr "" @@ -26159,20 +26187,20 @@ msgstr "الفواتير المرتبطة" msgid "Linked Location" msgstr "الموقع المرتبط" -#: erpnext/stock/doctype/item/item.py:994 +#: erpnext/stock/doctype/item/item.py:975 msgid "Linked with submitted documents" msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:210 -#: erpnext/selling/doctype/customer/customer.js:260 +#: erpnext/buying/doctype/supplier/supplier.js:212 +#: erpnext/selling/doctype/customer/customer.js:263 msgid "Linking Failed" msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:209 +#: erpnext/buying/doctype/supplier/supplier.js:211 msgid "Linking to Customer Failed. Please try again." msgstr "" -#: erpnext/selling/doctype/customer/customer.js:259 +#: erpnext/selling/doctype/customer/customer.js:262 msgid "Linking to Supplier Failed. Please try again." msgstr "" @@ -26231,7 +26259,7 @@ msgid "Loan Start Date and Loan Period are mandatory to save the Invoice Discoun msgstr "تاريخ بدء القرض وفترة القرض إلزامية لحفظ خصم الفاتورة" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:176 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:299 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:300 msgid "Loans (Liabilities)" msgstr "القروض (الخصوم)" @@ -26277,7 +26305,7 @@ msgid "Logo" msgstr "شعار" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:317 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:318 msgid "Long-term Provisions" msgstr "" @@ -26340,7 +26368,7 @@ msgstr "تفاصيل السبب المفقود" #. 'Quotation' #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/report/lost_opportunity/lost_opportunity.py:49 -#: erpnext/public/js/utils/sales_common.js:548 +#: erpnext/public/js/utils/sales_common.js:570 #: erpnext/selling/doctype/quotation/quotation.json msgid "Lost Reasons" msgstr "أسباب ضائعة" @@ -26432,7 +26460,7 @@ msgstr "نقاط الولاء: {0}" #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/loyalty_program/loyalty_program.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1157 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1158 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:952 @@ -26484,11 +26512,11 @@ msgstr "" msgid "MPS Generated" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:432 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:448 msgid "MRP Log documents are being created in the background." msgstr "" -#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:156 +#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:157 msgid "MT940 file detected. Please enable 'Import MT940 Format' to proceed." msgstr "" @@ -26512,10 +26540,10 @@ msgstr "عطل الآلة" msgid "Machine operator errors" msgstr "أخطاء مشغل الآلة" -#: erpnext/setup/doctype/company/company.py:685 -#: erpnext/setup/doctype/company/company.py:700 -#: erpnext/setup/doctype/company/company.py:701 -#: erpnext/setup/doctype/company/company.py:702 +#: erpnext/setup/doctype/company/company.py:716 +#: erpnext/setup/doctype/company/company.py:731 +#: erpnext/setup/doctype/company/company.py:732 +#: erpnext/setup/doctype/company/company.py:733 msgid "Main" msgstr "رئيسي" @@ -26622,12 +26650,12 @@ msgstr "صلاحية الصيانة" #. Label of the maintenance_schedule (Link) field in DocType 'Maintenance #. Visit' #. Label of a Link in the Support Workspace -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:156 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:157 #: erpnext/crm/workspace/crm/crm.json #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js:81 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1110 +#: erpnext/selling/doctype/sales_order/sales_order.js:1114 #: erpnext/support/workspace/support/support.json msgid "Maintenance Schedule" msgstr "جدول الصيانة" @@ -26733,7 +26761,7 @@ msgstr "نوع الصيانة" #: erpnext/crm/workspace/crm/crm.json #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js:87 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1103 +#: erpnext/selling/doctype/sales_order/sales_order.js:1107 #: erpnext/support/doctype/warranty_claim/warranty_claim.js:47 #: erpnext/support/workspace/support/support.json msgid "Maintenance Visit" @@ -26755,7 +26783,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:523 +#: erpnext/manufacturing/doctype/job_card/job_card.js:532 #: erpnext/manufacturing/doctype/work_order/work_order.js:798 #: erpnext/manufacturing/doctype/work_order/work_order.js:832 #: erpnext/setup/doctype/vehicle/vehicle.json @@ -26799,7 +26827,7 @@ msgstr "إنشاء فاتورة شراء" msgid "Make Quotation" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:353 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:327 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:127 msgid "Make Return Entry" msgstr "" @@ -26815,12 +26843,12 @@ msgstr "انشاء فاتورة المبيعات" msgid "Make Serial No / Batch from Work Order" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:92 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:279 +#: erpnext/manufacturing/doctype/job_card/job_card.js:101 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:253 msgid "Make Stock Entry" msgstr "جعل دخول الأسهم" -#: erpnext/manufacturing/doctype/job_card/job_card.js:397 +#: erpnext/manufacturing/doctype/job_card/job_card.js:406 msgid "Make Subcontracting PO" msgstr "" @@ -26853,8 +26881,8 @@ msgstr "" #: erpnext/assets/doctype/asset/asset.js:150 #: erpnext/assets/doctype/asset/asset.js:160 #: erpnext/assets/doctype/asset/asset.js:176 -#: erpnext/setup/doctype/company/company.js:154 -#: erpnext/setup/doctype/company/company.js:165 +#: erpnext/setup/doctype/company/company.js:161 +#: erpnext/setup/doctype/company/company.js:172 msgid "Manage" msgstr "" @@ -26867,7 +26895,7 @@ msgstr "إدارة تكلفة العمليات" msgid "Manage your orders" msgstr "إدارة طلباتك" -#: erpnext/setup/doctype/company/company.py:454 +#: erpnext/setup/doctype/company/company.py:485 msgid "Management" msgstr "الإدارة" @@ -26883,7 +26911,7 @@ msgstr "" msgid "Mandatory Accounting Dimension" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1852 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1854 msgid "Mandatory Field" msgstr "" @@ -26899,15 +26927,15 @@ msgstr "إلزامي للميزانية العمومية" msgid "Mandatory For Profit and Loss Account" msgstr "إلزامي لحساب الربح والخسارة" -#: erpnext/selling/doctype/quotation/quotation.py:610 +#: erpnext/selling/doctype/quotation/quotation.py:612 msgid "Mandatory Missing" msgstr "إلزامي مفقود" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:633 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:635 msgid "Mandatory Purchase Order" msgstr "أمر شراء إلزامي" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:654 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:656 msgid "Mandatory Purchase Receipt" msgstr "إيصال الشراء الإلزامي" @@ -26985,8 +27013,8 @@ msgstr "لا يمكن إنشاء الإدخال اليدوي! قم بتعطيل #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1082 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1098 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1140 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1156 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json @@ -27021,7 +27049,7 @@ msgstr "الكمية المصنعة" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:62 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:70 #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/item_manufacturer/item_manufacturer.json #: erpnext/stock/doctype/manufacturer/manufacturer.json @@ -27051,7 +27079,7 @@ msgstr "الصانع" #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:68 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:76 #: erpnext/stock/doctype/item_manufacturer/item_manufacturer.json #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -27125,7 +27153,7 @@ msgstr "تاريخ التصنيع" msgid "Manufacturing Manager" msgstr "مدير التصنيع" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2206 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2274 msgid "Manufacturing Quantity is mandatory" msgstr "كمية التصنيع إلزامية\\n
            \\nManufacturing Quantity is mandatory" @@ -27137,10 +27165,8 @@ msgstr "قسم التصنيع" #. Name of a DocType #. Label of a Link in the Manufacturing Workspace -#. Label of a Link in the Settings Workspace #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/setup/workspace/settings/settings.json msgid "Manufacturing Settings" msgstr "إعدادات التصنيع" @@ -27189,10 +27215,6 @@ msgstr "" msgid "Manufacturing User" msgstr "مستخدم التصنيع" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:183 -msgid "Mapping Purchase Receipt ..." -msgstr "" - #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:106 msgid "Mapping Subcontracting Inward Order ..." msgstr "" @@ -27301,13 +27323,13 @@ msgstr "" msgid "Market Segment" msgstr "سوق القطاع" -#: erpnext/setup/doctype/company/company.py:406 +#: erpnext/setup/doctype/company/company.py:437 msgid "Marketing" msgstr "التسويق" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:112 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:191 -#: erpnext/setup/doctype/company/company.py:641 +#: erpnext/setup/doctype/company/company.py:672 msgid "Marketing Expenses" msgstr "نفقات تسويقية" @@ -27353,7 +27375,7 @@ msgstr "اهلاك المواد" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1083 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1141 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "اهلاك المواد للتصنيع" @@ -27420,7 +27442,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:581 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:582 #: 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 @@ -27429,14 +27451,14 @@ 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:151 +#: erpnext/manufacturing/doctype/job_card/job_card.js:160 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:159 #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json #: erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/doctype/work_order/work_order.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1074 +#: erpnext/selling/doctype/sales_order/sales_order.js:1078 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:36 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -27525,7 +27547,7 @@ msgstr "المادة طلب خطة البند" msgid "Material Request Type" msgstr "نوع طلب المواد" -#: erpnext/selling/doctype/sales_order/sales_order.py:1922 +#: erpnext/selling/doctype/sales_order/sales_order.py:1795 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "لم يتم إنشاء طلب المواد ، ككمية للمواد الخام المتاحة بالفعل." @@ -27539,11 +27561,11 @@ msgstr "المادة يمكن طلب الحد الأقصى {0} للبند {1} م msgid "Material Request used to make this Stock Entry" msgstr "طلب المواد المستخدمة لانشاء الحركة المخزنية" -#: erpnext/controllers/subcontracting_controller.py:1272 +#: erpnext/controllers/subcontracting_controller.py:1293 msgid "Material Request {0} is cancelled or stopped" msgstr "طلب المواد {0} تم إلغاؤه أو إيقافه" -#: erpnext/selling/doctype/sales_order/sales_order.js:1440 +#: erpnext/selling/doctype/sales_order/sales_order.js:1444 msgid "Material Request {0} submitted." msgstr "تم تقديم طلب المواد {0}." @@ -27555,7 +27577,7 @@ msgstr "المواد المطلوبة" #. Label of the material_requests (Table) field in DocType 'Master Production #. Schedule' #. Label of the material_requests (Table) field in DocType 'Production Plan' -#: erpnext/accounts/doctype/budget/budget.py:337 +#: erpnext/accounts/doctype/budget/budget.py:592 #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json #: erpnext/manufacturing/doctype/production_plan/production_plan.json msgid "Material Requests" @@ -27593,7 +27615,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Pick List' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' -#: erpnext/manufacturing/doctype/job_card/job_card.js:165 +#: erpnext/manufacturing/doctype/job_card/job_card.js:174 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/setup/setup_wizard/operations/install_fixtures.py:83 #: erpnext/stock/doctype/item/item.json @@ -27648,12 +27670,12 @@ msgstr "المواد المنقولة للعقود من الباطن" msgid "Material from Customer" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:430 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:431 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:536 msgid "Material to Supplier" msgstr "مواد للمورد" -#: erpnext/controllers/subcontracting_controller.py:1493 +#: erpnext/controllers/subcontracting_controller.py:1514 msgid "Materials are already received against the {0} {1}" msgstr "" @@ -27726,7 +27748,7 @@ msgstr "أقصى درجة" msgid "Max discount allowed for item: {0} is {1}%" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:972 +#: erpnext/manufacturing/doctype/work_order/work_order.js:975 #: erpnext/stock/doctype/pick_list/pick_list.js:198 msgid "Max: {0}" msgstr "الحد الأقصى: {0}" @@ -27748,11 +27770,11 @@ msgstr "" msgid "Maximum Payment Amount" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3603 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3693 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "الحد الأقصى للعينات - {0} يمكن الاحتفاظ بالدفعة {1} والبند {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3594 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3684 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "الحد الأقصى للعينات - {0} تم الاحتفاظ به مسبقا للدفعة {1} و العنصر {2} في الدفعة {3}." @@ -27769,7 +27791,7 @@ msgstr "الاستخدام الأقصى" msgid "Maximum Value" msgstr "" -#: erpnext/controllers/selling_controller.py:256 +#: erpnext/controllers/selling_controller.py:265 msgid "Maximum discount for Item {0} is {1}%" msgstr "" @@ -28173,20 +28195,20 @@ msgstr "نفقات متنوعة" msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1442 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1443 msgid "Missing" msgstr "" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:97 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:200 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:593 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2391 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3047 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:595 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2393 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3049 #: erpnext/assets/doctype/asset_category/asset_category.py:116 msgid "Missing Account" msgstr "حساب مفقود" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:456 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:458 msgid "Missing Asset" msgstr "" @@ -28207,7 +28229,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1533 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1593 msgid "Missing Finished Good" msgstr "" @@ -28215,7 +28237,7 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:931 msgid "Missing Item" msgstr "" @@ -28235,8 +28257,8 @@ msgstr "قالب بريد إلكتروني مفقود للإرسال. يرجى msgid "Missing required filter: {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1098 -#: erpnext/manufacturing/doctype/work_order/work_order.py:1447 +#: erpnext/manufacturing/doctype/bom/bom.py:1116 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1448 msgid "Missing value" msgstr "" @@ -28251,8 +28273,8 @@ msgstr "ظروف مختلطة" msgid "Mobile: " msgstr "المحمول: " -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:218 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:251 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:221 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:249 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 #: erpnext/accounts/report/sales_register/sales_register.py:224 msgid "Mode Of Payment" @@ -28341,11 +28363,6 @@ msgstr "" msgid "Module (for Export)" msgstr "" -#. Label of a Card Break in the Settings Workspace -#: erpnext/setup/workspace/settings/settings.json -msgid "Module Settings" -msgstr "" - #. Label of the monitor_progress (Section Break) field in DocType 'Project' #: erpnext/projects/doctype/project/project.json msgid "Monitor Progress" @@ -28383,10 +28400,8 @@ msgstr "شهر (أشهر) بعد نهاية شهر الفاتورة" msgid "Monthly Completed Work Orders" msgstr "أوامر العمل المكتملة شهريًا" -#. Label of the monthly_distribution (Link) field in DocType 'Budget' #. Name of a DocType #. Label of a Link in the Accounting Workspace -#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:69 #: erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json #: erpnext/accounts/workspace/accounting/accounting.json @@ -28454,9 +28469,12 @@ msgstr "" msgid "Movement" msgstr "" +#. Option for the 'Default Stock Valuation Method' (Select) field in DocType +#. 'Company' #. Option for the 'Valuation Method' (Select) field in DocType 'Item' #. Option for the 'Default Valuation Method' (Select) field in DocType 'Stock #. Settings' +#: erpnext/setup/doctype/company/company.json #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Moving Average" @@ -28480,15 +28498,15 @@ msgstr "متعدد العملات" msgid "Multi-level BOM Creator" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:384 +#: erpnext/selling/doctype/customer/customer.py:393 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1221 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1223 msgid "Multiple POS Opening Entry" msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:343 +#: erpnext/accounts/doctype/pricing_rule/utils.py:346 msgid "Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}" msgstr "توجد قواعد أسعار متعددة بنفس المعايير، يرجى حل النزاع عن طريق تعيين الأولوية. قاعدة السعر: {0}" @@ -28502,15 +28520,15 @@ msgstr "برنامج متعدد الطبقات" msgid "Multiple Variants" msgstr "متغيرات متعددة" -#: erpnext/stock/doctype/warehouse/warehouse.py:150 +#: erpnext/stock/doctype/warehouse/warehouse.py:152 msgid "Multiple Warehouse Accounts" msgstr "" -#: erpnext/controllers/accounts_controller.py:1230 +#: erpnext/controllers/accounts_controller.py:1234 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "يوجد سنوات مالية متعددة لنفس التاريخ {0}. الرجاء تحديد الشركة لهذه السنة المالية\\n
            \\nMultiple fiscal years exist for the date {0}. Please set company in Fiscal Year" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1540 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1600 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -28519,7 +28537,7 @@ msgid "Music" msgstr "" #. Label of the must_be_whole_number (Check) field in DocType 'UOM' -#: erpnext/manufacturing/doctype/work_order/work_order.py:1394 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1395 #: erpnext/setup/doctype/uom/uom.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:267 #: erpnext/utilities/transaction_base.py:563 @@ -28945,7 +28963,7 @@ msgstr "الوزن الصافي" msgid "Net Weight UOM" msgstr "الوزن الصافي لوحدة القياس" -#: erpnext/controllers/accounts_controller.py:1586 +#: erpnext/controllers/accounts_controller.py:1594 msgid "Net total calculation precision loss" msgstr "" @@ -29037,6 +29055,10 @@ msgstr "دخل جديد" msgid "New Invoice" msgstr "" +#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:337 +msgid "New Journal Entry will be posted for the difference amount. The Posting Date can be modified." +msgstr "" + #: erpnext/assets/doctype/location/location_tree.js:23 msgid "New Location" msgstr "موقع جديد" @@ -29100,7 +29122,7 @@ msgstr "اسم المخزن الجديد" msgid "New Workplace" msgstr "مكان العمل الجديد" -#: erpnext/selling/doctype/customer/customer.py:353 +#: erpnext/selling/doctype/customer/customer.py:362 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}" msgstr "حد الائتمان الجديد أقل من المبلغ المستحق الحالي للعميل. حد الائتمان يجب أن يكون على الأقل {0}\\n
            \\nNew credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}" @@ -29114,10 +29136,14 @@ msgstr "" msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date" msgstr "سيتم إنشاء فواتير جديدة وفقًا للجدول الزمني حتى إذا كانت الفواتير الحالية غير مدفوعة أو تجاوز تاريخ الاستحقاق" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:250 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:251 msgid "New release date should be in the future" msgstr "يجب أن يكون تاريخ الإصدار الجديد في المستقبل" +#: erpnext/accounts/doctype/budget/budget.js:85 +msgid "New revised budget created successfully" +msgstr "" + #: erpnext/templates/pages/projects.html:37 msgid "New task" msgstr "مهمة جديدة" @@ -29172,7 +29198,7 @@ msgstr "لا رد فعل" msgid "No Answer" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2493 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2495 msgid "No Customer found for Inter Company Transactions which represents company {0}" msgstr "لم يتم العثور على زبون للمعاملات بين الشركات التي تمثل الشركة {0}" @@ -29197,15 +29223,15 @@ msgstr "أي عنصر مع الباركود {0}" msgid "No Item with Serial No {0}" msgstr "أي عنصر مع المسلسل لا {0}" -#: erpnext/controllers/subcontracting_controller.py:1407 +#: erpnext/controllers/subcontracting_controller.py:1428 msgid "No Items selected for transfer." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1222 +#: erpnext/selling/doctype/sales_order/sales_order.js:1226 msgid "No Items with Bill of Materials to Manufacture" msgstr "لا توجد بنود في قائمة المواد للتصنيع" -#: erpnext/selling/doctype/sales_order/sales_order.js:1360 +#: erpnext/selling/doctype/sales_order/sales_order.js:1364 msgid "No Items with Bill of Materials." msgstr "لا توجد عناصر مع جدول المواد." @@ -29221,14 +29247,14 @@ msgstr "" msgid "No Outstanding Invoices found for this party" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:624 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:629 msgid "No POS Profile found. Please create a New POS Profile first" msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1627 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1687 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1701 -#: erpnext/stock/doctype/item/item.py:1366 +#: erpnext/stock/doctype/item/item.py:1347 msgid "No Permission" msgstr "لا يوجد تصريح" @@ -29241,8 +29267,8 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:335 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1132 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:337 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1134 msgid "No Remarks" msgstr "لا ملاحظات" @@ -29250,7 +29276,7 @@ msgstr "لا ملاحظات" msgid "No Selection" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:857 +#: erpnext/controllers/sales_and_purchase_return.py:858 msgid "No Serial / Batches are available for return" msgstr "" @@ -29262,7 +29288,7 @@ msgstr "" msgid "No Summary" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2477 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2479 msgid "No Supplier found for Inter Company Transactions which represents company {0}" msgstr "لم يتم العثور على مورد للمعاملات بين الشركات التي تمثل الشركة {0}" @@ -29287,12 +29313,12 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:813 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:799 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:823 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:854 msgid "No accounting entries for the following warehouses" msgstr "لا القيود المحاسبية للمستودعات التالية" -#: erpnext/selling/doctype/sales_order/sales_order.py:785 +#: erpnext/selling/doctype/sales_order/sales_order.py:784 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "لم يتم العثور على BOM نشط للعنصر {0}. لا يمكن ضمان التسليم عن طريق الرقم التسلسلي" @@ -29332,7 +29358,7 @@ msgstr "" msgid "No employee was scheduled for call popup" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1316 +#: erpnext/controllers/subcontracting_controller.py:1337 msgid "No item available for transfer." msgstr "" @@ -29433,11 +29459,11 @@ msgstr "لا الزيارات" msgid "No of Workstations" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:307 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:323 msgid "No open Material Requests found for the given criteria." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1215 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1217 msgid "No open POS Opening Entry found for POS Profile {0}." msgstr "" @@ -29457,7 +29483,7 @@ msgstr "لم يتم العثور على فواتير معلقة" msgid "No outstanding invoices require exchange rate revaluation" msgstr "لا تتطلب الفواتير المستحقة إعادة تقييم سعر الصرف" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2492 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2493 msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified." msgstr "" @@ -29518,11 +29544,11 @@ msgstr "" msgid "No values" msgstr "لا توجد قيم" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:361 msgid "No {0} Accounts found for this company." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2541 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2543 msgid "No {0} found for Inter Company Transactions." msgstr "لم يتم العثور على {0} معاملات Inter Company." @@ -29557,12 +29583,12 @@ msgstr "" msgid "Non Profit" msgstr "غير ربحية" -#: erpnext/manufacturing/doctype/bom/bom.py:1469 +#: erpnext/manufacturing/doctype/bom/bom.py:1506 msgid "Non stock items" msgstr "البنود غير الأسهم" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:316 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:317 msgid "Non-Current Liabilities" msgstr "" @@ -29575,8 +29601,8 @@ msgid "None of the items have any change in quantity or value." msgstr "لا يوجد أي من البنود لديها أي تغيير في كمية أو قيمة.\\n
            \\nNone of the items have any change in quantity or value." #. Name of a UOM -#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:705 -#: erpnext/stock/utils.py:707 +#: erpnext/setup/setup_wizard/data/uom_data.json erpnext/stock/utils.py:709 +#: erpnext/stock/utils.py:711 msgid "Nos" msgstr "" @@ -29587,8 +29613,8 @@ msgstr "" msgid "Not Applicable" msgstr "لا ينطبق" -#: erpnext/selling/page/point_of_sale/pos_controller.js:844 -#: erpnext/selling/page/point_of_sale/pos_controller.js:873 +#: erpnext/selling/page/point_of_sale/pos_controller.js:848 +#: erpnext/selling/page/point_of_sale/pos_controller.js:877 msgid "Not Available" msgstr "غير متوفرة" @@ -29687,7 +29713,7 @@ msgstr "" msgid "Note: Email will not be sent to disabled users" msgstr "ملاحظة: لن يتم إرسال الايميل إلى المستخدم الغير نشط" -#: erpnext/manufacturing/doctype/bom/bom.py:680 +#: erpnext/manufacturing/doctype/bom/bom.py:691 msgid "Note: If you want to use the finished good {0} as a raw material, then enable the 'Do Not Explode' checkbox in the Items table against the same raw material." msgstr "" @@ -29695,7 +29721,7 @@ msgstr "" msgid "Note: Item {0} added multiple times" msgstr "ملاحظة: تمت إضافة العنصر {0} عدة مرات" -#: erpnext/controllers/accounts_controller.py:641 +#: erpnext/controllers/accounts_controller.py:646 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified" msgstr "ملاحظة : لن يتم إنشاء تدوين المدفوعات نظرا لأن \" حساب النقد او المصرف\" لم يتم تحديده" @@ -29703,7 +29729,7 @@ msgstr "ملاحظة : لن يتم إنشاء تدوين المدفوعات نظ msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "ملاحظة: مركز التكلفة هذا هو مجموعة. لا يمكن إجراء القيود المحاسبية مقابل المجموعات." -#: erpnext/stock/doctype/item/item.py:623 +#: erpnext/stock/doctype/item/item.py:604 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -30138,7 +30164,7 @@ msgstr "" msgid "Only leaf nodes are allowed in transaction" msgstr "المصنف ليس مجموعة فقط مسموح به في المعاملات" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1097 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1155 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -30183,7 +30209,7 @@ msgstr "" msgid "Open Activities HTML" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:21 +#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:24 msgid "Open BOM {0}" msgstr "" @@ -30217,7 +30243,7 @@ msgstr "القضايا المفتوحة" msgid "Open Issues " msgstr "القضايا المفتوحة" -#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:25 +#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:28 #: erpnext/manufacturing/doctype/work_order/work_order_preview.html:28 msgid "Open Item {0}" msgstr "" @@ -30332,7 +30358,7 @@ msgstr "مبلغ الافتتاح" #. Option for the 'Balance Type' (Select) field in DocType 'Financial Report #. Row' #: erpnext/accounts/doctype/financial_report_row/financial_report_row.json -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:158 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:189 msgid "Opening Balance" msgstr "الرصيد الافتتاحي" @@ -30349,7 +30375,7 @@ msgid "Opening Balance Details" msgstr "تفاصيل الرصيد الافتتاحي" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:192 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:342 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:343 msgid "Opening Balance Equity" msgstr "الرصيد الافتتاحي لحقوق الملكية" @@ -30372,7 +30398,7 @@ msgstr "تاريخ الفتح" msgid "Opening Entry" msgstr "فتح مدخل" -#: erpnext/accounts/general_ledger.py:795 +#: erpnext/accounts/general_ledger.py:797 msgid "Opening Entry can not be created after Period Closing Voucher is created." msgstr "" @@ -30383,7 +30409,7 @@ msgstr "جاري إنشاء الفاتورة الافتتاحية" #. Name of a DocType #. Label of a Link in the Accounting Workspace #. Label of a Link in the Home Workspace -#: erpnext/accounts/doctype/account/account_tree.js:197 +#: erpnext/accounts/doctype/account/account_tree.js:205 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/setup/workspace/home/home.json @@ -30399,8 +30425,8 @@ msgstr "أداة إنشاء فاتورة بند افتتاحية" msgid "Opening Invoice Item" msgstr "فتح الفاتورة البند" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1642 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1961 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1644 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1963 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 "" @@ -30488,7 +30514,7 @@ msgstr "تكاليف التشغيل (عملة الشركة)" msgid "Operating Cost Per BOM Quantity" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1545 +#: erpnext/manufacturing/doctype/bom/bom.py:1590 msgid "Operating Cost as per Work Order / BOM" msgstr "تكلفة التشغيل حسب أمر العمل / BOM" @@ -30536,7 +30562,7 @@ msgstr "وصف العملية" msgid "Operation ID" msgstr "معرف العملية" -#: erpnext/manufacturing/doctype/work_order/work_order.js:326 +#: erpnext/manufacturing/doctype/work_order/work_order.js:327 msgid "Operation Id" msgstr "معرف العملية" @@ -30564,7 +30590,7 @@ msgstr "رقم صف العملية" msgid "Operation Time" msgstr "وقت العملية" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1453 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1454 msgid "Operation Time must be greater than 0 for Operation {0}" msgstr "زمن العملية يجب أن يكون أكبر من 0 للعملية {0}\\n
            \\nOperation Time must be greater than 0 for Operation {0}" @@ -30579,7 +30605,7 @@ msgstr "اكتمال عملية لكيفية العديد من السلع تام msgid "Operation time does not depend on quantity to produce" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:565 +#: erpnext/manufacturing/doctype/job_card/job_card.js:574 msgid "Operation {0} added multiple times in the work order {1}" msgstr "تمت إضافة العملية {0} عدة مرات في أمر العمل {1}" @@ -30599,9 +30625,9 @@ msgstr "العملية {0} أطول من أي ساعات عمل متاحة في #. Label of the operations (Table) field in DocType 'Work Order' #. Label of the operation (Section Break) field in DocType 'Email Digest' #: erpnext/manufacturing/doctype/bom/bom.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:307 +#: erpnext/manufacturing/doctype/work_order/work_order.js:308 #: erpnext/manufacturing/doctype/work_order/work_order.json -#: erpnext/setup/doctype/company/company.py:424 +#: erpnext/setup/doctype/company/company.py:455 #: erpnext/setup/doctype/email_digest/email_digest.json #: erpnext/templates/generators/bom.html:61 msgid "Operations" @@ -30613,7 +30639,7 @@ msgstr "العمليات" msgid "Operations Routing" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1107 +#: erpnext/manufacturing/doctype/bom/bom.py:1125 msgid "Operations cannot be left blank" msgstr "لا يمكن ترك (العمليات) فارغة" @@ -30727,7 +30753,7 @@ msgstr "فرصة سبب ضياع التفاصيل" #. Label of the opportunity_owner (Link) field in DocType 'Opportunity' #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:32 -#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:65 +#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:66 msgid "Opportunity Owner" msgstr "" @@ -30771,7 +30797,7 @@ msgstr "تم إنشاء الفرصة {0}" msgid "Optimize Route" msgstr "تحسين الطريق" -#: erpnext/accounts/doctype/account/account_tree.js:174 +#: erpnext/accounts/doctype/account/account_tree.js:182 msgid "Optional. Sets company's default currency, if not specified." msgstr "اختياري. تحديد العملة الافتراضية للشركة، إذا لم يتم تحديدها." @@ -30779,6 +30805,10 @@ msgstr "اختياري. تحديد العملة الافتراضية للشرك msgid "Optional. This setting will be used to filter in various transactions." msgstr "اختياري . سيتم استخدام هذا الإعداد لفلترت المعاملات المختلفة." +#: erpnext/accounts/doctype/account/account_tree.js:169 +msgid "Optional. Used with Financial Report Template" +msgstr "" + #: erpnext/selling/report/territory_wise_sales/territory_wise_sales.py:43 msgid "Order Amount" msgstr "كمية الطلب" @@ -30821,7 +30851,7 @@ msgstr "" #: erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.py:142 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:175 -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:378 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:383 msgid "Order Qty" msgstr "الكمية النظام" @@ -30909,7 +30939,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:957 +#: erpnext/selling/doctype/sales_order/sales_order.py:956 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "أوامر" @@ -31052,7 +31082,7 @@ msgstr "لا تغطيه الضمان" msgid "Out of stock" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1228 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1230 #: erpnext/selling/page/point_of_sale/pos_controller.js:208 msgid "Outdated POS Opening Entry" msgstr "" @@ -31143,7 +31173,7 @@ msgstr "نحو الخارج" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1271 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1281 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -31161,11 +31191,11 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1568 +#: erpnext/controllers/stock_controller.py:1673 msgid "Over Receipt" msgstr "" -#: erpnext/controllers/status_updater.py:464 +#: erpnext/controllers/status_updater.py:465 msgid "Over Receipt/Delivery of {0} {1} ignored for item {2} because you have {3} role." msgstr "" @@ -31180,11 +31210,11 @@ msgstr "" msgid "Over Transfer Allowance (%)" msgstr "" -#: erpnext/controllers/status_updater.py:466 +#: erpnext/controllers/status_updater.py:467 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role." msgstr "" -#: erpnext/controllers/accounts_controller.py:2102 +#: erpnext/controllers/accounts_controller.py:2110 msgid "Overbilling of {} ignored because you have {} role." msgstr "" @@ -31200,7 +31230,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:275 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:277 #: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json #: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json #: erpnext/manufacturing/report/production_analytics/production_analytics.py:125 @@ -31421,7 +31451,7 @@ msgstr "" msgid "POS Invoice isn't created by user {}" msgstr "لم ينشئ المستخدم فاتورة نقاط البيع {}" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:194 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:199 msgid "POS Invoice should have the field {0} checked." msgstr "" @@ -31434,11 +31464,11 @@ msgstr "فواتير نقاط البيع" msgid "POS Invoices can't be added when Sales Invoice is enabled" msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:667 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:662 msgid "POS Invoices will be consolidated in a background process" msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:669 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:664 msgid "POS Invoices will be unconsolidated in a background process" msgstr "" @@ -31456,7 +31486,7 @@ msgstr "مجموعة المواد لنقطة البيع" msgid "POS Opening Entry" msgstr "دخول فتح نقاط البيع" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1229 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1231 msgid "POS Opening Entry - {0} is outdated. Please close the POS and create a new POS Opening Entry." msgstr "" @@ -31477,7 +31507,7 @@ msgstr "تفاصيل دخول فتح نقاط البيع" msgid "POS Opening Entry Exists" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1214 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1216 msgid "POS Opening Entry Missing" msgstr "" @@ -31511,7 +31541,7 @@ msgstr "طريقة الدفع في نقاط البيع" msgid "POS Profile" msgstr "الملف الشخصي لنقطة البيع" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1222 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1224 msgid "POS Profile - {0} has multiple open POS Opening Entries. Please close or cancel the existing entries before proceeding." msgstr "" @@ -31529,11 +31559,11 @@ msgstr "نقاط البيع الشخصية الملف الشخصي" msgid "POS Profile doesn't match {}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1182 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1184 msgid "POS Profile is mandatory to mark this invoice as POS Transaction." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1406 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1408 msgid "POS Profile required to make POS Entry" msgstr "ملف نقطة البيع مطلوب للقيام بإدخال خاص بنقطة البيع" @@ -31640,7 +31670,7 @@ msgstr "عنصر معبأ" msgid "Packed Items" msgstr "عناصر معبأة" -#: erpnext/controllers/stock_controller.py:1406 +#: erpnext/controllers/stock_controller.py:1511 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -31664,7 +31694,7 @@ msgstr "قائمة التعبئة" #. Name of a DocType #. Label of a Link in the Stock Workspace -#: erpnext/stock/doctype/delivery_note/delivery_note.js:299 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:300 #: erpnext/stock/doctype/packing_slip/packing_slip.json #: erpnext/stock/workspace/stock/stock.json msgid "Packing Slip" @@ -31675,7 +31705,7 @@ msgstr "قائمة بمحتويات الشحنة" msgid "Packing Slip Item" msgstr "مادة كشف التعبئة" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:643 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:645 msgid "Packing Slip(s) cancelled" msgstr "تم إلغاء قائمة الشحنة" @@ -31698,7 +31728,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:281 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:283 msgid "Paid" msgstr "مدفوع" @@ -31719,7 +31749,7 @@ msgstr "مدفوع" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:146 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1214 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:165 -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:172 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:203 #: erpnext/accounts/report/pos_register/pos_register.py:209 #: erpnext/selling/page/point_of_sale/pos_payment.js:691 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:56 @@ -31752,7 +31782,7 @@ msgstr "" msgid "Paid Amount After Tax (Company Currency)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2005 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2006 msgid "Paid Amount cannot be greater than total negative outstanding amount {0}" msgstr "المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ القائم السالب {0}" @@ -31766,8 +31796,8 @@ msgstr "" msgid "Paid To Account Type" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:325 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1178 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:327 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1180 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" @@ -31857,7 +31887,7 @@ msgstr "دفعة الأم" msgid "Parent Company" msgstr "الشركة الام" -#: erpnext/setup/doctype/company/company.py:559 +#: erpnext/setup/doctype/company/company.py:590 msgid "Parent Company must be a group company" msgstr "يجب أن تكون الشركة الأم شركة مجموعة" @@ -31923,7 +31953,7 @@ msgstr "الإجراء الرئيسي" msgid "Parent Row No" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:506 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:512 msgid "Parent Row No not found for {0}" msgstr "" @@ -31966,7 +31996,7 @@ msgstr "الأم الأرض" msgid "Parent Warehouse" msgstr "المستودع الأصل" -#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:166 +#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:167 msgid "Parsed file is not in valid MT940 format or contains no transactions." msgstr "" @@ -31979,7 +32009,7 @@ msgstr "" msgid "Partial Material Transferred" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1201 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1203 msgid "Partial Payment in POS Transactions are not allowed." msgstr "" @@ -32175,7 +32205,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:228 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:750 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -32223,7 +32253,7 @@ msgstr "عملة حساب الطرف" msgid "Party Account No. (Bank Statement)" msgstr "" -#: erpnext/controllers/accounts_controller.py:2376 +#: erpnext/controllers/accounts_controller.py:2384 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same" msgstr "" @@ -32269,7 +32299,7 @@ msgstr "" msgid "Party Link" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:50 +#: erpnext/controllers/sales_and_purchase_return.py:49 msgid "Party Mismatch" msgstr "" @@ -32280,7 +32310,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:110 -#: erpnext/accounts/report/general_ledger/general_ledger.py:752 +#: erpnext/accounts/report/general_ledger/general_ledger.py:759 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -32344,7 +32374,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:219 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:742 +#: erpnext/accounts/report/general_ledger/general_ledger.py:749 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -32432,7 +32462,7 @@ msgstr "" msgid "Pause" msgstr "وقفة" -#: erpnext/manufacturing/doctype/job_card/job_card.js:242 +#: erpnext/manufacturing/doctype/job_card/job_card.js:251 msgid "Pause Job" msgstr "" @@ -32484,7 +32514,7 @@ msgstr "واجب الدفع" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:39 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1160 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:211 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:214 #: erpnext/accounts/report/purchase_register/purchase_register.py:194 #: erpnext/accounts/report/purchase_register/purchase_register.py:235 msgid "Payable Account" @@ -32510,15 +32540,15 @@ msgstr "إعدادات الدافع" #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10 #: erpnext/accounts/doctype/payment_request/payment_request_dashboard.py:12 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:82 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:118 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:119 #: 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:95 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:96 #: 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:462 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:463 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:24 -#: erpnext/selling/doctype/sales_order/sales_order.js:1155 +#: erpnext/selling/doctype/sales_order/sales_order.js:1159 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:31 msgid "Payment" msgstr "دفع" @@ -32593,7 +32623,7 @@ msgstr "تاريخ استحقاق السداد" msgid "Payment Entries" msgstr "ادخال دفعات" -#: erpnext/accounts/utils.py:1110 +#: erpnext/accounts/utils.py:1114 msgid "Payment Entries {0} are un-linked" msgstr "تدوين مدفوعات {0} غير مترابطة" @@ -32607,7 +32637,6 @@ msgstr "تدوين مدفوعات {0} غير مترابطة" #. Option for the 'Payment Order Type' (Select) field in DocType 'Payment #. Order' #. Label of a Link in the Accounting Workspace -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Payables Workspace #. Label of a shortcut in the Payables Workspace #. Label of a Link in the Receivables Workspace @@ -32641,7 +32670,7 @@ msgstr "دفع الدخول المرجعي" msgid "Payment Entry already exists" msgstr "تدوين المدفوعات موجود بالفعل" -#: erpnext/accounts/utils.py:609 +#: erpnext/accounts/utils.py:613 msgid "Payment Entry has been modified after you pulled it. Please pull it again." msgstr "تم تعديل تدوين مدفوعات بعد سحبه. يرجى سحبه مرة أخرى." @@ -32650,7 +32679,7 @@ msgstr "تم تعديل تدوين مدفوعات بعد سحبه. يرجى سح msgid "Payment Entry is already created" msgstr "تدوين المدفوعات تم انشاؤه بالفعل" -#: erpnext/controllers/accounts_controller.py:1537 +#: erpnext/controllers/accounts_controller.py:1545 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice." msgstr "" @@ -32686,7 +32715,7 @@ msgstr "بوابة الدفع" msgid "Payment Gateway Account" msgstr "دفع حساب البوابة" -#: erpnext/accounts/utils.py:1377 +#: erpnext/accounts/utils.py:1384 msgid "Payment Gateway Account not created, please create one manually." msgstr "حساب بوابة الدفع لم يتم انشاءه، يرجى إنشاء واحد يدويا." @@ -32849,17 +32878,17 @@ 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:1708 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1707 #: 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 #: erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:134 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:133 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:135 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:134 #: erpnext/accounts/workspace/receivables/receivables.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:470 -#: erpnext/selling/doctype/sales_order/sales_order.js:1148 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:471 +#: erpnext/selling/doctype/sales_order/sales_order.js:1152 msgid "Payment Request" msgstr "طلب الدفع من قبل المورد" @@ -32911,7 +32940,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:2651 +#: erpnext/controllers/accounts_controller.py:2659 #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json msgid "Payment Schedule" @@ -33039,7 +33068,7 @@ msgstr "نوع الدفع يجب أن يكون إما استلام , دفع أو msgid "Payment URL" msgstr "" -#: erpnext/accounts/utils.py:1098 +#: erpnext/accounts/utils.py:1102 msgid "Payment Unlink Error" msgstr "" @@ -33047,7 +33076,7 @@ msgstr "" msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}" msgstr "الدفعة مقابل {0} {1} لا يمكن أن تكون أكبر من المبلغ القائم {2}" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:756 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:761 msgid "Payment amount cannot be less than or equal to 0" msgstr "لا يمكن أن يكون مبلغ الدفعة أقل من أو يساوي 0" @@ -33064,7 +33093,7 @@ msgstr "" msgid "Payment of {0} received successfully. Waiting for other requests to complete..." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:379 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:384 msgid "Payment related to {0} is not completed" msgstr "الدفع المتعلق بـ {0} لم يكتمل" @@ -33123,7 +33152,7 @@ msgid "Payroll Entry" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:261 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262 msgid "Payroll Payable" msgstr "رواتب واجبة الدفع" @@ -33173,9 +33202,9 @@ msgstr "في انتظار المبلغ" #. Label of the pending_qty (Float) field in DocType 'Production Plan Item' #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:254 #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:331 +#: erpnext/manufacturing/doctype/work_order/work_order.js:332 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:182 -#: erpnext/selling/doctype/sales_order/sales_order.js:1615 +#: erpnext/selling/doctype/sales_order/sales_order.js:1637 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45 msgid "Pending Qty" msgstr "الكمية التي قيد الانتظار" @@ -33208,7 +33237,7 @@ msgstr "أمر عمل معلق" msgid "Pending activities for today" msgstr "الأنشطة في انتظار لهذا اليوم" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:236 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:245 msgid "Pending processing" msgstr "" @@ -33306,7 +33335,7 @@ msgstr "تحليل التصور" msgid "Period Based On" msgstr "الفترة على أساس" -#: erpnext/accounts/general_ledger.py:807 +#: erpnext/accounts/general_ledger.py:809 msgid "Period Closed" msgstr "" @@ -33450,7 +33479,7 @@ msgstr "" #: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json #: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:54 -#: erpnext/public/js/financial_statements.js:348 +#: erpnext/public/js/financial_statements.js:359 msgid "Periodicity" msgstr "دورية" @@ -33487,6 +33516,15 @@ msgstr "البريد الالكتروني الشخصية" msgid "Petrol" msgstr "بنزين" +#: erpnext/manufacturing/doctype/bom/bom_item_preview.html:16 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:321 +msgid "Phantom Item" +msgstr "" + +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:430 +msgid "Phantom Item is mandatory" +msgstr "" + #: erpnext/setup/setup_wizard/operations/install_fixtures.py:234 msgid "Pharmaceutical" msgstr "الأدوية" @@ -33522,8 +33560,8 @@ msgstr "رقم الهاتف" #. Option for the 'From Voucher Type' (Select) field in DocType 'Stock #. Reservation Entry' #. Label of a Link in the Stock Workspace -#: erpnext/selling/doctype/sales_order/sales_order.js:1018 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:202 +#: erpnext/selling/doctype/sales_order/sales_order.js:1022 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:203 #: erpnext/stock/doctype/material_request/material_request.js:142 #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -33859,13 +33897,13 @@ msgstr "الرجاء تحديد شركة" msgid "Please Select a Company." msgstr "الرجاء تحديد شركة." -#: erpnext/stock/doctype/delivery_note/delivery_note.js:165 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:207 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:166 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:208 msgid "Please Select a Customer" msgstr "الرجاء تحديد عميل" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:139 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:245 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:130 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:219 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:145 msgid "Please Select a Supplier" msgstr "الرجاء تحديد مورد" @@ -33878,7 +33916,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "يرجى تعيين مجموعة الموردين في إعدادات الشراء." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1878 msgid "Please Specify Account" msgstr "" @@ -33906,11 +33944,11 @@ msgstr "الرجاء إضافة حساب فتح مؤقت في مخطط الحس msgid "Please add atleast one Serial No / Batch No" msgstr "" -#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:84 +#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:85 msgid "Please add the Bank Account column" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:235 +#: erpnext/accounts/doctype/account/account_tree.js:243 msgid "Please add the account to root level Company - {0}" msgstr "" @@ -33922,7 +33960,7 @@ msgstr "الرجاء إضافة الحساب إلى شركة على مستوى msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1579 +#: erpnext/controllers/stock_controller.py:1684 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -33930,11 +33968,11 @@ msgstr "" msgid "Please attach CSV file" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3184 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3186 msgid "Please cancel and amend the Payment Entry" msgstr "" -#: erpnext/accounts/utils.py:1097 +#: erpnext/accounts/utils.py:1101 msgid "Please cancel payment entry manually first" msgstr "" @@ -33955,7 +33993,7 @@ msgstr "" msgid "Please check either with operations or FG Based Operating Cost." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:450 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:521 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again." msgstr "" @@ -33980,7 +34018,7 @@ msgstr "الرجاء النقر على \"إنشاء جدول\" لجلب الرق msgid "Please click on 'Generate Schedule' to get schedule" msgstr "الرجاء الضغط علي ' إنشاء الجدول ' للحصول علي جدول\\n
            \\nPlease click on 'Generate Schedule' to get schedule" -#: erpnext/selling/doctype/customer/customer.py:576 +#: erpnext/selling/doctype/customer/customer.py:585 msgid "Please contact any of the following users to extend the credit limits for {0}: {1}" msgstr "" @@ -33988,7 +34026,7 @@ msgstr "" msgid "Please contact any of the following users to {} this transaction." msgstr "" -#: erpnext/selling/doctype/customer/customer.py:569 +#: erpnext/selling/doctype/customer/customer.py:578 msgid "Please contact your administrator to extend the credit limits for {0}." msgstr "" @@ -33996,7 +34034,7 @@ msgstr "" msgid "Please convert the parent account in corresponding child company to a group account." msgstr "الرجاء تحويل الحساب الرئيسي في الشركة الفرعية المقابلة إلى حساب مجموعة." -#: erpnext/selling/doctype/quotation/quotation.py:608 +#: erpnext/selling/doctype/quotation/quotation.py:610 msgid "Please create Customer from Lead {0}." msgstr "الرجاء إنشاء عميل من العميل المحتمل {0}." @@ -34008,7 +34046,7 @@ msgstr "" msgid "Please create a new Accounting Dimension if required." msgstr "" -#: erpnext/controllers/accounts_controller.py:734 +#: erpnext/controllers/accounts_controller.py:739 msgid "Please create purchase from internal sale or delivery document itself" msgstr "" @@ -34016,7 +34054,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "الرجاء إنشاء إيصال شراء أو فاتورة شراء للعنصر {0}" -#: erpnext/stock/doctype/item/item.py:651 +#: erpnext/stock/doctype/item/item.py:632 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -34032,11 +34070,11 @@ msgstr "" msgid "Please do not create more than 500 items at a time" msgstr "يرجى عدم إنشاء أكثر من 500 عنصر في وقت واحد" -#: erpnext/accounts/doctype/budget/budget.py:133 +#: erpnext/accounts/doctype/budget/budget.py:181 msgid "Please enable Applicable on Booking Actual Expenses" msgstr "يرجى تمكين Applicable على Booking Actual Expenses" -#: erpnext/accounts/doctype/budget/budget.py:129 +#: erpnext/accounts/doctype/budget/budget.py:177 msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses" msgstr "يرجى تمكين Applicable على أمر الشراء والتطبيق على المصروفات الفعلية للحجز" @@ -34052,32 +34090,32 @@ msgstr "" msgid "Please enable {0} in the {1}." msgstr "" -#: erpnext/controllers/selling_controller.py:812 +#: erpnext/controllers/selling_controller.py:824 msgid "Please enable {} in {} to allow same item in multiple rows" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:373 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375 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:381 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:383 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 "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1038 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1040 msgid "Please ensure {} account is a Balance Sheet account." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1048 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1050 msgid "Please ensure {} account {} is a Receivable account." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:595 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:653 msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}" msgstr "الرجاء إدخال حساب الفرق أو تعيين حساب تسوية المخزون الافتراضي للشركة {0}" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:509 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1313 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:514 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1315 msgid "Please enter Account for Change Amount" msgstr "الرجاء إدخال الحساب لمبلغ التغيير\\n
            \\nPlease enter Account for Change Amount" @@ -34089,7 +34127,7 @@ msgstr "الرجاء إدخال صلاحية المخول بالتصديق أو msgid "Please enter Cost Center" msgstr "يرجى إدخال مركز التكلفة\\n
            \\nPlease enter Cost Center" -#: erpnext/selling/doctype/sales_order/sales_order.py:407 +#: erpnext/selling/doctype/sales_order/sales_order.py:409 msgid "Please enter Delivery Date" msgstr "الرجاء إدخال تاريخ التسليم" @@ -34158,8 +34196,8 @@ msgstr "" msgid "Please enter Warehouse and Date" msgstr "الرجاء إدخال المستودع والتاريخ" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:658 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1309 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:660 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1311 msgid "Please enter Write Off Account" msgstr "الرجاء إدخال حساب الشطب" @@ -34179,7 +34217,7 @@ msgstr "" msgid "Please enter company name first" msgstr "الرجاء إدخال اسم الشركة اولاً" -#: erpnext/controllers/accounts_controller.py:2877 +#: erpnext/controllers/accounts_controller.py:2885 msgid "Please enter default currency in Company Master" msgstr "الرجاء إدخال العملة الافتراضية في شركة الرئيسية" @@ -34207,7 +34245,7 @@ msgstr "من فضلك ادخل تاريخ ترك العمل." msgid "Please enter serial nos" msgstr "" -#: erpnext/setup/doctype/company/company.js:207 +#: erpnext/setup/doctype/company/company.js:214 msgid "Please enter the company name to confirm" msgstr "الرجاء إدخال اسم الشركة للتأكيد" @@ -34215,7 +34253,7 @@ msgstr "الرجاء إدخال اسم الشركة للتأكيد" msgid "Please enter the first delivery date" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:759 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:764 msgid "Please enter the phone number first" msgstr "الرجاء إدخال رقم الهاتف أولاً" @@ -34267,7 +34305,7 @@ msgstr "يرجى التأكد من أن الموظفين أعلاه يقدمون msgid "Please make sure the file you are using has 'Parent Account' column present in the header." msgstr "" -#: erpnext/setup/doctype/company/company.js:209 +#: erpnext/setup/doctype/company/company.js:216 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone." msgstr "يرجى التأكد من أنك تريد حقا حذف جميع المعاملات لهذه الشركة. ستبقى بياناتك الرئيسية (الماستر) كما هيا. لا يمكن التراجع عن هذا الإجراء." @@ -34275,8 +34313,8 @@ msgstr "يرجى التأكد من أنك تريد حقا حذف جميع الم msgid "Please mention 'Weight UOM' along with Weight." msgstr "" -#: erpnext/accounts/general_ledger.py:641 -#: erpnext/accounts/general_ledger.py:648 +#: erpnext/accounts/general_ledger.py:643 +#: erpnext/accounts/general_ledger.py:650 msgid "Please mention '{0}' in Company: {1}" msgstr "" @@ -34317,12 +34355,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "يرجى تحديد نوع القالب لتنزيل القالب" -#: erpnext/controllers/taxes_and_totals.py:744 -#: erpnext/public/js/controllers/taxes_and_totals.js:815 +#: erpnext/controllers/taxes_and_totals.py:798 +#: erpnext/public/js/controllers/taxes_and_totals.js:776 msgid "Please select Apply Discount On" msgstr "الرجاء اختيار (تطبيق تخفيض على)" -#: erpnext/selling/doctype/sales_order/sales_order.py:1868 +#: erpnext/selling/doctype/sales_order/sales_order.py:1741 msgid "Please select BOM against item {0}" msgstr "الرجاء اختيار بوم ضد العنصر {0}" @@ -34342,13 +34380,13 @@ msgstr "" msgid "Please select Category first" msgstr "الرجاء تحديد التصنيف أولا\\n
            \\nPlease select Category first" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1486 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1485 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "يرجى تحديد نوع الرسوم أولا" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:455 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:459 msgid "Please select Company" msgstr "الرجاء اختيار شركة \\n
            \\nPlease select Company" @@ -34357,7 +34395,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:697 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:701 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "الرجاء تحديد الشركة أولا\\n
            \\nPlease select Company first" @@ -34366,12 +34404,13 @@ msgstr "الرجاء تحديد الشركة أولا\\n
            \\nPlease select Com msgid "Please select Completion Date for Completed Asset Maintenance Log" msgstr "يرجى تحديد تاريخ الانتهاء لاستكمال سجل صيانة الأصول" +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:195 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js:84 #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js:125 msgid "Please select Customer first" msgstr "يرجى اختيار العميل أولا" -#: erpnext/setup/doctype/company/company.py:490 +#: erpnext/setup/doctype/company/company.py:521 msgid "Please select Existing Company for creating Chart of Accounts" msgstr "الرجاء اختيار الشركة الحالية لإنشاء دليل الحسابات" @@ -34405,15 +34444,15 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "الرجاء تجديد تاريخ النشر قبل تحديد المستفيد\\n
            \\nPlease select Posting Date before selecting Party" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:698 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:702 msgid "Please select Posting Date first" msgstr "الرجاء تحديد تاريخ النشر أولا\\n
            \\nPlease select Posting Date first" -#: erpnext/manufacturing/doctype/bom/bom.py:1152 +#: erpnext/manufacturing/doctype/bom/bom.py:1170 msgid "Please select Price List" msgstr "الرجاء اختيار قائمة الأسعار\\n
            \\nPlease select Price List" -#: erpnext/selling/doctype/sales_order/sales_order.py:1870 +#: erpnext/selling/doctype/sales_order/sales_order.py:1743 msgid "Please select Qty against item {0}" msgstr "الرجاء اختيار الكمية ضد العنصر {0}" @@ -34433,28 +34472,28 @@ msgstr "الرجاء تحديد تاريخ البدء وتاريخ الانته msgid "Please select Stock Asset Account" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1457 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1517 msgid "Please select Subcontracting Order instead of Purchase Order {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:2726 +#: erpnext/controllers/accounts_controller.py:2734 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1384 +#: erpnext/manufacturing/doctype/bom/bom.py:1418 msgid "Please select a BOM" msgstr "يرجى تحديد بوم" #: erpnext/accounts/party.py:430 -#: erpnext/stock/doctype/pick_list/pick_list.py:1583 +#: erpnext/stock/doctype/pick_list/pick_list.py:1588 msgid "Please select a Company" msgstr "الرجاء اختيار الشركة" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:267 -#: erpnext/manufacturing/doctype/bom/bom.js:631 -#: erpnext/manufacturing/doctype/bom/bom.py:261 +#: erpnext/manufacturing/doctype/bom/bom.js:639 +#: erpnext/manufacturing/doctype/bom/bom.py:264 #: erpnext/public/js/controllers/accounts.js:277 -#: erpnext/public/js/controllers/transaction.js:3219 +#: erpnext/public/js/controllers/transaction.js:3236 msgid "Please select a Company first." msgstr "الرجاء تحديد شركة أولاً." @@ -34482,7 +34521,7 @@ msgstr "" msgid "Please select a Work Order first." msgstr "" -#: erpnext/setup/doctype/holiday_list/holiday_list.py:80 +#: erpnext/setup/doctype/holiday_list/holiday_list.py:89 msgid "Please select a country" msgstr "" @@ -34543,15 +34582,15 @@ msgstr "" msgid "Please select at least one row to fix" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1284 +#: erpnext/selling/doctype/sales_order/sales_order.js:1288 msgid "Please select atleast one item to continue" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:374 +#: erpnext/manufacturing/doctype/work_order/work_order.js:375 msgid "Please select atleast one operation to create Job Card" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1761 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1764 msgid "Please select correct account" msgstr "يرجى اختيارالحساب الصحيح" @@ -34616,7 +34655,7 @@ msgstr "" msgid "Please select valid document type." msgstr "" -#: erpnext/setup/doctype/holiday_list/holiday_list.py:51 +#: erpnext/setup/doctype/holiday_list/holiday_list.py:52 msgid "Please select weekly off day" msgstr "الرجاء اختيار يوم العطلة الاسبوعي" @@ -34638,7 +34677,7 @@ msgstr "يرجى تحديد \"مركز تكلفة اهلاك الأصول\" لل msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}" msgstr "يرجى تحديد \"احساب لربح / الخسارة عند التخلص من الأصول\" للشركة {0}" -#: erpnext/accounts/general_ledger.py:547 +#: erpnext/accounts/general_ledger.py:549 msgid "Please set '{0}' in Company: {1}" msgstr "" @@ -34646,7 +34685,7 @@ msgstr "" msgid "Please set Account" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1852 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1854 msgid "Please set Account for Change Amount" msgstr "" @@ -34654,7 +34693,7 @@ msgstr "" msgid "Please set Account in Warehouse {0} or Default Inventory Account in Company {1}" msgstr "يرجى تعيين Account in Warehouse {0} أو Account Inventory Account in Company {1}" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:321 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:333 msgid "Please set Accounting Dimension {} in {}" msgstr "" @@ -34668,7 +34707,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:58 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:68 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:78 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:780 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:781 msgid "Please set Company" msgstr "يرجى تعيين الشركة" @@ -34684,12 +34723,12 @@ msgstr "يرجى تحديد الحسابات المتعلقة بالاهلاك msgid "Please set Email/Phone for the contact" msgstr "" -#: erpnext/regional/italy/utils.py:277 +#: erpnext/regional/italy/utils.py:250 #, python-format msgid "Please set Fiscal Code for the customer '%s'" msgstr "" -#: erpnext/regional/italy/utils.py:285 +#: erpnext/regional/italy/utils.py:258 #, python-format msgid "Please set Fiscal Code for the public administration '%s'" msgstr "" @@ -34698,11 +34737,11 @@ msgstr "" msgid "Please set Fixed Asset Account in Asset Category {0}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:590 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:592 msgid "Please set Fixed Asset Account in {} against {}." msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:256 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:257 msgid "Please set Parent Row No for item {0}" msgstr "" @@ -34715,7 +34754,7 @@ msgstr "" msgid "Please set Root Type" msgstr "" -#: erpnext/regional/italy/utils.py:292 +#: erpnext/regional/italy/utils.py:265 #, python-format msgid "Please set Tax ID for the customer '%s'" msgstr "" @@ -34740,32 +34779,28 @@ 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:1622 -msgid "Please set a Supplier against the Items to be considered in the Purchase Order." -msgstr "يرجى تعيين مورد مقابل العناصر التي يجب مراعاتها في أمر الشراء." - -#: erpnext/projects/doctype/project/project.py:729 +#: erpnext/projects/doctype/project/project.py:728 msgid "Please set a default Holiday List for Company {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:269 +#: erpnext/setup/doctype/employee/employee.py:273 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:1111 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1113 msgid "Please set account in Warehouse {0}" msgstr "يرجى تعيين الحساب في مستودع {0}" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:58 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:68 msgid "Please set actual demand or sales forecast to generate Material Requirements Planning Report." msgstr "" -#: erpnext/regional/italy/utils.py:247 +#: erpnext/regional/italy/utils.py:220 #, python-format msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:870 +#: erpnext/controllers/stock_controller.py:872 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -34773,31 +34808,31 @@ msgstr "" msgid "Please set an email id for the Lead {0}" msgstr "رجاء ادخال ايميل العميل المحتمل" -#: erpnext/regional/italy/utils.py:303 +#: erpnext/regional/italy/utils.py:276 msgid "Please set at least one row in the Taxes and Charges Table" msgstr "يرجى ضبط صف واحد على الأقل في جدول الضرائب والرسوم" -#: erpnext/regional/italy/utils.py:267 +#: erpnext/regional/italy/utils.py:240 msgid "Please set both the Tax ID and Fiscal Code on Company {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2388 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2390 msgid "Please set default Cash or Bank account in Mode of Payment {0}" msgstr "الرجاء تحديد الحساب البنكي أو النقدي الافتراضي في نوع الدفع\\n
            \\nPlease set default Cash or Bank account in Mode of Payment {0}" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:94 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:197 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3044 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3046 msgid "Please set default Cash or Bank account in Mode of Payment {}" msgstr "الرجاء تعيين حساب نقدي أو مصرفي افتراضي في طريقة الدفع {}" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:96 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:199 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3046 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3048 msgid "Please set default Cash or Bank account in Mode of Payments {}" msgstr "الرجاء تعيين حساب نقدي أو مصرفي افتراضي في طريقة الدفع {}" -#: erpnext/accounts/utils.py:2359 +#: erpnext/accounts/utils.py:2385 msgid "Please set default Exchange Gain/Loss Account in Company {}" msgstr "" @@ -34809,16 +34844,16 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "يرجى تعيين الافتراضي UOM في إعدادات الأسهم" -#: erpnext/controllers/stock_controller.py:729 +#: erpnext/controllers/stock_controller.py:731 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" -#: erpnext/controllers/stock_controller.py:188 +#: erpnext/controllers/stock_controller.py:190 msgid "Please set default inventory account for item {0}, or their item group or brand." msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:274 -#: erpnext/accounts/utils.py:1119 +#: erpnext/accounts/utils.py:1123 msgid "Please set default {0} in Company {1}" msgstr "يرجى تعيين {0} الافتراضي للشركة {1}" @@ -34826,7 +34861,7 @@ msgstr "يرجى تعيين {0} الافتراضي للشركة {1}" msgid "Please set filter based on Item or Warehouse" msgstr "يرجى ضبط الفلتر على أساس البند أو المخزن" -#: erpnext/controllers/accounts_controller.py:2292 +#: erpnext/controllers/accounts_controller.py:2300 msgid "Please set one of the following:" msgstr "" @@ -34838,7 +34873,7 @@ msgstr "" msgid "Please set recurring after saving" msgstr "يرجى تحديد (تكرار) بعد الحفظ" -#: erpnext/regional/italy/utils.py:297 +#: erpnext/regional/italy/utils.py:270 msgid "Please set the Customer Address" msgstr "يرجى ضبط عنوان العميل" @@ -34850,11 +34885,11 @@ msgstr "يرجى تعيين مركز التكلفة الافتراضي في ال msgid "Please set the Item Code first" msgstr "يرجى تعيين رمز العنصر أولا" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1479 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1480 msgid "Please set the Target Warehouse in the Job Card" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1483 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1484 msgid "Please set the WIP Warehouse in the Job Card" msgstr "" @@ -34881,11 +34916,11 @@ msgstr "" msgid "Please set {0} for Batched Item {1}, which is used to set {2} on Submit." msgstr "يرجى تعيين {0} للعنصر المجمّع {1} ، والذي يتم استخدامه لتعيين {2} عند الإرسال." -#: erpnext/regional/italy/utils.py:449 +#: erpnext/regional/italy/utils.py:422 msgid "Please set {0} for address {1}" msgstr "يرجى ضبط {0} للعنوان {1}" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:209 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:210 msgid "Please set {0} in BOM Creator {1}" msgstr "" @@ -34893,7 +34928,7 @@ msgstr "" msgid "Please set {0} in Company {1} to account for Exchange Gain / Loss" msgstr "" -#: erpnext/controllers/accounts_controller.py:523 +#: erpnext/controllers/accounts_controller.py:528 msgid "Please set {0} to {1}, the same account that was used in the original invoice {2}." msgstr "" @@ -34910,13 +34945,13 @@ msgid "Please specify Company" msgstr "يرجى تحديد شركة" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:120 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:439 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:517 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:440 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:518 msgid "Please specify Company to proceed" msgstr "الرجاء تحديد الشركة للمضى قدما\\n
            \\nPlease specify Company to proceed" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1509 -#: erpnext/controllers/accounts_controller.py:3108 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/controllers/accounts_controller.py:3116 #: erpnext/public/js/controllers/accounts.js:117 msgid "Please specify a valid Row ID for row {0} in table {1}" msgstr "يرجى تحديد هوية الصف صالحة لصف {0} في الجدول {1}" @@ -34941,7 +34976,7 @@ msgstr "يرجى التحديد من / إلى النطاق\\n
            \\nPlease speci msgid "Please supply the specified items at the best possible rates" msgstr "يرجى تزويدنا بالبنود المحددة بأفضل الأسعار الممكنة" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:235 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:244 msgid "Please try again in an hour." msgstr "" @@ -35114,10 +35149,10 @@ msgstr "نفقات بريدية" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:61 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:66 #: erpnext/accounts/report/cheques_and_deposits_incorrectly_cleared/cheques_and_deposits_incorrectly_cleared.py:151 -#: erpnext/accounts/report/general_ledger/general_ledger.py:670 +#: erpnext/accounts/report/general_ledger/general_ledger.py:677 #: erpnext/accounts/report/gross_profit/gross_profit.py:289 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:183 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:203 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:186 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:201 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:143 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:94 #: erpnext/accounts/report/pos_register/pos_register.py:172 @@ -35150,7 +35185,7 @@ msgstr "نفقات بريدية" #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:86 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:502 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:24 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:113 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:116 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:144 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:36 #: erpnext/templates/form_grid/bank_reconciliation_grid.html:6 @@ -35163,8 +35198,8 @@ msgstr "تاريخ الترحيل" msgid "Posting Date Inheritance for Exchange Gain / Loss" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:256 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:136 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:266 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:142 msgid "Posting Date cannot be future date" msgstr "لا يمكن أن يكون تاريخ النشر تاريخا مستقبلا\\n
            \\nPosting Date cannot be future date" @@ -35222,18 +35257,18 @@ msgstr "" #: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:105 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:63 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:25 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:117 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:149 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:41 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Posting Time" msgstr "نشر التوقيت" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2154 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2222 msgid "Posting date and posting time is mandatory" msgstr "تاريخ النشر و وقت النشر الزامي\\n
            \\nPosting date and posting time is mandatory" -#: erpnext/controllers/sales_and_purchase_return.py:67 +#: erpnext/controllers/sales_and_purchase_return.py:66 msgid "Posting timestamp must be after {0}" msgstr "الطابع الزمني للترحيل يجب أن يكون بعد {0}" @@ -35624,7 +35659,7 @@ msgstr "" msgid "Price is not set for the item." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:492 +#: erpnext/manufacturing/doctype/bom/bom.py:503 msgid "Price not found for item {0} in price list {1}" msgstr "لم يتم العثور على السعر للعنصر {0} في قائمة الأسعار {1}" @@ -35997,7 +36032,7 @@ msgstr "وصف العملية" msgid "Process Loss" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1135 +#: erpnext/manufacturing/doctype/bom/bom.py:1153 msgid "Process Loss Percentage cannot be greater than 100" msgstr "" @@ -36019,7 +36054,7 @@ msgstr "" msgid "Process Loss Qty" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:319 +#: erpnext/manufacturing/doctype/job_card/job_card.js:328 msgid "Process Loss Quantity" msgstr "" @@ -36247,7 +36282,7 @@ msgstr "" #. Label of a Card Break in the Manufacturing Workspace #: erpnext/manufacturing/doctype/workstation/workstation.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/setup/doctype/company/company.py:430 +#: erpnext/setup/doctype/company/company.py:461 msgid "Production" msgstr "الإنتاج" @@ -36394,7 +36429,7 @@ msgstr "الربح هذا العام" #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/process_period_closing_voucher_detail/process_period_closing_voucher_detail.json #: erpnext/accounts/workspace/accounting/accounting.json -#: erpnext/public/js/financial_statements.js:261 +#: erpnext/public/js/financial_statements.js:272 msgid "Profit and Loss" msgstr "الربح والخسارة" @@ -36484,7 +36519,7 @@ msgstr "حالة المشروع" msgid "Project Summary" msgstr "ملخص المشروع" -#: erpnext/projects/doctype/project/project.py:667 +#: erpnext/projects/doctype/project/project.py:666 msgid "Project Summary for {0}" msgstr "ملخص المشروع لـ {0}" @@ -36598,7 +36633,7 @@ msgstr "الكمية المتوقعة" #. Name of a Workspace #. Label of a Card Break in the Projects Workspace -#: erpnext/config/projects.py:7 erpnext/projects/doctype/project/project.py:446 +#: erpnext/config/projects.py:7 erpnext/projects/doctype/project/project.py:445 #: erpnext/projects/workspace/projects/projects.json #: erpnext/selling/doctype/customer/customer_dashboard.py:26 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:28 @@ -36615,10 +36650,8 @@ msgstr "مدير المشاريع" #. Name of a DocType #. Label of a Link in the Projects Workspace -#. Label of a Link in the Settings Workspace #: erpnext/projects/doctype/projects_settings/projects_settings.json #: erpnext/projects/workspace/projects/projects.json -#: erpnext/setup/workspace/settings/settings.json msgid "Projects Settings" msgstr "إعدادات المشاريع" @@ -36741,7 +36774,7 @@ msgstr "تزويد بعنوان البريد الإلكتروني المسجل msgid "Providing" msgstr "توفير" -#: erpnext/setup/doctype/company/company.py:529 +#: erpnext/setup/doctype/company/company.py:560 msgid "Provisional Account" msgstr "" @@ -36807,7 +36840,7 @@ msgstr "" #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/projects/doctype/project/project_dashboard.py:16 -#: erpnext/setup/doctype/company/company.py:418 erpnext/setup/install.py:334 +#: erpnext/setup/doctype/company/company.py:449 erpnext/setup/install.py:334 #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/item_lead_time/item_lead_time.json #: erpnext/stock/doctype/item_reorder/item_reorder.json @@ -36886,7 +36919,6 @@ msgstr "" #. Option for the 'Invoice Type' (Select) field in DocType 'Payment #. Reconciliation Invoice' #. Name of a DocType -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Payables Workspace #. Label of a shortcut in the Payables Workspace #. Label of the purchase_invoice (Link) field in DocType 'Asset' @@ -36909,11 +36941,10 @@ msgstr "" #: erpnext/accounts/print_format/purchase_auditing_voucher/purchase_auditing_voucher.html:5 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:22 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 -#: erpnext/accounts/workspace/accounting/accounting.json #: 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:453 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:454 #: 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 @@ -36921,8 +36952,8 @@ msgstr "" #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json #: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:134 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:286 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:125 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:260 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:30 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/quality_inspection/quality_inspection.json @@ -36960,12 +36991,12 @@ msgstr "اتجهات فاتورة الشراء" msgid "Purchase Invoice cannot be made against an existing asset {0}" msgstr "لا يمكن إجراء فاتورة الشراء مقابل أصل موجود {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:433 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:447 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:443 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:457 msgid "Purchase Invoice {0} is already submitted" msgstr "فاتورة الشراء {0} تم ترحيلها من قبل" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2027 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:2029 msgid "Purchase Invoices" msgstr "فواتير الشراء" @@ -36988,11 +37019,12 @@ msgstr "فواتير الشراء" #. Label of the purchase_order (Link) field in DocType 'Stock Entry' #. Label of the purchase_order (Link) field in DocType 'Subcontracting Receipt #. Item' +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:144 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:145 #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:239 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:242 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json @@ -37008,15 +37040,16 @@ msgstr "فواتير الشراء" #: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:54 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:174 -#: erpnext/selling/doctype/sales_order/sales_order.js:1093 +#: erpnext/selling/doctype/sales_order/sales_order.js:1097 #: 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:181 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:240 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:214 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Purchase Order" msgstr "أمر الشراء" @@ -37076,7 +37109,7 @@ msgstr "صنف امر الشراء" msgid "Purchase Order Item Supplied" msgstr "الأصناف المزوده بامر الشراء" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:914 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:969 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}" msgstr "" @@ -37089,11 +37122,11 @@ msgstr "لم يتم استلام طلبات الشراء في الوقت الم msgid "Purchase Order Pricing Rule" msgstr "قاعدة تسعير أمر الشراء" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:629 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:631 msgid "Purchase Order Required" msgstr "أمر الشراء مطلوب" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:624 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:626 msgid "Purchase Order Required for item {}" msgstr "طلب الشراء مطلوب للعنصر {}" @@ -37105,11 +37138,11 @@ msgstr "طلب الشراء مطلوب للعنصر {}" msgid "Purchase Order Trends" msgstr "اتجهات امر الشراء" -#: erpnext/selling/doctype/sales_order/sales_order.js:1577 +#: erpnext/selling/doctype/sales_order/sales_order.js:1581 msgid "Purchase Order already created for all Sales Order items" msgstr "تم إنشاء أمر الشراء بالفعل لجميع بنود أوامر المبيعات" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:322 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:332 msgid "Purchase Order number required for Item {0}" msgstr "عدد طلب الشراء مطلوب للبند\\n
            \\nPurchase Order number required for Item {0}" @@ -37117,11 +37150,11 @@ msgstr "عدد طلب الشراء مطلوب للبند\\n
            \\nPurchase Order msgid "Purchase Order {0} created" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:667 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:669 msgid "Purchase Order {0} is not submitted" msgstr "طلب الشراء {0} يجب أن يعتمد\\n
            \\nPurchase Order {0} is not submitted" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:932 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:931 msgid "Purchase Orders" msgstr "طلبات الشراء" @@ -37131,7 +37164,7 @@ msgstr "طلبات الشراء" msgid "Purchase Orders Items Overdue" msgstr "أوامر الشراء البنود المتأخرة" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:321 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:323 msgid "Purchase Orders are not allowed for {0} due to a scorecard standing of {1}." msgstr "لا يسمح بأوامر الشراء {0} بسبب وضع بطاقة النقاط {1}." @@ -37146,7 +37179,7 @@ msgstr "أوامر الشراء إلى الفاتورة" msgid "Purchase Orders to Receive" msgstr "أوامر الشراء لتلقي" -#: erpnext/controllers/accounts_controller.py:1934 +#: erpnext/controllers/accounts_controller.py:1942 msgid "Purchase Orders {0} are un-linked" msgstr "" @@ -37169,17 +37202,17 @@ msgstr "قائمة أسعار الشراء" #. Reservation Entry' #. Label of a Link in the Stock Workspace #. Label of a shortcut in the Stock Workspace -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:169 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:653 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:663 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:170 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:654 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:664 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:49 #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:246 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:249 #: erpnext/accounts/report/purchase_register/purchase_register.py:223 #: 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:420 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:421 #: 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 @@ -37228,11 +37261,11 @@ msgstr "شراء السلعة استلام الموردة" msgid "Purchase Receipt No" msgstr "لا شراء استلام" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:650 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:652 msgid "Purchase Receipt Required" msgstr "إيصال استلام المشتريات مطلوب" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:645 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647 msgid "Purchase Receipt Required for item {}" msgstr "إيصال الشراء مطلوب للعنصر {}" @@ -37245,15 +37278,15 @@ msgstr "إيصال الشراء مطلوب للعنصر {}" msgid "Purchase Receipt Trends" msgstr "شراء اتجاهات الإيصال" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:381 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:355 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled." msgstr "لا يحتوي إيصال الشراء على أي عنصر تم تمكين الاحتفاظ عينة به." -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:991 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1046 msgid "Purchase Receipt {0} created." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:674 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:676 msgid "Purchase Receipt {0} is not submitted" msgstr "إيصال استلام المشتريات {0} لم يتم تقديمه" @@ -37264,13 +37297,13 @@ msgstr "إيصال استلام المشتريات {0} لم يتم تقديمه" msgid "Purchase Register" msgstr "سجل شراء" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:276 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:250 msgid "Purchase Return" msgstr "شراء العودة" #. Label of the purchase_tax_template (Link) field in DocType 'Tax Rule' #: erpnext/accounts/doctype/tax_rule/tax_rule.json -#: erpnext/setup/doctype/company/company.js:138 +#: erpnext/setup/doctype/company/company.js:145 msgid "Purchase Tax Template" msgstr "قالب الضرائب على المشتريات" @@ -37340,7 +37373,7 @@ msgstr "طلبات الشراء تساعدك على تخطيط ومتابعة ع msgid "Purchased" msgstr "اشترى" -#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185 +#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:146 msgid "Purchases" msgstr "" @@ -37360,7 +37393,7 @@ msgstr "المشتريات" #. Label of the purpose (Select) field in DocType 'Stock Entry Type' #. Label of the purpose (Select) field in DocType 'Stock Reconciliation' #: erpnext/assets/doctype/asset_movement/asset_movement.json -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:153 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:163 #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/stock_entry/stock_entry.js:348 @@ -37370,7 +37403,7 @@ msgstr "المشتريات" msgid "Purpose" msgstr "غرض" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:414 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:472 msgid "Purpose must be one of {0}" msgstr "الهدف يجب ان يكون واحد ل {0}\\n
            \\nPurpose must be one of {0}" @@ -37435,7 +37468,7 @@ msgstr "" #: erpnext/controllers/trends.py:268 erpnext/controllers/trends.py:280 #: erpnext/controllers/trends.py:285 #: erpnext/crm/doctype/opportunity_item/opportunity_item.json -#: erpnext/manufacturing/doctype/bom/bom.js:1031 +#: erpnext/manufacturing/doctype/bom/bom.js:1039 #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json #: erpnext/manufacturing/doctype/bom_item/bom_item.json #: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json @@ -37445,11 +37478,11 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:28 -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:57 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:213 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:307 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:372 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:470 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:69 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:235 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:333 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:398 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:499 #: erpnext/public/js/stock_reservation.js:134 #: erpnext/public/js/stock_reservation.js:336 erpnext/public/js/utils.js:771 #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json @@ -37458,8 +37491,8 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:494 #: erpnext/selling/doctype/sales_order/sales_order.js:584 #: erpnext/selling/doctype/sales_order/sales_order.js:631 -#: erpnext/selling/doctype/sales_order/sales_order.js:1261 -#: erpnext/selling/doctype/sales_order/sales_order.js:1413 +#: erpnext/selling/doctype/sales_order/sales_order.js:1265 +#: erpnext/selling/doctype/sales_order/sales_order.js:1417 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:255 #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json @@ -37548,7 +37581,7 @@ msgstr "الكمية المستهلكة لكل وحدة" msgid "Qty In Stock" msgstr "" -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:74 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:82 msgid "Qty Per Unit" msgstr "" @@ -37561,7 +37594,7 @@ msgstr "" msgid "Qty To Manufacture" msgstr "الكمية للتصنيع" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1390 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1391 msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}." msgstr "" @@ -37612,7 +37645,7 @@ msgstr "الكمية حسب السهم لوحدة قياس السهم" msgid "Qty for which recursion isn't applicable." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:970 +#: erpnext/manufacturing/doctype/work_order/work_order.js:973 msgid "Qty for {0}" msgstr "الكمية ل {0}" @@ -37663,7 +37696,7 @@ msgstr "الكمية للتسليم" msgid "Qty to Fetch" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:291 +#: erpnext/manufacturing/doctype/job_card/job_card.js:300 #: erpnext/manufacturing/doctype/job_card/job_card.py:774 msgid "Qty to Manufacture" msgstr "الكمية للتصنيع" @@ -37884,7 +37917,7 @@ msgstr "قالب فحص الجودة اسم" msgid "Quality Inspection(s)" msgstr "" -#: erpnext/setup/doctype/company/company.py:460 +#: erpnext/setup/doctype/company/company.py:491 msgid "Quality Management" msgstr "إدارة الجودة" @@ -38020,7 +38053,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:350 +#: erpnext/stock/doctype/material_request/material_request.js:353 #: 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 @@ -38134,7 +38167,7 @@ msgstr "" msgid "Quantity must be greater than zero, and less or equal to {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1018 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1003 #: erpnext/stock/doctype/pick_list/pick_list.js:204 msgid "Quantity must not be more than {0}" msgstr "الكمية يجب ألا تكون أكثر من {0}" @@ -38144,13 +38177,13 @@ msgstr "الكمية يجب ألا تكون أكثر من {0}" msgid "Quantity of item obtained after manufacturing / repacking from given quantities of raw materials" msgstr "الكمية من البنود التي تم الحصول عليها بعد التصنيع / إعادة التعبئة من الكميات المعطاء من المواد الخام" -#: erpnext/manufacturing/doctype/bom/bom.py:660 +#: erpnext/manufacturing/doctype/bom/bom.py:671 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:372 -#: erpnext/manufacturing/doctype/job_card/job_card.js:442 +#: erpnext/manufacturing/doctype/bom/bom.py:615 +#: erpnext/manufacturing/doctype/job_card/job_card.js:381 +#: erpnext/manufacturing/doctype/job_card/job_card.js:451 #: erpnext/manufacturing/doctype/workstation/workstation.js:303 msgid "Quantity should be greater than 0" msgstr "الكمية يجب أن تكون أبر من 0\\n
            \\nQuantity should be greater than 0" @@ -38159,15 +38192,15 @@ msgstr "الكمية يجب أن تكون أبر من 0\\n
            \\nQuantity should msgid "Quantity to Make" msgstr "كمية لجعل" -#: erpnext/manufacturing/doctype/work_order/work_order.js:336 +#: erpnext/manufacturing/doctype/work_order/work_order.js:337 msgid "Quantity to Manufacture" msgstr "كمية لتصنيع" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2481 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2483 msgid "Quantity to Manufacture can not be zero for the operation {0}" msgstr "لا يمكن أن تكون الكمية للتصنيع صفراً للتشغيل {0}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1382 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1383 msgid "Quantity to Manufacture must be greater than 0." msgstr "\"الكمية لتصنيع\" يجب أن تكون أكبر من 0." @@ -38175,7 +38208,7 @@ msgstr "\"الكمية لتصنيع\" يجب أن تكون أكبر من 0." msgid "Quantity to Produce" msgstr "كمية لإنتاج" -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:36 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:37 msgid "Quantity to Produce should be greater than zero." msgstr "" @@ -38212,7 +38245,7 @@ msgstr "سلسلة مسار الاستعلام" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:586 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:590 msgid "Quick Journal Entry" msgstr "قيد دفتر يومية سريع" @@ -38251,7 +38284,7 @@ msgstr "" #. Label of the prevdoc_docname (Link) field in DocType 'Sales Order Item' #. Label of a Link in the Selling Workspace #. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule' -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:294 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:295 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:36 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20 #: erpnext/crm/doctype/contract/contract.json @@ -38262,7 +38295,7 @@ msgstr "" #: erpnext/crm/report/lead_details/lead_details.js:37 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:38 #: erpnext/selling/doctype/quotation/quotation.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1171 +#: erpnext/selling/doctype/sales_order/sales_order.js:1175 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -38310,15 +38343,15 @@ msgstr "مناقصة لـ" msgid "Quotation Trends" msgstr "مؤشرات المناقصة" -#: erpnext/selling/doctype/sales_order/sales_order.py:471 +#: erpnext/selling/doctype/sales_order/sales_order.py:473 msgid "Quotation {0} is cancelled" msgstr "العرض المسعر {0} تم إلغائه" -#: erpnext/selling/doctype/sales_order/sales_order.py:384 +#: erpnext/selling/doctype/sales_order/sales_order.py:386 msgid "Quotation {0} not of type {1}" msgstr "عرض مسعر {0} ليس من النوع {1}" -#: erpnext/selling/doctype/quotation/quotation.py:345 +#: erpnext/selling/doctype/quotation/quotation.py:347 #: erpnext/selling/page/sales_funnel/sales_funnel.py:57 msgid "Quotations" msgstr "عروض مسعرة" @@ -38420,8 +38453,8 @@ msgstr "التي أثارها (بريد إلكتروني)" #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:268 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:323 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:271 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:321 #: erpnext/accounts/report/share_ledger/share_ledger.py:56 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -38618,7 +38651,7 @@ msgstr "المعدل الذي يتم تحويل العملة إلى عملة ا msgid "Rate at which this tax is applied" msgstr "السعر الذي يتم فيه تطبيق هذه الضريبة" -#: erpnext/controllers/accounts_controller.py:3930 +#: erpnext/controllers/accounts_controller.py:3938 msgid "Rate of '{}' items cannot be changed" msgstr "" @@ -38690,7 +38723,7 @@ msgstr "" msgid "Raw Material" msgstr "المواد الخام" -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:402 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:407 msgid "Raw Material Code" msgstr "كود المواد الخام" @@ -38735,7 +38768,7 @@ msgstr "" msgid "Raw Material Item Code" msgstr "قانون المواد الخام المدينة" -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:409 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:414 msgid "Raw Material Name" msgstr "اسم المادة الخام" @@ -38759,12 +38792,12 @@ msgstr "مستودع المواد الخام" #. Label of the section_break_8 (Section Break) field in DocType 'Job Card' #. Label of the mr_items (Table) field in DocType 'Production Plan' #: erpnext/manufacturing/doctype/bom/bom.js:370 -#: erpnext/manufacturing/doctype/bom/bom.js:1004 +#: erpnext/manufacturing/doctype/bom/bom.js:1012 #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/workstation/workstation.js:462 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:353 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:379 msgid "Raw Materials" msgstr "مواد أولية" @@ -38819,7 +38852,7 @@ msgstr "المواد الخام الموردة" msgid "Raw Materials Supplied Cost" msgstr "المواد الخام الموردة التكلفة" -#: erpnext/manufacturing/doctype/bom/bom.py:652 +#: erpnext/manufacturing/doctype/bom/bom.py:663 msgid "Raw Materials cannot be blank." msgstr "لا يمكن ترك المواد الخام فارغة." @@ -38833,10 +38866,16 @@ msgstr "" msgid "Raw SQL" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:410 +#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Raw materials consumed qty will be validated based on FG BOM required qty" +msgstr "" + +#: erpnext/buying/doctype/purchase_order/purchase_order.js:411 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:124 #: erpnext/manufacturing/doctype/work_order/work_order.js:726 -#: erpnext/selling/doctype/sales_order/sales_order.js:964 +#: erpnext/selling/doctype/sales_order/sales_order.js:968 #: erpnext/selling/doctype/sales_order/sales_order_list.js:70 #: erpnext/stock/doctype/material_request/material_request.js:228 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:116 @@ -38924,7 +38963,7 @@ msgid "Real Estate" msgstr "" #. Label of the hold_comment (Small Text) field in DocType 'Purchase Invoice' -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:274 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:275 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json msgid "Reason For Putting On Hold" msgstr "سبب لوضع في الانتظار" @@ -38934,8 +38973,8 @@ msgstr "سبب لوضع في الانتظار" msgid "Reason for Failure" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:741 -#: erpnext/selling/doctype/sales_order/sales_order.js:1738 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:742 +#: erpnext/selling/doctype/sales_order/sales_order.js:1752 msgid "Reason for Hold" msgstr "سبب الانتظار" @@ -38944,7 +38983,7 @@ msgstr "سبب الانتظار" msgid "Reason for Leaving" msgstr "سبب ترك العمل" -#: erpnext/selling/doctype/sales_order/sales_order.js:1753 +#: erpnext/selling/doctype/sales_order/sales_order.js:1767 msgid "Reason for hold:" msgstr "" @@ -39017,7 +39056,7 @@ msgstr "القبض / حساب الدائنة" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:68 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1158 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:244 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:242 #: erpnext/accounts/report/sales_register/sales_register.py:217 #: erpnext/accounts/report/sales_register/sales_register.py:271 msgid "Receivable Account" @@ -39207,7 +39246,7 @@ msgstr "" msgid "Reconcile Effect On" msgstr "" -#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:361 +#: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:363 msgid "Reconcile Entries" msgstr "التوفيق بين المدخلات" @@ -39433,7 +39472,7 @@ msgstr "رقم المرجع و تاريخ المرجع إلزامي للمعام msgid "Reference No is mandatory if you entered Reference Date" msgstr "رقم المرجع إلزامي اذا أدخلت تاريخ المرجع\\n
            \\nReference No is mandatory if you entered Reference Date" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:266 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:280 msgid "Reference No." msgstr "رقم المرجع." @@ -39521,11 +39560,11 @@ msgstr "المرجع: {0}، رمز العنصر: {1} والعميل: {2}" msgid "References" msgstr "المراجع" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:387 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:389 msgid "References to Sales Invoices are Incomplete" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:382 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:384 msgid "References to Sales Orders are Incomplete" msgstr "" @@ -39638,7 +39677,7 @@ msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:23 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:14 #: erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py:22 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:23 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:26 msgid "Related" msgstr "ذات صلة" @@ -39649,15 +39688,15 @@ msgstr "علاقة" #. Label of the release_date (Date) field in DocType 'Purchase Invoice' #. Label of the release_date (Date) field in DocType 'Supplier' -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:266 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:310 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:267 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:311 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1061 msgid "Release Date" msgstr "تاريخ النشر" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:316 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:318 msgid "Release date must be in the future" msgstr "يجب أن يكون تاريخ الإصدار في المستقبل" @@ -39732,7 +39771,7 @@ msgstr "كلام" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1264 #: erpnext/accounts/report/general_ledger/general_ledger.html:90 #: erpnext/accounts/report/general_ledger/general_ledger.html:116 -#: erpnext/accounts/report/general_ledger/general_ledger.py:785 +#: erpnext/accounts/report/general_ledger/general_ledger.py:792 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -39759,7 +39798,7 @@ msgstr "" msgid "Remarks:" msgstr "ملاحظات:" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:94 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:95 msgid "Remove Parent Row No in Items Table" msgstr "" @@ -39987,6 +40026,16 @@ msgstr "" msgid "Repost Item Valuation" msgstr "" +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:334 +msgid "Repost Item Valuation restarted for selected failed records." +msgstr "" + +#. Label of the repost_only_accounting_ledgers (Check) field in DocType 'Repost +#. Item Valuation' +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json +msgid "Repost Only Accounting Ledgers" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json msgid "Repost Payment Ledger" @@ -40014,7 +40063,7 @@ msgstr "" msgid "Repost started in the background" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:115 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:119 msgid "Reposting Completed {0}%" msgstr "" @@ -40030,16 +40079,22 @@ msgstr "" msgid "Reposting Info" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:123 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:127 msgid "Reposting Progress" msgstr "" -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:179 +#. Label of the reposting_reference (Data) field in DocType 'Repost Item +#. Valuation' +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json +msgid "Reposting Reference" +msgstr "" + +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:182 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:327 msgid "Reposting entries created: {0}" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:99 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:103 msgid "Reposting has been started in the background." msgstr "" @@ -40148,7 +40203,7 @@ msgstr "طلب تسعيرة البند" msgid "Request for Quotation Supplier" msgstr "طلب تسعيرة مزود" -#: erpnext/selling/doctype/sales_order/sales_order.js:1080 +#: erpnext/selling/doctype/sales_order/sales_order.js:1084 msgid "Request for Raw Materials" msgstr "طلب المواد الخام" @@ -40262,13 +40317,13 @@ msgstr "" #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json -#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:86 +#: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:94 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:11 #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.html:21 -#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:27 +#: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:28 #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:58 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1041 -#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:421 +#: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:426 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:139 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json @@ -40302,7 +40357,7 @@ msgstr "يتطلب وفاء" msgid "Research" msgstr "ابحاث" -#: erpnext/setup/doctype/company/company.py:466 +#: erpnext/setup/doctype/company/company.py:497 msgid "Research & Development" msgstr "البحث و التطوير" @@ -40392,6 +40447,10 @@ msgstr "" msgid "Reserved" msgstr "محجوز" +#: erpnext/controllers/stock_controller.py:1269 +msgid "Reserved Batch Conflict" +msgstr "" + #. Label of the reserved_qty (Float) field in DocType 'Bin' #. Label of the reserved_qty (Float) field in DocType 'Stock Reservation Entry' #. Label of the stock_reserved_qty (Float) field in DocType 'Subcontracting @@ -40675,10 +40734,14 @@ msgstr "مسؤول" msgid "Rest Of The World" msgstr "باقي أنحاء العالم" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:82 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:84 msgid "Restart" msgstr "" +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation_list.js:23 +msgid "Restart Failed Entries" +msgstr "" + #: erpnext/accounts/doctype/subscription/subscription.js:54 msgid "Restart Subscription" msgstr "إعادة تشغيل الاشتراك" @@ -40730,13 +40793,13 @@ msgid "Result Title Field" msgstr "النتيجة عنوان الحقل" #: erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.js:43 -#: erpnext/buying/doctype/purchase_order/purchase_order.js:385 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:386 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:63 -#: erpnext/selling/doctype/sales_order/sales_order.js:950 +#: erpnext/selling/doctype/sales_order/sales_order.js:954 msgid "Resume" msgstr "استئنف" -#: erpnext/manufacturing/doctype/job_card/job_card.js:226 +#: erpnext/manufacturing/doctype/job_card/job_card.js:235 msgid "Resume Job" msgstr "" @@ -40762,11 +40825,11 @@ msgid "Retain Sample" msgstr "الاحتفاظ عينة" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:196 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:347 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:348 msgid "Retained Earnings" msgstr "أرباح محتجزة" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:292 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:266 msgid "Retention Stock Entry" msgstr "الاحتفاظ الأسهم" @@ -40786,13 +40849,15 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'POS Invoice' #. 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 'Purchase Receipt' #. Option for the 'Status' (Select) field in DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:79 #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:277 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:279 #: erpnext/stock/doctype/delivery_note/delivery_note_list.js:16 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js:15 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:138 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:167 @@ -40801,11 +40866,11 @@ msgstr "" msgid "Return" msgstr "عودة" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:108 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:109 msgid "Return / Credit Note" msgstr "ارجاع / اشعار دائن" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:125 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:126 msgid "Return / Debit Note" msgstr "ارجاع / اشعار مدين" @@ -40841,7 +40906,7 @@ msgstr "العودة ضد شراء إيصال" msgid "Return Against Subcontracting Receipt" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:277 +#: erpnext/manufacturing/doctype/work_order/work_order.js:278 msgid "Return Components" msgstr "" @@ -40856,14 +40921,14 @@ msgstr "" msgid "Return Issued" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:352 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:326 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:126 msgid "Return Qty" msgstr "" #. Label of the return_qty_from_rejected_warehouse (Check) field in DocType #. 'Purchase Receipt Item' -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:328 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:302 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:102 msgid "Return Qty from Rejected Warehouse" @@ -40877,7 +40942,7 @@ msgstr "" msgid "Return Raw Material to Customer" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1499 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1501 msgid "Return invoice of asset cancelled" msgstr "" @@ -40959,7 +41024,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:25 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py:35 #: erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py:24 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:30 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:33 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt_dashboard.py:27 msgid "Returns" msgstr "النتائج" @@ -40972,7 +41037,7 @@ msgid "Revaluation Journals" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:197 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:352 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:353 msgid "Revaluation Surplus" msgstr "" @@ -41028,6 +41093,19 @@ msgstr "مراجعة والعمل" msgid "Reviews" msgstr "التعليقات" +#: erpnext/accounts/doctype/budget/budget.js:37 +msgid "Revise Budget" +msgstr "" + +#. Label of the revision_of (Data) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json +msgid "Revision Of" +msgstr "" + +#: erpnext/accounts/doctype/budget/budget.js:92 +msgid "Revision cancelled" +msgstr "" + #. Label of the rgt (Int) field in DocType 'Account' #. Label of the rgt (Int) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json @@ -41297,8 +41375,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:741 -#: erpnext/controllers/stock_controller.py:756 +#: erpnext/controllers/stock_controller.py:743 +#: erpnext/controllers/stock_controller.py:758 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -41323,7 +41401,7 @@ msgstr "اسم التوجيه" msgid "Row # {0}:" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:226 +#: erpnext/controllers/sales_and_purchase_return.py:225 msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "الصف # {0}: لا يمكن الارجاع أكثر من {1} للبند {2}" @@ -41335,25 +41413,25 @@ msgstr "" msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:151 +#: erpnext/controllers/sales_and_purchase_return.py:150 msgid "Row # {0}: Rate cannot be greater than the rate used in {1} {2}" msgstr "الصف # {0}: لا يمكن أن يكون المعدل أكبر من المعدل المستخدم في {1} {2}" -#: erpnext/controllers/sales_and_purchase_return.py:135 +#: erpnext/controllers/sales_and_purchase_return.py:134 msgid "Row # {0}: Returned Item {1} does not exist in {2} {3}" msgstr "الصف رقم {0}: العنصر الذي تم إرجاعه {1} غير موجود في {2} {3}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:256 +#: erpnext/manufacturing/doctype/work_order/work_order.py:257 msgid "Row #1: Sequence ID must be 1 for Operation {0}." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:518 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2044 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:523 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2046 msgid "Row #{0} (Payment Table): Amount must be negative" msgstr "الصف # {0} (جدول الدفع): يجب أن يكون المبلغ سلبيًا" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:516 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2039 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:521 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2041 msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "الصف رقم {0} (جدول الدفع): يجب أن يكون المبلغ موجبا" @@ -41370,15 +41448,15 @@ msgid "Row #{0}: Acceptance Criteria Formula is required." msgstr "" #: erpnext/controllers/subcontracting_controller.py:124 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:527 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:534 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:520 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:527 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1218 +#: erpnext/controllers/accounts_controller.py:1222 msgid "Row #{0}: Account {1} does not belong to company {2}" msgstr "الصف # {0}: الحساب {1} لا ينتمي إلى الشركة {2}" @@ -41399,19 +41477,19 @@ msgstr "" msgid "Row #{0}: Amount must be a positive number" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:443 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:445 msgid "Row #{0}: Asset {1} cannot be sold, it is already {2}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:448 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:450 msgid "Row #{0}: Asset {1} is already sold" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:369 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:371 msgid "Row #{0}: BOM is not specified for subcontracting item {0}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:286 +#: erpnext/selling/doctype/sales_order/sales_order.py:288 msgid "Row #{0}: BOM not found for FG Item {1}" msgstr "" @@ -41439,27 +41517,27 @@ msgstr "" msgid "Row #{0}: Cannot cancel this Stock Entry as returned quantity cannot be greater than delivered quantity for Item {1} in the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:3686 +#: erpnext/controllers/accounts_controller.py:3694 msgid "Row #{0}: Cannot delete item {1} which has already been billed." msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تحرير فاتورة به بالفعل." -#: erpnext/controllers/accounts_controller.py:3660 +#: erpnext/controllers/accounts_controller.py:3668 msgid "Row #{0}: Cannot delete item {1} which has already been delivered" msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تسليمه بالفعل" -#: erpnext/controllers/accounts_controller.py:3679 +#: erpnext/controllers/accounts_controller.py:3687 msgid "Row #{0}: Cannot delete item {1} which has already been received" msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم استلامه بالفعل" -#: erpnext/controllers/accounts_controller.py:3666 +#: erpnext/controllers/accounts_controller.py:3674 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it." msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تعيين ترتيب العمل إليه." -#: erpnext/controllers/accounts_controller.py:3672 +#: erpnext/controllers/accounts_controller.py:3680 msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order." msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تعيينه لأمر شراء العميل." -#: erpnext/controllers/accounts_controller.py:3939 +#: erpnext/controllers/accounts_controller.py:3947 msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}." msgstr "" @@ -41509,11 +41587,11 @@ msgstr "" msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times in the Subcontracting Inward process." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:333 +#: erpnext/manufacturing/doctype/work_order/work_order.py:334 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:358 +#: erpnext/manufacturing/doctype/work_order/work_order.py:359 msgid "Row #{0}: Customer Provided Item {1} does not exist in the Required Items table linked to the Subcontracting Inward Order." msgstr "" @@ -41521,7 +41599,7 @@ msgstr "" msgid "Row #{0}: Customer Provided Item {1} exceeds quantity available through Subcontracting Inward Order" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:346 +#: erpnext/manufacturing/doctype/work_order/work_order.py:347 msgid "Row #{0}: Customer Provided Item {1} has insufficient quantity in the Subcontracting Inward Order. Available quantity is {2}." msgstr "" @@ -41538,7 +41616,7 @@ msgstr "" msgid "Row #{0}: Dates overlapping with other row" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:393 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:395 msgid "Row #{0}: Default BOM not found for FG Item {1}" msgstr "" @@ -41550,34 +41628,34 @@ msgstr "الصف #{0}: تاريخ بداية الإهلاك مطلوب" msgid "Row #{0}: Duplicate entry in References {1} {2}" msgstr "الصف # {0}: إدخال مكرر في المراجع {1} {2}" -#: erpnext/selling/doctype/sales_order/sales_order.py:316 +#: erpnext/selling/doctype/sales_order/sales_order.py:318 msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "الصف # {0}: تاريخ التسليم المتوقع لا يمكن أن يكون قبل تاريخ أمر الشراء" -#: erpnext/controllers/stock_controller.py:872 +#: erpnext/controllers/stock_controller.py:874 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:398 -#: erpnext/selling/doctype/sales_order/sales_order.py:289 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:400 +#: erpnext/selling/doctype/sales_order/sales_order.py:291 msgid "Row #{0}: Finished Good Item Qty can not be zero" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:380 -#: erpnext/selling/doctype/sales_order/sales_order.py:269 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:382 +#: erpnext/selling/doctype/sales_order/sales_order.py:271 msgid "Row #{0}: Finished Good Item is not specified for service item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:387 -#: erpnext/selling/doctype/sales_order/sales_order.py:276 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:389 +#: erpnext/selling/doctype/sales_order/sales_order.py:278 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:370 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:428 msgid "Row #{0}: Finished Good must be {1}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:508 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:515 msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}." msgstr "" @@ -41614,7 +41692,7 @@ msgstr "" msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List." msgstr "" -#: erpnext/controllers/stock_controller.py:107 +#: erpnext/controllers/stock_controller.py:109 msgid "Row #{0}: Item {1} has zero rate but 'Allow Zero Valuation Rate' is not enabled." msgstr "" @@ -41659,7 +41737,7 @@ msgstr "" msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:658 +#: erpnext/selling/doctype/sales_order/sales_order.py:657 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" @@ -41671,7 +41749,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:753 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:811 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "الصف # {0}: العملية {1} لم تكتمل لـ {2} الكمية من السلع تامة الصنع في أمر العمل {3}. يرجى تحديث حالة التشغيل عبر بطاقة العمل {4}." @@ -41700,7 +41778,7 @@ msgstr "" msgid "Row #{0}: Please set reorder quantity" msgstr "الصف # {0}: يرجى تعيين إعادة ترتيب الكمية\\n
            \\nRow #{0}: Please set reorder quantity" -#: erpnext/controllers/accounts_controller.py:546 +#: erpnext/controllers/accounts_controller.py:551 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master" msgstr "" @@ -41717,15 +41795,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1301 +#: erpnext/controllers/stock_controller.py:1406 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1316 +#: erpnext/controllers/stock_controller.py:1421 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1331 +#: erpnext/controllers/stock_controller.py:1436 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -41733,8 +41811,8 @@ msgstr "" msgid "Row #{0}: Quantity cannot be a non-positive number. Please increase the quantity or remove the Item {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1377 -#: erpnext/controllers/accounts_controller.py:3793 +#: erpnext/controllers/accounts_controller.py:1385 +#: erpnext/controllers/accounts_controller.py:3801 msgid "Row #{0}: Quantity for Item {1} cannot be zero." msgstr "الصف # {0}: كمية البند {1} لا يمكن أن يكون صفرا" @@ -41746,8 +41824,8 @@ msgstr "" msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0." msgstr "" -#: erpnext/controllers/accounts_controller.py:801 -#: erpnext/controllers/accounts_controller.py:813 +#: erpnext/controllers/accounts_controller.py:806 +#: erpnext/controllers/accounts_controller.py:818 #: erpnext/utilities/transaction_base.py:114 #: erpnext/utilities/transaction_base.py:120 msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" @@ -41761,7 +41839,7 @@ msgstr "الصف {0} : نوع المستند المرجع يجب أن يكون msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "الصف # {0}: يجب أن يكون نوع المستند المرجعي أحد أوامر المبيعات أو فاتورة المبيعات أو إدخال دفتر اليومية أو المطالبة" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:501 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:508 msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}." msgstr "" @@ -41769,7 +41847,7 @@ msgstr "" msgid "Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:451 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:453 msgid "Row #{0}: Return Against is required for returning asset" msgstr "" @@ -41781,22 +41859,22 @@ msgstr "" msgid "Row #{0}: Returned quantity cannot be greater than available quantity to return for Item {1}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:496 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:503 msgid "Row #{0}: Scrap Item Qty cannot be zero" msgstr "" -#: erpnext/controllers/selling_controller.py:274 +#: erpnext/controllers/selling_controller.py:283 msgid "Row #{0}: Selling rate for item {1} is lower than its {2}.\n" "\t\t\t\t\tSelling {3} should be atleast {4}.

            Alternatively,\n" "\t\t\t\t\tyou can disable selling price validation in {5} to bypass\n" "\t\t\t\t\tthis validation." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:262 +#: erpnext/manufacturing/doctype/work_order/work_order.py:263 msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:259 +#: erpnext/controllers/stock_controller.py:261 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "الصف # {0}: الرقم التسلسلي {1} لا ينتمي إلى الدُفعة {2}" @@ -41812,19 +41890,19 @@ msgstr "" msgid "Row #{0}: Serial No(s) {1} are not a part of the linked Subcontracting Inward Order. Please select valid Serial No(s)." msgstr "" -#: erpnext/controllers/accounts_controller.py:574 +#: erpnext/controllers/accounts_controller.py:579 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date" msgstr "الصف # {0}: لا يمكن أن يكون تاريخ انتهاء الخدمة قبل تاريخ ترحيل الفاتورة" -#: erpnext/controllers/accounts_controller.py:568 +#: erpnext/controllers/accounts_controller.py:573 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date" msgstr "الصف # {0}: لا يمكن أن يكون تاريخ بدء الخدمة أكبر من تاريخ انتهاء الخدمة" -#: erpnext/controllers/accounts_controller.py:562 +#: erpnext/controllers/accounts_controller.py:567 msgid "Row #{0}: Service Start and End Date is required for deferred accounting" msgstr "الصف # {0}: مطلوب بداية وتاريخ انتهاء الخدمة للمحاسبة المؤجلة" -#: erpnext/selling/doctype/sales_order/sales_order.py:479 +#: erpnext/selling/doctype/sales_order/sales_order.py:481 msgid "Row #{0}: Set Supplier for item {1}" msgstr "الصف # {0}: حدد المورد للبند {1}" @@ -41836,19 +41914,19 @@ msgstr "" msgid "Row #{0}: Source Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:367 +#: erpnext/manufacturing/doctype/work_order/work_order.py:368 msgid "Row #{0}: Source Warehouse {1} for item {2} cannot be a customer warehouse." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:322 +#: erpnext/manufacturing/doctype/work_order/work_order.py:323 msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:897 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:977 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -41884,7 +41962,7 @@ msgstr "" msgid "Row #{0}: Stock is already reserved for the Item {1}." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:541 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:543 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}." msgstr "" @@ -41897,7 +41975,7 @@ msgstr "" msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1295 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1297 msgid "Row #{0}: Stock quantity {1} ({2}) for item {3} cannot exceed {4}" msgstr "" @@ -41905,7 +41983,7 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:272 +#: erpnext/controllers/stock_controller.py:274 msgid "Row #{0}: The batch {1} has already expired." msgstr "الصف رقم {0}: انتهت صلاحية الدفعة {1} بالفعل." @@ -41929,7 +42007,7 @@ msgstr "" msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:455 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:457 msgid "Row #{0}: You must select an Asset for Item {1}." msgstr "" @@ -41997,19 +42075,19 @@ msgstr "الصف # {}: عملة {} - {} لا تطابق عملة الشركة." msgid "Row #{}: Finance Book should not be empty since you're using multiple." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:407 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:412 msgid "Row #{}: Item Code: {} is not available under warehouse {}." msgstr "الصف # {}: رمز العنصر: {} غير متوفر ضمن المستودع {}." -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:93 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:92 msgid "Row #{}: POS Invoice {} has been {}" msgstr "الصف رقم {}: فاتورة نقاط البيع {} كانت {}" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:74 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:73 msgid "Row #{}: POS Invoice {} is not against customer {}" msgstr "الصف رقم {}: فاتورة نقاط البيع {} ليست ضد العميل {}" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:89 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:88 msgid "Row #{}: POS Invoice {} is not submitted yet" msgstr "الصف رقم {}: فاتورة نقاط البيع {} لم يتم تقديمها بعد" @@ -42021,19 +42099,19 @@ msgstr "" msgid "Row #{}: Please use a different Finance Book." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:478 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:483 msgid "Row #{}: Serial No {} cannot be returned since it was not transacted in original invoice {}" msgstr "الصف # {}: لا يمكن إرجاع الرقم التسلسلي {} لأنه لم يتم التعامل معه في الفاتورة الأصلية {}" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:414 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:419 msgid "Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}." msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:104 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:103 msgid "Row #{}: The original Invoice {} of return invoice {} is not consolidated." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:451 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:456 msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return." msgstr "" @@ -42050,11 +42128,11 @@ msgstr "رقم الصف {}: {}" msgid "Row #{}: {} {} does not exist." msgstr "الصف رقم {}: {} {} غير موجود." -#: erpnext/stock/doctype/item/item.py:1398 +#: erpnext/stock/doctype/item/item.py:1379 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:440 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:442 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}" msgstr "" @@ -42066,15 +42144,15 @@ msgstr "الصف {0}: العملية مطلوبة مقابل عنصر الماد msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1388 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1448 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1412 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1472 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:266 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:273 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time." msgstr "" @@ -42102,7 +42180,7 @@ msgstr "" msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1077 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1135 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -42114,11 +42192,16 @@ msgstr "صف {0}: من مواد مشروع القانون لم يتم العثو msgid "Row {0}: Both Debit and Credit values cannot be zero" msgstr "" -#: erpnext/controllers/selling_controller.py:266 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:550 +msgid "Row {0}: Consumed Qty {1} {2} must be less than or equal to Available Qty For Consumption\n" +"\t\t\t\t\t{3} {4} in Consumed Items Table." +msgstr "" + +#: erpnext/controllers/selling_controller.py:275 msgid "Row {0}: Conversion Factor is mandatory" msgstr "الصف {0}: معامل التحويل إلزامي" -#: erpnext/controllers/accounts_controller.py:3146 +#: erpnext/controllers/accounts_controller.py:3154 msgid "Row {0}: Cost Center {1} does not belong to Company {2}" msgstr "" @@ -42130,7 +42213,7 @@ msgstr "الصف {0}: مركز التكلفة مطلوب لعنصر {1}" msgid "Row {0}: Credit entry can not be linked with a {1}" msgstr "صف {0}: لا يمكن ربط قيد دائن مع {1}" -#: erpnext/manufacturing/doctype/bom/bom.py:466 +#: erpnext/manufacturing/doctype/bom/bom.py:475 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}" @@ -42138,7 +42221,7 @@ msgstr "الصف {0}: العملة للـ BOM #{1} يجب أن يساوي الع msgid "Row {0}: Debit entry can not be linked with a {1}" msgstr "الصف {0}: لا يمكن ربط قيد مدين مع {1}" -#: erpnext/controllers/selling_controller.py:834 +#: erpnext/controllers/selling_controller.py:846 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same" msgstr "الصف {0}: لا يمكن أن يكون مستودع التسليم ({1}) ومستودع العميل ({2}) متماثلين" @@ -42146,7 +42229,7 @@ msgstr "الصف {0}: لا يمكن أن يكون مستودع التسليم ({ msgid "Row {0}: Delivery Warehouse cannot be same as Customer Warehouse for Item {1}." msgstr "" -#: erpnext/controllers/accounts_controller.py:2639 +#: erpnext/controllers/accounts_controller.py:2647 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date" msgstr "الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق في جدول شروط الدفع قبل تاريخ الترحيل" @@ -42155,7 +42238,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1075 -#: erpnext/controllers/taxes_and_totals.py:1228 +#: erpnext/controllers/taxes_and_totals.py:1330 msgid "Row {0}: Exchange Rate is mandatory" msgstr "الصف {0}: سعر صرف إلزامي" @@ -42163,15 +42246,15 @@ msgstr "الصف {0}: سعر صرف إلزامي" msgid "Row {0}: Expected Value After Useful Life must be less than Net Purchase Amount" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:530 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:532 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:487 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:489 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:512 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:514 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}" msgstr "" @@ -42188,7 +42271,7 @@ msgstr "صف {0}: (من الوقت) و (إلى وقت) تكون إلزامية." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "الصف {0}: من وقت إلى وقت {1} يتداخل مع {2}" -#: erpnext/controllers/stock_controller.py:1397 +#: erpnext/controllers/stock_controller.py:1502 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -42204,11 +42287,11 @@ msgstr "صف {0}: يجب أن تكون قيمة الساعات أكبر من ا msgid "Row {0}: Invalid reference {1}" msgstr "الصف {0}: مرجع غير صالحة {1}" -#: erpnext/controllers/taxes_and_totals.py:140 +#: erpnext/controllers/taxes_and_totals.py:137 msgid "Row {0}: Item Tax template updated as per validity and rate applied" msgstr "" -#: erpnext/controllers/selling_controller.py:599 +#: erpnext/controllers/selling_controller.py:611 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer" msgstr "" @@ -42224,7 +42307,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:598 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:600 msgid "Row {0}: Packed Qty must be equal to {1} Qty." msgstr "" @@ -42268,15 +42351,15 @@ msgstr "" msgid "Row {0}: Please select an valid BOM for Item {1}." msgstr "" -#: erpnext/regional/italy/utils.py:310 +#: erpnext/regional/italy/utils.py:283 msgid "Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges" msgstr "الصف {0}: يرجى تعيين سبب الإعفاء الضريبي في ضرائب ورسوم المبيعات" -#: erpnext/regional/italy/utils.py:337 +#: erpnext/regional/italy/utils.py:310 msgid "Row {0}: Please set the Mode of Payment in Payment Schedule" msgstr "الصف {0}: يرجى ضبط طريقة الدفع في جدول الدفع" -#: erpnext/regional/italy/utils.py:342 +#: erpnext/regional/italy/utils.py:315 msgid "Row {0}: Please set the correct code on Mode of Payment {1}" msgstr "الصف {0}: يرجى ضبط الكود الصحيح على طريقة الدفع {1}" @@ -42292,7 +42375,7 @@ msgstr "" msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:461 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:519 msgid "Row {0}: Qty in Stock UOM can not be zero." msgstr "" @@ -42304,7 +42387,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:827 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:885 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "الصف {0}: الكمية غير متوفرة {4} في المستودع {1} في وقت نشر الإدخال ({2} {3})" @@ -42312,11 +42395,11 @@ msgstr "الصف {0}: الكمية غير متوفرة {4} في المستودع msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1425 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1485 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "الصف {0}: العنصر المتعاقد عليه من الباطن إلزامي للمادة الخام {1}" -#: erpnext/controllers/stock_controller.py:1388 +#: erpnext/controllers/stock_controller.py:1493 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -42324,11 +42407,11 @@ msgstr "" msgid "Row {0}: Task {1} does not belong to Project {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:506 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:564 msgid "Row {0}: The item {1}, quantity must be positive number" msgstr "الصف {0}: العنصر {1} ، يجب أن تكون الكمية رقمًا موجبًا" -#: erpnext/controllers/accounts_controller.py:3123 +#: erpnext/controllers/accounts_controller.py:3131 msgid "Row {0}: The {3} Account {1} does not belong to the company {2}" msgstr "" @@ -42336,16 +42419,16 @@ msgstr "" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:455 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:513 msgid "Row {0}: UOM Conversion Factor is mandatory" msgstr "الصف {0}: عامل تحويل UOM إلزامي\\n
            \\nRow {0}: UOM Conversion Factor is mandatory" -#: erpnext/manufacturing/doctype/bom/bom.py:1118 -#: erpnext/manufacturing/doctype/work_order/work_order.py:396 +#: erpnext/manufacturing/doctype/bom/bom.py:1136 +#: erpnext/manufacturing/doctype/work_order/work_order.py:397 msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1099 +#: erpnext/controllers/accounts_controller.py:1104 msgid "Row {0}: user has not applied the rule {1} on the item {2}" msgstr "الصف {0}: لم يطبق المستخدم القاعدة {1} على العنصر {2}" @@ -42357,7 +42440,7 @@ msgstr "" msgid "Row {0}: {1} must be greater than 0" msgstr "الصف {0}: يجب أن يكون {1} أكبر من 0" -#: erpnext/controllers/accounts_controller.py:711 +#: erpnext/controllers/accounts_controller.py:716 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}" msgstr "" @@ -42399,15 +42482,15 @@ msgstr "تمت إزالة الصفوف في {0}" msgid "Rows with Same Account heads will be merged on Ledger" msgstr "" -#: erpnext/controllers/accounts_controller.py:2650 +#: erpnext/controllers/accounts_controller.py:2658 msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "تم العثور على صفوف ذات تواريخ استحقاق مكررة في صفوف أخرى: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:124 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:128 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" -#: erpnext/controllers/accounts_controller.py:275 +#: erpnext/controllers/accounts_controller.py:280 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry." msgstr "" @@ -42563,7 +42646,7 @@ msgstr "طريقة تحصيل الراتب" #. Option for the 'Order Type' (Select) field in DocType 'Sales Order' #. Label of the sales_details (Tab Break) field in DocType 'Item' #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:142 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:237 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:238 #: erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py:9 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/doctype/payment_term/payment_term_dashboard.py:8 @@ -42574,11 +42657,11 @@ msgstr "طريقة تحصيل الراتب" #: erpnext/crm/doctype/opportunity/opportunity.js:288 #: erpnext/crm/doctype/opportunity/opportunity.py:158 #: erpnext/projects/doctype/project/project_dashboard.py:15 -#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:185 +#: erpnext/regional/report/vat_audit_report/vat_audit_report.py:146 #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/setup/doctype/company/company.py:412 -#: erpnext/setup/doctype/company/company.py:599 +#: erpnext/setup/doctype/company/company.py:443 +#: erpnext/setup/doctype/company/company.py:630 #: erpnext/setup/doctype/company/company_dashboard.py:9 #: erpnext/setup/doctype/sales_person/sales_person_dashboard.py:12 #: erpnext/setup/install.py:329 @@ -42587,7 +42670,7 @@ msgstr "طريقة تحصيل الراتب" msgid "Sales" msgstr "مبيعات" -#: erpnext/setup/doctype/company/company.py:599 +#: erpnext/setup/doctype/company/company.py:630 msgid "Sales Account" msgstr "حساب مبيعات" @@ -42661,7 +42744,6 @@ msgstr "" #. DocType 'POS Settings' #. Name of a DocType #. Label of the sales_invoice (Link) field in DocType 'Sales Invoice Reference' -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Receivables Workspace #. Label of a shortcut in the Receivables Workspace #. Option for the 'Document Type' (Select) field in DocType 'Contract' @@ -42684,18 +42766,17 @@ msgstr "" #: erpnext/accounts/report/gross_profit/gross_profit.js:30 #: erpnext/accounts/report/gross_profit/gross_profit.py:276 #: erpnext/accounts/report/gross_profit/gross_profit.py:283 -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/receivables/receivables.json #: erpnext/crm/doctype/contract/contract.json #: erpnext/projects/doctype/timesheet/timesheet.json #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.json #: erpnext/selling/doctype/quotation/quotation_list.js:22 -#: erpnext/selling/doctype/sales_order/sales_order.js:1059 +#: erpnext/selling/doctype/sales_order/sales_order.js:1063 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:350 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:351 #: erpnext/stock/doctype/delivery_note/delivery_note_list.js:65 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json msgid "Sales Invoice" @@ -42773,15 +42854,15 @@ msgstr "" msgid "Sales Invoice isn't created by user {}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:423 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:428 msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:618 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:620 msgid "Sales Invoice {0} has already been submitted" msgstr "سبق أن تم ترحيل فاتورة المبيعات {0}" -#: erpnext/selling/doctype/sales_order/sales_order.py:574 +#: erpnext/selling/doctype/sales_order/sales_order.py:576 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order" msgstr "" @@ -42828,15 +42909,16 @@ msgstr "" #. Label of the sales_order (Link) field in DocType 'Purchase Receipt Item' #. Option for the 'Voucher Type' (Select) field in DocType 'Stock Reservation #. Entry' +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:272 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:273 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:287 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:285 #: erpnext/accounts/report/sales_register/sales_register.py:238 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json -#: erpnext/controllers/selling_controller.py:504 +#: erpnext/controllers/selling_controller.py:513 #: erpnext/crm/doctype/contract/contract.json #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js:65 #: erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json @@ -42862,8 +42944,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:222 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json -#: erpnext/stock/doctype/delivery_note/delivery_note.js:160 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:226 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:161 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:227 #: erpnext/stock/doctype/material_request/material_request.js:221 #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -42873,6 +42955,7 @@ msgstr "" #: erpnext/stock/report/delayed_item_report/delayed_item_report.py:159 #: erpnext/stock/report/delayed_order_report/delayed_order_report.js:30 #: erpnext/stock/report/delayed_order_report/delayed_order_report.py:74 +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Sales Order" msgstr "طلب المبيعات" @@ -42922,7 +43005,7 @@ msgstr "تاريخ طلب المبيعات" #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:336 -#: erpnext/selling/doctype/sales_order/sales_order.js:1268 +#: erpnext/selling/doctype/sales_order/sales_order.js:1272 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -42963,24 +43046,24 @@ msgstr "" msgid "Sales Order Trends" msgstr "مجرى طلبات البيع" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:270 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:272 msgid "Sales Order required for Item {0}" msgstr "طلب البيع مطلوب للبند {0}\\n
            \\nSales Order required for Item {0}" -#: erpnext/selling/doctype/sales_order/sales_order.py:340 +#: erpnext/selling/doctype/sales_order/sales_order.py:342 msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1420 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1422 msgid "Sales Order {0} is not submitted" msgstr "لا يتم اعتماد أمر التوريد {0}\\n
            \\nSales Order {0} is not submitted" -#: erpnext/manufacturing/doctype/work_order/work_order.py:447 +#: erpnext/manufacturing/doctype/work_order/work_order.py:448 msgid "Sales Order {0} is not valid" msgstr "أمر البيع {0} غير موجود\\n
            \\nSales Order {0} is not valid" -#: erpnext/controllers/selling_controller.py:485 -#: erpnext/manufacturing/doctype/work_order/work_order.py:452 +#: erpnext/controllers/selling_controller.py:494 +#: erpnext/manufacturing/doctype/work_order/work_order.py:453 msgid "Sales Order {0} is {1}" msgstr "طلب المبيعات {0} هو {1}" @@ -43151,7 +43234,7 @@ msgstr "ملخص دفع المبيعات" msgid "Sales Person" msgstr "مندوب مبيعات" -#: erpnext/controllers/selling_controller.py:248 +#: erpnext/controllers/selling_controller.py:257 msgid "Sales Person {0} is disabled." msgstr "" @@ -43218,7 +43301,7 @@ msgid "Sales Representative" msgstr "" #: erpnext/accounts/report/gross_profit/gross_profit.py:893 -#: erpnext/stock/doctype/delivery_note/delivery_note.js:273 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:274 msgid "Sales Return" msgstr "مبيعات المعاده" @@ -43228,7 +43311,7 @@ msgstr "مبيعات المعاده" #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/sales_stage/sales_stage.json #: erpnext/crm/report/lost_opportunity/lost_opportunity.py:51 -#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:69 +#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:70 #: erpnext/crm/workspace/crm/crm.json msgid "Sales Stage" msgstr "مرحلة المبيعات" @@ -43239,7 +43322,7 @@ msgstr "ملخص المبيعات" #. Label of the sales_tax_template (Link) field in DocType 'Tax Rule' #: erpnext/accounts/doctype/tax_rule/tax_rule.json -#: erpnext/setup/doctype/company/company.js:126 +#: erpnext/setup/doctype/company/company.js:133 msgid "Sales Tax Template" msgstr "قالب ضريبة المبيعات" @@ -43380,7 +43463,7 @@ msgstr "مستودع الاحتفاظ بالعينات" msgid "Sample Size" msgstr "حجم العينة" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3585 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3675 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "كمية العينة {0} لا يمكن أن تكون أكثر من الكمية المستلمة {1}" @@ -43510,7 +43593,7 @@ msgstr "" msgid "Scheduler is Inactive. Can't trigger jobs now." msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:676 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:671 msgid "Scheduler is inactive. Cannot enqueue job." msgstr "" @@ -43699,13 +43782,13 @@ msgstr "" msgid "Secretary" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:180 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:194 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:117 msgid "Section Code" msgstr "كود القسم" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:177 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:300 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301 msgid "Secured Loans" msgstr "القروض المضمونة" @@ -43738,7 +43821,7 @@ msgstr "" msgid "Select Alternate Item" msgstr "اختر البند البديل" -#: erpnext/selling/doctype/quotation/quotation.js:325 +#: erpnext/selling/doctype/quotation/quotation.js:326 msgid "Select Alternative Items for Sales Order" msgstr "" @@ -43746,20 +43829,20 @@ msgstr "" msgid "Select Attribute Values" msgstr "حدد قيم السمات" -#: erpnext/selling/doctype/sales_order/sales_order.js:1251 +#: erpnext/selling/doctype/sales_order/sales_order.js:1255 msgid "Select BOM" msgstr "حدد مكتب الإدارة" -#: erpnext/selling/doctype/sales_order/sales_order.js:1232 +#: erpnext/selling/doctype/sales_order/sales_order.js:1236 msgid "Select BOM and Qty for Production" msgstr "اختر فاتورة المواد و الكمية للانتاج" -#: erpnext/selling/doctype/sales_order/sales_order.js:1383 +#: erpnext/selling/doctype/sales_order/sales_order.js:1387 msgid "Select BOM, Qty and For Warehouse" msgstr "اختر قائمة المواد، الكمية، وإلى المخزن" #: erpnext/assets/doctype/asset_repair/asset_repair.js:194 -#: erpnext/public/js/utils/sales_common.js:418 +#: erpnext/public/js/utils/sales_common.js:440 #: erpnext/stock/doctype/pick_list/pick_list.js:385 msgid "Select Batch No" msgstr "" @@ -43780,11 +43863,11 @@ msgstr "اختر الماركة ..." msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:132 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:136 msgid "Select Company" msgstr "حدد الشركة" -#: erpnext/manufacturing/doctype/job_card/job_card.js:520 +#: erpnext/manufacturing/doctype/job_card/job_card.js:529 msgid "Select Corrective Operation" msgstr "" @@ -43820,7 +43903,7 @@ msgstr "" msgid "Select Dispatch Address " msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:212 +#: erpnext/manufacturing/doctype/job_card/job_card.js:221 msgid "Select Employees" msgstr "حدد الموظفين" @@ -43835,12 +43918,12 @@ msgstr "" #. Forecast' #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json #: erpnext/manufacturing/doctype/sales_forecast/sales_forecast.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1584 -#: erpnext/selling/doctype/sales_order/sales_order.js:1596 +#: erpnext/selling/doctype/sales_order/sales_order.js:1588 +#: erpnext/selling/doctype/sales_order/sales_order.js:1616 msgid "Select Items" msgstr "اختيار العناصر" -#: erpnext/selling/doctype/sales_order/sales_order.js:1470 +#: erpnext/selling/doctype/sales_order/sales_order.js:1474 msgid "Select Items based on Delivery Date" msgstr "حدد العناصر بناءً على تاريخ التسليم" @@ -43851,7 +43934,7 @@ msgstr "" #. Label of the select_items_to_manufacture_section (Section Break) field in #. DocType 'Production Plan' #: erpnext/manufacturing/doctype/production_plan/production_plan.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1279 +#: erpnext/selling/doctype/sales_order/sales_order.js:1283 msgid "Select Items to Manufacture" msgstr "حدد العناصر لتصنيع" @@ -43865,7 +43948,7 @@ msgstr "" msgid "Select Job Worker Address" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1154 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1155 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:955 msgid "Select Loyalty Program" msgstr "اختر برنامج الولاء" @@ -43874,19 +43957,19 @@ msgstr "اختر برنامج الولاء" msgid "Select Possible Supplier" msgstr "اختار المورد المحتمل" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1024 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1009 #: erpnext/stock/doctype/pick_list/pick_list.js:214 msgid "Select Quantity" msgstr "إختيار الكمية" #: erpnext/assets/doctype/asset_repair/asset_repair.js:194 -#: erpnext/public/js/utils/sales_common.js:418 +#: erpnext/public/js/utils/sales_common.js:440 #: erpnext/stock/doctype/pick_list/pick_list.js:385 msgid "Select Serial No" msgstr "" #: erpnext/assets/doctype/asset_repair/asset_repair.js:197 -#: erpnext/public/js/utils/sales_common.js:421 +#: erpnext/public/js/utils/sales_common.js:443 #: erpnext/stock/doctype/pick_list/pick_list.js:388 msgid "Select Serial and Batch" msgstr "" @@ -43937,7 +44020,7 @@ msgstr "حدد شركة" msgid "Select a Company this Employee belongs to." msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:180 +#: erpnext/buying/doctype/supplier/supplier.js:182 msgid "Select a Customer" msgstr "" @@ -43949,11 +44032,11 @@ msgstr "حدد أولوية افتراضية." msgid "Select a Payment Method." msgstr "" -#: erpnext/selling/doctype/customer/customer.js:230 +#: erpnext/selling/doctype/customer/customer.js:233 msgid "Select a Supplier" msgstr "حدد المورد" -#: erpnext/stock/doctype/material_request/material_request.js:401 +#: erpnext/stock/doctype/material_request/material_request.js:404 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 "حدد موردًا من الموردين الافتراضيين للعناصر أدناه. عند التحديد ، سيتم إجراء طلب الشراء مقابل العناصر التي تنتمي إلى المورد المحدد فقط." @@ -43973,7 +44056,7 @@ msgstr "حدد حسابا للطباعة بعملة الحساب" msgid "Select an invoice to load summary data" msgstr "" -#: erpnext/selling/doctype/quotation/quotation.js:340 +#: erpnext/selling/doctype/quotation/quotation.js:341 msgid "Select an item from each set to be used in the Sales Order." msgstr "" @@ -43991,7 +44074,7 @@ msgstr "اختر الشركة أولا" msgid "Select company name first." msgstr "حدد اسم الشركة الأول." -#: erpnext/controllers/accounts_controller.py:2898 +#: erpnext/controllers/accounts_controller.py:2906 msgid "Select finance book for the item {0} at row {1}" msgstr "حدد دفتر تمويل للعنصر {0} في الصف {1}" @@ -44012,11 +44095,11 @@ 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:1126 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1111 msgid "Select the Item to be manufactured." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:911 +#: erpnext/manufacturing/doctype/bom/bom.js:919 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically." msgstr "" @@ -44037,7 +44120,7 @@ msgstr "" msgid "Select the date and your timezone" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:930 +#: erpnext/manufacturing/doctype/bom/bom.js:938 msgid "Select the raw materials (Items) required to manufacture the Item" msgstr "" @@ -44064,7 +44147,7 @@ msgstr "حدد، لجعل العميل قابلا للبحث باستخدام ه msgid "Selected POS Opening Entry should be open." msgstr "يجب أن يكون الإدخال الافتتاحي المحدد لنقاط البيع مفتوحًا." -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2536 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2538 msgid "Selected Price List should have buying and selling fields checked." msgstr "قائمة الأسعار المختارة يجب أن يكون لديها حقول بيع وشراء محددة." @@ -44144,7 +44227,6 @@ msgstr "معدل البيع" #. Name of a DocType #. Label of a Link in the Selling Workspace -#. Label of a Link in the Settings Workspace #. Label of a shortcut in the Settings Workspace #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/selling/workspace/selling/selling.json @@ -44270,7 +44352,7 @@ msgstr "" msgid "Serial / Batch Bundle" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:442 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:447 msgid "Serial / Batch Bundle Missing" msgstr "" @@ -44388,7 +44470,7 @@ msgstr "" msgid "Serial No Range" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2288 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2317 msgid "Serial No Reserved" msgstr "" @@ -44464,7 +44546,7 @@ msgstr "الرقم المتسلسل {0} لا ينتمي إلى البند {1}\\n msgid "Serial No {0} does not exist" msgstr "الرقم المتسلسل {0} غير موجود\\n
            \\nSerial No {0} does not exist" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2988 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3021 msgid "Serial No {0} does not exists" msgstr "" @@ -44496,7 +44578,7 @@ msgstr "الرقم التسلسلي {0} تحت الضمان حتى {1}\\n
            \\n msgid "Serial No {0} not found" msgstr "لم يتم العثور علي الرقم التسلسلي {0}\\n
            \\nSerial No {0} not found" -#: erpnext/selling/page/point_of_sale/pos_controller.js:875 +#: erpnext/selling/page/point_of_sale/pos_controller.js:879 msgid "Serial No: {0} has already been transacted into another POS Invoice." msgstr "الرقم التسلسلي: تم بالفعل معاملة {0} في فاتورة نقطة بيع أخرى." @@ -44517,7 +44599,7 @@ msgstr "" msgid "Serial Nos and Batches" msgstr "الرقم التسلسلي ودفعات" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1607 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1636 msgid "Serial Nos are created successfully" msgstr "" @@ -44599,15 +44681,15 @@ msgstr "" msgid "Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1829 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1858 msgid "Serial and Batch Bundle created" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1901 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1930 msgid "Serial and Batch Bundle updated" msgstr "" -#: erpnext/controllers/stock_controller.py:153 +#: erpnext/controllers/stock_controller.py:155 msgid "Serial and Batch Bundle {0} is already used in {1} {2}." msgstr "" @@ -44659,7 +44741,7 @@ msgstr "" msgid "Serial and Batch Summary" msgstr "" -#: erpnext/stock/utils.py:419 +#: erpnext/stock/utils.py:423 msgid "Serial number {0} entered more than once" msgstr "الرقم التسلسلي {0} دخلت أكثر من مرة" @@ -44725,7 +44807,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:620 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:624 #: 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 @@ -45016,8 +45098,8 @@ msgstr "" msgid "Set Delivery Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:391 -#: erpnext/manufacturing/doctype/job_card/job_card.js:460 +#: erpnext/manufacturing/doctype/job_card/job_card.js:400 +#: erpnext/manufacturing/doctype/job_card/job_card.js:469 msgid "Set Finished Good Quantity" msgstr "" @@ -45048,11 +45130,11 @@ msgstr "تعيين مجموعة من الحكمة الإغلاق الميزان msgid "Set Landed Cost Based on Purchase Invoice Rate" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1166 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1167 msgid "Set Loyalty Program" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:304 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:305 msgid "Set New Release Date" msgstr "تعيين تاريخ الإصدار الجديد" @@ -45068,7 +45150,7 @@ msgstr "" msgid "Set Operating Cost Based On BOM Quantity" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:88 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:89 msgid "Set Parent Row No in Items Table" msgstr "" @@ -45077,7 +45159,7 @@ msgstr "" msgid "Set Posting Date" msgstr "حدد تاريخ النشر" -#: erpnext/manufacturing/doctype/bom/bom.js:957 +#: erpnext/manufacturing/doctype/bom/bom.js:965 msgid "Set Process Loss Item Quantity" msgstr "" @@ -45113,13 +45195,17 @@ msgstr "" #. Label of the set_warehouse (Link) field in DocType 'Sales Order' #. Label of the set_warehouse (Link) field in DocType 'Delivery Note' #. Label of the set_from_warehouse (Link) field in DocType 'Material Request' -#: erpnext/public/js/utils/sales_common.js:520 +#: erpnext/public/js/utils/sales_common.js:542 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/material_request/material_request.json msgid "Set Source Warehouse" msgstr "تعيين المخزن المصدر" +#: erpnext/selling/doctype/sales_order/sales_order.js:1594 +msgid "Set Supplier" +msgstr "" + #. Label of the set_target_warehouse (Link) field in DocType 'Sales Invoice' #. Label of the set_warehouse (Link) field in DocType 'Purchase Order' #. Label of the set_target_warehouse (Link) field in DocType 'Delivery Note' @@ -45127,7 +45213,7 @@ msgstr "تعيين المخزن المصدر" #. Label of the set_warehouse (Link) field in DocType 'Subcontracting Order' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/public/js/utils/sales_common.js:517 +#: erpnext/public/js/utils/sales_common.js:539 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json @@ -45159,7 +45245,7 @@ msgstr "على النحو مغلق" msgid "Set as Completed" msgstr "تعيين كـ مكتمل" -#: erpnext/public/js/utils/sales_common.js:544 +#: erpnext/public/js/utils/sales_common.js:566 #: erpnext/selling/doctype/quotation/quotation.js:129 msgid "Set as Lost" msgstr "على النحو المفقودة" @@ -45182,11 +45268,11 @@ msgstr "على النحو المفتوحة" msgid "Set by Item Tax Template" msgstr "" -#: erpnext/setup/doctype/company/company.py:502 +#: erpnext/setup/doctype/company/company.py:533 msgid "Set default inventory account for perpetual inventory" msgstr "تعيين حساب المخزون الافتراضي للمخزون الدائم" -#: erpnext/setup/doctype/company/company.py:528 +#: erpnext/setup/doctype/company/company.py:559 msgid "Set default {0} account for non stock items" msgstr "" @@ -45196,7 +45282,7 @@ msgstr "" msgid "Set fieldname from which you want to fetch the data from the parent form." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:947 +#: erpnext/manufacturing/doctype/bom/bom.js:955 msgid "Set quantity of process loss item:" msgstr "" @@ -45212,7 +45298,7 @@ msgstr "تعيين معدل عنصر التجميع الفرعي استنادا msgid "Set targets Item Group-wise for this Sales Person." msgstr "تحديد أهداف المجموعة السلعة الحكيم لهذا الشخص المبيعات." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1183 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1168 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)" msgstr "" @@ -45301,8 +45387,8 @@ msgstr "" msgid "Setting up company" msgstr "تأسيس شركة" -#: erpnext/manufacturing/doctype/bom/bom.py:1097 -#: erpnext/manufacturing/doctype/work_order/work_order.py:1446 +#: erpnext/manufacturing/doctype/bom/bom.py:1115 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1447 msgid "Setting {0} is required" msgstr "" @@ -45411,7 +45497,7 @@ msgid "Shift Time (In Hours)" msgstr "" #. Name of a DocType -#: erpnext/stock/doctype/delivery_note/delivery_note.js:249 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:250 #: erpnext/stock/doctype/shipment/shipment.json msgid "Shipment" msgstr "" @@ -45462,7 +45548,7 @@ msgstr "" msgid "Shipment details" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:789 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:791 msgid "Shipments" msgstr "شحنات" @@ -45497,7 +45583,7 @@ msgstr "الشحن العنوان الاسم" msgid "Shipping Address Template" msgstr "" -#: erpnext/controllers/accounts_controller.py:505 +#: erpnext/controllers/accounts_controller.py:510 msgid "Shipping Address does not belong to the {0}" msgstr "" @@ -45639,7 +45725,7 @@ msgid "Short-term Investments" msgstr "" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:175 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:295 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:296 msgid "Short-term Provisions" msgstr "" @@ -45705,6 +45791,7 @@ msgstr "إظهار السجلات الفاشلة" msgid "Show Future Payments" msgstr "إظهار المدفوعات المستقبلية" +#: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:107 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:125 msgid "Show GL Balance" msgstr "" @@ -45860,7 +45947,7 @@ msgstr "إظهار نقاط البيع فقط" msgid "Show only the Immediate Upcoming Term" msgstr "" -#: erpnext/stock/utils.py:579 +#: erpnext/stock/utils.py:583 msgid "Show pending entries" msgstr "" @@ -45957,11 +46044,11 @@ msgstr "" msgid "Simultaneous" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:583 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:641 msgid "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:96 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:105 msgid "Since {0} are Serial No/Batch No items, you cannot enable 'Recreate Stock Ledgers' in Repost Item Valuation." msgstr "" @@ -45993,7 +46080,7 @@ msgstr "تخطي ملاحظة التسليم" #. Label of the skip_material_transfer (Check) field in DocType 'Work Order #. Operation' -#: erpnext/manufacturing/doctype/work_order/work_order.js:355 +#: erpnext/manufacturing/doctype/work_order/work_order.js:356 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.js:454 msgid "Skip Material Transfer" @@ -46060,7 +46147,7 @@ msgstr "" msgid "Solvency Ratios" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:300 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:302 msgid "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager." msgstr "" @@ -46068,15 +46155,15 @@ msgstr "" msgid "Something went wrong please try again" msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:752 +#: erpnext/accounts/doctype/pricing_rule/utils.py:755 msgid "Sorry, this coupon code is no longer valid" msgstr "عذرا ، رمز القسيمة هذا لم يعد صالحًا" -#: erpnext/accounts/doctype/pricing_rule/utils.py:750 +#: erpnext/accounts/doctype/pricing_rule/utils.py:753 msgid "Sorry, this coupon code's validity has expired" msgstr "عذرا ، لقد انتهت صلاحية رمز القسيمة" -#: erpnext/accounts/doctype/pricing_rule/utils.py:748 +#: erpnext/accounts/doctype/pricing_rule/utils.py:751 msgid "Sorry, this coupon code's validity has not started" msgstr "عذرًا ، لم تبدأ صلاحية رمز القسيمة" @@ -46153,7 +46240,7 @@ msgstr "نوع المصدر" #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:126 -#: erpnext/public/js/utils/sales_common.js:516 +#: erpnext/public/js/utils/sales_common.js:538 #: erpnext/stock/dashboard/item_dashboard.js:227 #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.js:668 @@ -46176,7 +46263,7 @@ msgstr "" msgid "Source Warehouse is mandatory for the Item {0}." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:281 +#: erpnext/manufacturing/doctype/work_order/work_order.py:282 msgid "Source Warehouse {0} must be same as Customer Warehouse {1} in the Subcontracting Inward Order." msgstr "" @@ -46184,7 +46271,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "لا يمكن أن يكون المصدر و الموقع الهدف نفسه" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:701 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:759 msgid "Source and target warehouse cannot be same for row {0}" msgstr "المصدر والمستودع المستهدف لا يمكن أن يكون نفس الصف {0}\\n
            \\nSource and target warehouse cannot be same for row {0}" @@ -46193,12 +46280,12 @@ msgid "Source and target warehouse must be different" msgstr "ويجب أن تكون مصدر ومستودع الهدف مختلفة" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:152 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:253 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:254 msgid "Source of Funds (Liabilities)" msgstr "(مصدر الأموال (الخصوم" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:678 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:695 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:736 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:753 msgid "Source warehouse is mandatory for row {0}" msgstr "مستودع المصدر إلزامي للصف {0}\\n
            \\nSource warehouse is mandatory for row {0}" @@ -46232,6 +46319,10 @@ msgstr "" msgid "Specify conditions to calculate shipping amount" msgstr "" +#: erpnext/accounts/doctype/budget/budget.py:216 +msgid "Spending for Account {0} ({1}) between {2} and {3} has already exceeded the new allocated budget. Spent: {4}, Budget: {5}" +msgstr "" + #: erpnext/assets/doctype/asset/asset.js:557 #: erpnext/stock/doctype/batch/batch.js:91 #: erpnext/stock/doctype/batch/batch.js:183 @@ -46271,7 +46362,7 @@ msgstr "" msgid "Split Quantity must be less than Asset Quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2518 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2519 msgid "Splitting {0} {1} into {2} rows as per Payment Terms" msgstr "" @@ -46338,7 +46429,7 @@ msgstr "" msgid "Standard Buying" msgstr "شراء القياسية" -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:61 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:73 msgid "Standard Description" msgstr "" @@ -46408,7 +46499,7 @@ msgstr "" msgid "Start Deletion" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:206 +#: erpnext/manufacturing/doctype/job_card/job_card.js:215 #: erpnext/manufacturing/doctype/workstation/workstation.js:124 msgid "Start Job" msgstr "" @@ -46417,7 +46508,7 @@ msgstr "" msgid "Start Merge" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:95 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js:99 msgid "Start Reposting" msgstr "" @@ -46433,7 +46524,7 @@ msgstr "" #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56 #: erpnext/accounts/report/financial_ratios/financial_ratios.js:17 #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:81 -#: erpnext/public/js/financial_statements.js:332 +#: erpnext/public/js/financial_statements.js:343 msgid "Start Year" msgstr "بداية السنة" @@ -46502,7 +46593,7 @@ msgstr "" msgid "Status Illustration" msgstr "" -#: erpnext/projects/doctype/project/project.py:710 +#: erpnext/projects/doctype/project/project.py:709 msgid "Status must be Cancelled or Completed" msgstr "يجب إلغاء الحالة أو إكمالها" @@ -46538,8 +46629,8 @@ msgstr "المخازن" #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1353 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1379 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1355 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1381 #: erpnext/accounts/report/account_balance/account_balance.js:58 msgid "Stock Adjustment" msgstr "تسوية المخزون" @@ -46641,7 +46732,7 @@ msgstr "" msgid "Stock Details" msgstr "تفاصيل المخزون" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:795 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -46696,7 +46787,7 @@ msgstr "" msgid "Stock Entry Type" msgstr "نوع إدخال الأسهم" -#: erpnext/stock/doctype/pick_list/pick_list.py:1402 +#: erpnext/stock/doctype/pick_list/pick_list.py:1407 msgid "Stock Entry has been already created against this Pick List" msgstr "تم إنشاء إدخال الأسهم بالفعل مقابل قائمة الاختيار هذه" @@ -46760,7 +46851,7 @@ msgid "Stock Ledger Entry" msgstr "حركة سجل المخزن" #: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:98 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:107 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:110 msgid "Stock Ledger ID" msgstr "معرف دفتر الأستاذ" @@ -46774,13 +46865,19 @@ msgstr "" msgid "Stock Ledger Variance" msgstr "" +#. Description of the 'Repost Only Accounting Ledgers' (Check) field in DocType +#. 'Repost Item Valuation' +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json +msgid "Stock Ledgers won’t be reposted." +msgstr "" + #: erpnext/stock/doctype/batch/batch.js:79 #: erpnext/stock/doctype/item/item.js:542 msgid "Stock Levels" msgstr "مستوى المخزون" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:160 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:272 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:273 msgid "Stock Liabilities" msgstr "خصوم المخزون" @@ -46853,8 +46950,8 @@ msgstr "كمية المخزون المتوقعة" #. Label of the stock_qty (Float) field in DocType 'BOM Item' #. Label of the stock_qty (Float) field in DocType 'Delivery Schedule Item' #. Label of the stock_qty (Float) field in DocType 'Material Request Item' -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:259 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:314 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:262 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:312 #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json #: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json #: erpnext/manufacturing/doctype/bom_item/bom_item.json @@ -46873,7 +46970,7 @@ msgstr "كمية المخزون مقابل الرقم التسلسلي" #. Label of the stock_received_but_not_billed (Link) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:161 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:273 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:274 #: erpnext/accounts/report/account_balance/account_balance.js:59 #: erpnext/setup/doctype/company/company.json msgid "Stock Received But Not Billed" @@ -46884,7 +46981,7 @@ msgstr "المخزون المتلقي ولكن غير مفوتر" #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' #. Label of a Link in the Stock Workspace #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:614 +#: erpnext/stock/doctype/item/item.py:595 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json msgid "Stock Reconciliation" @@ -46895,7 +46992,7 @@ msgstr "جرد المخزون" msgid "Stock Reconciliation Item" msgstr "جرد عناصر المخزون" -#: erpnext/stock/doctype/item/item.py:614 +#: erpnext/stock/doctype/item/item.py:595 msgid "Stock Reconciliations" msgstr "تسويات المخزون" @@ -46956,8 +47053,8 @@ msgid "Stock Reservation Entries Cancelled" msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:995 -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2196 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2028 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2211 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2029 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1773 msgid "Stock Reservation Entries Created" msgstr "" @@ -46985,7 +47082,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:551 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:553 msgid "Stock Reservation Warehouse Mismatch" msgstr "" @@ -47018,7 +47115,6 @@ msgstr "" #. Label of the auto_accounting_for_stock_settings (Section Break) field in #. DocType 'Company' -#. Label of a Link in the Settings Workspace #. Label of a shortcut in the Settings Workspace #. Name of a DocType #. Label of a Link in the Stock Workspace @@ -47098,8 +47194,8 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:261 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:316 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:264 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:314 #: erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json @@ -47229,7 +47325,7 @@ msgstr "" #: erpnext/stock/doctype/bin/bin.json #: erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.json #: erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py:134 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:123 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:126 msgid "Stock Value" msgstr "قيمة المخزون" @@ -47251,15 +47347,15 @@ msgstr "" msgid "Stock cannot be reserved in the group warehouse {0}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:732 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:734 msgid "Stock cannot be updated against Purchase Receipt {0}" msgstr "لا يمكن تحديث المخزون مقابل إيصال الشراء {0}\\n
            \\nStock cannot be updated against Purchase Receipt {0}" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1253 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1255 msgid "Stock cannot be updated against the following Delivery Notes: {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1322 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1324 msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item." msgstr "" @@ -47271,7 +47367,7 @@ msgstr "" msgid "Stock not available for Item {0} in Warehouse {1}." msgstr "" -#: erpnext/selling/page/point_of_sale/pos_controller.js:855 +#: erpnext/selling/page/point_of_sale/pos_controller.js:859 msgid "Stock quantity not enough for Item Code: {0} under warehouse {1}. Available quantity {2} {3}." msgstr "" @@ -47291,7 +47387,7 @@ msgstr "" msgid "Stock will be reserved on submission of Purchase Receipt created against Material Request for Sales Order." msgstr "" -#: erpnext/stock/utils.py:570 +#: erpnext/stock/utils.py:574 msgid "Stock/Accounts can not be frozen as processing of backdated entries is going on. Please try again later." msgstr "" @@ -47306,11 +47402,11 @@ msgstr "" msgid "Stop Reason" msgstr "توقف السبب" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1056 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1057 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel" msgstr "لا يمكن إلغاء طلب العمل المتوقف ، قم بإلغاء إيقافه أولاً للإلغاء" -#: erpnext/setup/doctype/company/company.py:339 +#: erpnext/setup/doctype/company/company.py:370 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:528 #: erpnext/stock/doctype/item/item.py:283 @@ -47337,7 +47433,7 @@ msgstr "المجمعات الفرعية" msgid "Sub Assemblies & Raw Materials" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:298 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:321 msgid "Sub Assembly Item" msgstr "" @@ -47353,7 +47449,7 @@ msgstr "" msgid "Sub Assembly Item Reference" msgstr "" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:403 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:430 msgid "Sub Assembly Item is mandatory" msgstr "" @@ -47371,7 +47467,7 @@ msgstr "" #. Label of the operation (Link) field in DocType 'Job Card Time Log' #. Name of a DocType -#: erpnext/manufacturing/doctype/job_card/job_card.js:336 +#: erpnext/manufacturing/doctype/job_card/job_card.js:345 #: erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json #: erpnext/manufacturing/doctype/sub_operation/sub_operation.json msgid "Sub Operation" @@ -47430,8 +47526,10 @@ msgstr "" #. Name of a report #. Label of a Link in the Manufacturing Workspace +#. Label of a Link in the Subcontracting Workspace #: erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontract Order Summary" msgstr "" @@ -47449,10 +47547,12 @@ msgstr "البند من الباطن" #. Label of a Link in the Buying Workspace #. Label of a Link in the Manufacturing Workspace #. Label of a Link in the Stock Workspace +#. Label of a Link in the Subcontracting Workspace #: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.json #: erpnext/buying/workspace/buying/buying.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/workspace/stock/stock.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracted Item To Be Received" msgstr "البند المتعاقد عليه من الباطن" @@ -47472,10 +47572,12 @@ msgstr "" #. Label of a Link in the Buying Workspace #. Label of a Link in the Manufacturing Workspace #. Label of a Link in the Stock Workspace +#. Label of a Link in the Subcontracting Workspace #: erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.json #: erpnext/buying/workspace/buying/buying.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/workspace/stock/stock.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracted Raw Materials To Be Transferred" msgstr "المواد الخام المتعاقد عليها من الباطن" @@ -47484,18 +47586,22 @@ msgstr "المواد الخام المتعاقد عليها من الباطن" #. 'Production Plan Sub Assembly Item' #. Label of a Card Break in the Manufacturing Workspace #. Option for the 'Purpose' (Select) field in DocType 'Material Request' +#. Name of a Workspace #: erpnext/manufacturing/doctype/job_card/job_card_dashboard.py:10 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/material_request/material_request.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting" msgstr "" #. Label of a Link in the Manufacturing Workspace #. Name of a DocType +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting BOM" msgstr "" @@ -47510,10 +47616,12 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/setup/setup_wizard/operations/install_fixtures.py:132 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:158 +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting Delivery" msgstr "" @@ -47533,11 +47641,13 @@ msgstr "" #. Option for the 'From Voucher Type' (Select) field in DocType 'Stock #. Reservation Entry' #. Name of a DocType +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/manufacturing/doctype/work_order/work_order.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1001 +#: erpnext/selling/doctype/sales_order/sales_order.js:1005 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting Inward Order" msgstr "" @@ -47579,8 +47689,9 @@ msgstr "" #. Receipt Item' #. Label of the subcontracting_order (Link) field in DocType 'Subcontracting #. Receipt Supplied Item' -#: erpnext/buying/doctype/purchase_order/purchase_order.js:440 -#: erpnext/controllers/subcontracting_controller.py:1102 +#. Label of a shortcut in the Subcontracting Workspace +#: erpnext/buying/doctype/purchase_order/purchase_order.js:441 +#: erpnext/controllers/subcontracting_controller.py:1123 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json @@ -47588,6 +47699,7 @@ msgstr "" #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:140 #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting Order" msgstr "" @@ -47616,7 +47728,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:968 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:967 msgid "Subcontracting Order {0} created." msgstr "" @@ -47635,6 +47747,7 @@ msgstr "" #. Option for the 'Reference Type' (Select) field in DocType 'Quality #. Inspection' #. Name of a DocType +#. Label of a shortcut in the Subcontracting Workspace #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json #: erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json @@ -47642,6 +47755,7 @@ msgstr "" #: erpnext/stock/doctype/quality_inspection/quality_inspection.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:530 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json +#: erpnext/subcontracting/workspace/subcontracting/subcontracting.json msgid "Subcontracting Receipt" msgstr "" @@ -47684,8 +47798,8 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:964 -#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:987 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:963 +#: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1042 msgid "Submit Action Failed" msgstr "" @@ -47732,7 +47846,7 @@ msgstr "" #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:16 #: erpnext/selling/doctype/quotation/quotation_dashboard.py:12 #: erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py:25 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:31 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py:34 msgid "Subscription" msgstr "اشتراك" @@ -47881,11 +47995,11 @@ msgstr "" msgid "Successfully imported {0} records." msgstr "" -#: erpnext/buying/doctype/supplier/supplier.js:202 +#: erpnext/buying/doctype/supplier/supplier.js:204 msgid "Successfully linked to Customer" msgstr "" -#: erpnext/selling/doctype/customer/customer.js:252 +#: erpnext/selling/doctype/customer/customer.js:255 msgid "Successfully linked to Supplier" msgstr "" @@ -48001,7 +48115,7 @@ msgstr "الموردة الكمية" #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:60 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:34 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:191 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:194 #: erpnext/accounts/report/purchase_register/purchase_register.js:21 #: erpnext/accounts/report/purchase_register/purchase_register.py:171 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 @@ -48035,10 +48149,10 @@ msgstr "الموردة الكمية" #: erpnext/public/js/purchase_trends_filters.js:63 #: erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json #: erpnext/regional/report/irs_1099/irs_1099.py:77 -#: erpnext/selling/doctype/customer/customer.js:234 +#: erpnext/selling/doctype/customer/customer.js:237 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:182 -#: erpnext/selling/doctype/sales_order/sales_order.js:1630 +#: erpnext/selling/doctype/sales_order/sales_order.js:1652 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/setup/workspace/home/home.json @@ -48131,7 +48245,7 @@ msgstr "تفاصيل المورد" #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:91 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1257 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:198 -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:238 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:180 #: erpnext/accounts/report/purchase_register/purchase_register.js:27 #: erpnext/accounts/report/purchase_register/purchase_register.py:186 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:55 @@ -48170,11 +48284,11 @@ msgstr "" #. Label of the bill_date (Date) field in DocType 'Purchase Invoice' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:224 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:238 msgid "Supplier Invoice Date" msgstr "المورد فاتورة التسجيل" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1746 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1748 msgid "Supplier Invoice Date cannot be greater than Posting Date" msgstr "تاريخ فاتورة المورد لا يمكن أن تكون أكبر من تاريخ الإنشاء
            Supplier Invoice Date cannot be greater than Posting Date" @@ -48184,12 +48298,12 @@ msgstr "تاريخ فاتورة المورد لا يمكن أن تكون أكب #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:110 -#: erpnext/accounts/report/general_ledger/general_ledger.py:780 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:218 +#: erpnext/accounts/report/general_ledger/general_ledger.py:787 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:232 msgid "Supplier Invoice No" msgstr "رقم فاتورة المورد" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1773 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1775 msgid "Supplier Invoice No exists in Purchase Invoice {0}" msgstr "المورد فاتورة لا يوجد في شراء الفاتورة {0}" @@ -48231,7 +48345,7 @@ msgstr "ملخص دفتر الأستاذ" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1174 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:156 -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:198 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:201 #: erpnext/accounts/report/purchase_register/purchase_register.py:177 #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:35 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:73 @@ -48309,12 +48423,12 @@ 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:606 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:607 #: 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 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json -#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:232 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:234 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:60 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:258 #: erpnext/buying/workspace/buying/buying.json @@ -48348,6 +48462,10 @@ msgstr "تم إنشاء عرض أسعار المورد {0}" msgid "Supplier Reference" msgstr "" +#: erpnext/selling/doctype/sales_order/sales_order.js:1676 +msgid "Supplier Required" +msgstr "" + #. Label of the supplier_score (Data) field in DocType 'Supplier Scorecard' #: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json msgid "Supplier Score" @@ -48417,7 +48535,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:80 +#: erpnext/manufacturing/doctype/job_card/job_card.js:89 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "Supplier Warehouse" msgstr "المورد مستودع" @@ -48430,6 +48548,10 @@ msgstr "المورد مستودع" msgid "Supplier delivers to Customer" msgstr "المورد يسلم للعميل" +#: erpnext/selling/doctype/sales_order/sales_order.js:1675 +msgid "Supplier is required for all selected Items" +msgstr "" + #. Description of the 'Supplier Numbers' (Table) field in DocType 'Customer' #: erpnext/selling/doctype/customer/customer.json msgid "Supplier numbers assigned by the customer" @@ -48440,7 +48562,7 @@ msgstr "" msgid "Supplier of Goods or Services." msgstr "" -#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:185 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:187 msgid "Supplier {0} not found in {1}" msgstr "المورد {0} غير موجود في {1}" @@ -48493,10 +48615,8 @@ msgstr "بوابة الدعم" msgid "Support Search Source" msgstr "دعم مصدر البحث" -#. Label of a Link in the Settings Workspace #. Name of a DocType #. Label of a Link in the Support Workspace -#: erpnext/setup/workspace/settings/settings.json #: erpnext/support/doctype/support_settings/support_settings.json #: erpnext/support/workspace/support/support.json msgid "Support Settings" @@ -48570,7 +48690,7 @@ msgstr "" msgid "System will fetch all the entries if limit value is zero." msgstr "سيقوم النظام بجلب كل الإدخالات إذا كانت قيمة الحد صفرا." -#: erpnext/controllers/accounts_controller.py:2147 +#: erpnext/controllers/accounts_controller.py:2155 msgid "System will not check over billing since amount for Item {0} in {1} is zero" msgstr "" @@ -48580,16 +48700,16 @@ msgstr "" msgid "System will notify to increase or decrease quantity or amount " msgstr "سيُعلم النظام بزيادة أو تقليل الكمية أو الكمية" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267 msgid "TCS Amount" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:249 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125 msgid "TCS Rate %" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:253 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:267 msgid "TDS Amount" msgstr "" @@ -48598,15 +48718,15 @@ msgstr "" msgid "TDS Computation Summary" msgstr "ملخص حساب TDS" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1530 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1532 msgid "TDS Deducted" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:286 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:287 msgid "TDS Payable" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:235 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:249 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:125 msgid "TDS Rate %" msgstr "" @@ -48773,7 +48893,6 @@ 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:998 #: 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 @@ -48794,7 +48913,7 @@ msgstr "عنوان المستودع المستهدف" msgid "Target Warehouse Address Link" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:236 +#: erpnext/manufacturing/doctype/work_order/work_order.py:237 msgid "Target Warehouse Reservation Error" msgstr "" @@ -48802,20 +48921,20 @@ msgstr "" msgid "Target Warehouse for Finished Good must be same as Finished Good Warehouse {1} in Work Order {2} linked to the Subcontracting Inward Order." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:741 +#: erpnext/manufacturing/doctype/work_order/work_order.py:742 msgid "Target Warehouse is required before Submit" msgstr "" -#: erpnext/controllers/selling_controller.py:840 +#: erpnext/controllers/selling_controller.py:852 msgid "Target Warehouse is set for some items but the customer is not an internal customer." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:297 +#: erpnext/manufacturing/doctype/work_order/work_order.py:298 msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcontracting Inward Order Item." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:684 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:691 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:742 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:749 msgid "Target warehouse is mandatory for row {0}" msgstr "المستودع المستهدف إلزامي للصف {0}\\n
            \\nTarget warehouse is mandatory for row {0}" @@ -48905,6 +49024,8 @@ msgstr "ضريبة" msgid "Tax Account" msgstr "حساب الضرائب" +#. Label of the amount (Currency) field in DocType 'Item Wise Tax Detail' +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:137 msgid "Tax Amount" msgstr "" @@ -49061,12 +49182,14 @@ msgstr "" #. Label of the tax_rate (Float) field in DocType 'Account' #. Label of the rate (Float) field in DocType 'Advance Taxes and Charges' #. Label of the tax_rate (Float) field in DocType 'Item Tax Template Detail' +#. Label of the rate (Float) field in DocType 'Item Wise Tax Detail' #. Label of the rate (Float) field in DocType 'Purchase Taxes and Charges' #. Label of the rate (Float) field in DocType 'Sales Taxes and Charges' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:166 +#: erpnext/accounts/doctype/account/account_tree.js:174 #: erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json #: erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/doctype/pos_closing_entry/closing_voucher_details.html:66 #: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json #: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json @@ -49082,6 +49205,11 @@ msgstr "معدلات الضريبة" msgid "Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme" msgstr "" +#. Label of the tax_row (Data) field in DocType 'Item Wise Tax Detail' +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json +msgid "Tax Row" +msgstr "" + #. Name of a DocType #. Label of a Link in the Accounting Workspace #: erpnext/accounts/doctype/tax_rule/tax_rule.json @@ -49122,7 +49250,7 @@ msgstr "نوع الضريبة" msgid "Tax Withheld Vouchers" msgstr "" -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:347 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:361 msgid "Tax Withholding" msgstr "" @@ -49213,10 +49341,13 @@ msgstr "" msgid "Tax will be withheld only for amount exceeding the cumulative threshold" msgstr "" +#. Label of the taxable_amount (Currency) field in DocType 'Item Wise Tax +#. Detail' #. Label of the taxable_amount (Currency) field in DocType 'Tax Withheld #. Vouchers' +#: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json -#: erpnext/controllers/taxes_and_totals.py:1148 +#: erpnext/controllers/taxes_and_totals.py:1202 msgid "Taxable Amount" msgstr "المبلغ الخاضع للضريبة" @@ -49629,11 +49760,11 @@ msgstr "قالب الشروط والأحكام" #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:97 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:182 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68 -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:221 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:171 #: erpnext/accounts/report/gross_profit/gross_profit.py:425 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js:8 #: erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py:21 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:262 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:260 #: erpnext/accounts/report/sales_register/sales_register.py:209 #: erpnext/crm/doctype/lead/lead.json #: erpnext/crm/doctype/opportunity/opportunity.json @@ -49743,6 +49874,10 @@ msgstr "" msgid "The Campaign '{0}' already exists for the {1} '{2}'" msgstr "الحملة '{0}' موجودة بالفعل لـ {1} '{2}'" +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:74 +msgid "The Company {0} of Sales Forecast {1} does not match with the Company {2} of Master Production Schedule {3}." +msgstr "" + #: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:206 msgid "The Document Type {0} must have a Status field to configure Service Level Agreement" msgstr "" @@ -49771,7 +49906,7 @@ msgstr "قد يكون مصطلح الدفع في الصف {0} مكررا." msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2498 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -49783,11 +49918,11 @@ msgstr "" msgid "The Serial No at Row #{0}: {1} is not available in warehouse {2}." msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2285 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2314 msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1595 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1655 msgid "The Serial and Batch Bundle {0} is not valid for this transaction. The 'Type of Transaction' should be 'Outward' instead of 'Inward' in Serial and Batch Bundle {0}" msgstr "" @@ -49795,7 +49930,7 @@ msgstr "" msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing.

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

            عند إنشاء إدخال التصنيع ، يتم إجراء مسح تلقائي لعناصر المواد الخام استنادًا إلى قائمة مكونات الصنف الخاصة بصنف الإنتاج. إذا كنت تريد إعادة تسريح أصناف المواد الخام استنادًا إلى إدخال نقل المواد الذي تم إجراؤه مقابل طلب العمل هذا بدلاً من ذلك ، فيمكنك تعيينه ضمن هذا الحقل." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2091 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2151 msgid "The Work Order is mandatory for Disassembly Order" msgstr "" @@ -49813,6 +49948,10 @@ msgstr "" msgid "The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document." msgstr "يختلف مبلغ {0} المحدد في طلب الدفع هذا عن المبلغ المحسوب لجميع خطط الدفع: {1}. تأكد من صحة ذلك قبل إرسال المستند." +#: erpnext/controllers/stock_controller.py:1258 +msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." +msgstr "" + #: erpnext/accounts/doctype/dunning/dunning.py:87 msgid "The currency of invoice {} ({}) is different from the currency of this dunning ({})." msgstr "" @@ -49821,7 +49960,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:1131 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1116 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM." msgstr "" @@ -49846,7 +49985,7 @@ msgstr "لا يمكن ترك الحقل من المساهمين فارغا" msgid "The field To Shareholder cannot be blank" msgstr "لا يمكن ترك الحقل للمساهم فارغا" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:401 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:403 msgid "The field {0} in row {1} is not set" msgstr "" @@ -49870,7 +50009,7 @@ msgstr "" msgid "The following batches are expired, please restock them:
            {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:839 +#: erpnext/stock/doctype/item/item.py:820 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "توجد السمات المحذوفة التالية في المتغيرات ولكن ليس في القالب. يمكنك إما حذف المتغيرات أو الاحتفاظ بالسمة (السمات) في القالب." @@ -49891,7 +50030,7 @@ msgstr "تم إنشاء {0} التالية: {1}" msgid "The gross weight of the package. Usually net weight + packaging material weight. (for print)" msgstr "الوزن الكلي للحزمة. الوزن الصافي عادة + تغليف المواد الوزن. (للطباعة)" -#: erpnext/setup/doctype/holiday_list/holiday_list.py:117 +#: erpnext/setup/doctype/holiday_list/holiday_list.py:126 msgid "The holiday on {0} is not between From Date and To Date" msgstr "عطلة على {0} ليست بين من تاريخ وإلى تاريخ" @@ -49899,7 +50038,7 @@ msgstr "عطلة على {0} ليست بين من تاريخ وإلى تاريخ" msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:616 +#: erpnext/stock/doctype/item/item.py:597 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" @@ -49945,7 +50084,7 @@ msgstr "" msgid "The operation {0} can not be the sub operation" msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:108 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:107 msgid "The original invoice should be consolidated before or along with the return invoice." msgstr "" @@ -49997,7 +50136,7 @@ msgstr "يجب أن يكون حساب الجذر {0} مجموعة" msgid "The selected BOMs are not for the same item" msgstr "قواائم المواد المحددة ليست لنفس البند" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:494 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:499 msgid "The selected change account {} doesn't belongs to Company {}." msgstr "حساب التغيير المحدد {} لا ينتمي إلى الشركة {}." @@ -50014,7 +50153,7 @@ msgstr "البائع والمشتري لا يمكن أن يكون هو نفسه" msgid "The serial and batch bundle {0} not linked to {1} {2}" msgstr "" -#: erpnext/stock/doctype/batch/batch.py:426 +#: erpnext/stock/doctype/batch/batch.py:427 msgid "The serial no {0} does not belong to item {1}" msgstr "الرقم التسلسلي {0} لا ينتمي إلى العنصر {1}" @@ -50053,11 +50192,11 @@ msgstr "" msgid "The task has been enqueued as a background job." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1007 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "وقد تم إرساء المهمة كعمل خلفية. في حالة وجود أي مشكلة في المعالجة في الخلفية ، سيقوم النظام بإضافة تعليق حول الخطأ في تسوية المخزون هذا والعودة إلى مرحلة المسودة" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1018 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1019 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -50069,7 +50208,7 @@ msgstr "" msgid "The total Issue / Transfer quantity {0} in Material Request {1} cannot be greater than requested quantity {2} for Item {3}" msgstr "" -#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:153 +#: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:154 msgid "The uploaded file does not appear to be in valid MT940 format." msgstr "" @@ -50101,15 +50240,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:1159 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1144 msgid "The warehouse where you store finished Items before they are shipped." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1152 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1137 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:1164 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1149 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 "" @@ -50117,7 +50256,7 @@ msgstr "" msgid "The {0} ({1}) must be equal to {2} ({3})" msgstr "يجب أن يكون {0} ({1}) مساويًا لـ {2} ({3})" -#: erpnext/public/js/controllers/transaction.js:3258 +#: erpnext/public/js/controllers/transaction.js:3275 msgid "The {0} contains Unit Price Items." msgstr "" @@ -50125,7 +50264,7 @@ msgstr "" msgid "The {0} {1} created successfully" msgstr "" -#: erpnext/controllers/sales_and_purchase_return.py:43 +#: erpnext/controllers/sales_and_purchase_return.py:42 msgid "The {0} {1} does not match with the {0} {2} in the {3} {4}" msgstr "" @@ -50189,11 +50328,11 @@ msgstr "" msgid "There is already an active Subcontracting BOM {0} for the Finished Good {1}." msgstr "" -#: erpnext/stock/doctype/batch/batch.py:434 +#: erpnext/stock/doctype/batch/batch.py:435 msgid "There is no batch found against the {0}: {1}" msgstr "لم يتم العثور على دفعة بالمقابلة مع {0}: {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1532 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1592 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -50214,7 +50353,7 @@ msgstr "" msgid "There was an issue connecting to Plaid's authentication server. Check browser console for more information" msgstr "" -#: erpnext/accounts/utils.py:1095 +#: erpnext/accounts/utils.py:1099 msgid "There were issues unlinking payment entry {0}." msgstr "" @@ -50236,22 +50375,14 @@ msgstr "هذا العنصر هو متغير {0} (قالب)." msgid "This Month's Summary" msgstr "ملخص هذا الشهر" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:977 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:976 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2132 +#: erpnext/selling/doctype/sales_order/sales_order.py:2005 msgid "This Sales Order has been fully subcontracted." msgstr "" -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31 -msgid "This Warehouse will be auto-updated in the Target Warehouse field of Work Order." -msgstr "سيتم تحديث هذا المستودع تلقائيًا في حقل "المستودع الهدف" الخاص بأمر العمل." - -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24 -msgid "This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders." -msgstr "سيتم تحديث هذا المستودع تلقائيًا في حقل "مستودع العمل قيد التقدم" الخاص بأوامر العمل." - #: erpnext/setup/doctype/email_digest/email_digest.py:184 msgid "This Week's Summary" msgstr "ملخص هذا الأسبوع" @@ -50272,11 +50403,11 @@ msgstr "" msgid "This covers all scorecards tied to this Setup" msgstr "وهذا يغطي جميع بطاقات الأداء مرتبطة بهذا الإعداد" -#: erpnext/controllers/status_updater.py:447 +#: erpnext/controllers/status_updater.py:448 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?" msgstr "هذه الوثيقة هي على حد كتبها {0} {1} لمادة {4}. وجعل لكم آخر {3} ضد نفسه {2}؟" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:490 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:491 msgid "This field is used to set the 'Customer'." msgstr "" @@ -50286,7 +50417,7 @@ msgstr "" msgid "This filter will be applied to Journal Entry." msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:820 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:825 msgid "This invoice has already been paid." msgstr "" @@ -50363,11 +50494,11 @@ msgstr "هذا يعتمد على المعاملات ضد هذا الشخص ال msgid "This is considered dangerous from accounting point of view." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:536 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:538 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:1145 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1130 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 "" @@ -50379,7 +50510,7 @@ msgstr "" msgid "This item filter has already been applied for the {0}" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.js:503 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:504 msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields." msgstr "" @@ -50395,7 +50526,7 @@ msgstr "" msgid "This schedule was created when Asset {0} was repaired through Asset Repair {1}." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1476 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1478 msgid "This schedule was created when Asset {0} was restored due to Sales Invoice {1} cancellation." msgstr "" @@ -50407,7 +50538,7 @@ msgstr "" msgid "This schedule was created when Asset {0} was restored." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1472 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1474 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}." msgstr "" @@ -50419,7 +50550,7 @@ msgstr "" msgid "This schedule was created when Asset {0} was {1} into new Asset {2}." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1448 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1450 msgid "This schedule was created when Asset {0} was {1} through Sales Invoice {2}." msgstr "" @@ -50437,7 +50568,7 @@ msgstr "" msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print." msgstr "يسمح هذا القسم للمستخدم بتعيين النص الأساسي ونص الإغلاق لحرف المطالبة لنوع المطالبة بناءً على اللغة ، والتي يمكن استخدامها في الطباعة." -#: erpnext/stock/doctype/delivery_note/delivery_note.js:496 +#: erpnext/stock/doctype/delivery_note/delivery_note.js:497 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc." msgstr "" @@ -50463,7 +50594,7 @@ msgstr "سيتم إلحاق هذا إلى بند رمز للمتغير. على msgid "This will restrict user access to other employee records" msgstr "سيؤدي هذا إلى تقييد وصول المستخدم لسجلات الموظفين الأخرى" -#: erpnext/controllers/selling_controller.py:841 +#: erpnext/controllers/selling_controller.py:853 msgid "This {} will be treated as material transfer." msgstr "" @@ -50592,7 +50723,7 @@ msgstr "الموقت تجاوزت الساعات المعطاة." #. Name of a DocType #. Label of a Link in the Projects Workspace #. Label of a shortcut in the Projects Workspace -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1047 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1048 #: erpnext/projects/doctype/timesheet/timesheet.json #: erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py:26 #: erpnext/projects/report/timesheet_billing_summary/timesheet_billing_summary.py:59 @@ -50621,7 +50752,7 @@ msgstr "تفاصيل الجدول الزمني" msgid "Timesheet for tasks." msgstr "الجدول الزمني للمهام." -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:919 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:921 msgid "Timesheet {0} is already completed or cancelled" msgstr "الجدول الزمني {0} بالفعل منتهي أو ملغى" @@ -50668,8 +50799,8 @@ msgstr "على فاتورة" msgid "To Currency" msgstr "إلى العملات" -#: erpnext/controllers/accounts_controller.py:555 -#: erpnext/setup/doctype/holiday_list/holiday_list.py:112 +#: erpnext/controllers/accounts_controller.py:560 +#: erpnext/setup/doctype/holiday_list/holiday_list.py:121 msgid "To Date cannot be before From Date" msgstr "(الى تاريخ) لا يمكن ان يكون قبل (من تاريخ)" @@ -50683,7 +50814,7 @@ msgstr "لا يمكن أن يكون "إلى" قبل "من تار msgid "To Date cannot be less than From Date" msgstr "لا يمكن أن يكون تاريخ التاريخ أقل من تاريخ" -#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:29 +#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:30 msgid "To Date is mandatory" msgstr "" @@ -50740,6 +50871,8 @@ msgstr "" msgid "To Employee" msgstr "إلى الموظف" +#. Label of the to_fiscal_year (Link) field in DocType 'Budget' +#: erpnext/accounts/doctype/budget/budget.json #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:51 msgid "To Fiscal Year" msgstr "إلى السنة المالية" @@ -50881,7 +51014,7 @@ msgstr "لمستودع" msgid "To Warehouse (Optional)" msgstr "إلى مستودع (اختياري)" -#: erpnext/manufacturing/doctype/bom/bom.js:925 +#: erpnext/manufacturing/doctype/bom/bom.js:933 msgid "To add Operations tick the 'With Operations' checkbox." msgstr "" @@ -50889,11 +51022,11 @@ msgstr "" msgid "To add subcontracted Item's raw materials if include exploded items is disabled." msgstr "" -#: erpnext/controllers/status_updater.py:442 +#: erpnext/controllers/status_updater.py:443 msgid "To allow over billing, update \"Over Billing Allowance\" in Accounts Settings or the Item." msgstr "للسماح بزيادة الفواتير ، حدّث "Over Billing Allowance" في إعدادات الحسابات أو العنصر." -#: erpnext/controllers/status_updater.py:438 +#: erpnext/controllers/status_updater.py:439 msgid "To allow over receipt / delivery, update \"Over Receipt/Delivery Allowance\" in Stock Settings or the Item." msgstr "للسماح بوصول الاستلام / التسليم ، قم بتحديث "الإفراط في الاستلام / بدل التسليم" في إعدادات المخزون أو العنصر." @@ -50909,11 +51042,11 @@ msgstr "" msgid "To be Delivered to Customer" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:611 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:613 msgid "To cancel a {} you need to cancel the POS Closing Entry {}." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:624 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:626 msgid "To cancel this Sales Invoice you need to cancel the POS Closing Entry {}." msgstr "" @@ -50935,12 +51068,12 @@ 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:2308 -#: erpnext/controllers/accounts_controller.py:3156 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2309 +#: erpnext/controllers/accounts_controller.py:3164 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف" -#: erpnext/stock/doctype/item/item.py:638 +#: erpnext/stock/doctype/item/item.py:619 msgid "To merge, following properties must be same for both items" msgstr "لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين" @@ -50956,11 +51089,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:626 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:647 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}" msgstr "" @@ -51010,6 +51143,23 @@ msgstr "" msgid "Too many columns. Export the report and print it using a spreadsheet application." 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:641 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:717 +#: 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 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:451 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:69 +#: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:123 +#: erpnext/manufacturing/workspace/manufacturing/manufacturing.json +#: erpnext/setup/doctype/email_digest/email_digest.json +#: erpnext/stock/workspace/stock/stock.json +msgid "Tools" +msgstr "" + #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json msgid "Torr" @@ -51114,7 +51264,7 @@ msgstr "" #. Label of the total_amount (Currency) field in DocType 'Stock Entry' #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json #: erpnext/accounts/doctype/journal_entry/journal_entry.json -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:241 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:255 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:131 #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json @@ -51309,6 +51459,10 @@ msgstr "المصاريف الكلية" msgid "Total Expense This Year" msgstr "إجمالي النفقات هذا العام" +#: erpnext/accounts/doctype/budget/budget.py:544 +msgid "Total Expenses booked through" +msgstr "" + #. Label of the total_experience (Data) field in DocType 'Employee External #. Work History' #: erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json @@ -51464,7 +51618,7 @@ msgstr "اجمالي أمر البيع التقديري" msgid "Total Order Value" msgstr "مجموع قيمة الطلب" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:694 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:620 msgid "Total Other Charges" msgstr "" @@ -51505,7 +51659,7 @@ msgstr "إجمالي المبلغ المستحق" msgid "Total Paid Amount" msgstr "إجمالي المبلغ المدفوع" -#: erpnext/controllers/accounts_controller.py:2704 +#: erpnext/controllers/accounts_controller.py:2712 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total" msgstr "يجب أن يكون إجمالي مبلغ الدفع في جدول الدفع مساويا للمجموع الكبير / المستدير" @@ -51517,7 +51671,7 @@ msgstr "لا يمكن أن يكون إجمالي مبلغ طلب الدفع أك msgid "Total Payments" msgstr "مجموع المدفوعات" -#: erpnext/selling/doctype/sales_order/sales_order.py:713 +#: erpnext/selling/doctype/sales_order/sales_order.py:712 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -51640,7 +51794,7 @@ msgstr "إجمالي المستهدف" msgid "Total Tasks" msgstr "إجمالي المهام" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:687 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:613 #: erpnext/accounts/report/purchase_register/purchase_register.py:263 msgid "Total Tax" msgstr "مجموع الضرائب" @@ -51797,20 +51951,28 @@ msgstr "" msgid "Total Workstation Time (In Hours)" msgstr "" -#: erpnext/controllers/selling_controller.py:234 +#: erpnext/controllers/selling_controller.py:243 msgid "Total allocated percentage for sales team should be 100" msgstr "مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100" -#: erpnext/selling/doctype/customer/customer.py:161 +#: erpnext/selling/doctype/customer/customer.py:162 msgid "Total contribution percentage should be equal to 100" msgstr "يجب أن تكون نسبة المساهمة الإجمالية مساوية 100" +#: erpnext/accounts/doctype/budget/budget.py:331 +msgid "Total distributed amount {0} must be equal to Budget Amount {1}" +msgstr "" + +#: erpnext/accounts/doctype/budget/budget.py:338 +msgid "Total distribution percent must equal 100 (currently {0})" +msgstr "" + #: erpnext/projects/doctype/project/project_dashboard.html:2 msgid "Total hours: {0}" msgstr "" -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:524 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:595 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:529 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:597 msgid "Total payments amount can't be greater than {}" msgstr "لا يمكن أن يكون إجمالي المدفوعات أكبر من {}" @@ -51989,7 +52151,7 @@ msgstr "" #. Label of the transaction_type (Data) field in DocType 'Bank Transaction' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/report/calculated_discount_mismatch/calculated_discount_mismatch.py:38 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:264 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:278 msgid "Transaction Type" msgstr "نوع المعاملة" @@ -52030,7 +52192,7 @@ msgstr "المعاملات السنوية التاريخ" msgid "Transactions against the Company already exist! Chart of Accounts can only be imported for a Company with no transactions." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1186 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1188 msgid "Transactions using Sales Invoice in POS are disabled." msgstr "" @@ -52041,7 +52203,7 @@ msgstr "" #. Option for the 'Asset Status' (Select) field in DocType 'Serial No' #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/assets/doctype/asset_movement/asset_movement.json -#: erpnext/buying/doctype/purchase_order/purchase_order.js:434 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:435 #: erpnext/stock/doctype/item_reorder/item_reorder.json #: erpnext/stock/doctype/serial_no/serial_no.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:538 @@ -52202,10 +52364,8 @@ msgid "Tree of Procedures" msgstr "شجرة الإجراءات" #. Name of a report -#. Label of a shortcut in the Accounting Workspace #. Label of a Link in the Financial Reports Workspace #: erpnext/accounts/report/trial_balance/trial_balance.json -#: erpnext/accounts/workspace/accounting/accounting.json #: erpnext/accounts/workspace/financial_reports/financial_reports.json msgid "Trial Balance" msgstr "ميزان المراجعة" @@ -52406,7 +52566,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json #: erpnext/manufacturing/doctype/workstation/workstation.js:480 -#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:58 +#: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:70 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:110 #: erpnext/public/js/stock_analytics.js:94 erpnext/public/js/utils.js:742 #: erpnext/quality_management/doctype/quality_goal_objective/quality_goal_objective.json @@ -52414,7 +52574,7 @@ msgstr "" #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json #: erpnext/selling/doctype/quotation_item/quotation_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1623 +#: erpnext/selling/doctype/sales_order/sales_order.js:1645 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:43 #: erpnext/selling/report/sales_analytics/sales_analytics.py:138 @@ -52435,7 +52595,7 @@ msgstr "" #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:94 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:176 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:178 #: erpnext/stock/report/stock_analytics/stock_analytics.py:45 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:134 #: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 @@ -52489,7 +52649,7 @@ msgstr "تفاصيل تحويل وحدة القياس" msgid "UOM Conversion Factor" msgstr "عامل تحويل وحدة القياس" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1424 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1431 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}" msgstr "معامل تحويل UOM ({0} -> {1}) غير موجود للعنصر: {2}" @@ -52502,7 +52662,7 @@ msgstr "معامل تحويل وحدة القياس مطلوب في الصف: {0 msgid "UOM Name" msgstr "اسم وحدة القايس" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3507 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3597 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -52557,7 +52717,7 @@ msgstr "تعذر العثور على سعر الصرف من {0} إلى {1} لت msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100" msgstr "تعذر العثور على النتيجة بدءا من {0}. يجب أن يكون لديك درجات دائمة تغطي 0 إلى 100" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1014 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1015 msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" @@ -52578,11 +52738,11 @@ msgstr "المبلغ غير المخصصة" msgid "Unassigned Qty" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:360 +#: erpnext/accounts/doctype/budget/budget.py:617 msgid "Unbilled Orders" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:100 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:101 msgid "Unblock Invoice" msgstr "الافراج عن الفاتورة" @@ -52628,7 +52788,7 @@ msgstr "لم تتحقق" msgid "Unit" msgstr "" -#: erpnext/controllers/accounts_controller.py:3930 +#: erpnext/controllers/accounts_controller.py:3938 msgid "Unit Price" msgstr "" @@ -52685,7 +52845,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:272 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:274 #: erpnext/accounts/doctype/subscription/subscription.json #: erpnext/accounts/doctype/subscription/subscription_list.js:12 msgid "Unpaid" @@ -52814,11 +52974,11 @@ msgid "Unscheduled" msgstr "غير المجدولة" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:178 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:304 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:305 msgid "Unsecured Loans" msgstr "القروض غير المضمونة" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1711 msgid "Unset Matched Payment Request" msgstr "" @@ -52895,7 +53055,7 @@ msgstr "تحديث السيارات تكرار المرجع" #. Label of the update_bom_costs_automatically (Check) field in DocType #. 'Manufacturing Settings' -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:35 +#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:23 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json msgid "Update BOM Cost Automatically" msgstr "تحديث بوم التكلفة تلقائيا" @@ -52975,10 +53135,10 @@ msgstr "تحديث المخزون الحالي" msgid "Update Existing Price List Rate" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:365 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:366 #: erpnext/public/js/utils.js:842 #: erpnext/selling/doctype/sales_order/sales_order.js:75 -#: erpnext/selling/doctype/sales_order/sales_order.js:936 +#: erpnext/selling/doctype/sales_order/sales_order.js:940 msgid "Update Items" msgstr "تحديث العناصر" @@ -52988,7 +53148,7 @@ msgstr "تحديث العناصر" #. Invoice' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/controllers/accounts_controller.py:190 +#: erpnext/controllers/accounts_controller.py:195 msgid "Update Outstanding for Self" msgstr "" @@ -53007,7 +53167,7 @@ msgstr "تحديث تنسيق الطباعة" msgid "Update Rate and Availability" msgstr "معدل التحديث والتوفر" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:629 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:630 msgid "Update Rate as per Last Purchase" msgstr "" @@ -53073,15 +53233,15 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1382 +#: erpnext/stock/doctype/item/item.py:1363 msgid "Updating Variants..." msgstr "جارٍ تحديث المتغيرات ..." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1107 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1092 msgid "Updating Work Order status" msgstr "" -#: erpnext/public/js/print.js:129 +#: erpnext/public/js/print.js:139 msgid "Updating details." msgstr "" @@ -53263,7 +53423,7 @@ msgstr "" msgid "Use Transaction Date Exchange Rate" msgstr "" -#: erpnext/projects/doctype/project/project.py:561 +#: erpnext/projects/doctype/project/project.py:560 msgid "Use a name that is different from previous project name" msgstr "استخدم اسمًا مختلفًا عن اسم المشروع السابق" @@ -53299,7 +53459,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:616 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:620 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json msgid "User Remark" @@ -53310,7 +53470,7 @@ msgstr "ملاحظة المستخدم" msgid "User Resolution Time" msgstr "وقت قرار المستخدم" -#: erpnext/accounts/doctype/pricing_rule/utils.py:591 +#: erpnext/accounts/doctype/pricing_rule/utils.py:594 msgid "User has not applied rule on the invoice {0}" msgstr "لم يطبق المستخدم قاعدة على الفاتورة {0}" @@ -53474,11 +53634,11 @@ msgstr "صالحة للبلدان" msgid "Valid from and valid upto fields are mandatory for the cumulative" msgstr "صالحة من وحقول تصل صالحة إلزامية للتراكمية" -#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:167 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:169 msgid "Valid till Date cannot be before Transaction Date" msgstr "صالح حتى التاريخ لا يمكن أن يكون قبل تاريخ المعاملة" -#: erpnext/selling/doctype/quotation/quotation.py:156 +#: erpnext/selling/doctype/quotation/quotation.py:158 msgid "Valid till date cannot be before transaction date" msgstr "صالحة حتى تاريخ لا يمكن أن يكون قبل تاريخ المعاملة" @@ -53496,6 +53656,12 @@ msgstr "التحقق من صحة القاعدة المطبقة" msgid "Validate Components and Quantities Per BOM" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate Consumed Qty (as per BOM)" +msgstr "" + #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -53541,7 +53707,7 @@ msgstr "الصلاحية والاستخدام" msgid "Validity in Days" msgstr "الصلاحية في أيام" -#: erpnext/selling/doctype/quotation/quotation.py:363 +#: erpnext/selling/doctype/quotation/quotation.py:365 msgid "Validity period of this quotation has ended." msgstr "انتهت فترة صلاحية هذا الاقتباس." @@ -53639,7 +53805,7 @@ msgstr "معدل التقييم مطلوب للبند {0} في الصف {1}" msgid "Valuation and Total" msgstr "التقييم والمجموع" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -53652,8 +53818,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:2332 -#: erpnext/controllers/accounts_controller.py:3180 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2333 +#: erpnext/controllers/accounts_controller.py:3188 msgid "Valuation type charges can not be marked as Inclusive" msgstr "لا يمكن تحديد رسوم نوع التقييم على أنها شاملة" @@ -53665,7 +53831,7 @@ msgstr "لا يمكن وضع علامة على رسوم التقييم على ا msgid "Value (G - D)" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:219 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:221 msgid "Value ({0})" msgstr "" @@ -53781,7 +53947,7 @@ msgstr "التباين ({})" msgid "Variant" msgstr "مختلف" -#: erpnext/stock/doctype/item/item.py:854 +#: erpnext/stock/doctype/item/item.py:835 msgid "Variant Attribute Error" msgstr "خطأ في سمة المتغير" @@ -53800,7 +53966,7 @@ msgstr "المتغير BOM" msgid "Variant Based On" msgstr "البديل القائم على" -#: erpnext/stock/doctype/item/item.py:882 +#: erpnext/stock/doctype/item/item.py:863 msgid "Variant Based On cannot be changed" msgstr "لا يمكن تغيير المتغير بناءً على" @@ -53818,7 +53984,7 @@ msgstr "الحقل البديل" msgid "Variant Item" msgstr "عنصر متغير" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:833 msgid "Variant Items" msgstr "العناصر المتغيرة" @@ -53965,7 +54131,7 @@ msgstr "" msgid "View Leads" msgstr "مشاهدة العملاء المحتملون" -#: erpnext/accounts/doctype/account/account_tree.js:270 +#: erpnext/accounts/doctype/account/account_tree.js:278 #: erpnext/stock/doctype/batch/batch.js:18 msgid "View Ledger" msgstr "عرض القيود" @@ -53974,7 +54140,7 @@ msgstr "عرض القيود" msgid "View Ledgers" msgstr "" -#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:55 +#: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.js:65 msgid "View MRP" msgstr "" @@ -54105,7 +54271,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:209 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:735 +#: erpnext/accounts/report/general_ledger/general_ledger.py:742 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:65 @@ -54127,7 +54293,7 @@ msgstr "" #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js:51 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:112 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:33 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:117 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:120 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:165 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:74 msgid "Voucher No" @@ -54145,7 +54311,7 @@ msgstr "" #. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:729 +#: erpnext/accounts/report/general_ledger/general_ledger.py:736 msgid "Voucher Subtype" msgstr "" @@ -54178,7 +54344,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1194 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:200 -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:734 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -54202,7 +54368,7 @@ msgstr "" #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:107 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:482 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.py:27 -#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:115 +#: erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:118 #: erpnext/stock/report/stock_ledger/stock_ledger.py:321 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:159 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:68 @@ -54356,7 +54522,7 @@ msgstr "" msgid "Warehouse and Reference" msgstr "مستودع والمراجع" -#: erpnext/stock/doctype/warehouse/warehouse.py:98 +#: erpnext/stock/doctype/warehouse/warehouse.py:100 msgid "Warehouse can not be deleted as stock ledger entry exists for this warehouse." msgstr "لا يمكن حذف مستودع كما دخول دفتر الأستاذ موجود لهذا المستودع.\\n
            \\nWarehouse can not be deleted as stock ledger entry exists for this warehouse." @@ -54364,16 +54530,16 @@ msgstr "لا يمكن حذف مستودع كما دخول دفتر الأستا msgid "Warehouse cannot be changed for Serial No." msgstr "المستودع لا يمكن ان يكون متغير لرقم تسلسلى.\\n
            \\nWarehouse cannot be changed for Serial No." -#: erpnext/controllers/sales_and_purchase_return.py:161 +#: erpnext/controllers/sales_and_purchase_return.py:160 msgid "Warehouse is mandatory" msgstr "المستودع إلزامي" -#: erpnext/stock/doctype/warehouse/warehouse.py:253 +#: erpnext/stock/doctype/warehouse/warehouse.py:259 msgid "Warehouse not found against the account {0}" msgstr "لم يتم العثور على المستودع مقابل الحساب {0}" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1243 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:428 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1245 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:430 msgid "Warehouse required for stock Item {0}" msgstr "مستودع الأسهم المطلوبة لل تفاصيل {0}" @@ -54387,7 +54553,7 @@ msgstr "مستودع الحكيم البند الرصيد العمر والقي msgid "Warehouse wise Stock Value" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:92 +#: erpnext/stock/doctype/warehouse/warehouse.py:94 msgid "Warehouse {0} can not be deleted as quantity exists for Item {1}" msgstr "مستودع {0} لا يمكن حذف كما توجد كمية القطعة ل {1}" @@ -54395,19 +54561,19 @@ msgstr "مستودع {0} لا يمكن حذف كما توجد كمية القط msgid "Warehouse {0} does not belong to Company {1}." msgstr "" -#: erpnext/stock/utils.py:433 +#: erpnext/stock/utils.py:437 msgid "Warehouse {0} does not belong to company {1}" msgstr "مستودع {0} لا تنتمي إلى شركة {1}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:233 +#: erpnext/manufacturing/doctype/work_order/work_order.py:234 msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:769 +#: erpnext/controllers/stock_controller.py:771 msgid "Warehouse {0} is not linked to any account, please mention the account in the warehouse record or set default inventory account in company {1}." msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:142 +#: erpnext/stock/doctype/warehouse/warehouse.py:144 msgid "Warehouse's Stock Value has already been booked in the following accounts:" msgstr "" @@ -54424,15 +54590,15 @@ msgstr "المستودع: {0} لا ينتمي إلى {1}" msgid "Warehouses" msgstr "المستودعات" -#: erpnext/stock/doctype/warehouse/warehouse.py:171 +#: erpnext/stock/doctype/warehouse/warehouse.py:173 msgid "Warehouses with child nodes cannot be converted to ledger" msgstr "المستودعات مع العقد التابعة لا يمكن أن يتم تحويلها إلى دفتر الاستاذ" -#: erpnext/stock/doctype/warehouse/warehouse.py:181 +#: erpnext/stock/doctype/warehouse/warehouse.py:183 msgid "Warehouses with existing transaction can not be converted to group." msgstr "لا يمكن تحويل المستودعات مع المعاملات الحالية إلى مجموعة.\\n
            \\nWarehouses with existing transaction can not be converted to group." -#: erpnext/stock/doctype/warehouse/warehouse.py:173 +#: erpnext/stock/doctype/warehouse/warehouse.py:175 msgid "Warehouses with existing transaction can not be converted to ledger." msgstr "المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى دفتر الأستاذ." @@ -54520,15 +54686,15 @@ msgstr "" 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:520 +#: erpnext/stock/doctype/material_request/material_request.js:524 msgid "Warning: Material Requested Qty is less than Minimum Order Qty" msgstr "تحذير : كمية المواد المطلوبة هي أقل من الحد الأدنى للطلب الكمية" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1431 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1432 msgid "Warning: Quantity exceeds maximum producible quantity based on quantity of raw materials received through the Subcontracting Inward Order {0}." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:333 +#: erpnext/selling/doctype/sales_order/sales_order.py:335 msgid "Warning: Sales Order {0} already exists against Customer's Purchase Order {1}" msgstr "تحذير: أمر البيع {0} موجود مسبقاً لأمر الشراء الخاص بالعميل {1}\\n
            \\nWarning: Sales Order {0} already exists against Customer's Purchase Order {1}" @@ -54848,15 +55014,11 @@ msgstr "العمل المنجز" #: erpnext/assets/doctype/asset/asset_list.js:12 #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json -#: erpnext/setup/doctype/company/company.py:340 +#: erpnext/setup/doctype/company/company.py:371 #: erpnext/support/doctype/warranty_claim/warranty_claim.json msgid "Work In Progress" msgstr "التقدم في العمل" -#: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:23 -msgid "Work In Progress Warehouse" -msgstr "مستودع قيد الإنجاز" - #. Option for the 'Transfer Material Against' (Select) field in DocType 'BOM' #. Label of the work_order (Link) field in DocType 'Job Card' #. Name of a DocType @@ -54886,7 +55048,7 @@ msgstr "مستودع قيد الإنجاز" #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:29 #: 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:1046 +#: erpnext/selling/doctype/sales_order/sales_order.js:1050 #: erpnext/stock/doctype/material_request/material_request.js:201 #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/stock/doctype/material_request/material_request.py:891 @@ -54953,16 +55115,16 @@ msgstr "ملخص أمر العمل" msgid "Work Order cannot be created for following reason:
            {0}" msgstr "لا يمكن إنشاء أمر العمل للسبب التالي:
            {0}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1375 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1376 msgid "Work Order cannot be raised against a Item Template" msgstr "لا يمكن رفع أمر العمل مقابل قالب العنصر" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2345 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2425 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2347 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2427 msgid "Work Order has been {0}" msgstr "تم عمل الطلب {0}" -#: erpnext/selling/doctype/sales_order/sales_order.js:1221 +#: erpnext/selling/doctype/sales_order/sales_order.js:1225 msgid "Work Order not created" msgstr "أمر العمل لم يتم إنشاؤه" @@ -54970,7 +55132,7 @@ msgstr "أمر العمل لم يتم إنشاؤه" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:745 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:803 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "أمر العمل {0}: لم يتم العثور على بطاقة المهمة للعملية {1}" @@ -54979,7 +55141,7 @@ msgstr "أمر العمل {0}: لم يتم العثور على بطاقة الم msgid "Work Orders" msgstr "طلبات العمل" -#: erpnext/selling/doctype/sales_order/sales_order.js:1306 +#: erpnext/selling/doctype/sales_order/sales_order.js:1310 msgid "Work Orders Created: {0}" msgstr "أوامر العمل التي تم إنشاؤها: {0}" @@ -55000,7 +55162,7 @@ msgstr "التقدم في العمل" msgid "Work-in-Progress Warehouse" msgstr "مستودع العمل قيد التنفيذ" -#: erpnext/manufacturing/doctype/work_order/work_order.py:739 +#: erpnext/manufacturing/doctype/work_order/work_order.py:740 msgid "Work-in-Progress Warehouse is required before Submit" msgstr "مستودع أعمال جارية مطلوب قبل التسجيل\\n
            \\nWork-in-Progress Warehouse is required before Submit" @@ -55045,7 +55207,7 @@ msgstr "ساعات العمل" #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:319 +#: erpnext/manufacturing/doctype/work_order/work_order.js:320 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.json #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:35 @@ -55137,7 +55299,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/setup/doctype/company/company.py:617 +#: erpnext/setup/doctype/company/company.py:648 msgid "Write Off" msgstr "لا تصلح" @@ -55240,7 +55402,7 @@ msgstr "القيمة المكتوبة" msgid "Wrong Company" msgstr "" -#: erpnext/setup/doctype/company/company.js:226 +#: erpnext/setup/doctype/company/company.js:233 msgid "Wrong Password" msgstr "كلمة مرور خاطئة\\n
            \\nWrong Password" @@ -55287,11 +55449,11 @@ msgstr "تاريخ البدء أو تاريخ الانتهاء العام يتد msgid "You are importing data for the code list:" msgstr "" -#: erpnext/controllers/accounts_controller.py:3773 +#: erpnext/controllers/accounts_controller.py:3781 msgid "You are not allowed to update as per the conditions set in {} Workflow." msgstr "غير مسموح لك بالتحديث وفقًا للشروط المحددة في {} سير العمل." -#: erpnext/accounts/general_ledger.py:786 +#: erpnext/accounts/general_ledger.py:788 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}" @@ -55307,7 +55469,7 @@ msgstr ".أنت غير مخول لتغيير القيم المجمدة" msgid "You are picking more than required quantity for the item {0}. Check if there is any other pick list created for the sales order {1}." msgstr "" -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:112 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:111 msgid "You can add the original invoice {} manually to proceed." msgstr "" @@ -55319,7 +55481,7 @@ msgstr "يمكنك أيضا نسخ - لصق هذا الرابط في متصفح msgid "You can also set default CWIP account in Company {}" msgstr "يمكنك أيضًا تعيين حساب CWIP الافتراضي في الشركة {}" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1041 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1043 msgid "You can change the parent account to a Balance Sheet account or select a different account." msgstr "يمكنك تغيير الحساب الرئيسي إلى حساب الميزانية العمومية أو تحديد حساب مختلف." @@ -55332,7 +55494,7 @@ msgid "You can only have Plans with the same billing cycle in a Subscription" msgstr "يمكنك فقط الحصول على خطط مع دورة الفواتير نفسها في الاشتراك" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:423 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:909 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:910 msgid "You can only redeem max {0} points in this order." msgstr "لا يمكنك استرداد سوى {0} نقاط كحد أقصى بهذا الترتيب." @@ -55360,7 +55522,7 @@ msgstr "" msgid "You can't redeem Loyalty Points having more value than the Total Amount." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:681 +#: erpnext/manufacturing/doctype/bom/bom.js:689 msgid "You cannot change the rate if BOM is mentioned against any Item." msgstr "" @@ -55372,7 +55534,7 @@ msgstr "" msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}" msgstr "لا يمكنك إنشاء أو إلغاء أي قيود محاسبية في فترة المحاسبة المغلقة {0}" -#: erpnext/accounts/general_ledger.py:806 +#: erpnext/accounts/general_ledger.py:808 msgid "You cannot create/amend any accounting entries till this date." msgstr "" @@ -55396,7 +55558,7 @@ msgstr "" msgid "You cannot redeem more than {0}." msgstr "لا يمكنك استرداد أكثر من {0}." -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:171 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:180 msgid "You cannot repost item valuation before {}" msgstr "" @@ -55416,7 +55578,7 @@ msgstr "لا يمكنك تقديم الطلب بدون دفع." msgid "You cannot {0} this document because another Period Closing Entry {1} exists after {2}" msgstr "" -#: erpnext/controllers/accounts_controller.py:3749 +#: erpnext/controllers/accounts_controller.py:3757 msgid "You do not have permissions to {} items in a {}." msgstr "ليس لديك أذونات لـ {} من العناصر في {}." @@ -55452,7 +55614,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: erpnext/stock/doctype/item/item.py:1058 +#: erpnext/stock/doctype/item/item.py:1039 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "يجب عليك تمكين الطلب التلقائي في إعدادات الأسهم للحفاظ على مستويات إعادة الطلب." @@ -55464,11 +55626,11 @@ msgstr "" msgid "You must select a customer before adding an item." msgstr "يجب عليك تحديد عميل قبل إضافة عنصر." -#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:268 +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:273 msgid "You need to cancel POS Closing Entry {} to be able to cancel this document." msgstr "" -#: erpnext/controllers/accounts_controller.py:3131 +#: erpnext/controllers/accounts_controller.py:3139 msgid "You selected the account group {1} as {2} Account in row {0}. Please select a single account." msgstr "" @@ -55519,7 +55681,7 @@ msgstr "" msgid "Zero Rated" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:461 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:519 msgid "Zero quantity" msgstr "" @@ -55532,7 +55694,7 @@ msgstr "ملف مضغوط" msgid "[Important] [ERPNext] Auto Reorder Errors" msgstr "[هام] [ERPNext] إعادة ترتيب الأخطاء تلقائيًا" -#: erpnext/controllers/status_updater.py:285 +#: erpnext/controllers/status_updater.py:286 msgid "`Allow Negative rates for Items`" msgstr "" @@ -55552,7 +55714,7 @@ msgstr "" msgid "as Title" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:949 +#: erpnext/manufacturing/doctype/bom/bom.js:957 msgid "as a percentage of finished item quantity" msgstr "" @@ -55568,12 +55730,12 @@ msgstr "مرتكز على" msgid "by {}" msgstr "" -#: erpnext/public/js/utils/sales_common.js:314 +#: erpnext/public/js/utils/sales_common.js:336 msgid "cannot be greater than 100" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:332 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1129 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:334 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1131 msgid "dated {0}" msgstr "" @@ -55621,14 +55783,14 @@ msgstr "مثال:شحن اليوم التالي" msgid "exchangerate.host" msgstr "" -#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:171 +#: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:184 msgid "fieldname" msgstr "" #. Option for the 'Service Provider' (Select) field in DocType 'Currency #. Exchange Settings' #: erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json -msgid "frankfurter.app" +msgid "frankfurter.dev" msgstr "" #: erpnext/templates/form_grid/item_grid.html:66 @@ -55676,7 +55838,7 @@ msgstr "LFT" msgid "material_request_item" msgstr "" -#: erpnext/controllers/selling_controller.py:195 +#: erpnext/controllers/selling_controller.py:204 msgid "must be between 0 and 100" msgstr "" @@ -55751,7 +55913,7 @@ msgstr "" msgid "received from" msgstr "مستلم من" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1450 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1452 msgid "returned" msgstr "تم إرجاعه" @@ -55786,7 +55948,7 @@ msgstr "RGT" msgid "sandbox" msgstr "رمل" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1450 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1452 msgid "sold" msgstr "تم البيع" @@ -55794,8 +55956,8 @@ msgstr "تم البيع" msgid "subscription is already cancelled." msgstr "" -#: erpnext/controllers/status_updater.py:450 -#: erpnext/controllers/status_updater.py:470 +#: erpnext/controllers/status_updater.py:451 +#: erpnext/controllers/status_updater.py:471 msgid "target_ref_field" msgstr "" @@ -55813,7 +55975,7 @@ msgstr "عنوان" msgid "to" msgstr "إلى" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3186 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3188 msgid "to unallocate the amount of this Return Invoice before cancelling it." msgstr "" @@ -55840,7 +56002,7 @@ msgstr "" msgid "you must select Capital Work in Progress Account in accounts table" msgstr "يجب عليك تحديد حساب رأس المال قيد التقدم في جدول الحسابات" -#: erpnext/controllers/accounts_controller.py:1210 +#: erpnext/controllers/accounts_controller.py:1214 msgid "{0} '{1}' is disabled" msgstr "{0} '{1}' معطل" @@ -55848,7 +56010,7 @@ msgstr "{0} '{1}' معطل" msgid "{0} '{1}' not in Fiscal Year {2}" msgstr "{0} '{1}' ليس في السنة المالية {2}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:631 +#: erpnext/manufacturing/doctype/work_order/work_order.py:632 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}" msgstr "{0} ({1}) لا يمكن أن يكون أكبر من الكمية المخطط لها ({2}) في أمر العمل {3}" @@ -55856,7 +56018,7 @@ msgstr "{0} ({1}) لا يمكن أن يكون أكبر من الكمية الم msgid "{0} {1} has submitted Assets. Remove Item {2} from table to continue." msgstr "" -#: erpnext/controllers/accounts_controller.py:2291 +#: erpnext/controllers/accounts_controller.py:2299 msgid "{0} Account not found against Customer {1}." msgstr "" @@ -55864,15 +56026,15 @@ msgstr "" msgid "{0} Account: {1} ({2}) must be in either customer billing currency: {3} or Company default currency: {4}" msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:276 +#: erpnext/accounts/doctype/budget/budget.py:515 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It is already exceeded by {5}." msgstr "" -#: erpnext/accounts/doctype/budget/budget.py:279 +#: erpnext/accounts/doctype/budget/budget.py:518 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It will be exceeded by {5}." msgstr "" -#: erpnext/accounts/doctype/pricing_rule/utils.py:767 +#: erpnext/accounts/doctype/pricing_rule/utils.py:770 msgid "{0} Coupon used are {1}. Allowed quantity is exhausted" msgstr "{0} القسيمة المستخدمة هي {1}. الكمية المسموح بها مستنفدة" @@ -55880,11 +56042,11 @@ msgstr "{0} القسيمة المستخدمة هي {1}. الكمية المسم msgid "{0} Digest" msgstr "{0} الملخص" -#: erpnext/accounts/utils.py:1437 +#: erpnext/accounts/utils.py:1444 msgid "{0} Number {1} is already used in {2} {3}" msgstr "{0} الرقم {1} مستخدم بالفعل في {2} {3}" -#: erpnext/manufacturing/doctype/bom/bom.py:1511 +#: erpnext/manufacturing/doctype/bom/bom.py:1548 msgid "{0} Operating Cost for operation {1}" msgstr "" @@ -55912,7 +56074,7 @@ msgstr "" msgid "{0} account is not of type {1}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:499 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:509 msgid "{0} account not found while submitting purchase receipt" msgstr "" @@ -55967,11 +56129,11 @@ msgstr "" msgid "{0} created" msgstr "{0} تم انشاؤه" -#: erpnext/setup/doctype/company/company.py:247 +#: erpnext/setup/doctype/company/company.py:278 msgid "{0} currency must be same as company's default currency. Please select another account." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:330 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:332 msgid "{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution." msgstr "{0} لديها حاليا {1} بطاقة أداء بطاقة الموردين، ويجب إصدار أوامر الشراء إلى هذا المورد بحذر." @@ -56009,7 +56171,7 @@ msgstr "{0} تم التقديم بنجاح" msgid "{0} hours" msgstr "" -#: erpnext/controllers/accounts_controller.py:2644 +#: erpnext/controllers/accounts_controller.py:2652 msgid "{0} in row {1}" msgstr "{0} في الحقل {1}" @@ -56019,7 +56181,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:100 #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:153 -#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:61 +#: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:60 msgid "{0} is added multiple times on rows: {1}" msgstr "" @@ -56027,16 +56189,16 @@ msgstr "" msgid "{0} is already running for {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:166 +#: erpnext/controllers/accounts_controller.py:171 msgid "{0} is blocked so this transaction cannot proceed" msgstr "تم حظر {0} حتى لا تتم متابعة هذه المعاملة" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1158 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1160 msgid "{0} is mandatory for Item {1}" msgstr "{0} إلزامي للصنف {1}\\n
            \\n{0} is mandatory for Item {1}" #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:99 -#: erpnext/accounts/general_ledger.py:830 +#: erpnext/accounts/general_ledger.py:832 msgid "{0} is mandatory for account {1}" msgstr "" @@ -56044,11 +56206,11 @@ 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:3088 +#: erpnext/controllers/accounts_controller.py:3096 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}." msgstr "{0} إلزامي. ربما لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}." -#: erpnext/selling/doctype/customer/customer.py:203 +#: erpnext/selling/doctype/customer/customer.py:204 msgid "{0} is not a company bank account" msgstr "{0} ليس حسابًا مصرفيًا للشركة" @@ -56056,7 +56218,7 @@ msgstr "{0} ليس حسابًا مصرفيًا للشركة" msgid "{0} is not a group node. Please select a group node as parent cost center" msgstr "{0} ليست عقدة مجموعة. يرجى تحديد عقدة المجموعة كمركز تكلفة الأصل" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:512 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:570 msgid "{0} is not a stock Item" msgstr "{0} ليس من نوع المخزون" @@ -56080,7 +56242,7 @@ msgstr "" msgid "{0} is not the default supplier for any items." msgstr "{0} ليس المورد الافتراضي لأية عناصر." -#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3014 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:3015 msgid "{0} is on hold till {1}" msgstr "{0} معلق حتى {1}" @@ -56108,15 +56270,15 @@ msgstr "" msgid "{0} items produced" msgstr "{0} عناصر منتجة" -#: erpnext/controllers/sales_and_purchase_return.py:219 +#: erpnext/controllers/sales_and_purchase_return.py:218 msgid "{0} must be negative in return document" msgstr "{0} يجب أن يكون سالبة في وثيقة الارجاع" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2337 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2339 msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:499 +#: erpnext/manufacturing/doctype/bom/bom.py:510 msgid "{0} not found for item {1}" msgstr "{0} لم يتم العثور على العنصر {1}" @@ -56128,7 +56290,7 @@ msgstr "{0} المعلمة غير صالحة" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} لا يمكن فلترة المدفوعات المدخلة {1}" -#: erpnext/controllers/stock_controller.py:1571 +#: erpnext/controllers/stock_controller.py:1676 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -56136,11 +56298,11 @@ msgstr "" msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:1006 +#: erpnext/stock/doctype/pick_list/pick_list.py:1010 msgid "{0} units of Item {1} is not available in any of the warehouses." msgstr "" -#: erpnext/stock/doctype/pick_list/pick_list.py:998 +#: erpnext/stock/doctype/pick_list/pick_list.py:1002 msgid "{0} units of Item {1} is picked in another Pick List." msgstr "" @@ -56165,7 +56327,7 @@ msgstr "{0} وحدات من {1} لازمة في {2} لإكمال هذه الم msgid "{0} until {1}" msgstr "" -#: erpnext/stock/utils.py:424 +#: erpnext/stock/utils.py:428 msgid "{0} valid serial nos for Item {1}" msgstr "{0} أرقام تسلسلية صالحة للبند {1}" @@ -56207,7 +56369,7 @@ msgstr "{0} {1} إنشاء" #: 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 +#: erpnext/accounts/doctype/payment_entry/payment_entry.py:2757 msgid "{0} {1} does not exist" msgstr "{0} {1} غير موجود\\n
            \\n{0} {1} does not exist" @@ -56223,8 +56385,8 @@ msgstr "" msgid "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:470 -#: erpnext/selling/doctype/sales_order/sales_order.py:583 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:472 +#: erpnext/selling/doctype/sales_order/sales_order.py:585 #: erpnext/stock/doctype/material_request/material_request.py:246 msgid "{0} {1} has been modified. Please refresh." msgstr "تم تعديل {0} {1}، يرجى تحديث الصفحة من المتصفح" @@ -56245,8 +56407,8 @@ msgstr "" msgid "{0} {1} is associated with {2}, but Party Account is {3}" msgstr "{0} {1} مرتبط ب {2}، ولكن حساب الطرف هو {3}" -#: erpnext/controllers/selling_controller.py:504 -#: erpnext/controllers/subcontracting_controller.py:1102 +#: erpnext/controllers/selling_controller.py:513 +#: erpnext/controllers/subcontracting_controller.py:1123 msgid "{0} {1} is cancelled or closed" msgstr "{0} {1} تم إلغائه أو مغلق" @@ -56299,7 +56461,7 @@ msgstr "" msgid "{0} {1} must be submitted" msgstr "{0} {1} يجب أن يتم اعتماده\\n
            \\n{0} {1} must be submitted" -#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:269 +#: erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:272 msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting." msgstr "" @@ -56334,7 +56496,7 @@ msgstr "{0} {1}: الحساب {2} غير فعال \\n
            \\n{0} {1}: Account {2} msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: قيد محاسبي ل {2} يمكن ان يتم فقط بالعملة : {3}" -#: erpnext/controllers/stock_controller.py:901 +#: erpnext/controllers/stock_controller.py:903 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: مركز التكلفة إلزامي للبند {2}" @@ -56388,7 +56550,7 @@ msgstr "" msgid "{0}, complete the operation {1} before the operation {2}." msgstr "{0} ، أكمل العملية {1} قبل العملية {2}." -#: erpnext/controllers/accounts_controller.py:472 +#: erpnext/controllers/accounts_controller.py:477 msgid "{0}: {1} does not belong to the Company: {2}" msgstr "" @@ -56396,7 +56558,7 @@ msgstr "" msgid "{0}: {1} does not exists" msgstr "{0}: {1} غير موجود" -#: erpnext/setup/doctype/company/company.py:234 +#: erpnext/setup/doctype/company/company.py:265 msgid "{0}: {1} is a group account." msgstr "" @@ -56416,7 +56578,7 @@ msgstr "{doctype} {name} تم إلغائه أو مغلق." msgid "{field_label} is mandatory for sub-contracted {doctype}." msgstr "" -#: erpnext/controllers/stock_controller.py:1976 +#: erpnext/controllers/stock_controller.py:2081 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" @@ -56482,7 +56644,7 @@ msgstr "" msgid "{} To Bill" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2103 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2105 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}" msgstr "لا يمكن إلغاء {} نظرًا لاسترداد نقاط الولاء المكتسبة. قم أولاً بإلغاء {} لا {}" diff --git a/erpnext/locale/bs.po b/erpnext/locale/bs.po index 0b14eb7bac5..e4c90136569 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-11-16 09:35+0000\n" -"PO-Revision-Date: 2025-11-23 23:34\n" +"POT-Creation-Date: 2025-11-30 09:36+0000\n" +"PO-Revision-Date: 2025-12-01 00:23\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:677 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:603 msgid " Amount" msgstr "Iznos" @@ -35,6 +35,11 @@ msgstr "Iznos" msgid " BOM" msgstr " Sastavnica" +#. Label of the default_wip_warehouse (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid " Default Work In Progress Warehouse " +msgstr " Standard Skladište Posla u Toku " + #. Label of the istable (Check) field in DocType 'Inventory Dimension' #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json msgid " Is Child Table" @@ -45,18 +50,23 @@ msgstr "Podređena tabela" msgid " Is Subcontracted" msgstr "Podizvođač" -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:174 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:196 msgid " Item" msgstr " Artikal" -#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:147 -#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:192 +#: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:153 +#: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:206 #: erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py:107 #: erpnext/selling/report/sales_analytics/sales_analytics.py:128 msgid " Name" msgstr " Naziv" -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:668 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:144 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:185 +msgid " Phantom Item" +msgstr " Fantomski Artikal" + +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:594 msgid " Rate" msgstr " Cijena" @@ -70,7 +80,7 @@ msgid " Skip Material Transfer" msgstr " Preskoči Prijenos Materijala" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:133 -#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:163 +#: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:174 msgid " Sub Assembly" msgstr " Podsklop" @@ -141,7 +151,7 @@ msgstr "% Završeno" msgid "% Delivered" msgstr "% Dostavljeno" -#: erpnext/manufacturing/doctype/bom/bom.js:945 +#: erpnext/manufacturing/doctype/bom/bom.js:953 #, python-format msgid "% Finished Item Quantity" msgstr "% Količina Gotovih Proizvoda" @@ -156,8 +166,8 @@ msgstr "% Instalirano" msgid "% Occupied" msgstr "% Zauzeto" -#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:285 -#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:340 +#: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:288 +#: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:338 msgid "% Of Grand Total" msgstr "% Od Ukupnog Iznosa" @@ -246,11 +256,11 @@ 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:2295 +#: erpnext/controllers/accounts_controller.py:2303 msgid "'Account' in the Accounting section of Customer {0}" msgstr "'Račun' u sekciji Knjigovodstvo Klijenta {0}" -#: erpnext/selling/doctype/sales_order/sales_order.py:346 +#: erpnext/selling/doctype/sales_order/sales_order.py:348 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'" msgstr "'Dozvoli višestruke Prodajne Naloge naspram Kupovnog Naloga Klijenta'" @@ -262,7 +272,7 @@ msgstr "'Na Osnovu' i 'Grupiraj Po' ne mogu biti isti" msgid "'Days Since Last Order' must be greater than or equal to zero" msgstr "'Dana od posljednje narudžbe' mora biti veći ili jednako nuli" -#: erpnext/controllers/accounts_controller.py:2300 +#: erpnext/controllers/accounts_controller.py:2308 msgid "'Default {0} Account' in Company {1}" msgstr "'Standard {0} račun' u Kompaniji {1}" @@ -292,8 +302,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:598 -#: erpnext/stock/report/stock_ledger/stock_ledger.py:631 +#: erpnext/stock/report/stock_ledger/stock_ledger.py:601 +#: erpnext/stock/report/stock_ledger/stock_ledger.py:634 msgid "'Opening'" msgstr "'Početno'" @@ -307,11 +317,11 @@ msgstr "'Do Datuma' je obavezno" msgid "'To Package No.' cannot be less than 'From Package No.'" msgstr "'Do Paketa Broj' ne može biti manje od 'Od Paketa Broj.'" -#: erpnext/controllers/sales_and_purchase_return.py:81 +#: erpnext/controllers/sales_and_purchase_return.py:80 msgid "'Update Stock' can not be checked because items are not delivered via {0}" msgstr "'Ažuriraj Zalihe' se ne može provjeriti jer se artikli ne isporučuju putem {0}" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:439 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:441 msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Ažuriraj Zalihe' ne može se provjeriti za prodaju osnovne Imovine" @@ -323,8 +333,8 @@ msgstr "Račun '{0}' već koristi {1}. Koristite drugi račun." msgid "'{0}' has been already added." msgstr "'{0}' je već dodan." -#: erpnext/setup/doctype/company/company.py:259 -#: erpnext/setup/doctype/company/company.py:270 +#: erpnext/setup/doctype/company/company.py:290 +#: erpnext/setup/doctype/company/company.py:301 msgid "'{0}' should be in company currency {1}." msgstr "'{0}' bi trebao biti u valuti kompanije {1}." @@ -753,7 +763,7 @@ msgstr "
          \n" "" -msgstr "" +msgstr "
          \n" +"

          Примечание

          \n" +"
            \n" +"
          • \n" +"Вы можете использовать теги Jinja в полях Subject и Body для динамических значений.\n" +"
          • \n" +" Все поля этого doctype доступны в объекте doc, а все поля для клиента, которому будет отправлено письмо, доступны в customer объекте.\n" +"
          \n" +"

          Примеры

          \n" +"\n" +"
            \n" +"
          • Тема:

            Выписка по счетам за {{ customer.customer_name }}

            • \n" +"
          • Тело:

            \n" +"
            Здравствуйте, {{ customer.customer_name }},
            PFA ваш Statement Of Accounts с {{ doc.from_date }} на {{ doc.to_date }}.
            • \n" +"
          \n" +"" #. Content of the 'Other Details' (HTML) field in DocType 'Purchase Receipt' #. Content of the 'Other Details' (HTML) field in DocType 'Subcontracting @@ -622,24 +645,26 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "
          Other Details
          " -msgstr "" +msgstr "
          Дополнительные сведения
          " #. Content of the 'no_bank_transactions' (HTML) field in DocType 'Bank #. Reconciliation Tool' #: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json msgid "
          No Matching Bank Transactions Found
          " -msgstr "" +msgstr "
          Соответствующих банковских транзакций не найдено
          " #: erpnext/public/js/bank_reconciliation_tool/dialog_manager.js:262 msgid "
          {0}
          " -msgstr "" +msgstr "
          {0}
          " #. Content of the 'settings' (HTML) field in DocType 'Cheque Print Template' #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json msgid "
          \n" "

          All dimensions in centimeter only

          \n" "
          " -msgstr "" +msgstr "
          \n" +"

          Все размеры указаны в сантиметрах

          \n" +"
          " #. Content of the 'about' (HTML) field in DocType 'Product Bundle' #: erpnext/selling/doctype/product_bundle/product_bundle.json @@ -648,7 +673,11 @@ msgid "

          About Product Bundle

          \n\n" "

          The package Item will have Is Stock Item as No and Is Sales Item as Yes.

          \n" "

          Example:

          \n" "

          If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.

          " -msgstr "" +msgstr "

          О комплекте продуктов

          \n\n" +"

          Группировка позиций в другую позицию. Это полезно, если вы объединяете определенные позиции в комплект и ведете учет запасов для отдельных позиций, а не для всей группы в целом.

          \n" +"

          Комплектная позиция будет иметь Является складской позицией со значением Нет и Является товарной позицией со значением Да.

          \n" +"

          Пример:

          \n" +"

          Если вы продаете ноутбуки и рюкзаки отдельно и предлагаете специальную цену при покупке обоих товаров вместе, то \"Ноутбук + Рюкзак\" будет новой позицией комплекта продуктов.

          " #. Content of the 'Help' (HTML) field in DocType 'Currency Exchange Settings' #: erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json @@ -656,7 +685,10 @@ msgid "

          Currency Exchange Settings Help

          \n" "

          There are 3 variables that could be used within the endpoint, result key and in values of the parameter.

          \n" "

          Exchange rate between {from_currency} and {to_currency} on {transaction_date} is fetched by the API.

          \n" "

          Example: If your endpoint is exchange.com/2021-08-01, then, you will have to input exchange.com/{transaction_date}

          " -msgstr "" +msgstr "

          Справка по настройкам обмена валют

          \n" +"

          Есть 3 переменные, которые можно использовать в конечной точке, ключе результата и в значениях параметра.

          \n" +"

          Курс обмена между {from_currency} и {to_currency} на {transaction_date} извлекается API.

          \n" +"

          Пример: если ваша конечная точка — exchange.com/2021-08-01, то вам нужно будет ввести exchange.com/{transaction_date}

          " #. Content of the 'Body and Closing Text Help' (HTML) field in DocType 'Dunning #. Letter Text' @@ -667,7 +699,12 @@ msgid "

          Body Text and Closing Text Example

          \n\n" "

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

          \n\n" "

          Templating

          \n\n" "

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

          " -msgstr "" +msgstr "

          Пример основного текста и закрывающего текста

          \n\n" +"
          Мы заметили, что вы еще не оплатили счет {{sales_invoice}} за {{frappe.db.get_value(\"Currency\", currency, \"symbol\")}} {{outstanding_amount}}. Это напоминание о том, что счет должен был быть оплачен {{due_date}}. Пожалуйста, оплатите причитающуюся сумму немедленно, чтобы избежать дальнейших расходов на напоминание.
          \n\n" +"

          Как получить имена полей

          \n\n" +"

          Имена полей, которые вы можете использовать в своем шаблоне, являются полями в документе. Вы можете узнать поля любого документа через Настройка > Настройте вид формы и выберите тип документа (например, счет-фактура)

          \n\n" +"

          Шаблоны

          \n\n" +"

          Шаблоны составляются с использованием языка шаблонов Jinja. Чтобы узнать больше о Jinja, прочтите эту документацию.

          " #. Content of the 'Contract Template Help' (HTML) field in DocType 'Contract #. Template' @@ -681,7 +718,15 @@ msgid "

          Contract Template Example

          \n\n" "

          The field names you can use in your Contract Template are the fields in the Contract for which you are creating the template. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Contract)

          \n\n" "

          Templating

          \n\n" "

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

          " -msgstr "" +msgstr "

          Пример шаблона договора

          \n\n" +"
          Контракт для клиента {{ party_name }}\n\n"
+"- Действителен от : {{ start_date }} \n"
+"- Действителен до : {{ end_date }}\n"
+"
          \n\n" +"

          Как получить имена полей

          \n\n" +"

          Имена полей, которые Вы можете использовать в своем шаблоне контракта, - это поля контракта, для которого Вы создаете шаблон. Вы можете узнать поля любого документа через меню Настройка > Настроить вид формы и выбрать тип документа (например, Контракт).

          \n\n" +"

          Создание шаблонов

          \n\n" +"

          Шаблоны создаются с помощью языка Jinja Templating Language. Чтобы узнать больше о Jinja, прочитайте эту документацию.

          " #. Content of the 'Terms and Conditions Help' (HTML) field in DocType 'Terms #. and Conditions' @@ -695,48 +740,61 @@ msgid "

          Standard Terms and Conditions Example

          \n\n" "

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

          \n\n" "

          Templating

          \n\n" "

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

          " -msgstr "" +msgstr "

          Пример стандартных правил и условий

          \n\n" +"
          Условия доставки для номера заказа {{ name }}\n\n"
+"-Дата заказа : {{ transaction_date }} \n"
+"-Ожидаемая дата поставки : {{ delivery_date }}\n"
+"
          \n\n" +"

          Как получить имена полей

          \n\n" +"

          Имена полей, которые Вы можете использовать в шаблоне письма, - это поля документа, из которого Вы отправляете письмо. Вы можете узнать поля любого документа через меню Настройка > Настроить вид формы и выбрать тип документа (например, Счет-фактура).

          \n\n" +"

          Создание шаблона

          \n\n" +"

          Шаблоны составляются с помощью языка шаблонизации Jinja. Чтобы узнать больше о Jinja, прочитайте эту документацию.

          " #. Content of the 'account_no_settings' (HTML) field in DocType 'Cheque Print #. Template' #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json msgid "" -msgstr "" +msgstr "" #. Content of the 'html_19' (HTML) field in DocType 'Cheque Print Template' #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json msgid "" -msgstr "" +msgstr "" #. Content of the 'Date Settings' (HTML) field in DocType 'Cheque Print #. Template' #: erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json msgid "" -msgstr "" +msgstr "" #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:123 msgid "
        • Clearance date must be after cheque date for row(s): {0}
          • " -msgstr "" +msgstr "
        • Дата оформления должна быть после даты проверки для строк: {0}
          • " -#: erpnext/controllers/accounts_controller.py:2196 +#: erpnext/controllers/accounts_controller.py:2240 msgid "
        • Item {0} in row(s) {1} billed more than {2}
          • " -msgstr "" +msgstr "
        • Товар {0} в строке(ах) {1} выставлен счет на сумму более {2}
          • " + +#: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:423 +msgid "
        • Packed Item {0}: Required {1}, Available {2}
          • " +msgstr "
        • Упакованный предмет {0}: Требуется {1}, Доступно {2}
          • " #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:118 msgid "
        • Payment document required for row(s): {0}
          • " -msgstr "" +msgstr "
        • Платежный документ, необходимый для строк: {0}
          • " #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:163 +#: erpnext/utilities/bulk_transaction.py:35 msgid "
        • {}
          • " -msgstr "" +msgstr "
        • {}
          • " -#: erpnext/controllers/accounts_controller.py:2193 +#: erpnext/controllers/accounts_controller.py:2237 msgid "

          Cannot overbill for the following Items:

          " -msgstr "" +msgstr "

          Невозможно выставить счет на сумму, превышающую указанную ниже:

          " #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:157 msgid "

          Following {0}s doesn't belong to Company {1} :

          " -msgstr "" +msgstr "

          Подписка на {0}не принадлежит компании {1} :

          " #. Content of the 'html_llwp' (HTML) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -760,23 +818,42 @@ msgid "

          In your Email Template, you can use the following special varia "

        \n" "

        \n" "

        Apart from these, you can access all values in this RFQ, like {{ message_for_supplier }} or {{ terms }}.

        " -msgstr "" +msgstr "

        В вашем Шаблоне электронной почтывы можете использовать следующие специальные переменные:\n" +"

        \n" +"
          \n" +"
        • \n" +" {{ update_password_link }}: Ссылка, по которой ваш поставщик может установить новый пароль для входа на ваш портал.\n" +"
          • \n" +"
        • \n" +" {{ portal_link }}: Ссылка на этот запрос на вашем портале поставщиков.\n" +"
          • \n" +"
        • \n" +" {{ supplier_name }}: Название компании вашего поставщика.\n" +"
          • \n" +"
        • \n" +" {{ contact.salutation }} {{ contact.last_name }}: Контактное лицо вашего поставщика.\n" +"
        • \n" +" {{ user_fullname }}: Ваше полное имя.\n" +"
          • \n" +"
        \n" +"

        \n" +"

        Помимо этого, вы можете получить доступ ко всем значениям в этом запросе предложений, например {{ message_for_supplier }} или {{ terms }}.

        " #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:116 msgid "

        Please correct the following row(s):