From 24f02493e434e12d9b4aa6c8f4adfc39882cbf1d Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Fri, 7 Aug 2026 15:16:29 +0530 Subject: [PATCH] chore: resolve conflicts --- .../journal_entry/test_journal_entry.py | 4 --- .../purchase_invoice/purchase_invoice.py | 25 ------------------- 2 files changed, 29 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py index 6ddd24d00f0..62e74d02033 100644 --- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py @@ -5,12 +5,8 @@ import unittest import frappe -<<<<<<< HEAD from frappe.tests.utils import change_settings -from frappe.utils import 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.journal_entry.journal_entry import StockAccountInvalidTransaction diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 405193e1c86..afc08c0e4d6 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -2117,31 +2117,6 @@ def make_stock_entry(source_name, target_doc=None): @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): from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_inter_company_transaction