nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: added new file serial batch bundle

Browse Source
This commit is contained in:
Rohit Waghchaure
2023-03-13 14:51:43 +05:30
parent f1b5966680
commit e6143abb8a
46 changed files with 1468 additions and 1131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
View File

@@ -81,9 +81,6 @@ class SubcontractingReceipt(SubcontractingController):
self.validate_posting_time()
self.validate_rejected_warehouse()
if self._action == "submit":
self.make_batches("warehouse")
if getdate(self.posting_date) > getdate(nowdate()):
frappe.throw(_("Posting Date cannot be future date"))

28
erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
View File

@@ -46,8 +46,10 @@
"subcontracting_receipt_item",
"section_break_45",
"bom",
"serial_and_batch_bundle",
"serial_no",
"col_break5",
"rejected_serial_and_batch_bundle",
"batch_no",
"rejected_serial_no",
"manufacture_details",
@@ -298,19 +300,19 @@
"depends_on": "eval:!doc.is_fixed_asset",
"fieldname": "serial_no",
"fieldtype": "Small Text",
"in_list_view": 1,
"label": "Serial No",
"no_copy": 1
"no_copy": 1,
"read_only": 1
},
{
"depends_on": "eval:!doc.is_fixed_asset",
"fieldname": "batch_no",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Batch No",
"no_copy": 1,
"options": "Batch",
"print_hide": 1
"print_hide": 1,
"read_only": 1
},
{
"depends_on": "eval: !parent.is_return",
@@ -471,12 +473,28 @@
"fieldname": "recalculate_rate",
"fieldtype": "Check",
"label": "Recalculate Rate"
},
{
"fieldname": "serial_and_batch_bundle",
"fieldtype": "Link",
"label": "Serial and Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1
},
{
"fieldname": "rejected_serial_and_batch_bundle",
"fieldtype": "Link",
"label": "Rejected Serial and Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2022-11-16 14:21:26.125815",
"modified": "2023-03-12 14:00:41.418681",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Receipt Item",

18
erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
View File

@@ -25,6 +25,7 @@
"consumed_qty",
"current_stock",
"secbreak_3",
"serial_and_batch_bundle",
"batch_no",
"col_break4",
"serial_no",
@@ -61,13 +62,15 @@
"fieldtype": "Link",
"label": "Batch No",
"no_copy": 1,
"options": "Batch"
"options": "Batch",
"read_only": 1
},
{
"fieldname": "serial_no",
"fieldtype": "Text",
"label": "Serial No",
"no_copy": 1
"no_copy": 1,
"read_only": 1
},
{
"fieldname": "col_break1",
@@ -189,12 +192,21 @@
"label": "Available Qty For Consumption",
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "serial_and_batch_bundle",
"fieldtype": "Link",
"label": "Serial and Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1,
"read_only": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2022-11-07 17:17:21.670761",
"modified": "2023-03-12 14:11:48.816699",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Receipt Supplied Item",