gnucash maint: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/1992e5fb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e1a5889b (commit)
	from  https://github.com/Gnucash/gnucash/commit/5af8d231 (commit)



commit 1992e5fb1fddca76adcb6eca08423c85dda9c8e0
Author: Michalis Kamprianis <michalis at linuxmail.org>
Date:   Sun May 4 21:25:37 2014 +0200

    Bug 728103 - Invoice opened does not contain the Job under circumstances
    
    corrected the saving of the page, so that it mentions the Job as
    the owner if there is a job, instead of the customer or the vendor.
    
    	modified:   src/business/business-gnome/dialog-invoice.c

diff --git a/src/business/business-gnome/dialog-invoice.c b/src/business/business-gnome/dialog-invoice.c
index 5acee72..28ec1ce 100644
--- a/src/business/business-gnome/dialog-invoice.c
+++ b/src/business/business-gnome/dialog-invoice.c
@@ -2181,10 +2181,20 @@ gnc_invoice_save_page (InvoiceWindow *iw,
     g_key_file_set_string(key_file, group_name, KEY_INVOICE_GUID,
                           guid_to_string(&iw->invoice_guid));
 
-    g_key_file_set_string(key_file, group_name, KEY_OWNER_TYPE,
+    if (gncOwnerGetJob (&(iw->job)))
+    {
+        g_key_file_set_string(key_file, group_name, KEY_OWNER_TYPE,
+                          qofOwnerGetType(&iw->job));
+        g_key_file_set_string(key_file, group_name, KEY_OWNER_GUID,
+                          guid_to_string(gncOwnerGetGUID(&iw->job)));
+    }
+    else
+    {
+        g_key_file_set_string(key_file, group_name, KEY_OWNER_TYPE,
                           qofOwnerGetType(&iw->owner));
-    g_key_file_set_string(key_file, group_name, KEY_OWNER_GUID,
+        g_key_file_set_string(key_file, group_name, KEY_OWNER_GUID,
                           guid_to_string(gncOwnerGetGUID(&iw->owner)));
+    }
 }
 
 GtkWidget *

commit e1a5889b45ecdf3b5cbf7dc1c4cf6ec01fcca2e5
Author: Michalis Kamprianis <michalis at linuxmail.org>
Date:   Wed Apr 30 08:49:38 2014 +0200

    Bug 509263 Since Last Run dialog won't allow resizing of Status column
    
    Added resizable=true in the column definition
    
    	modified:   src/gnome/dialog-sx-since-last-run.c

diff --git a/src/gnome/dialog-sx-since-last-run.c b/src/gnome/dialog-sx-since-last-run.c
index f9bc24f..a230723 100644
--- a/src/gnome/dialog-sx-since-last-run.c
+++ b/src/gnome/dialog-sx-since-last-run.c
@@ -975,6 +975,7 @@ gnc_ui_sx_since_last_run_dialog(GncSxInstanceModel *sx_instances, GList *auto_cr
                 "sensitive", SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY,
                 NULL);
         gtk_tree_view_append_column(dialog->instance_view, col);
+        gtk_tree_view_column_set_resizable(col, TRUE);
 
         renderer = gtk_cell_renderer_text_new();
         g_object_set(G_OBJECT(renderer),



Summary of changes:
 src/business/business-gnome/dialog-invoice.c | 14 ++++++++++++--
 src/gnome/dialog-sx-since-last-run.c         |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)