mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-15 07:28:39 +00:00
feat: party aliases
(cherry picked from commit 5e16d41387)
# Conflicts:
# erpnext/buying/doctype/supplier/supplier.json
# erpnext/selling/doctype/customer/customer.json
This commit is contained in:
@@ -11,6 +11,11 @@
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"naming_series",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"supplier_name",
|
||||
"alias",
|
||||
>>>>>>> 5e16d41387 (feat: party aliases)
|
||||
"supplier_type",
|
||||
"supplier_name",
|
||||
"gender",
|
||||
@@ -509,6 +514,38 @@
|
||||
{
|
||||
"fieldname": "column_break_oxjw",
|
||||
"fieldtype": "Column Break"
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
},
|
||||
{
|
||||
"fieldname": "taxation_section",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Tax Identification"
|
||||
},
|
||||
{
|
||||
"fieldname": "invoice_settings_section",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "more_info_tab",
|
||||
"fieldtype": "Tab Break",
|
||||
"label": "More Info"
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_jqla",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_pgad",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "alias",
|
||||
"fieldtype": "Data",
|
||||
"in_global_search": 1,
|
||||
"label": "Alias",
|
||||
"unique": 1
|
||||
>>>>>>> 5e16d41387 (feat: party aliases)
|
||||
}
|
||||
],
|
||||
"grid_page_length": 50,
|
||||
@@ -522,7 +559,7 @@
|
||||
"link_fieldname": "party"
|
||||
}
|
||||
],
|
||||
"modified": "2026-05-29 16:52:59.441272",
|
||||
"modified": "2026-06-22 12:23:09.241125",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Buying",
|
||||
"name": "Supplier",
|
||||
@@ -582,7 +619,7 @@
|
||||
],
|
||||
"quick_entry": 1,
|
||||
"row_format": "Dynamic",
|
||||
"search_fields": "supplier_group",
|
||||
"search_fields": "supplier_group, alias",
|
||||
"show_name_in_global_search": 1,
|
||||
"sort_field": "creation",
|
||||
"sort_order": "ASC",
|
||||
|
||||
@@ -39,6 +39,7 @@ class Supplier(TransactionBase):
|
||||
from erpnext.utilities.doctype.portal_user.portal_user import PortalUser
|
||||
|
||||
accounts: DF.Table[PartyAccount]
|
||||
alias: DF.Data | None
|
||||
allow_purchase_invoice_creation_without_purchase_order: DF.Check
|
||||
allow_purchase_invoice_creation_without_purchase_receipt: DF.Check
|
||||
companies: DF.Table[AllowedToTransactWith]
|
||||
|
||||
@@ -12,6 +12,11 @@
|
||||
"field_order": [
|
||||
"basic_info",
|
||||
"naming_series",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"customer_name",
|
||||
"alias",
|
||||
>>>>>>> 5e16d41387 (feat: party aliases)
|
||||
"customer_type",
|
||||
"customer_name",
|
||||
"gender",
|
||||
@@ -633,7 +638,38 @@
|
||||
{
|
||||
"fieldname": "supplier_numbers_section",
|
||||
"fieldtype": "Section Break",
|
||||
<<<<<<< HEAD
|
||||
"label": "Supplier Numbers"
|
||||
=======
|
||||
"label": "Defaults"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_yvyu",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "default_accounts_column",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "supplier_numbers_column",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_nrvh",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "credit_limit_column",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "alias",
|
||||
"fieldtype": "Data",
|
||||
"in_global_search": 1,
|
||||
"label": "Alias",
|
||||
"unique": 1
|
||||
>>>>>>> 5e16d41387 (feat: party aliases)
|
||||
}
|
||||
],
|
||||
"icon": "fa fa-user",
|
||||
@@ -647,7 +683,7 @@
|
||||
"link_fieldname": "party"
|
||||
}
|
||||
],
|
||||
"modified": "2026-05-29 16:52:59.441272",
|
||||
"modified": "2026-06-22 12:23:19.196991",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Selling",
|
||||
"name": "Customer",
|
||||
@@ -726,7 +762,7 @@
|
||||
],
|
||||
"quick_entry": 1,
|
||||
"row_format": "Dynamic",
|
||||
"search_fields": "customer_group,territory, mobile_no,primary_address",
|
||||
"search_fields": "customer_group,territory, mobile_no,primary_address, alias",
|
||||
"show_name_in_global_search": 1,
|
||||
"sort_field": "creation",
|
||||
"sort_order": "DESC",
|
||||
|
||||
@@ -49,6 +49,7 @@ class Customer(TransactionBase):
|
||||
|
||||
account_manager: DF.Link | None
|
||||
accounts: DF.Table[PartyAccount]
|
||||
alias: DF.Data | None
|
||||
companies: DF.Table[AllowedToTransactWith]
|
||||
credit_limits: DF.Table[CustomerCreditLimit]
|
||||
customer_details: DF.Text | None
|
||||
|
||||
Reference in New Issue
Block a user