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

feat: add difference_posting_date field

Browse Source 
(cherry picked from commit 225e56cbca)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
#	erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
This commit is contained in:
rs-rethik
2024-12-20 12:07:20 +05:30
committed by Mergify
parent 497029f958
commit bec1f972b3
4 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
View File

@@ -14,7 +14,8 @@
"advance_amount", "advance_amount",
"allocated_amount", "allocated_amount",
"exchange_gain_loss", "exchange_gain_loss",
"ref_exchange_rate" "ref_exchange_rate",
"difference_posting_date"
], ],
"fields": [ "fields": [
{ {
@@ -30,7 +31,7 @@
"width": "180px" "width": "180px"
}, },
{ {
"columns": 3, "columns": 2,
"fieldname": "reference_name", "fieldname": "reference_name",
"fieldtype": "Dynamic Link", "fieldtype": "Dynamic Link",
"in_list_view": 1, "in_list_view": 1,
@@ -40,7 +41,7 @@
"read_only": 1 "read_only": 1
}, },
{ {
"columns": 3, "columns": 2,
"fieldname": "remarks", "fieldname": "remarks",
"fieldtype": "Text", "fieldtype": "Text",
"in_list_view": 1, "in_list_view": 1,
@@ -111,13 +112,24 @@
"label": "Reference Exchange Rate", "label": "Reference Exchange Rate",
"non_negative": 1, "non_negative": 1,
"read_only": 1 "read_only": 1
},
{
"columns": 2,
"fieldname": "difference_posting_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Difference Posting Date"
} }
], ],
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-06-23 21:13:18.013816", "modified": "2023-06-23 21:13:18.013816",
=======
"modified": "2024-12-20 12:04:46.729972",
>>>>>>> 225e56cbca (feat: add difference_posting_date field)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Advance", "name": "Purchase Invoice Advance",

1
erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.py
View File

@@ -16,6 +16,7 @@ class PurchaseInvoiceAdvance(Document):
advance_amount: DF.Currency advance_amount: DF.Currency
allocated_amount: DF.Currency allocated_amount: DF.Currency
difference_posting_date: DF.Date | None
exchange_gain_loss: DF.Currency exchange_gain_loss: DF.Currency
parent: DF.Data parent: DF.Data
parentfield: DF.Data parentfield: DF.Data

18
erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
View File

@@ -14,7 +14,8 @@
"advance_amount", "advance_amount",
"allocated_amount", "allocated_amount",
"exchange_gain_loss", "exchange_gain_loss",
"ref_exchange_rate" "ref_exchange_rate",
"difference_posting_date"
], ],
"fields": [ "fields": [
{ {
@@ -30,7 +31,7 @@
"width": "250px" "width": "250px"
}, },
{ {
"columns": 3, "columns": 2,
"fieldname": "reference_name", "fieldname": "reference_name",
"fieldtype": "Dynamic Link", "fieldtype": "Dynamic Link",
"in_list_view": 1, "in_list_view": 1,
@@ -41,7 +42,7 @@
"read_only": 1 "read_only": 1
}, },
{ {
"columns": 3, "columns": 2,
"fieldname": "remarks", "fieldname": "remarks",
"fieldtype": "Text", "fieldtype": "Text",
"in_list_view": 1, "in_list_view": 1,
@@ -112,13 +113,24 @@
"label": "Reference Exchange Rate", "label": "Reference Exchange Rate",
"non_negative": 1, "non_negative": 1,
"read_only": 1 "read_only": 1
},
{
"columns": 2,
"fieldname": "difference_posting_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Difference Posting Date"
} }
], ],
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-06-23 21:12:57.557731", "modified": "2023-06-23 21:12:57.557731",
=======
"modified": "2024-12-20 11:58:28.962370",
>>>>>>> 225e56cbca (feat: add difference_posting_date field)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Advance", "name": "Sales Invoice Advance",

1
erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.py
View File

@@ -16,6 +16,7 @@ class SalesInvoiceAdvance(Document):
advance_amount: DF.Currency advance_amount: DF.Currency
allocated_amount: DF.Currency allocated_amount: DF.Currency
difference_posting_date: DF.Date | None
exchange_gain_loss: DF.Currency exchange_gain_loss: DF.Currency
parent: DF.Data parent: DF.Data
parentfield: DF.Data parentfield: DF.Data