Merge pull request #40635 from frappe/pot_develop_2024-03-24
diff --git a/erpnext/accounts/doctype/dunning/dunning.json b/erpnext/accounts/doctype/dunning/dunning.json
index b7e8aea..3273462 100644
--- a/erpnext/accounts/doctype/dunning/dunning.json
+++ b/erpnext/accounts/doctype/dunning/dunning.json
@@ -185,7 +185,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Address",
"read_only": 1
},
@@ -204,7 +204,7 @@
},
{
"fieldname": "company_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Company Address Display",
"read_only": 1
},
@@ -381,7 +381,7 @@
],
"is_submittable": 1,
"links": [],
- "modified": "2023-06-15 15:46:53.865712",
+ "modified": "2024-03-22 16:01:13.231067",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Dunning",
diff --git a/erpnext/accounts/doctype/dunning/dunning.py b/erpnext/accounts/doctype/dunning/dunning.py
index e3897bf..f7c4d90 100644
--- a/erpnext/accounts/doctype/dunning/dunning.py
+++ b/erpnext/accounts/doctype/dunning/dunning.py
@@ -32,14 +32,14 @@
from erpnext.accounts.doctype.overdue_payment.overdue_payment import OverduePayment
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
base_dunning_amount: DF.Currency
body_text: DF.TextEditor | None
closing_text: DF.TextEditor | None
company: DF.Link
company_address: DF.Link | None
- company_address_display: DF.SmallText | None
+ company_address_display: DF.TextEditor | None
contact_display: DF.SmallText | None
contact_email: DF.Data | None
contact_mobile: DF.SmallText | None
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index b4d1d39..4684aab 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -30,7 +30,7 @@
make_reverse_gl_entries,
process_gl_map,
)
-from erpnext.accounts.party import get_party_account, set_contact_details
+from erpnext.accounts.party import complete_contact_details, get_party_account, set_contact_details
from erpnext.accounts.utils import (
cancel_exchange_gain_loss_journal,
get_account_currency,
@@ -446,6 +446,8 @@
if self.party:
if not self.contact_person:
set_contact_details(self, party=frappe._dict({"name": self.party}), party_type=self.party_type)
+ else:
+ complete_contact_details(self)
if not self.party_balance:
self.party_balance = get_balance_on(
party_type=self.party_type, party=self.party, date=self.posting_date, company=self.company
@@ -2295,7 +2297,7 @@
pe.party_type = party_type
pe.party = doc.get(scrub(party_type))
pe.contact_person = doc.get("contact_person")
- pe.contact_email = doc.get("contact_email")
+ complete_contact_details(pe)
pe.ensure_supplier_is_not_blocked()
pe.paid_from = party_account if payment_type == "Receive" else bank.account
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
index d7b1736..467ea54 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
@@ -420,7 +420,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Address",
"read_only": 1
},
@@ -475,7 +475,7 @@
},
{
"fieldname": "shipping_address",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Shipping Address",
"print_hide": 1,
"read_only": 1
@@ -489,7 +489,7 @@
},
{
"fieldname": "company_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hidden": 1,
"label": "Company Address",
"print_hide": 1,
@@ -1563,7 +1563,7 @@
"icon": "fa fa-file-text",
"is_submittable": 1,
"links": [],
- "modified": "2024-03-20 16:00:34.268756",
+ "modified": "2024-03-22 16:15:08.561034",
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Invoice",
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
index 5db3da1..8052c4c 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
@@ -47,7 +47,7 @@
account_for_change_amount: DF.Link | None
additional_discount_percentage: DF.Float
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
advances: DF.Table[SalesInvoiceAdvance]
against_income_account: DF.SmallText | None
allocate_advances_automatically: DF.Check
@@ -72,7 +72,7 @@
commission_rate: DF.Float
company: DF.Link
company_address: DF.Link | None
- company_address_display: DF.SmallText | None
+ company_address_display: DF.TextEditor | None
consolidated_invoice: DF.Link | None
contact_display: DF.SmallText | None
contact_email: DF.Data | None
@@ -138,7 +138,7 @@
selling_price_list: DF.Link
set_posting_time: DF.Check
set_warehouse: DF.Link | None
- shipping_address: DF.SmallText | None
+ shipping_address: DF.TextEditor | None
shipping_address_name: DF.Link | None
shipping_rule: DF.Link | None
source: DF.Link | None
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 44d3d48..01a3746 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -443,7 +443,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Address",
"read_only": 1
},
@@ -489,7 +489,7 @@
},
{
"fieldname": "shipping_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Shipping Address",
"print_hide": 1,
"read_only": 1
@@ -1363,7 +1363,7 @@
},
{
"fieldname": "billing_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Billing Address",
"read_only": 1
},
@@ -1638,7 +1638,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
- "modified": "2024-03-20 15:57:00.736868",
+ "modified": "2024-03-22 16:15:09.099187",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 19b7092..4b5b456 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -82,7 +82,7 @@
)
additional_discount_percentage: DF.Float
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
advance_tax: DF.Table[AdvanceTax]
advances: DF.Table[PurchaseInvoiceAdvance]
against_expense_account: DF.SmallText | None
@@ -107,7 +107,7 @@
bill_date: DF.Date | None
bill_no: DF.Data | None
billing_address: DF.Link | None
- billing_address_display: DF.SmallText | None
+ billing_address_display: DF.TextEditor | None
buying_price_list: DF.Link | None
cash_bank_account: DF.Link | None
clearance_date: DF.Date | None
@@ -174,7 +174,7 @@
set_posting_time: DF.Check
set_warehouse: DF.Link | None
shipping_address: DF.Link | None
- shipping_address_display: DF.SmallText | None
+ shipping_address_display: DF.TextEditor | None
shipping_rule: DF.Link | None
status: DF.Literal[
"",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index cffb097..436f510 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -495,7 +495,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hide_days": 1,
"hide_seconds": 1,
"label": "Address",
@@ -566,7 +566,7 @@
},
{
"fieldname": "shipping_address",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hide_days": 1,
"hide_seconds": 1,
"label": "Shipping Address",
@@ -584,7 +584,7 @@
},
{
"fieldname": "company_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hide_days": 1,
"hide_seconds": 1,
"label": "Company Address",
@@ -1999,7 +1999,7 @@
{
"allow_on_submit": 1,
"fieldname": "dispatch_address",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Dispatch Address",
"read_only": 1
},
@@ -2256,4 +2256,4 @@
"title_field": "title",
"track_changes": 1,
"track_seen": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index aa0048d..a35c6b6 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -77,7 +77,7 @@
account_for_change_amount: DF.Link | None
additional_discount_account: DF.Link | None
additional_discount_percentage: DF.Float
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
advances: DF.Table[SalesInvoiceAdvance]
against_income_account: DF.SmallText | None
allocate_advances_automatically: DF.Check
@@ -102,7 +102,7 @@
commission_rate: DF.Float
company: DF.Link
company_address: DF.Link | None
- company_address_display: DF.SmallText | None
+ company_address_display: DF.TextEditor | None
company_tax_id: DF.Data | None
contact_display: DF.SmallText | None
contact_email: DF.Data | None
@@ -119,7 +119,7 @@
debit_to: DF.Link
disable_rounded_total: DF.Check
discount_amount: DF.Currency
- dispatch_address: DF.SmallText | None
+ dispatch_address: DF.TextEditor | None
dispatch_address_name: DF.Link | None
dont_create_loyalty_points: DF.Check
due_date: DF.Date | None
@@ -183,7 +183,7 @@
set_posting_time: DF.Check
set_target_warehouse: DF.Link | None
set_warehouse: DF.Link | None
- shipping_address: DF.SmallText | None
+ shipping_address: DF.TextEditor | None
shipping_address_name: DF.Link | None
shipping_rule: DF.Link | None
source: DF.Link | None
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index d8ae2a4..4b3f0c8 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -282,9 +282,7 @@
pass
-def set_contact_details(party_details, party, party_type):
- party_details.contact_person = get_default_contact(party_type, party.name)
-
+def complete_contact_details(party_details):
if not party_details.contact_person:
party_details.update(
{
@@ -315,6 +313,11 @@
party_details.update(contact_details)
+def set_contact_details(party_details, party, party_type):
+ party_details.contact_person = get_default_contact(party_type, party.name)
+ complete_contact_details(party_details)
+
+
def set_other_values(party_details, party, party_type):
# copy
if party_type == "Customer":
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
index 2ffd3b3..98c6656 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
@@ -24,3 +24,10 @@
fieldtype: "Check",
default: 1,
});
+
+frappe.query_reports["Profit and Loss Statement"]["filters"].push({
+ fieldname: "include_default_book_entries",
+ label: __("Include Default FB Entries"),
+ fieldtype: "Check",
+ default: 1,
+});
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 0916ff5..1ee9794 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -355,7 +355,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Supplier Address Details",
"read_only": 1
},
@@ -394,7 +394,7 @@
},
{
"fieldname": "shipping_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Shipping Address Details",
"print_hide": 1,
"read_only": 1
@@ -1098,7 +1098,7 @@
},
{
"fieldname": "billing_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Billing Address Details",
"read_only": 1
},
@@ -1288,7 +1288,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2024-03-20 16:03:31.611808",
+ "modified": "2024-03-22 16:15:09.674963",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 4f24ec2..e462820 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -55,7 +55,7 @@
)
additional_discount_percentage: DF.Float
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
advance_paid: DF.Currency
advance_payment_status: DF.Literal["Not Initiated", "Initiated", "Partially Paid", "Fully Paid"]
amended_from: DF.Link | None
@@ -74,7 +74,7 @@
base_total: DF.Currency
base_total_taxes_and_charges: DF.Currency
billing_address: DF.Link | None
- billing_address_display: DF.SmallText | None
+ billing_address_display: DF.TextEditor | None
buying_price_list: DF.Link | None
company: DF.Link
contact_display: DF.SmallText | None
@@ -131,7 +131,7 @@
set_reserve_warehouse: DF.Link | None
set_warehouse: DF.Link | None
shipping_address: DF.Link | None
- shipping_address_display: DF.SmallText | None
+ shipping_address_display: DF.TextEditor | None
shipping_rule: DF.Link | None
status: DF.Literal[
"",
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
index fd73f77..f386b64 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -303,7 +303,7 @@
},
{
"fieldname": "billing_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Billing Address Details",
"read_only": 1
}
@@ -312,7 +312,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2023-11-06 12:45:28.898706",
+ "modified": "2024-03-22 16:01:19.097788",
"modified_by": "Administrator",
"module": "Buying",
"name": "Request for Quotation",
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 f261773..fb4dc6a 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -40,7 +40,7 @@
amended_from: DF.Link | None
billing_address: DF.Link | None
- billing_address_display: DF.SmallText | None
+ billing_address_display: DF.TextEditor | None
company: DF.Link
email_template: DF.Link | None
incoterm: DF.Link | None
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 09be247..993cde0 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -228,7 +228,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Address",
"read_only": 1
},
@@ -865,7 +865,7 @@
},
{
"fieldname": "shipping_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Shipping Address Details",
"print_hide": 1,
"read_only": 1
@@ -897,7 +897,7 @@
},
{
"fieldname": "billing_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Billing Address Details",
"read_only": 1
},
@@ -928,7 +928,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2024-03-20 16:03:59.069145",
+ "modified": "2024-03-22 16:15:10.122197",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation",
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index b716f7f..52bd83b 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -31,7 +31,7 @@
)
additional_discount_percentage: DF.Float
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
auto_repeat: DF.Link | None
@@ -46,7 +46,7 @@
base_total: DF.Currency
base_total_taxes_and_charges: DF.Currency
billing_address: DF.Link | None
- billing_address_display: DF.SmallText | None
+ billing_address_display: DF.TextEditor | None
buying_price_list: DF.Link | None
company: DF.Link
contact_display: DF.SmallText | None
@@ -81,7 +81,7 @@
rounding_adjustment: DF.Currency
select_print_heading: DF.Link | None
shipping_address: DF.Link | None
- shipping_address_display: DF.SmallText | None
+ shipping_address_display: DF.TextEditor | None
shipping_rule: DF.Link | None
status: DF.Literal["", "Draft", "Submitted", "Stopped", "Cancelled", "Expired"]
supplier: DF.Link
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 8bdee22..3b83c7c 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -380,6 +380,12 @@
for bundle in bundles:
frappe.delete_doc("Serial and Batch Bundle", bundle.name)
+ batches = frappe.get_all(
+ "Batch", filters={"reference_doctype": self.doctype, "reference_name": self.name}
+ )
+ for row in batches:
+ frappe.delete_doc("Batch", row.name)
+
def validate_return_against_account(self):
if (
self.doctype in ["Sales Invoice", "Purchase Invoice"] and self.is_return and self.return_against
@@ -1643,52 +1649,30 @@
return amount, base_amount
def make_discount_gl_entries(self, gl_entries):
- if self.doctype == "Purchase Invoice":
- enable_discount_accounting = cint(
- frappe.db.get_single_value("Buying Settings", "enable_discount_accounting")
- )
- elif self.doctype == "Sales Invoice":
- enable_discount_accounting = cint(
- frappe.db.get_single_value("Selling Settings", "enable_discount_accounting")
- )
-
- if self.doctype == "Purchase Invoice":
- dr_or_cr = "credit"
- rev_dr_cr = "debit"
- supplier_or_customer = self.supplier
-
- else:
- dr_or_cr = "debit"
- rev_dr_cr = "credit"
- supplier_or_customer = self.customer
+ enable_discount_accounting = cint(
+ frappe.db.get_single_value("Selling Settings", "enable_discount_accounting")
+ )
if enable_discount_accounting:
for item in self.get("items"):
if item.get("discount_amount") and item.get("discount_account"):
discount_amount = item.discount_amount * item.qty
- if self.doctype == "Purchase Invoice":
- income_or_expense_account = (
- item.expense_account
- if (not item.enable_deferred_expense or self.is_return)
- else item.deferred_expense_account
- )
- else:
- income_or_expense_account = (
- item.income_account
- if (not item.enable_deferred_revenue or self.is_return)
- else item.deferred_revenue_account
- )
+ income_account = (
+ item.income_account
+ if (not item.enable_deferred_revenue or self.is_return)
+ else item.deferred_revenue_account
+ )
account_currency = get_account_currency(item.discount_account)
gl_entries.append(
self.get_gl_dict(
{
"account": item.discount_account,
- "against": supplier_or_customer,
- dr_or_cr: flt(
+ "against": self.customer,
+ "debit": flt(
discount_amount * self.get("conversion_rate"), item.precision("discount_amount")
),
- dr_or_cr + "_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
+ "debit_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
"cost_center": item.cost_center,
"project": item.project,
},
@@ -1697,17 +1681,16 @@
)
)
- account_currency = get_account_currency(income_or_expense_account)
+ account_currency = get_account_currency(income_account)
gl_entries.append(
self.get_gl_dict(
{
- "account": income_or_expense_account,
- "against": supplier_or_customer,
- rev_dr_cr: flt(
+ "account": income_account,
+ "against": self.customer,
+ "credit": flt(
discount_amount * self.get("conversion_rate"), item.precision("discount_amount")
),
- rev_dr_cr
- + "_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
+ "credit_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
"cost_center": item.cost_center,
"project": item.project or self.project,
},
@@ -1725,8 +1708,8 @@
self.get_gl_dict(
{
"account": self.additional_discount_account,
- "against": supplier_or_customer,
- dr_or_cr: self.base_discount_amount,
+ "against": self.customer,
+ "debit": self.base_discount_amount,
"cost_center": self.cost_center or erpnext.get_default_cost_center(self.company),
},
item=self,
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 15eeff5..a1946e8 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -48,7 +48,9 @@
super(StockController, self).validate()
if self.docstatus == 0:
- self.validate_duplicate_serial_and_batch_bundle()
+ for table_name in ["items", "packed_items", "supplied_items"]:
+ self.validate_duplicate_serial_and_batch_bundle(table_name)
+
if not self.get("is_return"):
self.validate_inspection()
self.validate_serialized_batch()
@@ -58,12 +60,19 @@
self.validate_internal_transfer()
self.validate_putaway_capacity()
- def validate_duplicate_serial_and_batch_bundle(self):
- if sbb_list := [
- item.get("serial_and_batch_bundle")
- for item in self.items
- if item.get("serial_and_batch_bundle")
- ]:
+ def validate_duplicate_serial_and_batch_bundle(self, table_name):
+ if not self.get(table_name):
+ return
+
+ sbb_list = []
+ for item in self.get(table_name):
+ if item.get("serial_and_batch_bundle"):
+ sbb_list.append(item.get("serial_and_batch_bundle"))
+
+ if item.get("rejected_serial_and_batch_bundle"):
+ sbb_list.append(item.get("rejected_serial_and_batch_bundle"))
+
+ if sbb_list:
SLE = frappe.qb.DocType("Stock Ledger Entry")
data = (
frappe.qb.from_(SLE)
@@ -188,7 +197,7 @@
not row.serial_and_batch_bundle and not row.get("rejected_serial_and_batch_bundle")
):
bundle_details = {
- "item_code": row.item_code,
+ "item_code": row.get("rm_item_code") or row.item_code,
"posting_date": self.posting_date,
"posting_time": self.posting_time,
"voucher_type": self.doctype,
@@ -200,7 +209,7 @@
"do_not_submit": True,
}
- if row.qty:
+ if row.get("qty") or row.get("consumed_qty"):
self.update_bundle_details(bundle_details, table_name, row)
self.create_serial_batch_bundle(bundle_details, row)
@@ -219,6 +228,12 @@
type_of_transaction = "Inward"
if not self.is_return:
type_of_transaction = "Outward"
+ elif table_name == "supplied_items":
+ qty = row.consumed_qty
+ warehouse = self.supplier_warehouse
+ type_of_transaction = "Outward"
+ if self.is_return:
+ type_of_transaction = "Inward"
else:
type_of_transaction = get_type_of_transaction(self, row)
@@ -550,13 +565,30 @@
)
def delete_auto_created_batches(self):
- for row in self.items:
- if row.serial_and_batch_bundle:
- frappe.db.set_value(
- "Serial and Batch Bundle", row.serial_and_batch_bundle, {"is_cancelled": 1}
- )
+ for table_name in ["items", "packed_items", "supplied_items"]:
+ if not self.get(table_name):
+ continue
- row.db_set("serial_and_batch_bundle", None)
+ for row in self.get(table_name):
+ update_values = {}
+ if row.get("batch_no"):
+ update_values["batch_no"] = None
+
+ if row.serial_and_batch_bundle:
+ update_values["serial_and_batch_bundle"] = None
+ frappe.db.set_value(
+ "Serial and Batch Bundle", row.serial_and_batch_bundle, {"is_cancelled": 1}
+ )
+
+ if update_values:
+ row.db_set(update_values)
+
+ if table_name == "items" and row.get("rejected_serial_and_batch_bundle"):
+ frappe.db.set_value(
+ "Serial and Batch Bundle", row.rejected_serial_and_batch_bundle, {"is_cancelled": 1}
+ )
+
+ row.db_set("rejected_serial_and_batch_bundle", None)
def set_serial_and_batch_bundle(self, table_name=None, ignore_validate=False):
if not table_name:
diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py
index e66fe8b..ffc7f91 100644
--- a/erpnext/controllers/subcontracting_controller.py
+++ b/erpnext/controllers/subcontracting_controller.py
@@ -379,10 +379,10 @@
if row.serial_no:
details.serial_no.extend(get_serial_nos(row.serial_no))
- if row.batch_no:
+ elif row.batch_no:
details.batch_no[row.batch_no] += row.qty
- if voucher_bundle_data:
+ elif voucher_bundle_data:
bundle_key = (row.rm_item_code, row.main_item_code, row.t_warehouse, row.voucher_no)
bundle_data = voucher_bundle_data.get(bundle_key, frappe._dict())
@@ -392,6 +392,9 @@
if bundle_data.batch_nos:
for batch_no, qty in bundle_data.batch_nos.items():
+ if qty < 0:
+ qty = abs(qty)
+
if qty > 0:
details.batch_no[batch_no] += qty
bundle_data.batch_nos[batch_no] -= qty
@@ -545,17 +548,24 @@
rm_obj.reference_name = item_row.name
+ use_serial_batch_fields = frappe.db.get_single_value("Stock Settings", "use_serial_batch_fields")
+
if self.doctype == self.subcontract_data.order_doctype:
rm_obj.required_qty = qty
rm_obj.amount = rm_obj.required_qty * rm_obj.rate
else:
rm_obj.consumed_qty = qty
rm_obj.required_qty = bom_item.required_qty or qty
+ rm_obj.serial_and_batch_bundle = None
setattr(
rm_obj, self.subcontract_data.order_field, item_row.get(self.subcontract_data.order_field)
)
- if self.doctype == "Subcontracting Receipt":
+ if use_serial_batch_fields:
+ rm_obj.use_serial_batch_fields = 1
+ self.__set_batch_nos(bom_item, item_row, rm_obj, qty)
+
+ if self.doctype == "Subcontracting Receipt" and not use_serial_batch_fields:
args = frappe._dict(
{
"item_code": rm_obj.rm_item_code,
@@ -581,6 +591,68 @@
rm_obj.rate = get_incoming_rate(args)
+ def __set_batch_nos(self, bom_item, item_row, rm_obj, qty):
+ key = (rm_obj.rm_item_code, item_row.item_code, item_row.get(self.subcontract_data.order_field))
+
+ if self.available_materials.get(key) and self.available_materials[key]["batch_no"]:
+ new_rm_obj = None
+ for batch_no, batch_qty in self.available_materials[key]["batch_no"].items():
+ if batch_qty >= qty or (
+ rm_obj.consumed_qty == 0
+ and self.backflush_based_on == "BOM"
+ and len(self.available_materials[key]["batch_no"]) == 1
+ ):
+ if rm_obj.consumed_qty == 0:
+ self.__set_consumed_qty(rm_obj, qty)
+
+ self.__set_batch_no_as_per_qty(item_row, rm_obj, batch_no, qty)
+ self.available_materials[key]["batch_no"][batch_no] -= qty
+ return
+
+ elif qty > 0 and batch_qty > 0:
+ qty -= batch_qty
+ new_rm_obj = self.append(self.raw_material_table, bom_item)
+ new_rm_obj.serial_and_batch_bundle = None
+ new_rm_obj.use_serial_batch_fields = 1
+ new_rm_obj.reference_name = item_row.name
+ self.__set_batch_no_as_per_qty(item_row, new_rm_obj, batch_no, batch_qty)
+ self.available_materials[key]["batch_no"][batch_no] = 0
+
+ if new_rm_obj:
+ self.remove(rm_obj)
+ elif abs(qty) > 0:
+ self.__set_consumed_qty(rm_obj, qty)
+
+ else:
+ self.__set_consumed_qty(rm_obj, qty, bom_item.required_qty or qty)
+ self.__set_serial_nos(item_row, rm_obj)
+
+ def __set_consumed_qty(self, rm_obj, consumed_qty, required_qty=0):
+ rm_obj.required_qty = required_qty
+ rm_obj.consumed_qty = consumed_qty
+
+ def __set_serial_nos(self, item_row, rm_obj):
+ key = (rm_obj.rm_item_code, item_row.item_code, item_row.get(self.subcontract_data.order_field))
+ if self.available_materials.get(key) and self.available_materials[key]["serial_no"]:
+ used_serial_nos = self.available_materials[key]["serial_no"][0 : cint(rm_obj.consumed_qty)]
+ rm_obj.serial_no = "\n".join(used_serial_nos)
+
+ # Removed the used serial nos from the list
+ for sn in used_serial_nos:
+ self.available_materials[key]["serial_no"].remove(sn)
+
+ def __set_batch_no_as_per_qty(self, item_row, rm_obj, batch_no, qty):
+ rm_obj.update(
+ {
+ "consumed_qty": qty,
+ "batch_no": batch_no,
+ "required_qty": qty,
+ self.subcontract_data.order_field: item_row.get(self.subcontract_data.order_field),
+ }
+ )
+
+ self.__set_serial_nos(item_row, rm_obj)
+
def __get_qty_based_on_material_transfer(self, item_row, transfer_item):
key = (item_row.item_code, item_row.get(self.subcontract_data.order_field))
@@ -1076,6 +1148,9 @@
"serial_and_batch_bundle": rm_item.get("serial_and_batch_bundle"),
"main_item_code": fg_item_code,
"allow_alternative_item": item_wh.get(rm_item_code, {}).get("allow_alternative_item"),
+ "use_serial_batch_fields": rm_item.get("use_serial_batch_fields"),
+ "serial_no": rm_item.get("serial_no") if rm_item.get("use_serial_batch_fields") else None,
+ "batch_no": rm_item.get("batch_no") if rm_item.get("use_serial_batch_fields") else None,
}
}
diff --git a/erpnext/controllers/tests/test_subcontracting_controller.py b/erpnext/controllers/tests/test_subcontracting_controller.py
index 95a7bcb..7374e1e 100644
--- a/erpnext/controllers/tests/test_subcontracting_controller.py
+++ b/erpnext/controllers/tests/test_subcontracting_controller.py
@@ -140,6 +140,7 @@
- Create partial SCR against the SCO and check serial nos and batch no.
"""
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
set_backflush_based_on("Material Transferred for Subcontract")
service_items = [
{
@@ -202,6 +203,8 @@
if value.get(field):
self.assertEqual(value.get(field), transferred_detais.get(field))
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
+
def test_subcontracting_with_same_components_different_fg(self):
"""
- Set backflush based on Material Transfer.
@@ -211,6 +214,7 @@
- Create partial SCR against the SCO and check serial nos.
"""
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
set_backflush_based_on("Material Transferred for Subcontract")
service_items = [
{
@@ -278,6 +282,8 @@
self.assertEqual(value.qty, 6)
self.assertEqual(sorted(value.serial_no), sorted(transferred_detais.get("serial_no")[6:12]))
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
+
def test_return_non_consumed_materials(self):
"""
- Set backflush based on Material Transfer.
@@ -288,6 +294,7 @@
- After that return the non consumed material back to the store from supplier's warehouse.
"""
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
set_backflush_based_on("Material Transferred for Subcontract")
service_items = [
{
@@ -333,6 +340,7 @@
get_serial_nos(doc.items[0].serial_no),
itemwise_details.get(doc.items[0].item_code)["serial_no"][5:6],
)
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
def test_item_with_batch_based_on_bom(self):
"""
@@ -578,6 +586,7 @@
- Create SCR for remaining qty against the SCO and change the qty manually.
"""
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
set_backflush_based_on("Material Transferred for Subcontract")
service_items = [
{
@@ -643,6 +652,8 @@
self.assertEqual(value.qty, details.qty)
self.assertEqual(sorted(value.serial_no), sorted(details.serial_no))
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
+
def test_incorrect_serial_no_components_based_on_material_transfer(self):
"""
- Set backflush based on Material Transferred for Subcontract.
@@ -652,6 +663,7 @@
- System should throw the error and not allowed to save the SCR.
"""
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
serial_no = "ABC"
if not frappe.db.exists("Serial No", serial_no):
frappe.get_doc(
@@ -712,6 +724,7 @@
scr1.save()
self.delete_bundle_from_scr(scr1)
scr1.delete()
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
@staticmethod
def delete_bundle_from_scr(scr):
@@ -844,6 +857,223 @@
for item in sco.get("supplied_items"):
self.assertEqual(item.supplied_qty, 0.0)
+ def test_sco_with_material_transfer_with_use_serial_batch_fields(self):
+ """
+ - Set backflush based on Material Transfer.
+ - Create SCO for the item Subcontracted Item SA1 and Subcontracted Item SA5.
+ - Transfer the components from Stores to Supplier warehouse with batch no and serial nos.
+ - Transfer extra item Subcontracted SRM Item 4 for the subcontract item Subcontracted Item SA5.
+ - Create partial SCR against the SCO and check serial nos and batch no.
+ """
+
+ set_backflush_based_on("Material Transferred for Subcontract")
+ service_items = [
+ {
+ "warehouse": "_Test Warehouse - _TC",
+ "item_code": "Subcontracted Service Item 1",
+ "qty": 5,
+ "rate": 100,
+ "fg_item": "Subcontracted Item SA1",
+ "fg_item_qty": 5,
+ },
+ {
+ "warehouse": "_Test Warehouse - _TC",
+ "item_code": "Subcontracted Service Item 5",
+ "qty": 6,
+ "rate": 100,
+ "fg_item": "Subcontracted Item SA5",
+ "fg_item_qty": 6,
+ },
+ ]
+ sco = get_subcontracting_order(service_items=service_items)
+ rm_items = get_rm_items(sco.supplied_items)
+ rm_items.append(
+ {
+ "main_item_code": "Subcontracted Item SA5",
+ "item_code": "Subcontracted SRM Item 4",
+ "qty": 6,
+ }
+ )
+ itemwise_details = make_stock_in_entry(rm_items=rm_items)
+
+ for item in rm_items:
+ item["sco_rm_detail"] = sco.items[0].name if item.get("qty") == 5 else sco.items[1].name
+
+ make_stock_transfer_entry(
+ sco_no=sco.name,
+ rm_items=rm_items,
+ itemwise_details=copy.deepcopy(itemwise_details),
+ )
+
+ scr1 = make_subcontracting_receipt(sco.name)
+ scr1.remove(scr1.items[1])
+ scr1.save()
+ scr1.submit()
+
+ for key, value in get_supplied_items(scr1).items():
+ transferred_detais = itemwise_details.get(key)
+
+ for field in ["qty", "serial_no", "batch_no"]:
+ if value.get(field):
+ data = value.get(field)
+ if field == "serial_no":
+ data = sorted(data)
+
+ self.assertEqual(data, transferred_detais.get(field))
+
+ scr2 = make_subcontracting_receipt(sco.name)
+ scr2.save()
+ scr2.submit()
+
+ for key, value in get_supplied_items(scr2).items():
+ transferred_detais = itemwise_details.get(key)
+
+ for field in ["qty", "serial_no", "batch_no"]:
+ if value.get(field):
+ data = value.get(field)
+ if field == "serial_no":
+ data = sorted(data)
+
+ self.assertEqual(data, transferred_detais.get(field))
+
+ def test_subcontracting_with_same_components_different_fg_with_serial_batch_fields(self):
+ """
+ - Set backflush based on Material Transfer.
+ - Create SCO for the item Subcontracted Item SA2 and Subcontracted Item SA3.
+ - Transfer the components from Stores to Supplier warehouse with serial nos.
+ - Transfer extra qty of components for the item Subcontracted Item SA2.
+ - Create partial SCR against the SCO and check serial nos.
+ """
+
+ set_backflush_based_on("Material Transferred for Subcontract")
+ service_items = [
+ {
+ "warehouse": "_Test Warehouse - _TC",
+ "item_code": "Subcontracted Service Item 2",
+ "qty": 5,
+ "rate": 100,
+ "fg_item": "Subcontracted Item SA2",
+ "fg_item_qty": 5,
+ },
+ {
+ "warehouse": "_Test Warehouse - _TC",
+ "item_code": "Subcontracted Service Item 3",
+ "qty": 6,
+ "rate": 100,
+ "fg_item": "Subcontracted Item SA3",
+ "fg_item_qty": 6,
+ },
+ ]
+ sco = get_subcontracting_order(service_items=service_items)
+ rm_items = get_rm_items(sco.supplied_items)
+ rm_items[0]["qty"] += 1
+ itemwise_details = make_stock_in_entry(rm_items=rm_items)
+
+ for item in rm_items:
+ item["sco_rm_detail"] = sco.items[0].name if item.get("qty") == 5 else sco.items[1].name
+ item["use_serial_batch_fields"] = 1
+
+ make_stock_transfer_entry(
+ sco_no=sco.name,
+ rm_items=rm_items,
+ itemwise_details=copy.deepcopy(itemwise_details),
+ )
+
+ scr1 = make_subcontracting_receipt(sco.name)
+ scr1.items[0].qty = 3
+ scr1.remove(scr1.items[1])
+ scr1.save()
+ scr1.submit()
+
+ for key, value in get_supplied_items(scr1).items():
+ transferred_detais = itemwise_details.get(key)
+
+ self.assertEqual(value.qty, 4)
+ self.assertEqual(sorted(value.serial_no), sorted(transferred_detais.get("serial_no")[0:4]))
+
+ scr2 = make_subcontracting_receipt(sco.name)
+ scr2.items[0].qty = 2
+ scr2.remove(scr2.items[1])
+ scr2.save()
+ scr2.submit()
+
+ for key, value in get_supplied_items(scr2).items():
+ transferred_detais = itemwise_details.get(key)
+
+ self.assertEqual(value.qty, 2)
+ self.assertEqual(sorted(value.serial_no), sorted(transferred_detais.get("serial_no")[4:6]))
+
+ scr3 = make_subcontracting_receipt(sco.name)
+ scr3.save()
+ scr3.submit()
+
+ for key, value in get_supplied_items(scr3).items():
+ transferred_detais = itemwise_details.get(key)
+
+ self.assertEqual(value.qty, 6)
+ self.assertEqual(sorted(value.serial_no), sorted(transferred_detais.get("serial_no")[6:12]))
+
+ def test_return_non_consumed_materials_with_serial_batch_fields(self):
+ """
+ - Set backflush based on Material Transfer.
+ - Create SCO for item Subcontracted Item SA2.
+ - Transfer the components from Stores to Supplier warehouse with serial nos.
+ - Transfer extra qty of component for the subcontracted item Subcontracted Item SA2.
+ - Create SCR for full qty against the SCO and change the qty of raw material.
+ - After that return the non consumed material back to the store from supplier's warehouse.
+ """
+
+ set_backflush_based_on("Material Transferred for Subcontract")
+ service_items = [
+ {
+ "warehouse": "_Test Warehouse - _TC",
+ "item_code": "Subcontracted Service Item 2",
+ "qty": 5,
+ "rate": 100,
+ "fg_item": "Subcontracted Item SA2",
+ "fg_item_qty": 5,
+ },
+ ]
+ sco = get_subcontracting_order(service_items=service_items)
+ rm_items = get_rm_items(sco.supplied_items)
+ rm_items[0]["qty"] += 1
+ itemwise_details = make_stock_in_entry(rm_items=rm_items)
+
+ for item in rm_items:
+ item["use_serial_batch_fields"] = 1
+ item["sco_rm_detail"] = sco.items[0].name
+
+ make_stock_transfer_entry(
+ sco_no=sco.name,
+ rm_items=rm_items,
+ itemwise_details=copy.deepcopy(itemwise_details),
+ )
+
+ scr1 = make_subcontracting_receipt(sco.name)
+ scr1.save()
+ scr1.supplied_items[0].consumed_qty = 5
+ scr1.supplied_items[0].serial_no = "\n".join(
+ sorted(itemwise_details.get("Subcontracted SRM Item 2").get("serial_no")[0:5])
+ )
+ scr1.submit()
+
+ for key, value in get_supplied_items(scr1).items():
+ transferred_detais = itemwise_details.get(key)
+ self.assertTrue(value.use_serial_batch_fields)
+ self.assertEqual(value.qty, 5)
+ self.assertEqual(sorted(value.serial_no), sorted(transferred_detais.get("serial_no")[0:5]))
+
+ sco.load_from_db()
+ self.assertEqual(sco.supplied_items[0].consumed_qty, 5)
+ doc = get_materials_from_supplier(sco.name, [d.name for d in sco.supplied_items])
+ self.assertEqual(doc.items[0].qty, 1)
+ self.assertEqual(doc.items[0].s_warehouse, "_Test Warehouse 1 - _TC")
+ self.assertEqual(doc.items[0].t_warehouse, "_Test Warehouse - _TC")
+ self.assertEqual(
+ get_serial_nos(doc.items[0].serial_no),
+ itemwise_details.get(doc.items[0].item_code)["serial_no"][5:6],
+ )
+
def add_second_row_in_scr(scr):
item_dict = {}
@@ -914,6 +1144,7 @@
else child_row.get("consumed_qty")
)
+ details.use_serial_batch_fields = child_row.get("use_serial_batch_fields")
if child_row.serial_and_batch_bundle:
doc = frappe.get_doc("Serial and Batch Bundle", child_row.serial_and_batch_bundle)
for row in doc.get("entries"):
@@ -945,6 +1176,7 @@
"rate": row.rate or 100,
"stock_uom": row.stock_uom or "Nos",
"warehouse": row.warehouse or "_Test Warehouse - _TC",
+ "use_serial_batch_fields": row.get("use_serial_batch_fields"),
}
item_details = args.itemwise_details.get(row.item_code)
@@ -960,9 +1192,12 @@
if batch_qty >= row.qty:
batches[batch_no] = row.qty
item_details.batch_no[batch_no] -= row.qty
+ if row.get("use_serial_batch_fields"):
+ item["batch_no"] = batch_no
+
break
- if serial_nos or batches:
+ if not row.get("use_serial_batch_fields") and (serial_nos or batches):
item["serial_and_batch_bundle"] = make_serial_batch_bundle(
frappe._dict(
{
@@ -978,6 +1213,9 @@
)
).name
+ if serial_nos and row.get("use_serial_batch_fields"):
+ item["serial_no"] = "\n".join(serial_nos)
+
items.append(item)
ste_dict = make_rm_stock_entry(args.sco_no, items)
@@ -1132,6 +1370,7 @@
"rate": item.rate,
"stock_uom": item.stock_uom,
"warehouse": item.reserve_warehouse,
+ "use_serial_batch_fields": 0,
}
)
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 07641d2..e6f7bfc 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -250,7 +250,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hidden": 1,
"label": "Address",
"oldfieldname": "address",
@@ -622,7 +622,7 @@
"icon": "fa fa-info-sign",
"idx": 195,
"links": [],
- "modified": "2022-10-13 12:42:21.545636",
+ "modified": "2024-03-22 16:01:10.721453",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity",
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 72e26de..7abbb63 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -40,7 +40,7 @@
OpportunityLostReasonDetail,
)
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
annual_revenue: DF.Currency
base_opportunity_amount: DF.Currency
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
index 08026d0..e773d66 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
@@ -187,7 +187,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hidden": 1,
"label": "Address",
"read_only": 1
@@ -238,7 +238,7 @@
"link_fieldname": "maintenance_schedule"
}
],
- "modified": "2023-06-03 16:15:43.958072",
+ "modified": "2024-03-22 16:01:11.868813",
"modified_by": "Administrator",
"module": "Maintenance",
"name": "Maintenance Schedule",
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index 75d890c..50ec1f2 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -26,7 +26,7 @@
MaintenanceScheduleItem,
)
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
company: DF.Link
contact_display: DF.SmallText | None
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
index b0d5cb8..6124b6f 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
@@ -83,7 +83,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hidden": 1,
"label": "Address",
"read_only": 1
@@ -295,7 +295,7 @@
"idx": 1,
"is_submittable": 1,
"links": [],
- "modified": "2023-06-03 16:19:07.902723",
+ "modified": "2024-03-22 16:01:12.354826",
"modified_by": "Administrator",
"module": "Maintenance",
"name": "Maintenance Visit",
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
index d2511b8..b43b419 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
@@ -22,7 +22,7 @@
MaintenanceVisitPurpose,
)
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
company: DF.Link
completion_status: DF.Literal["", "Partially Completed", "Fully Completed"]
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index e1c1069..b56e9e1 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -1208,6 +1208,51 @@
except frappe.MandatoryError:
self.fail("Batch generation causing failing in Work Order")
+ @change_settings("Manufacturing Settings", {"make_serial_no_batch_from_work_order": 1})
+ def test_auto_serial_no_batch_creation(self):
+ from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
+
+ fg_item = frappe.generate_hash(length=20)
+ child_item = frappe.generate_hash(length=20)
+
+ bom_tree = {fg_item: {child_item: {}}}
+
+ create_nested_bom(bom_tree, prefix="")
+
+ item = frappe.get_doc("Item", fg_item)
+ item.update(
+ {
+ "has_serial_no": 1,
+ "has_batch_no": 1,
+ "serial_no_series": f"SN-TEST-{item.name}.#####",
+ "create_new_batch": 1,
+ "batch_number_series": f"BATCH-TEST-{item.name}.#####",
+ }
+ )
+ item.save()
+
+ try:
+ wo_order = make_wo_order_test_record(item=fg_item, batch_size=5, qty=10, skip_transfer=True)
+ serial_nos = self.get_serial_nos_for_fg(wo_order.name)
+
+ stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 10))
+ stock_entry.set_work_order_details()
+ stock_entry.set_serial_no_batch_for_finished_good()
+ for row in stock_entry.items:
+ if row.item_code == fg_item:
+ self.assertTrue(row.serial_and_batch_bundle)
+ self.assertEqual(
+ sorted(get_serial_nos_from_bundle(row.serial_and_batch_bundle)), sorted(serial_nos)
+ )
+
+ sn_doc = frappe.get_doc("Serial and Batch Bundle", row.serial_and_batch_bundle)
+ for row in sn_doc.entries:
+ self.assertTrue(row.serial_no)
+ self.assertTrue(row.batch_no)
+
+ except frappe.MandatoryError:
+ self.fail("Batch generation causing failing in Work Order")
+
def get_serial_nos_for_fg(self, work_order):
serial_nos = []
for row in frappe.get_all("Serial No", filters={"work_order": work_order}):
@@ -2270,6 +2315,7 @@
wo_order.planned_start_date = args.planned_start_date or now()
wo_order.transfer_material_against = args.transfer_material_against or "Work Order"
wo_order.from_wip_warehouse = args.from_wip_warehouse or 0
+ wo_order.batch_size = args.batch_size or 0
if args.source_warehouse:
for item in wo_order.get("required_items"):
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 233ca19..f897a91 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -536,6 +536,12 @@
"Item", self.production_item, ["serial_no_series", "item_name", "description"], as_dict=1
)
+ batches = []
+ if self.has_batch_no:
+ batches = frappe.get_all(
+ "Batch", filters={"reference_name": self.name}, order_by="creation", pluck="name"
+ )
+
serial_nos = []
if item_details.serial_no_series:
serial_nos = get_available_serial_nos(item_details.serial_no_series, self.qty)
@@ -556,10 +562,20 @@
"description",
"status",
"work_order",
+ "batch_no",
]
serial_nos_details = []
+ index = 0
for serial_no in serial_nos:
+ index += 1
+ batch_no = None
+ if batches and self.batch_size:
+ batch_no = batches[0]
+
+ if index % self.batch_size == 0:
+ batches.remove(batch_no)
+
serial_nos_details.append(
(
serial_no,
@@ -574,6 +590,7 @@
item_details.description,
"Inactive",
self.name,
+ batch_no,
)
)
diff --git a/erpnext/public/scss/erpnext.scss b/erpnext/public/scss/erpnext.scss
index 03dd311..3d8ee89 100644
--- a/erpnext/public/scss/erpnext.scss
+++ b/erpnext/public/scss/erpnext.scss
@@ -549,6 +549,14 @@
justify-content: center;
}
-.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor {
+.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor,
+.frappe-control[data-fieldname="address_display"] .ql-editor,
+.frappe-control[data-fieldname="shipping_address_display"] .ql-editor,
+.frappe-control[data-fieldname="shipping_address"] .ql-editor,
+.frappe-control[data-fieldname="dispatch_address"] .ql-editor,
+.frappe-control[data-fieldname="source_address_display"] .ql-editor,
+.frappe-control[data-fieldname="target_address_display"] .ql-editor,
+.frappe-control[data-fieldname="billing_address_display"] .ql-editor,
+.frappe-control[data-fieldname="company_address_display"] .ql-editor {
white-space: normal;
}
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 1e22f44..fc34c73 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -94,7 +94,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hidden": 1,
"label": "Address",
"read_only": 1
@@ -238,7 +238,7 @@
"idx": 1,
"is_submittable": 1,
"links": [],
- "modified": "2024-02-04 18:20:12.020313",
+ "modified": "2024-03-22 16:01:13.513355",
"modified_by": "Administrator",
"module": "Selling",
"name": "Installation Note",
@@ -271,4 +271,4 @@
"states": [],
"timeline_field": "customer",
"title_field": "customer_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/installation_note/installation_note.py b/erpnext/selling/doctype/installation_note/installation_note.py
index d1bfd91..ac7cd60 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.py
+++ b/erpnext/selling/doctype/installation_note/installation_note.py
@@ -23,7 +23,7 @@
InstallationNoteItem,
)
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
company: DF.Link
contact_display: DF.SmallText | None
@@ -38,6 +38,7 @@
inst_time: DF.Time | None
items: DF.Table[InstallationNoteItem]
naming_series: DF.Literal["MAT-INS-.YYYY.-"]
+ project: DF.Link | None
remarks: DF.SmallText | None
status: DF.Literal["Draft", "Submitted", "Cancelled"]
territory: DF.Link
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 982e732..bb6e0bd 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -265,7 +265,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Address",
"oldfieldname": "customer_address",
"oldfieldtype": "Small Text",
@@ -318,7 +318,7 @@
},
{
"fieldname": "shipping_address",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Shipping Address",
"print_hide": 1,
"read_only": 1
@@ -965,7 +965,7 @@
},
{
"fieldname": "company_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Company Address",
"read_only": 1
},
@@ -1073,7 +1073,7 @@
"idx": 82,
"is_submittable": 1,
"links": [],
- "modified": "2024-03-20 16:04:21.567847",
+ "modified": "2024-03-22 16:15:10.488656",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 633e5f5..6977f06 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -34,7 +34,7 @@
from erpnext.stock.doctype.packed_item.packed_item import PackedItem
additional_discount_percentage: DF.Float
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
auto_repeat: DF.Link | None
@@ -49,7 +49,7 @@
campaign: DF.Link | None
company: DF.Link
company_address: DF.Link | None
- company_address_display: DF.SmallText | None
+ company_address_display: DF.TextEditor | None
competitors: DF.TableMultiSelect[CompetitorDetail]
contact_display: DF.SmallText | None
contact_email: DF.Data | None
@@ -93,7 +93,7 @@
scan_barcode: DF.Data | None
select_print_heading: DF.Link | None
selling_price_list: DF.Link
- shipping_address: DF.SmallText | None
+ shipping_address: DF.TextEditor | None
shipping_address_name: DF.Link | None
shipping_rule: DF.Link | None
source: DF.Link | None
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 1fb1ae0..8f6ae05 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -369,7 +369,7 @@
{
"allow_on_submit": 1,
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hide_days": 1,
"hide_seconds": 1,
"label": "Address",
@@ -415,7 +415,7 @@
},
{
"fieldname": "company_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hide_days": 1,
"hide_seconds": 1,
"label": "Company Address",
@@ -450,7 +450,7 @@
{
"allow_on_submit": 1,
"fieldname": "shipping_address",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"hide_days": 1,
"hide_seconds": 1,
"label": "Shipping Address",
@@ -1525,7 +1525,7 @@
"allow_on_submit": 1,
"depends_on": "dispatch_address_name",
"fieldname": "dispatch_address",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Dispatch Address",
"read_only": 1
},
@@ -1657,7 +1657,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
- "modified": "2024-03-20 16:04:43.627183",
+ "modified": "2024-03-22 16:15:04.884816",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 2896203..826ba1e 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -64,7 +64,7 @@
from erpnext.stock.doctype.packed_item.packed_item import PackedItem
additional_discount_percentage: DF.Float
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
advance_paid: DF.Currency
advance_payment_status: DF.Literal["Not Requested", "Requested", "Partially Paid", "Fully Paid"]
amended_from: DF.Link | None
@@ -84,7 +84,7 @@
commission_rate: DF.Float
company: DF.Link
company_address: DF.Link | None
- company_address_display: DF.SmallText | None
+ company_address_display: DF.TextEditor | None
contact_display: DF.SmallText | None
contact_email: DF.Data | None
contact_mobile: DF.SmallText | None
@@ -104,7 +104,7 @@
]
disable_rounded_total: DF.Check
discount_amount: DF.Currency
- dispatch_address: DF.SmallText | None
+ dispatch_address: DF.TextEditor | None
dispatch_address_name: DF.Link | None
from_date: DF.Date | None
grand_total: DF.Currency
@@ -147,7 +147,7 @@
select_print_heading: DF.Link | None
selling_price_list: DF.Link
set_warehouse: DF.Link | None
- shipping_address: DF.SmallText | None
+ shipping_address: DF.TextEditor | None
shipping_address_name: DF.Link | None
shipping_rule: DF.Link | None
skip_delivery_note: DF.Check
diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py
index 7be1418..6e32cc2 100644
--- a/erpnext/stock/deprecated_serial_batch.py
+++ b/erpnext/stock/deprecated_serial_batch.py
@@ -245,6 +245,8 @@
if self.sle.serial_and_batch_bundle:
query = query.where(bundle.name != self.sle.serial_and_batch_bundle)
+ query = query.where(bundle.voucher_type != "Pick List")
+
for d in query.run(as_dict=True):
self.non_batchwise_balance_value += flt(d.batch_value)
self.non_batchwise_balance_qty += flt(d.batch_qty)
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 87c3333..d05392d 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -351,7 +351,7 @@
},
{
"fieldname": "shipping_address",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Shipping Address",
"read_only": 1
},
@@ -408,7 +408,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Billing Address",
"read_only": 1
},
@@ -420,7 +420,7 @@
},
{
"fieldname": "company_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Company Address",
"read_only": 1
},
@@ -1289,7 +1289,7 @@
{
"depends_on": "dispatch_address_name",
"fieldname": "dispatch_address",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Dispatch Address",
"print_hide": 1,
"read_only": 1
@@ -1397,7 +1397,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
- "modified": "2024-03-20 16:05:02.854990",
+ "modified": "2024-03-22 16:15:07.253135",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index e17a0a2..f13353e 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -35,7 +35,7 @@
from erpnext.stock.doctype.packed_item.packed_item import PackedItem
additional_discount_percentage: DF.Float
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
amount_eligible_for_commission: DF.Currency
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
@@ -52,7 +52,7 @@
commission_rate: DF.Float
company: DF.Link
company_address: DF.Link | None
- company_address_display: DF.SmallText | None
+ company_address_display: DF.TextEditor | None
contact_display: DF.SmallText | None
contact_email: DF.Data | None
contact_mobile: DF.SmallText | None
@@ -66,7 +66,7 @@
customer_name: DF.Data | None
disable_rounded_total: DF.Check
discount_amount: DF.Currency
- dispatch_address: DF.SmallText | None
+ dispatch_address: DF.TextEditor | None
dispatch_address_name: DF.Link | None
driver: DF.Link | None
driver_name: DF.Data | None
@@ -117,7 +117,7 @@
set_posting_time: DF.Check
set_target_warehouse: DF.Link | None
set_warehouse: DF.Link | None
- shipping_address: DF.SmallText | None
+ shipping_address: DF.TextEditor | None
shipping_address_name: DF.Link | None
shipping_rule: DF.Link | None
source: DF.Link | None
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index b926e98..a0c6ec3 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -313,7 +313,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Address",
"read_only": 1
},
@@ -352,7 +352,7 @@
},
{
"fieldname": "shipping_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Shipping Address",
"print_hide": 1,
"read_only": 1
@@ -1095,7 +1095,7 @@
},
{
"fieldname": "billing_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Billing Address",
"read_only": 1
},
@@ -1252,7 +1252,7 @@
"idx": 261,
"is_submittable": 1,
"links": [],
- "modified": "2024-03-20 16:05:31.713453",
+ "modified": "2024-03-22 16:15:10.937188",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 034dd0a..e87e20d 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -40,7 +40,7 @@
from erpnext.stock.doctype.purchase_receipt_item.purchase_receipt_item import PurchaseReceiptItem
additional_discount_percentage: DF.Float
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
apply_putaway_rule: DF.Check
@@ -56,7 +56,7 @@
base_total: DF.Currency
base_total_taxes_and_charges: DF.Currency
billing_address: DF.Link | None
- billing_address_display: DF.SmallText | None
+ billing_address_display: DF.TextEditor | None
buying_price_list: DF.Link | None
company: DF.Link
contact_display: DF.SmallText | None
@@ -109,7 +109,7 @@
set_posting_time: DF.Check
set_warehouse: DF.Link | None
shipping_address: DF.Link | None
- shipping_address_display: DF.SmallText | None
+ shipping_address_display: DF.TextEditor | None
shipping_rule: DF.Link | None
status: DF.Literal["", "Draft", "To Bill", "Completed", "Return Issued", "Cancelled", "Closed"]
subcontracting_receipt: DF.Link | None
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index ac2fe58..96a9209 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -1081,7 +1081,9 @@
cint(frappe.user_defaults?.use_serial_batch_fields) === 1
) {
this.frm.doc.items.forEach((item) => {
- frappe.model.set_value(item.doctype, item.name, "use_serial_batch_fields", 1);
+ if (!item.serial_and_batch_bundle) {
+ frappe.model.set_value(item.doctype, item.name, "use_serial_batch_fields", 1);
+ }
});
}
}
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index d45296f..61e9f25 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -306,7 +306,7 @@
},
{
"fieldname": "source_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Source Warehouse Address",
"read_only": 1
},
@@ -336,7 +336,7 @@
},
{
"fieldname": "target_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Target Warehouse Address",
"read_only": 1
},
@@ -464,7 +464,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Address"
},
{
@@ -681,7 +681,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2024-01-12 11:56:58.644882",
+ "modified": "2024-03-22 16:23:13.683565",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 5b321de..d2dab8a 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -85,7 +85,7 @@
add_to_transit: DF.Check
additional_costs: DF.Table[LandedCostTaxesandCharges]
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
apply_putaway_rule: DF.Check
bom_no: DF.Link | None
@@ -127,14 +127,14 @@
scan_barcode: DF.Data | None
select_print_heading: DF.Link | None
set_posting_time: DF.Check
- source_address_display: DF.SmallText | None
+ source_address_display: DF.TextEditor | None
source_warehouse_address: DF.Link | None
stock_entry_type: DF.Link
subcontracting_order: DF.Link | None
supplier: DF.Link | None
supplier_address: DF.Link | None
supplier_name: DF.Data | None
- target_address_display: DF.SmallText | None
+ target_address_display: DF.TextEditor | None
target_warehouse_address: DF.Link | None
to_warehouse: DF.Link | None
total_additional_costs: DF.Currency
@@ -2541,6 +2541,7 @@
)
d.serial_and_batch_bundle = id
+ d.use_serial_batch_fields = 0
def get_available_serial_nos(self) -> List[str]:
serial_nos = []
@@ -2640,7 +2641,9 @@
def set_missing_values(source, target):
target.stock_entry_type = "Material Transfer"
target.set_missing_values()
- target.make_serial_and_batch_bundle_for_transfer()
+
+ if not frappe.db.get_single_value("Stock Settings", "use_serial_batch_fields"):
+ target.make_serial_and_batch_bundle_for_transfer()
def update_item(source_doc, target_doc, source_parent):
target_doc.t_warehouse = ""
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index ebbc18d..d09282d 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -891,7 +891,7 @@
)
-def get_item_price(args, item_code, ignore_party=False):
+def get_item_price(args, item_code, ignore_party=False) -> list[dict]:
"""
Get name, price_list_rate from Item Price based on conditions
Check if the desired qty is within the increment of the packing list.
@@ -913,6 +913,7 @@
.orderby(ip.valid_from, order=frappe.qb.desc)
.orderby(IfNull(ip.batch_no, ""), order=frappe.qb.desc)
.orderby(ip.uom, order=frappe.qb.desc)
+ .limit(1)
)
if not ignore_party:
@@ -929,7 +930,7 @@
& (IfNull(ip.valid_upto, "2500-12-31") >= args["transaction_date"])
)
- return query.run()
+ return query.run(as_dict=True)
def get_price_list_rate_for(args, item_code):
@@ -955,7 +956,7 @@
price_list_rate = get_item_price(item_price_args, item_code)
if price_list_rate:
desired_qty = args.get("qty")
- if desired_qty and check_packing_list(price_list_rate[0][0], desired_qty, item_code):
+ if desired_qty and check_packing_list(price_list_rate[0].name, desired_qty, item_code):
item_price_data = price_list_rate
else:
for field in ["customer", "supplier"]:
@@ -975,12 +976,12 @@
item_price_data = general_price_list_rate
if item_price_data:
- if item_price_data[0][2] == args.get("uom"):
- return item_price_data[0][1]
+ if item_price_data[0].uom == args.get("uom"):
+ return item_price_data[0].price_list_rate
elif not args.get("price_list_uom_dependant"):
- return flt(item_price_data[0][1] * flt(args.get("conversion_factor", 1)))
+ return flt(item_price_data[0].price_list_rate * flt(args.get("conversion_factor", 1)))
else:
- return item_price_data[0][1]
+ return item_price_data[0].price_list_rate
def check_packing_list(price_list_rate_name, desired_qty, item_code):
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
index 507e233..7cbf7db 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -182,7 +182,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Supplier Address Details",
"read_only": 1
},
@@ -230,7 +230,7 @@
},
{
"fieldname": "shipping_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Shipping Address Details",
"print_hide": 1,
"read_only": 1
@@ -243,7 +243,7 @@
},
{
"fieldname": "billing_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Billing Address Details",
"read_only": 1
},
@@ -454,7 +454,7 @@
"icon": "fa fa-file-text",
"is_submittable": 1,
"links": [],
- "modified": "2024-01-03 20:56:04.670380",
+ "modified": "2024-03-22 16:15:07.797633",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Order",
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
index daccbbb..321ae51 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
@@ -36,10 +36,10 @@
)
additional_costs: DF.Table[LandedCostTaxesandCharges]
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
billing_address: DF.Link | None
- billing_address_display: DF.SmallText | None
+ billing_address_display: DF.TextEditor | None
company: DF.Link
contact_display: DF.SmallText | None
contact_email: DF.SmallText | None
@@ -59,7 +59,7 @@
set_reserve_warehouse: DF.Link | None
set_warehouse: DF.Link | None
shipping_address: DF.Link | None
- shipping_address_display: DF.SmallText | None
+ shipping_address_display: DF.TextEditor | None
status: DF.Literal[
"Draft",
"Open",
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
index 383a83b..8b9cbe3 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
@@ -192,7 +192,7 @@
},
{
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Address",
"read_only": 1
},
@@ -231,7 +231,7 @@
},
{
"fieldname": "shipping_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Shipping Address",
"print_hide": 1,
"read_only": 1
@@ -521,7 +521,7 @@
},
{
"fieldname": "billing_address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Billing Address",
"read_only": 1
},
@@ -645,7 +645,7 @@
"in_create": 1,
"is_submittable": 1,
"links": [],
- "modified": "2023-11-16 13:04:00.710534",
+ "modified": "2024-03-22 16:15:08.074134",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Receipt",
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
index 3467b82..4e2b9c2 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
@@ -33,13 +33,13 @@
)
additional_costs: DF.Table[LandedCostTaxesandCharges]
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amended_from: DF.Link | None
auto_repeat: DF.Link | None
bill_date: DF.Date | None
bill_no: DF.Data | None
billing_address: DF.Link | None
- billing_address_display: DF.SmallText | None
+ billing_address_display: DF.TextEditor | None
company: DF.Link
contact_display: DF.SmallText | None
contact_email: DF.SmallText | None
@@ -69,7 +69,7 @@
set_posting_time: DF.Check
set_warehouse: DF.Link | None
shipping_address: DF.Link | None
- shipping_address_display: DF.SmallText | None
+ shipping_address_display: DF.TextEditor | None
status: DF.Literal["", "Draft", "Completed", "Return", "Return Issued", "Cancelled", "Closed"]
supplied_items: DF.Table[SubcontractingReceiptSuppliedItem]
supplier: DF.Link
@@ -149,7 +149,9 @@
self.update_prevdoc_status()
self.set_subcontracting_order_status()
self.set_consumed_qty_in_subcontract_order()
- self.make_bundle_using_old_serial_batch_fields()
+
+ for table_name in ["items", "supplied_items"]:
+ self.make_bundle_using_old_serial_batch_fields(table_name)
self.update_stock_ledger()
self.make_gl_entries()
self.repost_future_sle_and_gle()
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
index 3e74ac9..4f4a1bd 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
@@ -292,6 +292,7 @@
self.assertRaises(OverAllowanceError, make_return_subcontracting_receipt, **args)
def test_subcontracting_receipt_no_gl_entry(self):
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
sco = get_subcontracting_order()
rm_items = get_rm_items(sco.supplied_items)
itemwise_details = make_stock_in_entry(rm_items=rm_items)
@@ -327,8 +328,10 @@
# Service Cost(100 * 10) + Raw Materials Cost(100 * 10) + Additional Costs(10 * 10) = 2100
self.assertEqual(stock_value_difference, 2100)
self.assertFalse(get_gl_entries("Subcontracting Receipt", scr.name))
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
def test_subcontracting_receipt_gl_entry(self):
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
sco = get_subcontracting_order(
company="_Test Company with perpetual inventory",
warehouse="Stores - TCP1",
@@ -387,6 +390,7 @@
scr.reload()
scr.cancel()
self.assertTrue(get_gl_entries("Subcontracting Receipt", scr.name))
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
def test_supplied_items_consumed_qty(self):
# Set Backflush Based On as "Material Transferred for Subcontracting" to transfer RM's more than the required qty
@@ -664,6 +668,7 @@
)
def test_subcontracting_receipt_valuation_for_fg_with_auto_created_serial_batch_bundle(self):
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
set_backflush_based_on("BOM")
fg_item = make_item(
@@ -760,9 +765,11 @@
frappe.db.set_single_value(
"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0
)
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
def test_subcontracting_receipt_raw_material_rate(self):
# Step - 1: Set Backflush Based On as "BOM"
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
set_backflush_based_on("BOM")
# Step - 2: Create FG and RM Items
@@ -820,6 +827,8 @@
self.assertEqual(rm_item.rate, 100)
self.assertEqual(rm_item.amount, rm_item.consumed_qty * rm_item.rate)
+ frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
+
def test_quality_inspection_for_subcontracting_receipt(self):
from erpnext.stock.doctype.quality_inspection.test_quality_inspection import (
create_quality_inspection,
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index 9af2b46..4ff1bcc 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -311,7 +311,7 @@
{
"depends_on": "customer",
"fieldname": "address_display",
- "fieldtype": "Small Text",
+ "fieldtype": "Text Editor",
"label": "Address",
"read_only": 1
},
@@ -379,7 +379,7 @@
"icon": "fa fa-bug",
"idx": 1,
"links": [],
- "modified": "2023-11-28 17:30:35.676410",
+ "modified": "2024-03-22 16:01:11.412114",
"modified_by": "Administrator",
"module": "Support",
"name": "Warranty Claim",
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.py b/erpnext/support/doctype/warranty_claim/warranty_claim.py
index e0eb5a3..658be57 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.py
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.py
@@ -18,7 +18,7 @@
if TYPE_CHECKING:
from frappe.types import DF
- address_display: DF.SmallText | None
+ address_display: DF.TextEditor | None
amc_expiry_date: DF.Date | None
amended_from: DF.Link | None
company: DF.Link