[grisbi-cvs] [SCM] grisbi branch, grisbi-0.8.x, updated. upstream_version_0_8_7-9-gd37a051

[Pierre Biava]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, grisbi-0.8.x has been updated
       via  d37a051418dbe777c77348fae07efc5fa0722a71 (commit)
       via  5f39e8d0b10159b9c38923f38ad60b468c108972 (commit)
      from  daf8358c891d39eced6d44f9b69dba3fd091811f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d37a051418dbe777c77348fae07efc5fa0722a71
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Aug 14 09:55:10 2011 +0200

    Fix bug  1387: error in calculation of the account balance in the prediction module with a scheduled transfer(cherry picked from commit 5c7bb102e36766a9a4e38977faf21116e3f9af9d)

commit 5f39e8d0b10159b9c38923f38ad60b468c108972
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Aug 6 10:38:29 2011 +0200

    new stable version 0.8.8

-----------------------------------------------------------------------

Changes:
diff --git a/NEWS b/NEWS
index 83de6c0..c82f628 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+New in version 0.8.8
+- update the Russian translation
+- fixes bug 1373: the transaction is not transferred to the new account when use the Edit menu
+- fixes bug 1365: corrects the name of the International Russian currency RUB -> RUR
+- fixes some bugs in the navigation in the left panel of Grisbi
+- fixes a crash when the number of recently used files = 0
+- removal the display of the build date for the stable versions of Grisbi
+
 New in version 0.8.7
 - fixes a problem of gtk version under Windows.
 
diff --git a/configure.in b/configure.in
index 3f487f4..e98e908 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 m4_define(grisbi_major_version, 0)
 m4_define(grisbi_minor_version, 8)
-m4_define(grisbi_micro_version, 7)
+m4_define(grisbi_micro_version, 8)
 m4_define(grisbi_version, grisbi_major_version.grisbi_minor_version.grisbi_micro_version)
 
 AC_INIT([grisbi],[grisbi_version],[http://grisbi.tuxfamily.org/mantis/login_select_proj_page.php?ref=bug_report_page.php],[grisbi],[http://www.grisbi.org/index.fr.html])
diff --git a/grisbi.spec b/grisbi.spec
index d42c428..68903c3 100644
--- a/grisbi.spec
+++ b/grisbi.spec
@@ -1,5 +1,5 @@
 %define name    grisbi
-%define version 0.8.7
+%define version 0.8.8
 %define release %mkrel 1
 
 %define _disable_ld_no_undefined 1
@@ -48,17 +48,6 @@ cp -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/grisbi/grisbi.png \
 
 %find_lang %{name} %{name}-tips
 
-%if %mdkversion < 200900
-%post
-%update_menus
-%endif
-
-
-%if %mdkversion < 200900
-%postun
-%clean_menus
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %_iconsdir/hicolor/48x48/apps/%name.png
 
 %changelog
+* Sat Aug 06 2011 Pierre Biava <grisbi at pierre.biava.name> 0.8.8-1mdv2010.2
+- new version 0.8.8
+
 * Sun May 22 2011 Pierre Biava <grisbi at pierre.biava.name> 0.8.6-1mdv2010.2
 - new version 0.8.6
 
diff --git a/src/bet_tab.c b/src/bet_tab.c
index 4e0de62..08f0c89 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -833,43 +833,53 @@ void bet_array_refresh_scheduled_data ( GtkTreeModel *tab_model,
                         scheduled_number );
             if ( transfer_account_number == selected_account )
             {
+                gint floating_point;
+
+                currency_number = gsb_data_account_get_currency ( selected_account );
+                floating_point = gsb_data_account_get_currency_floating_point ( selected_account );
                 str_description = g_strdup_printf ( _("Transfer between account: %s\n"
                         "and account: %s"),
                         gsb_data_account_get_name ( transfer_account_number ),
                         gsb_data_account_get_name ( account_number ) );
-            
-                amount = gsb_real_opposite ( gsb_data_scheduled_get_amount (
-                        scheduled_number ) );
+
+                amount = gsb_real_opposite ( gsb_data_scheduled_get_adjusted_amount_for_currency ( scheduled_number,
+                                    currency_number,
+                                    floating_point ) );
+                str_amount = gsb_real_safe_real_to_string ( amount, floating_point );
             }
             else if ( account_number == selected_account )
             {
+                currency_number = gsb_data_scheduled_get_currency_number ( scheduled_number );
                 str_description = g_strdup_printf ( _("Transfer between account: %s\n"
                         "and account: %s"),
                         gsb_data_account_get_name ( account_number ),
                         gsb_data_account_get_name ( transfer_account_number ) );
 
                 amount = gsb_data_scheduled_get_amount ( scheduled_number );
+                str_amount = bet_data_get_str_amount_in_account_currency ( amount,
+                        account_number,
+                        scheduled_number,
+                        SPP_ORIGIN_SCHEDULED );
             }
             else
                 continue;
         }
         else if ( account_number == selected_account )
         {
+            currency_number = gsb_data_scheduled_get_currency_number ( scheduled_number );
             str_description = bet_array_list_get_description ( account_number,
                         SPP_ORIGIN_SCHEDULED,
                         GINT_TO_POINTER ( scheduled_number ) );
 
             amount = gsb_data_scheduled_get_amount ( scheduled_number );
-        }
-        else
-            continue;
-
-        str_amount = bet_data_get_str_amount_in_account_currency ( amount,
+            str_amount = bet_data_get_str_amount_in_account_currency ( amount,
                         account_number,
                         scheduled_number,
                         SPP_ORIGIN_SCHEDULED );
+        }
+        else
+            continue;
 
-        currency_number = gsb_data_scheduled_get_currency_number ( scheduled_number );
         if (amount.mantissa < 0)
             str_debit = gsb_real_get_string_with_currency ( gsb_real_abs ( amount ), currency_number, TRUE );
         else


hooks/post-receive
-- 
grisbi