erpnext

mirror of https://github.com/frappe/erpnext.git synced 2026-08-25 13:03:02 +00:00

Files

mergify[bot] 26db582499 fix: add company field on POS Invoice Merge Log (backport #48357 ) (#48414 )

* fix: add company field on POS Invoice Merge Log

(cherry picked from commit 109658731b)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json

* fix: patch for updating company name on existing pos merge log records

(cherry picked from commit d46b68230c)

# Conflicts:
#	erpnext/patches.txt

* fix: pass company on create_merge_logs

(cherry picked from commit b4b473185f)

* test: test company fetching from POS Closing Entry

(cherry picked from commit 9548f341bf)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py

* chore: remove conflicts

---------

Co-authored-by: Kavin <78342682+kavin0411@users.noreply.github.com>
Co-authored-by: diptanilsaha <diptanil@frappe.io>

2025-07-06 15:25:59 +05:30

v4_2

style: format code with black

2022-03-28 18:52:46 +05:30

v5_7

style: format code with black

2022-03-28 18:52:46 +05:30

v8_1

style: format code with black

2022-03-28 18:52:46 +05:30

v10_0

refactor(treewide): formatting and ruff fixes, + manually enabled F401