Merge pull request #30724 from deepeshgarg007/erpnext_changes
fix: Consistent customer and supplier forms
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index a57d9a9..e0ee658 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -18,16 +18,16 @@
"tax_id",
"tax_category",
"tax_withholding_category",
- "is_transporter",
- "is_internal_supplier",
- "represents_company",
"image",
"column_break0",
"supplier_group",
"supplier_type",
"allow_purchase_invoice_creation_without_purchase_order",
"allow_purchase_invoice_creation_without_purchase_receipt",
+ "is_internal_supplier",
+ "represents_company",
"disabled",
+ "is_transporter",
"warn_rfqs",
"warn_pos",
"prevent_rfqs",
@@ -38,12 +38,6 @@
"default_currency",
"column_break_10",
"default_price_list",
- "section_credit_limit",
- "payment_terms",
- "cb_21",
- "on_hold",
- "hold_type",
- "release_date",
"address_contacts",
"address_html",
"column_break1",
@@ -57,6 +51,12 @@
"primary_address",
"default_payable_accounts",
"accounts",
+ "section_credit_limit",
+ "payment_terms",
+ "cb_21",
+ "on_hold",
+ "hold_type",
+ "release_date",
"default_tax_withholding_config",
"column_break2",
"website",
@@ -258,7 +258,7 @@
"collapsible": 1,
"fieldname": "section_credit_limit",
"fieldtype": "Section Break",
- "label": "Credit Limit"
+ "label": "Payment Terms"
},
{
"fieldname": "payment_terms",
@@ -432,7 +432,7 @@
"link_fieldname": "party"
}
],
- "modified": "2021-10-20 22:03:33.147249",
+ "modified": "2022-04-16 18:02:27.838623",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",
@@ -497,6 +497,7 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "ASC",
+ "states": [],
"title_field": "supplier_name",
"track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 1c009d3..fe0a89a 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -59,6 +59,7 @@
"Warehouse",
"Item Group",
"Customer Group",
+ "Supplier Group",
"Sales Person",
"Territory",
"Assessment Group",
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index ae40630..7cba141 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -15,23 +15,23 @@
"salutation",
"customer_name",
"gender",
- "customer_type",
- "tax_withholding_category",
"default_bank_account",
+ "tax_id",
+ "tax_category",
+ "tax_withholding_category",
"lead_name",
"opportunity_name",
"image",
"column_break0",
- "account_manager",
"customer_group",
+ "customer_type",
"territory",
- "tax_id",
- "tax_category",
+ "account_manager",
"so_required",
"dn_required",
- "disabled",
"is_internal_customer",
"represents_company",
+ "disabled",
"allowed_to_transact_section",
"companies",
"currency_and_price_list",
@@ -40,7 +40,6 @@
"default_price_list",
"address_contacts",
"address_html",
- "website",
"column_break1",
"contact_html",
"primary_address_and_contact_detail",
@@ -60,6 +59,7 @@
"column_break_45",
"market_segment",
"industry",
+ "website",
"language",
"is_frozen",
"column_break_38",
@@ -100,7 +100,7 @@
"fieldname": "customer_name",
"fieldtype": "Data",
"in_global_search": 1,
- "label": "Full Name",
+ "label": "Customer Name",
"no_copy": 1,
"oldfieldname": "customer_name",
"oldfieldtype": "Data",
@@ -118,7 +118,7 @@
"default": "Company",
"fieldname": "customer_type",
"fieldtype": "Select",
- "label": "Type",
+ "label": "Customer Type",
"oldfieldname": "customer_type",
"oldfieldtype": "Select",
"options": "Company\nIndividual",
@@ -337,7 +337,7 @@
"collapsible": 1,
"fieldname": "default_receivable_accounts",
"fieldtype": "Section Break",
- "label": "Accounting"
+ "label": "Default Receivable Accounts"
},
{
"description": "Mention if non-standard receivable account",
@@ -511,7 +511,7 @@
"link_fieldname": "party"
}
],
- "modified": "2021-10-20 22:07:52.485809",
+ "modified": "2022-04-16 20:32:34.000304",
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer",
@@ -595,6 +595,7 @@
"show_name_in_global_search": 1,
"sort_field": "modified",
"sort_order": "ASC",
+ "states": [],
"title_field": "customer_name",
"track_changes": 1
}
\ No newline at end of file