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

Merge branch 'develop' into internal_transfer

Browse Source
This commit is contained in:
Sagar Sharma 2022-11-17 16:42:18 +05:30 committed by GitHub
commit 29a8d9a9b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 773 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.pre-commit-config.yaml
View File

@ -16,8 +16,8 @@ repos:
- id: check-merge-conflict
- id: check-ast
- repo: https://gitlab.com/pycqa/flake8
rev: 3.9.2
- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
hooks:
- id: flake8
additional_dependencies: [

15
erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js
View File

@ -45,21 +45,6 @@ frappe.ui.form.on("Journal Entry Template", {
frm.trigger("clear_child");
switch(frm.doc.voucher_type){
case "Opening Entry":
frm.set_value("is_opening", "Yes");
frappe.call({
type:"GET",
method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_opening_accounts",
args: {
"company": frm.doc.company
},
callback: function(r) {
if(r.message) {
add_accounts(frm.doc, r.message);
}
}
});
break;
case "Bank Entry":
case "Cash Entry":
frappe.call({

24
erpnext/assets/doctype/asset/test_asset.py
View File

@ -230,9 +230,17 @@ class TestAsset(AssetSetup):
self.assertTrue(asset.journal_entry_for_scrap)
expected_gle = (
("_Test Accumulated Depreciations - _TC", 18000.0 + pro_rata_amount, 0.0),
(
"_Test Accumulated Depreciations - _TC",
flt(18000.0 + pro_rata_amount, asset.precision("gross_purchase_amount")),
0.0,
),
("_Test Fixed Asset - _TC", 0.0, 100000.0),
("_Test Gain/Loss on Asset Disposal - _TC", 82000.0 - pro_rata_amount, 0.0),
(
"_Test Gain/Loss on Asset Disposal - _TC",
flt(82000.0 - pro_rata_amount, asset.precision("gross_purchase_amount")),
0.0,
),
)
gle = frappe.db.sql(
@ -288,9 +296,17 @@ class TestAsset(AssetSetup):
pro_rata_amount = flt(pro_rata_amount, asset.precision("gross_purchase_amount"))
expected_gle = (
("_Test Accumulated Depreciations - _TC", 18000.0 + pro_rata_amount, 0.0),
(
"_Test Accumulated Depreciations - _TC",
flt(18000.0 + pro_rata_amount, asset.precision("gross_purchase_amount")),
0.0,
),
("_Test Fixed Asset - _TC", 0.0, 100000.0),
("_Test Gain/Loss on Asset Disposal - _TC", 57000.0 - pro_rata_amount, 0.0),
(
"_Test Gain/Loss on Asset Disposal - _TC",
flt(57000.0 - pro_rata_amount, asset.precision("gross_purchase_amount")),
0.0,
),
("Debtors - _TC", 25000.0, 0.0),
)

4
erpnext/assets/doctype/location/location.py
View File

@ -200,11 +200,11 @@ def get_children(doctype, parent=None, location=None, is_root=False):
name as value,
is_group as expandable
from
`tab{doctype}` comp
`tabLocation` comp
where
ifnull(parent_location, "")={parent}
""".format(
doctype=doctype, parent=frappe.db.escape(parent)
parent=frappe.db.escape(parent)
),
as_dict=1,
)

5
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -1108,7 +1108,8 @@
"fetch_from": "supplier.is_internal_supplier",
"fieldname": "is_internal_supplier",
"fieldtype": "Check",
"label": "Is Internal Supplier"
"label": "Is Internal Supplier",
"read_only": 1
},
{
"fetch_from": "supplier.represents_company",
@ -1232,7 +1233,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
"modified": "2022-10-11 13:01:41.674352",
"modified": "2022-11-17 12:34:36.033363",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",

19
erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
View File

@ -478,7 +478,7 @@ def get_rfq_containing_supplier(doctype, txt, searchfield, start, page_len, filt
conditions += "and rfq.transaction_date = '{0}'".format(filters.get("transaction_date"))
rfq_data = frappe.db.sql(
"""
f"""
select
distinct rfq.name, rfq.transaction_date,
rfq.company
@ -486,15 +486,18 @@ def get_rfq_containing_supplier(doctype, txt, searchfield, start, page_len, filt
`tabRequest for Quotation` rfq, `tabRequest for Quotation Supplier` rfq_supplier
where
rfq.name = rfq_supplier.parent
and rfq_supplier.supplier = '{0}'
and rfq_supplier.supplier = %(supplier)s
and rfq.docstatus = 1
and rfq.company = '{1}'
{2}
and rfq.company = %(company)s
{conditions}
order by rfq.transaction_date ASC
limit %(page_len)s offset %(start)s """.format(
filters.get("supplier"), filters.get("company"), conditions
),
{"page_len": page_len, "start": start},
limit %(page_len)s offset %(start)s """,
{
"page_len": page_len,
"start": start,
"company": filters.get("company"),
"supplier": filters.get("supplier"),
},
as_dict=1,
)

12
erpnext/manufacturing/doctype/bom_operation/bom_operation.json
View File

@ -9,6 +9,7 @@
"sequence_id",
"operation",
"col_break1",
"workstation_type",
"workstation",
"time_in_mins",
"fixed_time",
@ -40,9 +41,9 @@
"reqd": 1
},
{
"depends_on": "eval:!doc.workstation_type",
"fieldname": "workstation",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Workstation",
"oldfieldname": "workstation",
"oldfieldtype": "Link",
@ -180,13 +181,20 @@
"fieldname": "set_cost_based_on_bom_qty",
"fieldtype": "Check",
"label": "Set Operating Cost Based On BOM Quantity"
},
{
"fieldname": "workstation_type",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Workstation Type",
"options": "Workstation Type"
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2022-04-08 01:18:33.547481",
"modified": "2022-11-04 17:17:16.986941",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM Operation",

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

@ -27,11 +27,14 @@
"operation",
"operation_row_number",
"column_break_18",
"workstation_type",
"workstation",
"employee",
"section_break_21",
"sub_operations",
"timing_detail",
"expected_start_date",
"expected_end_date",
"time_logs",
"section_break_13",
"total_completed_qty",
@ -416,11 +419,27 @@
"fieldtype": "Link",
"label": "Quality Inspection Template",
"options": "Quality Inspection Template"
},
{
"fieldname": "workstation_type",
"fieldtype": "Link",
"label": "Workstation Type",
"options": "Workstation Type"
},
{
"fieldname": "expected_start_date",
"fieldtype": "Datetime",
"label": "Expected Start Date"
},
{
"fieldname": "expected_end_date",
"fieldtype": "Datetime",
"label": "Expected End Date"
}
],
"is_submittable": 1,
"links": [],
"modified": "2021-11-24 19:17:40.879235",
"modified": "2022-11-09 15:02:44.490731",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card",
@ -475,6 +494,7 @@
],
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"title_field": "operation",
"track_changes": 1
}

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

@ -2,6 +2,7 @@
# For license information, please see license.txt
import datetime
import json
from typing import Optional
import frappe
from frappe import _, bold
@ -26,6 +27,7 @@ from frappe.utils import (
from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import (
get_mins_between_operations,
)
from erpnext.manufacturing.doctype.workstation_type.workstation_type import get_workstations
class OverlapError(frappe.ValidationError):
@ -129,7 +131,7 @@ class JobCard(Document):
query = (
frappe.qb.from_(jctl)
.from_(jc)
.select(jc.name.as_("name"), jctl.to_time)
.select(jc.name.as_("name"), jctl.to_time, jc.workstation, jc.workstation_type)
.where(
(jctl.parent == jc.name)
& (Criterion.any(time_conditions))
@ -140,6 +142,9 @@ class JobCard(Document):
.orderby(jctl.to_time, order=frappe.qb.desc)
)
if self.workstation_type:
query = query.where(jc.workstation_type == self.workstation_type)
if self.workstation:
production_capacity = (
frappe.get_cached_value("Workstation", self.workstation, "production_capacity") or 1
@ -156,8 +161,21 @@ class JobCard(Document):
if existing and production_capacity > len(existing):
return
if self.workstation_type:
if workstation := self.get_workstation_based_on_available_slot(existing):
self.workstation = workstation
return None
return existing[0] if existing else None
def get_workstation_based_on_available_slot(self, existing) -> Optional[str]:
workstations = get_workstations(self.workstation_type)
if workstations:
busy_workstations = [row.workstation for row in existing]
for workstation in workstations:
if workstation not in busy_workstations:
return workstation
def schedule_time_logs(self, row):
row.remaining_time_in_mins = row.time_in_mins
while row.remaining_time_in_mins > 0:
@ -170,6 +188,9 @@ class JobCard(Document):
# get the last record based on the to time from the job card
data = self.get_overlap_for(args, check_next_available_slot=True)
if data:
if not self.workstation:
self.workstation = data.workstation
row.planned_start_time = get_datetime(data.to_time + get_mins_between_operations())
def check_workstation_time(self, row):

162
erpnext/manufacturing/doctype/work_order/test_work_order.py
View File

@ -5,7 +5,7 @@ import copy
import frappe
from frappe.tests.utils import FrappeTestCase, change_settings, timeout
from frappe.utils import add_days, add_months, cint, flt, now, today
from frappe.utils import add_days, add_months, add_to_date, cint, flt, now, today
from erpnext.manufacturing.doctype.job_card.job_card import JobCardCancelError
from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom
@ -1480,6 +1480,166 @@ class TestWorkOrder(FrappeTestCase):
for row in return_ste_doc.items:
self.assertEqual(row.qty, 2)
def test_workstation_type_for_work_order(self):
prepare_data_for_workstation_type_check()
workstation_types = ["Workstation Type 1", "Workstation Type 2", "Workstation Type 3"]
planned_start_date = "2022-11-14 10:00:00"
wo_order = make_wo_order_test_record(
item="Test FG Item For Workstation Type", planned_start_date=planned_start_date, qty=2
)
job_cards = frappe.get_all(
"Job Card",
fields=[
"`tabJob Card`.`name`",
"`tabJob Card`.`workstation_type`",
"`tabJob Card`.`workstation`",
"`tabJob Card Time Log`.`from_time`",
"`tabJob Card Time Log`.`to_time`",
"`tabJob Card Time Log`.`time_in_mins`",
],
filters=[
["Job Card", "work_order", "=", wo_order.name],
["Job Card Time Log", "docstatus", "=", 1],
],
order_by="`tabJob Card`.`creation` desc",
)
workstations_to_check = ["Workstation 1", "Workstation 3", "Workstation 5"]
for index, row in enumerate(job_cards):
if index != 0:
planned_start_date = add_to_date(planned_start_date, minutes=40)
self.assertEqual(row.workstation_type, workstation_types[index])
self.assertEqual(row.from_time, planned_start_date)
self.assertEqual(row.to_time, add_to_date(planned_start_date, minutes=30))
self.assertEqual(row.workstation, workstations_to_check[index])
planned_start_date = "2022-11-14 10:00:00"
wo_order = make_wo_order_test_record(
item="Test FG Item For Workstation Type", planned_start_date=planned_start_date, qty=2
)
job_cards = frappe.get_all(
"Job Card",
fields=[
"`tabJob Card`.`name`",
"`tabJob Card`.`workstation_type`",
"`tabJob Card`.`workstation`",
"`tabJob Card Time Log`.`from_time`",
"`tabJob Card Time Log`.`to_time`",
"`tabJob Card Time Log`.`time_in_mins`",
],
filters=[
["Job Card", "work_order", "=", wo_order.name],
["Job Card Time Log", "docstatus", "=", 1],
],
order_by="`tabJob Card`.`creation` desc",
)
workstations_to_check = ["Workstation 2", "Workstation 4", "Workstation 6"]
for index, row in enumerate(job_cards):
if index != 0:
planned_start_date = add_to_date(planned_start_date, minutes=40)
self.assertEqual(row.workstation_type, workstation_types[index])
self.assertEqual(row.from_time, planned_start_date)
self.assertEqual(row.to_time, add_to_date(planned_start_date, minutes=30))
self.assertEqual(row.workstation, workstations_to_check[index])
def prepare_data_for_workstation_type_check():
from erpnext.manufacturing.doctype.operation.test_operation import make_operation
from erpnext.manufacturing.doctype.workstation.test_workstation import make_workstation
from erpnext.manufacturing.doctype.workstation_type.test_workstation_type import (
create_workstation_type,
)
workstation_types = ["Workstation Type 1", "Workstation Type 2", "Workstation Type 3"]
for workstation_type in workstation_types:
create_workstation_type(workstation_type=workstation_type)
operations = ["Cutting", "Sewing", "Packing"]
for operation in operations:
make_operation(
{
"operation": operation,
}
)
workstations = [
{
"workstation": "Workstation 1",
"workstation_type": "Workstation Type 1",
},
{
"workstation": "Workstation 2",
"workstation_type": "Workstation Type 1",
},
{
"workstation": "Workstation 3",
"workstation_type": "Workstation Type 2",
},
{
"workstation": "Workstation 4",
"workstation_type": "Workstation Type 2",
},
{
"workstation": "Workstation 5",
"workstation_type": "Workstation Type 3",
},
{
"workstation": "Workstation 6",
"workstation_type": "Workstation Type 3",
},
]
for row in workstations:
make_workstation(row)
fg_item = make_item(
"Test FG Item For Workstation Type",
{
"is_stock_item": 1,
},
)
rm_item = make_item(
"Test RM Item For Workstation Type",
{
"is_stock_item": 1,
},
)
if not frappe.db.exists("BOM", {"item": fg_item.name}):
bom_doc = make_bom(
item=fg_item.name,
source_warehouse="Stores - _TC",
raw_materials=[rm_item.name],
do_not_submit=True,
)
submit_bom = False
for index, operation in enumerate(operations):
if not frappe.db.exists("BOM Operation", {"parent": bom_doc.name, "operation": operation}):
bom_doc.append(
"operations",
{
"operation": operation,
"time_in_mins": 30,
"hour_rate": 100,
"workstation_type": workstation_types[index],
},
)
submit_bom = True
if submit_bom:
bom_doc.submit()
def prepare_data_for_backflush_based_on_materials_transferred():
batch_item_doc = make_item(

1
erpnext/manufacturing/doctype/work_order/work_order.js
View File

@ -446,7 +446,6 @@ frappe.ui.form.on("Work Order", {
frm.fields_dict.required_items.grid.toggle_reqd("source_warehouse", true);
frm.toggle_reqd("transfer_material_against",
frm.doc.operations && frm.doc.operations.length > 0);
frm.fields_dict.operations.grid.toggle_reqd("workstation", frm.doc.operations);
},
set_sales_order: function(frm) {

14
erpnext/manufacturing/doctype/work_order/work_order.py
View File

@ -87,11 +87,18 @@ class WorkOrder(Document):
self.validate_transfer_against()
self.validate_operation_time()
self.status = self.get_status()
self.validate_workstation_type()
validate_uom_is_integer(self, "stock_uom", ["qty", "produced_qty"])
self.set_required_items(reset_only_qty=len(self.get("required_items")))
def validate_workstation_type(self):
for row in self.operations:
if not row.workstation and not row.workstation_type:
msg = f"Row {row.idx}: Workstation or Workstation Type is mandatory for an operation {row.operation}"
frappe.throw(_(msg))
def validate_sales_order(self):
if self.sales_order:
self.check_sales_order_on_hold_or_close()
@ -491,11 +498,6 @@ class WorkOrder(Document):
def prepare_data_for_job_card(self, row, index, plan_days, enable_capacity_planning):
self.set_operation_start_end_time(index, row)
if not row.workstation:
frappe.throw(
_("Row {0}: select the workstation against the operation {1}").format(row.idx, row.operation)
)
original_start_time = row.planned_start_time
job_card_doc = create_job_card(
self, row, auto_create=True, enable_capacity_planning=enable_capacity_planning
@ -662,6 +664,7 @@ class WorkOrder(Document):
"description",
"workstation",
"idx",
"workstation_type",
"base_hour_rate as hour_rate",
"time_in_mins",
"parent as bom",
@ -1398,6 +1401,7 @@ def create_job_card(work_order, row, enable_capacity_planning=False, auto_create
doc.update(
{
"work_order": work_order.name,
"workstation_type": row.get("workstation_type"),
"operation": row.get("operation"),
"workstation": row.get("workstation"),
"posting_date": nowdate(),

10
erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
View File

@ -10,6 +10,7 @@
"completed_qty",
"column_break_4",
"bom",
"workstation_type",
"workstation",
"sequence_id",
"section_break_10",
@ -196,12 +197,18 @@
{
"fieldname": "section_break_10",
"fieldtype": "Section Break"
},
{
"fieldname": "workstation_type",
"fieldtype": "Link",
"label": "Workstation Type",
"options": "Workstation Type"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2021-11-29 16:37:18.824489",
"modified": "2022-11-09 01:37:56.563068",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Work Order Operation",
@ -209,5 +216,6 @@
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}

1
erpnext/manufacturing/doctype/workstation/test_workstation.py
View File

@ -107,6 +107,7 @@ def make_workstation(*args, **kwargs):
doc = frappe.get_doc({"doctype": "Workstation", "workstation_name": workstation_name})
doc.hour_rate_rent = args.get("hour_rate_rent")
doc.hour_rate_labour = args.get("hour_rate_labour")
doc.workstation_type = args.get("workstation_type")
doc.insert()
return doc

14
erpnext/manufacturing/doctype/workstation/workstation.js
View File

@ -2,7 +2,7 @@
// License: GNU General Public License v3. See license.txt
frappe.ui.form.on("Workstation", {
onload: function(frm) {
onload(frm) {
if(frm.is_new())
{
frappe.call({
@ -15,6 +15,18 @@ frappe.ui.form.on("Workstation", {
}
})
}
},
workstation_type(frm) {
if (frm.doc.workstation_type) {
frm.call({
method: "set_data_based_on_workstation_type",
doc: frm.doc,
callback: function(r) {
frm.refresh_fields();
}
})
}
}
});

33
erpnext/manufacturing/doctype/workstation/workstation.json
View File

@ -1,26 +1,30 @@
{
"actions": [],
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:workstation_name",
"creation": "2013-01-10 16:34:17",
"doctype": "DocType",
"document_type": "Setup",
"engine": "InnoDB",
"field_order": [
"workstation_name",
"production_capacity",
"column_break_3",
"workstation_type",
"over_heads",
"hour_rate_electricity",
"hour_rate_consumable",
"column_break_11",
"hour_rate_rent",
"hour_rate_labour",
"section_break_11",
"hour_rate",
"workstaion_description",
"description",
"working_hours_section",
"holiday_list",
"working_hours",
"workstaion_description",
"description"
"working_hours"
],
"fields": [
{
@ -44,7 +48,7 @@
},
{
"fieldname": "over_heads",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "Operating Costs",
"oldfieldtype": "Section Break"
},
@ -99,7 +103,7 @@
},
{
"fieldname": "working_hours_section",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "Working Hours"
},
{
@ -128,16 +132,29 @@
{
"collapsible": 1,
"fieldname": "workstaion_description",
"fieldtype": "Section Break",
"fieldtype": "Tab Break",
"label": "Description"
},
{
"bold": 1,
"fieldname": "workstation_type",
"fieldtype": "Link",
"label": "Workstation Type",
"options": "Workstation Type"
},
{
"fieldname": "section_break_11",
"fieldtype": "Section Break"
}
],
"icon": "icon-wrench",
"idx": 1,
"modified": "2019-11-26 12:39:19.742052",
"links": [],
"modified": "2022-11-04 17:39:01.549346",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Workstation",
"naming_rule": "By fieldname",
"owner": "Administrator",
"permissions": [
{
@ -154,6 +171,8 @@
],
"quick_entry": 1,
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "ASC",
"states": [],
"track_changes": 1
}

30
erpnext/manufacturing/doctype/workstation/workstation.py
View File

@ -32,7 +32,11 @@ class OverlapError(frappe.ValidationError):
class Workstation(Document):
def validate(self):
def before_save(self):
self.set_data_based_on_workstation_type()
self.set_hour_rate()
def set_hour_rate(self):
self.hour_rate = (
flt(self.hour_rate_labour)
+ flt(self.hour_rate_electricity)
@ -40,6 +44,30 @@ class Workstation(Document):
+ flt(self.hour_rate_rent)
)
@frappe.whitelist()
def set_data_based_on_workstation_type(self):
if self.workstation_type:
fields = [
"hour_rate_labour",
"hour_rate_electricity",
"hour_rate_consumable",
"hour_rate_rent",
"hour_rate",
"description",
]
data = frappe.get_cached_value("Workstation Type", self.workstation_type, fields, as_dict=True)
if not data:
return
for field in fields:
if self.get(field):
continue
if value := data.get(field):
self.set(field, value)
def on_update(self):
self.validate_overlap_for_operation_timings()
self.update_bom_operation()

0
erpnext/manufacturing/doctype/workstation_type/__init__.py Normal file
View File

21
erpnext/manufacturing/doctype/workstation_type/test_workstation_type.py Normal file
View File

@ -0,0 +1,21 @@
# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
import frappe
from frappe.tests.utils import FrappeTestCase
class TestWorkstationType(FrappeTestCase):
pass
def create_workstation_type(**args):
args = frappe._dict(args)
if workstation_type := frappe.db.exists("Workstation Type", args.workstation_type):
return frappe.get_doc("Workstation Type", workstation_type)
else:
doc = frappe.new_doc("Workstation Type")
doc.update(args)
doc.insert()
return doc

8
erpnext/manufacturing/doctype/workstation_type/workstation_type.js Normal file
View File

@ -0,0 +1,8 @@
// Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
frappe.ui.form.on('Workstation Type', {
// refresh: function(frm) {
// }
});

133
erpnext/manufacturing/doctype/workstation_type/workstation_type.json Normal file
View File

@ -0,0 +1,133 @@
{
"actions": [],
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:workstation_type",
"creation": "2022-11-04 17:03:23.334818",
"default_view": "List",
"doctype": "DocType",
"document_type": "Setup",
"engine": "InnoDB",
"field_order": [
"workstation_type",
"over_heads",
"hour_rate_electricity",
"hour_rate_consumable",
"column_break_5",
"hour_rate_rent",
"hour_rate_labour",
"section_break_8",
"hour_rate",
"description_tab",
"description"
],
"fields": [
{
"fieldname": "workstation_type",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Workstation Type",
"oldfieldname": "workstation_name",
"oldfieldtype": "Data",
"reqd": 1,
"unique": 1
},
{
"fieldname": "over_heads",
"fieldtype": "Section Break",
"label": "Operating Costs",
"oldfieldtype": "Section Break"
},
{
"description": "per hour",
"fieldname": "hour_rate_electricity",
"fieldtype": "Currency",
"label": "Electricity Cost",
"oldfieldname": "hour_rate_electricity",
"oldfieldtype": "Currency"
},
{
"description": "per hour",
"fieldname": "hour_rate_consumable",
"fieldtype": "Currency",
"label": "Consumable Cost",
"oldfieldname": "hour_rate_consumable",
"oldfieldtype": "Currency"
},
{
"description": "per hour",
"fieldname": "hour_rate_rent",
"fieldtype": "Currency",
"label": "Rent Cost",
"oldfieldname": "hour_rate_rent",
"oldfieldtype": "Currency"
},
{
"description": "Wages per hour",
"fieldname": "hour_rate_labour",
"fieldtype": "Currency",
"label": "Wages",
"oldfieldname": "hour_rate_labour",
"oldfieldtype": "Currency"
},
{
"description": "per hour",
"fieldname": "hour_rate",
"fieldtype": "Currency",
"label": "Net Hour Rate",
"oldfieldname": "hour_rate",
"oldfieldtype": "Currency",
"read_only": 1
},
{
"fieldname": "description",
"fieldtype": "Small Text",
"in_list_view": 1,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
"width": "300px"
},
{
"fieldname": "column_break_5",
"fieldtype": "Column Break"
},
{
"collapsible": 1,
"fieldname": "description_tab",
"fieldtype": "Tab Break",
"label": "Description"
},
{
"fieldname": "section_break_8",
"fieldtype": "Section Break"
}
],
"icon": "icon-wrench",
"links": [],
"modified": "2022-11-16 23:11:36.224249",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Workstation Type",
"naming_rule": "By fieldname",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Manufacturing User",
"share": 1,
"write": 1
}
],
"quick_entry": 1,
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "ASC",
"states": [],
"track_changes": 1
}

25
erpnext/manufacturing/doctype/workstation_type/workstation_type.py Normal file
View File

@ -0,0 +1,25 @@
# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
import frappe
from frappe.model.document import Document
from frappe.utils import flt
class WorkstationType(Document):
def before_save(self):
self.set_hour_rate()
def set_hour_rate(self):
self.hour_rate = (
flt(self.hour_rate_labour)
+ flt(self.hour_rate_electricity)
+ flt(self.hour_rate_consumable)
+ flt(self.hour_rate_rent)
)
def get_workstations(workstation_type):
workstations = frappe.get_all("Workstation", filters={"workstation_type": workstation_type})
return [workstation.name for workstation in workstations]

336
erpnext/manufacturing/workspace/manufacturing/manufacturing.json
View File

@ -73,168 +73,6 @@
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "Bill of Materials",
"link_count": 0,
"onboard": 0,
"type": "Card Break"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Item",
"link_count": 0,
"link_to": "Item",
"link_type": "DocType",
"onboard": 1,
"type": "Link"
},
{
"dependencies": "Item",
"hidden": 0,
"is_query_report": 0,
"label": "Bill of Materials",
"link_count": 0,
"link_to": "BOM",
"link_type": "DocType",
"onboard": 1,
"type": "Link"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Workstation",
"link_count": 0,
"link_to": "Workstation",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Operation",
"link_count": 0,
"link_to": "Operation",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Routing",
"link_count": 0,
"link_to": "Routing",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Work Order",
"hidden": 0,
"is_query_report": 1,
"label": "Production Planning Report",
"link_count": 0,
"link_to": "Production Planning Report",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Work Order",
"hidden": 0,
"is_query_report": 1,
"label": "Work Order Summary",
"link_count": 0,
"link_to": "Work Order Summary",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Quality Inspection",
"hidden": 0,
"is_query_report": 1,
"label": "Quality Inspection Summary",
"link_count": 0,
"link_to": "Quality Inspection Summary",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Downtime Entry",
"hidden": 0,
"is_query_report": 1,
"label": "Downtime Analysis",
"link_count": 0,
"link_to": "Downtime Analysis",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Job Card",
"hidden": 0,
"is_query_report": 1,
"label": "Job Card Summary",
"link_count": 0,
"link_to": "Job Card Summary",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "BOM",
"hidden": 0,
"is_query_report": 1,
"label": "BOM Search",
"link_count": 0,
"link_to": "BOM Search",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "BOM",
"hidden": 0,
"is_query_report": 1,
"label": "BOM Stock Report",
"link_count": 0,
"link_to": "BOM Stock Report",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Work Order",
"hidden": 0,
"is_query_report": 1,
"label": "Production Analytics",
"link_count": 0,
"link_to": "Production Analytics",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "BOM",
"hidden": 0,
"is_query_report": 1,
"label": "BOM Operations Time",
"link_count": 0,
"link_to": "BOM Operations Time",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
@ -400,9 +238,181 @@
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "Bill of Materials",
"link_count": 15,
"onboard": 0,
"type": "Card Break"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Item",
"link_count": 0,
"link_to": "Item",
"link_type": "DocType",
"onboard": 1,
"type": "Link"
},
{
"dependencies": "Item",
"hidden": 0,
"is_query_report": 0,
"label": "Bill of Materials",
"link_count": 0,
"link_to": "BOM",
"link_type": "DocType",
"onboard": 1,
"type": "Link"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Workstation Type",
"link_count": 0,
"link_to": "Workstation Type",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Workstation",
"link_count": 0,
"link_to": "Workstation",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "",
"hidden": 0,
"is_query_report": 0,
"label": "Operation",
"link_count": 0,
"link_to": "Operation",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Work Order",
"hidden": 0,
"is_query_report": 1,
"label": "Routing",
"link_count": 0,
"link_to": "Routing",
"link_type": "DocType",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Work Order",
"hidden": 0,
"is_query_report": 1,
"label": "Production Planning Report",
"link_count": 0,
"link_to": "Production Planning Report",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Quality Inspection",
"hidden": 0,
"is_query_report": 1,
"label": "Work Order Summary",
"link_count": 0,
"link_to": "Work Order Summary",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Downtime Entry",
"hidden": 0,
"is_query_report": 1,
"label": "Quality Inspection Summary",
"link_count": 0,
"link_to": "Quality Inspection Summary",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Job Card",
"hidden": 0,
"is_query_report": 1,
"label": "Downtime Analysis",
"link_count": 0,
"link_to": "Downtime Analysis",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "BOM",
"hidden": 0,
"is_query_report": 1,
"label": "Job Card Summary",
"link_count": 0,
"link_to": "Job Card Summary",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "BOM",
"hidden": 0,
"is_query_report": 1,
"label": "BOM Search",
"link_count": 0,
"link_to": "BOM Search",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "Work Order",
"hidden": 0,
"is_query_report": 1,
"label": "BOM Stock Report",
"link_count": 0,
"link_to": "BOM Stock Report",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"dependencies": "BOM",
"hidden": 0,
"is_query_report": 1,
"label": "Production Analytics",
"link_count": 0,
"link_to": "Production Analytics",
"link_type": "Report",
"onboard": 0,
"type": "Link"
},
{
"hidden": 0,
"is_query_report": 0,
"label": "BOM Operations Time",
"link_count": 0,
"link_to": "BOM Operations Time",
"link_type": "Report",
"onboard": 0,
"type": "Link"
}
],
"modified": "2022-06-15 15:18:57.062935",
"modified": "2022-11-14 14:53:34.616862",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Manufacturing",

5
erpnext/patches/v13_0/update_exchange_rate_settings.py
View File

@ -1,10 +1,5 @@
import frappe
from erpnext.setup.install import setup_currency_exchange
def execute():
frappe.reload_doc("accounts", "doctype", "currency_exchange_settings_result")
frappe.reload_doc("accounts", "doctype", "currency_exchange_settings_details")
frappe.reload_doc("accounts", "doctype", "currency_exchange_settings")
setup_currency_exchange()

6
erpnext/public/js/bulk_transaction_processing.js
View File

@ -11,7 +11,7 @@ $.extend(erpnext.bulk_transaction_processing, {
});
let count_of_rows = checked_items.length;
frappe.confirm(__("Create {0} {1} ?", [count_of_rows, to_doctype]), ()=>{
frappe.confirm(__("Create {0} {1} ?", [count_of_rows, __(to_doctype)]), ()=>{
if (doc_name.length == 0) {
frappe.call({
method: "erpnext.utilities.bulk_transaction.transaction_processing",
@ -20,11 +20,11 @@ $.extend(erpnext.bulk_transaction_processing, {
});
if (count_of_rows > 10) {
frappe.show_alert("Starting a background job to create {0} {1}", [count_of_rows, to_doctype]);
frappe.show_alert("Starting a background job to create {0} {1}", [count_of_rows, __(to_doctype)]);
}
} else {
frappe.msgprint(__("Selected document must be in submitted state"));
}
});
}
});
});

2
erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
View File

@ -79,7 +79,7 @@ def get_children(doctype, parent=None, parent_quality_procedure=None, is_root=Fa
]
else:
return frappe.get_all(
doctype,
"Quality Procedure",
fields=["name as value", "is_group as expandable"],
filters=dict(parent_quality_procedure=parent),
order_by="name asc",

4
erpnext/setup/doctype/company/company.py
View File

@ -689,11 +689,11 @@ def get_children(doctype, parent=None, company=None, is_root=False):
name as value,
is_group as expandable
from
`tab{doctype}` comp
`tabCompany` comp
where
ifnull(parent_company, "")={parent}
""".format(
doctype=doctype, parent=frappe.db.escape(parent)
parent=frappe.db.escape(parent)
),
as_dict=1,
)

2
erpnext/setup/doctype/department/department.py
View File

@ -63,7 +63,7 @@ def get_children(doctype, parent=None, company=None, is_root=False):
else:
filters["parent_department"] = parent
return frappe.get_all(doctype, fields=fields, filters=filters, order_by="name")
return frappe.get_all("Department", fields=fields, filters=filters, order_by="name")
@frappe.whitelist()

12
erpnext/stock/doctype/material_request/material_request.py
View File

@ -10,7 +10,7 @@ import json
import frappe
from frappe import _, msgprint
from frappe.model.mapper import get_mapped_doc
from frappe.utils import cstr, flt, get_link_to_form, getdate, new_line_sep, nowdate
from frappe.utils import cint, cstr, flt, get_link_to_form, getdate, new_line_sep, nowdate
from erpnext.buying.utils import check_on_hold_or_closed_status, validate_for_items
from erpnext.controllers.buying_controller import BuyingController
@ -500,13 +500,13 @@ def get_material_requests_based_on_supplier(doctype, txt, searchfield, start, pa
and mr.per_ordered < 99.99
and mr.docstatus = 1
and mr.status != 'Stopped'
and mr.company = '{1}'
{2}
and mr.company = %s
{1}
order by mr_item.item_code ASC
limit {3} offset {4} """.format(
", ".join(["%s"] * len(supplier_items)), filters.get("company"), conditions, page_len, start
limit {2} offset {3} """.format(
", ".join(["%s"] * len(supplier_items)), conditions, cint(page_len), cint(start)
),
tuple(supplier_items),
tuple(supplier_items) + (filters.get("company"),),
as_dict=1,
)

119
erpnext/stock/doctype/quality_inspection/quality_inspection.py
View File

@ -6,7 +6,7 @@ import frappe
from frappe import _
from frappe.model.document import Document
from frappe.model.mapper import get_mapped_doc
from frappe.utils import cint, flt
from frappe.utils import cint, cstr, flt
from erpnext.stock.doctype.quality_inspection_template.quality_inspection_template import (
get_template_details,
@ -219,68 +219,71 @@ class QualityInspection(Document):
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def item_query(doctype, txt, searchfield, start, page_len, filters):
if filters.get("from"):
from frappe.desk.reportview import get_match_cond
from frappe.desk.reportview import get_match_cond
mcond = get_match_cond(filters["from"])
cond, qi_condition = "", "and (quality_inspection is null or quality_inspection = '')"
from_doctype = cstr(filters.get("doctype"))
if not from_doctype or not frappe.db.exists("DocType", from_doctype):
return []
if filters.get("parent"):
if (
filters.get("from") in ["Purchase Invoice Item", "Purchase Receipt Item"]
and filters.get("inspection_type") != "In Process"
):
cond = """and item_code in (select name from `tabItem` where
inspection_required_before_purchase = 1)"""
elif (
filters.get("from") in ["Sales Invoice Item", "Delivery Note Item"]
and filters.get("inspection_type") != "In Process"
):
cond = """and item_code in (select name from `tabItem` where
inspection_required_before_delivery = 1)"""
elif filters.get("from") == "Stock Entry Detail":
cond = """and s_warehouse is null"""
mcond = get_match_cond(from_doctype)
cond, qi_condition = "", "and (quality_inspection is null or quality_inspection = '')"
if filters.get("from") in ["Supplier Quotation Item"]:
qi_condition = ""
if filters.get("parent"):
if (
from_doctype in ["Purchase Invoice Item", "Purchase Receipt Item"]
and filters.get("inspection_type") != "In Process"
):
cond = """and item_code in (select name from `tabItem` where
inspection_required_before_purchase = 1)"""
elif (
from_doctype in ["Sales Invoice Item", "Delivery Note Item"]
and filters.get("inspection_type") != "In Process"
):
cond = """and item_code in (select name from `tabItem` where
inspection_required_before_delivery = 1)"""
elif from_doctype == "Stock Entry Detail":
cond = """and s_warehouse is null"""
return frappe.db.sql(
"""
SELECT item_code
FROM `tab{doc}`
WHERE parent=%(parent)s and docstatus < 2 and item_code like %(txt)s
{qi_condition} {cond} {mcond}
ORDER BY item_code limit {page_len} offset {start}
""".format(
doc=filters.get("from"),
cond=cond,
mcond=mcond,
start=start,
page_len=page_len,
qi_condition=qi_condition,
),
{"parent": filters.get("parent"), "txt": "%%%s%%" % txt},
)
if from_doctype in ["Supplier Quotation Item"]:
qi_condition = ""
elif filters.get("reference_name"):
return frappe.db.sql(
"""
SELECT production_item
FROM `tab{doc}`
WHERE name = %(reference_name)s and docstatus < 2 and production_item like %(txt)s
{qi_condition} {cond} {mcond}
ORDER BY production_item
limit {page_len} offset {start}
""".format(
doc=filters.get("from"),
cond=cond,
mcond=mcond,
start=start,
page_len=page_len,
qi_condition=qi_condition,
),
{"reference_name": filters.get("reference_name"), "txt": "%%%s%%" % txt},
)
return frappe.db.sql(
"""
SELECT item_code
FROM `tab{doc}`
WHERE parent=%(parent)s and docstatus < 2 and item_code like %(txt)s
{qi_condition} {cond} {mcond}
ORDER BY item_code limit {page_len} offset {start}
""".format(
doc=from_doctype,
cond=cond,
mcond=mcond,
start=cint(start),
page_len=cint(page_len),
qi_condition=qi_condition,
),
{"parent": filters.get("parent"), "txt": "%%%s%%" % txt},
)
elif filters.get("reference_name"):
return frappe.db.sql(
"""
SELECT production_item
FROM `tab{doc}`
WHERE name = %(reference_name)s and docstatus < 2 and production_item like %(txt)s
{qi_condition} {cond} {mcond}
ORDER BY production_item
limit {page_len} offset {start}
""".format(
doc=from_doctype,
cond=cond,
mcond=mcond,
start=cint(start),
page_len=cint(page_len),
qi_condition=qi_condition,
),
{"reference_name": filters.get("reference_name"), "txt": "%%%s%%" % txt},
)
@frappe.whitelist()