diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 01caa360dbe..8b6cd3eee23 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -1541,31 +1541,31 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters): if not frappe.db.has_column("Journal Entry", searchfield): return [] - return frappe.db.sql( - f""" - SELECT jv.name, jv.posting_date, jv.user_remark - FROM `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail - WHERE jv_detail.parent = jv.name - AND jv_detail.account = %(account)s - AND IFNULL(jv_detail.party, '') = %(party)s - AND ( - jv_detail.reference_type IS NULL - OR jv_detail.reference_type = '' - ) - AND jv.docstatus = 1 - AND jv.`{searchfield}` LIKE %(txt)s - ORDER BY jv.name DESC - LIMIT %(limit)s offset %(offset)s - """, - dict( - account=filters.get("account"), - party=cstr(filters.get("party")), - txt=f"%{txt}%", - offset=start, - limit=page_len, - ), + JournalEntry = frappe.qb.DocType("Journal Entry") + JournalEntryAccount = frappe.qb.DocType("Journal Entry Account") + + query = ( + frappe.qb.from_(JournalEntry) + .join(JournalEntryAccount) + .on(JournalEntryAccount.parent == JournalEntry.name) + .select(JournalEntry.name, JournalEntry.posting_date, JournalEntry.user_remark) + .where(JournalEntryAccount.account == filters.get("account")) + .where(JournalEntryAccount.reference_type.isnull() | (JournalEntryAccount.reference_type == "")) + .where(JournalEntry.docstatus == 1) + .where(JournalEntry[searchfield].like(f"%{txt}%")) + .orderby(JournalEntry.name, order=frappe.qb.desc) + .limit(page_len) + .offset(start) ) + party = filters.get("party") + if party: + query = query.where(JournalEntryAccount.party == party) + else: + query = query.where(JournalEntryAccount.party.isnull() | (JournalEntryAccount.party == "")) + + return query.run() + @frappe.whitelist() def get_outstanding(args): diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 6509b2e3873..f1e816a9cbe 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -824,7 +824,7 @@ frappe.ui.form.on("Payment Entry", { paid_amount: function (frm) { frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate)); let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency; - if (frm.doc.paid_amount) { + if (!frm.doc.received_amount) { if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) { frm.set_value("received_amount", frm.doc.paid_amount); } else if (company_currency == frm.doc.paid_to_account_currency) { @@ -845,7 +845,7 @@ frappe.ui.form.on("Payment Entry", { flt(frm.doc.received_amount) * flt(frm.doc.target_exchange_rate) ); - if (frm.doc.received_amount) { + if (!frm.doc.paid_amount) { if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) { frm.set_value("paid_amount", frm.doc.received_amount); if (frm.doc.target_exchange_rate) { diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 8b561730de0..c790f86633a 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -332,9 +332,6 @@ class PurchaseInvoice(BuyingController): if self.bill_date: self.remarks += " " + _("dated {0}").format(formatdate(self.bill_date)) - else: - self.remarks = _("No Remarks") - def set_missing_values(self, for_validate=False): if not self.credit_to: self.credit_to = get_party_account("Supplier", self.supplier, self.company) diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json index 7a55a5eb141..7399e987fa7 100644 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -740,7 +740,6 @@ "label": "Valuation Rate", "no_copy": 1, "options": "Company:company:default_currency", - "precision": "6", "print_hide": 1, "read_only": 1 }, @@ -1008,7 +1007,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2026-03-25 18:03:33.522195", + "modified": "2026-04-07 15:40:45.687554", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 64728cd1e0a..90c0da74f26 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -165,13 +165,7 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends ( ); } } - - // Show buttons only when pos view is active - if (cint(doc.docstatus == 0) && this.frm.page.current_view_name !== "pos" && !doc.is_return) { - this.frm.cscript.sales_order_btn(); - this.frm.cscript.delivery_note_btn(); - this.frm.cscript.quotation_btn(); - } + this.toggle_get_items(); this.set_default_print_format(); if (doc.docstatus == 1 && !doc.inter_company_invoice_reference) { @@ -260,6 +254,93 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends ( } } + toggle_get_items() { + const buttons = ["Sales Order", "Quotation", "Timesheet", "Delivery Note"]; + + buttons.forEach((label) => { + this.frm.remove_custom_button(label, "Get Items From"); + }); + + if (cint(this.frm.doc.docstatus) !== 0 || this.frm.page.current_view_name === "pos") { + return; + } + + if (!this.frm.doc.is_return) { + this.frm.cscript.sales_order_btn(); + this.frm.cscript.quotation_btn(); + this.frm.cscript.timesheet_btn(); + } + + this.frm.cscript.delivery_note_btn(); + } + + timesheet_btn() { + var me = this; + + me.frm.add_custom_button( + __("Timesheet"), + function () { + let d = new frappe.ui.Dialog({ + title: __("Fetch Timesheet"), + fields: [ + { + label: __("From"), + fieldname: "from_time", + fieldtype: "Date", + reqd: 1, + }, + { + label: __("Item Code"), + fieldname: "item_code", + fieldtype: "Link", + options: "Item", + get_query: () => { + return { + query: "erpnext.controllers.queries.item_query", + filters: { + is_sales_item: 1, + customer: me.frm.doc.customer, + has_variants: 0, + }, + }; + }, + }, + { + fieldtype: "Column Break", + fieldname: "col_break_1", + }, + { + label: __("To"), + fieldname: "to_time", + fieldtype: "Date", + reqd: 1, + }, + { + label: __("Project"), + fieldname: "project", + fieldtype: "Link", + options: "Project", + default: me.frm.doc.project, + }, + ], + primary_action: function () { + const data = d.get_values(); + me.frm.events.add_timesheet_data(me.frm, { + from_time: data.from_time, + to_time: data.to_time, + project: data.project, + item_code: data.item_code, + }); + d.hide(); + }, + primary_action_label: __("Get Timesheets"), + }); + d.show(); + }, + __("Get Items From") + ); + } + sales_order_btn() { var me = this; @@ -331,6 +412,12 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends ( this.$delivery_note_btn = this.frm.add_custom_button( __("Delivery Note"), function () { + if (!me.frm.doc.customer) { + frappe.throw({ + title: __("Mandatory"), + message: __("Please Select a Customer"), + }); + } erpnext.utils.map_current_doc({ method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice", source_doctype: "Delivery Note", @@ -343,7 +430,7 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends ( var filters = { docstatus: 1, company: me.frm.doc.company, - is_return: 0, + is_return: me.frm.doc.is_return, }; if (me.frm.doc.customer) filters["customer"] = me.frm.doc.customer; return { @@ -610,6 +697,10 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends ( apply_tds(frm) { this.frm.clear_table("tax_withholding_entries"); } + + is_return() { + this.toggle_get_items(); + } }; // for backward compatibility: combine new and previous states @@ -1061,71 +1152,6 @@ frappe.ui.form.on("Sales Invoice", { }, refresh: function (frm) { - if (frm.doc.docstatus === 0 && !frm.doc.is_return) { - frm.add_custom_button( - __("Timesheet"), - function () { - let d = new frappe.ui.Dialog({ - title: __("Fetch Timesheet"), - fields: [ - { - label: __("From"), - fieldname: "from_time", - fieldtype: "Date", - reqd: 1, - }, - { - label: __("Item Code"), - fieldname: "item_code", - fieldtype: "Link", - options: "Item", - get_query: () => { - return { - query: "erpnext.controllers.queries.item_query", - filters: { - is_sales_item: 1, - customer: frm.doc.customer, - has_variants: 0, - }, - }; - }, - }, - { - fieldtype: "Column Break", - fieldname: "col_break_1", - }, - { - label: __("To"), - fieldname: "to_time", - fieldtype: "Date", - reqd: 1, - }, - { - label: __("Project"), - fieldname: "project", - fieldtype: "Link", - options: "Project", - default: frm.doc.project, - }, - ], - primary_action: function () { - const data = d.get_values(); - frm.events.add_timesheet_data(frm, { - from_time: data.from_time, - to_time: data.to_time, - project: data.project, - item_code: data.item_code, - }); - d.hide(); - }, - primary_action_label: __("Get Timesheets"), - }); - d.show(); - }, - __("Get Items From") - ); - } - if (frm.doc.is_debit_note) { frm.set_df_property("return_against", "label", __("Adjustment Against")); } diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index ba5aa9dfd93..0477c172587 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -1101,9 +1101,6 @@ class SalesInvoice(SellingController): if self.po_date: self.remarks += " " + _("dated {0}").format(formatdate(self.po_date)) - else: - self.remarks = _("No Remarks") - def validate_auto_set_posting_time(self): # Don't auto set the posting date and time if invoice is amended if self.is_new() and self.amended_from: diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index 002cdc4a43c..03d8b2e7eb5 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -2887,7 +2887,7 @@ class TestSalesInvoice(ERPNextTestSuite): si.submit() # Check if adjustment entry is created - self.assertTrue( + self.assertFalse( frappe.db.exists( "GL Entry", { diff --git a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py index a739502074e..4b852e0583d 100644 --- a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py @@ -120,12 +120,12 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) - expected_data = [[100, 30, "No Remarks"], [100, 50, "No Remarks"], [100, 20, "No Remarks"]] + expected_data = [[100, 30], [100, 50], [100, 20]] for i in range(3): row = report[1][i - 1] - self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced, row.remarks]) - + self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) # check invoice grand total, invoiced, paid and outstanding column's value after payment self.create_payment_entry(si.name) report = execute(filters) @@ -178,11 +178,11 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) - expected_data = [[100, 30, "No Remarks"], [100, 50, "No Remarks"], [100, 20, "No Remarks"]] + expected_data = [[100, 30], [100, 50], [100, 20]] for i in range(3): row = report[1][i - 1] - self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced]) # check invoice grand total, invoiced, paid and outstanding column's value after credit note cr_note = self.create_credit_note(si.name, do_not_submit=True) @@ -225,9 +225,10 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) row = report[1][0] - expected_data = [8000, 8000, "No Remarks"] # Data in company currency + expected_data = [8000, 8000] # Data in company currency - self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) # CASE 2: Transaction currency and party account currency are the same self.create_customer( @@ -258,18 +259,20 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) row = report[1][0] - expected_data = [100, 100, "No Remarks"] # Data in Part Account Currency + expected_data = [100, 100] # Data in Part Account Currency - self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) # View in Company currency filters.pop("in_party_currency") report = execute(filters) row = report[1][0] - expected_data = [8000, 8000, "No Remarks"] # Data in Company Currency + expected_data = [8000, 8000] # Data in Company Currency - self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) def test_accounts_receivable_with_partial_payment(self): filters = { @@ -285,11 +288,12 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) - expected_data = [[200, 60, "No Remarks"], [200, 100, "No Remarks"], [200, 40, "No Remarks"]] + expected_data = [[200, 60], [200, 100], [200, 40]] for i in range(3): row = report[1][i - 1] - self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data[i - 1], [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) # check invoice grand total, invoiced, paid and outstanding column's value after payment self.create_payment_entry(si.name) @@ -348,11 +352,12 @@ class TestAccountsReceivable(ERPNextTestSuite, AccountsTestMixin): report = execute(filters) - expected_data = [100, 100, "No Remarks"] + expected_data = [100, 100] self.assertEqual(len(report[1]), 1) row = report[1][0] - self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced, row.remarks]) + self.assertEqual(expected_data, [row.invoice_grand_total, row.invoiced]) + self.assertFalse(row.get("remarks")) # check invoice grand total, invoiced, paid and outstanding column's value after payment self.create_payment_entry(si.name) diff --git a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py index 2d0015a461e..394a9636b78 100644 --- a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py +++ b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py @@ -142,6 +142,7 @@ def prepare_data(accounts, filters, company_currency, dimension_list): total = 0 row = { "account": d.name, + "is_group": d.is_group, "parent_account": d.parent_account, "indent": d.indent, "from_date": filters.from_date, diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index a53c2134e3f..518b49f0ea5 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/erpnext/accounts/report/gross_profit/gross_profit.py @@ -578,7 +578,11 @@ class GrossProfitGenerator: # get buying rate if flt(row.qty): - row.buying_rate = flt(row.buying_amount / flt(row.qty), self.float_precision) + row.buying_rate = ( + flt(row.buying_amount / flt(row.qty), self.float_precision) + if not row.delivered_by_supplier + else None + ) row.base_rate = flt(row.base_amount / flt(row.qty), self.float_precision) else: if self.is_not_invoice_row(row): @@ -630,7 +634,8 @@ class GrossProfitGenerator: returned_item_row.qty += row.qty returned_item_row.base_amount += row.base_amount - row.buying_amount = flt(flt(row.qty) * flt(row.buying_rate), self.currency_precision) + if not row.delivered_by_supplier: + row.buying_amount = flt(flt(row.qty) * flt(row.buying_rate), self.currency_precision) def get_average_rate_based_on_group_by(self): for key in list(self.grouped): @@ -799,6 +804,26 @@ class GrossProfitGenerator: return self.calculate_buying_amount_from_sle( row, my_sle, parenttype, parent, item_row, item_code ) + elif ( + row.delivered_by_supplier + and row.so_detail + and ( + po_details := frappe.get_all( + "Purchase Order Item", + filters={"sales_order_item": row.so_detail, "docstatus": 1}, + pluck="name", + ) + ) + ): + from frappe.query_builder.functions import Sum + + table = frappe.qb.DocType("Purchase Invoice Item") + query = ( + frappe.qb.from_(table) + .select(Sum(table.stock_qty * table.base_net_rate)) + .where((table.po_detail.isin(po_details)) & (table.docstatus == 1)) + ) + return flt(query.run()[0][0]) elif row.sales_order and row.so_detail: incoming_amount = self.get_buying_amount_from_so_dn(row.sales_order, row.so_detail, item_code) if incoming_amount: @@ -951,6 +976,7 @@ class GrossProfitGenerator: SalesInvoice.is_return, SalesInvoiceItem.cost_center, SalesInvoiceItem.serial_and_batch_bundle, + SalesInvoiceItem.delivered_by_supplier, ) if self.filters.group_by == "Sales Person": diff --git a/erpnext/accounts/report/gross_profit/test_gross_profit.py b/erpnext/accounts/report/gross_profit/test_gross_profit.py index ac1ca89b5e4..74f4a0eba6b 100644 --- a/erpnext/accounts/report/gross_profit/test_gross_profit.py +++ b/erpnext/accounts/report/gross_profit/test_gross_profit.py @@ -731,6 +731,31 @@ class TestGrossProfit(ERPNextTestSuite): self.assertEqual(total[7], 1000.0) self.assertEqual(total[8], 100.0) + def test_drop_ship(self): + from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_invoice + from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order, make_sales_invoice + from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order + from erpnext.stock.doctype.item.test_item import make_item + + item = make_item("_Test Drop Ship Item", properties={"is_stock_item": 1, "delivered_by_supplier": 1}) + + so = make_sales_order(item=item.name, qty=10, rate=100) + po = make_purchase_order(so.name, selected_items=[so.items[0]])[0] + po.items[0].rate = 80 + po.supplier = "_Test Supplier" + po.submit() + make_purchase_invoice(po.name).submit() + si = make_sales_invoice(so.name).submit() + + filters = frappe._dict( + company=si.company, from_date=si.posting_date, to_date=si.posting_date, group_by="Invoice" + ) + + _, data = execute(filters=filters) + self.assertEqual(data[1].buying_amount, 800) + self.assertIsNone(data[1].buying_rate) + self.assertEqual(data[1]["gross_profit_%"], 20) + def make_sales_person(sales_person_name="_Test Sales Person"): if not frappe.db.exists("Sales Person", {"sales_person_name": sales_person_name}): diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 5b1bce2cb35..0c23353d1eb 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -1603,6 +1603,10 @@ def parse_naming_series_variable(doc, variable): else: data = {"YY": "%y", "YYYY": "%Y", "MM": "%m", "DD": "%d", "JJJ": "%j"} + + if doc and doc.doctype in ["Batch", "Serial No"] and doc.reference_doctype and doc.reference_name: + doc = frappe.get_doc(doc.reference_doctype, doc.reference_name) + date = ( ( getdate(doc.get("posting_date") or doc.get("transaction_date") or doc.get("posting_datetime")) diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.js b/erpnext/assets/doctype/asset_movement/asset_movement.js index f56c1e31f27..2e73d0d9df8 100644 --- a/erpnext/assets/doctype/asset_movement/asset_movement.js +++ b/erpnext/assets/doctype/asset_movement/asset_movement.js @@ -41,7 +41,7 @@ frappe.ui.form.on("Asset Movement", { }); }, - onload: (frm) => { + refresh: (frm) => { frm.trigger("set_required_fields"); }, diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py index 1fc2cdf3386..09d7d30ab39 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -285,7 +285,7 @@ class RequestforQuotation(BuyingController): } ) user.save(ignore_permissions=True) - update_password_link = user.reset_password() + update_password_link = user._reset_password() return user, update_password_link diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 17d5d929bb5..e0bb6e85bab 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -4357,6 +4357,15 @@ def get_missing_company_details(doctype, docname): address_display_list = get_address_display_list("Company", company) address_line = address_display_list[0].get("address_line1") if address_display_list else "" + needs_new_company_address = not address_line + + if needs_new_company_address and not frappe.has_permission("Address", "create", throw=False): + frappe.msgprint( + _( + "Company Address is missing. You don't have permission to create an Address. Please contact your System Manager." + ) + ) + return required_fields.append(company_address) required_fields.append(address_line) @@ -4379,6 +4388,18 @@ def get_missing_company_details(doctype, docname): def update_company_master_and_address(current_doctype, name, company, details): from frappe.utils import validate_email_address + if not frappe.has_permission(current_doctype, "write", doc=name, throw=False): + frappe.throw( + _("You don't have permission to update this document. Please contact your System Manager."), + title=_("Insufficient Permissions"), + ) + + if not frappe.has_permission("Company", "write", doc=company, throw=False): + frappe.throw( + _("You don't have permission to update Company details. Please contact your System Manager."), + title=_("Insufficient Permissions"), + ) + if isinstance(details, str): details = frappe.parse_json(details) @@ -4393,6 +4414,13 @@ def update_company_master_and_address(current_doctype, name, company, details): company_address = details.get("company_address") if details.get("address_line1"): + if not frappe.has_permission("Address", "create", throw=False): + frappe.throw( + _( + "You don't have permission to create a Company Address. Please contact your System Manager." + ), + title=_("Insufficient Permissions"), + ) address_doc = frappe.get_doc( { "doctype": "Address", @@ -4425,6 +4453,7 @@ def update_doc_company_address(current_doctype, docname, company_address, detail "Sales Invoice": ("company_address", "company_address_display"), "Delivery Note": ("company_address", "company_address_display"), "POS Invoice": ("company_address", "company_address_display"), + "Quotation": ("company_address", "company_address_display"), "Request for Quotation": ("shipping_address", "shipping_address_display"), } diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 9b663c0d2b9..b2e7337a4ec 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -364,38 +364,43 @@ def get_project_name(doctype, txt, searchfield, start, page_len, filters): @frappe.whitelist() @frappe.validate_and_sanitize_search_inputs -def get_delivery_notes_to_be_billed(doctype, txt, searchfield, start, page_len, filters, as_dict): - doctype = "Delivery Note" +def get_delivery_notes_to_be_billed( + doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict, as_dict: bool = False +): + DeliveryNote = frappe.qb.DocType("Delivery Note") + fields = get_fields(doctype, ["name", "customer", "posting_date"]) - return frappe.db.sql( - """ - select {fields} - from `tabDelivery Note` - where `tabDelivery Note`.`{key}` like {txt} and - `tabDelivery Note`.docstatus = 1 - and status not in ('Stopped', 'Closed') {fcond} - and ( - (`tabDelivery Note`.is_return = 0 and `tabDelivery Note`.per_billed < 100) - or (`tabDelivery Note`.grand_total = 0 and `tabDelivery Note`.per_billed < 100) - or ( - `tabDelivery Note`.is_return = 1 - and return_against in (select name from `tabDelivery Note` where per_billed < 100) + original_dn = ( + frappe.qb.from_(DeliveryNote) + .select(DeliveryNote.name) + .where((DeliveryNote.docstatus == 1) & (DeliveryNote.is_return == 0) & (DeliveryNote.per_billed > 0)) + ) + + query = ( + frappe.qb.from_(DeliveryNote) + .select(*[DeliveryNote[f] for f in fields]) + .where( + (DeliveryNote.docstatus == 1) + & (DeliveryNote.status.notin(["Stopped", "Closed"])) + & (DeliveryNote[searchfield].like(f"%{txt}%")) + & ( + ((DeliveryNote.is_return == 0) & (DeliveryNote.per_billed < 100)) + | ((DeliveryNote.grand_total == 0) & (DeliveryNote.per_billed < 100)) + | ( + (DeliveryNote.is_return == 1) + & (DeliveryNote.per_billed < 100) + & (DeliveryNote.return_against.isin(original_dn)) ) ) - {mcond} order by `tabDelivery Note`.`{key}` asc limit {page_len} offset {start} - """.format( - fields=", ".join([f"`tabDelivery Note`.{f}" for f in fields]), - key=searchfield, - fcond=get_filters_cond(doctype, filters, []), - mcond=get_match_cond(doctype), - start=start, - page_len=page_len, - txt="%(txt)s", - ), - {"txt": ("%%%s%%" % txt)}, - as_dict=as_dict, + ) ) + if filters and isinstance(filters, dict): + for key, value in filters.items(): + query = query.where(DeliveryNote[key] == value) + + query = query.orderby(DeliveryNote[searchfield], order=Order.asc).limit(page_len).offset(start) + return query.run(as_dict=as_dict) @frappe.whitelist() diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 8138a94693c..5a062e19daf 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -634,11 +634,11 @@ class SellingController(StockController): if allow_at_arms_length_price: continue - rate = flt( - flt(d.incoming_rate, d.precision("incoming_rate")) * d.conversion_factor, - d.precision("rate"), - ) - if d.rate != rate: + rate = flt(flt(d.incoming_rate) * flt(d.conversion_factor or 1.0)) + + if flt(d.rate, d.precision("incoming_rate")) != flt( + rate, d.precision("incoming_rate") + ): d.rate = rate frappe.msgprint( _( diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 3ce079a62a6..96ca67c28df 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -341,7 +341,7 @@ class StatusUpdater(Document): item_details.extend(self.fetch_items_with_pending_qty(args, "item_code", regular_items)) # Query production plan items with production_item field - if pp_items: + if pp_items and args.get("target_dt") in ["Production Plan Sub Assembly Item"]: item_details.extend(self.fetch_items_with_pending_qty(args, "production_item", pp_items)) item_lookup = {item.name: item for item in item_details} diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index 7f41e8476ea..21743e57f11 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -167,8 +167,11 @@ class calculate_taxes_and_totals: bill_for_rejected_quantity_in_purchase_invoice = frappe.get_single_value( "Buying Settings", "bill_for_rejected_quantity_in_purchase_invoice" ) + + do_not_round_fields = ["valuation_rate", "incoming_rate"] + for item in self.doc.items: - self.doc.round_floats_in(item) + self.doc.round_floats_in(item, do_not_round_fields=do_not_round_fields) if item.discount_percentage == 100: item.rate = 0.0 diff --git a/erpnext/crm/report/lost_opportunity/lost_opportunity.py b/erpnext/crm/report/lost_opportunity/lost_opportunity.py index eb09711667a..cfbee3901e2 100644 --- a/erpnext/crm/report/lost_opportunity/lost_opportunity.py +++ b/erpnext/crm/report/lost_opportunity/lost_opportunity.py @@ -4,6 +4,12 @@ import frappe from frappe import _ +from frappe.query_builder import DocType +from frappe.query_builder.custom import GROUP_CONCAT +from frappe.query_builder.functions import Date + +Opportunity = DocType("Opportunity") +OpportunityLostReasonDetail = DocType("Opportunity Lost Reason Detail") def execute(filters=None): @@ -66,58 +72,48 @@ def get_columns(): def get_data(filters): - return frappe.db.sql( - f""" - SELECT - `tabOpportunity`.name, - `tabOpportunity`.opportunity_from, - `tabOpportunity`.party_name, - `tabOpportunity`.customer_name, - `tabOpportunity`.opportunity_type, - GROUP_CONCAT(`tabOpportunity Lost Reason Detail`.lost_reason separator ', ') lost_reason, - `tabOpportunity`.sales_stage, - `tabOpportunity`.territory - FROM - `tabOpportunity` - {get_join(filters)} - WHERE - `tabOpportunity`.status = 'Lost' and `tabOpportunity`.company = %(company)s - AND DATE(`tabOpportunity`.modified) BETWEEN %(from_date)s AND %(to_date)s - {get_conditions(filters)} - GROUP BY - `tabOpportunity`.name - ORDER BY - `tabOpportunity`.creation asc """, - filters, - as_dict=1, + query = ( + frappe.qb.from_(Opportunity) + .left_join(OpportunityLostReasonDetail) + .on( + (OpportunityLostReasonDetail.parenttype == "Opportunity") + & (OpportunityLostReasonDetail.parent == Opportunity.name) + ) + .select( + Opportunity.name, + Opportunity.opportunity_from, + Opportunity.party_name, + Opportunity.customer_name, + Opportunity.opportunity_type, + GROUP_CONCAT(OpportunityLostReasonDetail.lost_reason, alias="lost_reason").separator(", "), + Opportunity.sales_stage, + Opportunity.territory, + ) + .where( + (Opportunity.status == "Lost") + & (Opportunity.company == filters.get("company")) + & (Date(Opportunity.modified).between(filters.get("from_date"), filters.get("to_date"))) + ) + .groupby(Opportunity.name) + .orderby(Opportunity.creation) ) + query = get_conditions(filters, query) -def get_conditions(filters): - conditions = [] + return query.run(as_dict=1) + +def get_conditions(filters, query): if filters.get("territory"): - conditions.append(" and `tabOpportunity`.territory=%(territory)s") + query = query.where(Opportunity.territory == filters.get("territory")) if filters.get("opportunity_from"): - conditions.append(" and `tabOpportunity`.opportunity_from=%(opportunity_from)s") + query = query.where(Opportunity.opportunity_from == filters.get("opportunity_from")) if filters.get("party_name"): - conditions.append(" and `tabOpportunity`.party_name=%(party_name)s") - - return " ".join(conditions) if conditions else "" - - -def get_join(filters): - join = """LEFT JOIN `tabOpportunity Lost Reason Detail` - ON `tabOpportunity Lost Reason Detail`.parenttype = 'Opportunity' and - `tabOpportunity Lost Reason Detail`.parent = `tabOpportunity`.name""" + query = query.where(Opportunity.party_name == filters.get("party_name")) if filters.get("lost_reason"): - join = """JOIN `tabOpportunity Lost Reason Detail` - ON `tabOpportunity Lost Reason Detail`.parenttype = 'Opportunity' and - `tabOpportunity Lost Reason Detail`.parent = `tabOpportunity`.name and - `tabOpportunity Lost Reason Detail`.lost_reason = '{}' - """.format(filters.get("lost_reason")) + query = query.where(OpportunityLostReasonDetail.lost_reason == filters.get("lost_reason")) - return join + return query diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot index 2ce76e47917..06178e5e76e 100644 --- a/erpnext/locale/main.pot +++ b/erpnext/locale/main.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ERPNext VERSION\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-04-05 09:48+0000\n" -"PO-Revision-Date: 2026-04-05 09:48+0000\n" +"POT-Creation-Date: 2026-04-12 09:47+0000\n" +"PO-Revision-Date: 2026-04-12 09:47+0000\n" "Last-Translator: hello@frappe.io\n" "Language-Team: hello@frappe.io\n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.16.0\n" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1558 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1591 msgid "" "\n" "\t\t\tThe Batch {0} of an item {1} has negative stock in the warehouse {2}{3}.\n" @@ -162,7 +162,7 @@ msgstr "" msgid "% Delivered" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:1017 +#: erpnext/manufacturing/doctype/bom/bom.js:1019 #, python-format msgid "% Finished Item Quantity" msgstr "" @@ -287,7 +287,7 @@ msgstr "" msgid "'Default {0} Account' in Company {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1226 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1229 msgid "'Entries' cannot be empty" msgstr "" @@ -1004,7 +1004,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:1760 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1763 msgid "A Reverse Journal Entry {0} already exists for this Journal Entry." msgstr "" @@ -1216,7 +1216,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:988 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1080 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1229,7 +1229,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:167 +#: erpnext/accounts/doctype/account/account_tree.js:162 #: erpnext/accounts/doctype/account_category/account_category.json #: erpnext/workspace_sidebar/accounts_setup.json msgid "Account Category" @@ -1359,7 +1359,7 @@ msgstr "" #. Label of the account_number (Data) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:133 +#: erpnext/accounts/doctype/account/account_tree.js:128 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.py:396 #: erpnext/accounts/report/financial_statements.py:685 #: erpnext/accounts/report/trial_balance/trial_balance.py:495 @@ -1406,7 +1406,7 @@ msgstr "" #. Label of the account_type (Select) field in DocType 'Party Type' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/account.py:206 -#: erpnext/accounts/doctype/account/account_tree.js:159 +#: erpnext/accounts/doctype/account/account_tree.js:154 #: erpnext/accounts/doctype/bank_account/bank_account.json #: erpnext/accounts/doctype/bank_account_type/bank_account_type.json #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json @@ -1560,7 +1560,7 @@ msgstr "" msgid "Account: {0} is capital Work in progress and can not be updated by Journal Entry" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:368 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:371 msgid "Account: {0} can only be updated via Stock Transactions" msgstr "" @@ -1853,8 +1853,8 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1964 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2056 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2076 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1862,29 +1862,29 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:843 msgid "Accounting Entry for Service" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1016 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1037 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1055 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1076 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1097 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1125 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1232 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1468 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1490 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1017 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1038 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1056 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1077 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1098 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1126 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1238 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1474 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1496 #: erpnext/controllers/stock_controller.py:727 #: erpnext/controllers/stock_controller.py:744 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:937 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1909 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1923 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:936 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2001 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2015 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:745 msgid "Accounting Entry for Stock" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:741 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:740 msgid "Accounting Entry for {0}" msgstr "" @@ -1978,12 +1978,12 @@ msgstr "" msgid "Accounts Frozen Till Date" msgstr "" -#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:192 +#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:186 msgid "Accounts Included in Report" msgstr "" -#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:166 -#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:191 +#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:160 +#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:185 msgid "Accounts Missing from Report" msgstr "" @@ -2083,7 +2083,7 @@ msgstr "" msgid "Accounts Setup" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1325 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1328 msgid "Accounts table cannot be blank." msgstr "" @@ -2547,7 +2547,7 @@ msgid "Add Employees" msgstr "" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:256 -#: erpnext/selling/doctype/sales_order/sales_order.js:277 +#: erpnext/selling/doctype/sales_order/sales_order.js:284 #: erpnext/stock/dashboard/item_dashboard.js:216 msgid "Add Item" msgstr "" @@ -2609,7 +2609,7 @@ msgid "Add Quote" msgstr "" #. Label of the add_raw_materials (Button) field in DocType 'BOM Operation' -#: erpnext/manufacturing/doctype/bom/bom.js:1045 +#: erpnext/manufacturing/doctype/bom/bom.js:1047 #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json msgid "Add Raw Materials" msgstr "" @@ -2623,7 +2623,7 @@ msgid "Add Sales Partners" msgstr "" #. Label of the add_schedule (Button) field in DocType 'Sales Order Item' -#: erpnext/selling/doctype/sales_order/sales_order.js:649 +#: erpnext/selling/doctype/sales_order/sales_order.js:656 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json msgid "Add Schedule" msgstr "" @@ -2885,7 +2885,7 @@ msgstr "" msgid "Additional Discount Amount (Company Currency)" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:833 +#: erpnext/controllers/taxes_and_totals.py:837 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -2980,7 +2980,7 @@ msgstr "" msgid "Additional Information updated successfully." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:812 +#: erpnext/manufacturing/doctype/work_order/work_order.js:818 msgid "Additional Material Transfer" msgstr "" @@ -3167,11 +3167,11 @@ msgstr "" msgid "Adjust Qty" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1130 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1156 msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:669 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:668 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3284,11 +3284,11 @@ msgstr "" msgid "Advance amount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:970 +#: erpnext/controllers/taxes_and_totals.py:974 msgid "Advance amount cannot be greater than {0} {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:873 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:876 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}" msgstr "" @@ -3410,7 +3410,7 @@ msgstr "" msgid "Against Income Account" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:735 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:738 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:777 msgid "Against Journal Entry {0} does not have any unmatched {1} entry" msgstr "" @@ -3596,7 +3596,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:1555 erpnext/public/js/setup_wizard.js:184 +#: erpnext/accounts/utils.py:1631 erpnext/public/js/setup_wizard.js:184 msgid "All Accounts" msgstr "" @@ -3757,7 +3757,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1430 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1487 msgid "All items have already been Invoiced/Returned" msgstr "" @@ -3765,7 +3765,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3136 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3335 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3773,11 +3773,11 @@ msgstr "" msgid "All items in this document already have a linked Quality Inspection." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1239 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1236 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:1250 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1247 msgid "All linked Sales Orders must be subcontracted." msgstr "" @@ -3791,7 +3791,7 @@ msgstr "" msgid "All the items have been already returned." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1196 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1256 msgid "All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table." msgstr "" @@ -4337,8 +4337,8 @@ msgstr "" #: erpnext/manufacturing/doctype/bom/bom.js:288 #: erpnext/manufacturing/doctype/work_order/work_order.js:165 #: erpnext/manufacturing/doctype/work_order/work_order.js:180 -#: erpnext/public/js/utils.js:571 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:288 +#: erpnext/public/js/utils.js:587 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:322 msgid "Alternate Item" msgstr "" @@ -4738,7 +4738,7 @@ msgstr "" msgid "An Item Group is a way to classify items based on types." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:537 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:558 msgid "An error has been appeared while reposting item valuation via {0}" msgstr "" @@ -4765,7 +4765,7 @@ msgstr "" msgid "Analytical Accounting" msgstr "" -#: erpnext/public/js/utils.js:168 +#: erpnext/public/js/utils.js:184 msgid "Annual Billing: {0}" msgstr "" @@ -5705,7 +5705,7 @@ msgstr "" msgid "Asset restored after Asset Capitalization {0} was cancelled" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1522 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1519 msgid "Asset returned" msgstr "" @@ -5717,8 +5717,8 @@ msgstr "" msgid "Asset scrapped via Journal Entry {0}" msgstr "" +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1519 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1522 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1525 msgid "Asset sold" msgstr "" @@ -5857,7 +5857,7 @@ msgstr "" msgid "At Row #{0}: The picked quantity {1} for the item {2} is greater than available stock {3} in the warehouse {4}." msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1403 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1436 msgid "At Row {0}: In Serial and Batch Bundle {1} must have docstatus as 1 and not 0" msgstr "" @@ -5890,19 +5890,19 @@ msgstr "" msgid "At least one of the Selling or Buying must be selected" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:316 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:324 msgid "At least one raw material item must be present in the stock entry for the type {0}" msgstr "" -#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:25 +#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:27 msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:819 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:881 msgid "At least one warehouse is mandatory" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:721 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:783 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 "" @@ -5910,11 +5910,11 @@ msgstr "" msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:732 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:794 msgid "At row #{0}: you have selected the Difference Account {1}, which is a Cost of Goods Sold type account. Please select a different account" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1151 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1184 msgid "At row {0}: Batch No is mandatory for Item {1}" msgstr "" @@ -5922,11 +5922,11 @@ msgstr "" msgid "At row {0}: Parent Row No cannot be set for item {1}" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1136 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1169 msgid "At row {0}: Qty is mandatory for the batch {1}" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1143 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1176 msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" @@ -6319,7 +6319,7 @@ msgstr "" #: erpnext/manufacturing/doctype/workstation/workstation.js:505 #: erpnext/manufacturing/report/bom_stock_analysis/bom_stock_analysis.py:118 #: erpnext/manufacturing/report/bom_stock_analysis/bom_stock_analysis.py:175 -#: erpnext/public/js/utils.js:631 +#: erpnext/public/js/utils.js:647 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json #: erpnext/stock/report/stock_ageing/stock_ageing.py:170 @@ -6411,7 +6411,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:952 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6539,10 +6539,10 @@ msgstr "" #: erpnext/manufacturing/report/bom_stock_analysis/bom_stock_analysis.js:8 #: 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:1415 +#: erpnext/selling/doctype/sales_order/sales_order.js:1422 #: erpnext/stock/doctype/material_request/material_request.js:351 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json -#: erpnext/stock/doctype/stock_entry/stock_entry.js:709 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:796 #: erpnext/stock/report/bom_search/bom_search.py:38 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:525 @@ -6791,7 +6791,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2284 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2448 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -6802,7 +6802,7 @@ msgid "BOM and Production" msgstr "" #: erpnext/stock/doctype/material_request/material_request.js:386 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:761 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:848 msgid "BOM does not contain any stock item" msgstr "" @@ -6835,15 +6835,15 @@ msgstr "" msgid "BOMs Updated" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:297 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:299 msgid "BOMs created successfully" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:307 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:309 msgid "BOMs creation failed" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:247 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:249 msgid "BOMs creation has been enqueued, kindly check the status after some time" msgstr "" @@ -6859,7 +6859,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:368 +#: erpnext/manufacturing/doctype/work_order/work_order.js:371 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Backflush Materials From WIP Warehouse" msgstr "" @@ -7585,11 +7585,11 @@ msgstr "" msgid "Batch No" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1154 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1187 msgid "Batch No is mandatory" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3435 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3468 msgid "Batch No {0} does not exists" msgstr "" @@ -7597,7 +7597,7 @@ msgstr "" msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead." msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:458 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:491 msgid "Batch No {0} is not present in the original {1} {2}, hence you can't return it against the {1} {2}" msgstr "" @@ -7612,7 +7612,7 @@ msgstr "" msgid "Batch Nos" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1976 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2009 msgid "Batch Nos are created successfully" msgstr "" @@ -7649,7 +7649,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:350 +#: erpnext/manufacturing/doctype/work_order/work_order.js:353 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Batch Size" @@ -7678,12 +7678,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3519 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:290 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3326 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3525 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -7753,7 +7753,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:1372 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/material_request/material_request.js:139 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:695 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:782 #: erpnext/workspace_sidebar/subcontracting.json msgid "Bill of Materials" msgstr "" @@ -8189,10 +8189,6 @@ msgstr "" msgid "Booked Fixed Asset" msgstr "" -#: 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:828 msgid "Books have been closed till the period ending on {0}" msgstr "" @@ -8911,7 +8907,7 @@ msgstr "" msgid "Can be approved by {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2530 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2554 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state." msgstr "" @@ -8939,7 +8935,7 @@ msgstr "" msgid "Can not filter based on Voucher No, if grouped by Voucher" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1384 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1387 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2874 msgid "Can only make payment against unbilled {0}" msgstr "" @@ -8987,7 +8983,7 @@ msgstr "" msgid "Cannot Assign Cashier" msgstr "" -#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:90 +#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:92 #: erpnext/stock/doctype/delivery_trip/delivery_trip.py:219 msgid "Cannot Calculate Arrival Time as Driver Address is Missing." msgstr "" @@ -9006,7 +9002,7 @@ msgstr "" msgid "Cannot Merge" msgstr "" -#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:123 +#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:125 msgid "Cannot Optimize Route as Driver Address is Missing." msgstr "" @@ -9026,7 +9022,7 @@ msgstr "" msgid "Cannot amend {0} {1}, please create a new one instead." msgstr "" -#: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.py:1293 +#: erpnext/accounts/doctype/tax_withholding_entry/tax_withholding_entry.py:1297 msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" @@ -9046,7 +9042,7 @@ 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:252 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:273 msgid "Cannot cancel as processing of cancelled documents is pending." msgstr "" @@ -9062,7 +9058,7 @@ msgstr "" msgid "Cannot cancel this Manufacturing Stock Entry as quantity of Finished Good produced cannot be less than quantity delivered in the linked Subcontracting Inward Order." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:575 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:578 msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" @@ -9070,7 +9066,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:496 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:558 msgid "Cannot cancel transaction for Completed Work Order." msgstr "" @@ -9114,7 +9110,7 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1018 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1017 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" @@ -9181,6 +9177,10 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" +#: erpnext/stock/doctype/stock_entry/stock_entry.py:924 +msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." +msgstr "" + #: erpnext/setup/doctype/company/company.py:223 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 "" @@ -9214,11 +9214,11 @@ msgstr "" msgid "Cannot produce more Item {0} than Sales Order quantity {1} {2}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1450 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1451 msgid "Cannot produce more item for {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1454 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1455 msgid "Cannot produce more than {0} items for {1}" msgstr "" @@ -9565,7 +9565,7 @@ msgstr "" msgid "Caution" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:187 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:208 msgid "Caution: This might alter frozen accounts." msgstr "" @@ -9771,7 +9771,7 @@ msgstr "" #. Label of a Link in the Invoicing Workspace #. Label of a Workspace Sidebar Item -#: erpnext/accounts/doctype/account/account_tree.js:196 +#: erpnext/accounts/doctype/account/account_tree.js:191 #: erpnext/accounts/doctype/cost_center/cost_center.js:41 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/workspace_sidebar/accounts_setup.json @@ -10110,7 +10110,7 @@ msgstr "" msgid "Closed Documents" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2453 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2477 msgid "Closed Work Order can not be stopped or Re-opened" msgstr "" @@ -10986,12 +10986,12 @@ msgstr "" msgid "Company and Posting Date is mandatory" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2581 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2578 msgid "Company currencies of both the companies should match for Inter Company Transactions." msgstr "" #: erpnext/stock/doctype/material_request/material_request.js:380 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:755 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:842 msgid "Company field is required" msgstr "" @@ -11138,12 +11138,12 @@ msgstr "" msgid "Completed Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1368 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1369 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:323 -#: erpnext/manufacturing/doctype/job_card/job_card.js:444 +#: erpnext/manufacturing/doctype/job_card/job_card.js:325 +#: erpnext/manufacturing/doctype/job_card/job_card.js:446 #: erpnext/manufacturing/doctype/workstation/workstation.js:296 msgid "Completed Quantity" msgstr "" @@ -11289,7 +11289,7 @@ msgstr "" msgid "Consider Minimum Order Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1018 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1078 msgid "Consider Process Loss" msgstr "" @@ -11480,7 +11480,7 @@ msgstr "" msgid "Consumed Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1744 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1745 msgid "Consumed Qty cannot be greater than Reserved Qty for item {0}" msgstr "" @@ -11792,7 +11792,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom_item/bom_item.json #: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json -#: erpnext/public/js/utils.js:886 +#: erpnext/public/js/utils.js:902 #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json #: erpnext/stock/doctype/packed_item/packed_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -11900,13 +11900,13 @@ msgstr "" msgid "Corrective Action" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:501 +#: erpnext/manufacturing/doctype/job_card/job_card.js:503 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:508 +#: erpnext/manufacturing/doctype/job_card/job_card.js:510 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Corrective Operation" msgstr "" @@ -12158,8 +12158,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:1433 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:903 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1439 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:902 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -12229,7 +12229,7 @@ msgstr "" msgid "Cost of Goods Sold" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:735 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:797 msgid "Cost of Goods Sold Account in Items Table" msgstr "" @@ -12394,7 +12394,7 @@ msgstr "" msgid "Coupon Type" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:86 +#: erpnext/accounts/doctype/account/account_tree.js:63 #: erpnext/accounts/doctype/bank_clearance/bank_clearance.py:84 #: erpnext/templates/form_grid/bank_reconciliation_grid.html:16 msgid "Cr" @@ -12592,7 +12592,7 @@ msgstr "" msgid "Create Payment Request" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:794 +#: erpnext/manufacturing/doctype/work_order/work_order.js:800 msgid "Create Pick List" msgstr "" @@ -12619,7 +12619,7 @@ msgstr "" #. Title of an Onboarding Step #. Label of an action in the Onboarding Step 'Create Purchase Order' #: erpnext/buying/onboarding_step/create_purchase_order/create_purchase_order.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1668 +#: erpnext/selling/doctype/sales_order/sales_order.js:1675 #: erpnext/utilities/activation.py:106 msgid "Create Purchase Order" msgstr "" @@ -12804,7 +12804,7 @@ msgstr "" msgid "Create a variant with the template image." msgstr "" -#: erpnext/stock/stock_ledger.py:2072 +#: erpnext/stock/stock_ledger.py:2058 msgid "Create an incoming stock transaction for the Item." msgstr "" @@ -12852,11 +12852,11 @@ msgstr "" msgid "Creating Accounts..." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1543 +#: erpnext/selling/doctype/sales_order/sales_order.js:1550 msgid "Creating Delivery Note ..." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:677 +#: erpnext/selling/doctype/sales_order/sales_order.js:684 msgid "Creating Delivery Schedule..." msgstr "" @@ -12876,7 +12876,7 @@ msgstr "" msgid "Creating Purchase Invoices ..." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1692 +#: erpnext/selling/doctype/sales_order/sales_order.js:1699 msgid "Creating Purchase Order ..." msgstr "" @@ -12895,7 +12895,7 @@ msgstr "" msgid "Creating Stock Entry" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1813 +#: erpnext/selling/doctype/sales_order/sales_order.js:1820 msgid "Creating Subcontracting Inward Order ..." msgstr "" @@ -13128,8 +13128,8 @@ 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:378 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:386 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:375 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:383 #: erpnext/controllers/accounts_controller.py:2370 msgid "Credit To" msgstr "" @@ -13332,7 +13332,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1604 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1672 -#: erpnext/accounts/utils.py:2456 +#: erpnext/accounts/utils.py:2532 msgid "Currency for {0} must be {1}" msgstr "" @@ -13597,7 +13597,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:309 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:390 #: 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 @@ -13637,7 +13637,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:1183 +#: erpnext/selling/doctype/sales_order/sales_order.js:1190 #: 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 @@ -13675,7 +13675,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/serial_no/serial_no.json #: erpnext/stock/doctype/shipment/shipment.json -#: erpnext/stock/doctype/stock_entry/stock_entry.js:385 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:472 #: erpnext/stock/doctype/warehouse/warehouse.json #: erpnext/stock/report/delayed_item_report/delayed_item_report.js:36 #: erpnext/stock/report/delayed_item_report/delayed_item_report.py:121 @@ -14154,7 +14154,7 @@ msgstr "" msgid "Customer required for 'Customerwise Discount'" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1143 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1140 #: erpnext/selling/doctype/sales_order/sales_order.py:434 #: erpnext/stock/doctype/delivery_note/delivery_note.py:436 msgid "Customer {0} does not belong to project {1}" @@ -14207,7 +14207,7 @@ msgstr "" msgid "Customer-wise Item Price" msgstr "" -#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:38 +#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:44 msgid "Customer/Lead Name" msgstr "" @@ -14776,7 +14776,7 @@ msgstr "" msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2244 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2245 msgid "Default BOM for {0} not found" msgstr "" @@ -14784,7 +14784,7 @@ msgstr "" msgid "Default BOM not found for FG Item {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2241 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2242 msgid "Default BOM not found for Item {0} and Project {1}" msgstr "" @@ -15509,10 +15509,10 @@ msgstr "" #: erpnext/manufacturing/doctype/master_production_schedule_item/master_production_schedule_item.json #: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1067 -#: erpnext/public/js/utils.js:879 +#: erpnext/public/js/utils.js:895 #: 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:1490 +#: erpnext/selling/doctype/sales_order/sales_order.js:631 +#: erpnext/selling/doctype/sales_order/sales_order.js:1497 #: 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 @@ -15552,19 +15552,19 @@ msgstr "" #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:129 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:332 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:413 #: 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:291 #: erpnext/accounts/report/sales_register/sales_register.py:245 -#: erpnext/selling/doctype/sales_order/sales_order.js:1042 +#: erpnext/selling/doctype/sales_order/sales_order.js:1049 #: 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/delivery_trip/delivery_trip.js:54 #: erpnext/stock/doctype/packing_slip/packing_slip.json #: erpnext/stock/doctype/pick_list/pick_list.js:134 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:59 @@ -15612,12 +15612,12 @@ msgstr "" msgid "Delivery Note Trends" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1404 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1401 msgid "Delivery Note {0} is not submitted" msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1285 -#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:73 +#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:75 msgid "Delivery Notes" msgstr "" @@ -15629,8 +15629,8 @@ msgstr "" msgid "Delivery Notes {0} updated" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:619 -#: erpnext/selling/doctype/sales_order/sales_order.js:646 +#: erpnext/selling/doctype/sales_order/sales_order.js:626 +#: erpnext/selling/doctype/sales_order/sales_order.js:653 msgid "Delivery Schedule" msgstr "" @@ -16025,11 +16025,11 @@ msgstr "" msgid "Difference Account" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:724 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:786 msgid "Difference Account in Items Table" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:713 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:775 msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" @@ -16276,6 +16276,9 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' +#: erpnext/manufacturing/doctype/work_order/work_order.js:1056 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:370 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:413 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Disassemble" @@ -16285,7 +16288,11 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:444 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2390 +msgid "Disassemble Qty cannot be less than or equal to 0." +msgstr "" + +#: erpnext/manufacturing/doctype/work_order/work_order.js:447 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -16834,7 +16841,7 @@ msgstr "" msgid "Do you want to change valuation method?" msgstr "" -#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:156 +#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:158 msgid "Do you want to notify all the customers by email?" msgstr "" @@ -17085,7 +17092,7 @@ msgstr "" msgid "Due Date cannot be before {0}" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:144 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:165 msgid "Due to stock closing entry {0}, you cannot repost item valuation before {1}" msgstr "" @@ -18022,8 +18029,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:381 -#: erpnext/manufacturing/doctype/job_card/job_card.js:451 +#: erpnext/manufacturing/doctype/job_card/job_card.js:383 +#: erpnext/manufacturing/doctype/job_card/job_card.js:453 #: 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 @@ -18031,7 +18038,7 @@ msgstr "" msgid "End Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.js:311 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:345 msgid "End Transit" msgstr "" @@ -18108,8 +18115,8 @@ msgstr "" msgid "Enter Serial Nos" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:408 -#: erpnext/manufacturing/doctype/job_card/job_card.js:477 +#: erpnext/manufacturing/doctype/job_card/job_card.js:410 +#: erpnext/manufacturing/doctype/job_card/job_card.js:479 #: erpnext/manufacturing/doctype/workstation/workstation.js:312 msgid "Enter Value" msgstr "" @@ -18185,11 +18192,11 @@ msgstr "" msgid "Enter the opening stock units." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:990 +#: erpnext/manufacturing/doctype/bom/bom.js:992 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:1158 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1218 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set." msgstr "" @@ -18278,7 +18285,7 @@ msgstr "" msgid "Error while processing deferred accounting for {0}" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:533 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:554 msgid "Error while reposting item valuation" msgstr "" @@ -18351,7 +18358,7 @@ msgstr "" msgid "Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings." msgstr "" -#: erpnext/stock/stock_ledger.py:2335 +#: erpnext/stock/stock_ledger.py:2321 msgid "Example: Serial No {0} reserved in {1}." msgstr "" @@ -18361,6 +18368,10 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" +#: erpnext/stock/doctype/stock_entry/stock_entry.py:931 +msgid "Excess Disassembly" +msgstr "" + #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:55 msgid "Excess Materials Consumed" msgstr "" @@ -18506,7 +18517,7 @@ msgstr "" msgid "Excise Entry" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.js:1411 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:1501 msgid "Excise Invoice" msgstr "" @@ -18699,7 +18710,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:604 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:601 #: 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:183 @@ -18770,13 +18781,13 @@ msgstr "" msgid "Expense Head" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:498 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:522 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:542 +#: 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 msgid "Expense Head Changed" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:600 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:597 msgid "Expense account is mandatory for item {0}" msgstr "" @@ -18802,7 +18813,7 @@ msgid "Expenses Included In Valuation" msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:307 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:409 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:496 msgid "Expired Batches" msgstr "" @@ -19079,7 +19090,7 @@ msgstr "" msgid "Fetch Subscription Updates" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1069 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:284 msgid "Fetch Timesheet" msgstr "" @@ -19102,7 +19113,7 @@ msgid "Fetch Value From" msgstr "" #: erpnext/stock/doctype/material_request/material_request.js:372 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:732 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:819 msgid "Fetch exploded BOM (including sub-assemblies)" msgstr "" @@ -19363,9 +19374,9 @@ msgstr "" msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) " msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:878 -#: erpnext/manufacturing/doctype/work_order/work_order.js:893 -#: erpnext/manufacturing/doctype/work_order/work_order.js:902 +#: erpnext/manufacturing/doctype/work_order/work_order.js:884 +#: erpnext/manufacturing/doctype/work_order/work_order.js:899 +#: erpnext/manufacturing/doctype/work_order/work_order.js:908 msgid "Finish" msgstr "" @@ -19381,7 +19392,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:43 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:147 -#: erpnext/selling/doctype/sales_order/sales_order.js:824 +#: erpnext/selling/doctype/sales_order/sales_order.js:831 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json msgid "Finished Good" @@ -19396,7 +19407,7 @@ msgstr "" #. Service Item' #. Label of the fg_item (Link) field in DocType 'Subcontracting Order Service #. Item' -#: erpnext/public/js/utils.js:905 +#: erpnext/public/js/utils.js:921 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json msgid "Finished Good Item" @@ -19409,7 +19420,7 @@ msgstr "" msgid "Finished Good Item Code" msgstr "" -#: erpnext/public/js/utils.js:923 +#: erpnext/public/js/utils.js:939 msgid "Finished Good Item Qty" msgstr "" @@ -19516,11 +19527,11 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1675 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:577 +#: erpnext/selling/doctype/sales_order/sales_order.js:584 msgid "First Delivery Date" msgstr "" @@ -19831,7 +19842,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:521 +#: erpnext/manufacturing/doctype/job_card/job_card.js:523 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "For Operation" msgstr "" @@ -19852,7 +19863,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:836 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:898 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -19880,7 +19891,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:1407 +#: erpnext/selling/doctype/sales_order/sales_order.js:1414 #: erpnext/stock/doctype/material_request/material_request.js:361 #: erpnext/templates/form_grid/material_request_grid.html:36 msgid "For Warehouse" @@ -19932,7 +19943,7 @@ msgstr "" msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2600 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2624 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})" msgstr "" @@ -19949,7 +19960,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:1707 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1799 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -19982,7 +19993,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:977 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1069 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20544,7 +20555,7 @@ msgstr "" msgid "Furniture and Fixtures" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:140 +#: erpnext/accounts/doctype/account/account_tree.js:135 msgid "Further accounts can be made under Groups, but entries can be made against non-Groups" msgstr "" @@ -20833,7 +20844,7 @@ msgstr "" msgid "Get Customer Group Details" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:608 +#: erpnext/selling/doctype/sales_order/sales_order.js:615 msgid "Get Delivery Schedule" msgstr "" @@ -20871,10 +20882,10 @@ msgstr "" #. Label of the get_items_from (Select) field in DocType 'Production Plan' #: 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:293 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:325 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:359 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1125 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:340 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:374 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:406 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:446 #: erpnext/buying/doctype/purchase_order/purchase_order.js:540 #: erpnext/buying/doctype/purchase_order/purchase_order.js:563 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:380 @@ -20889,19 +20900,19 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/public/js/controllers/buying.js:327 #: erpnext/selling/doctype/quotation/quotation.js:183 -#: erpnext/selling/doctype/sales_order/sales_order.js:203 -#: erpnext/selling/doctype/sales_order/sales_order.js:1200 +#: erpnext/selling/doctype/sales_order/sales_order.js:210 +#: erpnext/selling/doctype/sales_order/sales_order.js:1207 #: erpnext/stock/doctype/delivery_note/delivery_note.js:187 #: erpnext/stock/doctype/delivery_note/delivery_note.js:239 #: erpnext/stock/doctype/material_request/material_request.js:141 #: erpnext/stock/doctype/material_request/material_request.js:238 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:144 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:244 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:352 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:399 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:432 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:523 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:699 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:439 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:486 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:519 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:610 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:786 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:165 msgid "Get Items From" msgstr "" @@ -20917,8 +20928,8 @@ msgid "Get Items for Purchase Only" msgstr "" #: erpnext/stock/doctype/material_request/material_request.js:346 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:735 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:748 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:822 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:835 msgid "Get Items from BOM" msgstr "" @@ -21021,7 +21032,7 @@ msgstr "" msgid "Get Suppliers By" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1121 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:336 msgid "Get Timesheets" msgstr "" @@ -21034,7 +21045,7 @@ msgstr "" msgid "Get Unreconciled Entries" msgstr "" -#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:69 +#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:71 msgid "Get stops from" msgstr "" @@ -21093,7 +21104,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2225 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2317 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -21695,7 +21706,7 @@ msgstr "" msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}" msgstr "" -#: erpnext/stock/stock_ledger.py:2057 +#: erpnext/stock/stock_ledger.py:2043 msgid "Here are the options to proceed:" msgstr "" @@ -21723,7 +21734,7 @@ msgstr "" msgid "Hertz" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:535 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:556 msgid "Hi," msgstr "" @@ -21790,7 +21801,7 @@ msgid "History In Company" msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.js:338 -#: erpnext/selling/doctype/sales_order/sales_order.js:989 +#: erpnext/selling/doctype/sales_order/sales_order.js:996 msgid "Hold" msgstr "" @@ -22280,7 +22291,7 @@ msgstr "" msgid "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template." msgstr "" -#: erpnext/stock/stock_ledger.py:2067 +#: erpnext/stock/stock_ledger.py:2053 msgid "If not, you can Cancel / Submit this entry" msgstr "" @@ -22308,7 +22319,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:1191 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1251 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected." msgstr "" @@ -22317,7 +22328,7 @@ msgstr "" msgid "If the account is frozen, entries are allowed to restricted users." msgstr "" -#: erpnext/stock/stock_ledger.py:2060 +#: erpnext/stock/stock_ledger.py:2046 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 "" @@ -22327,7 +22338,7 @@ msgstr "" msgid "If the reorder check is set at the Group warehouse level, the available quantity becomes the sum of the projected quantities of all its child warehouses." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1210 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1270 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed." msgstr "" @@ -22494,7 +22505,7 @@ msgstr "" msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1390 +#: erpnext/selling/doctype/sales_order/sales_order.js:1397 msgid "Ignore Existing Ordered Qty" msgstr "" @@ -22949,7 +22960,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:1386 +#: erpnext/selling/doctype/sales_order/sales_order.js:1393 #: 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 @@ -23170,7 +23181,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:984 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 msgid "Incorrect Component Quantity" msgstr "" @@ -23475,13 +23486,13 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:145 #: erpnext/stock/doctype/pick_list/pick_list.py:163 #: erpnext/stock/doctype/pick_list/pick_list.py:1088 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 -#: erpnext/stock/serial_batch_bundle.py:1205 erpnext/stock/stock_ledger.py:1748 -#: erpnext/stock/stock_ledger.py:2226 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1048 +#: erpnext/stock/serial_batch_bundle.py:1205 erpnext/stock/stock_ledger.py:1734 +#: erpnext/stock/stock_ledger.py:2212 msgid "Insufficient Stock" msgstr "" -#: erpnext/stock/stock_ledger.py:2241 +#: erpnext/stock/stock_ledger.py:2227 msgid "Insufficient Stock for Batch" msgstr "" @@ -23574,7 +23585,7 @@ msgstr "" msgid "Inter Company Order Reference" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1137 +#: erpnext/selling/doctype/sales_order/sales_order.js:1144 msgid "Inter Company Purchase Order" msgstr "" @@ -23640,7 +23651,7 @@ msgstr "" msgid "Internal Customer for company {0} already exists" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1136 +#: erpnext/selling/doctype/sales_order/sales_order.js:1143 msgid "Internal Purchase Order" msgstr "" @@ -23710,8 +23721,8 @@ msgstr "" msgid "Interval should be between 1 to 59 MInutes" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:379 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:387 +#: 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:1017 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1027 #: erpnext/assets/doctype/asset_category/asset_category.py:69 @@ -23762,7 +23773,7 @@ msgstr "" msgid "Invalid Company Field" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2356 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2353 msgid "Invalid Company for Inter Company Transaction." msgstr "" @@ -23784,7 +23795,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:840 +#: erpnext/controllers/taxes_and_totals.py:844 msgid "Invalid Discount Amount" msgstr "" @@ -23896,12 +23907,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1842 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1018 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1110 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1132 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -23926,7 +23937,7 @@ msgstr "" msgid "Invalid file URL" msgstr "" -#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:93 +#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:87 msgid "Invalid filter formula. Please check the syntax." msgstr "" @@ -23965,7 +23976,7 @@ msgstr "" msgid "Invalid {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2354 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2351 msgid "Invalid {0} for Inter Company Transaction." msgstr "" @@ -23989,7 +24000,7 @@ msgstr "" #. Label of a Workspace Sidebar Item #: erpnext/patches/v15_0/refactor_closing_stock_balance.py:43 #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json -#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.py:176 +#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.py:175 #: erpnext/workspace_sidebar/stock.json msgid "Inventory Dimension" msgstr "" @@ -24199,7 +24210,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:2405 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2402 #: 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" @@ -24934,9 +24945,9 @@ 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:1249 +#: erpnext/controllers/taxes_and_totals.py:1253 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json -#: erpnext/manufacturing/doctype/bom/bom.js:1083 +#: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:25 @@ -24955,7 +24966,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:1631 +#: erpnext/selling/doctype/sales_order/sales_order.js:1638 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:50 #: 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 @@ -25182,7 +25193,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:1078 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:293 #: 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:312 @@ -25239,17 +25250,17 @@ msgstr "" #: erpnext/projects/doctype/timesheet/timesheet.js:214 #: erpnext/public/js/controllers/transaction.js:2911 #: erpnext/public/js/stock_reservation.js:112 -#: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:563 -#: erpnext/public/js/utils.js:720 +#: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:579 +#: erpnext/public/js/utils.js:736 #: 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:298 #: 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:1245 -#: erpnext/selling/doctype/sales_order/sales_order.js:1400 +#: erpnext/selling/doctype/sales_order/sales_order.js:375 +#: erpnext/selling/doctype/sales_order/sales_order.js:483 +#: erpnext/selling/doctype/sales_order/sales_order.js:1252 +#: erpnext/selling/doctype/sales_order/sales_order.js:1407 #: 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 @@ -25331,7 +25342,7 @@ msgstr "" msgid "Item Code cannot be changed for Serial No." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:454 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:451 msgid "Item Code required at Row No {0}" msgstr "" @@ -25719,9 +25730,9 @@ msgstr "" #: 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:2917 -#: erpnext/public/js/utils.js:815 +#: erpnext/public/js/utils.js:831 #: erpnext/selling/doctype/quotation_item/quotation_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1252 +#: erpnext/selling/doctype/sales_order/sales_order.js:1259 #: 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 @@ -26096,7 +26107,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:559 +#: erpnext/controllers/taxes_and_totals.py:562 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -26116,7 +26127,7 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3299 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3498 msgid "Item for row {0} does not match Material Request" msgstr "" @@ -26137,7 +26148,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:1638 +#: erpnext/selling/doctype/sales_order/sales_order.js:1645 msgid "Item name" msgstr "" @@ -26150,7 +26161,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1155 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1247 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -26249,7 +26260,7 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2137 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2229 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -26269,7 +26280,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1488 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1580 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -26356,7 +26367,7 @@ msgid "Items Filter" msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.py:1683 -#: erpnext/selling/doctype/sales_order/sales_order.js:1676 +#: erpnext/selling/doctype/sales_order/sales_order.js:1683 msgid "Items Required" msgstr "" @@ -26387,7 +26398,7 @@ 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:1436 +#: erpnext/selling/doctype/sales_order/sales_order.js:1443 msgid "Items for Raw Material Request" msgstr "" @@ -26395,7 +26406,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1151 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -26415,7 +26426,7 @@ msgid "Items to Order and Receive" msgstr "" #: erpnext/public/js/stock_reservation.js:72 -#: erpnext/selling/doctype/sales_order/sales_order.js:327 +#: erpnext/selling/doctype/sales_order/sales_order.js:334 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:226 msgid "Items to Reserve" msgstr "" @@ -26472,7 +26483,7 @@ msgstr "" #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/job_card/job_card.py:997 #: erpnext/manufacturing/doctype/operation/operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:397 +#: erpnext/manufacturing/doctype/work_order/work_order.js:400 #: 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 @@ -26610,7 +26621,7 @@ msgstr "" msgid "Job Worker Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2654 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2678 msgid "Job card {0} created" msgstr "" @@ -26695,7 +26706,7 @@ msgstr "" msgid "Journal Entry Type" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:553 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:556 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset." msgstr "" @@ -26708,7 +26719,7 @@ msgstr "" msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:723 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:726 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher" msgstr "" @@ -27614,7 +27625,7 @@ msgstr "" #. Label of the lost_reasons_section (Section Break) field in DocType #. 'Quotation' #: erpnext/crm/doctype/opportunity/opportunity.json -#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:49 +#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:55 #: erpnext/public/js/utils/sales_common.js:596 #: erpnext/selling/doctype/quotation/quotation.json msgid "Lost Reasons" @@ -27701,7 +27712,7 @@ msgstr "" msgid "Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned." msgstr "" -#: erpnext/public/js/utils.js:184 +#: erpnext/public/js/utils.js:200 msgid "Loyalty Points: {0}" msgstr "" @@ -27715,7 +27726,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:1176 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1202 #: 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 @@ -27912,7 +27923,7 @@ msgstr "" #: 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:1114 +#: erpnext/selling/doctype/sales_order/sales_order.js:1121 #: erpnext/support/workspace/support/support.json #: erpnext/workspace_sidebar/crm.json erpnext/workspace_sidebar/support.json msgid "Maintenance Schedule" @@ -28019,7 +28030,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:1107 +#: erpnext/selling/doctype/sales_order/sales_order.js:1114 #: erpnext/support/doctype/warranty_claim/warranty_claim.js:47 #: erpnext/support/workspace/support/support.json #: erpnext/workspace_sidebar/crm.json erpnext/workspace_sidebar/support.json @@ -28042,9 +28053,9 @@ msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' #: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 -#: erpnext/manufacturing/doctype/job_card/job_card.js:542 -#: erpnext/manufacturing/doctype/work_order/work_order.js:833 -#: erpnext/manufacturing/doctype/work_order/work_order.js:867 +#: erpnext/manufacturing/doctype/job_card/job_card.js:544 +#: erpnext/manufacturing/doctype/work_order/work_order.js:839 +#: erpnext/manufacturing/doctype/work_order/work_order.js:873 #: erpnext/setup/doctype/vehicle/vehicle.json msgid "Make" msgstr "" @@ -28107,7 +28118,7 @@ msgstr "" msgid "Make Stock Entry" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:416 +#: erpnext/manufacturing/doctype/job_card/job_card.js:418 msgid "Make Subcontracting PO" msgstr "" @@ -28171,7 +28182,7 @@ msgstr "" msgid "Mandatory Accounting Dimension" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1882 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1879 msgid "Mandatory Field" msgstr "" @@ -28191,11 +28202,11 @@ msgstr "" msgid "Mandatory Missing" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:637 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:634 msgid "Mandatory Purchase Order" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:658 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:655 msgid "Mandatory Purchase Receipt" msgstr "" @@ -28270,8 +28281,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:1232 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1248 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1324 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1340 #: 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 @@ -28420,7 +28431,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2390 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2589 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -28497,7 +28508,7 @@ msgstr "" msgid "Mapping Subcontracting Order ..." msgstr "" -#: erpnext/public/js/utils.js:1050 +#: erpnext/public/js/utils.js:1066 msgid "Mapping {0} ..." msgstr "" @@ -28643,7 +28654,7 @@ msgstr "" msgid "Material" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:858 +#: erpnext/manufacturing/doctype/work_order/work_order.js:864 msgid "Material Consumption" msgstr "" @@ -28651,12 +28662,12 @@ 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:1233 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1325 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.js:579 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:666 msgid "Material Consumption is not set in Manufacturing Settings." msgstr "" @@ -28738,7 +28749,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:1078 +#: erpnext/selling/doctype/sales_order/sales_order.js:1085 #: 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 @@ -28748,8 +28759,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json -#: erpnext/stock/doctype/stock_entry/stock_entry.js:253 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:356 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:287 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:443 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json @@ -28850,7 +28861,7 @@ msgstr "" msgid "Material Request {0} is cancelled or stopped" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1452 +#: erpnext/selling/doctype/sales_order/sales_order.js:1459 msgid "Material Request {0} submitted." msgstr "" @@ -29039,8 +29050,11 @@ msgstr "" msgid "Max discount allowed for item: {0} is {1}%" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1010 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1040 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1047 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1070 #: erpnext/stock/doctype/pick_list/pick_list.js:200 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:382 msgid "Max: {0}" msgstr "" @@ -29066,11 +29080,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3902 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4104 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3893 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4095 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -29125,7 +29139,7 @@ msgstr "" msgid "Megawatt" msgstr "" -#: erpnext/stock/stock_ledger.py:2073 +#: erpnext/stock/stock_ledger.py:2059 msgid "Mention Valuation Rate in the Item master." msgstr "" @@ -29170,7 +29184,7 @@ msgstr "" msgid "Merge Similar Account Heads" msgstr "" -#: erpnext/public/js/utils.js:1082 +#: erpnext/public/js/utils.js:1098 msgid "Merge taxes from multiple documents" msgstr "" @@ -29498,9 +29512,9 @@ 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:596 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2422 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3030 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:593 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2419 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3027 #: erpnext/assets/doctype/asset_category/asset_category.py:116 msgid "Missing Account" msgstr "" @@ -29526,7 +29540,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1685 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1777 msgid "Missing Finished Good" msgstr "" @@ -29534,7 +29548,7 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:991 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1083 msgid "Missing Item" msgstr "" @@ -29554,7 +29568,7 @@ msgstr "" msgid "Missing Warehouse" msgstr "" -#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:154 +#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:156 msgid "Missing email template for dispatch. Please set one in Delivery Settings." msgstr "" @@ -29563,7 +29577,7 @@ msgid "Missing required filter: {0}" msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:1218 -#: erpnext/manufacturing/doctype/work_order/work_order.py:1476 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1477 msgid "Missing value" msgstr "" @@ -29802,7 +29816,7 @@ msgstr "" msgid "Multiple Loyalty Programs found for Customer {}. Please select manually." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1194 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1191 msgid "Multiple POS Opening Entry" msgstr "" @@ -29820,10 +29834,6 @@ msgstr "" msgid "Multiple Variants" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:152 -msgid "Multiple Warehouse Accounts" -msgstr "" - #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.js:244 msgid "Multiple company fields available: {0}. Please select manually." msgstr "" @@ -29832,7 +29842,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:1692 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1784 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -29841,7 +29851,7 @@ msgid "Music" msgstr "" #. Label of the must_be_whole_number (Check) field in DocType 'UOM' -#: erpnext/manufacturing/doctype/work_order/work_order.py:1423 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1424 #: erpnext/setup/doctype/uom/uom.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:267 #: erpnext/utilities/transaction_base.py:568 @@ -29875,7 +29885,7 @@ msgstr "" msgid "Name of Beneficiary" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:126 +#: erpnext/accounts/doctype/account/account_tree.js:121 msgid "Name of new Account. Note: Please don't create accounts for Customers and Suppliers" msgstr "" @@ -29969,7 +29979,7 @@ msgstr "" msgid "Negative Quantity is not allowed" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1575 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 #: erpnext/stock/serial_batch_bundle.py:1528 msgid "Negative Stock Error" msgstr "" @@ -30284,7 +30294,7 @@ msgstr "" msgid "Net total calculation precision loss" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:124 +#: erpnext/accounts/doctype/account/account_tree.js:119 msgid "New Account Name" msgstr "" @@ -30326,7 +30336,7 @@ msgstr "" msgid "New Batch Qty" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:113 +#: erpnext/accounts/doctype/account/account_tree.js:108 #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:18 #: erpnext/setup/doctype/company/company_tree.js:23 msgid "New Company" @@ -30503,7 +30513,7 @@ msgstr "" msgid "Next email will be sent on:" msgstr "" -#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:161 +#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:155 msgid "No Account Data row found" msgstr "" @@ -30520,7 +30530,7 @@ msgstr "" msgid "No Answer" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2527 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2524 msgid "No Customer found for Inter Company Transactions which represents company {0}" msgstr "" @@ -30529,7 +30539,7 @@ msgstr "" msgid "No Customers found with selected options." msgstr "" -#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:144 +#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:146 msgid "No Delivery Note selected for Customer {}" msgstr "" @@ -30553,11 +30563,11 @@ msgstr "" msgid "No Items selected for transfer." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1226 +#: erpnext/selling/doctype/sales_order/sales_order.js:1233 msgid "No Items with Bill of Materials to Manufacture or all items already manufactured" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1372 +#: erpnext/selling/doctype/sales_order/sales_order.js:1379 msgid "No Items with Bill of Materials." msgstr "" @@ -30577,9 +30587,9 @@ msgstr "" msgid "No POS Profile found. Please create a New POS Profile first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1570 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1630 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1644 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1573 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1633 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1647 #: erpnext/stock/doctype/item/item.py:1388 msgid "No Permission" msgstr "" @@ -30593,11 +30603,6 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:336 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1105 -msgid "No Remarks" -msgstr "" - #: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -30614,7 +30619,7 @@ msgstr "" msgid "No Summary" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2511 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2508 msgid "No Supplier found for Inter Company Transactions which represents company {0}" msgstr "" @@ -30643,7 +30648,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:833 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:832 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:897 msgid "No accounting entries for the following warehouses" msgstr "" @@ -30729,7 +30734,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:600 +#: erpnext/selling/doctype/sales_order/sales_order.js:607 msgid "No of Deliveries" msgstr "" @@ -30805,7 +30810,7 @@ msgstr "" msgid "No open Material Requests found for the given criteria." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1188 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1185 msgid "No open POS Opening Entry found for POS Profile {0}." msgstr "" @@ -30894,7 +30899,7 @@ msgstr "" msgid "No values" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2575 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2572 msgid "No {0} found for Inter Company Transactions." msgstr "" @@ -31084,7 +31089,7 @@ msgstr "" msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1027 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1030 msgid "Note: {0}" msgstr "" @@ -31141,7 +31146,7 @@ msgstr "" msgid "Notice (days)" msgstr "" -#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:45 +#: erpnext/stock/doctype/delivery_trip/delivery_trip.js:47 msgid "Notify Customers via Email" msgstr "" @@ -31240,7 +31245,7 @@ msgstr "" msgid "Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:134 +#: erpnext/accounts/doctype/account/account_tree.js:129 msgid "Number of new Account, it will be included in the account name as a prefix" msgstr "" @@ -31446,7 +31451,7 @@ msgstr "" msgid "Once set, this invoice will be on hold till the set date" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:745 +#: erpnext/manufacturing/doctype/work_order/work_order.js:751 msgid "Once the Work Order is Closed. It can't be resumed." msgstr "" @@ -31542,7 +31547,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1247 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1339 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -31786,7 +31791,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Invoicing Workspace #. Label of a Link in the Home Workspace -#: erpnext/accounts/doctype/account/account_tree.js:206 +#: erpnext/accounts/doctype/account/account_tree.js:201 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/setup/workspace/home/home.json @@ -31807,8 +31812,8 @@ msgstr "" msgid "Opening Invoice Tool" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1647 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1991 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1653 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1988 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 "" @@ -31944,7 +31949,7 @@ msgstr "" msgid "Operation ID" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:333 +#: erpnext/manufacturing/doctype/work_order/work_order.js:336 msgid "Operation Id" msgstr "" @@ -31972,7 +31977,7 @@ msgstr "" msgid "Operation Time" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1482 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1483 msgid "Operation Time must be greater than 0 for Operation {0}" msgstr "" @@ -31987,7 +31992,7 @@ msgstr "" msgid "Operation time does not depend on quantity to produce" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:584 +#: erpnext/manufacturing/doctype/job_card/job_card.js:586 msgid "Operation {0} added multiple times in the work order {1}" msgstr "" @@ -32007,7 +32012,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:314 +#: erpnext/manufacturing/doctype/work_order/work_order.js:317 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/setup/doctype/company/company.py:469 #: erpnext/setup/doctype/email_digest/email_digest.json @@ -32079,7 +32084,7 @@ msgstr "" #: erpnext/crm/doctype/prospect/prospect.js:20 #: erpnext/crm/doctype/prospect_opportunity/prospect_opportunity.json #: erpnext/crm/report/lead_details/lead_details.js:36 -#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:17 +#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:23 #: erpnext/public/js/communication.js:35 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/quotation/quotation.js:155 @@ -32108,7 +32113,7 @@ msgstr "" #. Label of the opportunity_from (Link) field in DocType 'Opportunity' #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/report/lost_opportunity/lost_opportunity.js:42 -#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:24 +#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:30 msgid "Opportunity From" msgstr "" @@ -32161,7 +32166,7 @@ msgstr "" #. Name of a DocType #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/doctype/opportunity_type/opportunity_type.json -#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:44 +#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:50 #: erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:52 #: erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:48 #: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:64 @@ -32182,15 +32187,19 @@ msgstr "" msgid "Optimize Route" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:183 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1017 +msgid "Optional. Select a specific manufacture entry to reverse." +msgstr "" + +#: erpnext/accounts/doctype/account/account_tree.js:178 msgid "Optional. Sets company's default currency, if not specified." msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:162 +#: erpnext/accounts/doctype/account/account_tree.js:157 msgid "Optional. This setting will be used to filter in various transactions." msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:170 +#: erpnext/accounts/doctype/account/account_tree.js:165 msgid "Optional. Used with Financial Report Template" msgstr "" @@ -32480,7 +32489,7 @@ msgstr "" msgid "Out of stock" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1201 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1198 #: erpnext/selling/page/point_of_sale/pos_controller.js:208 msgid "Outdated POS Opening Entry" msgstr "" @@ -32586,7 +32595,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1321 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1344 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -32914,7 +32923,7 @@ msgstr "" msgid "POS Opening Entry" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1202 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1199 msgid "POS Opening Entry - {0} is outdated. Please close the POS and create a new POS Opening Entry." msgstr "" @@ -32935,7 +32944,7 @@ msgstr "" msgid "POS Opening Entry Exists" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1187 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1184 msgid "POS Opening Entry Missing" msgstr "" @@ -32971,7 +32980,7 @@ msgstr "" msgid "POS Profile" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1195 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1192 msgid "POS Profile - {0} has multiple open POS Opening Entries. Please close or cancel the existing entries before proceeding." msgstr "" @@ -32989,11 +32998,11 @@ msgstr "" msgid "POS Profile doesn't match {}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1155 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1152 msgid "POS Profile is mandatory to mark this invoice as POS Transaction." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1384 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1381 msgid "POS Profile required to make POS Entry" msgstr "" @@ -33228,7 +33237,7 @@ msgid "Paid To Account Type" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:326 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1151 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1148 msgid "Paid amount + Write Off Amount can not be greater than Grand Total" msgstr "" @@ -33384,7 +33393,7 @@ msgstr "" msgid "Parent Row No" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:533 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:535 msgid "Parent Row No not found for {0}" msgstr "" @@ -33440,7 +33449,7 @@ msgstr "" msgid "Partial Material Transferred" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1174 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1171 msgid "Partial Payment in POS Transactions are not allowed." msgstr "" @@ -33656,7 +33665,7 @@ msgstr "" #: erpnext/crm/doctype/appointment/appointment.json #: erpnext/crm/doctype/opportunity/opportunity.json #: erpnext/crm/report/lost_opportunity/lost_opportunity.js:55 -#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:31 +#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:37 #: erpnext/public/js/bank_reconciliation_tool/data_table_manager.js:50 #: erpnext/public/js/bank_reconciliation_tool/dialog_manager.js:135 #: erpnext/selling/doctype/quotation/quotation.json @@ -34001,7 +34010,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:42 #: erpnext/buying/doctype/purchase_order/purchase_order.js:421 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:24 -#: erpnext/selling/doctype/sales_order/sales_order.js:1159 +#: erpnext/selling/doctype/sales_order/sales_order.js:1166 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:31 msgid "Payment" msgstr "" @@ -34163,7 +34172,7 @@ msgstr "" msgid "Payment Gateway Account" msgstr "" -#: erpnext/accounts/utils.py:1437 +#: erpnext/accounts/utils.py:1509 msgid "Payment Gateway Account not created, please create one manually." msgstr "" @@ -34353,7 +34362,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:135 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:139 #: erpnext/buying/doctype/purchase_order/purchase_order.js:429 -#: erpnext/selling/doctype/sales_order/sales_order.js:1152 +#: erpnext/selling/doctype/sales_order/sales_order.js:1159 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Request" @@ -34554,7 +34563,7 @@ msgstr "" msgid "Payment Unlink Error" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:895 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:898 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}" msgstr "" @@ -34566,7 +34575,7 @@ msgstr "" msgid "Payment methods are mandatory. Please add at least one payment method." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3034 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3031 msgid "Payment methods refreshed. Please review before proceeding." msgstr "" @@ -34692,9 +34701,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:338 +#: erpnext/manufacturing/doctype/work_order/work_order.js:341 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:182 -#: erpnext/selling/doctype/sales_order/sales_order.js:1645 +#: erpnext/selling/doctype/sales_order/sales_order.js:1652 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45 msgid "Pending Qty" msgstr "" @@ -34729,7 +34738,7 @@ msgstr "" msgid "Pending activities for today" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:254 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:275 msgid "Pending processing" msgstr "" @@ -35056,7 +35065,7 @@ msgstr "" #. Reservation Entry' #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item -#: erpnext/selling/doctype/sales_order/sales_order.js:1022 +#: erpnext/selling/doctype/sales_order/sales_order.js:1029 #: erpnext/stock/doctype/delivery_note/delivery_note.js:199 #: erpnext/stock/doctype/material_request/material_request.js:156 #: erpnext/stock/doctype/pick_list/pick_list.json @@ -35398,6 +35407,7 @@ msgstr "" msgid "Please Select a Company." msgstr "" +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:418 #: erpnext/stock/doctype/delivery_note/delivery_note.js:162 #: erpnext/stock/doctype/delivery_note/delivery_note.js:204 msgid "Please Select a Customer" @@ -35453,7 +35463,7 @@ msgstr "" msgid "Please add the Bank Account column" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:244 +#: erpnext/accounts/doctype/account/account_tree.js:239 msgid "Please add the account to root level Company - {0}" msgstr "" @@ -35473,7 +35483,7 @@ msgstr "" msgid "Please attach CSV file" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3173 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3170 msgid "Please cancel and amend the Payment Entry" msgstr "" @@ -35491,7 +35501,7 @@ msgstr "" msgid "Please capitalize this asset before submitting." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:969 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:972 msgid "Please check Multi Currency option to allow accounts with other currency" msgstr "" @@ -35507,7 +35517,7 @@ msgstr "" msgid "Please check the 'Enable Serial and Batch No for Item' checkbox in the {0} to make Serial and Batch Bundle for the item." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:541 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:562 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again." msgstr "" @@ -35608,11 +35618,11 @@ msgstr "" msgid "Please enable {} in {} to allow same item in multiple rows" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:373 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:384 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:381 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 "" @@ -35624,12 +35634,12 @@ msgstr "" msgid "Please ensure {} account {} is a Receivable account." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:699 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:761 msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}" msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:554 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1286 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1283 msgid "Please enter Account for Change Amount" msgstr "" @@ -35658,7 +35668,7 @@ msgid "Please enter Expense Account" msgstr "" #: erpnext/assets/doctype/asset_capitalization/asset_capitalization.js:84 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:87 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:97 msgid "Please enter Item Code to get Batch Number" msgstr "" @@ -35690,7 +35700,7 @@ msgstr "" msgid "Please enter Receipt Document" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1033 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1036 msgid "Please enter Reference date" msgstr "" @@ -35714,20 +35724,20 @@ msgstr "" msgid "Please enter Warehouse and Date" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:662 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1282 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:659 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1279 msgid "Please enter Write Off Account" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:717 +#: erpnext/selling/doctype/sales_order/sales_order.js:724 msgid "Please enter a valid number of deliveries" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:658 +#: erpnext/selling/doctype/sales_order/sales_order.js:665 msgid "Please enter a valid quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:652 +#: erpnext/selling/doctype/sales_order/sales_order.js:659 msgid "Please enter at least one delivery date and quantity" msgstr "" @@ -35767,7 +35777,7 @@ msgstr "" msgid "Please enter the company name to confirm" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:713 +#: erpnext/selling/doctype/sales_order/sales_order.js:720 msgid "Please enter the first delivery date" msgstr "" @@ -35877,7 +35887,7 @@ msgstr "" msgid "Please save first" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:859 +#: erpnext/selling/doctype/sales_order/sales_order.js:866 msgid "Please save the Sales Order before adding a delivery schedule." msgstr "" @@ -35885,7 +35895,7 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:846 +#: erpnext/controllers/taxes_and_totals.py:850 #: erpnext/public/js/controllers/taxes_and_totals.js:796 msgid "Please select Apply Discount On" msgstr "" @@ -36002,7 +36012,7 @@ msgstr "" msgid "Please select Stock Asset Account" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1611 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1703 msgid "Please select Subcontracting Order instead of Purchase Order {0}" msgstr "" @@ -36075,7 +36085,7 @@ msgstr "" msgid "Please select a field to edit from numpad" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:709 +#: erpnext/selling/doctype/sales_order/sales_order.js:716 msgid "Please select a frequency for delivery schedule" msgstr "" @@ -36120,15 +36130,15 @@ msgstr "" msgid "Please select at least one schedule." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1296 +#: erpnext/selling/doctype/sales_order/sales_order.js:1303 msgid "Please select atleast one item to continue" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:381 +#: erpnext/manufacturing/doctype/work_order/work_order.js:384 msgid "Please select atleast one operation to create Job Card" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1709 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1712 msgid "Please select correct account" msgstr "" @@ -36146,13 +36156,13 @@ msgid "Please select item code" msgstr "" #: erpnext/public/js/stock_reservation.js:212 -#: erpnext/selling/doctype/sales_order/sales_order.js:419 +#: erpnext/selling/doctype/sales_order/sales_order.js:426 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:301 msgid "Please select items to reserve." msgstr "" #: erpnext/public/js/stock_reservation.js:290 -#: erpnext/selling/doctype/sales_order/sales_order.js:523 +#: erpnext/selling/doctype/sales_order/sales_order.js:530 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:399 msgid "Please select items to unreserve." msgstr "" @@ -36226,7 +36236,7 @@ msgstr "" msgid "Please set Account" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1882 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1879 msgid "Please set Account for Change Amount" msgstr "" @@ -36248,7 +36258,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:789 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:880 msgid "Please set Company" msgstr "" @@ -36278,11 +36288,11 @@ msgstr "" msgid "Please set Fixed Asset Account in Asset Category {0}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:593 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:590 msgid "Please set Fixed Asset Account in {} against {}." msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:279 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:281 msgid "Please set Parent Row No for item {0}" msgstr "" @@ -36328,7 +36338,7 @@ msgstr "" msgid "Please set a default Holiday List for Employee {0} or Company {1}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1116 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1117 msgid "Please set account in Warehouse {0}" msgstr "" @@ -36357,23 +36367,23 @@ msgstr "" msgid "Please set both the Tax ID and Fiscal Code on Company {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2419 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2416 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:3027 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3024 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:3029 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3026 msgid "Please set default Cash or Bank account in Mode of Payments {}" msgstr "" -#: erpnext/accounts/utils.py:2451 +#: erpnext/accounts/utils.py:2527 msgid "Please set default Exchange Gain/Loss Account in Company {}" msgstr "" @@ -36422,7 +36432,7 @@ msgstr "" msgid "Please set the Default Cost Center in {0} company." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:662 +#: erpnext/manufacturing/doctype/work_order/work_order.js:668 msgid "Please set the Item Code first" msgstr "" @@ -36461,7 +36471,7 @@ msgstr "" msgid "Please set {0} for address {1}" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:232 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:234 msgid "Please set {0} in BOM Creator {1}" msgstr "" @@ -36487,7 +36497,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:120 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:419 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:526 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:613 msgid "Please specify Company to proceed" msgstr "" @@ -36512,7 +36522,7 @@ msgstr "" msgid "Please specify from/to range" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:253 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:274 msgid "Please try again in an hour." msgstr "" @@ -36736,7 +36746,7 @@ msgstr "" msgid "Posting Date Inheritance for Exchange Gain / Loss" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:270 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:269 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:142 msgid "Posting Date cannot be future date" msgstr "" @@ -36804,10 +36814,14 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2338 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2537 msgid "Posting date and posting time is mandatory" msgstr "" +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:99 +msgid "Posting date is required" +msgstr "" + #: erpnext/controllers/sales_and_purchase_return.py:66 msgid "Posting timestamp must be after {0}" msgstr "" @@ -37613,7 +37627,7 @@ msgstr "" msgid "Process Loss Qty" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:338 +#: erpnext/manufacturing/doctype/job_card/job_card.js:340 msgid "Process Loss Quantity" msgstr "" @@ -38586,7 +38600,7 @@ msgstr "" #: 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 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:337 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:424 #: erpnext/workspace_sidebar/buying.json #: erpnext/workspace_sidebar/invoicing.json msgid "Purchase Invoice" @@ -38625,12 +38639,12 @@ msgstr "" msgid "Purchase Invoice cannot be made against an existing asset {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:453 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:467 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:452 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:466 msgid "Purchase Invoice {0} is already submitted" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1932 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1938 msgid "Purchase Invoices" msgstr "" @@ -38673,8 +38687,8 @@ msgstr "" #: erpnext/crm/doctype/contract/contract.json #: erpnext/manufacturing/doctype/blanket_order/blanket_order.js:54 #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:181 -#: erpnext/selling/doctype/sales_order/sales_order.js:1097 +#: erpnext/selling/doctype/sales_order/sales_order.js:188 +#: erpnext/selling/doctype/sales_order/sales_order.js:1104 #: 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 @@ -38757,11 +38771,11 @@ msgstr "" msgid "Purchase Order Pricing Rule" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:633 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:630 msgid "Purchase Order Required" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:628 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:625 msgid "Purchase Order Required for item {}" msgstr "" @@ -38775,11 +38789,11 @@ msgstr "" msgid "Purchase Order Trends" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1589 +#: erpnext/selling/doctype/sales_order/sales_order.js:1596 msgid "Purchase Order already created for all Sales Order items" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:339 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:338 msgid "Purchase Order number required for Item {0}" msgstr "" @@ -38787,7 +38801,7 @@ msgstr "" msgid "Purchase Order {0} created" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:671 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:668 msgid "Purchase Order {0} is not submitted" msgstr "" @@ -38904,11 +38918,11 @@ msgstr "" msgid "Purchase Receipt No" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:654 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651 msgid "Purchase Receipt Required" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:649 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:646 msgid "Purchase Receipt Required for item {}" msgstr "" @@ -38936,7 +38950,7 @@ msgstr "" msgid "Purchase Receipt {0} created." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:678 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:675 msgid "Purchase Receipt {0} is not submitted" msgstr "" @@ -39054,14 +39068,14 @@ msgstr "" #: 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:372 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:459 #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Purpose" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:516 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:578 msgid "Purpose must be one of {0}" msgstr "" @@ -39126,7 +39140,7 @@ msgstr "" #: erpnext/controllers/trends.py:276 erpnext/controllers/trends.py:288 #: erpnext/controllers/trends.py:293 #: erpnext/crm/doctype/opportunity_item/opportunity_item.json -#: erpnext/manufacturing/doctype/bom/bom.js:1103 +#: erpnext/manufacturing/doctype/bom/bom.js:1105 #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json #: erpnext/manufacturing/doctype/bom_item/bom_item.json #: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json @@ -39142,15 +39156,15 @@ msgstr "" #: 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:853 +#: erpnext/public/js/stock_reservation.js:336 erpnext/public/js/utils.js:869 #: erpnext/selling/doctype/delivery_schedule_item/delivery_schedule_item.json #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:390 -#: 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:1272 -#: erpnext/selling/doctype/sales_order/sales_order.js:1425 +#: erpnext/selling/doctype/sales_order/sales_order.js:397 +#: erpnext/selling/doctype/sales_order/sales_order.js:501 +#: erpnext/selling/doctype/sales_order/sales_order.js:591 +#: erpnext/selling/doctype/sales_order/sales_order.js:638 +#: erpnext/selling/doctype/sales_order/sales_order.js:1279 +#: erpnext/selling/doctype/sales_order/sales_order.js:1432 #: 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 @@ -39260,7 +39274,7 @@ msgstr "" msgid "Qty To Manufacture" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1419 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1420 msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}." msgstr "" @@ -39315,7 +39329,8 @@ msgstr "" msgid "Qty for which recursion isn't applicable." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1008 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1045 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1068 msgid "Qty for {0}" msgstr "" @@ -39362,11 +39377,15 @@ msgstr "" msgid "Qty to Deliver" msgstr "" +#: erpnext/stock/doctype/stock_entry/stock_entry.js:379 +msgid "Qty to Disassemble" +msgstr "" + #: erpnext/public/js/utils/serial_no_batch_selector.js:373 msgid "Qty to Fetch" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:310 +#: erpnext/manufacturing/doctype/job_card/job_card.js:312 #: erpnext/manufacturing/doctype/job_card/job_card.py:889 msgid "Qty to Manufacture" msgstr "" @@ -39553,7 +39572,13 @@ msgid "Quality Inspection Reading" msgstr "" #. Label of the inspection_required (Check) field in DocType 'BOM' +#. Label of the quality_inspection_required (Check) field in DocType 'BOM +#. Operation' +#. Label of the quality_inspection_required (Check) field in DocType 'Work +#. Order Operation' #: erpnext/manufacturing/doctype/bom/bom.json +#: erpnext/manufacturing/doctype/bom_operation/bom_operation.json +#: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Quality Inspection Required" msgstr "" @@ -39613,7 +39638,7 @@ msgid "Quality Inspection {0} is rejected for the item: {1}" msgstr "" #: erpnext/public/js/controllers/transaction.js:384 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:196 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:206 msgid "Quality Inspection(s)" msgstr "" @@ -39766,7 +39791,7 @@ msgstr "" #: 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 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:728 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:815 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json #: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json #: erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py:36 @@ -39881,7 +39906,7 @@ msgstr "" msgid "Quantity must be less than or equal to {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1038 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1098 #: erpnext/stock/doctype/pick_list/pick_list.js:206 msgid "Quantity must not be more than {0}" msgstr "" @@ -39896,21 +39921,21 @@ msgid "Quantity required for Item {0} in row {1}" msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:716 -#: erpnext/manufacturing/doctype/job_card/job_card.js:391 -#: erpnext/manufacturing/doctype/job_card/job_card.js:461 +#: erpnext/manufacturing/doctype/job_card/job_card.js:393 +#: erpnext/manufacturing/doctype/job_card/job_card.js:463 #: erpnext/manufacturing/doctype/workstation/workstation.js:303 msgid "Quantity should be greater than 0" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:343 +#: erpnext/manufacturing/doctype/work_order/work_order.js:346 msgid "Quantity to Manufacture" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2593 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2617 msgid "Quantity to Manufacture can not be zero for the operation {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1411 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1412 msgid "Quantity to Manufacture must be greater than 0." msgstr "" @@ -39989,7 +40014,7 @@ msgstr "" #. Label of a Link in the Selling Workspace #. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule' #. Label of a Workspace Sidebar Item -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:300 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:381 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:51 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20 #: erpnext/crm/doctype/contract/contract.json @@ -40000,7 +40025,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:1175 +#: erpnext/selling/doctype/sales_order/sales_order.js:1182 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40183,7 +40208,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom_item/bom_item.json #: erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_item.json #: erpnext/manufacturing/doctype/work_order_item/work_order_item.json -#: erpnext/public/js/utils.js:863 +#: erpnext/public/js/utils.js:879 #: erpnext/selling/doctype/product_bundle_item/product_bundle_item.json #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -40506,7 +40531,7 @@ 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:446 -#: erpnext/manufacturing/doctype/bom/bom.js:1076 +#: erpnext/manufacturing/doctype/bom/bom.js:1078 #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/production_plan/production_plan.json @@ -40536,7 +40561,7 @@ msgstr "" msgid "Raw Materials Consumption" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:327 msgid "Raw Materials Missing" msgstr "" @@ -40592,8 +40617,8 @@ msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.js:369 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:124 -#: erpnext/manufacturing/doctype/work_order/work_order.js:761 -#: erpnext/selling/doctype/sales_order/sales_order.js:968 +#: erpnext/manufacturing/doctype/work_order/work_order.js:767 +#: erpnext/selling/doctype/sales_order/sales_order.js:975 #: erpnext/selling/doctype/sales_order/sales_order_list.js:70 #: erpnext/stock/doctype/material_request/material_request.js:243 #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js:116 @@ -40692,7 +40717,7 @@ msgid "Reason for Failure" msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.js:679 -#: erpnext/selling/doctype/sales_order/sales_order.js:1760 +#: erpnext/selling/doctype/sales_order/sales_order.js:1767 msgid "Reason for Hold" msgstr "" @@ -40701,7 +40726,7 @@ msgstr "" msgid "Reason for Leaving" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1775 +#: erpnext/selling/doctype/sales_order/sales_order.js:1782 msgid "Reason for hold:" msgstr "" @@ -40895,7 +40920,7 @@ msgstr "" msgid "Received Quantity" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.js:321 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:355 msgid "Received Stock Entries" msgstr "" @@ -41135,7 +41160,7 @@ msgstr "" msgid "Ref Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1031 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1034 msgid "Reference #{0} dated {1}" msgstr "" @@ -41173,7 +41198,7 @@ msgstr "" msgid "Reference No" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:645 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:648 msgid "Reference No & Reference Date is required for {0}" msgstr "" @@ -41181,7 +41206,7 @@ msgstr "" msgid "Reference No and Reference Date is mandatory for Bank transaction" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:650 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:653 msgid "Reference No is mandatory if you entered Reference Date" msgstr "" @@ -41330,7 +41355,7 @@ msgstr "" msgid "Regular" msgstr "" -#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.py:199 +#: erpnext/stock/doctype/inventory_dimension/inventory_dimension.py:202 msgid "Rejected " msgstr "" @@ -41758,7 +41783,7 @@ msgstr "" msgid "Repost Item Valuation" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:346 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:367 msgid "Repost Item Valuation restarted for selected failed records." msgstr "" @@ -41888,7 +41913,7 @@ msgstr "" msgid "Reqd Qty (BOM)" msgstr "" -#: erpnext/public/js/utils.js:879 +#: erpnext/public/js/utils.js:895 msgid "Reqd by date" msgstr "" @@ -41955,7 +41980,7 @@ msgstr "" msgid "Request for Quotation Supplier" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1084 +#: erpnext/selling/doctype/sales_order/sales_order.js:1091 msgid "Request for Raw Materials" msgstr "" @@ -42160,8 +42185,8 @@ msgstr "" msgid "Reservation Based On" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:919 -#: erpnext/selling/doctype/sales_order/sales_order.js:99 +#: erpnext/manufacturing/doctype/work_order/work_order.js:925 +#: erpnext/selling/doctype/sales_order/sales_order.js:106 #: erpnext/stock/doctype/pick_list/pick_list.js:150 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:180 msgid "Reserve" @@ -42175,7 +42200,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/public/js/stock_reservation.js:15 -#: erpnext/selling/doctype/sales_order/sales_order.js:397 +#: erpnext/selling/doctype/sales_order/sales_order.js:404 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:278 @@ -42275,29 +42300,29 @@ msgstr "" msgid "Reserved Quantity for Production" msgstr "" -#: erpnext/stock/stock_ledger.py:2341 +#: erpnext/stock/stock_ledger.py:2327 msgid "Reserved Serial No." msgstr "" #. Label of the reserved_stock (Float) field in DocType 'Bin' #. Name of a report #: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:24 -#: erpnext/manufacturing/doctype/work_order/work_order.js:935 +#: erpnext/manufacturing/doctype/work_order/work_order.js:941 #: erpnext/public/js/stock_reservation.js:236 -#: erpnext/selling/doctype/sales_order/sales_order.js:127 -#: erpnext/selling/doctype/sales_order/sales_order.js:457 +#: erpnext/selling/doctype/sales_order/sales_order.js:134 +#: erpnext/selling/doctype/sales_order/sales_order.js:464 #: erpnext/stock/dashboard/item_dashboard_list.html:15 #: erpnext/stock/doctype/bin/bin.json #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/report/reserved_stock/reserved_stock.json #: erpnext/stock/report/stock_balance/stock_balance.py:572 -#: erpnext/stock/stock_ledger.py:2325 +#: erpnext/stock/stock_ledger.py:2311 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:205 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:333 msgid "Reserved Stock" msgstr "" -#: erpnext/stock/stock_ledger.py:2370 +#: erpnext/stock/stock_ledger.py:2356 msgid "Reserved Stock for Batch" msgstr "" @@ -42342,7 +42367,7 @@ msgid "Reserved for sub contracting" msgstr "" #: erpnext/public/js/stock_reservation.js:203 -#: erpnext/selling/doctype/sales_order/sales_order.js:410 +#: erpnext/selling/doctype/sales_order/sales_order.js:417 #: erpnext/stock/doctype/pick_list/pick_list.js:295 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:293 msgid "Reserving Stock..." @@ -42559,7 +42584,7 @@ msgstr "" #: erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.js:43 #: erpnext/buying/doctype/purchase_order/purchase_order.js:344 #: erpnext/manufacturing/doctype/workstation/workstation_job_card.html:63 -#: erpnext/selling/doctype/sales_order/sales_order.js:954 +#: erpnext/selling/doctype/sales_order/sales_order.js:961 msgid "Resume" msgstr "" @@ -42664,7 +42689,7 @@ msgstr "" msgid "Return Against Subcontracting Receipt" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:284 +#: erpnext/manufacturing/doctype/work_order/work_order.js:287 msgid "Return Components" msgstr "" @@ -42700,7 +42725,7 @@ msgstr "" msgid "Return Raw Material to Customer" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1525 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1522 msgid "Return invoice of asset cancelled" msgstr "" @@ -43009,7 +43034,7 @@ msgstr "" #. Label of the root_type (Select) field in DocType 'Account' #. Label of the root_type (Select) field in DocType 'Ledger Merge' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:152 +#: erpnext/accounts/doctype/account/account_tree.js:147 #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/report/account_balance/account_balance.js:22 msgid "Root Type" @@ -43230,12 +43255,12 @@ msgid "Row #1: Sequence ID must be 1 for Operation {0}." msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:563 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2074 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2071 msgid "Row #{0} (Payment Table): Amount must be negative" msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:561 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2069 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2066 msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" @@ -43467,7 +43492,7 @@ msgstr "" msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:472 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:534 msgid "Row #{0}: Finished Good must be {1}" msgstr "" @@ -43480,11 +43505,11 @@ msgstr "" msgid "Row #{0}: For Customer Provided Item {1}, Source Warehouse must be {2}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:693 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:696 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:703 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:706 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited" msgstr "" @@ -43504,7 +43529,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1542 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1634 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -43581,7 +43606,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:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:960 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 "" @@ -43767,11 +43792,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:1015 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1107 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1037 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1129 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -43783,7 +43808,7 @@ msgstr "" msgid "Row #{0}: Status is mandatory" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:455 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:458 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}" msgstr "" @@ -43816,7 +43841,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:1268 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1265 msgid "Row #{0}: Stock quantity {1} ({2}) for item {3} cannot exceed {4}" msgstr "" @@ -43985,7 +44010,7 @@ msgstr "" msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:443 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:440 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}" msgstr "" @@ -43997,7 +44022,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1566 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1658 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -44005,7 +44030,7 @@ msgstr "" msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:608 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:611 msgid "Row {0}: Account {1} and Party Type {2} have different account types" msgstr "" @@ -44013,11 +44038,11 @@ msgstr "" msgid "Row {0}: Activity Type is mandatory." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:674 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:677 msgid "Row {0}: Advance against Customer must be credit" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:676 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:679 msgid "Row {0}: Advance against Supplier must be debit" msgstr "" @@ -44029,7 +44054,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:1227 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -44037,7 +44062,7 @@ msgstr "" msgid "Row {0}: Bill of Materials not found for the Item {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:927 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:930 msgid "Row {0}: Both Debit and Credit values cannot be zero" msgstr "" @@ -44059,7 +44084,7 @@ msgstr "" msgid "Row {0}: Cost center is required for an item {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:773 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:776 msgid "Row {0}: Credit entry can not be linked with a {1}" msgstr "" @@ -44067,7 +44092,7 @@ msgstr "" msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:768 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:771 msgid "Row {0}: Debit entry can not be linked with a {1}" msgstr "" @@ -44087,8 +44112,8 @@ msgstr "" msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1018 -#: erpnext/controllers/taxes_and_totals.py:1377 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1021 +#: erpnext/controllers/taxes_and_totals.py:1381 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -44104,15 +44129,15 @@ msgstr "" msgid "Row {0}: Expense Account {1} is linked to company {2}. Please select an account belonging to company {3}." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:533 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:530 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:490 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:487 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:515 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:512 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}" msgstr "" @@ -44141,7 +44166,7 @@ msgstr "" msgid "Row {0}: Hours value must be greater than zero." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:793 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:796 msgid "Row {0}: Invalid reference {1}" msgstr "" @@ -44181,11 +44206,11 @@ msgstr "" msgid "Row {0}: Packing Slip is already created for Item {1}." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:819 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:822 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:597 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:600 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}" msgstr "" @@ -44193,11 +44218,11 @@ msgstr "" msgid "Row {0}: Payment Term is mandatory" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:667 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:670 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:660 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:663 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry." msgstr "" @@ -44241,7 +44266,7 @@ msgstr "" msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:563 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:625 msgid "Row {0}: Qty in Stock UOM can not be zero." msgstr "" @@ -44253,7 +44278,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:942 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1034 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -44265,7 +44290,7 @@ msgstr "" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1579 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1671 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" @@ -44281,7 +44306,7 @@ msgstr "" msgid "Row {0}: The entire expense amount for account {1} in {2} has already been allocated." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:609 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:671 msgid "Row {0}: The item {1}, quantity must be positive number" msgstr "" @@ -44293,11 +44318,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:3394 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3593 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:557 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:619 msgid "Row {0}: UOM Conversion Factor is mandatory" msgstr "" @@ -44330,7 +44355,7 @@ msgstr "" msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:833 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:836 msgid "Row {0}: {1} {2} does not match with {3}" msgstr "" @@ -44455,7 +44480,7 @@ msgstr "" msgid "SLA Paused On" msgstr "" -#: erpnext/public/js/utils.js:1243 +#: erpnext/public/js/utils.js:1259 msgid "SLA is on hold since {0}" msgstr "" @@ -44662,7 +44687,7 @@ 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:1063 +#: erpnext/selling/doctype/sales_order/sales_order.js:1070 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -44810,7 +44835,7 @@ msgstr "" #. Label of a Workspace Sidebar Item #: 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:278 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:359 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:284 #: erpnext/accounts/report/sales_register/sales_register.py:238 @@ -44908,8 +44933,8 @@ msgstr "" #: 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/delivery_schedule_item/delivery_schedule_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:336 -#: erpnext/selling/doctype/sales_order/sales_order.js:1279 +#: erpnext/selling/doctype/sales_order/sales_order.js:343 +#: erpnext/selling/doctype/sales_order/sales_order.js:1286 #: 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 @@ -44960,7 +44985,7 @@ msgstr "" 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:1398 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1395 msgid "Sales Order {0} is not submitted" msgstr "" @@ -45236,7 +45261,7 @@ msgstr "" #. Label of a Workspace Sidebar Item #: 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/lost_opportunity/lost_opportunity.py:57 #: erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:70 #: erpnext/crm/workspace/crm/crm.json erpnext/workspace_sidebar/crm.json msgid "Sales Stage" @@ -45390,7 +45415,7 @@ msgid "Sample Quantity" msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:269 -#: erpnext/stock/doctype/stock_entry/stock_entry.js:448 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:535 msgid "Sample Retention Stock Entry" msgstr "" @@ -45407,7 +45432,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3884 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4086 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -45776,7 +45801,7 @@ msgstr "" msgid "Select Accounting Dimension." msgstr "" -#: erpnext/public/js/utils.js:539 +#: erpnext/public/js/utils.js:555 msgid "Select Alternate Item" msgstr "" @@ -45788,15 +45813,15 @@ msgstr "" msgid "Select Attribute Values" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1262 +#: erpnext/selling/doctype/sales_order/sales_order.js:1269 msgid "Select BOM" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1239 +#: erpnext/selling/doctype/sales_order/sales_order.js:1246 msgid "Select BOM and Qty for Production" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1395 +#: erpnext/selling/doctype/sales_order/sales_order.js:1402 msgid "Select BOM, Qty and For Warehouse" msgstr "" @@ -45830,7 +45855,7 @@ msgstr "" msgid "Select Company Address" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:539 +#: erpnext/manufacturing/doctype/job_card/job_card.js:541 msgid "Select Corrective Operation" msgstr "" @@ -45871,7 +45896,7 @@ msgid "Select Employees" msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.js:198 -#: erpnext/selling/doctype/sales_order/sales_order.js:818 +#: erpnext/selling/doctype/sales_order/sales_order.js:825 msgid "Select Finished Good" msgstr "" @@ -45881,13 +45906,13 @@ 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:1596 -#: erpnext/selling/doctype/sales_order/sales_order.js:1624 +#: erpnext/selling/doctype/sales_order/sales_order.js:1603 +#: erpnext/selling/doctype/sales_order/sales_order.js:1631 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:493 msgid "Select Items" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1482 +#: erpnext/selling/doctype/sales_order/sales_order.js:1489 msgid "Select Items based on Delivery Date" msgstr "" @@ -45898,7 +45923,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:1291 +#: erpnext/selling/doctype/sales_order/sales_order.js:1298 msgid "Select Items to Manufacture" msgstr "" @@ -45916,7 +45941,7 @@ msgstr "" msgid "Select Job Worker Address" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1173 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1199 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:955 msgid "Select Loyalty Program" msgstr "" @@ -45929,7 +45954,7 @@ msgstr "" msgid "Select Possible Supplier" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1044 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1104 #: erpnext/stock/doctype/pick_list/pick_list.js:216 msgid "Select Quantity" msgstr "" @@ -46063,11 +46088,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:1146 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1206 msgid "Select the Item to be manufactured." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:983 +#: erpnext/manufacturing/doctype/bom/bom.js:985 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically." msgstr "" @@ -46088,7 +46113,7 @@ msgstr "" msgid "Select the date and your timezone" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:1002 +#: erpnext/manufacturing/doctype/bom/bom.js:1004 msgid "Select the raw materials (Items) required to manufacture the Item" msgstr "" @@ -46116,7 +46141,7 @@ msgstr "" msgid "Selected POS Opening Entry should be open." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2570 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2567 msgid "Selected Price List should have buying and selling fields checked." msgstr "" @@ -46166,7 +46191,7 @@ msgstr "" msgid "Sell quantity cannot exceed the asset quantity" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1411 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1408 msgid "Sell quantity cannot exceed the asset quantity. Asset {0} has only {1} item(s)." msgstr "" @@ -46365,7 +46390,7 @@ msgstr "" msgid "Serial / Batch No" msgstr "" -#: erpnext/public/js/utils.js:201 +#: erpnext/public/js/utils.js:217 msgid "Serial / Batch Nos" msgstr "" @@ -46478,7 +46503,7 @@ msgstr "" msgid "Serial No Range" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2639 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2672 msgid "Serial No Reserved" msgstr "" @@ -46535,7 +46560,7 @@ msgstr "" msgid "Serial No and Batch Traceability" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1146 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1179 msgid "Serial No is mandatory" msgstr "" @@ -46564,7 +46589,7 @@ msgstr "" msgid "Serial No {0} does not exist" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3429 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:3462 msgid "Serial No {0} does not exists" msgstr "" @@ -46580,7 +46605,7 @@ msgstr "" msgid "Serial No {0} is already assigned to customer {1}. Can only be returned against the customer {1}" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:451 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:484 msgid "Serial No {0} is not present in the {1} {2}, hence you can't return it against the {1} {2}" msgstr "" @@ -46618,11 +46643,11 @@ msgstr "" msgid "Serial Nos and Batches" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1925 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1958 msgid "Serial Nos are created successfully" msgstr "" -#: erpnext/stock/stock_ledger.py:2331 +#: erpnext/stock/stock_ledger.py:2317 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding." msgstr "" @@ -46699,11 +46724,11 @@ msgstr "" msgid "Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2147 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2180 msgid "Serial and Batch Bundle created" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2219 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2252 msgid "Serial and Batch Bundle updated" msgstr "" @@ -47105,7 +47130,7 @@ msgstr "" #. Label of the set_basic_rate_manually (Check) field in DocType 'Stock Entry #. Detail' -#: erpnext/stock/doctype/stock_entry/stock_entry.py:299 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:307 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Set Basic Rate Manually" msgstr "" @@ -47120,8 +47145,8 @@ msgstr "" msgid "Set Delivery Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:410 -#: erpnext/manufacturing/doctype/job_card/job_card.js:479 +#: erpnext/manufacturing/doctype/job_card/job_card.js:412 +#: erpnext/manufacturing/doctype/job_card/job_card.js:481 msgid "Set Finished Good Quantity" msgstr "" @@ -47158,7 +47183,7 @@ msgstr "" msgid "Set Landed Cost Based on Purchase Invoice Rate" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1185 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1211 msgid "Set Loyalty Program" msgstr "" @@ -47187,7 +47212,7 @@ msgstr "" msgid "Set Posting Date" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:1029 +#: erpnext/manufacturing/doctype/bom/bom.js:1031 msgid "Set Process Loss Item Quantity" msgstr "" @@ -47230,7 +47255,7 @@ msgstr "" msgid "Set Source Warehouse" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1602 +#: erpnext/selling/doctype/sales_order/sales_order.js:1609 msgid "Set Supplier" msgstr "" @@ -47260,7 +47285,7 @@ msgstr "" msgid "Set Valuation Rate for Rejected Materials" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:256 +#: erpnext/selling/doctype/sales_order/sales_order.js:263 msgid "Set Warehouse" msgstr "" @@ -47310,7 +47335,7 @@ msgstr "" msgid "Set fieldname from which you want to fetch the data from the parent form." msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:1019 +#: erpnext/manufacturing/doctype/bom/bom.js:1021 msgid "Set quantity of process loss item:" msgstr "" @@ -47326,7 +47351,7 @@ msgstr "" msgid "Set targets Item Group-wise for this Sales Person." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1203 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1263 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)" msgstr "" @@ -47422,7 +47447,7 @@ msgid "Setting up company" msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:1217 -#: erpnext/manufacturing/doctype/work_order/work_order.py:1475 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1476 msgid "Setting {0} is required" msgstr "" @@ -48137,7 +48162,7 @@ msgstr "" msgid "Simultaneous" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:687 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:749 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 "" @@ -48145,10 +48170,14 @@ msgstr "" msgid "Since you have enabled 'Track Semi Finished Goods', at least one operation must have 'Is Final Finished Good' checked. For that set the FG / Semi FG Item as {0} against an operation." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:111 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:132 msgid "Since {0} are Serial No/Batch No items, you cannot enable 'Recreate Stock Ledgers' in Repost Item Valuation." msgstr "" +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:112 +msgid "Since {0} has 'Update Stock' disabled, you cannot create repost item valuation against it" +msgstr "" + #. Option for the 'Marital Status' (Select) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "Single" @@ -48171,7 +48200,7 @@ msgstr "" #. Label of the skip_material_transfer (Check) field in DocType 'Work Order #. Operation' -#: erpnext/manufacturing/doctype/work_order/work_order.js:362 +#: erpnext/manufacturing/doctype/work_order/work_order.js:365 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.js:454 msgid "Skip Material Transfer" @@ -48302,6 +48331,23 @@ msgstr "" msgid "Source Location" msgstr "" +#: erpnext/manufacturing/doctype/work_order/work_order.js:1014 +msgid "Source Manufacture Entry" +msgstr "" + +#. Label of the source_stock_entry (Link) field in DocType 'Stock Entry' +#: erpnext/stock/doctype/stock_entry/stock_entry.json +msgid "Source Stock Entry (Manufacture)" +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:912 +msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2370 +msgid "Source Stock Entry {0} has no finished goods quantity" +msgstr "" + #. Label of the source_type (Select) field in DocType 'Support Search Source' #: erpnext/support/doctype/support_search_source/support_search_source.json msgid "Source Type" @@ -48336,7 +48382,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: 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:719 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:806 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Source Warehouse" msgstr "" @@ -48364,7 +48410,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:816 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:878 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -48377,9 +48423,9 @@ msgstr "" msgid "Source of Funds (Liabilities)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:782 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:799 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:806 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:844 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:861 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -48721,8 +48767,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:1358 -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1384 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1364 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1390 #: erpnext/accounts/report/account_balance/account_balance.js:58 msgid "Stock Adjustment" msgstr "" @@ -48829,7 +48875,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1002 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -48900,7 +48946,7 @@ msgstr "" msgid "Stock Entry {0} has created" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1312 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1315 msgid "Stock Entry {0} is not submitted" msgstr "" @@ -49131,15 +49177,15 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.js:289 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:297 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:303 -#: erpnext/manufacturing/doctype/work_order/work_order.js:921 -#: erpnext/manufacturing/doctype/work_order/work_order.js:930 -#: erpnext/manufacturing/doctype/work_order/work_order.js:937 +#: erpnext/manufacturing/doctype/work_order/work_order.js:927 +#: erpnext/manufacturing/doctype/work_order/work_order.js:936 +#: erpnext/manufacturing/doctype/work_order/work_order.js:943 #: erpnext/manufacturing/doctype/work_order/work_order_dashboard.py:14 #: erpnext/public/js/stock_reservation.js:12 -#: erpnext/selling/doctype/sales_order/sales_order.js:101 -#: erpnext/selling/doctype/sales_order/sales_order.js:116 -#: erpnext/selling/doctype/sales_order/sales_order.js:129 -#: erpnext/selling/doctype/sales_order/sales_order.js:250 +#: erpnext/selling/doctype/sales_order/sales_order.js:108 +#: erpnext/selling/doctype/sales_order/sales_order.js:123 +#: erpnext/selling/doctype/sales_order/sales_order.js:136 +#: erpnext/selling/doctype/sales_order/sales_order.js:257 #: erpnext/stock/doctype/pick_list/pick_list.js:152 #: erpnext/stock/doctype/pick_list/pick_list.js:167 #: erpnext/stock/doctype/pick_list/pick_list.js:172 @@ -49171,7 +49217,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1018 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2245 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2124 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2125 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1777 msgid "Stock Reservation Entries Created" msgstr "" @@ -49182,7 +49228,7 @@ msgstr "" #. Name of a DocType #: erpnext/public/js/stock_reservation.js:309 -#: erpnext/selling/doctype/sales_order/sales_order.js:467 +#: erpnext/selling/doctype/sales_order/sales_order.js:474 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:388 #: erpnext/stock/report/reserved_stock/reserved_stock.js:53 @@ -49371,7 +49417,7 @@ msgid "Stock UOM Quantity" msgstr "" #: erpnext/public/js/stock_reservation.js:230 -#: erpnext/selling/doctype/sales_order/sales_order.js:451 +#: erpnext/selling/doctype/sales_order/sales_order.js:458 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:327 msgid "Stock Unreservation" msgstr "" @@ -49385,7 +49431,7 @@ msgstr "" msgid "Stock Uom" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:739 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:736 msgid "Stock Update Not Allowed" msgstr "" @@ -49482,18 +49528,22 @@ msgstr "" msgid "Stock cannot be reserved in the group warehouse {0}." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1226 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1223 msgid "Stock cannot be updated against the following Delivery Notes: {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1295 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1292 msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:736 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:733 msgid "Stock cannot be updated for Purchase Invoice {0} because a Purchase Receipt {1} has already been created for this transaction. Please disable the 'Update Stock' checkbox in the Purchase Invoice and save the invoice." msgstr "" +#: erpnext/stock/doctype/warehouse/warehouse.py:124 +msgid "Stock entries exist with the old account. Changing the account may lead to a mismatch between the warehouse closing balance and the account closing balance. The overall closing balance will still match, but not for the specific account." +msgstr "" + #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1131 msgid "Stock has been unreserved for work order {0}." msgstr "" @@ -49602,7 +49652,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:355 +#: erpnext/manufacturing/doctype/job_card/job_card.js:357 #: erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json #: erpnext/manufacturing/doctype/sub_operation/sub_operation.json msgid "Sub Operation" @@ -49786,12 +49836,14 @@ msgstr "" #. Name of a DocType #. Label of a Card Break in the Subcontracting Workspace #. Label of a Link in the Subcontracting Workspace +#. Label of a Workspace Sidebar Item #: erpnext/manufacturing/doctype/work_order/work_order.json -#: erpnext/selling/doctype/sales_order/sales_order.js:1005 +#: erpnext/selling/doctype/sales_order/sales_order.js:1012 #: 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 +#: erpnext/workspace_sidebar/subcontracting.json msgid "Subcontracting Inward Order" msgstr "" @@ -50329,8 +50381,8 @@ msgstr "" #: erpnext/regional/report/irs_1099/irs_1099.py:77 #: erpnext/selling/doctype/customer/customer.js:253 #: erpnext/selling/doctype/party_specific_item/party_specific_item.json -#: erpnext/selling/doctype/sales_order/sales_order.js:189 -#: erpnext/selling/doctype/sales_order/sales_order.js:1660 +#: erpnext/selling/doctype/sales_order/sales_order.js:196 +#: erpnext/selling/doctype/sales_order/sales_order.js:1667 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/setup/workspace/home/home.json @@ -50489,7 +50541,7 @@ msgstr "" msgid "Supplier Invoice No" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1774 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1780 msgid "Supplier Invoice No exists in Purchase Invoice {0}" msgstr "" @@ -50657,7 +50709,7 @@ msgstr "" msgid "Supplier Reference" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1684 +#: erpnext/selling/doctype/sales_order/sales_order.js:1691 msgid "Supplier Required" msgstr "" @@ -50751,7 +50803,7 @@ msgstr "" msgid "Supplier delivers to Customer" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1683 +#: erpnext/selling/doctype/sales_order/sales_order.js:1690 msgid "Supplier is required for all selected Items" msgstr "" @@ -50919,7 +50971,7 @@ msgstr "" msgid "TDS Computation Summary" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1535 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1541 msgid "TDS Deducted" msgstr "" @@ -51058,7 +51110,7 @@ msgstr "" #: erpnext/stock/dashboard/item_dashboard.js:234 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/material_request_item/material_request_item.json -#: erpnext/stock/doctype/stock_entry/stock_entry.js:725 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:812 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Target Warehouse" msgstr "" @@ -51094,9 +51146,9 @@ 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:788 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:795 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:810 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:850 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:872 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -51356,7 +51408,7 @@ msgstr "" #. Label of the rate (Float) field in DocType 'Sales Taxes and Charges' #. Label of the tax_rate (Percent) field in DocType 'Tax Withholding Entry' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account_tree.js:175 +#: erpnext/accounts/doctype/account/account_tree.js:170 #: 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 @@ -51567,7 +51619,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:157 -#: erpnext/controllers/taxes_and_totals.py:1249 +#: erpnext/controllers/taxes_and_totals.py:1253 msgid "Taxable Amount" msgstr "" @@ -52016,7 +52068,7 @@ msgstr "" #: erpnext/crm/report/lead_details/lead_details.js:46 #: erpnext/crm/report/lead_details/lead_details.py:34 #: erpnext/crm/report/lost_opportunity/lost_opportunity.js:36 -#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:58 +#: erpnext/crm/report/lost_opportunity/lost_opportunity.py:64 #: erpnext/crm/workspace/crm/crm.json #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json @@ -52152,7 +52204,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:2621 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2820 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -52164,11 +52216,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:2636 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2669 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:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1839 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 "" @@ -52206,7 +52258,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:1151 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1211 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM." msgstr "" @@ -52392,7 +52444,7 @@ msgstr "" msgid "The percentage you are allowed to transfer more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed transfer 110 units." msgstr "" -#: erpnext/public/js/utils.js:951 +#: erpnext/public/js/utils.js:967 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?" msgstr "" @@ -52445,7 +52497,7 @@ msgstr "" msgid "The shares don't exist with the {0}" msgstr "" -#: erpnext/stock/stock_ledger.py:813 +#: erpnext/stock/stock_ledger.py:814 msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" @@ -52511,15 +52563,15 @@ msgstr "" msgid "The value {0} is already assigned to an existing Item {1}." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1179 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1239 msgid "The warehouse where you store finished Items before they are shipped." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1172 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1232 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1184 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1244 msgid "The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as a Work in Progress warehouse." msgstr "" @@ -52607,7 +52659,7 @@ msgstr "" msgid "There is no batch found against the {0}: {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1684 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1776 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -52769,11 +52821,11 @@ msgstr "" msgid "This is considered dangerous from accounting point of view." msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:539 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:536 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:1165 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1225 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox." msgstr "" @@ -52811,7 +52863,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:1502 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1499 msgid "This schedule was created when Asset {0} was restored due to Sales Invoice {1} cancellation." msgstr "" @@ -52823,7 +52875,7 @@ msgstr "" msgid "This schedule was created when Asset {0} was restored." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1498 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1495 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}." msgstr "" @@ -52835,7 +52887,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:1474 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1471 msgid "This schedule was created when Asset {0} was {1} through Sales Invoice {2}." msgstr "" @@ -53021,7 +53073,7 @@ msgstr "" #. Name of a DocType #. Label of a Link in the Projects Workspace #. Label of a Workspace Sidebar Item -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1066 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:281 #: 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 @@ -53318,7 +53370,7 @@ msgstr "" msgid "To Warehouse (Optional)" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:997 +#: erpnext/manufacturing/doctype/bom/bom.js:999 msgid "To add Operations tick the 'With Operations' checkbox." msgstr "" @@ -53397,11 +53449,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:630 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:627 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}" msgstr "" -#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:651 +#: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:648 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}" msgstr "" @@ -53723,7 +53775,7 @@ msgstr "" msgid "Total Debit" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:933 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:936 msgid "Total Debit must be equal to Total Credit. The difference is {0}" msgstr "" @@ -54156,7 +54208,7 @@ msgstr "" msgid "Total Time in Mins" msgstr "" -#: erpnext/public/js/utils.js:177 +#: erpnext/public/js/utils.js:193 msgid "Total Unpaid: {0}" msgstr "" @@ -54260,7 +54312,7 @@ msgstr "" msgid "Total percentage against cost centers should be 100" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:665 +#: erpnext/selling/doctype/sales_order/sales_order.js:672 msgid "Total quantity in delivery schedule cannot be greater than the item quantity" msgstr "" @@ -54532,7 +54584,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:1159 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1156 msgid "Transactions using Sales Invoice in POS are disabled." msgstr "" @@ -54631,7 +54683,7 @@ msgstr "" msgid "Transit" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.js:502 +#: erpnext/stock/doctype/stock_entry/stock_entry.js:589 msgid "Transit Entry" msgstr "" @@ -54918,13 +54970,13 @@ msgstr "" #: erpnext/manufacturing/doctype/workstation/workstation.js:480 #: 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:824 +#: erpnext/public/js/stock_analytics.js:94 erpnext/public/js/utils.js:840 #: erpnext/quality_management/doctype/quality_goal_objective/quality_goal_objective.json #: erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json #: erpnext/selling/doctype/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:1653 +#: erpnext/selling/doctype/sales_order/sales_order.js:1660 #: 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 @@ -55014,7 +55066,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3806 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4008 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -55328,15 +55380,15 @@ msgstr "" msgid "Unreconciled Entries" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:928 -#: erpnext/selling/doctype/sales_order/sales_order.js:114 +#: erpnext/manufacturing/doctype/work_order/work_order.js:934 +#: erpnext/selling/doctype/sales_order/sales_order.js:121 #: erpnext/stock/doctype/pick_list/pick_list.js:158 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:193 msgid "Unreserve" msgstr "" #: erpnext/public/js/stock_reservation.js:245 -#: erpnext/selling/doctype/sales_order/sales_order.js:502 +#: erpnext/selling/doctype/sales_order/sales_order.js:509 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:378 msgid "Unreserve Stock" msgstr "" @@ -55350,7 +55402,7 @@ msgid "Unreserve for Sub-assembly" msgstr "" #: erpnext/public/js/stock_reservation.js:281 -#: erpnext/selling/doctype/sales_order/sales_order.js:514 +#: erpnext/selling/doctype/sales_order/sales_order.js:521 #: erpnext/stock/doctype/pick_list/pick_list.js:310 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:390 msgid "Unreserving Stock..." @@ -55536,10 +55588,10 @@ msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.js:324 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:43 -#: erpnext/public/js/utils.js:930 +#: erpnext/public/js/utils.js:946 #: erpnext/selling/doctype/quotation/quotation.js:135 -#: erpnext/selling/doctype/sales_order/sales_order.js:82 -#: erpnext/selling/doctype/sales_order/sales_order.js:940 +#: erpnext/selling/doctype/sales_order/sales_order.js:89 +#: erpnext/selling/doctype/sales_order/sales_order.js:947 msgid "Update Items" msgstr "" @@ -55638,7 +55690,7 @@ msgstr "" msgid "Updating Variants..." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1127 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1187 msgid "Updating Work Order status" msgstr "" @@ -56190,11 +56242,11 @@ msgstr "" msgid "Valuation Rate (In / Out)" msgstr "" -#: erpnext/stock/stock_ledger.py:2076 +#: erpnext/stock/stock_ledger.py:2062 msgid "Valuation Rate Missing" msgstr "" -#: erpnext/stock/stock_ledger.py:2054 +#: erpnext/stock/stock_ledger.py:2040 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" @@ -56511,7 +56563,7 @@ msgstr "" msgid "Video Settings" msgstr "" -#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:7 +#: erpnext/accounts/doctype/financial_report_template/financial_report_template.js:9 msgid "View Account Coverage" msgstr "" @@ -56543,7 +56595,7 @@ msgstr "" msgid "View Leads" msgstr "" -#: erpnext/accounts/doctype/account/account_tree.js:279 +#: erpnext/accounts/doctype/account/account_tree.js:274 #: erpnext/stock/doctype/batch/batch.js:18 msgid "View Ledger" msgstr "" @@ -56760,7 +56812,7 @@ msgstr "" msgid "Voucher No" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1386 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1419 msgid "Voucher No is mandatory" msgstr "" @@ -57004,11 +57056,11 @@ msgstr "" msgid "Warehouse is required to get producible FG Items" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:259 +#: erpnext/stock/doctype/warehouse/warehouse.py:233 msgid "Warehouse not found against the account {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1216 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1213 #: erpnext/stock/doctype/delivery_note/delivery_note.py:444 msgid "Warehouse required for stock Item {0}" msgstr "" @@ -57030,7 +57082,7 @@ msgstr "" msgid "Warehouse {0} does not belong to company {1}" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:306 +#: erpnext/stock/doctype/warehouse/warehouse.py:280 msgid "Warehouse {0} does not exist" msgstr "" @@ -57042,10 +57094,6 @@ msgstr "" 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:144 -msgid "Warehouse's Stock Value has already been booked in the following accounts:" -msgstr "" - #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:20 msgid "Warehouse: {0} does not belong to {1}" msgstr "" @@ -57059,15 +57107,15 @@ msgstr "" msgid "Warehouses" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:173 +#: erpnext/stock/doctype/warehouse/warehouse.py:147 msgid "Warehouses with child nodes cannot be converted to ledger" msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:183 +#: erpnext/stock/doctype/warehouse/warehouse.py:157 msgid "Warehouses with existing transaction can not be converted to group." msgstr "" -#: erpnext/stock/doctype/warehouse/warehouse.py:175 +#: erpnext/stock/doctype/warehouse/warehouse.py:149 msgid "Warehouses with existing transaction can not be converted to ledger." msgstr "" @@ -57143,7 +57191,7 @@ msgstr "" msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" -#: erpnext/stock/stock_ledger.py:823 +#: erpnext/stock/stock_ledger.py:824 msgid "Warning on Negative Stock" msgstr "" @@ -57151,7 +57199,11 @@ msgstr "" msgid "Warning!" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1318 +#: erpnext/stock/doctype/warehouse/warehouse.py:122 +msgid "Warning: Account changed for warehouse" +msgstr "" + +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1321 msgid "Warning: Another {0} # {1} exists against stock entry {2}" msgstr "" @@ -57159,7 +57211,7 @@ msgstr "" msgid "Warning: Material Requested Qty is less than Minimum Order Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1460 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1461 msgid "Warning: Quantity exceeds maximum producible quantity based on quantity of raw materials received through the Subcontracting Inward Order {0}." msgstr "" @@ -57430,7 +57482,7 @@ msgstr "" msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:296 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:304 msgid "When there are multiple finished goods ({0}) in a Repack stock entry, the basic rate for all finished goods must be set manually. To set rate manually, enable the checkbox 'Set Basic Rate Manually' in the respective finished good row." msgstr "" @@ -57582,7 +57634,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:1050 +#: erpnext/selling/doctype/sales_order/sales_order.js:1057 #: erpnext/stock/doctype/material_request/material_request.js:216 #: erpnext/stock/doctype/material_request/material_request.json #: erpnext/stock/doctype/material_request/material_request.py:871 @@ -57619,6 +57671,10 @@ msgstr "" msgid "Work Order Item" msgstr "" +#: erpnext/stock/doctype/stock_entry/stock_entry.py:915 +msgid "Work Order Mismatch" +msgstr "" + #. Name of a DocType #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Work Order Operation" @@ -57660,16 +57716,16 @@ msgstr "" msgid "Work Order cannot be created for following reason:
{0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1404 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1405 msgid "Work Order cannot be raised against a Item Template" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2457 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2537 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2481 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2561 msgid "Work Order has been {0}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1225 +#: erpnext/selling/doctype/sales_order/sales_order.js:1232 msgid "Work Order not created" msgstr "" @@ -57677,7 +57733,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:860 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2386 +msgid "Work Order {0} has no produced qty" +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:952 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -57686,7 +57746,7 @@ msgstr "" msgid "Work Orders" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:1318 +#: erpnext/selling/doctype/sales_order/sales_order.js:1325 msgid "Work Orders Created: {0}" msgstr "" @@ -57755,7 +57815,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:326 +#: erpnext/manufacturing/doctype/work_order/work_order.js:329 #: 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 @@ -58039,7 +58099,7 @@ msgstr "" msgid "You can change the parent account to a Balance Sheet account or select a different account." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:709 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:712 msgid "You can not enter current voucher in 'Against Journal Entry' column" msgstr "" @@ -58048,7 +58108,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:928 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1019 msgid "You can only redeem max {0} points in this order." msgstr "" @@ -58096,7 +58156,7 @@ msgstr "" msgid "You cannot create/amend any accounting entries till this date." msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:942 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:945 msgid "You cannot credit and debit same account at the same time" msgstr "" @@ -58120,7 +58180,7 @@ msgstr "" msgid "You cannot redeem more than {0}." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:189 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:210 msgid "You cannot repost item valuation before {}" msgstr "" @@ -58140,7 +58200,7 @@ msgstr "" msgid "You cannot {0} this document because another Period Closing Entry {1} exists after {2}" msgstr "" -#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:565 +#: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:567 msgid "You do not have permission to edit this document" msgstr "" @@ -58160,7 +58220,7 @@ msgstr "" msgid "You had {} errors while creating opening invoices. Check {} for more details" msgstr "" -#: erpnext/public/js/utils.js:1030 +#: erpnext/public/js/utils.js:1046 msgid "You have already selected items from {0} {1}" msgstr "" @@ -58247,7 +58307,7 @@ msgstr "" msgid "Zero Rated" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:563 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:625 msgid "Zero quantity" msgstr "" @@ -58264,7 +58324,7 @@ msgstr "" msgid "`Allow Negative rates for Items`" msgstr "" -#: erpnext/stock/stock_ledger.py:2068 +#: erpnext/stock/stock_ledger.py:2054 msgid "after" msgstr "" @@ -58280,11 +58340,11 @@ msgstr "" msgid "as Title" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.js:1021 +#: erpnext/manufacturing/doctype/bom/bom.js:1023 msgid "as a percentage of finished item quantity" msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1556 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1589 msgid "as of {0}" msgstr "" @@ -58412,7 +58472,7 @@ msgstr "" msgid "must be between 0 and 100" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.js:638 +#: erpnext/selling/doctype/sales_order/sales_order.js:645 msgid "name" msgstr "" @@ -58433,7 +58493,7 @@ msgstr "" msgid "paid to" msgstr "" -#: erpnext/public/js/utils.js:447 +#: erpnext/public/js/utils.js:463 msgid "payments app is not installed. Please install it from {0} or {1}" msgstr "" @@ -58454,7 +58514,7 @@ msgstr "" msgid "per hour" msgstr "" -#: erpnext/stock/stock_ledger.py:2069 +#: erpnext/stock/stock_ledger.py:2055 msgid "performing either one below:" msgstr "" @@ -58483,7 +58543,7 @@ msgstr "" msgid "received from" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1476 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1473 msgid "returned" msgstr "" @@ -58518,7 +58578,7 @@ msgstr "" msgid "sandbox" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1476 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1473 msgid "sold" msgstr "" @@ -58545,7 +58605,7 @@ msgstr "" msgid "to" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3175 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3172 msgid "to unallocate the amount of this Return Invoice before cancelling it." msgstr "" @@ -58612,7 +58672,7 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/accounts/utils.py:1497 +#: erpnext/accounts/utils.py:1569 msgid "{0} Number {1} is already used in {2} {3}" msgstr "" @@ -58620,7 +58680,7 @@ msgstr "" msgid "{0} Operating Cost for operation {1}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:556 +#: erpnext/manufacturing/doctype/work_order/work_order.js:562 msgid "{0} Operations: {1}" msgstr "" @@ -58644,23 +58704,23 @@ msgstr "" msgid "{0} account is not of type {1}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:519 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:518 msgid "{0} account not found while submitting purchase receipt" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1062 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1065 msgid "{0} against Bill {1} dated {2}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1071 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1074 msgid "{0} against Purchase Order {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1038 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1041 msgid "{0} against Sales Invoice {1}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1045 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:1048 msgid "{0} against Sales Order {1}" msgstr "" @@ -58788,7 +58848,7 @@ msgstr "" msgid "{0} is in Draft. Submit it before creating the Asset." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1131 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1128 msgid "{0} is mandatory for Item {1}" msgstr "" @@ -58805,7 +58865,7 @@ msgstr "" msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}." msgstr "" -#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1780 +#: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1813 msgid "{0} is not a CSV file." msgstr "" @@ -58817,7 +58877,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:615 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:677 msgid "{0} is not a stock Item" msgstr "" @@ -58853,27 +58913,27 @@ msgstr "" msgid "{0} is open. Close the POS or cancel the existing POS Opening Entry to create a new POS Opening Entry." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:521 +#: erpnext/manufacturing/doctype/work_order/work_order.js:527 msgid "{0} items disassembled" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:485 +#: erpnext/manufacturing/doctype/work_order/work_order.js:491 msgid "{0} items in progress" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:509 +#: erpnext/manufacturing/doctype/work_order/work_order.js:515 msgid "{0} items lost during process." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:466 +#: erpnext/manufacturing/doctype/work_order/work_order.js:472 msgid "{0} items produced" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:489 +#: erpnext/manufacturing/doctype/work_order/work_order.js:495 msgid "{0} items returned" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:492 +#: erpnext/manufacturing/doctype/work_order/work_order.js:498 msgid "{0} items to return" msgstr "" @@ -58881,7 +58941,7 @@ msgstr "" msgid "{0} must be negative in return document" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2367 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2364 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 "" @@ -58917,16 +58977,16 @@ msgstr "" msgid "{0} units of {1} are required in {2} with the inventory dimension: {3} on {4} {5} for {6} to complete the transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:1721 erpnext/stock/stock_ledger.py:2217 -#: erpnext/stock/stock_ledger.py:2231 +#: erpnext/stock/stock_ledger.py:1707 erpnext/stock/stock_ledger.py:2203 +#: erpnext/stock/stock_ledger.py:2217 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:2318 erpnext/stock/stock_ledger.py:2363 +#: erpnext/stock/stock_ledger.py:2304 erpnext/stock/stock_ledger.py:2349 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:1715 +#: erpnext/stock/stock_ledger.py:1701 msgid "{0} units of {1} needed in {2} to complete this transaction." msgstr "" @@ -59027,7 +59087,7 @@ msgstr "" msgid "{0} {1} is cancelled so the action cannot be completed" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:857 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:860 msgid "{0} {1} is closed" msgstr "" @@ -59039,7 +59099,7 @@ msgstr "" msgid "{0} {1} is frozen" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:854 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:857 msgid "{0} {1} is fully billed" msgstr "" @@ -59055,8 +59115,8 @@ msgstr "" msgid "{0} {1} is not in any active Fiscal Year" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:851 -#: erpnext/accounts/doctype/journal_entry/journal_entry.py:890 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:854 +#: erpnext/accounts/doctype/journal_entry/journal_entry.py:893 msgid "{0} {1} is not submitted" msgstr "" @@ -59217,7 +59277,7 @@ msgstr "" msgid "{}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2133 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2130 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}" msgstr "" diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js index 32c543703bc..f0d9576d469 100644 --- a/erpnext/manufacturing/doctype/bom/bom.js +++ b/erpnext/manufacturing/doctype/bom/bom.js @@ -955,6 +955,8 @@ frappe.ui.form.on("BOM Item", "sourced_by_supplier", function (frm, cdt, cdn) { if (d.sourced_by_supplier) { d.rate = 0; refresh_field("rate", d.name, d.parentfield); + } else { + get_bom_material_detail(frm.doc, cdt, cdn, false); } }); diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index a231eee9d84..03aae5219bb 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -1585,15 +1585,10 @@ def get_children(parent=None, is_root=False, **filters): def add_additional_cost(stock_entry, work_order, job_card=None): # Add non stock items cost in the additional cost stock_entry.additional_costs = [] - company_account = frappe.db.get_value( + expense_account = frappe.get_value( "Company", work_order.company, - ["default_expense_account", "default_operating_cost_account"], - as_dict=1, - ) - - expense_account = ( - company_account.default_operating_cost_account or company_account.default_expense_account + "default_operating_cost_account", ) add_non_stock_items_cost(stock_entry, work_order, expense_account, job_card=job_card) add_operations_cost(stock_entry, work_order, expense_account, job_card=job_card) @@ -1676,7 +1671,7 @@ def add_operating_cost_component_wise( per_unit_cost = flt(actual_cp_operating_cost) / flt(row.completed_qty - work_order.produced_qty) - if per_unit_cost and expense_account: + if per_unit_cost: stock_entry.append( "additional_costs", { diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json index 11c704649a3..ad47d4024b4 100644 --- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json +++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json @@ -20,6 +20,7 @@ "is_subcontracted", "is_final_finished_good", "set_cost_based_on_bom_qty", + "quality_inspection_required", "warehouse_section", "skip_material_transfer", "backflush_from_wip_warehouse", @@ -290,13 +291,20 @@ "fieldname": "backflush_from_wip_warehouse", "fieldtype": "Check", "label": "Backflush Materials From WIP Warehouse" + }, + { + "default": "0", + "depends_on": "eval:parent.inspection_required", + "fieldname": "quality_inspection_required", + "fieldtype": "Check", + "label": "Quality Inspection Required" } ], "idx": 1, "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2026-03-31 17:09:48.771834", + "modified": "2026-04-01 17:09:48.771834", "modified_by": "Administrator", "module": "Manufacturing", "name": "BOM Operation", diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.py b/erpnext/manufacturing/doctype/bom_operation/bom_operation.py index fd197e89e62..72d7f194fd8 100644 --- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.py +++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.py @@ -35,6 +35,7 @@ class BOMOperation(Document): parent: DF.Data parentfield: DF.Data parenttype: DF.Data + quality_inspection_required: DF.Check sequence_id: DF.Int set_cost_based_on_bom_qty: DF.Check skip_material_transfer: DF.Check diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json index 728e8fc27ec..21f0adbdd74 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.json +++ b/erpnext/manufacturing/doctype/job_card/job_card.json @@ -1,7 +1,7 @@ { "actions": [], "autoname": "naming_series:", - "creation": "2018-07-09 17:23:29.518745", + "creation": "2026-03-31 21:06:16.282931", "doctype": "DocType", "editable_grid": 1, "engine": "InnoDB", @@ -452,7 +452,6 @@ "show_dashboard": 1 }, { - "depends_on": "expected_start_date", "fieldname": "scheduled_time_section", "fieldtype": "Section Break", "label": "Scheduled Time" @@ -628,7 +627,7 @@ "grid_page_length": 50, "is_submittable": 1, "links": [], - "modified": "2026-02-26 15:13:56.767070", + "modified": "2026-03-31 21:06:48.987740", "modified_by": "Administrator", "module": "Manufacturing", "name": "Job Card", diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index a4eaec8e73f..9716ae49dc0 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -788,27 +788,27 @@ class JobCard(Document): ["action_if_quality_inspection_is_not_submitted", "action_if_quality_inspection_is_rejected"], ) - item = self.finished_good or self.production_item - bom_inspection_required = frappe.db.get_value( - "BOM", self.semi_fg_bom or self.bom_no, "inspection_required" + bom_inspection_required = frappe.get_value("BOM", self.bom_no, "inspection_required") + operation_inspection_required = frappe.get_value( + "Work Order Operation", self.operation_id, "quality_inspection_required" ) - if bom_inspection_required: + if bom_inspection_required and operation_inspection_required: if not self.quality_inspection: frappe.throw( _( "Quality Inspection is required for the item {0} before completing the job card {1}" - ).format(get_link_to_form("Item", item), bold(self.name)) + ).format(get_link_to_form("Item", self.finished_good), bold(self.name)) ) - qa_status, docstatus = frappe.db.get_value( + + qa_status, docstatus = frappe.get_value( "Quality Inspection", self.quality_inspection, ["status", "docstatus"] ) - if docstatus != 1: if action_submit == "Stop": frappe.throw( _("Quality Inspection {0} is not submitted for the item: {1}").format( get_link_to_form("Quality Inspection", self.quality_inspection), - get_link_to_form("Item", item), + get_link_to_form("Item", self.finished_good), ), title=_("Inspection Submission"), exc=QualityInspectionNotSubmittedError, @@ -817,7 +817,7 @@ class JobCard(Document): frappe.msgprint( _("Quality Inspection {0} is not submitted for the item: {1}").format( get_link_to_form("Quality Inspection", self.quality_inspection), - get_link_to_form("Item", item), + get_link_to_form("Item", self.finished_good), ), alert=True, indicator="orange", @@ -827,7 +827,7 @@ class JobCard(Document): frappe.throw( _("Quality Inspection {0} is rejected for the item: {1}").format( get_link_to_form("Quality Inspection", self.quality_inspection), - get_link_to_form("Item", item), + get_link_to_form("Item", self.finished_good), ), title=_("Inspection Rejected"), exc=QualityInspectionRejectedError, @@ -836,7 +836,7 @@ class JobCard(Document): frappe.msgprint( _("Quality Inspection {0} is rejected for the item: {1}").format( get_link_to_form("Quality Inspection", self.quality_inspection), - get_link_to_form("Item", item), + get_link_to_form("Item", self.finished_good), ), alert=True, indicator="orange", diff --git a/erpnext/manufacturing/doctype/job_card/test_job_card.py b/erpnext/manufacturing/doctype/job_card/test_job_card.py index a25b6e1af3d..9a6733232a1 100644 --- a/erpnext/manufacturing/doctype/job_card/test_job_card.py +++ b/erpnext/manufacturing/doctype/job_card/test_job_card.py @@ -87,6 +87,7 @@ class TestJobCard(ERPNextTestSuite): with_operations=1, track_semi_finished_goods=1, company="_Test Company", + inspection_required=1, ) final_bom.append("items", {"item_code": raw.name, "qty": 1}) final_bom.append( @@ -97,6 +98,7 @@ class TestJobCard(ERPNextTestSuite): "bom_no": cut_bom, "skip_material_transfer": 1, "time_in_mins": 60, + "quality_inspection_required": 1, }, ) final_bom.append( @@ -133,6 +135,15 @@ class TestJobCard(ERPNextTestSuite): work_order.submit() job_card = frappe.get_all("Job Card", filters={"work_order": work_order.name, "operation": "Cutting"}) job_card_doc = frappe.get_doc("Job Card", job_card[0].name) + job_card_doc.append( + "time_logs", + { + "from_time": "2024-01-01 08:00:00", + "to_time": "2024-01-01 09:00:00", + "time_in_mins": 60, + "completed_qty": 1, + }, + ) self.assertRaises(frappe.ValidationError, job_card_doc.submit) def test_job_card_operations(self): diff --git a/erpnext/manufacturing/doctype/sub_operation/sub_operation.json b/erpnext/manufacturing/doctype/sub_operation/sub_operation.json index d550d755f98..98b1e1b2aa2 100644 --- a/erpnext/manufacturing/doctype/sub_operation/sub_operation.json +++ b/erpnext/manufacturing/doctype/sub_operation/sub_operation.json @@ -16,7 +16,8 @@ "fieldtype": "Link", "in_list_view": 1, "label": "Operation", - "options": "Operation" + "options": "Operation", + "reqd": 1 }, { "default": "0", @@ -40,7 +41,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-08-04 16:15:11.425349", + "modified": "2026-04-13 12:17:33.776504", "modified_by": "Administrator", "module": "Manufacturing", "name": "Sub Operation", diff --git a/erpnext/manufacturing/doctype/sub_operation/sub_operation.py b/erpnext/manufacturing/doctype/sub_operation/sub_operation.py index f4bb62e8f6c..a34a96fc1a5 100644 --- a/erpnext/manufacturing/doctype/sub_operation/sub_operation.py +++ b/erpnext/manufacturing/doctype/sub_operation/sub_operation.py @@ -16,7 +16,7 @@ class SubOperation(Document): from frappe.types import DF description: DF.SmallText | None - operation: DF.Link | None + operation: DF.Link parent: DF.Data parentfield: DF.Data parenttype: DF.Data diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py index b2a1eba0232..628aa58b187 100644 --- a/erpnext/manufacturing/doctype/work_order/test_work_order.py +++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py @@ -698,10 +698,14 @@ class TestWorkOrder(ERPNextTestSuite): if not bom_name: bom = make_bom(item=fg_item, rate=1000, raw_materials=[rm1], do_not_save=True) bom.with_operations = 1 + operation = make_operation(operation="Batch Size Operation") + operation.create_job_card_based_on_batch_size = 1 + operation.save() + bom.append( "operations", { - "operation": "_Test Operation 1", + "operation": "Batch Size Operation", "workstation": "_Test Workstation 1", "description": "Test Data", "operating_cost": 100, @@ -4178,6 +4182,64 @@ class TestWorkOrder(ERPNextTestSuite): self.assertEqual(bin1_at_completion.reserved_qty_for_production, 0) + def test_operating_time(self): + workstation = make_workstation(workstation="Test Workstation for Operating Time") + raw_material = make_item(item_code="Raw Material 1", properties={"is_stock_item": 1}) + subassembly_item = make_item(item_code="Subassembly Item", properties={"is_stock_item": 1}) + subassembly_bom = make_bom( + item=subassembly_item.name, + quantity=5, + raw_materials=[raw_material.name], + rm_qty=25, + with_operations=1, + do_not_submit=True, + ) + subassembly_operation = make_operation(operation="Subassembly Operation") + subassembly_bom.append( + "operations", + { + "operation": subassembly_operation.name, + "time_in_mins": 60, + "workstation": workstation.name, + }, + ) + subassembly_bom.save() + subassembly_bom.submit() + + fg_item = make_item(item_code="FG Item", properties={"is_stock_item": 1}) + fg_bom = make_bom( + item=fg_item.name, + quantity=50, + raw_materials=[subassembly_item.name], + rm_qty=3, + with_operations=1, + do_not_submit=True, + ) + fg_operation = make_operation(operation="FG Operation") + fg_operation.create_job_card_based_on_batch_size = 1 + fg_operation.batch_size = 25 + fg_operation.save() + fg_bom.append( + "operations", + { + "operation": fg_operation.name, + "time_in_mins": 60, + "workstation": workstation.name, + }, + ) + fg_bom.items[0].do_not_explode = 0 + fg_bom.items[0].bom_no = subassembly_bom.name + fg_bom.save() + fg_bom.submit() + + wo_order = make_wo_order_test_record( + item=fg_item.name, + qty=100, + use_multi_level_bom=1, + ) + self.assertEqual(wo_order.operations[0].time_in_mins, 72) + self.assertEqual(wo_order.operations[1].time_in_mins, 240) + def get_reserved_entries(voucher_no, warehouse=None): doctype = frappe.qb.DocType("Stock Reservation Entry") diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js index 0e8729bf4ba..9840ed1c13d 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.js +++ b/erpnext/manufacturing/doctype/work_order/work_order.js @@ -419,6 +419,7 @@ frappe.ui.form.on("Work Order", { sequence_id: data.sequence_id, skip_material_transfer: data.skip_material_transfer, backflush_from_wip_warehouse: data.backflush_from_wip_warehouse, + time_in_mins: data.time_in_mins, }); } } diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py index 5e18f68e8c0..007675f9d8f 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.py +++ b/erpnext/manufacturing/doctype/work_order/work_order.py @@ -1252,7 +1252,7 @@ class WorkOrder(Document): def set_work_order_operations(self): """Fetch operations from BOM and set in 'Work Order'""" - def _get_operations(bom_no, qty=1): + def _get_operations(bom_no, qty=1, exploded=False): data = frappe.get_all( "BOM Operation", filters={"parent": bom_no}, @@ -1277,16 +1277,20 @@ class WorkOrder(Document): "skip_material_transfer", "backflush_from_wip_warehouse", "set_cost_based_on_bom_qty", + "quality_inspection_required", ], order_by="idx", ) for d in data: if not d.fixed_time: - if d.set_cost_based_on_bom_qty: - d.time_in_mins = flt(d.time_in_mins) * flt(flt(qty) / flt(d.batch_size or 1)) + if frappe.get_value("Operation", d.operation, "create_job_card_based_on_batch_size"): + qty = d.batch_size + + if exploded: + d.time_in_mins *= flt(qty) else: - d.time_in_mins = flt(d.time_in_mins) * flt(qty) + d.time_in_mins /= flt(qty) d.status = "Pending" @@ -1307,7 +1311,9 @@ class WorkOrder(Document): for node in bom_traversal: if node.is_bom: - operations.extend(_get_operations(node.name, qty=node.exploded_qty / node.bom_qty)) + operations.extend( + _get_operations(node.name, qty=node.exploded_qty / node.bom_qty, exploded=True) + ) bom_qty = frappe.get_cached_value("BOM", self.bom_no, "quantity") operations.extend(_get_operations(self.bom_no, qty=bom_qty)) @@ -1321,7 +1327,7 @@ class WorkOrder(Document): def calculate_time(self): for d in self.get("operations"): if not d.fixed_time: - d.time_in_mins = flt(d.time_in_mins) * (flt(self.qty) / flt(d.batch_size)) + d.time_in_mins = flt(d.time_in_mins) * flt(self.qty) self.calculate_operating_cost() @@ -2630,6 +2636,7 @@ def validate_operation_data(row): def create_job_card(work_order, row, enable_capacity_planning=False, auto_create=False): doc = frappe.new_doc("Job Card") + qty = row.job_card_qty or work_order.get("qty", 0) doc.update( { "work_order": work_order.name, @@ -2638,7 +2645,7 @@ def create_job_card(work_order, row, enable_capacity_planning=False, auto_create "workstation": row.get("workstation"), "operation_row_id": cint(row.idx), "posting_date": nowdate(), - "for_quantity": row.job_card_qty or work_order.get("qty", 0), + "for_quantity": qty, "operation_id": row.get("name"), "bom_no": work_order.bom_no, "project": work_order.project, @@ -2646,7 +2653,7 @@ def create_job_card(work_order, row, enable_capacity_planning=False, auto_create "sequence_id": row.get("sequence_id"), "hour_rate": row.get("hour_rate"), "serial_no": row.get("serial_no"), - "time_required": row.get("time_in_mins"), + "time_required": (row.get("time_in_mins", 0) / work_order.qty) * qty, "source_warehouse": row.get("source_warehouse") or work_order.get("source_warehouse"), "target_warehouse": row.get("fg_warehouse") or work_order.get("fg_warehouse"), "wip_warehouse": work_order.wip_warehouse or row.get("wip_warehouse") diff --git a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json index 6cbcc855d01..89ed830116b 100644 --- a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json +++ b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json @@ -15,6 +15,7 @@ "workstation_type", "workstation", "sequence_id", + "quality_inspection_required", "section_break_insy", "bom_no", "finished_good", @@ -294,13 +295,19 @@ "fieldtype": "Check", "label": "Backflush Materials From WIP Warehouse", "read_only": 1 + }, + { + "default": "0", + "fieldname": "quality_inspection_required", + "fieldtype": "Check", + "label": "Quality Inspection Required" } ], "grid_page_length": 50, "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-05-15 15:10:06.885440", + "modified": "2026-03-30 17:20:08.874381", "modified_by": "Administrator", "module": "Manufacturing", "name": "Work Order Operation", diff --git a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.py b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.py index fb8b3feb4dd..2e45434f94b 100644 --- a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.py +++ b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.py @@ -36,6 +36,7 @@ class WorkOrderOperation(Document): planned_operating_cost: DF.Currency planned_start_time: DF.Datetime | None process_loss_qty: DF.Float + quality_inspection_required: DF.Check sequence_id: DF.Int skip_material_transfer: DF.Check source_warehouse: DF.Link | None diff --git a/erpnext/manufacturing/doctype/workstation/workstation_list.js b/erpnext/manufacturing/doctype/workstation/workstation_list.js index 33722634b96..4c81ab082bf 100644 --- a/erpnext/manufacturing/doctype/workstation/workstation_list.js +++ b/erpnext/manufacturing/doctype/workstation/workstation_list.js @@ -10,6 +10,6 @@ frappe.listview_settings["Workstation"] = { Setup: "blue", }; - return [__(doc.status), color_map[doc.status], true]; + return [__(doc.status), color_map[doc.status], "status,=," + doc.status]; }, }; diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 8e36eaaed40..d41924edb4a 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -473,3 +473,4 @@ erpnext.patches.v16_0.enable_serial_batch_setting erpnext.patches.v16_0.update_requested_qty_packed_item erpnext.patches.v16_0.remove_payables_receivables_workspace erpnext.patches.v16_0.co_by_product_patch +erpnext.patches.v16_0.depends_on_inv_dimensions diff --git a/erpnext/patches/v16_0/depends_on_inv_dimensions.py b/erpnext/patches/v16_0/depends_on_inv_dimensions.py new file mode 100644 index 00000000000..0de46f68f11 --- /dev/null +++ b/erpnext/patches/v16_0/depends_on_inv_dimensions.py @@ -0,0 +1,89 @@ +import frappe + + +def get_inventory_dimensions(): + return frappe.get_all( + "Inventory Dimension", + fields=[ + "target_fieldname as fieldname", + "source_fieldname", + "reference_document as doctype", + "reqd", + "mandatory_depends_on", + ], + order_by="creation", + distinct=True, + ) + + +def get_display_depends_on(doctype, fieldname): + if doctype not in [ + "Stock Entry Detail", + "Sales Invoice Item", + "Delivery Note Item", + "Purchase Invoice Item", + "Purchase Receipt Item", + ]: + return None, None + + fieldname_start_with = "to" + display_depends_on = "" + + if doctype in ["Purchase Invoice Item", "Purchase Receipt Item"]: + display_depends_on = "eval:parent.is_internal_supplier == 1" + fieldname_start_with = "from" + elif doctype != "Stock Entry Detail": + display_depends_on = "eval:parent.is_internal_customer == 1" + elif doctype == "Stock Entry Detail": + display_depends_on = "eval:doc.t_warehouse" + + return f"{fieldname_start_with}_{fieldname}", display_depends_on + + +def execute(): + for dimension in get_inventory_dimensions(): + if frappe.db.exists( + "Custom Field", {"fieldname": dimension.source_fieldname, "dt": "Stock Entry Detail"} + ): + frappe.set_value( + "Custom Field", + {"fieldname": dimension.source_fieldname, "dt": "Stock Entry Detail"}, + "depends_on", + "eval:doc.s_warehouse", + ) + if frappe.db.exists( + "Custom Field", {"fieldname": dimension.source_fieldname, "dt": "Stock Entry Detail", "reqd": 1} + ): + frappe.set_value( + "Custom Field", + {"fieldname": dimension.source_fieldname, "dt": "Stock Entry Detail", "reqd": 1}, + {"mandatory_depends_on": "eval:doc.s_warehouse", "reqd": 0}, + ) + if frappe.db.exists( + "Custom Field", + { + "fieldname": f"to_{dimension.fieldname}", + "dt": "Stock Entry Detail", + "depends_on": "eval:parent.purpose != 'Material Issue'", + }, + ): + frappe.set_value( + "Custom Field", + { + "fieldname": f"to_{dimension.fieldname}", + "dt": "Stock Entry Detail", + "depends_on": "eval:parent.purpose != 'Material Issue'", + }, + "depends_on", + "eval:doc.t_warehouse", + ) + fieldname, display_depends_on = get_display_depends_on(dimension.doctype, dimension.fieldname) + if display_depends_on and frappe.db.exists( + "Custom Field", {"fieldname": fieldname, "dt": dimension.doctype} + ): + frappe.set_value( + "Custom Field", + {"fieldname": fieldname, "dt": dimension.doctype}, + "mandatory_depends_on", + display_depends_on if dimension.reqd else dimension.mandatory_depends_on, + ) diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js index 25918a179b8..0c8366d4e95 100644 --- a/erpnext/public/js/financial_statements.js +++ b/erpnext/public/js/financial_statements.js @@ -230,7 +230,10 @@ erpnext.financial_statements = { value = default_formatter(value, row, column, data); - if (data && !data.parent_account && !data.parent_section) { + if ( + data && + ((!data.parent_account && !data.parent_section) || data.is_group_account || data.is_group) + ) { value = $(`${value}`); var $value = $(value).css("font-weight", "bold"); diff --git a/erpnext/public/js/print.js b/erpnext/public/js/print.js index 43ba9afc148..8e775feab96 100644 --- a/erpnext/public/js/print.js +++ b/erpnext/public/js/print.js @@ -5,6 +5,7 @@ const doctype_list = [ "Purchase Order", "Purchase Invoice", "POS Invoice", + "Quotation", "Request for Quotation", ]; const allowed_print_formats = [ @@ -20,6 +21,8 @@ const allowed_print_formats = [ "Purchase Invoice with Item Image", "POS Invoice Standard", "POS Invoice with Item Image", + "Quotation Standard", + "Quotation with Item Image", "Request for Quotation with Item Image", ]; const allowed_letterheads = ["Company Letterhead", "Company Letterhead - Grey"]; diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.py b/erpnext/selling/doctype/selling_settings/selling_settings.py index c13d4ce0a6c..bf8750cc1b8 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.py +++ b/erpnext/selling/doctype/selling_settings/selling_settings.py @@ -93,10 +93,10 @@ class SellingSettings(Document): self.validate_fallback_to_default_price_list() - if old_doc.enable_tracking_sales_commissions != self.enable_tracking_sales_commissions: + if old_doc and old_doc.enable_tracking_sales_commissions != self.enable_tracking_sales_commissions: toggle_tracking_sales_commissions_section(not self.enable_tracking_sales_commissions) - if old_doc.enable_utm != self.enable_utm: + if old_doc and old_doc.enable_utm != self.enable_utm: toggle_utm_analytics_section(not self.enable_utm) def validate_fallback_to_default_price_list(self): diff --git a/erpnext/selling/print_format/quotation_standard/__init__.py b/erpnext/selling/print_format/quotation_standard/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/selling/print_format/quotation_standard/quotation_standard.json b/erpnext/selling/print_format/quotation_standard/quotation_standard.json new file mode 100644 index 00000000000..e719f52b150 --- /dev/null +++ b/erpnext/selling/print_format/quotation_standard/quotation_standard.json @@ -0,0 +1,33 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2026-03-18 11:47:51.934541", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Quotation", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 14, + "html": "\n\n{%- 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{{ _(\"Party Name\") }}: {{doc.party_name }}\n\t\t\t\t\n\t\t\t\t\t{{ _(\"Valid Till\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.valid_till) }}\n\t\t\t\t
{{ _(\"Quotation\") }}: {{ doc.name }}\n\t\t\t\t\t{{ _(\"Posting Date\") }}: {{\n\t\t\t\t\tfrappe.utils.format_date(doc.transaction_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\t
\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": "2026-03-23 16:14:39.728914", + "modified_by": "Administrator", + "module": "Selling", + "name": "Quotation 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/selling/print_format/quotation_with_item_image/__init__.py b/erpnext/selling/print_format/quotation_with_item_image/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/selling/print_format/quotation_with_item_image/quotation_with_item_image.json b/erpnext/selling/print_format/quotation_with_item_image/quotation_with_item_image.json new file mode 100644 index 00000000000..2d195632178 --- /dev/null +++ b/erpnext/selling/print_format/quotation_with_item_image/quotation_with_item_image.json @@ -0,0 +1,33 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2026-03-18 11:57:39.954918", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Quotation", + "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
{{ _(\"Quotation:\") }}
\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
{{ _(\"Posting 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
{{ _(\"Valid Till:\") }}
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
{{ frappe.utils.format_date(doc.valid_till) }}
\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": "2026-03-18 11:57:39.954918", + "modified_by": "Administrator", + "module": "Selling", + "name": "Quotation 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/setup/install.py b/erpnext/setup/install.py index 69fbe650f2a..2007a3bf84c 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -310,6 +310,7 @@ def set_default_print_formats(): "Purchase Order": "Purchase Order with Item Image", "Purchase Invoice": "Purchase Invoice with Item Image", "POS Invoice": "POS Invoice with Item Image", + "Quotation": "Quotation with Item Image", "Request for Quotation": "Request for Quotation with Item Image", } diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json index d88af98bca8..0175b790887 100644 --- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json +++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -759,7 +759,6 @@ "label": "Incoming Rate", "no_copy": 1, "options": "Company:company:default_currency", - "precision": "6", "print_hide": 1, "read_only": 1 }, @@ -953,7 +952,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-05-31 19:51:32.651562", + "modified": "2026-04-07 15:43:20.892151", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note Item", diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.js b/erpnext/stock/doctype/delivery_trip/delivery_trip.js index 692b468e6ae..61c6743054f 100755 --- a/erpnext/stock/doctype/delivery_trip/delivery_trip.js +++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.js @@ -41,6 +41,8 @@ frappe.ui.form.on("Delivery Trip", { }, refresh: function (frm) { + frm.ignore_doctypes_on_cancel_all = ["Delivery Note"]; + if (frm.doc.docstatus == 1 && frm.doc.delivery_stops.length > 0) { frm.add_custom_button(__("Notify Customers via Email"), function () { frm.trigger("notify_customers"); diff --git a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json index 376b09f9370..aae81a29eac 100644 --- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json +++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json @@ -8,9 +8,8 @@ "field_order": [ "dimension_details_tab", "dimension_name", - "reference_document", "column_break_4", - "disabled", + "reference_document", "field_mapping_section", "source_fieldname", "column_break_9", @@ -93,12 +92,6 @@ "fieldtype": "Check", "label": "Apply to All Inventory Documents" }, - { - "default": "0", - "fieldname": "disabled", - "fieldtype": "Check", - "label": "Disabled" - }, { "fieldname": "target_fieldname", "fieldtype": "Data", @@ -159,6 +152,7 @@ "label": "Conditional Rule Examples" }, { + "depends_on": "eval:!doc.apply_to_all_doctypes", "description": "To apply condition on parent field use parent.field_name and to apply condition on child table use doc.field_name. Here field_name could be based on the actual column name of the respective field.", "fieldname": "mandatory_depends_on", "fieldtype": "Small Text", @@ -188,7 +182,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2025-07-07 15:51:29.329064", + "modified": "2026-04-08 10:10:16.884388", "modified_by": "Administrator", "module": "Stock", "name": "Inventory Dimension", diff --git a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py index 53a2e45f1df..fc5038db069 100644 --- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py +++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py @@ -32,7 +32,6 @@ class InventoryDimension(Document): apply_to_all_doctypes: DF.Check condition: DF.Code | None dimension_name: DF.Data - disabled: DF.Check document_type: DF.Link | None fetch_from_parent: DF.Literal[None] istable: DF.Check @@ -76,7 +75,6 @@ class InventoryDimension(Document): old_doc = self._doc_before_save allow_to_edit_fields = [ - "disabled", "fetch_from_parent", "type_of_transaction", "condition", @@ -120,6 +118,7 @@ class InventoryDimension(Document): def reset_value(self): if self.apply_to_all_doctypes: self.type_of_transaction = "" + self.mandatory_depends_on = "" self.istable = 0 for field in ["document_type", "condition"]: @@ -184,8 +183,12 @@ class InventoryDimension(Document): label=_(label), depends_on="eval:doc.s_warehouse" if doctype == "Stock Entry Detail" else "", search_index=1, - reqd=self.reqd, - mandatory_depends_on=self.mandatory_depends_on, + reqd=1 + if self.reqd and not self.mandatory_depends_on and doctype != "Stock Entry Detail" + else 0, + mandatory_depends_on="eval:doc.s_warehouse" + if self.reqd and doctype == "Stock Entry Detail" + else self.mandatory_depends_on, ), ] @@ -296,12 +299,13 @@ class InventoryDimension(Document): options=self.reference_document, label=label, depends_on=display_depends_on, + mandatory_depends_on=display_depends_on if self.reqd else self.mandatory_depends_on, ), ] ) -def field_exists(doctype, fieldname) -> str or None: +def field_exists(doctype, fieldname) -> str | None: return frappe.db.get_value("DocField", {"parent": doctype, "fieldname": fieldname}, "name") @@ -372,7 +376,6 @@ def get_document_wise_inventory_dimensions(doctype) -> dict: "type_of_transaction", "fetch_from_parent", ], - filters={"disabled": 0}, or_filters={"document_type": doctype, "apply_to_all_doctypes": 1}, ) @@ -389,7 +392,6 @@ def get_inventory_dimensions(): "validate_negative_stock", "name as dimension_name", ], - filters={"disabled": 0}, order_by="creation", distinct=True, ) diff --git a/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py index fb62b0eb5c0..bfe6864486b 100644 --- a/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py +++ b/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py @@ -211,9 +211,9 @@ class TestInventoryDimension(ERPNextTestSuite): doc = create_inventory_dimension( reference_document="Pallet", type_of_transaction="Outward", - dimension_name="Pallet", + dimension_name="Pallet 75", apply_to_all_doctypes=0, - document_type="Stock Entry Detail", + document_type="Delivery Note Item", ) doc.reqd = 1 @@ -221,7 +221,7 @@ class TestInventoryDimension(ERPNextTestSuite): self.assertTrue( frappe.db.get_value( - "Custom Field", {"fieldname": "pallet", "dt": "Stock Entry Detail", "reqd": 1}, "name" + "Custom Field", {"fieldname": "pallet_75", "dt": "Delivery Note Item", "reqd": 1}, "name" ) ) diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index af59eacd0df..b25fc06e2dd 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -87,16 +87,40 @@ frappe.ui.form.on("Item", { toggle_has_serial_batch_fields(frm) { let hide_fields = cint(frappe.user_defaults?.enable_serial_and_batch_no_for_item) === 0 ? 1 : 0; - frm.toggle_display(["serial_no_series", "batch_number_series", "create_new_batch"], !hide_fields); + frm.toggle_display( + [ + "serial_no_series", + "batch_number_series", + "create_new_batch", + "has_expiry_date", + "retain_sample", + ], + !hide_fields + ); frm.toggle_enable(["has_serial_no", "has_batch_no"], !hide_fields); if (hide_fields) { - let description = __( - "To enable the Serial No and Batch No feature, please check the 'Enable Serial / Batch No for Item' checkbox in Stock Settings." - ); + let header = frm.fields_dict["serial_nos_and_batches"].wrapper; + let wrapper = header.find(".section-head.collapsible"); - frm.set_df_property("has_serial_no", "description", description); - frm.set_df_property("has_batch_no", "description", description); + render_serial_batch_banner(wrapper); + + if (!wrapper.data("banner-handler-added")) { + wrapper.data("banner-handler-added", true); + + wrapper.on("click", function () { + setTimeout(() => { + let isCollapsed = $(this).hasClass("collapsed"); + + wrapper.find(".custom-serial-batch-banner").toggleClass("hidden", isCollapsed); + }, 10); + }); + } + + // Button action + wrapper.find(".go-to-settings").on("click", function () { + frappe.set_route("Form", "Stock Settings"); + }); } }, @@ -372,6 +396,63 @@ var set_customer_group = function (frm, cdt, cdn) { return true; }; +function render_serial_batch_banner(wrapper) { + let hiddenClass = ""; + if (wrapper.hasClass("collapsed")) { + hiddenClass = "hidden"; + } + + wrapper.find(".custom-serial-batch-banner").remove(); + + let banner_html = ` +
+ +
+ + `; + + // Insert banner at top of section + wrapper.append(banner_html); +} + $.extend(erpnext.item, { setup_queries: function (frm) { frm.fields_dict["item_defaults"].grid.get_field("expense_account").get_query = function ( diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index e4996462278..75dcd140474 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -433,7 +433,7 @@ "depends_on": "eval:doc.is_stock_item", "fieldname": "serial_nos_and_batches", "fieldtype": "Section Break", - "label": "Serial Nos and Batches" + "label": "Serial Nos / Batches" }, { "default": "0", @@ -995,7 +995,7 @@ "image_field": "image", "links": [], "make_attachments_public": 1, - "modified": "2026-03-24 15:45:40.207531", + "modified": "2026-04-14 13:37:00.183583", "modified_by": "Administrator", "module": "Stock", "name": "Item", diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json index e388199c361..b3f2e2eed5c 100644 --- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json +++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -735,7 +735,6 @@ "oldfieldname": "valuation_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", - "precision": "6", "print_hide": 1, "print_width": "80px", "read_only": 1, @@ -1150,7 +1149,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2026-02-07 14:42:11.646809", + "modified": "2026-04-07 15:40:47.032889", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt Item", diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.js b/erpnext/stock/doctype/quality_inspection/quality_inspection.js index 69bc03a8bd4..8d5764d5697 100644 --- a/erpnext/stock/doctype/quality_inspection/quality_inspection.js +++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.js @@ -58,6 +58,7 @@ frappe.ui.form.on("Quality Inspection", { if (doc.reference_type && doc.reference_name) { let filters = { from: doctype, + parent_doctype: doc.reference_type, inspection_type: doc.inspection_type, }; diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py index 67fc49acb8a..52ac45ec6fb 100644 --- a/erpnext/stock/doctype/quality_inspection/quality_inspection.py +++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py @@ -368,10 +368,11 @@ def item_query(doctype, txt, searchfield, start, page_len, filters): from frappe.desk.reportview import get_match_cond from_doctype = cstr(filters.get("from")) + parent_doctype = cstr(filters.get("parent_doctype")) if not from_doctype or not frappe.db.exists("DocType", from_doctype): return [] - mcond = get_match_cond(from_doctype) + mcond = get_match_cond(parent_doctype or from_doctype) cond, qi_condition = "", "and (quality_inspection is null or quality_inspection = '')" if filters.get("parent"): 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 5daab368156..67a85a03705 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 @@ -148,7 +148,7 @@ class SerialandBatchBundle(Document): if not frappe.db.get_single_value("Stock Settings", "enable_serial_and_batch_no_for_item"): frappe.throw( _( - "Please check the 'Enable Serial and Batch No for Item' checkbox in the {0} to make Serial and Batch Bundle for the item." + "Please check the 'Activate Serial and Batch No for Item' checkbox in the {0} to make Serial and Batch Bundle for the item." ).format(get_link_to_form("Stock Settings", "Stock Settings")), title=_("Serial and Batch No for Item Disabled"), ) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index e4c1ffa4d26..3688b38aef1 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -725,14 +725,6 @@ frappe.ui.form.on("Stock Entry", { } }, - set_rate_and_fg_qty: function (frm, cdt, cdn) { - frm.events.set_basic_rate(frm, cdt, cdn); - let item = frappe.get_doc(cdt, cdn); - if (item.is_finished_item) { - frm.events.set_fg_completed_qty(frm); - } - }, - get_warehouse_details: function (frm, cdt, cdn) { var child = locals[cdt][cdn]; if (!child.bom_no) { @@ -1021,7 +1013,7 @@ frappe.ui.form.on("Stock Entry Detail", { }, conversion_factor(frm, cdt, cdn) { - frm.events.set_rate_and_fg_qty(frm, cdt, cdn); + frm.events.set_basic_rate(frm, cdt, cdn); }, s_warehouse(frm, cdt, cdn) { diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index ae5c390fdae..d62ce4e2cb4 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -3928,9 +3928,12 @@ def get_operating_cost_per_unit(work_order=None, bom_no=None): for d in work_order.get("operations"): if flt(d.completed_qty): - operating_cost_per_unit += flt( - d.actual_operating_cost - get_consumed_operating_cost(work_order.name, bom_no) - ) / flt(d.completed_qty - work_order.produced_qty) + if not (remaining_qty := flt(d.completed_qty - work_order.produced_qty)): + continue + operating_cost_per_unit += ( + flt(d.actual_operating_cost - get_consumed_operating_cost(work_order.name, bom_no)) + / remaining_qty + ) elif work_order.qty: operating_cost_per_unit += flt(d.planned_operating_cost) / flt(work_order.qty) diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index e0fc0ba6d11..4c8b666ef5d 100644 --- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -1801,6 +1801,47 @@ class TestStockReconciliation(ERPNextTestSuite, StockTestMixin): elif s.id_plant == plant_b.name: self.assertEqual(s.actual_qty, 3) + def test_serial_no_status_with_backdated_stock_reco(self): + from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note + + item_code = self.make_item( + "Test Item", + { + "is_stock_item": 1, + "has_serial_no": 1, + "serial_no_series": "SERIAL.###", + }, + ).name + + warehouse = "_Test Warehouse - _TC" + + reco = create_stock_reconciliation( + item_code=item_code, + posting_date=add_days(nowdate(), -2), + warehouse=warehouse, + qty=1, + rate=80, + purpose="Opening Stock", + ) + + serial_no = get_serial_nos_from_bundle(reco.items[0].serial_and_batch_bundle)[0] + + create_delivery_note( + item_code=item_code, warehouse=warehouse, qty=1, rate=100, posting_date=nowdate() + ) + + self.assertEqual(frappe.get_value("Serial No", serial_no, "status"), "Delivered") + + reco = create_stock_reconciliation( + item_code=item_code, + posting_date=add_days(nowdate(), -1), + warehouse=warehouse, + qty=1, + rate=90, + ) + + self.assertEqual(frappe.get_value("Serial No", serial_no, "status"), "Delivered") + def create_batch_item_with_batch(item_name, batch_id): batch_item_doc = create_item(item_name, is_stock_item=1) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.js b/erpnext/stock/doctype/stock_settings/stock_settings.js index 76651bf69fe..00f91ed6b41 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.js +++ b/erpnext/stock/doctype/stock_settings/stock_settings.js @@ -15,6 +15,12 @@ frappe.ui.form.on("Stock Settings", { frm.set_query("sample_retention_warehouse", filters); }, + enable_serial_and_batch_no_for_item(frm) { + if (frm.doc.enable_serial_and_batch_no_for_item) { + frappe.msgprint(__("After save, please refresh the page to apply the changes.")); + } + }, + use_serial_batch_fields(frm) { if (frm.doc.use_serial_batch_fields && !frm.doc.disable_serial_no_and_batch_selector) { frm.set_value("disable_serial_no_and_batch_selector", 1); diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index 8e42e4d3177..0b298bd2839 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -528,18 +528,18 @@ "label": "Allow Negative Stock for Batch" }, { + "default": "0", "fieldname": "enable_serial_and_batch_no_for_item", "fieldtype": "Check", - "label": "Enable Serial / Batch No for Item" + "label": "Activate Serial / Batch No for Item" } ], - "hide_toolbar": 0, "icon": "icon-cog", "idx": 1, "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-03-27 22:39:16.812184", + "modified": "2026-04-14 13:51:49.545114", "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings", diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py index c2c553457b0..f4079cc54cb 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.py +++ b/erpnext/stock/doctype/warehouse/warehouse.py @@ -109,49 +109,23 @@ class Warehouse(NestedSet): def warn_about_multiple_warehouse_account(self): "If Warehouse value is split across multiple accounts, warn." - def get_accounts_where_value_is_booked(name): - sle = frappe.qb.DocType("Stock Ledger Entry") - gle = frappe.qb.DocType("GL Entry") - ac = frappe.qb.DocType("Account") - - return ( - frappe.qb.from_(sle) - .join(gle) - .on(sle.voucher_no == gle.voucher_no) - .join(ac) - .on(ac.name == gle.account) - .select(gle.account) - .distinct() - .where((sle.warehouse == name) & (ac.account_type == "Stock")) - .orderby(sle.creation) - .run(as_dict=True) - ) - - if self.is_new(): + if not frappe.db.count("Stock Ledger Entry", {"warehouse": self.name}): return - old_wh_account = frappe.db.get_value("Warehouse", self.name, "account") + doc_before_save = self.get_doc_before_save() + old_wh_account = doc_before_save.account if doc_before_save else None - # WH account is being changed or set get all accounts against which wh value is booked - if self.account != old_wh_account: - accounts = get_accounts_where_value_is_booked(self.name) - accounts = [d.account for d in accounts] + if self.is_new() or (self.account and old_wh_account == self.account): + return - if not accounts or (len(accounts) == 1 and self.account in accounts): - # if same singular account has stock value booked ignore - return - - warning = _("Warehouse's Stock Value has already been booked in the following accounts:") - account_str = "
" + ", ".join(frappe.bold(ac) for ac in accounts) - reason = "

" + _( - "Booking stock value across multiple accounts will make it harder to track stock and account value." - ) - - frappe.msgprint( - warning + account_str + reason, - title=_("Multiple Warehouse Accounts"), - indicator="orange", - ) + frappe.msgprint( + title=_("Warning: Account changed for warehouse"), + indicator="orange", + msg=_( + "Stock entries exist with the old account. Changing the account may lead to a mismatch between the warehouse closing balance and the account closing balance. The overall closing balance will still match, but not for the specific account." + ), + alert=True, + ) def check_if_sle_exists(self, non_cancelled_only=False): filters = {"warehouse": self.name} diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py index 713161e3f8a..e3ce254b590 100644 --- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py @@ -250,7 +250,7 @@ def get_item_warehouse_batch_map(filters, float_precision): ) qty_dict.bal_qty = flt(qty_dict.bal_qty, float_precision) + flt(d.actual_qty, float_precision) - qty_dict.bal_value += flt(d.stock_value_difference, float_precision) + qty_dict.bal_value += flt(d.stock_value_difference) return iwb_map diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.js b/erpnext/stock/report/stock_ledger/stock_ledger.js index d56d58db666..84daee608fc 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.js +++ b/erpnext/stock/report/stock_ledger/stock_ledger.js @@ -119,7 +119,7 @@ frappe.query_reports["Stock Ledger"] = { }, { fieldname: "segregate_serial_batch_bundle", - label: __("Segregate Serial / Batch Bundle"), + label: __("Enable Serial / Batch Bundle"), fieldtype: "Check", default: 0, }, diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index e2bcc3dc6f3..aeb685854ef 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -390,12 +390,21 @@ def get_columns(filters): "options": "voucher_type", "width": 100, }, + { + "label": _("Serial and Batch Bundle"), + "fieldname": "serial_and_batch_bundle", + "fieldtype": "Link", + "options": "Serial and Batch Bundle", + "width": 150, + "hidden": not filters.get("segregate_serial_batch_bundle"), + }, { "label": _("Batch"), "fieldname": "batch_no", "fieldtype": "Link", "options": "Batch", "width": 100, + "hidden": not filters.get("segregate_serial_batch_bundle"), }, { "label": _("Serial No"), @@ -403,13 +412,7 @@ def get_columns(filters): "fieldtype": "Link", "options": "Serial No", "width": 100, - }, - { - "label": _("Serial and Batch Bundle"), - "fieldname": "serial_and_batch_bundle", - "fieldtype": "Link", - "options": "Serial and Batch Bundle", - "width": 100, + "hidden": not filters.get("segregate_serial_batch_bundle"), }, { "label": _("Project"), diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index c1a2cdb57b1..edde90de391 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -556,6 +556,16 @@ class update_entries_after: previous_sle = get_previous_sle_of_current_voucher(args) if previous_sle: self.prev_sle_dict[(args.get("item_code"), args.get("warehouse"))] = previous_sle + else: + self.prev_sle_dict[(args.get("item_code"), args.get("warehouse"))] = frappe._dict( + { + "qty_after_transaction": 0.0, + "valuation_rate": 0.0, + "stock_value": 0.0, + "prev_stock_value": 0.0, + "stock_queue": [], + } + ) warehouse_dict.previous_sle = previous_sle @@ -1071,34 +1081,6 @@ class update_entries_after: sabb_doc.voucher_no = None sabb_doc.cancel() - if sle.serial_and_batch_bundle and frappe.get_cached_value("Item", sle.item_code, "has_serial_no"): - self.update_serial_no_status(sle) - - def update_serial_no_status(self, sle): - from erpnext.stock.serial_batch_bundle import get_serial_nos - - serial_nos = get_serial_nos(sle.serial_and_batch_bundle) - if not serial_nos: - return - - warehouse = None - status = "Inactive" - - if sle.actual_qty > 0: - warehouse = sle.warehouse - status = "Active" - - sn_table = frappe.qb.DocType("Serial No") - - query = ( - frappe.qb.update(sn_table) - .set(sn_table.warehouse, warehouse) - .set(sn_table.status, status) - .where(sn_table.name.isin(serial_nos)) - ) - - query.run() - def calculate_valuation_for_serial_batch_bundle(self, sle): if not frappe.db.exists("Serial and Batch Bundle", sle.serial_and_batch_bundle): return