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

Merge branch 'develop' into FIX-ISS-23-24-01158

Browse Source
This commit is contained in:
Sagar Sharma 2023-05-31 16:34:00 +05:30 committed by GitHub
commit fe7c626098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/assets/doctype/asset_category/asset_category.py
View File

@ -96,7 +96,6 @@ class AssetCategory(Document):
frappe.throw(msg, title=_("Missing Account")) frappe.throw(msg, title=_("Missing Account"))
@frappe.whitelist()
def get_asset_category_account( def get_asset_category_account(
fieldname, item=None, asset=None, account=None, asset_category=None, company=None fieldname, item=None, asset=None, account=None, asset_category=None, company=None
): ):

2
erpnext/controllers/accounts_controller.py
View File

@ -2444,7 +2444,7 @@ def set_order_defaults(
Returns a Sales/Purchase Order Item child item containing the default values Returns a Sales/Purchase Order Item child item containing the default values
""" """
p_doc = frappe.get_doc(parent_doctype, parent_doctype_name) p_doc = frappe.get_doc(parent_doctype, parent_doctype_name)
child_item = frappe.new_doc(child_doctype, p_doc, child_docname) child_item = frappe.new_doc(child_doctype, parent_doc=p_doc, parentfield=child_docname)
item = frappe.get_doc("Item", trans_item.get("item_code")) item = frappe.get_doc("Item", trans_item.get("item_code"))
for field in ("item_code", "item_name", "description", "item_group"): for field in ("item_code", "item_name", "description", "item_group"):

2
erpnext/patches/v13_0/copy_custom_field_filters_to_website_item.py
View File

@ -15,7 +15,7 @@ def execute():
web_item = frappe.db.get_value("Website Item", {"item_code": row.parent}) web_item = frappe.db.get_value("Website Item", {"item_code": row.parent})
web_item_doc = frappe.get_doc("Website Item", web_item) web_item_doc = frappe.get_doc("Website Item", web_item)
child_doc = frappe.new_doc(docfield.options, web_item_doc, field) child_doc = frappe.new_doc(docfield.options, parent_doc=web_item_doc, parentfield=field)
for field in ["name", "creation", "modified", "idx"]: for field in ["name", "creation", "modified", "idx"]:
row[field] = None row[field] = None