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

feat: add dispatch address fields to purchase doctypes

Browse Source 
(cherry picked from commit 54b5205221)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
This commit is contained in:
Karm Soni
2025-04-09 19:19:47 +05:30
committed by Mergify
parent 3e733f6ba1
commit 5f101e7635
6 changed files with 93 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -144,8 +144,10 @@
"contact_email",
"company_shipping_address_section",
"shipping_address",
"column_break_126",
"shipping_address_display",
"column_break_126",
"dispatch_address",
"dispatch_address_display",
"company_billing_address_section",
"billing_address",
"column_break_130",
@@ -1627,13 +1629,37 @@
"fieldname": "update_outstanding_for_self",
"fieldtype": "Check",
"label": "Update Outstanding for Self"
<<<<<<< HEAD
=======
},
{
"fieldname": "sender",
"fieldtype": "Data",
"label": "Sender",
"options": "Email"
},
{
"fieldname": "dispatch_address_display",
"fieldtype": "Text Editor",
"label": "Dispatch Address",
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "dispatch_address",
"fieldtype": "Link",
"label": "Select Dispatch Address ",
"options": "Address",
"print_hide": 1
>>>>>>> 54b5205221 (feat: add dispatch address fields to purchase doctypes)
}
],
"grid_page_length": 50,
"icon": "fa fa-file-text",
"idx": 204,
"is_submittable": 1,
"links": [],
"modified": "2025-01-14 11:39:04.564610",
"modified": "2025-04-09 16:49:22.175081",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
@@ -1688,6 +1714,7 @@
"write": 1
}
],
"row_format": "Dynamic",
"search_fields": "posting_date, supplier, bill_no, base_grand_total, outstanding_amount",
"show_name_in_global_search": 1,
"sort_field": "modified",

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -117,6 +117,8 @@ class PurchaseInvoice(BuyingController):
currency: DF.Link | None
disable_rounded_total: DF.Check
discount_amount: DF.Currency
dispatch_address: DF.Link | None
dispatch_address_display: DF.TextEditor | None
due_date: DF.Date | None
from_date: DF.Date | None
grand_total: DF.Currency

39
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@@ -110,8 +110,10 @@
"contact_email",
"shipping_address_section",
"shipping_address",
"column_break_99",
"shipping_address_display",
"column_break_99",
"dispatch_address",
"dispatch_address_display",
"company_billing_address_section",
"billing_address",
"column_break_103",
@@ -1269,13 +1271,47 @@
"fieldtype": "Tab Break",
"label": "Connections",
"show_dashboard": 1
<<<<<<< HEAD
=======
},
{
"fieldname": "advance_payment_status",
"fieldtype": "Select",
"hidden": 1,
"in_standard_filter": 1,
"label": "Advance Payment Status",
"no_copy": 1,
"oldfieldname": "status",
"oldfieldtype": "Select",
"options": "Not Initiated\nInitiated\nPartially Paid\nFully Paid",
"print_hide": 1
},
{
"fieldname": "dispatch_address",
"fieldtype": "Link",
"label": "Dispatch Address",
"options": "Address",
"print_hide": 1
},
{
"fieldname": "dispatch_address_display",
"fieldtype": "Text Editor",
"label": "Dispatch Address Details",
"print_hide": 1,
"read_only": 1
>>>>>>> 54b5205221 (feat: add dispatch address fields to purchase doctypes)
}
],
"grid_page_length": 50,
"icon": "fa fa-file-text",
"idx": 105,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2024-03-20 16:03:31.611808",
=======
"modified": "2025-04-09 16:54:08.836106",
>>>>>>> 54b5205221 (feat: add dispatch address fields to purchase doctypes)
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
@@ -1322,6 +1358,7 @@
"write": 1
}
],
"row_format": "Dynamic",
"search_fields": "status, transaction_date, supplier, grand_total",
"show_name_in_global_search": 1,
"sort_field": "modified",

2
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -92,6 +92,8 @@ class PurchaseOrder(BuyingController):
customer_name: DF.Data | None
disable_rounded_total: DF.Check
discount_amount: DF.Currency
dispatch_address: DF.Link | None
dispatch_address_display: DF.TextEditor | None
from_date: DF.Date | None
grand_total: DF.Currency
group_same_items: DF.Check

22
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@@ -113,8 +113,10 @@
"contact_email",
"section_break_98",
"shipping_address",
"column_break_100",
"shipping_address_display",
"column_break_100",
"dispatch_address",
"dispatch_address_display",
"billing_address_section",
"billing_address",
"column_break_104",
@@ -1267,13 +1269,28 @@
"no_copy": 1,
"print_hide": 1,
"read_only": 1
},
{
"fieldname": "dispatch_address",
"fieldtype": "Link",
"label": "Dispatch Address Template",
"options": "Address",
"print_hide": 1
},
{
"fieldname": "dispatch_address_display",
"fieldtype": "Text Editor",
"label": "Dispatch Address",
"print_hide": 1,
"read_only": 1
}
],
"grid_page_length": 50,
"icon": "fa fa-truck",
"idx": 261,
"is_submittable": 1,
"links": [],
"modified": "2024-11-13 16:55:14.129055",
"modified": "2025-04-09 16:52:19.323878",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
@@ -1334,6 +1351,7 @@
"write": 1
}
],
"row_format": "Dynamic",
"search_fields": "status, posting_date, supplier",
"show_name_in_global_search": 1,
"sort_field": "modified",

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -69,6 +69,8 @@ class PurchaseReceipt(BuyingController):
currency: DF.Link
disable_rounded_total: DF.Check
discount_amount: DF.Currency
dispatch_address: DF.Link | None
dispatch_address_display: DF.TextEditor | None
grand_total: DF.Currency
group_same_items: DF.Check
ignore_pricing_rule: DF.Check