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

chore: resolve conflicts

Browse Source
This commit is contained in:
diptanilsaha
2026-08-07 15:16:29 +05:30
parent 9876d48f28
commit 24f02493e4
2 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/journal_entry/test_journal_entry.py
View File

@@ -5,12 +5,8 @@
import unittest import unittest
import frappe import frappe
<<<<<<< HEAD
from frappe.tests.utils import change_settings from frappe.tests.utils import change_settings
from frappe.utils import flt, nowdate
=======
from frappe.utils import add_days, flt, nowdate from frappe.utils import add_days, flt, nowdate
>>>>>>> 0bb0f6d689 (test(journal_entry): added test cases for blocked purchase invoices)
from erpnext.accounts.doctype.account.test_account import get_inventory_account from erpnext.accounts.doctype.account.test_account import get_inventory_account
from erpnext.accounts.doctype.journal_entry.journal_entry import StockAccountInvalidTransaction from erpnext.accounts.doctype.journal_entry.journal_entry import StockAccountInvalidTransaction

25
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -2117,31 +2117,6 @@ def make_stock_entry(source_name, target_doc=None):
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def change_release_date(name, release_date=None):
if frappe.db.exists("Purchase Invoice", name):
pi = frappe.get_doc("Purchase Invoice", name)
pi.check_permission()
pi.db_set("release_date", release_date)
@frappe.whitelist()
def unblock_invoice(name):
if frappe.db.exists("Purchase Invoice", name):
pi = frappe.get_doc("Purchase Invoice", name)
pi.unblock_invoice()
@frappe.whitelist()
def block_invoice(name, release_date, hold_comment=None):
if frappe.db.exists("Purchase Invoice", name):
pi = frappe.get_doc("Purchase Invoice", name)
pi.block_invoice(hold_comment, release_date)
@frappe.whitelist()
=======
>>>>>>> c8125b8b5a (refactor(purchase_invoice): expose invoice hold actions as document methods)
def make_inter_company_sales_invoice(source_name, target_doc=None): def make_inter_company_sales_invoice(source_name, target_doc=None):
from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_inter_company_transaction from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_inter_company_transaction