From 1ee5c2ff87a3569c565a55127828a4d7ad5cf4f3 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sun, 13 Nov 2022 19:49:07 +0530 Subject: [PATCH] chore: Resolve conflicts --- erpnext/accounts/report/gross_profit/gross_profit.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index 2890ba929d1..3c0c8bcb19a 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/erpnext/accounts/report/gross_profit/gross_profit.py @@ -3,14 +3,9 @@ import frappe -<<<<<<< HEAD -from frappe import _, scrub -from frappe.utils import cint, flt -======= from frappe import _, qb, scrub from frappe.query_builder import Order from frappe.utils import cint, flt, formatdate ->>>>>>> e4d16c31da (fix: GP incorrect buying amount if no upd on SI and Delivery Note) from erpnext.controllers.queries import get_match_cond from erpnext.stock.utils import get_incoming_rate