CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-29 09:01:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: use flt instead of mandatory field

Browse Source 
(cherry picked from commit 8c34cc0e00)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.json
This commit is contained in:
vishnu
2023-05-23 04:27:50 +00:00
committed by Mergify
parent d6427cfe53
commit f63b866de3
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/manufacturing/doctype/job_card/job_card.json
View File

@@ -117,8 +117,7 @@
"fieldname": "for_quantity", "fieldname": "for_quantity",
"fieldtype": "Float", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 1,
"label": "Qty To Manufacture", "label": "Qty To Manufacture"
"reqd": 1
}, },
{ {
"fieldname": "wip_warehouse", "fieldname": "wip_warehouse",
@@ -421,11 +420,15 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"modified": "2021-11-12 10:15:06.572401", "modified": "2021-11-12 10:15:06.572401",
======= =======
"modified": "2023-05-22 23:26:57.589331", "modified": "2023-05-22 23:26:57.589331",
>>>>>>> a209fb4b64 (fix: error while saving job card) >>>>>>> a209fb4b64 (fix: error while saving job card)
=======
"modified": "2023-05-23 09:56:43.826602",
>>>>>>> 8c34cc0e00 (fix: use flt instead of mandatory field)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Job Card", "name": "Job Card",

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

@@ -657,7 +657,7 @@ class JobCard(Document):
self.status = {0: "Open", 1: "Submitted", 2: "Cancelled"}[self.docstatus or 0] self.status = {0: "Open", 1: "Submitted", 2: "Cancelled"}[self.docstatus or 0]
if self.docstatus < 2: if self.docstatus < 2:
if self.for_quantity <= self.transferred_qty: if flt(self.for_quantity) <= flt(self.transferred_qty):
self.status = "Material Transferred" self.status = "Material Transferred"
if self.time_logs: if self.time_logs: