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

fix: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2021-11-01 14:40:19 +05:30
committed by GitHub
parent f88c24155c
commit 134ea9214e
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,9 +332,6 @@ class TestPurchaseReceipt(ERPNextTestCase):
pr1.submit() pr1.submit()
self.assertRaises(frappe.ValidationError, pr2.submit) self.assertRaises(frappe.ValidationError, pr2.submit)
<<<<<<< HEAD
frappe.db.rollback()
=======
pr1.cancel() pr1.cancel()
se.cancel() se.cancel()
@@ -350,7 +347,6 @@ class TestPurchaseReceipt(ERPNextTestCase):
po.load_from_db() po.load_from_db()
po.cancel() po.cancel()
>>>>>>> 2a14f255cf (fix: COGS account in purchase receipt)
def test_serial_no_supplier(self): def test_serial_no_supplier(self):
pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=1) pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=1)
@@ -1073,7 +1069,6 @@ class TestPurchaseReceipt(ERPNextTestCase):
frappe.db.set_value('Company', company, 'enable_perpetual_inventory_for_non_stock_items', before_test_value) frappe.db.set_value('Company', company, 'enable_perpetual_inventory_for_non_stock_items', before_test_value)
<<<<<<< HEAD
def test_payment_terms_are_fetched_when_creating_purchase_invoice(self): def test_payment_terms_are_fetched_when_creating_purchase_invoice(self):
from erpnext.accounts.doctype.payment_entry.test_payment_entry import ( from erpnext.accounts.doctype.payment_entry.test_payment_entry import (
create_payment_terms_template, create_payment_terms_template,
@@ -1089,22 +1084,7 @@ class TestPurchaseReceipt(ERPNextTestCase):
) )
automatically_fetch_payment_terms() automatically_fetch_payment_terms()
=======
def test_purchase_receipt_with_exchange_rate_difference(self):
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice as create_purchase_invoice
from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import make_purchase_receipt as create_purchase_receipt
pi = create_purchase_invoice(company="_Test Company with perpetual inventory",
cost_center = "Main - TCP1",
warehouse = "Stores - TCP1",
expense_account ="_Test Account Cost for Goods Sold - TCP1",
currency = "USD", conversion_rate = 70)
pr = create_purchase_receipt(pi.name)
pr.conversion_rate = 80
pr.items[0].purchase_invoice = pi.name
pr.items[0].purchase_invoice_item = pi.items[0].name
>>>>>>> 2a14f255cf (fix: COGS account in purchase receipt)
po = create_purchase_order(qty=10, rate=100, do_not_save=1) po = create_purchase_order(qty=10, rate=100, do_not_save=1)
create_payment_terms_template() create_payment_terms_template()