nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-21 10:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Conflicts

Browse Source
This commit is contained in:
marination
2025-05-13 14:26:54 +02:00
parent a8b982dd0a
commit 9cede83de1
4 changed files with 2546 additions and 2569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -9,12 +9,8 @@ from frappe.core.doctype.user_permission.test_user_permission import create_user
from frappe.tests.utils import FrappeTestCase, change_settings from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import add_days, flt, getdate, nowdate, today from frappe.utils import add_days, flt, getdate, nowdate, today
<<<<<<< HEAD
from erpnext.accounts.test.accounts_mixin import AccountsTestMixin from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
from erpnext.controllers.accounts_controller import update_child_qty_rate
=======
from erpnext.controllers.accounts_controller import InvalidQtyError, update_child_qty_rate from erpnext.controllers.accounts_controller import InvalidQtyError, update_child_qty_rate
>>>>>>> b2d8a44199 (test: Add, expand and refine test-cases for zero-quantity transactions.)
from erpnext.maintenance.doctype.maintenance_schedule.test_maintenance_schedule import ( from erpnext.maintenance.doctype.maintenance_schedule.test_maintenance_schedule import (
make_maintenance_schedule, make_maintenance_schedule,
) )

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

@@ -10,11 +10,8 @@ import erpnext
import erpnext.controllers import erpnext.controllers
import erpnext.controllers.status_updater import erpnext.controllers.status_updater
from erpnext.accounts.doctype.account.test_account import get_inventory_account from erpnext.accounts.doctype.account.test_account import get_inventory_account
<<<<<<< HEAD
from erpnext.buying.doctype.supplier.test_supplier import create_supplier from erpnext.buying.doctype.supplier.test_supplier import create_supplier
=======
from erpnext.controllers.accounts_controller import InvalidQtyError from erpnext.controllers.accounts_controller import InvalidQtyError
>>>>>>> b2d8a44199 (test: Add, expand and refine test-cases for zero-quantity transactions.)
from erpnext.controllers.buying_controller import QtyMismatchError from erpnext.controllers.buying_controller import QtyMismatchError
from erpnext.stock import get_warehouse_account_map from erpnext.stock import get_warehouse_account_map
from erpnext.stock.doctype.item.test_item import create_item, make_item from erpnext.stock.doctype.item.test_item import create_item, make_item
@@ -3384,7 +3381,6 @@ class TestPurchaseReceipt(FrappeTestCase):
self.assertEqual(pr.status, "Completed") self.assertEqual(pr.status, "Completed")
def test_internal_transfer_for_batch_items_with_cancel(self): def test_internal_transfer_for_batch_items_with_cancel(self):
from erpnext.controllers.sales_and_purchase_return import make_return_doc
from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
@@ -3500,7 +3496,6 @@ class TestPurchaseReceipt(FrappeTestCase):
frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1) frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
def test_internal_transfer_for_batch_items_with_cancel_use_serial_batch_fields(self): def test_internal_transfer_for_batch_items_with_cancel_use_serial_batch_fields(self):
from erpnext.controllers.sales_and_purchase_return import make_return_doc
from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
@@ -4082,7 +4077,6 @@ class TestPurchaseReceipt(FrappeTestCase):
make_purchase_receipt as _make_purchase_receipt, make_purchase_receipt as _make_purchase_receipt,
) )
from erpnext.buying.doctype.purchase_order.test_purchase_order import ( from erpnext.buying.doctype.purchase_order.test_purchase_order import (
create_pr_against_po,
create_purchase_order, create_purchase_order,
) )

7
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -23,14 +23,7 @@ from frappe.utils import (
import erpnext import erpnext
from erpnext.accounts.general_ledger import process_gl_map from erpnext.accounts.general_ledger import process_gl_map
<<<<<<< HEAD
<<<<<<< HEAD
from erpnext.buying.utils import check_on_hold_or_closed_status from erpnext.buying.utils import check_on_hold_or_closed_status
=======
from erpnext.controllers.accounts_controller import InvalidQtyError
>>>>>>> b2d8a44199 (test: Add, expand and refine test-cases for zero-quantity transactions.)
=======
>>>>>>> 4918aeb4c6 (refactor: Consolidate duplicate zero-quantity transaction Items checks.)
from erpnext.controllers.taxes_and_totals import init_landed_taxes_and_totals from erpnext.controllers.taxes_and_totals import init_landed_taxes_and_totals
from erpnext.manufacturing.doctype.bom.bom import ( from erpnext.manufacturing.doctype.bom.bom import (
add_additional_cost, add_additional_cost,

5098
erpnext/translations/tr.csv
View File

File diff suppressed because it is too large Load Diff