nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-16 16:08:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
diptanilsaha
2026-06-20 20:06:09 +05:30
parent bf58393fda
commit e605675e11
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/report/utils.py
View File

@@ -146,17 +146,7 @@ def get_appropriate_company(filters):
return company
<<<<<<< HEAD
@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: 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
sales_invoice = sales_invoice or frappe.form_dict.get("sales_invoice")