nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 07:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflct in test purchase receipt

Browse Source
This commit is contained in:
rohitwaghchaure
2022-10-12 16:26:52 +05:30
committed by GitHub
parent cb7aef505d
commit 6ae2f90683
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
View File

@@ -2,14 +2,9 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
<<<<<<< HEAD
import json import json
import unittest import unittest
from collections import defaultdict from collections import defaultdict
=======
from cmath import pi
from turtle import update
>>>>>>> 683a47f7a1 (fix: consider sales rate as incoming rate for transit warehouse in purchase flow)
import frappe import frappe
from frappe.tests.utils import FrappeTestCase, change_settings from frappe.tests.utils import FrappeTestCase, change_settings