Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ux): make stock entry type the title field (#29674)

Browse Source
This commit is contained in:
Ankush Menat 2022-02-07 13:19:08 +05:30 committed by GitHub
parent cec971b5db
commit 5e6227e3d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/stock/doctype/stock_entry/stock_entry.json
View File

@ -8,7 +8,6 @@
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"items_section", "items_section",
"title",
"naming_series", "naming_series",
"stock_entry_type", "stock_entry_type",
"outgoing_stock_entry", "outgoing_stock_entry",
@ -83,14 +82,6 @@
"fieldtype": "Section Break", "fieldtype": "Section Break",
"oldfieldtype": "Section Break" "oldfieldtype": "Section Break"
}, },
{
"fieldname": "title",
"fieldtype": "Data",
"hidden": 1,
"label": "Title",
"no_copy": 1,
"print_hide": 1
},
{ {
"fieldname": "naming_series", "fieldname": "naming_series",
"fieldtype": "Select", "fieldtype": "Select",
@ -353,9 +344,9 @@
}, },
{ {
"fieldname": "scan_barcode", "fieldname": "scan_barcode",
"options": "Barcode",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Scan Barcode" "label": "Scan Barcode",
"options": "Barcode"
}, },
{ {
"allow_bulk_edit": 1, "allow_bulk_edit": 1,
@ -628,10 +619,11 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2021-08-20 19:19:31.514846", "modified": "2022-02-07 12:55:14.614077",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry", "name": "Stock Entry",
"naming_rule": "By \"Naming Series\" field",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
@ -698,6 +690,7 @@
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "title", "states": [],
"title_field": "stock_entry_type",
"track_changes": 1 "track_changes": 1
} }

9
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -76,7 +76,6 @@ class StockEntry(StockController):
self.validate_posting_time() self.validate_posting_time()
self.validate_purpose() self.validate_purpose()
self.set_title()
self.validate_item() self.validate_item()
self.validate_customer_provided_item() self.validate_customer_provided_item()
self.validate_qty() self.validate_qty()
@ -1835,14 +1834,6 @@ class StockEntry(StockController):
return sorted(list(set(get_serial_nos(self.pro_doc.serial_no)) - set(used_serial_nos))) return sorted(list(set(get_serial_nos(self.pro_doc.serial_no)) - set(used_serial_nos)))
def set_title(self):
if frappe.flags.in_import and self.title:
# Allow updating title during data import/update
return
self.title = self.purpose
@frappe.whitelist() @frappe.whitelist()
def move_sample_to_retention_warehouse(company, items): def move_sample_to_retention_warehouse(company, items):
if isinstance(items, str): if isinstance(items, str):