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

fix: add company field on POS Invoice Merge Log

Browse Source
This commit is contained in:
Kavin
2025-07-05 13:34:11 +05:30
parent 072518ed96
commit 109658731b
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
View File

@@ -5,6 +5,7 @@
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"company",
"posting_date", "posting_date",
"posting_time", "posting_time",
"merge_invoices_based_on", "merge_invoices_based_on",
@@ -113,12 +114,22 @@
"label": "Posting Time", "label": "Posting Time",
"no_copy": 1, "no_copy": 1,
"reqd": 1 "reqd": 1
},
{
"fieldname": "company",
"fieldtype": "Link",
"in_standard_filter": 1,
"label": "Company",
"options": "Company",
"print_hide": 1,
"remember_last_selected_value": 1,
"reqd": 1
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2024-03-27 13:10:15.620564", "modified": "2025-07-02 17:08:04.747202",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Invoice Merge Log", "name": "POS Invoice Merge Log",
@@ -179,8 +190,9 @@
"write": 1 "write": 1
} }
], ],
"row_format": "Dynamic",
"sort_field": "creation", "sort_field": "creation",
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }

5
erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
View File

@@ -29,11 +29,10 @@ class POSInvoiceMergeLog(Document):
if TYPE_CHECKING: if TYPE_CHECKING:
from frappe.types import DF from frappe.types import DF
from erpnext.accounts.doctype.pos_invoice_reference.pos_invoice_reference import ( from erpnext.accounts.doctype.pos_invoice_reference.pos_invoice_reference import POSInvoiceReference
POSInvoiceReference,
)
amended_from: DF.Link | None amended_from: DF.Link | None
company: DF.Link
consolidated_credit_note: DF.Link | None consolidated_credit_note: DF.Link | None
consolidated_invoice: DF.Link | None consolidated_invoice: DF.Link | None
customer: DF.Link customer: DF.Link