Merge branch 'maint'

src/core-utils/core-utils.i

@@ -77,6 +77,6 @@ const char * gnc_locale_default_iso_currency_code (void);
     return gnc_utf8_validate(str, -1, 0);
   }
 %}
-#elsif defined(SWIGPYTHON)
+#elif defined(SWIGPYTHON)
 gboolean gnc_utf8_validate(const gchar *, gssize, const gchar**);
 #endif

src/engine/business-core.i

@@ -166,7 +166,7 @@ static GncInvoiceList * qof_query_run_for_invoices(QofQuery *q) {
     SET_ENUM("GNC-INVOICE-VEND-CREDIT-NOTE");
     SET_ENUM("GNC-INVOICE-EMPL-CREDIT-NOTE");
 
-#undefine SET_ENUM
+#undef SET_ENUM
   }
 
 }

src/engine/engine.i

@@ -364,7 +364,7 @@ KvpValue * kvp_frame_get_slot_path_gslist (KvpFrame *frame, GSList *key_path);
     SET_ENUM("GNC-HOW-RND-ROUND");
     SET_ENUM("GNC-HOW-RND-NEVER");
 
-#undefine SET_ENUM
+#undef SET_ENUM
   }
 
 }

src/engine/iso-4217-currencies.xml

@@ -2516,7 +2516,7 @@
   exchange-code="949"
   parts-per-unit="100"
   smallest-fraction="100"
-  local-symbol="₤"
+  local-symbol="₺"
 />
 <!-- "TTD" - "Trinidad and Tobago Dollar"
 -->

src/gnome/reconcile-view.c

@@ -31,6 +31,7 @@
 
 #include "gnc-date.h"
 #include "qof.h"
+#include "qofbook.h"
 #include "Transaction.h"
 #include "gnc-ui-util.h"
 #include "gnc-prefs.h"
@@ -354,6 +355,8 @@ gnc_reconcile_view_init (GNCReconcileView *view)
 {
     GNCSearchParam *param;
     GList          *columns = NULL;
+    gboolean num_action =
+                qof_book_use_split_action_for_num_field(gnc_get_current_book());
 
     view->reconciled = g_hash_table_new (NULL, NULL);
     view->account = NULL;
@@ -374,7 +377,12 @@ gnc_reconcile_view_init (GNCReconcileView *view)
     columns = gnc_search_param_prepend (columns, _("Description"), NULL,
                                         GNC_ID_SPLIT, SPLIT_TRANS,
                                         TRANS_DESCRIPTION, NULL);
-    columns = gnc_search_param_prepend_with_justify (columns, _("Num"),
+    columns = num_action ?
+              gnc_search_param_prepend_with_justify (columns, _("Num"),
+              GTK_JUSTIFY_CENTER,
+              NULL, GNC_ID_SPLIT,
+              SPLIT_ACTION, NULL) :
+              gnc_search_param_prepend_with_justify (columns, _("Num"),
               GTK_JUSTIFY_CENTER,
               NULL, GNC_ID_SPLIT,
               SPLIT_TRANS, TRANS_NUM, NULL);

src/html/gnc-html.i

@@ -51,7 +51,7 @@ SCM scm_init_sw_gnc_html_module(void);
     SET_ENUM("URL-TYPE-PRICE");
     SET_ENUM("URL-TYPE-OTHER");
 
-#undefine SET_ENUM
+#undef SET_ENUM
   }
 
 }