Merge pull request #38077 from anandbaburajan/trans_delete_att_comm
chore: delete comments and unlink attachments on company transactions deletion
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.js b/erpnext/manufacturing/doctype/production_plan/production_plan.js
index 72438dd..dd102b0 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.js
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.js
@@ -89,10 +89,6 @@
frm.trigger("show_progress");
if (frm.doc.status !== "Completed") {
- frm.add_custom_button(__("Work Order Tree"), ()=> {
- frappe.set_route('Tree', 'Work Order', {production_plan: frm.doc.name});
- }, __('View'));
-
frm.add_custom_button(__("Production Plan Summary"), ()=> {
frappe.set_route('query-report', 'Production Plan Summary', {production_plan: frm.doc.name});
}, __('View'));
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index 6b12a29..6efb762 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -828,8 +828,6 @@
# Combine subassembly items
sub_assembly_items_store = self.combine_subassembly_items(sub_assembly_items_store)
- sub_assembly_items_store.sort(key=lambda d: d.bom_level, reverse=True) # sort by bom level
-
for idx, row in enumerate(sub_assembly_items_store):
row.idx = idx + 1
self.append("sub_assembly_items", row)
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index e9c6ee3..dd32c34 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -664,49 +664,6 @@
frappe.db.rollback()
- def test_subassmebly_sorting(self):
- "Test subassembly sorting in case of multiple items with nested BOMs."
- from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
-
- prefix = "_TestLevel_"
- boms = {
- "Assembly": {
- "SubAssembly1": {
- "ChildPart1": {},
- "ChildPart2": {},
- },
- "ChildPart6": {},
- "SubAssembly4": {"SubSubAssy2": {"ChildPart7": {}}},
- },
- "MegaDeepAssy": {
- "SecretSubassy": {
- "SecretPart": {"VerySecret": {"SuperSecret": {"Classified": {}}}},
- },
- # ^ assert that this is
- # first item in subassy table
- },
- }
- create_nested_bom(boms, prefix=prefix)
-
- items = [prefix + item_code for item_code in boms.keys()]
- plan = create_production_plan(item_code=items[0], do_not_save=True)
- plan.append(
- "po_items",
- {
- "use_multi_level_bom": 1,
- "item_code": items[1],
- "bom_no": frappe.db.get_value("Item", items[1], "default_bom"),
- "planned_qty": 1,
- "planned_start_date": now_datetime(),
- },
- )
- plan.get_sub_assembly_items()
-
- bom_level_order = [d.bom_level for d in plan.sub_assembly_items]
- self.assertEqual(bom_level_order, sorted(bom_level_order, reverse=True))
- # lowest most level of subassembly should be first
- self.assertIn("SuperSecret", plan.sub_assembly_items[0].production_item)
-
def test_multiple_work_order_for_production_plan_item(self):
"Test producing Prod Plan (making WO) in parts."
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
index 521543a..afe4a6e 100644
--- a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
@@ -22,9 +22,9 @@
"formatter": function(value, row, column, data, default_formatter) {
value = default_formatter(value, row, column, data);
- if (column.fieldname == "document_name") {
+ if (column.fieldname == "item_code") {
var color = data.pending_qty > 0 ? 'red': 'green';
- value = `<a style='color:${color}' href="#Form/${data['document_type']}/${data['document_name']}" data-doctype="${data['document_type']}">${data['document_name']}</a>`;
+ value = `<a style='color:${color}' href="/app/item/${data['item_code']}" data-doctype="Item">${data['item_code']}</a>`;
}
return value;
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
index 2c8f82f..076690f 100644
--- a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
@@ -44,6 +44,7 @@
{
"indent": 0,
"item_code": row.item_code,
+ "sales_order": row.get("sales_order"),
"item_name": frappe.get_cached_value("Item", row.item_code, "item_name"),
"qty": row.planned_qty,
"document_type": "Work Order",
@@ -80,7 +81,7 @@
data.append(
{
- "indent": 1,
+ "indent": 1 + item.indent,
"item_code": item.production_item,
"item_name": item.item_name,
"qty": item.qty,
@@ -98,7 +99,7 @@
for row in frappe.get_all(
"Work Order",
filters={"production_plan": filters.get("production_plan")},
- fields=["name", "produced_qty", "production_plan", "production_item"],
+ fields=["name", "produced_qty", "production_plan", "production_item", "sales_order"],
):
order_details.setdefault((row.name, row.production_item), row)
@@ -118,10 +119,17 @@
"label": _("Finished Good"),
"fieldtype": "Link",
"fieldname": "item_code",
- "width": 300,
+ "width": 240,
"options": "Item",
},
- {"label": _("Item Name"), "fieldtype": "data", "fieldname": "item_name", "width": 100},
+ {"label": _("Item Name"), "fieldtype": "data", "fieldname": "item_name", "width": 150},
+ {
+ "label": _("Sales Order"),
+ "options": "Sales Order",
+ "fieldtype": "Link",
+ "fieldname": "sales_order",
+ "width": 100,
+ },
{
"label": _("Document Type"),
"fieldtype": "Link",
@@ -133,10 +141,16 @@
"label": _("Document Name"),
"fieldtype": "Dynamic Link",
"fieldname": "document_name",
- "width": 150,
+ "options": "document_type",
+ "width": 180,
},
{"label": _("BOM Level"), "fieldtype": "Int", "fieldname": "bom_level", "width": 100},
{"label": _("Order Qty"), "fieldtype": "Float", "fieldname": "qty", "width": 120},
- {"label": _("Received Qty"), "fieldtype": "Float", "fieldname": "produced_qty", "width": 160},
+ {
+ "label": _("Produced / Received Qty"),
+ "fieldtype": "Float",
+ "fieldname": "produced_qty",
+ "width": 200,
+ },
{"label": _("Pending Qty"), "fieldtype": "Float", "fieldname": "pending_qty", "width": 110},
]
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 42932ad..ddc7e2a 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -3,17 +3,32 @@
frappe.ui.form.on("Customer", {
setup: function(frm) {
-
+ frm.custom_make_buttons = {
+ "Opportunity": "Opportunity",
+ "Quotation": "Quotation",
+ "Sales Order": "Sales Order",
+ "Pricing Rule": "Pricing Rule",
+ };
frm.make_methods = {
- 'Quotation': () => frappe.model.open_mapped_doc({
- method: "erpnext.selling.doctype.customer.customer.make_quotation",
- frm: cur_frm
- }),
- 'Opportunity': () => frappe.model.open_mapped_doc({
- method: "erpnext.selling.doctype.customer.customer.make_opportunity",
- frm: cur_frm
- })
- }
+ "Quotation": () =>
+ frappe.model.open_mapped_doc({
+ method: "erpnext.selling.doctype.customer.customer.make_quotation",
+ frm: frm,
+ }),
+ "Sales Order": () =>
+ frappe.model.with_doctype("Sales Order", function () {
+ var so = frappe.model.get_new_doc("Sales Order");
+ so.customer = frm.doc.name; // Set the current customer as the SO customer
+ frappe.set_route("Form", "Sales Order", so.name);
+ }),
+ "Opportunity": () =>
+ frappe.model.open_mapped_doc({
+ method: "erpnext.selling.doctype.customer.customer.make_opportunity",
+ frm: frm,
+ }),
+ "Pricing Rule": () =>
+ erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name),
+ };
frm.add_fetch('lead_name', 'company_name', 'customer_name');
frm.add_fetch('default_sales_partner','commission_rate','default_commission_rate');
@@ -146,9 +161,9 @@
{party_type: 'Customer', party: frm.doc.name, party_name: frm.doc.customer_name});
}, __('View'));
- frm.add_custom_button(__('Pricing Rule'), function () {
- erpnext.utils.make_pricing_rule(frm.doc.doctype, frm.doc.name);
- }, __('Create'));
+ for (const doctype in frm.make_methods) {
+ frm.add_custom_button(__(doctype), frm.make_methods[doctype], __("Create"));
+ }
frm.add_custom_button(__('Get Customer Group Details'), function () {
frm.trigger("get_customer_group_details");
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index 9bba4eb..feecd9c 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -609,11 +609,12 @@
// if item is clicked twice from item selector
// then "item_code, batch_no, uom, rate" will help in getting the exact item
// to increase the qty by one
- const has_batch_no = batch_no;
+ const has_batch_no = (batch_no !== 'null' && batch_no !== null);
item_row = this.frm.doc.items.find(
i => i.item_code === item_code
&& (!has_batch_no || (has_batch_no && i.batch_no === batch_no))
&& (i.uom === uom)
+ && (i.rate === flt(rate))
);
}
diff --git a/erpnext/setup/doctype/employee/employee.js b/erpnext/setup/doctype/employee/employee.js
index 39a215f..efc3fd1 100755
--- a/erpnext/setup/doctype/employee/employee.js
+++ b/erpnext/setup/doctype/employee/employee.js
@@ -81,8 +81,10 @@
employee: frm.doc.name,
email: frm.doc.prefered_email
},
+ freeze: true,
+ freeze_message: __("Creating User..."),
callback: function (r) {
- frm.set_value("user_id", r.message);
+ frm.reload_doc();
}
});
}
diff --git a/erpnext/setup/doctype/employee/employee.py b/erpnext/setup/doctype/employee/employee.py
index 78fb4df..6f9176c 100755
--- a/erpnext/setup/doctype/employee/employee.py
+++ b/erpnext/setup/doctype/employee/employee.py
@@ -48,6 +48,9 @@
else:
existing_user_id = frappe.db.get_value("Employee", self.name, "user_id")
if existing_user_id:
+ user = frappe.get_doc("User", existing_user_id)
+ validate_employee_role(user, ignore_emp_check=True)
+ user.save(ignore_permissions=True)
remove_user_permission("Employee", self.name, existing_user_id)
def after_rename(self, old, new, merge):
@@ -230,12 +233,26 @@
frappe.cache().hdel("employees_with_number", prev_number)
-def validate_employee_role(doc, method):
+def validate_employee_role(doc, method=None, ignore_emp_check=False):
# called via User hook
- if "Employee" in [d.role for d in doc.get("roles")]:
- if not frappe.db.get_value("Employee", {"user_id": doc.name}):
- frappe.msgprint(_("Please set User ID field in an Employee record to set Employee Role"))
- doc.get("roles").remove(doc.get("roles", {"role": "Employee"})[0])
+ if not ignore_emp_check:
+ if frappe.db.get_value("Employee", {"user_id": doc.name}):
+ return
+
+ user_roles = [d.role for d in doc.get("roles")]
+ if "Employee" in user_roles:
+ frappe.msgprint(
+ _("User {0}: Removed Employee role as there is no mapped employee.").format(doc.name)
+ )
+ doc.get("roles").remove(doc.get("roles", {"role": "Employee"})[0])
+
+ if "Employee Self Service" in user_roles:
+ frappe.msgprint(
+ _("User {0}: Removed Employee Self Service role as there is no mapped employee.").format(
+ doc.name
+ )
+ )
+ doc.get("roles").remove(doc.get("roles", {"role": "Employee Self Service"})[0])
def update_user_permissions(doc, method):
@@ -347,6 +364,8 @@
}
)
user.insert()
+ emp.user_id = user.name
+ emp.save()
return user.name
diff --git a/erpnext/setup/doctype/employee/test_employee.py b/erpnext/setup/doctype/employee/test_employee.py
index 5a693c5..9b70683 100644
--- a/erpnext/setup/doctype/employee/test_employee.py
+++ b/erpnext/setup/doctype/employee/test_employee.py
@@ -25,6 +25,15 @@
employee1_doc.status = "Left"
self.assertRaises(InactiveEmployeeStatusError, employee1_doc.save)
+ def test_user_has_employee(self):
+ employee = make_employee("test_emp_user_creation@company.com")
+ employee_doc = frappe.get_doc("Employee", employee)
+ user = employee_doc.user_id
+ self.assertTrue("Employee" in frappe.get_roles(user))
+ employee_doc.user_id = ""
+ employee_doc.save()
+ self.assertTrue("Employee" not in frappe.get_roles(user))
+
def tearDown(self):
frappe.db.rollback()