mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-20 15:32:14 +00:00
feat: Allow to Make Quality Inspection after Purchase / Delivery
(cherry picked from commit 8eaa2afeb7)
# Conflicts:
# erpnext/stock/doctype/stock_settings/stock_settings.json
This commit is contained in:
committed by
Mergify
parent
14a502c956
commit
2e6ba91589
@@ -144,6 +144,11 @@ class QualityInspection(Document):
|
|||||||
child_row_references.remove(child_row_references[0])
|
child_row_references.remove(child_row_references[0])
|
||||||
|
|
||||||
def validate_inspection_required(self):
|
def validate_inspection_required(self):
|
||||||
|
if frappe.db.get_single_value(
|
||||||
|
"Stock Settings", "allow_to_make_quality_inspection_after_purchase_or_delivery"
|
||||||
|
):
|
||||||
|
return
|
||||||
|
|
||||||
if self.reference_type in ["Purchase Receipt", "Purchase Invoice"] and not frappe.get_cached_value(
|
if self.reference_type in ["Purchase Receipt", "Purchase Invoice"] and not frappe.get_cached_value(
|
||||||
"Item", self.item_code, "inspection_required_before_purchase"
|
"Item", self.item_code, "inspection_required_before_purchase"
|
||||||
):
|
):
|
||||||
|
|||||||
@@ -35,6 +35,7 @@
|
|||||||
"show_barcode_field",
|
"show_barcode_field",
|
||||||
"clean_description_html",
|
"clean_description_html",
|
||||||
"allow_internal_transfer_at_arms_length_price",
|
"allow_internal_transfer_at_arms_length_price",
|
||||||
|
<<<<<<< HEAD
|
||||||
"quality_inspection_settings_section",
|
"quality_inspection_settings_section",
|
||||||
"action_if_quality_inspection_is_not_submitted",
|
"action_if_quality_inspection_is_not_submitted",
|
||||||
"column_break_23",
|
"column_break_23",
|
||||||
@@ -46,6 +47,8 @@
|
|||||||
"auto_reserve_stock_for_sales_order_on_purchase",
|
"auto_reserve_stock_for_sales_order_on_purchase",
|
||||||
"serial_and_batch_reservation_section",
|
"serial_and_batch_reservation_section",
|
||||||
"auto_reserve_serial_and_batch",
|
"auto_reserve_serial_and_batch",
|
||||||
|
=======
|
||||||
|
>>>>>>> 8eaa2afeb7 (feat: Allow to Make Quality Inspection after Purchase / Delivery)
|
||||||
"serial_and_batch_item_settings_tab",
|
"serial_and_batch_item_settings_tab",
|
||||||
"section_break_7",
|
"section_break_7",
|
||||||
"allow_existing_serial_no",
|
"allow_existing_serial_no",
|
||||||
@@ -62,6 +65,21 @@
|
|||||||
"use_naming_series",
|
"use_naming_series",
|
||||||
"column_break_wslv",
|
"column_break_wslv",
|
||||||
"naming_series_prefix",
|
"naming_series_prefix",
|
||||||
|
"stock_reservation_tab",
|
||||||
|
"enable_stock_reservation",
|
||||||
|
"auto_reserve_stock",
|
||||||
|
"column_break_rx3e",
|
||||||
|
"allow_partial_reservation",
|
||||||
|
"auto_reserve_stock_for_sales_order_on_purchase",
|
||||||
|
"serial_and_batch_reservation_section",
|
||||||
|
"auto_reserve_serial_and_batch",
|
||||||
|
"quality_tab",
|
||||||
|
"quality_inspection_settings_section",
|
||||||
|
"action_if_quality_inspection_is_not_submitted",
|
||||||
|
"column_break_23",
|
||||||
|
"action_if_quality_inspection_is_rejected",
|
||||||
|
"section_break_uiau",
|
||||||
|
"allow_to_make_quality_inspection_after_purchase_or_delivery",
|
||||||
"stock_planning_tab",
|
"stock_planning_tab",
|
||||||
"auto_material_request",
|
"auto_material_request",
|
||||||
"auto_indent",
|
"auto_indent",
|
||||||
@@ -503,6 +521,21 @@
|
|||||||
"fieldname": "allow_uom_with_conversion_rate_defined_in_item",
|
"fieldname": "allow_uom_with_conversion_rate_defined_in_item",
|
||||||
"fieldtype": "Check",
|
"fieldtype": "Check",
|
||||||
"label": "Allow UOM with Conversion Rate Defined in Item"
|
"label": "Allow UOM with Conversion Rate Defined in Item"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "quality_tab",
|
||||||
|
"fieldtype": "Tab Break",
|
||||||
|
"label": "Quality"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "section_break_uiau",
|
||||||
|
"fieldtype": "Section Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"fieldname": "allow_to_make_quality_inspection_after_purchase_or_delivery",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"label": "Allow to Make Quality Inspection after Purchase / Delivery"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "icon-cog",
|
"icon": "icon-cog",
|
||||||
@@ -510,7 +543,7 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"issingle": 1,
|
"issingle": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2025-03-31 15:34:20.752065",
|
"modified": "2025-04-10 16:19:31.210007",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Stock Settings",
|
"name": "Stock Settings",
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ class StockSettings(Document):
|
|||||||
allow_partial_reservation: DF.Check
|
allow_partial_reservation: DF.Check
|
||||||
allow_to_edit_stock_uom_qty_for_purchase: DF.Check
|
allow_to_edit_stock_uom_qty_for_purchase: DF.Check
|
||||||
allow_to_edit_stock_uom_qty_for_sales: DF.Check
|
allow_to_edit_stock_uom_qty_for_sales: DF.Check
|
||||||
|
allow_to_make_quality_inspection_after_purchase_or_delivery: DF.Check
|
||||||
allow_uom_with_conversion_rate_defined_in_item: DF.Check
|
allow_uom_with_conversion_rate_defined_in_item: DF.Check
|
||||||
auto_create_serial_and_batch_bundle_for_outward: DF.Check
|
auto_create_serial_and_batch_bundle_for_outward: DF.Check
|
||||||
auto_indent: DF.Check
|
auto_indent: DF.Check
|
||||||
|
|||||||
Reference in New Issue
Block a user