Merge lp:~abdsandr/financisto/abdsandr into lp:~financisto-dev/financisto/trunk

[Abdsandryk Souza]

Adding functionalities: Google Docs backup, monthly preview and credit card statements.

=== modified file '.classpath'
--- .classpath	2010-07-14 02:47:40 +0000
+++ .classpath	2010-08-22 11:18:40 +0000
@@ -6,5 +6,6 @@
 	<classpathentry kind="lib" path="lib/rfc2445-no-joda.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="lib" path="lib/GDocsAPI.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

=== modified file 'AndroidManifest.xml'
--- AndroidManifest.xml	2010-07-27 13:00:40 +0000
+++ AndroidManifest.xml	2010-08-22 11:18:40 +0000
@@ -153,6 +153,8 @@
 
 		<activity android:name=".activity.CsvExportActivity" android:label="@string/csv_export" 
 			android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden"/>
+			
+		<activity android:name=".activity.MonthlyViewActivity" android:label="@string/monthly_view"/>
 
 	</application>
 	

=== added file 'assets/database/alter/20100721_0737_add_bill_filtering_pars_to_account.sql'
--- assets/database/alter/20100721_0737_add_bill_filtering_pars_to_account.sql	1970-01-01 00:00:00 +0000
+++ assets/database/alter/20100721_0737_add_bill_filtering_pars_to_account.sql	2010-08-22 11:18:40 +0000
@@ -0,0 +1,3 @@
+ALTER TABLE account ADD COLUMN closing_day integer not null default 0;
+ALTER TABLE account ADD COLUMN payment_day integer not null default 0;
+ALTER TABLE transactions ADD COLUMN is_ccard_payment integer not null default 0;
\ No newline at end of file

=== added file 'lib/GDocsAPI.jar'
Binary files lib/GDocsAPI.jar	1970-01-01 00:00:00 +0000 and lib/GDocsAPI.jar	2010-08-22 11:18:40 +0000 differ
=== added file 'res/drawable/btn_next.png'
Binary files res/drawable/btn_next.png	1970-01-01 00:00:00 +0000 and res/drawable/btn_next.png	2010-08-22 11:18:40 +0000 differ
=== added file 'res/drawable/btn_previous.png'
Binary files res/drawable/btn_previous.png	1970-01-01 00:00:00 +0000 and res/drawable/btn_previous.png	2010-08-22 11:18:40 +0000 differ
=== added file 'res/drawable/ic_menu_bill_off.png'
Binary files res/drawable/ic_menu_bill_off.png	1970-01-01 00:00:00 +0000 and res/drawable/ic_menu_bill_off.png	2010-08-22 11:18:40 +0000 differ
=== added file 'res/drawable/ic_menu_bill_on.png'
Binary files res/drawable/ic_menu_bill_on.png	1970-01-01 00:00:00 +0000 and res/drawable/ic_menu_bill_on.png	2010-08-22 11:18:40 +0000 differ
=== added file 'res/drawable/ic_menu_calendar.png'
Binary files res/drawable/ic_menu_calendar.png	1970-01-01 00:00:00 +0000 and res/drawable/ic_menu_calendar.png	2010-08-22 11:18:40 +0000 differ
=== added file 'res/drawable/ic_menu_calendar_off.png'
Binary files res/drawable/ic_menu_calendar_off.png	1970-01-01 00:00:00 +0000 and res/drawable/ic_menu_calendar_off.png	2010-08-22 11:18:40 +0000 differ
=== added file 'res/layout/credit_card_transaction.xml'
--- res/layout/credit_card_transaction.xml	1970-01-01 00:00:00 +0000
+++ res/layout/credit_card_transaction.xml	2010-08-22 11:18:40 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content">
+  
+  <TextView android:id="@+id/list_date"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:padding="3px" />
+  
+  <TextView android:id="@+id/list_note"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:gravity="left" 
+  android:layout_weight="1"
+  android:padding="3px" />
+  
+  <TextView android:id="@+id/list_value"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:gravity="right" 
+  android:padding="3px" />
+  
+</LinearLayout>
\ No newline at end of file

=== added file 'res/layout/monthly_view.xml'
--- res/layout/monthly_view.xml	1970-01-01 00:00:00 +0000
+++ res/layout/monthly_view.xml	2010-08-22 11:18:40 +0000
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  
+  Contributors:
+      Abdsandryk - initial API and implementation
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_height="fill_parent" 
+	android:layout_width="fill_parent"
+	android:orientation="vertical">
+	
+	<LinearLayout 
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent" 
+		android:background="#000"
+		android:paddingTop="2dp">
+		
+		<ImageButton android:id="@+id/bt_month_previous"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:src="@drawable/btn_previous" />
+			
+		<TextView android:id="@+id/monthly_view_title"
+			android:layout_width="fill_parent" 
+			android:layout_height="fill_parent"
+			android:layout_weight="1"
+			android:textStyle="bold" 
+			android:gravity="center"
+			android:textColor="#FFF" />
+			
+		<ImageButton android:id="@+id/bt_month_next"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:src="@drawable/btn_next" />
+			
+	</LinearLayout>
+	
+	<ListView android:id="@android:id/list" 
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content" 
+		android:layout_weight="1"
+		android:background="#111111"
+		android:visibility="gone" />
+	
+	<TextView android:id="@id/android:empty" 
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content" 
+		android:layout_weight="1"
+		android:gravity="center" 
+		android:text="@string/no_transactions" />
+	
+	<LinearLayout 
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent" 
+		android:background="#000"
+		android:paddingTop="2dp">
+	
+		<TextView android:id="@+id/monthly_result_label"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:gravity="left|center"
+			android:textColor="#000"
+			android:background="#DEDEDE"
+			android:text="@string/bill_on" />
+			
+		<TextView android:id="@+id/monthly_result"
+			android:layout_height="fill_parent"
+			android:layout_width="fill_parent" 
+			android:layout_weight="1"
+			android:gravity="right|center"
+			android:textStyle="bold" 
+			android:background="#DEDEDE"
+			android:textColor="#000"
+			android:visibility="gone" />
+			
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file

=== added directory 'res/menu'
=== added file 'res/menu/blotter_menu.xml'
--- res/menu/blotter_menu.xml	1970-01-01 00:00:00 +0000
+++ res/menu/blotter_menu.xml	2010-08-22 11:18:40 +0000
@@ -0,0 +1,5 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/opt_menu_month"
+		android:icon="@drawable/ic_menu_calendar_off"
+		android:title="@string/monthly_view" />
+</menu>

=== added file 'res/menu/ccard_blotter_menu.xml'
--- res/menu/ccard_blotter_menu.xml	1970-01-01 00:00:00 +0000
+++ res/menu/ccard_blotter_menu.xml	2010-08-22 11:18:40 +0000
@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/opt_menu_month"
+		android:icon="@drawable/ic_menu_calendar_off"
+		android:title="@string/monthly_view" />
+	<item android:id="@+id/opt_menu_bill"
+		android:icon="@drawable/ic_menu_bill_off"
+		android:title="@string/ccard_statement" />
+</menu>

=== modified file 'res/values-pt-rBR/strings.xml'
--- res/values-pt-rBR/strings.xml	2010-08-04 21:13:31 +0000
+++ res/values-pt-rBR/strings.xml	2010-08-22 11:18:40 +0000
@@ -9,6 +9,7 @@
   Contributors:
       Denis Solonenko - initial API and implementation
       Charles HG Santos - Brazilian translation [http://www.provadigital.com.br]
+      Abdsandryk Souza / Rodrigo Sousa - adding new strings
 -->
 <resources>
     <string name="accounts">Contas</string>
@@ -50,7 +51,7 @@
 	<string name="transfer">Transferência</string>
 	<string name="confirmation">Confirmação</string>	
 	<string name="delete_category_dialog">Apagar esta categoria e todas as sub-categorias (se existirem)?</string>
-	<string name="currency_delete_alert">Não é possível apagar uma moeda em uso...</string>	
+	<string name="currency_delete_alert">Não é possível apagar uma moeda em uso.</string>	
 	<string name="yes">Sim</string>
 	<string name="no">Não</string>
 	<string name="error">Erro</string>
@@ -64,7 +65,7 @@
 	<string name="period_from">Período de</string>
 	<string name="period_to">Período para</string>
 	<string name="period_recur">Período recorrente</string>
-	<string name="preferences">Preferencias</string>
+	<string name="preferences">Preferências</string>
 	<string name="amount_picker">Separador de valor</string>
 	<string name="integer_part_title">Número de dígitos</string>
 	<string name="use_hundredth_title">Usar centésimos</string>
@@ -98,7 +99,7 @@
 	<string name="no_locations">Sem localizações</string>
 	<string name="use_gps">Usar GPS</string>
 	<string name="use_gps_summary">Usar GPS para pegar a localização nas transações</string>
-	<string name="use_my_location">Ussar Minha Localização</string>
+	<string name="use_my_location">Usar Minha Localização</string>
 	<string name="use_my_location_summary">Usar Minha Localização para pegar a localização atual para novas transações</string>	
 	<string name="select_location">Escolher localização</string>
 	<string name="no_fix">Localização desconhecida</string>
@@ -207,7 +208,7 @@
 	<string name="card_number_hint">Os últimos 4 dígitos do cartão</string>
 	<string name="issuer">Emissor</string>
 	<string name="cash">Dinheiro</string>	
-	<string name="sort_order">Ordem de lisgatem</string>
+	<string name="sort_order">Ordem de listagem</string>
 	<string name="force_gps_location">Forçar localização GPS</string>
 	<string name="whats_new">O que tem de novo</string>
 	<string name="attribute_delete_alert">Isto apagará os atributos das categorias e transações também.</string>
@@ -232,7 +233,7 @@
 	<string name="more_products">Mais produtos.</string>
 	<string name="pin_protection">Senha de proteção</string>	
 	<string name="pin_protection_summary">Marque para proteger acesso com senha</string>
-	<string name="pin_protection_notify">Por favor, configure a senha nas Preferências</string>
+	<string name="pin_protection_notify">Favor configurar a senha em Preferências</string>
 	<string name="change_pin">Modificar senha</string>	
 	<string name="change_pin_summary">Modifica a senha.</string>
 	<string name="pin">Senha</string>
@@ -241,11 +242,22 @@
 	<string name="restore">Restaurar</string>
 	<string name="backup_database">Backup dos dados</string>
 	<string name="backup_database_inprogress">Efetuando backup..</string>
+	<string name="backup_database_gdocs">Backup no Google Docs</string>
+	<string name="backup_database_gdocs_inprogress">Efetuando backup..</string>
 	<string name="csv_export">Exportar em CSV</string>
 	<string name="csv_export_inprogress">Exportando dados para formato CSV..</string>	
 	<string name="restore_database">Restaurar dados</string>
 	<string name="restore_database_inprogress">Restaurando dados...</string>
+	<string name="restore_database_gdocs">Restaurar do Google Docs</string>
+	<string name="restore_database_inprogress_gdocs">Restaurando base...</string>
 	<string name="restore_database_success">Os dados foram restaurados com sucesso..</string>
+	<string name="gdocs_connection_failed">Não foi possível conectar ao Google Docs.</string>
+	<string name="gdocs_folder_not_found">A pasta de backup não foi encontrada no Google Docs.</string>
+	<string name="gdocs_credentials_not_configured">Favor configurar login e senha do Google Docs em Preferências.</string>
+	<string name="gdocs_folder_not_configured">Favor configurar a pasta de backup no Google Docs.</string>
+	<string name="gdocs_login_failed">Login ou senha do Google inválido(s).</string>
+	<string name="gdocs_backup_failed">Erro enviando arquivo de backup ao Google Docs. Tente novamente.</string>
+	<string name="gdocs_restore_failed">Erro recuperando arquivo de backup. Tente novamente.</string>
 	<string name="success">Sucesso!</string>
 	<string name="fail">Falha..</string>
 	<string name="duplicate">Duplicatas</string>
@@ -253,7 +265,7 @@
 	<string name="select_to_account">Selecione conta de destino..</string>
 	<string name="update_balance">Atualizar balanço</string>
 	<string name="close_account">Fechar conta</string>
-	<string name="reopen_account">Re-abrir conta</string>
+	<string name="reopen_account">Reabrir conta</string>
 	<string name="difference">Diferença</string>
 	<string name="new_balance">Novo balanço</string>
 	<string name="duplicate_success">Transação duplicada com a mesma data e hora</string>	
@@ -343,6 +355,13 @@
 	<string name="calculating">Calculando..</string>
 	<string name="budget_mode">Condições facilitadas</string>
 	<string name="budget_mode_summary">Use menos condições restritivas (categoria OU projeto) para filtrar transações</string>
+	<string name="gdocs_backup">Backup no Google Docs</string>
+	<string name="user_login">Nome de usuário</string>
+	<string name="user_login_summary">Nome de usuário no Google (usuário)</string>
+	<string name="user_password">Senha</string>
+	<string name="user_password_summary">Senha no Google</string>
+	<string name="backup_folder">Pasta de backup</string>
+	<string name="backup_folder_summary">Pasta no Google Docs para armazenar os arquivos.</string>
 	<string name="other">Outro</string>
 	<string name="send_error_reports">Enviar relatórios de erro</string>
 	<string name="send_error_reports_summary">Enviar relatõrios de erros anônimos para orangesoftware.ru (requer reiníci)</string>	
@@ -364,13 +383,13 @@
 	<string name="recurrence_period_starts_on">Iniciar em</string>	
 	<string name="recurrence_weekly_days">Repetir em</string>
 	<string name="recurrence_monthly_pattern">Padrão mensal</string>	
-	<string name="recurrence_monthly_every_nth_day">Todo Nésimo dia</string>
+	<string name="recurrence_monthly_every_nth_day">Todo N-ésimo dia</string>
 	<string name="recurrence_monthly_specific_day">Especifie o dia</string>
 	<string name="recur_interval_semi_monthly_1">1º dia</string>	
 	<string name="recur_interval_semi_monthly_2">2º dia</string>	
 	<string name="recurrence_none">Sem recorrência</string>
 	<string name="specify_value">Especifique o valor..</string>		
-	<string name="recurrence_evaluate">Previsão das dadas</string>	
+	<string name="recurrence_evaluate">Previsão das datas</string>	
 	<string name="first">Primeiro</string>		
 	<string name="second">Segundo</string>		
 	<string name="third">Terceiro</string>		
@@ -419,7 +438,7 @@
 	<string name="notification_sound">Som</string>
 	<string name="notification_vibra">Vibração</string>
 	<string name="notification_led">Led</string>
-	<string name="transaction_status">Estatus</string>
+	<string name="transaction_status">Estado</string>
 	<string name="transaction_status_pending">Pendente</string>
 	<string name="transaction_status_unreconciled">Não conciliada</string>
 	<string name="transaction_status_cleared">Apurada</string>
@@ -438,4 +457,23 @@
 	<string name="report_by_sub_category">Por Sub-categoria</string>
 	<string name="report_by_sub_category_summary">Transações listadas por sub-categoria</string>
 	<string name="credits">Créditos</string>
+	
+	<string name="payment_day">Dia do pagamento</string>
+	<string name="closing_day">Dia do fechamento</string>
+	<string name="closing_day_hint">Dia em que a fatura é gerada.</string>
+	<string name="ccard_statement">Previsão de Fatura</string>
+	<string name="monthly_view">Balanço Mensal</string>	
+	<string name="credit_card_statement">Fatura do Cartão de Crédito</string>
+	<string name="ccard_statement_title">Fatura &lt;ccard&gt;</string>
+	<string name="ccard_par">&lt;ccard&gt;</string>
+	<string name="bill_on">Fatura em </string>
+	<string name="monthly_result">Resultado do mês</string>
+	<string name="closing_day_error">Dia de fechamento não é válido.</string>
+	<string name="payment_day_error">Dia de pagamento não é válido.</string>
+	<string name="statement_error">Favor registrar dias de pagamento e fechamento da fatura deste cartão nas propriedades da conta.</string>
+	<string name="is_ccard_payment">Pagamento de Fatura</string>
+	<string name="is_ccard_payment_summary">Nao incluir no total da fatura</string>
+	<string name="header_payments">Pagamentos</string>
+	<string name="header_credits">Créditos Diversos</string>
+	<string name="header_expenses">Despesas</string>
 </resources>

=== modified file 'res/values/ids.xml'
--- res/values/ids.xml	2010-08-19 13:42:10 +0000
+++ res/values/ids.xml	2010-08-22 11:18:40 +0000
@@ -60,5 +60,6 @@
 	<item type="id" name="status_clear"/>
 	<item type="id" name="attach_picture"/>	
 	<item type="id" name="delete_picture"/>	
-	<item type="id" name="negative_opening_amount"/>		
+	<item type="id" name="negative_opening_amount"/>
+	<item type="id" name="is_ccard_payment"/>		
 </resources>

=== modified file 'res/values/strings.xml'
--- res/values/strings.xml	2010-08-19 13:42:10 +0000
+++ res/values/strings.xml	2010-08-22 11:18:40 +0000
@@ -240,11 +240,22 @@
 	<string name="restore">Restore</string>
 	<string name="backup_database">Backup Database</string>
 	<string name="backup_database_inprogress">Backing up database..</string>
+	<string name="backup_database_gdocs">Backup on Google Docs</string>
+	<string name="backup_database_gdocs_inprogress">Backing up database..</string>
 	<string name="csv_export">CSV Export</string>
 	<string name="csv_export_inprogress">Exporting database to CSV..</string>	
 	<string name="restore_database">Restore Database</string>
 	<string name="restore_database_inprogress">Restoring database...</string>
-	<string name="restore_database_success">Database has been successfully restored..</string>
+	<string name="restore_database_gdocs">Restore from Google Docs</string>
+	<string name="restore_database_inprogress_gdocs">Restoring database...</string>
+	<string name="restore_database_success">Database has been successfully restored.</string>
+	<string name="gdocs_connection_failed">Can not connect to Google Docs.</string>
+	<string name="gdocs_folder_not_found">The backup folder on Google Docs was not found.</string>
+	<string name="gdocs_credentials_not_configured">Please set Google account login and password on Preferences.</string>
+	<string name="gdocs_folder_not_configured">Please set the Google Docs backup folder on Preferences.</string>
+	<string name="gdocs_login_failed">Google account login or password not valid.</string>
+	<string name="gdocs_backup_failed">Error sending backup file to Google Docs. Please try again.</string>
+	<string name="gdocs_restore_failed">Error retrieving backup file. Please try again.</string>
 	<string name="success">Success!</string>
 	<string name="fail">Fail..</string>
 	<string name="duplicate">Duplicate</string>
@@ -343,6 +354,13 @@
 	<string name="calculating">Calculating..</string>
 	<string name="budget_mode">Ease conditions</string>
 	<string name="budget_mode_summary">Use less restrictive conditions (category OR project) to filter transactions</string>
+	<string name="gdocs_backup">Google Docs Backup</string>
+	<string name="user_login">Login</string>
+	<string name="user_login_summary">Google account login (username)</string>
+	<string name="user_password">Password</string>
+	<string name="user_password_summary">Google account password</string>
+	<string name="backup_folder">Backup Folder</string>
+	<string name="backup_folder_summary">Folder on Google Docs to store backup files.</string>
 	<string name="other">Other</string>
 	<string name="send_error_reports">Send error reports</string>
 	<string name="send_error_reports_summary">Send anonymous error reports to orangesoftware.ru (requires restart)</string>	
@@ -445,4 +463,22 @@
 	<string name="negative_opening_amount">Negative opening amount</string>
 	<string name="negative_opening_amount_summary">Open account with negative opening amount</string>
 
+	<string name="payment_day">Payment day</string>
+	<string name="closing_day">Closing day</string>
+	<string name="closing_day_hint">Day on which the bill closes</string>
+	<string name="ccard_statement">Statements</string>
+	<string name="monthly_view">Month Preview</string>	
+	<string name="credit_card_statement">Credit Card Statement</string>
+	<string name="ccard_statement_title">&lt;ccard&gt; Statement</string>
+	<string name="ccard_par">&lt;ccard&gt;</string>
+	<string name="bill_on">Bill on </string>
+	<string name="monthly_result">Balance of month</string>
+	<string name="closing_day_error">Closing day is not valid.</string>
+	<string name="payment_day_error">Payment day is not valid.</string>
+	<string name="statement_error">Please set payment and closing days for this credit card on account properties.</string>
+	<string name="is_ccard_payment">Credit Card Payment</string>
+	<string name="is_ccard_payment_summary">Not Include into bill total</string>
+	<string name="header_payments">Payments</string>
+	<string name="header_credits">Various Credits</string>
+	<string name="header_expenses">Expenses</string>
 </resources>

=== modified file 'res/xml/preferences.xml'
--- res/xml/preferences.xml	2010-08-19 10:35:29 +0000
+++ res/xml/preferences.xml	2010-08-22 11:18:40 +0000
@@ -84,6 +84,17 @@
 			android:title="@string/use_my_location" android:summary="@string/use_my_location_summary"
 			android:defaultValue="true" />
 	</PreferenceCategory>
+	<PreferenceCategory android:title="@string/gdocs_backup">
+		<EditTextPreference android:key="user_login"
+			android:title="@string/user_login" android:summary="@string/user_login_summary"/>
+		<EditTextPreference 
+			android:key="user_password"
+			android:title="@string/user_password" 
+			android:password="true"
+			android:summary="@string/user_password_summary"/>
+		<EditTextPreference android:key="backup_folder"
+			android:title="@string/backup_folder" android:summary="@string/backup_folder_summary"/>
+	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/other">
 		<CheckBoxPreference android:key="include_transfers_into_reports"
 			android:title="@string/include_transfers_into_reports" android:summary="@string/include_transfers_into_reports_summary"

=== modified file 'src/ru/orangesoftware/financisto/activity/AbstractTransactionActivity.java'
--- src/ru/orangesoftware/financisto/activity/AbstractTransactionActivity.java	2010-08-19 10:35:29 +0000
+++ src/ru/orangesoftware/financisto/activity/AbstractTransactionActivity.java	2010-08-22 11:18:40 +0000
@@ -75,6 +75,7 @@
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageButton;
@@ -133,6 +134,8 @@
 	private ImageView pictureView;
 	private String pictureFileName;
 	
+	private CheckBox ccardPayment;
+	
 	protected long selectedAccountId = -1;
 	protected long selectedCategoryId = 0;
 	protected long selectedProjectId = 0;
@@ -519,6 +522,12 @@
 		if (transaction.isNotTemplateLike()) {
 			pictureView = x.addPictureNodeMinus(this, layout, R.id.attach_picture, R.id.delete_picture, R.string.attach_picture, R.string.new_picture);
 		}
+		// checkbox to register if the transaction is a credit card payment. 
+		// this will be used to exclude from totals in bill preview
+		ccardPayment = x.addCheckboxNode(layout,
+				R.id.is_ccard_payment, R.string.is_ccard_payment,
+				R.string.is_ccard_payment_summary, false);
+		
 	}
 
 	protected abstract void createListNodes(LinearLayout layout);
@@ -585,6 +594,10 @@
 				removePicture();
 				break;
 			}
+			case R.id.is_ccard_payment: {
+				ccardPayment.setChecked(!ccardPayment.isChecked());
+				transaction.isCCardPayment = ccardPayment.isChecked()?1:0;
+			}
 		}
 	}	
 
@@ -825,6 +838,13 @@
 			setNotification(transaction.notificationOptions);
 		}
 		selectPicture(transaction.attachedPicture);
+		setIsCCardPayment(transaction.isCCardPayment);
+	}
+
+	private void setIsCCardPayment(int isCCardPaymentValue) {
+		// TODO Auto-generated method stub
+		transaction.isCCardPayment = isCCardPaymentValue;
+		ccardPayment.setChecked(isCCardPaymentValue==1);
 	}
 
 	private void setLocation(String provider, float accuracy, double latitude, double longitude) {

=== modified file 'src/ru/orangesoftware/financisto/activity/AccountActivity.java'
--- src/ru/orangesoftware/financisto/activity/AccountActivity.java	2010-08-19 13:42:10 +0000
+++ src/ru/orangesoftware/financisto/activity/AccountActivity.java	2010-08-22 11:18:40 +0000
@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     Denis Solonenko - initial API and implementation
+ *     Abdsandryk - adding bill filtering parameters
  ******************************************************************************/
 package ru.orangesoftware.financisto.activity;
 
@@ -67,6 +68,13 @@
 	private CardIssuerAdapter cardIssuerAdapter;
 	private ListAdapter currencyAdapter;	
 	
+	/** for bill filtering */
+	private EditText closingDayText;
+	private EditText paymentDayText;
+	private View closingDayNode;
+	private View paymentDayNode;
+	/***********************/
+	
 	private Account account = new Account();
 
 	@Override
@@ -90,6 +98,17 @@
 		sortOrderText.setInputType(InputType.TYPE_CLASS_NUMBER);
 		sortOrderText.setSingleLine();
 		
+		/********** bill filtering **********/
+		closingDayText = new EditText(this);
+		closingDayText.setInputType(InputType.TYPE_CLASS_NUMBER);
+		closingDayText.setHint(R.string.closing_day_hint);
+		closingDayText.setSingleLine();
+		
+		paymentDayText = new EditText(this);
+		paymentDayText.setInputType(InputType.TYPE_CLASS_NUMBER);
+		paymentDayText.setSingleLine();
+		/************************************/
+		
 		amountInput = new AmountInput(this);
 		amountInput.setOwner(this);
 
@@ -110,6 +129,14 @@
 		
 		numberNode = x.addEditNode(layout, R.string.card_number, numberText);
 		setVisibility(numberNode, View.GONE);
+		
+		/********** bill filtering **********/
+		closingDayNode = x.addEditNode(layout, R.string.closing_day, closingDayText);
+		setVisibility(closingDayNode, View.GONE);
+		
+		paymentDayNode = x.addEditNode(layout, R.string.payment_day, paymentDayText);
+		setVisibility(paymentDayNode, View.GONE);		
+		/************************************/
 
 		currencyCursor = em.getAllCurrencies("name");
 		startManagingCursor(currencyCursor);		
@@ -168,12 +195,36 @@
 				if (type.hasNumber) {
 					account.number = Utils.text(numberText);
 				}
+				
+				/********** validate closing and payment days **********/
+				if (type.isCreditCard) {
+					String closingDay = Utils.text(closingDayText);
+					account.closingDay = closingDay == null ? 0 : Integer.parseInt(closingDay);
+					if (account.closingDay != 0) {
+						if (account.closingDay>31) {
+							Toast.makeText(AccountActivity.this, R.string.closing_day_error, Toast.LENGTH_SHORT).show();
+							return;	
+						}	
+					}
+					
+					String paymentDay = Utils.text(paymentDayText);
+					account.paymentDay = paymentDay == null ? 0 : Integer.parseInt(paymentDay);	
+					if (account.paymentDay != 0) {
+						if (account.paymentDay>31) {
+							Toast.makeText(AccountActivity.this, R.string.payment_day_error, Toast.LENGTH_SHORT).show();
+							return;	
+						}
+					}
+				}	
+				/************* validate closing and payment days *************/
+				
 				account.title = accountTitle.getText().toString();
 				account.creationDate = System.currentTimeMillis();
 				String sortOrder = Utils.text(sortOrderText);
 				account.sortOrder = sortOrder == null ? 0 : Integer.parseInt(sortOrder);
 				account.isIncludeIntoTotals  = isIncludedIntoTotals.isChecked();
 				account.limitAmount = limitInput.getAmount();
+				
 				long accountId = em.saveAccount(account);
 				long amount = amountInput.getAmount();
 				if (amount != 0) {
@@ -273,6 +324,12 @@
 		setVisibility(cardIssuerNode, type.isCard ? View.VISIBLE : View.GONE);
 		setVisibility(issuerNode, type.hasIssuer ? View.VISIBLE : View.GONE);
 		setVisibility(numberNode, type.hasNumber ? View.VISIBLE : View.GONE);
+		
+		/******* bill filtering ********/
+		setVisibility(closingDayNode, type.isCreditCard ? View.VISIBLE : View.GONE);
+		setVisibility(paymentDayNode, type.isCreditCard ? View.VISIBLE : View.GONE);
+		/*******************************/
+		
 		setVisibility(limitAmountView, type == AccountType.CREDIT_CARD ? View.VISIBLE : View.GONE);
 		account.type = type.name();
 		selectCardIssuer(account.cardIssuer != null 
@@ -311,6 +368,12 @@
 		issuerName.setText(account.issuer);
 		numberText.setText(account.number);
 		sortOrderText.setText(String.valueOf(account.sortOrder));
+		
+		/******** bill filtering ********/
+		closingDayText.setText(String.valueOf(account.closingDay));
+		paymentDayText.setText(String.valueOf(account.paymentDay));
+		/********************************/		
+		
 		isIncludedIntoTotals.setChecked(account.isIncludeIntoTotals);
 		if (account.limitAmount > 0) {
 			limitInput.setAmount(account.limitAmount);

=== modified file 'src/ru/orangesoftware/financisto/activity/BlotterActivity.java'
--- src/ru/orangesoftware/financisto/activity/BlotterActivity.java	2010-08-05 11:46:29 +0000
+++ src/ru/orangesoftware/financisto/activity/BlotterActivity.java	2010-08-22 11:18:40 +0000
@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     Denis Solonenko - initial API and implementation
+ *     Abdsandryk - menu option to call Credit Card Bill functionality
  ******************************************************************************/
 package ru.orangesoftware.financisto.activity;
 
@@ -19,6 +20,7 @@
 import ru.orangesoftware.financisto.blotter.WhereFilter;
 import ru.orangesoftware.financisto.dialog.TransactionInfoDialog;
 import ru.orangesoftware.financisto.model.Account;
+import ru.orangesoftware.financisto.model.AccountType;
 import ru.orangesoftware.financisto.model.Transaction;
 import ru.orangesoftware.financisto.service.FinancistoService;
 import ru.orangesoftware.financisto.utils.MenuItemInfo;
@@ -31,6 +33,8 @@
 import android.database.Cursor;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -51,6 +55,9 @@
 	private static final int NEW_TRANSFER_REQUEST = 3;
 	private static final int EDIT_TRANSFER_REQUEST = 4;
 	private static final int NEW_TRANSACTION_FROM_TEMPLATE_REQUEST = 5;
+	private static final int MONTHLY_VIEW_REQUEST = 6;
+	private static final int BILL_PREVIEW_REQUEST = 7;
+	
 		
 	private static final int FILTER_REQUEST = 6;
 	private static final int MENU_DUPLICATE = MENU_ADD+1;
@@ -323,5 +330,82 @@
 		TransactionInfoDialog transactionInfoView = new TransactionInfoDialog(this, position, id, em, inflater);
 		transactionInfoView.show(id);
 	}
+
+	/* (non-Javadoc)
+	 * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu)
+	 */
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		
+		long accountId = blotterFilter.getAccountId();
+		
+		// Funcionality available for account blotter
+		if (accountId != -1) {
+	
+			// get account type
+			Account account = em.getAccount(accountId);
+			AccountType type = AccountType.valueOf(account.type);
+			
+			if (type.isCreditCard) {
+				// Show menu for Credit Cards - bill
+				MenuInflater inflater = getMenuInflater();
+				inflater.inflate(R.menu.ccard_blotter_menu, menu);
+			} else {
+				// Show menu for other accounts - monthly view
+				MenuInflater inflater = getMenuInflater();
+				inflater.inflate(R.menu.blotter_menu, menu);
+			}
+			
+			return true;
+		} else {
+			return true;
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see android.app.Activity#onOptionsItemSelected(android.view.MenuItem)
+	 */
+	@Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+		long accountId = blotterFilter.getAccountId();
+
+		Intent intent = new Intent(this, MonthlyViewActivity.class);
+		intent.putExtra(MonthlyViewActivity.ACCOUNT_EXTRA, accountId);
+		
+		switch (item.getItemId()) {
+        	
+	        case R.id.opt_menu_month:
+	        	// call credit card bill activity sending account id
+	    		intent.putExtra(MonthlyViewActivity.BILL_PREVIEW_EXTRA, false);
+	    		startActivityForResult(intent, MONTHLY_VIEW_REQUEST);
+	            return true;
+
+	        case R.id.opt_menu_bill:
+	    		if (accountId != -1) {
+	    			Account account = em.getAccount(accountId);
+	    		
+		        	// call credit card bill activity sending account id
+		        	if (account.paymentDay>0 && account.closingDay>0) {
+			        	intent.putExtra(MonthlyViewActivity.BILL_PREVIEW_EXTRA, true);
+			    		startActivityForResult(intent, BILL_PREVIEW_REQUEST);
+			            return true;
+					} else {	
+						// display message: need payment and closing day
+						AlertDialog.Builder dlgAlert  = new AlertDialog.Builder(this);
+				        dlgAlert.setMessage(R.string.statement_error);
+				        dlgAlert.setTitle(R.string.ccard_statement);
+				        dlgAlert.setPositiveButton(R.string.ok, null);
+				        dlgAlert.setCancelable(true);
+				        dlgAlert.create().show();
+						return true;
+					}
+	    		} else {
+	    			return true;
+	    		}
+	        default:
+	            return super.onOptionsItemSelected(item);
+        }
+    }
 	
 }

=== modified file 'src/ru/orangesoftware/financisto/activity/MainActivity.java'
--- src/ru/orangesoftware/financisto/activity/MainActivity.java	2010-07-19 14:44:00 +0000
+++ src/ru/orangesoftware/financisto/activity/MainActivity.java	2010-08-22 11:18:40 +0000
@@ -11,11 +11,14 @@
 package ru.orangesoftware.financisto.activity;
 
 import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
 
 import ru.orangesoftware.financisto.R;
 import ru.orangesoftware.financisto.backup.Backup;
 import ru.orangesoftware.financisto.backup.DatabaseExport;
 import ru.orangesoftware.financisto.backup.DatabaseImport;
+import ru.orangesoftware.financisto.backup.SettingsNotConfiguredException;
 import ru.orangesoftware.financisto.blotter.WhereFilter;
 import ru.orangesoftware.financisto.db.DatabaseAdapter;
 import ru.orangesoftware.financisto.db.DatabaseHelper;
@@ -39,6 +42,8 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -51,6 +56,16 @@
 import android.widget.LinearLayout;
 import android.widget.TabHost;
 import android.widget.TextView;
+import api.wireless.gdata.client.AbstructParserFactory;
+import api.wireless.gdata.client.GDataParserFactory;
+import api.wireless.gdata.client.ServiceDataClient;
+import api.wireless.gdata.data.Feed;
+import api.wireless.gdata.docs.client.DocsClient;
+import api.wireless.gdata.docs.client.DocsGDataClient;
+import api.wireless.gdata.docs.data.DocumentEntry;
+import api.wireless.gdata.docs.data.FolderEntry;
+import api.wireless.gdata.docs.parser.xml.XmlDocsGDataParserFactory;
+import api.wireless.gdata.util.AuthenticationException;
 
 import com.nullwire.trace.ExceptionHandler;
 
@@ -69,7 +84,9 @@
 	private static final int MENU_RESTORE = Menu.FIRST+8;
 	private static final int MENU_CSV_EXPORT = Menu.FIRST+9;
 	private static final int MENU_SCHEDULED_TRANSACTIONS = Menu.FIRST+10;
-
+	private static final int MENU_BACKUP_GDOCS = Menu.FIRST+11;
+	private static final int MENU_RESTORE_GDOCS = Menu.FIRST+12;
+	
 	private final HashMap<String, Boolean> started = new HashMap<String, Boolean>();
 
 	private String appVersion;
@@ -237,6 +254,8 @@
 		menu.addSubMenu(0, MENU_CSV_EXPORT, 0, R.string.csv_export);
 		menu.addSubMenu(0, MENU_BACKUP, 0, R.string.backup_database);
 		menu.addSubMenu(0, MENU_RESTORE, 0, R.string.restore_database);
+		menu.addSubMenu(0, MENU_BACKUP_GDOCS, 0, R.string.backup_database_gdocs);
+		menu.addSubMenu(0, MENU_RESTORE_GDOCS, 0, R.string.restore_database_gdocs);
 		menuItem = menu.add(0, MENU_ABOUT, 0, R.string.about);
 		menuItem.setIcon(android.R.drawable.ic_menu_info_details);
 		return true;
@@ -273,24 +292,101 @@
 		case MENU_BACKUP:
 			doBackup();
 			break;
+		case MENU_BACKUP_GDOCS:
+			doBackupOnline();
+			break;
 		case MENU_RESTORE:
 			doImport();
 			break;
+		case MENU_RESTORE_GDOCS:
+			doImportFromGoogleDocs();
+			break;
 		}
 		return false;
 	}
 	
+	/**
+	 * Treat assinchronous requests to popup error messages
+	 * */
+	private Handler handler = new Handler() 
+	{
+		@Override
+		/**
+		 * Schedule the popup of the given error message
+		 * 
+		 * @param msg The message to display
+		 * */
+		public void handleMessage(Message msg) 
+		{
+			showErrorPopup(MainActivity.this, msg.what);
+		}
+	};
+	
+	/**
+	 * Display the error message
+	 * 
+	 * @param context 
+	 * @message message The message to display
+	 * */
+	protected void showErrorPopup(Context context, int message)
+	{
+		new AlertDialog.Builder(context)
+		.setMessage(message)
+		.setTitle(R.string.error)
+		.setPositiveButton(R.string.ok, null)
+		.setCancelable(true)
+		.create().show();
+	}
+	
+	/**
+	 * Connects to Google Docs
+	 * */
+	protected DocsClient createDocsClient(Context context) throws AuthenticationException, SettingsNotConfiguredException
+	{
+		GDataParserFactory dspf = new XmlDocsGDataParserFactory(new AbstructParserFactory());
+		DocsGDataClient dataClient = new DocsGDataClient(
+			"cl",
+			ServiceDataClient.DEFAULT_AUTH_PROTOCOL, 
+			ServiceDataClient.DEFAULT_AUTH_HOST);
+		DocsClient googleDocsClient = new DocsClient(dataClient, dspf);
+
+		/*
+		 * Start authentication
+		 * */
+		// check user login on preferences
+		String login = MyPreferences.getUserLogin(context);
+		if(login==null||login.equals("")) 
+			throw new SettingsNotConfiguredException("login");
+		// check user password on preferences
+		String password = MyPreferences.getUserPassword(context);
+		if(password==null||password.equals("")) 
+			throw new SettingsNotConfiguredException("password");
+		
+		googleDocsClient.setUserCredentials(login, password);
+		
+		return googleDocsClient;
+	}
+	
 	private void doBackup() {
 		ProgressDialog d = ProgressDialog.show(this, null, getString(R.string.backup_database_inprogress), true);
 		new BackupExportTask(d).execute((String[])null);
 	}
 	
+	/**
+	 * Backup to Google Docs using the Google account parameters registered on preferences.
+	 * */
+	private void doBackupOnline() {
+		ProgressDialog d = ProgressDialog.show(this, null, getString(R.string.backup_database_gdocs_inprogress), true);
+		new OnlineBackupExportTask(d).execute((String[])null);
+	}
+
 	private void doCsvExport() {
 		Intent intent = new Intent(this, CsvExportActivity.class);
 		startActivityForResult(intent, ACTIVITY_CSV_EXPORT);
 	}
 
 	private String selectedBackupFile;
+	private Properties backupFiles;
 	
 	private void doImport() {
 		final String[] backupFiles = Backup.listBackups();
@@ -316,6 +412,78 @@
 			.show();
 	}
 	
+	/**
+	 * Retrieves the backup file from the Google Docs account registered on preferences
+	 * */
+	private void doImportFromGoogleDocs() {
+		Feed<DocumentEntry> feed = null;
+		
+		try	{ 
+			Context context = MainActivity.this;
+			DocsClient docsClient = createDocsClient(context);
+			
+			// get the list of files in the repository
+			String folder = MyPreferences.getBackupFolder(context);
+			// check the backup folder registered on preferences
+			if(folder==null||folder.equals("")) {
+				showErrorPopup(this,R.string.gdocs_folder_not_configured);
+				return;
+			}
+			FolderEntry fd = docsClient.getFolderByTitle(folder);
+			if(fd==null) // if the registered folder does not exist
+			{
+				showErrorPopup(this,R.string.gdocs_folder_not_found);
+				return;
+			}
+			feed = docsClient.getFolderDocsListFeed(fd.getKey());
+		}  catch (AuthenticationException e) { //falha de login
+			showErrorPopup(this,R.string.gdocs_login_failed);
+			return;
+		}  catch (SettingsNotConfiguredException e) { //parametros de login nao configurados
+			if(e.getMessage().equals("login"))
+				handler.sendEmptyMessage(R.string.gdocs_credentials_not_configured);
+			else if(e.getMessage().equals("password"))
+				handler.sendEmptyMessage(R.string.gdocs_credentials_not_configured);
+			return;
+		}  catch(Exception e) { //outros erros de conexao
+			showErrorPopup(this,R.string.gdocs_connection_failed);
+			return;
+		}
+		
+		/*
+		 * Convert from ListList<DocumentEntry> to String[] to use in method setSingleChoiceItems()
+		 * */
+		List<DocumentEntry> arquivos = feed.getEntries();
+		final String[] backupFilesNames = new String[arquivos.size()];
+		backupFiles = new Properties();
+		String name;
+		for (int i=0;i<arquivos.size();i++) {
+			name = arquivos.get(i).getTitle();
+			backupFilesNames[i]=name;
+			backupFiles.put(name, arquivos.get(i).getKey());
+		}		
+		
+		new AlertDialog.Builder(this)
+			.setTitle(R.string.restore_database)
+			.setPositiveButton(R.string.restore, new DialogInterface.OnClickListener(){
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					if (selectedBackupFile != null) {
+						ProgressDialog d = ProgressDialog.show(MainActivity.this, null, getString(R.string.restore_database_inprogress_gdocs), true);
+						new OnlineBackupImportTask(d).execute(selectedBackupFile, backupFiles.get(selectedBackupFile).toString());
+					}
+				}
+			})
+			.setSingleChoiceItems(backupFilesNames, -1, new DialogInterface.OnClickListener(){
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					if (backupFilesNames != null && which >= 0 && which < backupFilesNames.length) {
+						selectedBackupFile = backupFilesNames[which];
+					}
+				}
+			})
+			.show();
+	}
 
 	private class CsvExportTask extends ImportExportAsyncTask {
 		
@@ -351,8 +519,45 @@
 		protected Object work(Context context, DatabaseAdapter db, String...params) throws Exception {
 			DatabaseExport export = new DatabaseExport(context, db.db());
 			return export.export();
-		}
-
+
+		}
+		
+		@Override
+		protected String getSuccessMessage(Object result) {
+			return String.valueOf(result);
+		}
+
+	}
+	
+	/**
+	 * Task that calls backup to google docs functions
+	 * */
+	private class OnlineBackupExportTask extends ImportExportAsyncTask {
+		
+		public OnlineBackupExportTask(ProgressDialog dialog) {
+			super(MainActivity.this, dialog, null);
+		}
+		
+		@Override
+		protected Object work(Context context, DatabaseAdapter db, String...params)  throws AuthenticationException, Exception{
+			DatabaseExport export = new DatabaseExport(context, db.db());
+			try {
+				return export.exportOnline(createDocsClient(context), MyPreferences.getBackupFolder(context));
+			}  catch (AuthenticationException e) { // connection error
+				handler.sendEmptyMessage(R.string.gdocs_login_failed);
+				throw e;
+			}  catch (SettingsNotConfiguredException e) { // missing login or password
+				if(e.getMessage().equals("login"))
+					handler.sendEmptyMessage(R.string.gdocs_credentials_not_configured);
+				else if(e.getMessage().equals("password"))
+					handler.sendEmptyMessage(R.string.gdocs_credentials_not_configured);
+				throw e;
+			}  catch (Exception e) { // Other errors 
+				handler.sendEmptyMessage(R.string.gdocs_backup_failed);
+				throw e;
+			}
+		}
+		
 		@Override
 		protected String getSuccessMessage(Object result) {
 			return String.valueOf(result);
@@ -376,6 +581,48 @@
 			new DatabaseImport(MainActivity.this, db.db(), params[0]).importDatabase();
 			return true;
 		}
+		
+		@Override
+		protected String getSuccessMessage(Object result) {
+			return MainActivity.this.getString(R.string.restore_database_success);
+		}
+
+	}
+	
+	/**
+	 * Task that calls backup from google docs functions
+	 * */
+	private class OnlineBackupImportTask extends ImportExportAsyncTask {
+		
+		public OnlineBackupImportTask(ProgressDialog dialog) {
+			super(MainActivity.this, dialog, new ImportExportAsyncTaskListener(){
+				@Override
+				public void onCompleted() {
+					onTabChanged(getTabHost().getCurrentTabTag());
+				}
+			});
+		}
+
+		@Override
+		protected Object work(Context context, DatabaseAdapter db, String...params) throws Exception, AuthenticationException, SettingsNotConfiguredException {
+			try {
+				new DatabaseImport(MainActivity.this, db.db(), params[0]).
+					importOnlineDatabase(createDocsClient(context), params[1]);
+			}  catch (SettingsNotConfiguredException e) { // error configuring connection parameters
+				if(e.getMessage().equals("login"))
+					handler.sendEmptyMessage(R.string.gdocs_credentials_not_configured);
+				else if(e.getMessage().equals("password"))
+					handler.sendEmptyMessage(R.string.gdocs_credentials_not_configured);
+				throw e;
+			}catch (AuthenticationException e) { // authentication error
+				handler.sendEmptyMessage(R.string.gdocs_login_failed);
+				throw e;
+			} catch (Exception e) { // error accessing files
+				handler.sendEmptyMessage(R.string.gdocs_restore_failed);
+				throw e;
+			}
+			return true;
+		}
 
 		@Override
 		protected String getSuccessMessage(Object result) {

=== added file 'src/ru/orangesoftware/financisto/activity/MonthlyViewActivity.java'
--- src/ru/orangesoftware/financisto/activity/MonthlyViewActivity.java	1970-01-01 00:00:00 +0000
+++ src/ru/orangesoftware/financisto/activity/MonthlyViewActivity.java	2010-08-22 11:18:40 +0000
@@ -0,0 +1,510 @@
+package ru.orangesoftware.financisto.activity;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+import ru.orangesoftware.financisto.R;
+import ru.orangesoftware.financisto.adapter.CreditCardStatementAdapter;
+import ru.orangesoftware.financisto.db.DatabaseAdapter;
+import ru.orangesoftware.financisto.db.MyEntityManager;
+import ru.orangesoftware.financisto.db.DatabaseHelper.TransactionColumns;
+import ru.orangesoftware.financisto.model.Account;
+import ru.orangesoftware.financisto.model.AccountType;
+import ru.orangesoftware.financisto.model.Currency;
+import ru.orangesoftware.financisto.utils.Utils;
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.MergeCursor;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageButton;
+import android.widget.TextView;
+
+/**
+ * Display the credit card bill, including scheduled and future transactions for a given period.
+ * Display only expenses, ignoring payments (positive values) in Credit Card accounts. 
+ * @author Abdsandryk
+ */
+public class MonthlyViewActivity extends ListActivity {
+	
+	private DatabaseAdapter dbAdapter;
+	private Cursor transactionsCursor;
+	
+	private long accountId = 0;
+	private Account account;
+	private Currency currency;
+	private boolean isCreditCard = false;
+	private boolean isStatementPreview = false;
+	
+	private String title;
+	private int closingDay = 0;
+	private int paymentDay = 0;
+	private String paymentDayStr;
+	
+	private int month = 0;
+	private String monthStr;
+	private int year = 0;
+	private String yearStr;
+	
+	private ImageButton bPrevious;
+	private ImageButton bNext;
+	
+	private int negativeColor;
+	private int positiveColor;
+	
+	private Utils u;
+
+	public static final String ACCOUNT_EXTRA = "account_id";
+	public static final String BILL_PREVIEW_EXTRA = "bill_preview";
+	
+	public static final String HEADER_PAYMENTS = "bill_payments";
+	public static final String HEADER_CREDITS  = "bill_credits";
+	public static final String HEADER_EXPENSES = "bill_expenses";
+	
+	/** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.monthly_view);
+        
+        u = new Utils(this);
+        negativeColor = this.getResources().getColor(R.color.negative_amount);
+        positiveColor = this.getResources().getColor(R.color.positive_amount);
+        
+        Intent intent = getIntent();
+		if (intent != null) {
+			accountId = intent.getLongExtra(ACCOUNT_EXTRA, 0);
+			isStatementPreview = intent.getBooleanExtra(BILL_PREVIEW_EXTRA, false);
+		}		
+		
+		initialize();
+    }
+    
+    /**
+     * When activity lifecycle ends, release resources
+     */
+    @Override
+    public void onDestroy() {
+    	// close cursor
+    	if (transactionsCursor != null) {
+    		transactionsCursor.close();
+    	}
+    	super.onDestroy();
+    }
+
+    
+    
+    /**
+     * Initialize data and GUI elements.
+     */
+    private void initialize() {
+    	
+    	// get account data
+		dbAdapter = new DatabaseAdapter(this);
+		dbAdapter.open();
+		
+		// set currency based on account
+		MyEntityManager em = new MyEntityManager(this, dbAdapter.db());
+		account = em.getAccount(accountId);
+		
+		dbAdapter.close();
+		
+        // get current month and year
+		Calendar cal = Calendar.getInstance();
+		month = cal.get(Calendar.MONTH) + 1;
+		year = cal.get(Calendar.YEAR);
+		
+		// set part of the title, based on account name: "<CCARD> Bill"
+		if (account != null) {
+			
+			// get account type
+			isCreditCard = AccountType.valueOf(account.type).isCreditCard;
+	
+			currency = account.currency;
+			
+			if (isCreditCard) {
+				if (isStatementPreview) { 
+					// assuming that expensesOnly is true only if payment and closing days > 0 [BlotterActivity]
+					title = getString(R.string.ccard_statement_title);
+					String accountTitle = account.title;
+					if (account.title==null || account.title.length()==0) {
+						accountTitle = account.cardIssuer;
+					}
+					String toReplace = getString(R.string.ccard_par);
+					title = title.replaceAll(toReplace, accountTitle);
+					paymentDay = account.paymentDay;
+					closingDay = account.closingDay;
+					// set activity window title
+					this.setTitle(R.string.ccard_statement);
+					setCCardTitle();
+					setCCardInterval();
+				} else {
+					title = (account.title==null||account.title.length()==0?account.cardIssuer:account.title);
+					paymentDay = 1;
+					closingDay = 31;
+					setTitle();
+					setInterval();
+					
+					// set payment date and label on total bar
+					TextView totalLabel = (TextView) findViewById(R.id.monthly_result_label);
+					totalLabel.setText(getResources().getString(R.string.monthly_result));
+				}
+			} else {
+				if (account.title==null||account.title.length()==0) {
+					if (isCreditCard) {
+						// title = <CARD_ISSUER>
+						title = account.cardIssuer;
+					} else {
+						// title = <ACCOUNT_TYPE_TITLE>
+						AccountType type = AccountType.valueOf(account.type);
+						title = getString(type.titleId);
+					}
+				} else {
+					// title = <TITLE>
+					title = account.title;
+				}
+				
+				paymentDay = 1;
+				closingDay = 31;
+				setTitle();
+				setInterval();
+				
+				// set payment date and label on total bar
+				TextView totalLabel = (TextView) findViewById(R.id.monthly_result_label);
+				totalLabel.setText(getResources().getString(R.string.monthly_result));
+			}		
+		
+			bPrevious = (ImageButton) findViewById(R.id.bt_month_previous);
+			bPrevious.setOnClickListener(new OnClickListener(){
+				@Override
+				public void onClick(View arg0) {
+					month--;
+					if (month<1) {
+						month=12;
+						year--;
+					}
+					if (isCreditCard) {
+						if (isStatementPreview) {
+							setCCardTitle();
+							setCCardInterval();
+						} else {
+							setTitle();
+							setInterval();
+						}
+					} else {
+						setTitle();
+						setInterval();
+					}
+				}			
+			});
+			
+			bNext = (ImageButton) findViewById(R.id.bt_month_next);
+			bNext.setOnClickListener(new OnClickListener(){
+				@Override
+				public void onClick(View arg0) {
+					month++;
+					if (month>12) {
+						month=1;
+						year++;
+					}
+					if (isCreditCard) {
+						if (isStatementPreview) {
+							setCCardTitle();
+							setCCardInterval();
+						} else {
+							setTitle();
+							setInterval();
+						}
+					} else {
+						setTitle();
+						setInterval();
+					}
+				}			
+			});
+		
+		}
+	}
+
+    /**
+     * Configure the interval based on the bill period of a credit card.
+     * Attention: 
+     *   Calendar.MONTH = 0 to 11
+     *   integer  month = 1 to 12
+     */
+	private void setCCardInterval() {
+		
+		Calendar close = getClosingDate(month, year);
+		Calendar open;
+		
+		if (month>1) {
+			// closing date from previous month
+			open = getClosingDate(month-1, year);
+		} else {
+			open = getClosingDate(12, year-1);
+		}
+		// add one day to the closing date of previous month
+		open.add(Calendar.DAY_OF_MONTH, +1);
+		
+		// adjust time for closing day
+		close.set(Calendar.HOUR_OF_DAY, 23);
+		close.set(Calendar.MINUTE, 59);
+		close.set(Calendar.SECOND, 59);
+		
+		fillData(open, close);
+	}
+	
+    /**
+     * Configure the interval in a monthly perspective.
+     * Attention: 
+     *   Calendar.MONTH = 0 to 11
+     *   integer  month = 1 to 12
+     */
+	private void setInterval() {
+		
+		Calendar close = new GregorianCalendar(year, month-1, getLastDayOfMonth(month, year));
+		Calendar open = new GregorianCalendar(year, month-1, 1);
+		
+		// adjust time for closing day
+		close.set(Calendar.HOUR_OF_DAY, 23);
+		close.set(Calendar.MINUTE, 59);
+		close.set(Calendar.SECOND, 59);
+		
+		fillData(open, close);
+	}
+	
+	/**
+	 * Returns the day on which the credit card bill closes for a given month/year.
+	 * @param month
+	 * @param year
+	 * @return
+	 */
+	private Calendar getClosingDate(int month, int year) {
+		int m = month;
+		if (closingDay > paymentDay) {
+			m--;
+		}
+		int maxDay = getLastDayOfMonth(m, year);
+		int day = closingDay;
+		if (closingDay>maxDay) {
+			day = maxDay;
+		}
+		
+		return new GregorianCalendar(year, m-1, day);
+	}
+	
+	/**
+	 * Return the last day (maximum value of day) of the given month.
+	 * @param month
+	 * @param year
+	 * @return
+	 */
+	private int getLastDayOfMonth(int month, int year) {
+		Calendar calCurr = GregorianCalendar.getInstance();
+		calCurr.set(year, month-1, 1); // Months are 0 to 11
+		return calCurr.getActualMaximum(GregorianCalendar.DAY_OF_MONTH);
+	}
+
+
+	/**
+	 * Get data for a given period and display the related credit card expenses. 
+	 * @param open Start of period.
+	 * @param close End of period.
+	 */
+	private void fillData(Calendar open, Calendar close) {
+		dbAdapter = new DatabaseAdapter(this);
+		dbAdapter.open();
+		
+		// closing cursor from previous request
+    	if (transactionsCursor != null) {
+    		transactionsCursor.close();
+    	}
+		
+		if (isStatementPreview) {
+			// display expenses and credits separated	    	
+			Cursor expenses = dbAdapter.getAllExpenses(String.valueOf(accountId), 
+    													  String.valueOf(open.getTimeInMillis()), 
+    													  String.valueOf(close.getTimeInMillis()));
+			Cursor credits = dbAdapter.getCredits(String.valueOf(accountId), 
+					  									String.valueOf(open.getTimeInMillis()), 
+					  									String.valueOf(close.getTimeInMillis()));
+			Cursor payments = dbAdapter.getPayments(String.valueOf(accountId), 
+														String.valueOf(open.getTimeInMillis()), 
+														String.valueOf(close.getTimeInMillis()));
+			transactionsCursor = new MergeCursor(new Cursor[] { getHeader(HEADER_PAYMENTS, payments.getCount()), payments, 
+																getHeader(HEADER_CREDITS, credits.getCount()), credits, 
+																getHeader(HEADER_EXPENSES, expenses.getCount()), expenses});
+			
+		} else {
+			// account filtering: credit card transactions, from open to close date
+			transactionsCursor = dbAdapter.getAllTransactions(String.valueOf(accountId), 
+    													  String.valueOf(open.getTimeInMillis()), 
+    													  String.valueOf(close.getTimeInMillis()));
+		}
+    	
+    	TextView totalText = (TextView)findViewById(R.id.monthly_result);
+    	
+    	if (transactionsCursor == null || transactionsCursor.getCount()==0) {
+    		// display total = 0
+    		u.setAmountText(totalText, currency, 0, false);
+    		totalText.setTextColor(Color.BLACK);
+    		totalText.setVisibility(View.VISIBLE);
+    		
+    		// hide list and display empty message
+    		this.getListView().setVisibility(View.GONE);
+    		((TextView)findViewById(android.R.id.empty)).setVisibility(View.VISIBLE);
+
+    	} else { // display data
+     		startManagingCursor(transactionsCursor);
+    		
+    		// Mapping data from database
+    		String[] from = new String[] {TransactionColumns.DATETIME, TransactionColumns.NOTE, TransactionColumns.FROM_AMOUNT};
+    		int[] to = new int[] {R.id.list_date, R.id.list_note, R.id.list_value};
+    		
+    		// Mapping data to view
+    		CreditCardStatementAdapter expenses =  new CreditCardStatementAdapter(this, R.layout.credit_card_transaction, transactionsCursor, from, to, currency);
+    		expenses.setStatementPreview(isStatementPreview);
+    		setListAdapter(expenses);
+    		
+    		// calculate total
+    		long total = calculateTotal(expenses.getCursor());
+    		// display total
+    		if (isStatementPreview) {
+    			u.setAmountText(totalText, currency, (-1)*total, false);
+    			totalText.setTextColor(Color.BLACK);
+    		} else {
+	    		if (total<0) { 
+	    			u.setAmountText(totalText, currency, (-1)*total, false);
+	    			totalText.setTextColor(negativeColor);
+	    		} else {
+	    			u.setAmountText(totalText, currency, total, false);
+	    			totalText.setTextColor(positiveColor);
+	    		}
+    		}
+    		totalText.setVisibility(View.VISIBLE);
+    		
+    		// display list and hide empty message
+    		this.getListView().setVisibility(View.VISIBLE);
+    		((TextView)findViewById(android.R.id.empty)).setVisibility(View.GONE);
+    	}
+    	
+    	dbAdapter.close();
+    	System.gc();
+    }
+	
+	/**
+	 * Calculate the total amount based on cursor expenses and various credits.
+	 * Credit card payments are not included.
+	 * @param cursor
+	 * @return The total amount.
+	 */
+	private long calculateTotal(Cursor cursor) {
+		long total = 0;
+		cursor.moveToFirst();
+		if (isStatementPreview) {
+			// exclude payments
+			for (int i=0; i<cursor.getCount(); i++) {
+				if (cursor.getInt(cursor.getColumnIndex(TransactionColumns.IS_CCARD_PAYMENT))==0) {
+					total += cursor.getLong(cursor.getColumnIndex(TransactionColumns.FROM_AMOUNT));
+				}
+				cursor.moveToNext();
+			}
+		} else {
+			// consider all transactions
+			for (int i=0; i<cursor.getCount(); i++) {
+				total += cursor.getLong(cursor.getColumnIndex(TransactionColumns.FROM_AMOUNT));
+				cursor.moveToNext();
+			}
+		}
+		
+		return total;		
+	}
+
+
+	/**
+	 * Adjust the title based on the credit card's payment day.
+	 */
+	private void setCCardTitle() {
+		
+		Calendar date = new GregorianCalendar(year, month-1, paymentDay);
+		
+		monthStr = Integer.toString(date.get(Calendar.MONTH)+1);
+		yearStr = Integer.toString(date.get(Calendar.YEAR));
+		
+		if (paymentDay<10) {
+        	paymentDayStr = "0"+paymentDay;
+        } else {
+        	paymentDayStr = Integer.toString(paymentDay);
+        }
+		
+		if (monthStr.length()<2) {
+			monthStr = "0"+monthStr;
+		}
+		
+		String pd = paymentDayStr + "/" + monthStr + "/" + yearStr;
+		
+        // set payment date and label on title bar
+		TextView label = (TextView)findViewById(R.id.monthly_view_title);
+		label.setText(title+"\n" + pd);
+		// set payment date and label on total bar
+		TextView totalLabel = (TextView) findViewById(R.id.monthly_result_label);
+		totalLabel.setText(getResources().getString(R.string.bill_on)+" "+pd);
+	}
+	
+	/**
+	 * Adjust the title based on the credit card's payment day.
+	 */
+	private void setTitle() {
+		
+		Calendar date = new GregorianCalendar(year, month-1, 1);
+		 
+		SimpleDateFormat dateFormat = new SimpleDateFormat("MMMMM yyyy");  
+		String pd = dateFormat.format(date.getTime()); 
+		
+		TextView label = (TextView)findViewById(R.id.monthly_view_title);
+		label.setText(title+"\n" + pd);
+		
+	}
+
+	// Update view 
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+			super.onActivityResult(requestCode, resultCode, data);
+		setCCardInterval();
+	}
+	
+	private Cursor getHeader(String type, int count) {
+		MatrixCursor header = new MatrixCursor(new String[] {
+				TransactionColumns.ID, 
+				TransactionColumns.FROM_ACCOUNT_ID, 
+				TransactionColumns.TO_ACCOUNT_ID,
+				TransactionColumns.CATEGORY_ID, 
+				TransactionColumns.PROJECT_ID, 
+				TransactionColumns.NOTE, 
+				TransactionColumns.FROM_AMOUNT, 
+				TransactionColumns.TO_AMOUNT,
+				TransactionColumns.DATETIME,
+				TransactionColumns.LOCATION_ID,
+				TransactionColumns.PROVIDER, 
+				TransactionColumns.ACCURACY, 
+				TransactionColumns.LATITUDE, 
+				TransactionColumns.LONGITUDE,
+				TransactionColumns.IS_TEMPLATE,
+				TransactionColumns.TEMPLATE_NAME,
+				TransactionColumns.RECURRENCE,
+				TransactionColumns.NOTIFICATION_OPTIONS,
+				TransactionColumns.STATUS,
+				TransactionColumns.ATTACHED_PICTURE,
+				TransactionColumns.IS_CCARD_PAYMENT, type});
+		if (count>0) {
+			header.addRow(new Object[] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,count});
+		}
+		return header;
+	}
+	
+	
+}

=== added file 'src/ru/orangesoftware/financisto/adapter/CreditCardStatementAdapter.java'
--- src/ru/orangesoftware/financisto/adapter/CreditCardStatementAdapter.java	1970-01-01 00:00:00 +0000
+++ src/ru/orangesoftware/financisto/adapter/CreditCardStatementAdapter.java	2010-08-22 11:18:40 +0000
@@ -0,0 +1,217 @@
+package ru.orangesoftware.financisto.adapter;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+import ru.orangesoftware.financisto.R;
+import ru.orangesoftware.financisto.activity.MonthlyViewActivity;
+import ru.orangesoftware.financisto.db.DatabaseAdapter;
+import ru.orangesoftware.financisto.db.DatabaseHelper.TransactionColumns;
+import ru.orangesoftware.financisto.model.Currency;
+import ru.orangesoftware.financisto.utils.Utils;
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Filterable;
+import android.widget.SimpleCursorAdapter;
+import android.widget.TextView;
+
+public class CreditCardStatementAdapter extends SimpleCursorAdapter implements Filterable {
+ 
+	    private int layout;
+	    
+	    private Utils u;
+	    private Currency currency;
+	    
+	    private final int scheduledStyle = Typeface.ITALIC;
+	    private final int scheduledColor;
+		private final int futureColor;
+		private final int negativeColor;
+	    private final int normalStyle = Typeface.NORMAL;
+	    private final int normalColor = Color.LTGRAY;
+	    
+	    private boolean isStatementPreview = false;
+
+		/**
+	     * Create an adapter to display the expenses list of a credit card bill.
+	     * @param context The context.
+	     * @param layout The layout id.
+	     * @param c The cursor with all the expenses of a given credit card bill.
+	     * @param from Array of columns.
+	     * @param to Id of the columns in layout.
+	     * @param cur The credit card base currency.
+	     */
+	    public CreditCardStatementAdapter (Context context, int layout, Cursor c, String[] from, int[] to, Currency cur) {
+	        super(context, layout, c, from, to);
+	        this.layout = layout;
+	        u = new Utils(context);
+	        this.currency = cur;
+	        futureColor = context.getResources().getColor(R.color.future_color);
+	        scheduledColor = context.getResources().getColor(R.color.scheduled);
+	        negativeColor = context.getResources().getColor(R.color.negative_amount);
+	    }
+	    
+	    public boolean isStatementPreview() {
+			return isStatementPreview;
+		}
+
+		public void setStatementPreview(boolean isStatementPreview) {
+			this.isStatementPreview = isStatementPreview;
+		}
+	 
+	    @Override
+	    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+	 
+	        Cursor c = getCursor();
+	 
+	        final LayoutInflater inflater = LayoutInflater.from(context);
+	        View v = inflater.inflate(layout, parent, false);
+	 
+	        updateListItem(v, context, c);
+	 
+	        return v;
+	    }
+	 
+	    @Override
+	    public void bindView(View v, Context context, Cursor c) {
+    		updateListItem(v, context, c);	        
+	    }
+	    
+	    /**
+	     * Update the list of expenses, displaying the elements of the Cursor. 
+	     * @param v The view.
+	     * @param context The context.
+	     * @param c The cursor with all the bill transactions
+	     */
+	    private void updateListItem(View v, Context context, Cursor c) {
+	    	// get amount of expense
+	    	int valueCol = c.getColumnIndex(TransactionColumns.FROM_AMOUNT);
+	    	long value = c.getLong(valueCol);
+	    	// is scheduled?
+	    	boolean isScheduled = c.getInt(c.getColumnIndex(TransactionColumns.IS_TEMPLATE))==2;
+	        
+	        // get columns values or needed parameters
+	        long date = c.getLong(TransactionColumns.Indicies.DATETIME);
+	        String note = c.getString(TransactionColumns.Indicies.NOTE);
+	        int locId = c.getInt(TransactionColumns.Indicies.LOCATION_ID);
+	        String location = null;
+	        String desc = "";
+	        boolean future = date>Calendar.getInstance().getTimeInMillis();
+	        
+	        // draw headers for payments, various credits and expenses sections
+	        if (c.getColumnIndex(MonthlyViewActivity.HEADER_PAYMENTS) != -1) {
+        		drawGroupTitle(context.getResources().getString(R.string.header_payments), v);   	
+	        	return;
+	        } else if (c.getColumnIndex(MonthlyViewActivity.HEADER_CREDITS) != -1) {
+	        	drawGroupTitle(context.getResources().getString(R.string.header_credits), v); 
+	        	return;
+	        } else if (c.getColumnIndex(MonthlyViewActivity.HEADER_EXPENSES) != -1) {
+	        	drawGroupTitle(context.getResources().getString(R.string.header_expenses), v); 
+	        	return;
+	        } 
+	        
+	        /* 
+	         * Set description: 
+	         * a) if location is set, format description considering location
+	         *    - "Location (Note)"
+	         * b) otherwise, show description as note
+	         *    - "Note" 
+	         */
+	        if (locId>0) { 
+	        	DatabaseAdapter dba = new DatabaseAdapter(context);
+	        	dba.open();
+	        	location = dba.getLocation(locId).name;
+	        	dba.close();
+	        	if (note!=null && note.length()>0) {
+	        		desc = location+" ("+note+")";
+	        	} else {
+	        		desc = location;
+	        	}
+	        } else {
+	        	desc = note;
+	        }
+	 
+	        // set expenses date, description and value to the respective columns
+	        TextView dateText = (TextView) v.findViewById(R.id.list_date);
+	        TextView descText = (TextView) v.findViewById(R.id.list_note);
+	        TextView valueText = (TextView) v.findViewById(R.id.list_value);
+	
+	        dateText.setBackgroundColor(Color.rgb(17,17,17));
+        	descText.setBackgroundColor(Color.rgb(17,17,17));
+        	valueText.setBackgroundColor(Color.rgb(17,17,17));
+        	
+	        if (dateText != null) {
+	            dateText.setText(getDate(date)+" ");
+	        }
+	        if (descText != null) {
+	            descText.setText(desc);
+	        }
+	        if (valueText != null) {
+	        	if (isStatementPreview) {
+	        		u.setAmountText(valueText, currency, (-1)*value, false);
+	        	} else {
+	        		u.setAmountText(valueText, currency, value, false);
+	        	}
+	        }
+	        
+	        // set style 
+	        if (isScheduled) {
+	        	dateText.setTypeface(Typeface.defaultFromStyle(scheduledStyle), scheduledStyle);
+	        	descText.setTypeface(Typeface.defaultFromStyle(scheduledStyle), scheduledStyle);
+	        	valueText.setTypeface(Typeface.defaultFromStyle(scheduledStyle), scheduledStyle);
+	        	dateText.setTextColor(scheduledColor);
+	        	descText.setTextColor(scheduledColor);
+	        	valueText.setTextColor(scheduledColor);
+	        } else {
+	        	dateText.setTypeface(Typeface.defaultFromStyle(normalStyle), normalStyle);
+	        	descText.setTypeface(Typeface.defaultFromStyle(normalStyle), normalStyle);
+	        	valueText.setTypeface(Typeface.defaultFromStyle(normalStyle), normalStyle);
+	        	
+	        	// set color
+				if (future) {
+					// future expenses
+					dateText.setTextColor(futureColor);
+		        	descText.setTextColor(futureColor);
+		        	valueText.setTextColor(futureColor);	
+				} else {
+					// normal
+					dateText.setTextColor(normalColor);
+		        	descText.setTextColor(normalColor);
+		        	// display colored negative values in month preview, but not in bill preview 
+		        	if (value<0 && !isStatementPreview) valueText.setTextColor(negativeColor); else valueText.setTextColor(normalColor);
+				}       	
+	        }
+	    }
+	    
+	    private void drawGroupTitle(String title, View v) {
+	    	TextView dateText = (TextView) v.findViewById(R.id.list_date);
+	        TextView descText = (TextView) v.findViewById(R.id.list_note);
+	        TextView valueText = (TextView) v.findViewById(R.id.list_value);
+        	dateText.setText("");
+	        descText.setText(title);
+	        valueText.setText("");
+	        dateText.setBackgroundColor(Color.DKGRAY);
+        	descText.setBackgroundColor(Color.DKGRAY);
+        	valueText.setBackgroundColor(Color.DKGRAY);
+        	descText.setTypeface(Typeface.defaultFromStyle(normalStyle), normalStyle);
+        	descText.setTextColor(normalColor);
+	    }
+	    
+	    /**
+	     * Return the string for date in the following format: dd/MM/yy.
+	     * @param date Time in milliseconds.
+	     * @return The string representing the given time in the format dd/MM/yy.
+	     */
+	    private String getDate(long date) {
+	    	Calendar cal = new GregorianCalendar();
+        	cal.setTimeInMillis(date);
+        	int d = cal.get(Calendar.DAY_OF_MONTH);
+        	int m = cal.get(Calendar.MONTH)+1;
+        	int y = cal.get(Calendar.YEAR);
+        	return (d<10?"0"+d:d)+"/"+(m<10?"0"+m:m)+"/"+(y-2000);
+	    }
+	}

=== modified file 'src/ru/orangesoftware/financisto/backup/DatabaseImport.java'
--- src/ru/orangesoftware/financisto/backup/DatabaseImport.java	2010-08-05 13:50:00 +0000
+++ src/ru/orangesoftware/financisto/backup/DatabaseImport.java	2010-08-22 11:18:40 +0000
@@ -17,6 +17,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 
 import ru.orangesoftware.financisto.db.Database;
@@ -29,9 +30,10 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
+//import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
+import api.wireless.gdata.docs.client.DocsClient;
 
 public class DatabaseImport {
 
@@ -49,7 +51,31 @@
 	
 	public void importDatabase() throws IOException {
 		File file = new File(Export.EXPORT_PATH, backupFile);
-		InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "UTF-8");
+		FileInputStream inputStream = new FileInputStream(file);
+		recoverDatabase(inputStream);
+	}
+	
+	/**
+	 * Get backup file from Google docs
+	 * 
+	 * @param docsClient The Google Docs connection
+	 * @param resourceId the key of the recovery document on google docs
+	 **/
+	public void importOnlineDatabase(DocsClient docsClient, String resourceId) throws Exception {
+		InputStream inputStream=null;
+		inputStream = docsClient.getDocumentMediaAsTXT(resourceId);
+		recoverDatabase(inputStream);
+		inputStream.close();
+	}
+	
+	/**
+	 * Recover database from a inputStream
+	 * 
+	 * @param inputStream stream with the backup data
+	 **/
+	protected void recoverDatabase(InputStream inputStream) throws IOException
+	{
+		InputStreamReader isr = new InputStreamReader(inputStream, "UTF-8");
 		BufferedReader br = new BufferedReader(isr, 65535);
 		try {
 			db.beginTransaction();
@@ -101,14 +127,14 @@
 		}
 	}
 
-	private void printCurrentSchema() {
+	/*private void printCurrentSchema() {
 		Cursor c = db.rawQuery("SELECT * FROM sqlite_master where type='table'", null);
 		try {
 			DatabaseUtils.dumpCursor(c);
 		} finally {
 			c.close();
 		}
-	}
+	}*/
 
 	private void scheduleAll() {
 		FinancistoService.scheduleAll(context, new MyEntityManager(context, db));

=== added file 'src/ru/orangesoftware/financisto/backup/SettingsNotConfiguredException.java'
--- src/ru/orangesoftware/financisto/backup/SettingsNotConfiguredException.java	1970-01-01 00:00:00 +0000
+++ src/ru/orangesoftware/financisto/backup/SettingsNotConfiguredException.java	2010-08-22 11:18:40 +0000
@@ -0,0 +1,33 @@
+/* Copyright (c) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package ru.orangesoftware.financisto.backup;
+
+/**
+ * Exceção usada quando ocorre algum erro relacionado aos parametros de configuração do usuário 
+ * */
+public class SettingsNotConfiguredException extends Exception {
+	
+	public static final long serialVersionUID = 1;
+	
+	public SettingsNotConfiguredException() {
+		super();
+	}
+	
+	public SettingsNotConfiguredException(String msg) {
+		super(msg);
+	}
+}

=== modified file 'src/ru/orangesoftware/financisto/db/DatabaseAdapter.java'
--- src/ru/orangesoftware/financisto/db/DatabaseAdapter.java	2010-07-27 13:00:40 +0000
+++ src/ru/orangesoftware/financisto/db/DatabaseAdapter.java	2010-08-22 11:18:40 +0000
@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     Denis Solonenko - initial API and implementation
+ *     Abdsandryk - implement getAllExpenses method for bill filtering
  ******************************************************************************/
 package ru.orangesoftware.financisto.db;
 
@@ -39,11 +40,13 @@
 import ru.orangesoftware.financisto.db.DatabaseHelper.CategoryAttributeColumns;
 import ru.orangesoftware.financisto.db.DatabaseHelper.CategoryColumns;
 import ru.orangesoftware.financisto.db.DatabaseHelper.CategoryViewColumns;
+import ru.orangesoftware.financisto.db.DatabaseHelper.LocationColumns;
 import ru.orangesoftware.financisto.db.DatabaseHelper.TransactionAttributeColumns;
 import ru.orangesoftware.financisto.db.DatabaseHelper.TransactionColumns;
 import ru.orangesoftware.financisto.model.Attribute;
 import ru.orangesoftware.financisto.model.Category;
 import ru.orangesoftware.financisto.model.CategoryTree;
+import ru.orangesoftware.financisto.model.MyLocation;
 import ru.orangesoftware.financisto.model.SystemAttribute;
 import ru.orangesoftware.financisto.model.Total;
 import ru.orangesoftware.financisto.model.Transaction;
@@ -53,6 +56,7 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
+import android.database.MergeCursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.util.Log;
@@ -181,6 +185,100 @@
 				BlotterColumns.DATETIME+" DESC");
 	}
 
+	/**
+	 * [Bill Filtering] Returns all the expenses (negative amount) for a given Account in a given period.
+	 * @param accountId Account id.
+	 * @param start Start date.
+	 * @param end End date.
+	 * @return Transactions (negative amount) of the given Account, from start date to end date.
+	 */
+	public Cursor getAllExpenses(String accountId, String start, String end) {
+		// query
+		String where = TransactionColumns.FROM_ACCOUNT_ID+"=? AND "+TransactionColumns.FROM_AMOUNT+"<? AND "+
+					   TransactionColumns.DATETIME+">? AND "+TransactionColumns.DATETIME+"<?";
+		
+		try {
+			Cursor c = db.query(TRANSACTION_TABLE, TransactionColumns.NORMAL_PROJECTION, 
+					   where, new String[]{accountId, "0", start, end}, null, null, TransactionColumns.DATETIME);
+			return c;
+		} catch(SQLiteException e) {
+			return null;
+		}
+	}
+	
+	
+	/**
+	 * [Bill Filtering] Returns the credits (positive amount) for a given Account in a given period, excluding payments.
+	 * @param accountId Account id.
+	 * @param start Start date.
+	 * @param end End date.
+	 * @return Transactions (positive amount) of the given Account, from start date to end date.
+	 */
+	public Cursor getCredits(String accountId, String start, String end) {
+		// query
+		String where = TransactionColumns.FROM_ACCOUNT_ID+"=? AND "+TransactionColumns.FROM_AMOUNT+">? AND "+
+					   TransactionColumns.DATETIME+">? AND "+TransactionColumns.DATETIME+"<? AND "+
+					   TransactionColumns.IS_CCARD_PAYMENT+"=?";
+		
+		try {
+			Cursor c = db.query(TRANSACTION_TABLE, TransactionColumns.NORMAL_PROJECTION, 
+					   where, new String[]{accountId, "0", start, end, "0"}, null, null, TransactionColumns.DATETIME);
+			return c;
+		} catch(SQLiteException e) {
+			return null;
+		}
+	}
+	
+	/**
+	 * [Bill Filtering] Returns all the payments for a given Credit Card Account in a given period.
+	 * @param accountId Account id.
+	 * @param start Start date.
+	 * @param end End date.
+	 * @return Transactions of the given Account, from start date to end date.
+	 */
+	public Cursor getPayments(String accountId, String start, String end) {
+		// query direct payments
+		String where = TransactionColumns.FROM_ACCOUNT_ID+"=? AND "+TransactionColumns.FROM_AMOUNT+">? AND "+
+						TransactionColumns.DATETIME+">? AND "+TransactionColumns.DATETIME+"<? AND "+
+						TransactionColumns.IS_CCARD_PAYMENT+"=?";
+		
+		String whereTransfer =  TransactionColumns.TO_ACCOUNT_ID+"=? AND "+TransactionColumns.TO_AMOUNT+">? AND "+
+								TransactionColumns.DATETIME+">? AND "+TransactionColumns.DATETIME+"<? AND "+
+								TransactionColumns.IS_CCARD_PAYMENT+"=?";
+		
+		try {
+			Cursor c1 = db.query(TRANSACTION_TABLE, TransactionColumns.NORMAL_PROJECTION, 
+					   	where, new String[]{accountId, "0", start, end, "1"}, null, null, TransactionColumns.DATETIME);
+			Cursor c2 = db.query(TRANSACTION_TABLE, TransactionColumns.NORMAL_PROJECTION, 
+						whereTransfer, new String[]{accountId, "0", start, end, "1"}, null, null, TransactionColumns.DATETIME);
+			Cursor c = new MergeCursor(new Cursor[] {c1, c2});
+			return c;
+		} catch(SQLiteException e) {
+			return null;
+		}
+	}
+	
+	/**
+	 * [Monthly view] Returns all the transactions for a given Account in a given period (month).
+	 * @param accountId Account id.
+	 * @param start Start date.
+	 * @param end End date.
+	 * @return Transactions (negative value) of the given Account, from start date to end date.
+	 */
+	public Cursor getAllTransactions(String accountId, String start, String end) {
+		// query
+		String where = TransactionColumns.FROM_ACCOUNT_ID+"=? AND "+
+					   TransactionColumns.DATETIME+">? AND "+TransactionColumns.DATETIME+"<?";
+		
+		try {
+			Cursor c = db.query(TRANSACTION_TABLE, TransactionColumns.NORMAL_PROJECTION, 
+					   where, new String[]{accountId, start, end}, null, null, TransactionColumns.DATETIME);
+			return c;
+		} catch(SQLiteException e) {
+			return null;
+		}
+	}
+	
 	public Cursor getTransactions(WhereFilter filter) {
 		String sortOrder = getBlotterSortOrder(filter);
 		return db.query(V_BLOTTER_FOR_ACCOUNT, BlotterColumns.NORMAL_PROJECTION, 
@@ -962,6 +1060,37 @@
 			c.close();
 		}		
 	}
+	
+	
+	/**
+	 * Gets the location for a given id.
+	 * @param id
+	 * @return
+	 */
+	public MyLocation getLocation(long id) {
+		Cursor c = db.query(LOCATIONS_TABLE, LocationColumns.NORMAL_PROJECTION, 
+				LocationColumns.ID+"=?", new String[]{String.valueOf(id)}, null, null, null);
+		try {
+			if (c.moveToNext()) {				
+				MyLocation loc = new MyLocation();
+				loc.id = id;
+				loc.accuracy = c.getLong(c.getColumnIndex(LocationColumns.ACCURACY));
+				loc.dateTime = c.getLong(c.getColumnIndex(LocationColumns.DATETIME));
+				loc.isPayee = false;
+				loc.latitude = c.getDouble(c.getColumnIndex(LocationColumns.LATITUDE));
+				loc.longitude = c.getDouble(c.getColumnIndex(LocationColumns.LONGITUDE));
+				loc.name = c.getString(c.getColumnIndex(LocationColumns.NAME));
+				loc.provider = c.getString(c.getColumnIndex(LocationColumns.PROVIDER));
+				loc.resolvedAddress = c.getString(c.getColumnIndex(LocationColumns.RESOLVED_ADDRESS));
+				
+				return loc;
+			} else {
+				return new MyLocation();
+			}
+		} finally {
+			c.close();
+		}
+	}
 
 }
 

=== modified file 'src/ru/orangesoftware/financisto/db/DatabaseHelper.java'
--- src/ru/orangesoftware/financisto/db/DatabaseHelper.java	2010-08-19 10:35:29 +0000
+++ src/ru/orangesoftware/financisto/db/DatabaseHelper.java	2010-08-22 11:18:40 +0000
@@ -82,7 +82,8 @@
 		public static final String RECURRENCE = "recurrence";
 		public static final String NOTIFICATION_OPTIONS = "notification_options";		
 		public static final String STATUS = "status";		
-		public static final String ATTACHED_PICTURE = "attached_picture";		
+		public static final String ATTACHED_PICTURE = "attached_picture";
+		public static final String IS_CCARD_PAYMENT = "is_ccard_payment";
 		
 		public static String[] NORMAL_PROJECTION = {
 			ID, 
@@ -104,7 +105,8 @@
 			RECURRENCE,
 			NOTIFICATION_OPTIONS,
 			STATUS,
-			ATTACHED_PICTURE};
+			ATTACHED_PICTURE,
+			IS_CCARD_PAYMENT};
 
 		public static class Indicies {
 			public static final int ID = 0;
@@ -127,6 +129,7 @@
 			public static final int NOTIFICATION_OPTIONS = 17;
 			public static final int STATUS = 18;
 			public static final int ATTACHED_PICTURE = 19;
+			public static final int IS_CCARD_PAYMENT = 20;
 		}
 		
 		private TransactionColumns() {}
@@ -157,7 +160,7 @@
 		public static final String TEMPLATE_NAME = "template_name";
 		public static final String RECURRENCE = "recurrence";
 		public static final String NOTIFICATION_OPTIONS = "notification_options";		
-		public static final String STATUS = "status";		
+		public static final String STATUS = "status";
 
 		public static final String[] NORMAL_PROJECTION = {
 			ID,
@@ -233,6 +236,8 @@
 		public static final String SORT_ORDER = "sort_order";
 		public static final String LAST_CATEGORY_ID = "last_category_id";
 		public static final String LAST_ACCOUNT_ID = "last_account_id";
+		public static final String CLOSING_DAY = "closing_day";
+		public static final String PAYMENT_DAY = "payment_day";
 		
 		private AccountColumns() {}
 
@@ -395,4 +400,19 @@
 		public static String[] NORMAL_PROJECTION = {ID, NAME, CURRENCY_ID, AMOUNT, LEFT, RIGHT};		
 	}
 	
+	public static class LocationColumns {
+		
+		public static final String ID = "_id";
+		public static final String NAME = "name";	
+		public static final String DATETIME = "datetime";
+		public static final String PROVIDER = "provider";
+		public static final String ACCURACY = "accuracy";
+		public static final String LATITUDE = "latitude";
+		public static final String LONGITUDE = "longitude";
+		public static final String IS_PAYEE = "is_payee";
+		public static final String RESOLVED_ADDRESS = "resolved_address";
+		
+		public static String[] NORMAL_PROJECTION = {ID, NAME, DATETIME, PROVIDER, ACCURACY, LATITUDE, LONGITUDE, IS_PAYEE, RESOLVED_ADDRESS};		
+	}
+	
 }

=== modified file 'src/ru/orangesoftware/financisto/export/Export.java'
--- src/ru/orangesoftware/financisto/export/Export.java	2010-06-02 15:22:10 +0000
+++ src/ru/orangesoftware/financisto/export/Export.java	2010-08-22 11:18:40 +0000
@@ -11,32 +11,77 @@
 package ru.orangesoftware.financisto.export;
 
 import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import api.wireless.gdata.docs.client.DocsClient;
+import api.wireless.gdata.docs.data.DocumentEntry;
+import api.wireless.gdata.docs.data.FolderEntry;
+
 public abstract class Export {
 	
 	public static final String EXPORT_PATH = "/sdcard/financisto/";
 
 	public String export() throws Exception {
-		SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd'_'HHmmss'_'SSS");
-		String fileName = df.format(new Date())+getExtension();
+		String fileName = generateFilename();
 		File path = new File(getPath());
 		path.mkdirs();
 		File file = new File(path, fileName);		
-		OutputStreamWriter osw = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
+		FileOutputStream outputStream = new FileOutputStream(file);
+		generateBackup(outputStream);
+		return fileName;
+	}
+	
+	/**
+	 * Backup database to google docs
+	 * 
+	 * @param docsClient Google docs connection
+	 * @param folder Google docs folder name 
+	 * */
+	public String exportOnline(DocsClient docsClient, String folder) throws Exception {
+		// generation backup file
+		String fileName = generateFilename();
+		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+		generateBackup(outputStream);
+		
+		// transforming streams
+		InputStream backup = new ByteArrayInputStream(outputStream.toByteArray()); 
+		
+		// creating document on Google Docs
+		DocumentEntry entry = new DocumentEntry();
+		entry.setTitle(fileName);
+		FolderEntry fd = docsClient.getFolderByTitle(folder);
+		docsClient.createDocumentInFolder(entry, backup, "text/plain",fd.getKey());
+		
+		return fileName;
+	}
+	
+	private String generateFilename()
+	{
+		SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd'_'HHmmss'_'SSS");
+		return df.format(new Date())+getExtension();
+	}
+	
+	private void generateBackup(OutputStream outputStream) throws Exception 
+	{
+		OutputStreamWriter osw = new OutputStreamWriter(outputStream, "UTF-8");
 		BufferedWriter bw = new BufferedWriter(osw, 65536);
+
 		try {			
 			writeHeader(bw);
 			writeBody(bw);
 			writeFooter(bw);
-			return fileName;
-		} finally {
+		}
+		finally {
 			bw.close();
-		}		
+		}	
 	}
 
 	protected abstract  void writeHeader(BufferedWriter bw) throws Exception;

=== modified file 'src/ru/orangesoftware/financisto/export/ImportExportAsyncTask.java'
--- src/ru/orangesoftware/financisto/export/ImportExportAsyncTask.java	2010-06-02 15:22:10 +0000
+++ src/ru/orangesoftware/financisto/export/ImportExportAsyncTask.java	2010-08-22 11:18:40 +0000
@@ -51,19 +51,19 @@
 	@Override
 	protected void onPostExecute(Object result) {
 		dialog.dismiss();
-		String message;
-		String title;
-		if (result instanceof Exception) {
-			Exception e = (Exception)result;
-			title = context.getString(R.string.fail);
-			message = e.getClass().getSimpleName()+":"+e.getMessage();
-		} else {
-			title = context.getString(R.string.success);
-			message = getSuccessMessage(result);
-		}
+		String message=null;
+		String title=null;
+
+		if (result instanceof Exception) 
+			return;
+
+		title = context.getString(R.string.success);
+		message = getSuccessMessage(result);
+		
 		if (listener != null) {
 			listener.onCompleted();
 		}
+		
 		new AlertDialog.Builder(context)
 			.setTitle(title)
 			.setMessage(message)

=== modified file 'src/ru/orangesoftware/financisto/model/Account.java'
--- src/ru/orangesoftware/financisto/model/Account.java	2010-06-02 15:22:10 +0000
+++ src/ru/orangesoftware/financisto/model/Account.java	2010-08-22 11:18:40 +0000
@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     Denis Solonenko - initial API and implementation
+ *     Abdsandryk - parameters for bill filtering
  ******************************************************************************/
 package ru.orangesoftware.financisto.model;
 
@@ -65,4 +66,12 @@
 
 	@Column(name = "last_category_id")
 	public long lastCategoryId;
+	
+	/** parameters for credit card bills filtering */
+	@Column(name = "closing_day")
+	public int closingDay;
+	
+	@Column(name = "payment_day")
+	public int paymentDay;
+	/***********************************************/
 }

=== modified file 'src/ru/orangesoftware/financisto/model/AccountType.java'
--- src/ru/orangesoftware/financisto/model/AccountType.java	2010-06-02 15:22:10 +0000
+++ src/ru/orangesoftware/financisto/model/AccountType.java	2010-08-22 11:18:40 +0000
@@ -7,33 +7,37 @@
  * 
  * Contributors:
  *     Denis Solonenko - initial API and implementation
+ *     Abdsandryk - parameters for bill filtering
  ******************************************************************************/
 package ru.orangesoftware.financisto.model;
 
 import ru.orangesoftware.financisto.R;
 
 public enum AccountType {
-	CASH(R.string.account_type_cash, R.drawable.account_type_cash, false, false, false), 
-	BANK(R.string.account_type_bank, R.drawable.account_type_bank, true, false, false), 
-	DEBIT_CARD(R.string.account_type_debit_card, R.drawable.account_type_debit_card, true, true, true), 
-	CREDIT_CARD(R.string.account_type_credit_card, R.drawable.account_type_credit_card, true, true, true), 
-	ASSET(R.string.account_type_asset, R.drawable.account_type_other, false, false, false),
-	LIABILITY(R.string.account_type_liability, R.drawable.account_type_other, false, false, false),
-	OTHER(R.string.account_type_other, R.drawable.account_type_other, false, false, false);
+	CASH(R.string.account_type_cash, R.drawable.account_type_cash, false, false, false, false), 
+	BANK(R.string.account_type_bank, R.drawable.account_type_bank, true, false, false, false), 
+	DEBIT_CARD(R.string.account_type_debit_card, R.drawable.account_type_debit_card, true, true, true, false), 
+	CREDIT_CARD(R.string.account_type_credit_card, R.drawable.account_type_credit_card, true, true, true, true), 
+	ASSET(R.string.account_type_asset, R.drawable.account_type_other, false, false, false, false),
+	LIABILITY(R.string.account_type_liability, R.drawable.account_type_other, false, false, false, false),
+	OTHER(R.string.account_type_other, R.drawable.account_type_other, false, false, false, false);
 	
 	public final int titleId;
 	public final int iconId;
 	public final boolean hasIssuer;
 	public final boolean hasNumber;
 	public final boolean isCard;
+	public final boolean isCreditCard;
 	
 	private AccountType(int titleId, int iconId, 
-			boolean hasIssuer, boolean hasNumber, boolean isCard) {
+			boolean hasIssuer, boolean hasNumber, boolean isCard, boolean isCreditCard) {
 		this.titleId = titleId;
 		this.iconId = iconId;
 		this.hasIssuer = hasIssuer;
 		this.hasNumber = hasNumber;
 		this.isCard = isCard;
+		this.isCreditCard = isCreditCard;
+
 	}
 	
 }

=== modified file 'src/ru/orangesoftware/financisto/model/Transaction.java'
--- src/ru/orangesoftware/financisto/model/Transaction.java	2010-06-17 15:30:33 +0000
+++ src/ru/orangesoftware/financisto/model/Transaction.java	2010-08-22 11:18:40 +0000
@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *     Denis Solonenko - initial API and implementation
+ *     Abdsandryk - identifying credit card payments
  ******************************************************************************/
 package ru.orangesoftware.financisto.model;
 
@@ -89,6 +90,9 @@
 	
 	@Column(name = "attached_picture")
 	public String attachedPicture;
+	
+	@Column(name = "is_ccard_payment")
+	public int isCCardPayment;
 
 	@Transient
 	public EnumMap<SystemAttribute, String> systemAttributes;
@@ -114,6 +118,7 @@
 		values.put(TransactionColumns.NOTIFICATION_OPTIONS, notificationOptions);
 		values.put(TransactionColumns.STATUS, status.name());
 		values.put(TransactionColumns.ATTACHED_PICTURE, attachedPicture);
+		values.put(TransactionColumns.IS_CCARD_PAYMENT, isCCardPayment);
 		return values;
 	}
 
@@ -140,6 +145,7 @@
 		t.notificationOptions = c.getString(TransactionColumns.Indicies.NOTIFICATION_OPTIONS);	
 		t.status = TransactionStatus.valueOf(c.getString(TransactionColumns.Indicies.STATUS));
 		t.attachedPicture = c.getString(TransactionColumns.Indicies.ATTACHED_PICTURE);
+		t.isCCardPayment = c.getInt(TransactionColumns.Indicies.IS_CCARD_PAYMENT);
 		return t;
 	}		
 	
@@ -163,6 +169,10 @@
 		return isTemplate == 0;
 	}
 	
+	public boolean isCreditCardPayment() {
+		return isCCardPayment == 1;
+	}
+	
 	public String getSystemAttribute(SystemAttribute sa) {
 		return systemAttributes != null ? systemAttributes.get(sa) : null;
 	}

=== modified file 'src/ru/orangesoftware/financisto/utils/MyPreferences.java'
--- src/ru/orangesoftware/financisto/utils/MyPreferences.java	2010-08-19 10:35:29 +0000
+++ src/ru/orangesoftware/financisto/utils/MyPreferences.java	2010-08-22 11:18:40 +0000
@@ -125,6 +125,30 @@
 		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
 		return Integer.parseInt(sharedPreferences.getString("ntsl_show_location_order", "1"));
 	}
+	
+	/**
+	 * Get google docs user login registered on preferences
+	 * */
+	public static String getUserLogin(Context context) {
+		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+		return sharedPreferences.getString("user_login", null);
+	}
+
+	/**
+	 * Get google docs user password registered on preferences
+	 * */
+	public static String getUserPassword(Context context) {
+		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+		return sharedPreferences.getString("user_password", null);
+	}
+
+	/**
+	 * Get google docs backup folder registered on preferences
+	 * */
+	public static String getBackupFolder(Context context) {
+		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+		return sharedPreferences.getString("backup_folder", null);
+	}
 
 	public static boolean isShowNote(Context context) {
 		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);

=== modified file 'src/ru/orangesoftware/financisto/widget/AmountInput.java'
--- src/ru/orangesoftware/financisto/widget/AmountInput.java	2010-08-19 13:42:10 +0000
+++ src/ru/orangesoftware/financisto/widget/AmountInput.java	2010-08-22 11:18:40 +0000
@@ -70,10 +70,14 @@
 		initialize(context, null);
 	}
 	
-	public void allowNegativeAmount() {
+	public void setAllowNegativeAmount() {
 		allowNegativeAmount = true;
 	}
 	
+	public boolean allowNegativeAmount() {
+		return allowNegativeAmount;
+	}
+	
 	@Override
 	public void setEnabled(boolean enabled) {
 		super.setEnabled(enabled);