gnucash maint: Repair unintended indent changes,

Mike Evans mikee at code.gnucash.org
Mon May 6 08:42:49 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/0cb60dd2 (commit)
	from  https://github.com/Gnucash/gnucash/commit/6e246ef8 (commit)



commit 0cb60dd224a97b6d54e874fce3c46d122eb3defd
Author: Mike Evans <mikee at saxicola.co.uk>
Date:   Mon May 6 13:40:21 2019 +0100

    Repair unintended indent changes,
    
    This happened in commit 126dc3a for bug 797168

diff --git a/gnucash/gnome/dialog-invoice.c b/gnucash/gnome/dialog-invoice.c
index 610f71372..cd3f6ceed 100644
--- a/gnucash/gnome/dialog-invoice.c
+++ b/gnucash/gnome/dialog-invoice.c
@@ -161,7 +161,8 @@ struct _invoice_window
     GtkWidget  * posted_date_hbox;
     GtkWidget  * posted_date;
     GtkWidget  * active_check;
-
+    GtkWidget  * paid_label;
+    
     GtkWidget  * owner_box;
     GtkWidget  * owner_label;
     GtkWidget  * owner_choice;
@@ -760,12 +761,12 @@ gnc_dialog_post_invoice(InvoiceWindow *iw, char *message,
     *ddue = *postdate;
     *memo = NULL;
     {
-        GncGUID *guid = NULL;
-        owner_inst = qofOwnerGetOwner (gncOwnerGetEndOwner (&(iw->owner)));
-        qof_instance_get (owner_inst,
-                  "invoice-last-posted-account", &guid,
-                  NULL);
-        *acc = xaccAccountLookup (guid, iw->book);
+    GncGUID *guid = NULL;
+    owner_inst = qofOwnerGetOwner (gncOwnerGetEndOwner (&(iw->owner)));
+    qof_instance_get (owner_inst,
+                      "invoice-last-posted-account", &guid,
+                      NULL);
+    *acc = xaccAccountLookup (guid, iw->book);
     }
     /* Get the default for the accumulate option */
     *accumulate = gnc_prefs_get_bool(GNC_PREFS_GROUP_INVOICE, GNC_PREF_ACCUM_SPLITS);
@@ -957,12 +958,12 @@ gnc_invoice_post(InvoiceWindow *iw, struct post_invoice_params *post_params)
      */
     owner_inst = qofOwnerGetOwner (gncOwnerGetEndOwner (&(iw->owner)));
     {
-        const GncGUID *guid = qof_instance_get_guid (QOF_INSTANCE (acc));
-        qof_begin_edit (owner_inst);
-        qof_instance_set (owner_inst,
-                  "invoice-last-posted-account", guid,
-                  NULL);
-        qof_commit_edit (owner_inst);
+    const GncGUID *guid = qof_instance_get_guid (QOF_INSTANCE (acc));
+    qof_begin_edit (owner_inst);
+    qof_instance_set (owner_inst,
+                      "invoice-last-posted-account", guid,
+                      NULL);
+    qof_commit_edit (owner_inst);
     }
 
     /* ... post it ... */
@@ -1874,8 +1875,6 @@ gnc_invoice_update_window (InvoiceWindow *iw, GtkWidget *widget)
         {
             hide = GTK_WIDGET (gtk_builder_get_object (iw->builder, "hide3"));
             gtk_widget_hide (hide);
-            hide = GTK_WIDGET (gtk_builder_get_object (iw->builder, "hide4"));
-            gtk_widget_hide (hide);
 
             show = GTK_WIDGET (gtk_builder_get_object (iw->builder, "posted_label"));
             gtk_widget_show (show);
@@ -1933,6 +1932,7 @@ gnc_invoice_update_window (InvoiceWindow *iw, GtkWidget *widget)
         /* Setup viewer for read-only access */
         gtk_widget_set_sensitive (acct_entry, FALSE);
         gtk_widget_set_sensitive (iw->id_entry, FALSE);
+        gtk_widget_set_selectable (iw->id_entry, TRUE);
         gtk_widget_set_sensitive (iw->terms_menu, FALSE);
         gtk_widget_set_sensitive (iw->owner_box, FALSE);
         gtk_widget_set_sensitive (iw->job_box, FALSE);
@@ -1949,6 +1949,11 @@ gnc_invoice_update_window (InvoiceWindow *iw, GtkWidget *widget)
         gtk_widget_set_sensitive (iw->notes_text, TRUE);
     }
 
+    if(gncInvoiceIsPaid (invoice))
+            gtk_label_set_text(GTK_LABEL(iw->paid_label),  _("PAID"));
+    else
+        gtk_label_set_text(GTK_LABEL(iw->paid_label),  _("UNPAID"));
+    
     if (widget)
         gtk_widget_show (widget);
     else
@@ -2317,6 +2322,7 @@ gnc_invoice_create_page (InvoiceWindow *iw, gpointer page)
     iw->owner_label = GTK_WIDGET (gtk_builder_get_object (builder, "page_owner_label"));
     iw->job_label = GTK_WIDGET (gtk_builder_get_object (builder, "page_job_label"));
     iw->job_box = GTK_WIDGET (gtk_builder_get_object (builder, "page_job_hbox"));
+    iw->paid_label = GTK_WIDGET (gtk_builder_get_object (builder, "hide4"));
 
     /* grab the project widgets */
     iw->proj_frame = GTK_WIDGET (gtk_builder_get_object (builder, "page_proj_frame"));
@@ -3358,7 +3364,7 @@ gnc_invoice_show_docs_due (GtkWindow *parent, QofBook *book, double days_in_adva
     if (param_list == NULL)
     {
         /* Translators: This abbreviation is the column heading for
-       the condition "Is this invoice a Credit Note?" */
+           the condition "Is this invoice a Credit Note?" */
         param_list = gnc_search_param_prepend (param_list, _("CN?"), NULL, type,
                                                INVOICE_IS_CN, NULL);
         param_list = gnc_search_param_prepend (param_list, _("Amount"), NULL, type,



Summary of changes:
 gnucash/gnome/dialog-invoice.c | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)



More information about the gnucash-changes mailing list