gnucash stable: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e8d2d8dc (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8b94e9a4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d326cca0 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b5399e00 (commit)



commit e8d2d8dc6662952ab7f2fc355b69ed680146944d
Merge: 8b94e9a440 d326cca065
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Thu Jul 6 08:45:24 2023 +0800

    Merge branch 'bug798998' into stable #3701


commit 8b94e9a440638703b7a34f7eb763ad736dad4077
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Thu Jul 6 08:44:13 2023 +0800

    SCM must never be NULL
    
    It is assigned later on; nevertheless must never be NULL. It could be
    SCM_EOL.

diff --git a/gnucash/gnome/dialog-report-style-sheet.cpp b/gnucash/gnome/dialog-report-style-sheet.cpp
index a0d8f97d75..135228bc91 100644
--- a/gnucash/gnome/dialog-report-style-sheet.cpp
+++ b/gnucash/gnome/dialog-report-style-sheet.cpp
@@ -87,9 +87,8 @@ static void
 dirty_same_stylesheet (gpointer key, gpointer val, gpointer data)
 {
     auto dirty_ss{static_cast<SCM>(data)};
-    SCM rep_ss = NULL;
     auto report{static_cast<SCM>(val)};
-    SCM func = NULL;
+    SCM func, rep_ss;
 
     func = scm_c_eval_string ("gnc:report-stylesheet");
     if (scm_is_procedure (func))
@@ -378,7 +377,7 @@ gnc_style_sheet_select_dialog_edit_cb (GtkWidget *widget, gpointer user_data)
         ss_info             * ssinfo;
         gchar               * name;
 
-        SCM                 sheet_info = NULL;
+        SCM                 sheet_info;
 
         gtk_tree_model_get (model, &iter,
                             COLUMN_NAME, &name,
@@ -408,7 +407,7 @@ gnc_style_sheet_select_dialog_delete_cb (GtkWidget *widget, gpointer user_data)
     {
         ss_info           * ssinfo;
 
-        SCM                 sheet_info = NULL;
+        SCM                 sheet_info;
         SCM                 remover;
 
         gtk_tree_model_get (model, &iter,

commit d326cca0653d1934b5ab96784d401f607e1faac0
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Jul 5 13:24:21 2023 +0800

    Bug 798998 - Job Report Not Working
    
    GncOptions add support fo GncOptionUIType::JOB

diff --git a/gnucash/gnome/business-options-gnome.cpp b/gnucash/gnome/business-options-gnome.cpp
index f9c96d00b1..3f19e7787b 100644
--- a/gnucash/gnome/business-options-gnome.cpp
+++ b/gnucash/gnome/business-options-gnome.cpp
@@ -54,6 +54,8 @@ ui_type_to_owner_type(GncOptionUIType ui_type)
         return GNC_OWNER_VENDOR;
     if (ui_type == GncOptionUIType::EMPLOYEE)
         return GNC_OWNER_EMPLOYEE;
+    if (ui_type == GncOptionUIType::JOB)
+        return GNC_OWNER_JOB;
 
     std::ostringstream oss;
     oss << "UI type " << static_cast<unsigned int>(ui_type) << " could not be converted to owner type\n";
@@ -239,6 +241,8 @@ gnc_business_options_gnome_initialize(void)
                                  create_option_widget<GncOptionUIType::OWNER>);
     GncOptionUIFactory::set_func(GncOptionUIType::EMPLOYEE,
                                  create_option_widget<GncOptionUIType::OWNER>);
+    GncOptionUIFactory::set_func(GncOptionUIType::JOB,
+                                 create_option_widget<GncOptionUIType::OWNER>);
     GncOptionUIFactory::set_func(GncOptionUIType::INVOICE,
                                  create_option_widget<GncOptionUIType::INVOICE>);
     GncOptionUIFactory::set_func(GncOptionUIType::TAX_TABLE,
diff --git a/libgnucash/engine/gnc-option-impl.cpp b/libgnucash/engine/gnc-option-impl.cpp
index edb1b10d44..8d268f447a 100644
--- a/libgnucash/engine/gnc-option-impl.cpp
+++ b/libgnucash/engine/gnc-option-impl.cpp
@@ -46,6 +46,8 @@ ui_type_to_owner_type(GncOptionUIType ui_type)
         return GNC_OWNER_VENDOR;
     if (ui_type == GncOptionUIType::EMPLOYEE)
         return GNC_OWNER_EMPLOYEE;
+    if (ui_type == GncOptionUIType::JOB)
+        return GNC_OWNER_JOB;
     return GNC_OWNER_NONE;
 }
 



Summary of changes:
 gnucash/gnome/business-options-gnome.cpp    | 4 ++++
 gnucash/gnome/dialog-report-style-sheet.cpp | 7 +++----
 libgnucash/engine/gnc-option-impl.cpp       | 2 ++
 3 files changed, 9 insertions(+), 4 deletions(-)