nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Order Number and Order Date fields to Blanket Order

Browse Source 
(cherry picked from commit 5a284df51d)

# Conflicts:
#	erpnext/manufacturing/doctype/blanket_order/blanket_order.json
This commit is contained in:
Himanshu Shivhare
2024-12-05 15:46:46 +05:30
committed by Mergify
parent 28442f3414
commit 583182180a
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/manufacturing/doctype/blanket_order/blanket_order.json
View File

@@ -13,6 +13,8 @@
"supplier", "supplier",
"supplier_name", "supplier_name",
"column_break_8", "column_break_8",
"order_no",
"order_date",
"from_date", "from_date",
"to_date", "to_date",
"company", "company",
@@ -129,15 +131,31 @@
"fieldname": "terms", "fieldname": "terms",
"fieldtype": "Text Editor", "fieldtype": "Text Editor",
"label": "Terms and Conditions Details" "label": "Terms and Conditions Details"
},
{
"fieldname": "order_no",
"fieldtype": "Data",
"label": "Order No"
},
{
"depends_on": "eval:doc.order_no",
"fieldname": "order_date",
"fieldtype": "Date",
"label": "Order Date"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-06-29 00:30:30.621636", "modified": "2021-06-29 00:30:30.621636",
=======
"modified": "2024-12-05 15:44:21.520093",
>>>>>>> 5a284df51d (refactor: Order Number and Order Date fields to Blanket Order)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Blanket Order", "name": "Blanket Order",
"naming_rule": "By \"Naming Series\" field",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {

2
erpnext/manufacturing/doctype/blanket_order/blanket_order.py
View File

@@ -31,6 +31,8 @@ class BlanketOrder(Document):
from_date: DF.Date from_date: DF.Date
items: DF.Table[BlanketOrderItem] items: DF.Table[BlanketOrderItem]
naming_series: DF.Literal["MFG-BLR-.YYYY.-"] naming_series: DF.Literal["MFG-BLR-.YYYY.-"]
order_date: DF.Date | None
order_no: DF.Data | None
supplier: DF.Link | None supplier: DF.Link | None
supplier_name: DF.Data | None supplier_name: DF.Data | None
tc_name: DF.Link | None tc_name: DF.Link | None