From 4ca1f3b9cf69b00a80499b5d7d59a36a00521bf6 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 9 Aug 2023 15:36:28 +0530 Subject: [PATCH 1/2] fix: Make default sales update frequency as monthly instead of each transaction (cherry picked from commit 32863b492242dc0a761eb70b3e21663e78777aa6) # Conflicts: # erpnext/selling/doctype/selling_settings/selling_settings.json --- .../selling/doctype/selling_settings/selling_settings.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 45ad7d95a15..1152d41e87b 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -84,7 +84,7 @@ "fieldname": "sales_update_frequency", "fieldtype": "Select", "label": "Sales Update Frequency in Company and Project", - "options": "Each Transaction\nDaily\nMonthly", + "options": "Monthly\nEach Transaction\nDaily", "reqd": 1 }, { @@ -193,7 +193,11 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], +<<<<<<< HEAD "modified": "2023-03-03 11:16:54.333615", +======= + "modified": "2023-08-09 15:35:42.914354", +>>>>>>> 32863b4922 (fix: Make default sales update frequency as monthly instead of each transaction) "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings", From a3032910a74a6c13a539d5baca83a5a38e93d8f6 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sun, 13 Aug 2023 11:37:40 +0530 Subject: [PATCH 2/2] chore: resolve conflicts --- .../selling/doctype/selling_settings/selling_settings.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 1152d41e87b..af148c51fb9 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -193,11 +193,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-03-03 11:16:54.333615", -======= "modified": "2023-08-09 15:35:42.914354", ->>>>>>> 32863b4922 (fix: Make default sales update frequency as monthly instead of each transaction) "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings", @@ -226,4 +222,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +}