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

Merge branch 'version-13-hotfix' into backport-fix-selling-settings

Browse Source
This commit is contained in:
Saqib
2021-09-17 15:56:01 +05:30
committed by GitHub
parent 24c08f5092 6ed40463a0
commit 5451aed115
6 changed files with 137 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/public/js/utils.js
View File

@@ -714,12 +714,15 @@ erpnext.utils.map_current_doc = function(opts) {
child_columns: opts.child_columns, child_columns: opts.child_columns,
action: function(selections, args) { action: function(selections, args) {
let values = selections; let values = selections;
if(values.length === 0){ if (values.length === 0) {
frappe.msgprint(__("Please select {0}", [opts.source_doctype])) frappe.msgprint(__("Please select {0}", [opts.source_doctype]))
return; return;
} }
opts.source_name = values; opts.source_name = values;
opts.args = args; if (opts.allow_child_item_selection) {
// args contains filtered child docnames
opts.args = args;
}
d.dialog.hide(); d.dialog.hide();
_map(); _map();
}, },

5
erpnext/setup/doctype/item_group/item_group.py
View File

@@ -36,6 +36,7 @@ class ItemGroup(NestedSet, WebsiteGenerator):
self.parent_item_group = _('All Item Groups') self.parent_item_group = _('All Item Groups')
self.make_route() self.make_route()
self.validate_item_group_defaults()
def on_update(self): def on_update(self):
NestedSet.on_update(self) NestedSet.on_update(self)
@@ -113,6 +114,10 @@ class ItemGroup(NestedSet, WebsiteGenerator):
def delete_child_item_groups_key(self): def delete_child_item_groups_key(self):
frappe.cache().hdel("child_item_groups", self.name) frappe.cache().hdel("child_item_groups", self.name)
def validate_item_group_defaults(self):
from erpnext.stock.doctype.item.item import validate_item_default_company_links
validate_item_default_company_links(self.item_group_defaults)
def get_child_groups_for_website(item_group_name, immediate=False): def get_child_groups_for_website(item_group_name, immediate=False):
"""Returns child item groups *excluding* passed group.""" """Returns child item groups *excluding* passed group."""
item_group = frappe.get_cached_value("Item Group", item_group_name, ["lft", "rgt"], as_dict=1) item_group = frappe.get_cached_value("Item Group", item_group_name, ["lft", "rgt"], as_dict=1)

91
erpnext/setup/doctype/item_group/test_records.json
View File

@@ -1,73 +1,74 @@
[ [
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 0, "is_group": 0,
"item_group_name": "_Test Item Group", "item_group_name": "_Test Item Group",
"parent_item_group": "All Item Groups", "parent_item_group": "All Item Groups",
"item_group_defaults": [{ "item_group_defaults": [{
"company": "_Test Company", "company": "_Test Company",
"buying_cost_center": "_Test Cost Center 2 - _TC", "buying_cost_center": "_Test Cost Center 2 - _TC",
"selling_cost_center": "_Test Cost Center 2 - _TC" "selling_cost_center": "_Test Cost Center 2 - _TC",
"default_warehouse": "_Test Warehouse - _TC"
}] }]
}, },
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 0, "is_group": 0,
"item_group_name": "_Test Item Group Desktops", "item_group_name": "_Test Item Group Desktops",
"parent_item_group": "All Item Groups" "parent_item_group": "All Item Groups"
}, },
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 1, "is_group": 1,
"item_group_name": "_Test Item Group A", "item_group_name": "_Test Item Group A",
"parent_item_group": "All Item Groups" "parent_item_group": "All Item Groups"
}, },
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 1, "is_group": 1,
"item_group_name": "_Test Item Group B", "item_group_name": "_Test Item Group B",
"parent_item_group": "All Item Groups" "parent_item_group": "All Item Groups"
}, },
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 1, "is_group": 1,
"item_group_name": "_Test Item Group B - 1", "item_group_name": "_Test Item Group B - 1",
"parent_item_group": "_Test Item Group B" "parent_item_group": "_Test Item Group B"
}, },
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 1, "is_group": 1,
"item_group_name": "_Test Item Group B - 2", "item_group_name": "_Test Item Group B - 2",
"parent_item_group": "_Test Item Group B" "parent_item_group": "_Test Item Group B"
}, },
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 0, "is_group": 0,
"item_group_name": "_Test Item Group B - 3", "item_group_name": "_Test Item Group B - 3",
"parent_item_group": "_Test Item Group B" "parent_item_group": "_Test Item Group B"
}, },
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 1, "is_group": 1,
"item_group_name": "_Test Item Group C", "item_group_name": "_Test Item Group C",
"parent_item_group": "All Item Groups" "parent_item_group": "All Item Groups"
}, },
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 1, "is_group": 1,
"item_group_name": "_Test Item Group C - 1", "item_group_name": "_Test Item Group C - 1",
"parent_item_group": "_Test Item Group C" "parent_item_group": "_Test Item Group C"
}, },
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 1, "is_group": 1,
"item_group_name": "_Test Item Group C - 2", "item_group_name": "_Test Item Group C - 2",
"parent_item_group": "_Test Item Group C" "parent_item_group": "_Test Item Group C"
}, },
{ {
"doctype": "Item Group", "doctype": "Item Group",
"is_group": 1, "is_group": 1,
"item_group_name": "_Test Item Group D", "item_group_name": "_Test Item Group D",
"parent_item_group": "All Item Groups" "parent_item_group": "All Item Groups"
}, },
{ {
@@ -104,4 +105,4 @@
} }
] ]
} }
] ]

90
erpnext/stock/doctype/item/item.py
View File

@@ -3,6 +3,7 @@
import copy import copy
import json import json
from typing import List
import frappe import frappe
from frappe import _ from frappe import _
@@ -29,6 +30,7 @@ from erpnext.controllers.item_variant import (
validate_item_variant_attributes, validate_item_variant_attributes,
) )
from erpnext.setup.doctype.item_group.item_group import invalidate_cache_for from erpnext.setup.doctype.item_group.item_group import invalidate_cache_for
from erpnext.stock.doctype.item_default.item_default import ItemDefault
class DuplicateReorderRows(frappe.ValidationError): class DuplicateReorderRows(frappe.ValidationError):
@@ -116,9 +118,9 @@ class Item(Document):
self.validate_fixed_asset() self.validate_fixed_asset()
self.validate_retain_sample() self.validate_retain_sample()
self.validate_uom_conversion_factor() self.validate_uom_conversion_factor()
self.validate_item_defaults()
self.validate_customer_provided_part() self.validate_customer_provided_part()
self.update_defaults_from_item_group() self.update_defaults_from_item_group()
self.validate_item_defaults()
self.validate_auto_reorder_enabled_in_stock_settings() self.validate_auto_reorder_enabled_in_stock_settings()
self.cant_change() self.cant_change()
self.validate_item_tax_net_rate_range() self.validate_item_tax_net_rate_range()
@@ -309,8 +311,12 @@ class Item(Document):
_("Default BOM ({0}) must be active for this item or its template").format(bom_item)) _("Default BOM ({0}) must be active for this item or its template").format(bom_item))
def fill_customer_code(self): def fill_customer_code(self):
""" Append all the customer codes and insert into "customer_code" field of item table """ """
self.customer_code = ','.join(d.ref_code for d in self.get("customer_items", [])) Append all the customer codes and insert into "customer_code" field of item table.
Used to search Item by customer code.
"""
customer_codes = set(d.ref_code for d in self.get("customer_items", []))
self.customer_code = ','.join(customer_codes)
def check_item_tax(self): def check_item_tax(self):
"""Check whether Tax Rate is not entered twice for same Tax Type""" """Check whether Tax Rate is not entered twice for same Tax Type"""
@@ -526,35 +532,39 @@ class Item(Document):
if len(companies) != len(self.item_defaults): if len(companies) != len(self.item_defaults):
frappe.throw(_("Cannot set multiple Item Defaults for a company.")) frappe.throw(_("Cannot set multiple Item Defaults for a company."))
validate_item_default_company_links(self.item_defaults)
def update_defaults_from_item_group(self): def update_defaults_from_item_group(self):
"""Get defaults from Item Group""" """Get defaults from Item Group"""
if self.item_group and not self.item_defaults: if self.item_defaults or not self.item_group:
item_defaults = frappe.db.get_values("Item Default", {"parent": self.item_group}, return
['company', 'default_warehouse','default_price_list','buying_cost_center','default_supplier',
'expense_account','selling_cost_center','income_account'], as_dict = 1)
if item_defaults:
for item in item_defaults:
self.append('item_defaults', {
'company': item.company,
'default_warehouse': item.default_warehouse,
'default_price_list': item.default_price_list,
'buying_cost_center': item.buying_cost_center,
'default_supplier': item.default_supplier,
'expense_account': item.expense_account,
'selling_cost_center': item.selling_cost_center,
'income_account': item.income_account
})
else:
warehouse = ''
defaults = frappe.defaults.get_defaults() or {}
# To check default warehouse is belong to the default company item_defaults = frappe.db.get_values("Item Default", {"parent": self.item_group},
if defaults.get("default_warehouse") and defaults.company and frappe.db.exists("Warehouse", ['company', 'default_warehouse','default_price_list','buying_cost_center','default_supplier',
{'name': defaults.default_warehouse, 'company': defaults.company}): 'expense_account','selling_cost_center','income_account'], as_dict = 1)
self.append("item_defaults", { if item_defaults:
"company": defaults.get("company"), for item in item_defaults:
"default_warehouse": defaults.default_warehouse self.append('item_defaults', {
}) 'company': item.company,
'default_warehouse': item.default_warehouse,
'default_price_list': item.default_price_list,
'buying_cost_center': item.buying_cost_center,
'default_supplier': item.default_supplier,
'expense_account': item.expense_account,
'selling_cost_center': item.selling_cost_center,
'income_account': item.income_account
})
else:
defaults = frappe.defaults.get_defaults() or {}
# To check default warehouse is belong to the default company
if defaults.get("default_warehouse") and defaults.company and frappe.db.exists("Warehouse",
{'name': defaults.default_warehouse, 'company': defaults.company}):
self.append("item_defaults", {
"company": defaults.get("company"),
"default_warehouse": defaults.default_warehouse
})
def update_variants(self): def update_variants(self):
if self.flags.dont_update_variants or \ if self.flags.dont_update_variants or \
@@ -1024,3 +1034,25 @@ def update_variants(variants, template, publish_progress=True):
@erpnext.allow_regional @erpnext.allow_regional
def set_item_tax_from_hsn_code(item): def set_item_tax_from_hsn_code(item):
pass pass
def validate_item_default_company_links(item_defaults: List[ItemDefault]) -> None:
for item_default in item_defaults:
for doctype, field in [
['Warehouse', 'default_warehouse'],
['Cost Center', 'buying_cost_center'],
['Cost Center', 'selling_cost_center'],
['Account', 'expense_account'],
['Account', 'income_account']
]:
if item_default.get(field):
company = frappe.db.get_value(doctype, item_default.get(field), 'company', cache=True)
if company and company != item_default.company:
frappe.throw(_("Row #{}: {} {} doesn't belong to Company {}. Please select valid {}.")
.format(
item_default.idx,
doctype,
frappe.bold(item_default.get(field)),
frappe.bold(item_default.company),
frappe.bold(frappe.unscrub(field))
), title=_("Invalid Item Defaults"))

17
erpnext/stock/doctype/item/test_item.py
View File

@@ -232,6 +232,23 @@ class TestItem(unittest.TestCase):
for key, value in purchase_item_check.items(): for key, value in purchase_item_check.items():
self.assertEqual(value, purchase_item_details.get(key)) self.assertEqual(value, purchase_item_details.get(key))
def test_item_default_validations(self):
with self.assertRaises(frappe.ValidationError) as ve:
make_item("Bad Item defaults", {
"item_group": "_Test Item Group",
"item_defaults": [{
"company": "_Test Company 1",
"default_warehouse": "_Test Warehouse - _TC",
"expense_account": "Stock In Hand - _TC",
"buying_cost_center": "_Test Cost Center - _TC",
"selling_cost_center": "_Test Cost Center - _TC",
}]
})
self.assertTrue("belong to company" in str(ve.exception).lower(),
msg="Mismatching company entities in item defaults should not be allowed.")
def test_item_attribute_change_after_variant(self): def test_item_attribute_change_after_variant(self):
frappe.delete_doc_if_exists("Item", "_Test Variant Item-L", force=1) frappe.delete_doc_if_exists("Item", "_Test Variant Item-L", force=1)

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

@@ -272,8 +272,9 @@ def update_status(name, status):
material_request.update_status(status) material_request.update_status(status)
@frappe.whitelist() @frappe.whitelist()
def make_purchase_order(source_name, target_doc=None, args={}): def make_purchase_order(source_name, target_doc=None, args=None):
if args is None:
args = {}
if isinstance(args, string_types): if isinstance(args, string_types):
args = json.loads(args) args = json.loads(args)