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

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-11-13 19:49:07 +05:30
committed by GitHub
parent 09ef8eeaea
commit 1ee5c2ff87
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@@ -3,14 +3,9 @@
import frappe import frappe
<<<<<<< HEAD
from frappe import _, scrub
from frappe.utils import cint, flt
=======
from frappe import _, qb, scrub from frappe import _, qb, scrub
from frappe.query_builder import Order from frappe.query_builder import Order
from frappe.utils import cint, flt, formatdate 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.controllers.queries import get_match_cond
from erpnext.stock.utils import get_incoming_rate from erpnext.stock.utils import get_incoming_rate