[grisbi-cvs] grisbi/src gsb_form.c, 1.136, 1.137 gsb_transactions_list.c, 1.187, 1.188

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27834/src

Modified Files:
	gsb_form.c gsb_transactions_list.c 
Log Message:
back for the display of financials years in child transactions

Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- gsb_transactions_list.c	28 Nov 2009 10:58:14 -0000	1.187
+++ gsb_transactions_list.c	28 Nov 2009 12:56:18 -0000	1.188
@@ -665,7 +665,6 @@
 	    case ELEMENT_CATEGORY:
 	    case ELEMENT_DEBIT:
 	    case ELEMENT_CREDIT:
-        case ELEMENT_EXERCICE:
 		break;
 
 	    default:
@@ -745,27 +744,17 @@
 	    /* mise en forme du moyen de paiement */
 
 	case ELEMENT_PAYMENT_TYPE:
-	    return ( my_strdup (gsb_data_payment_get_name (
-                        gsb_data_transaction_get_method_of_payment_number (
-                        transaction_number ) ) ) );
+	    return ( my_strdup (gsb_data_payment_get_name ( gsb_data_transaction_get_method_of_payment_number ( transaction_number))));
 
 	    /* mise en forme du no de rapprochement */
 
 	case ELEMENT_RECONCILE_NB:
-	    return ( my_strdup (gsb_data_reconcile_get_name (
-                        gsb_data_transaction_get_reconcile_number (
-                        transaction_number ) ) ) );
+	    return ( my_strdup (gsb_data_reconcile_get_name ( gsb_data_transaction_get_reconcile_number ( transaction_number))));
 
 	    /* mise en place de l'exo */
 
 	case ELEMENT_EXERCICE:
-
-        if ( gsb_data_transaction_get_split_of_transaction ( transaction_number ) )
-            return g_strdup ( "" );
-        else
-	        return ( my_strdup ( gsb_data_fyear_get_name (
-                        gsb_data_transaction_get_financial_year_number (
-                        transaction_number ) ) ) );
+	    return ( my_strdup (gsb_data_fyear_get_name (gsb_data_transaction_get_financial_year_number ( transaction_number))));
 
 	    /* mise en place des catégories */
 

Index: gsb_form.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- gsb_form.c	22 Nov 2009 18:45:52 -0000	1.136
+++ gsb_form.c	28 Nov 2009 12:56:18 -0000	1.137
@@ -586,7 +586,6 @@
 	{
 	    switch (element -> element_number)
 	    {
-		case TRANSACTION_FORM_EXERCICE:
 		case TRANSACTION_FORM_BUDGET:
 		case TRANSACTION_FORM_VOUCHER:
 		    gtk_widget_set_sensitive ( element -> element_widget,
@@ -609,6 +608,7 @@
 		case TRANSACTION_FORM_TYPE:
 		case TRANSACTION_FORM_CHEQUE:
 		case TRANSACTION_FORM_BANK:
+        case TRANSACTION_FORM_EXERCICE:
 		    gtk_widget_set_sensitive ( element -> element_widget,
 					       FALSE );
 		    break;