Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37190 from FHenry/dev_feat_adress_contact_postion

Browse Source 
feat: Customer and Supplier - Primary Address and Contact on the same column as new address and contact
This commit is contained in:
Deepesh Garg 2023-09-24 21:39:05 +05:30 committed by GitHub
commit 12e16aa95f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/buying/doctype/supplier/supplier.json
View File

@ -45,12 +45,13 @@
"column_break1", "column_break1",
"contact_html", "contact_html",
"primary_address_and_contact_detail_section", "primary_address_and_contact_detail_section",
"supplier_primary_contact",
"mobile_no",
"email_id",
"column_break_44", "column_break_44",
"supplier_primary_address", "supplier_primary_address",
"primary_address", "primary_address",
"column_break_mglr",
"supplier_primary_contact",
"mobile_no",
"email_id",
"accounting_tab", "accounting_tab",
"payment_terms", "payment_terms",
"default_accounts_section", "default_accounts_section",
@ -469,6 +470,10 @@
{ {
"fieldname": "column_break_1mqv", "fieldname": "column_break_1mqv",
"fieldtype": "Column Break" "fieldtype": "Column Break"
},
{
"fieldname": "column_break_mglr",
"fieldtype": "Column Break"
} }
], ],
"icon": "fa fa-user", "icon": "fa fa-user",
@ -481,7 +486,7 @@
"link_fieldname": "party" "link_fieldname": "party"
} }
], ],
"modified": "2023-06-26 14:20:00.961554", "modified": "2023-09-21 12:24:20.398889",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier", "name": "Supplier",

25
erpnext/selling/doctype/customer/customer.json
View File

@ -48,12 +48,13 @@
"column_break1", "column_break1",
"contact_html", "contact_html",
"primary_address_and_contact_detail", "primary_address_and_contact_detail",
"customer_primary_contact",
"mobile_no",
"email_id",
"column_break_26", "column_break_26",
"customer_primary_address", "customer_primary_address",
"primary_address", "primary_address",
"column_break_nwor",
"customer_primary_contact",
"mobile_no",
"email_id",
"tax_tab", "tax_tab",
"taxation_section", "taxation_section",
"tax_id", "tax_id",
@ -339,12 +340,12 @@
"label": "Default Accounts" "label": "Default Accounts"
}, },
{ {
"description": "Mention if non-standard Receivable account", "description": "Mention if non-standard Receivable account",
"fieldname": "accounts", "fieldname": "accounts",
"fieldtype": "Table", "fieldtype": "Table",
"label": "Accounts", "label": "Accounts",
"options": "Party Account" "options": "Party Account"
}, },
{ {
"fieldname": "credit_limit_section", "fieldname": "credit_limit_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
@ -568,6 +569,10 @@
"fieldtype": "Table", "fieldtype": "Table",
"label": "Customer Portal Users", "label": "Customer Portal Users",
"options": "Portal User" "options": "Portal User"
},
{
"fieldname": "column_break_nwor",
"fieldtype": "Column Break"
} }
], ],
"icon": "fa fa-user", "icon": "fa fa-user",
@ -581,7 +586,7 @@
"link_fieldname": "party" "link_fieldname": "party"
} }
], ],
"modified": "2023-06-22 13:21:10.678382", "modified": "2023-09-21 12:23:20.706020",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Customer", "name": "Customer",