mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-14 15:57:41 +00:00
feat(Dunning): separate tab "Address & Contact" (#44363)
(cherry picked from commit e094473c65)
# Conflicts:
# erpnext/accounts/doctype/dunning/dunning.json
This commit is contained in:
@@ -19,16 +19,6 @@
|
|||||||
"currency",
|
"currency",
|
||||||
"column_break_11",
|
"column_break_11",
|
||||||
"conversion_rate",
|
"conversion_rate",
|
||||||
"address_and_contact_section",
|
|
||||||
"customer_address",
|
|
||||||
"address_display",
|
|
||||||
"contact_person",
|
|
||||||
"contact_display",
|
|
||||||
"column_break_16",
|
|
||||||
"company_address",
|
|
||||||
"company_address_display",
|
|
||||||
"contact_mobile",
|
|
||||||
"contact_email",
|
|
||||||
"section_break_6",
|
"section_break_6",
|
||||||
"dunning_type",
|
"dunning_type",
|
||||||
"column_break_8",
|
"column_break_8",
|
||||||
@@ -56,7 +46,21 @@
|
|||||||
"income_account",
|
"income_account",
|
||||||
"column_break_48",
|
"column_break_48",
|
||||||
"cost_center",
|
"cost_center",
|
||||||
"amended_from"
|
"amended_from",
|
||||||
|
"address_and_contact_tab",
|
||||||
|
"address_and_contact_section",
|
||||||
|
"customer_address",
|
||||||
|
"address_display",
|
||||||
|
"column_break_vodj",
|
||||||
|
"contact_person",
|
||||||
|
"contact_display",
|
||||||
|
"contact_mobile",
|
||||||
|
"contact_email",
|
||||||
|
"section_break_xban",
|
||||||
|
"column_break_16",
|
||||||
|
"company_address",
|
||||||
|
"company_address_display",
|
||||||
|
"column_break_lqmf"
|
||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
@@ -178,10 +182,8 @@
|
|||||||
"label": "Rate of Interest (%) Yearly"
|
"label": "Rate of Interest (%) Yearly"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"collapsible": 1,
|
|
||||||
"fieldname": "address_and_contact_section",
|
"fieldname": "address_and_contact_section",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break"
|
||||||
"label": "Address and Contact"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "address_display",
|
"fieldname": "address_display",
|
||||||
@@ -377,11 +379,32 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "column_break_48",
|
"fieldname": "column_break_48",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "address_and_contact_tab",
|
||||||
|
"fieldtype": "Tab Break",
|
||||||
|
"label": "Address & Contact"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_vodj",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "section_break_xban",
|
||||||
|
"fieldtype": "Section Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_lqmf",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2023-06-15 15:46:53.865712",
|
"modified": "2023-06-15 15:46:53.865712",
|
||||||
|
=======
|
||||||
|
"modified": "2024-11-26 13:46:07.760867",
|
||||||
|
>>>>>>> e094473c65 (feat(Dunning): separate tab "Address & Contact" (#44363))
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Dunning",
|
"name": "Dunning",
|
||||||
|
|||||||
Reference in New Issue
Block a user