mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-13 14:41:53 +00:00
fix(report_utils): remove unnecessary whitelist decorator on get_invoiced_item_gross_margin
(cherry picked from commit e29535f29c)
# Conflicts:
# erpnext/accounts/report/utils.py
This commit is contained in:
@@ -146,8 +146,17 @@ def get_appropriate_company(filters):
|
|||||||
return company
|
return company
|
||||||
|
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def get_invoiced_item_gross_margin(sales_invoice=None, item_code=None, company=None, with_item_data=False):
|
def get_invoiced_item_gross_margin(sales_invoice=None, item_code=None, company=None, with_item_data=False):
|
||||||
|
=======
|
||||||
|
def get_invoiced_item_gross_margin(
|
||||||
|
sales_invoice: str | None = None,
|
||||||
|
item_code: str | None = None,
|
||||||
|
company: str | None = None,
|
||||||
|
with_item_data: bool = False,
|
||||||
|
):
|
||||||
|
>>>>>>> e29535f29c (fix(report_utils): remove unnecessary whitelist decorator on `get_invoiced_item_gross_margin`)
|
||||||
from erpnext.accounts.report.gross_profit.gross_profit import GrossProfitGenerator
|
from erpnext.accounts.report.gross_profit.gross_profit import GrossProfitGenerator
|
||||||
|
|
||||||
sales_invoice = sales_invoice or frappe.form_dict.get("sales_invoice")
|
sales_invoice = sales_invoice or frappe.form_dict.get("sales_invoice")
|
||||||
|
|||||||
Reference in New Issue
Block a user