Merge lp:~emmanuel-florent/financisto/financisto1.6.7enhanced into lp:~financisto-dev/financisto/trunk

[Emmanuel Florent]

[Emmanuel Florent (emmanuel-florent)]

Following the new integration test, i could fix things more easily.

=== modified file '.bzrignore' (properties changed: +x to -x)
--- .bzrignore	2014-01-11 06:52:17 +0000
+++ .bzrignore	2014-06-25 21:52:59 +0000
@@ -12,4 +12,8 @@
 tests/coverage.em
 tests/coverage
 robotium_tests/local.properties
-google-play-services_lib/gen
\ No newline at end of file
+google-play-services_lib/gen
+out
+lib
+Financisto.iml
+*.iml

=== removed directory '.idea'
=== removed file '.idea/ant.xml'
--- .idea/ant.xml	2013-04-15 11:49:43 +0000
+++ .idea/ant.xml	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/tests/build.xml" />
-  </component>
-</project>
-

=== removed file '.idea/compiler.xml'
--- .idea/compiler.xml	2012-12-17 13:20:12 +0000
+++ .idea/compiler.xml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <excludeFromCompile>
-      <directory url="file://$PROJECT_DIR$/GreenDroid/gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/tests/gen" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/robotium_tests/gen" includeSubdirectories="true" />
-    </excludeFromCompile>
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="?*.properties" />
-      <entry name="?*.xml" />
-      <entry name="?*.gif" />
-      <entry name="?*.png" />
-      <entry name="?*.jpeg" />
-      <entry name="?*.jpg" />
-      <entry name="?*.html" />
-      <entry name="?*.dtd" />
-      <entry name="?*.tld" />
-      <entry name="?*.ftl" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
-

=== removed directory '.idea/copyright'
=== removed file '.idea/copyright/gpl2.xml'
--- .idea/copyright/gpl2.xml	2011-12-20 13:57:31 +0000
+++ .idea/copyright/gpl2.xml	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright (c) &amp;#36;today.year Denis Solonenko.&#10;All rights reserved. This program and the accompanying materials&#10;are made available under the terms of the GNU Public License v2.0&#10;which accompanies this distribution, and is available at&#10;http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" />
-    <option name="keyword" value="Copyright" />
-    <option name="allowReplaceKeyword" value="" />
-    <option name="myName" value="gpl2" />
-    <option name="myLocal" value="true" />
-  </copyright>
-</component>
\ No newline at end of file

=== removed file '.idea/copyright/profiles_settings.xml'
--- .idea/copyright/profiles_settings.xml	2011-12-20 13:57:31 +0000
+++ .idea/copyright/profiles_settings.xml	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="">
-    <module2copyright>
-      <element module="All" copyright="gpl2" />
-    </module2copyright>
-  </settings>
-</component>
\ No newline at end of file

=== removed directory '.idea/dictionaries'
=== removed file '.idea/dictionaries/solomonk.xml'
--- .idea/dictionaries/solomonk.xml	2013-02-18 17:26:29 +0000
+++ .idea/dictionaries/solomonk.xml	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="solomonk">
-    <words>
-      <w>stacktrace</w>
-    </words>
-  </dictionary>
-</component>
\ No newline at end of file

=== removed file '.idea/encodings.xml'
--- .idea/encodings.xml	2011-12-20 13:57:31 +0000
+++ .idea/encodings.xml	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-

=== removed directory '.idea/libraries'
=== removed file '.idea/misc.xml'
--- .idea/misc.xml	2014-01-11 06:52:17 +0000
+++ .idea/misc.xml	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="FacetAutodetectingManager">
-    <autodetection-disabled>
-      <facet-type id="android">
-        <modules>
-          <module name="GDocsAPI">
-            <files>
-              <file url="file://$PROJECT_DIR$/../../android-gdocs-api/GDocsAPI/AndroidManifest.xml" />
-            </files>
-          </module>
-          <module name="test">
-            <files>
-              <file url="file://$PROJECT_DIR$/test/AndroidManifest.xml" />
-            </files>
-          </module>
-          <module name="Tests">
-            <files>
-              <file url="file://$PROJECT_DIR$/Tests/AndroidManifest.xml" />
-            </files>
-          </module>
-        </modules>
-      </facet-type>
-    </autodetection-disabled>
-  </component>
-  <component name="ProjectResources">
-    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/classes" />
-  </component>
-  <component name="SvnBranchConfigurationManager">
-    <option name="mySupportsUserInfoFilter" value="true" />
-  </component>
-</project>
-

=== removed file '.idea/modules.xml'
--- .idea/modules.xml	2014-01-11 06:52:17 +0000
+++ .idea/modules.xml	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Financisto.iml" filepath="$PROJECT_DIR$/Financisto.iml" />
-      <module fileurl="file://$PROJECT_DIR$/google-play-services_lib/google-play-services_lib.iml" filepath="$PROJECT_DIR$/google-play-services_lib/google-play-services_lib.iml" />
-      <module fileurl="file://$PROJECT_DIR$/robotium_tests/robotium_tests.iml" filepath="$PROJECT_DIR$/robotium_tests/robotium_tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/tests/tests.iml" filepath="$PROJECT_DIR$/tests/tests.iml" />
-    </modules>
-  </component>
-</project>
-

=== removed directory '.idea/scopes'
=== removed file '.idea/scopes/scope_settings.xml'
--- .idea/scopes/scope_settings.xml	2011-12-20 13:57:31 +0000
+++ .idea/scopes/scope_settings.xml	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file

=== removed file '.idea/sqldialects.xml'
--- .idea/sqldialects.xml	2013-07-14 08:33:04 +0000
+++ .idea/sqldialects.xml	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/assets/database/view/010[v_all_transactions].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/015[v_blotter_for_account_with_splits].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/020[v_blotter].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/021[v_blotter_for_account].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/030[v_category].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/035[v_category_list].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/050[v_attributes].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/060[v_report_category].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/060[v_report_sub_category].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/061[v_report_period].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/062[v_report_location].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/063[v_report_project].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/064[v_report_payee].sql" dialect="SQLite" />
-    <file url="file://$PROJECT_DIR$/assets/database/view/080[v_transaction_attributes].sql" dialect="SQLite" />
-  </component>
-</project>
-

=== removed file '.idea/uiDesigner.xml'
--- .idea/uiDesigner.xml	2011-12-20 13:57:31 +0000
+++ .idea/uiDesigner.xml	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-

=== removed file '.idea/vcs.xml'
--- .idea/vcs.xml	2011-12-20 13:57:31 +0000
+++ .idea/vcs.xml	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Bazaar" />
-  </component>
-</project>
-

=== removed file 'Financisto.iml'
--- Financisto.iml	2014-06-17 15:11:57 +0000
+++ Financisto.iml	1970-01-01 00:00:00 +0000
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <libelement value="jar://$MODULE_DIR$/lib/rfc2445-no-joda.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/lib/GDocsAPI.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/lib/CWAC-WakefulIntentService.jar!/" />
-    <conelement value="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK" />
-    <src_description expected_position="0">
-      <src_folder value="file://$MODULE_DIR$/gen" expected_position="0" />
-      <src_folder value="file://$MODULE_DIR$/src" expected_position="1" />
-    </src_description>
-  </component>
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="UPDATE_PROPERTY_FILES" value="true" />
-        <includeAssetsFromLibraries>true</includeAssetsFromLibraries>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/bin" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="jdk" jdkName="Android 2.2 Google APIs" jdkType="Android SDK" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/achartengine-1.0.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/CWAC-WakefulIntentService.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/httpmime-4.0.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/json_simple-1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/rfc2445-no-joda.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/trove-3.0.2-long.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/gson-2.2.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/android-support-v4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/commons-logging-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/google-api-client-1.17.0-rc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/google-api-client-android-1.17.0-rc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/google-api-services-drive-v2-rev100-1.17.0-rc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/google-http-client-1.17.0-rc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/google-http-client-android-1.17.0-rc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/google-http-client-gson-1.17.0-rc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/google-http-client-jackson2-1.17.0-rc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/google-oauth-client-1.17.0-rc.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/httpclient-4.0.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/httpcore-4.0.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module" module-name="google-play-services_lib" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/dropbox-android-sdk-1.5.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/eventbus-2.2.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-  </component>
-</module>
-

=== removed file 'google-play-services_lib/google-play-services_lib.iml'
--- google-play-services_lib/google-play-services_lib.iml	2014-06-17 15:11:57 +0000
+++ google-play-services_lib/google-play-services_lib.iml	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="LIBRARY_PROJECT" value="true" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android 2.2 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/google-play-services.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-  </component>
-</module>
-

=== modified file 'project.properties'
--- project.properties	2014-06-17 15:17:07 +0000
+++ project.properties	2014-06-25 21:52:59 +0000
@@ -22,7 +22,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs (x86 System Image):19
 apk-configurations=
 android.library.reference.1=google-play-services_lib
 

=== removed file 'robotium_tests/robotium_tests.iml'
--- robotium_tests/robotium_tests.iml	2014-06-17 15:11:57 +0000
+++ robotium_tests/robotium_tests.iml	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="PACK_TEST_CODE" value="true" />
-        <includeAssetsFromLibraries>true</includeAssetsFromLibraries>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android 4.0.3 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Financisto" scope="PROVIDED" />
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/libs/robotium-solo-3.4.1.jar!/" />
-        </CLASSES>
-        <JAVADOC>
-          <root url="jar://$MODULE_DIR$/libs/robotium-solo-3.4.1-javadoc.jar!/" />
-        </JAVADOC>
-        <SOURCES />
-      </library>
-    </orderEntry>
-  </component>
-</module>
-

=== modified file 'src/ru/orangesoftware/financisto/activity/FlowzrSyncActivity.java'
--- src/ru/orangesoftware/financisto/activity/FlowzrSyncActivity.java	2014-05-17 06:59:48 +0000
+++ src/ru/orangesoftware/financisto/activity/FlowzrSyncActivity.java	2014-06-25 21:52:59 +0000
@@ -187,18 +187,32 @@
 			})
 			.show();
 		}
-		//radio crendentials
+        //checkbox
+        CheckBox chk=(CheckBox)findViewById(R.id.chk_sync_from_zero);
+        OnClickListener chk_listener = new OnClickListener() {
+            public void onClick(View v) {
+                lastSyncLocalTimestamp=0;
+                renderLastTime(0);
+                flowzrSyncEngine.resetLastTime(getApplicationContext());
+            }
+        };
+        chk.setOnClickListener(chk_listener);
+        //radio crendentials
 		RadioGroup radioGroupCredentials = (RadioGroup)findViewById(R.id.radioCredentials);
 		OnClickListener radio_listener = new OnClickListener() {
 		    public void onClick(View v) {
 		    	RadioButton radioButtonSelected = (RadioButton)findViewById(v.getId());
 	    	for (Account account: accounts) {
 		    		if (account.name==radioButtonSelected.getText()) {
-		    			useCredential=account;    			
+                        lastSyncLocalTimestamp=0;
+                        renderLastTime(0);
+                        flowzrSyncEngine.resetLastTime(getApplicationContext());
+                        useCredential=account;
 		    		}
 		    	}		    			    	
 		    }
-		};		
+		};
+        radioGroupCredentials.setOnClickListener(radio_listener);
 		//initialize value
 	     for (int i = 0; i < accounts.length; i++) {
 	    	 	RadioButton rb = new RadioButton(this);

=== modified file 'src/ru/orangesoftware/financisto/db/MyEntityManager.java'
--- src/ru/orangesoftware/financisto/db/MyEntityManager.java	2014-01-20 16:30:18 +0000
+++ src/ru/orangesoftware/financisto/db/MyEntityManager.java	2014-06-25 21:52:59 +0000
@@ -412,6 +412,8 @@
 
 	public long insertBudget(Budget budget) {
         SQLiteDatabase db = db();
+        budget.remoteKey=null;
+
 		db.beginTransaction();
 		try {
 			if (budget.id > 0) {

=== modified file 'src/ru/orangesoftware/financisto/export/flowzr/FlowzrSyncEngine.java'
--- src/ru/orangesoftware/financisto/export/flowzr/FlowzrSyncEngine.java	2014-05-17 06:57:53 +0000
+++ src/ru/orangesoftware/financisto/export/flowzr/FlowzrSyncEngine.java	2014-06-25 21:52:59 +0000
@@ -9,13 +9,7 @@
  */
 
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -24,6 +18,7 @@
 import java.util.Map;
 import java.util.TimeZone;
 
+import com.google.api.client.json.JsonParser;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
@@ -32,9 +27,12 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.EntityUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -47,6 +45,7 @@
 import ru.orangesoftware.financisto.db.DatabaseHelper;
 import ru.orangesoftware.financisto.db.MyEntityManager;
 import ru.orangesoftware.financisto.export.flowzr.FlowzrSyncTask.GetAuthTokenCallback;
+import ru.orangesoftware.financisto.filter.WhereFilter;
 import ru.orangesoftware.financisto.model.Account;
 import ru.orangesoftware.financisto.model.Attribute;
 import ru.orangesoftware.financisto.model.Budget;
@@ -87,11 +86,11 @@
 public class FlowzrSyncEngine  {
 	private static String TAG="flowzr";
 	private final static String FLOWZR_MSG_NET_ERROR="FLOWZR_MSG_NET_ERROR";
-
-    private static SQLiteDatabase db;
-    private static DatabaseAdapter dba;
+    public static HttpContext ctx;
+    public static SQLiteDatabase db;
+    public static DatabaseAdapter dba;
     
-    private static MyEntityManager em;
+    public static MyEntityManager em;
     static InputStream isHttpcontent = null;
     static JSONObject jObj = null;
     static String json = "";
@@ -99,8 +98,8 @@
 
     private static Context context;
  
-    private static String[] tableNames= {"attributes","currency","project","payee","account","LOCATIONS","category","transactions",DatabaseHelper.BUDGET_TABLE, "currency_exchange_rate"};  
-	private static Class[] clazzArray = {Attribute.class,Currency.class,Project.class,Payee.class,Account.class,MyLocation.class,Category.class,Transaction.class,Budget.class,ExchangeRate.class};        
+    private static String[] tableNames= {"attributes","currency","project","payee","account","LOCATIONS","category","transactions",DatabaseHelper.BUDGET_TABLE, "currency_exchange_rate"};
+	private static Class[] clazzArray = {Attribute.class,Currency.class,Project.class,Payee.class,Account.class,MyLocation.class,Category.class,Transaction.class,Budget.class,ExchangeRate.class};
 	
 	private static int MAX_PULL_SIZE=50;
 	private static int MAX_PUSH_SIZE=20;
@@ -242,15 +241,19 @@
 	        try {
 				pushUpdate();
 			} catch (ClientProtocolException e) {
+                e.printStackTrace();
 				sendBackTrace(e);
 				recordSyncTime=false;
 			} catch (IOException e) {
+                e.printStackTrace();
 				sendBackTrace(e);
 				recordSyncTime=false;
 			} catch (JSONException e) {
+                e.printStackTrace();
 				sendBackTrace(e);
 				recordSyncTime=false;
 			} catch (Exception e) {
+                e.printStackTrace();
 				recordSyncTime=false;
 			}      
         }
@@ -333,8 +336,8 @@
     
     }
 
-	public static void resetLastTime () {
-    	SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
+	public static void resetLastTime (Context ctx) {
+    	SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(ctx).edit();
     	if (editor!=null) {
     		editor.putLong("PROPERTY_LAST_SYNC_TIMESTAMP", 0);
     		editor.commit();    
@@ -419,18 +422,31 @@
         }      
     }
     
-	private static <T extends MyEntity> void pushUpdate(String tableName,Class<T> clazz) throws ClientProtocolException, IOException, JSONException, Exception  {	
+	public static <T extends Object> void pushUpdate(String tableName,Class<T> clazz) throws ClientProtocolException, IOException, JSONException, Exception  {
 		SQLiteDatabase db2=dba.db();
 		Cursor cursorCursor;
 		String sql;
 		long total;
 
-		sql="select count(*) from " + tableName  + " where updated_on<0 or (updated_on > " + last_sync_ts  + " and updated_on<" + startTimestamp + ")" ;		
+		sql="select count(*) from " + tableName  + " where updated_on<=0 or remote_key is null or (updated_on > " + last_sync_ts  ;
+        if (!tableName.equals(DatabaseHelper.BUDGET_TABLE)) {
+            sql=sql+ " and updated_on<" + startTimestamp + ")" ;
+        } else {
+            sql=sql+ ")";
+        }
+
 		cursorCursor=db.rawQuery(sql, null);
 		cursorCursor.moveToFirst();
 		total=cursorCursor.getLong(0);
-		sql="select * from " + tableName +  " where updated_on<0 or (updated_on > " + last_sync_ts +  " and updated_on<" + startTimestamp + ")";		
-	
+
+
+        sql="select * from " + tableName +  " where updated_on<=0 or remote_key is null or (updated_on > " + last_sync_ts ;
+        if (!tableName.equals(DatabaseHelper.BUDGET_TABLE)) {
+            sql=sql+ " and updated_on<" + startTimestamp + ")" ;
+        } else {
+            sql=sql+ ")";
+        }
+
 		if (tableName.equals(DatabaseHelper.TRANSACTION_TABLE)) {
 			sql+= " order by  parent_id asc,_id asc";	
 		} else 	if (tableName.equals(DatabaseHelper.BUDGET_TABLE)) {
@@ -443,10 +459,11 @@
 		JSONArray resultSet 	= new JSONArray();
 		
 		int i=0;
-		if (cursorCursor.moveToFirst() && isCanceled!=true) {			
+		if (cursorCursor.moveToFirst() && isCanceled!=true) {
+            Log.i("flowzr","pushing "  + tableName);
 			do {								 	
 				if (i%10==0) {					
-					notifyUser(context.getString(R.string.flowzr_sync_sending) + " " + tableName, (int)(Math.round(i*100/total)));
+					//notifyUser(context.getString(R.string.flowzr_sync_sending) + " " + tableName, (int)(Math.round(i*100/total)));
 				}				
 				resultSet.put(cursorToDict(tableName,cursorCursor));
 				i++;
@@ -467,8 +484,10 @@
 			String resp=makeRequest(tableName, resultSet.toString());
 			if (resp.equals(FLOWZR_MSG_NET_ERROR)) {
 				isCanceled=true;
+                Log.e("flowzr",resp);
 			}
 			if (isCanceled) {
+                Log.i("flowzr","sync canceled!");
 				return ;
 			}
 		}
@@ -483,8 +502,10 @@
 		String strResponse;
 
 	        HttpPost httpPost = new HttpPost(uri);
+
 	        httpPost.setEntity(new StringEntity(json,HTTP.UTF_8));
-	        httpPost.setHeader("Accept", "application/json");
+            httpPost.addHeader("Cookie","dev_appserver_login=[e-mail]:False:18580476422013912411");
+
 	        HttpResponse response =http_client.execute(httpPost);
 		    HttpEntity entity = response.getEntity();
 	        int code = response.getStatusLine().getStatusCode();
@@ -566,10 +587,11 @@
 	       	 			} else if (tableName.equals(DatabaseHelper.CATEGORY_TABLE)) {
 	       	 				//load parent id
 	       	 				Category cat=dba.getCategory(c.getInt(0)); // sql build/load parentId	
-	       	 				if (cat.getParentId()>KEY_CREATE) {
-	       	 					Category pcat=em.load(Category.class, cat.getParentId());
-	       	 					rowObject.put( "parent" ,  pcat.remoteKey); 
-	       	 					rowObject.put( "parent_id" ,  pcat.id); 
+	       	 				if (cat.getParentId()>0) {
+                                    Category pcat = em.load(Category.class, cat.getParentId());
+                                    rowObject.put("parent", pcat.remoteKey);
+                                    rowObject.put("parent_id", pcat.id);
+
 	       	 				}
 	       	 				String attrPushString="";
 	       	 				
@@ -639,7 +661,7 @@
      * it is not possible to make alter table add column updated with a default timestamp at current_timestamp
      * so default is set as zero and this pre-sync function make all 0 at last_sync_ts + 1
      */    
-    private static void fixCreatedEntities() {        	
+    public static void fixCreatedEntities() {
     	long ctime=last_sync_ts + 1;
     	for (String t : tableNames) {         		
     		db.execSQL("update "  + t + " set updated_on=" + ctime + " where updated_on=0");
@@ -764,7 +786,7 @@
 		return null;
 	}
     
-    private static Object pushDelete() throws Exception {
+    public static Object pushDelete() throws Exception {
 		String sql="select count(*) from " + DatabaseHelper.DELETE_LOG_TABLE ;		
 		Cursor cursorCursor=db.rawQuery(sql, null);
 		cursorCursor.moveToFirst();
@@ -775,7 +797,7 @@
     	String del_list="";
     	if (cursor.moveToFirst()) {
     		do {
-				notifyUser("push delete",(int)(Math.round(i*100/total)));
+				//notifyUser("push delete",(int)(Math.round(i*100/total)));
 				del_list+=cursor.getString(1) + ";";
     			i++;
     		} while (cursor.moveToNext());
@@ -858,12 +880,13 @@
 		}		 		
 	}
 
-	public static <T> Object saveOrUpdateCategoryFromJSON(long id,JSONObject jsonObjectEntity) {					
+	public static <T> Object saveOrUpdateCategoryFromJSON(long id,JSONObject jsonObjectEntity) {
+
 		if (!jsonObjectEntity.has("name")) {
 			return null;
 		}
 		Category tEntity=new Category(KEY_CREATE);
-		if (id != KEY_CREATE) {
+		if (id != KEY_CREATE && id!=-2) {
 			tEntity = dba.getCategory(id);				
 		}
 		//---
@@ -882,7 +905,12 @@
 					e.printStackTrace();
 				}
 			}
-			ArrayList<Attribute> attributes = new ArrayList<Attribute>();
+
+            if (jsonObjectEntity.has("type") ) {
+                tEntity.type=jsonObjectEntity.getInt("type");
+            }
+
+                ArrayList<Attribute> attributes = new ArrayList<Attribute>();
 			if (jsonObjectEntity.has("attributes") ) {				
 				for (String attr_key: jsonObjectEntity.getString("attributes").split(";")) {
 						int l=(int) getLocalKey(DatabaseHelper.ATTRIBUTES_TABLE, attr_key);
@@ -892,10 +920,16 @@
 						}
 				}				
 			}
-			//updated on + remote key
-			em.saveOrUpdate(tEntity);
+
+            String r=tEntity.remoteKey;
+
 			//left, right
 			dba.insertOrUpdate(tEntity, attributes);
+            String sql="update category set remote_key='"+ r + "' where _id="+ tEntity.id ;
+            db.execSQL(sql);
+
+
+
 
 			
 			return tEntity;
@@ -1293,9 +1327,13 @@
 		 		tEntity.issuer=jsonObjectAccount.getString(DatabaseHelper.AccountColumns.ISSUER);				
 		 	}
 		 	//number
-		 	if (jsonObjectAccount.has("iban")) {				 	
-		 		tEntity.number=jsonObjectAccount.getString("iban");
+		 	if (jsonObjectAccount.has("code")) {
+		 		tEntity.number=jsonObjectAccount.getString("code");
 		 	}
+            //limit
+            if (jsonObjectAccount.has("total_limit")) {
+                tEntity.limitAmount=jsonObjectAccount.getLong("total_limit");
+            }
 		 	//is_active
 		 	if (jsonObjectAccount.has("closed")) {			 	
 		 		if (jsonObjectAccount.getBoolean("closed")) {
@@ -1562,7 +1600,7 @@
 		}
     }
 
-    private static void pullUpdate() throws IOException, JSONException, Exception {    	
+    private static void pullUpdate() throws IOException, JSONException, Exception {
     	int i=0;
     	for (String tableName : tableNames) {      	   		
     		Log.i("flowzr",  context.getString(R.string.flowzr_sync_receiving) + " " + tableName );
@@ -1571,7 +1609,7 @@
 				notifyUser(context.getString(R.string.flowzr_sync_receiving) + " " + tableName + ". " + context.getString(R.string.hint_run_background), (int)(Math.round(i*100/tableNames.length)));
 			} else {
 				notifyUser(context.getString(R.string.flowzr_sync_receiving) + " " + tableName, (int)(Math.round(i*100/tableNames.length)));
-			}    		
+			}
       		if (!isCanceled) {
       			pullUpdate(tableName,clazzArray[i],last_sync_ts); 
       		}
@@ -1579,7 +1617,7 @@
         }
     } 
     
-    private static <T> void pullUpdate(String tableName,Class<T> clazz,long  last_sync_ts) throws IOException, JSONException, Exception {
+    public static <T> void pullUpdate(String tableName,Class<T> clazz,long  last_sync_ts) throws IOException, JSONException, Exception {
 		
 		if (tableName.equals(DatabaseHelper.TRANSACTION_TABLE)) {			
     		//pull all remote accounts, accounts by accounts
@@ -1605,15 +1643,31 @@
     	if (url==null) {
     		return 0;
     	}
-		HttpGet httpGet = new HttpGet(url);
+
+        HttpGet httpGet = new HttpGet(url);
+        httpGet.addHeader("Cookie","dev_appserver_login=[e-mail]:False:185804764220139124118");
     	HttpResponse httpResponse = http_client.execute(httpGet);
+
         HttpEntity httpEntity = httpResponse.getEntity();
-        is = httpEntity.getContent();             	            	
-        reader = new JsonReader(new InputStreamReader(is, "UTF-8"));
+
+        // All the work is done for you here :)
+        String jsonContent = EntityUtils.toString(httpEntity);
+
+        // Create a Reader from String
+        Reader stringReader = new StringReader(jsonContent);
+
+        //is = httpEntity.getContent();
+
+        reader = new JsonReader(stringReader);
+        reader.setLenient(true);
+
         reader.beginObject();
-        int i=readMessage(reader,tableName,clazz,last_sync_ts);
-        httpEntity.consumeContent();  		        
+
+        int i = readMessage(reader, tableName, clazz, last_sync_ts);
+        httpEntity.consumeContent();
         return i;
+
+
     }
 
     public static <T> void getJSONFromUrl2(String url,String tableName,String account_key, Class<T> clazz,long last_sync_ts) throws IOException, JSONException, Exception {
@@ -1626,8 +1680,10 @@
     public static <T> int readMessage(JsonReader reader,String tableName,Class<T> clazz,long last_sync_ts) throws IOException, JSONException,Exception {    
 		String n = null;
 		int i=0;
+
    		while (reader.hasNext()) {
    			JsonToken peek=reader.peek();
+
    			String v = null;
    			if (peek==JsonToken.BEGIN_OBJECT) {
    				reader.beginObject();
@@ -1657,7 +1713,11 @@
    				reader.endObject();
    			} else if (peek==JsonToken.END_ARRAY) {
    				reader.endArray();
-   			}
+   			} else if (peek==JsonToken.STRING) {
+                reader.skipValue();
+            } else {
+                reader.skipValue();
+            }
    		}
    		return i;      
     }
@@ -1719,7 +1779,7 @@
 				}
 				saveEntityFromJson(o, tableName, clazz,i);
 				if (i%10==0) {
-					notifyUser(context.getString(R.string.flowzr_sync_receiving) + " " + tableName + ". " + context.getString(R.string.hint_run_background), (int)(Math.round(j)));
+					//notifyUser(context.getString(R.string.flowzr_sync_receiving) + " " + tableName + ". " + context.getString(R.string.hint_run_background), (int)(Math.round(j)));
 				}
 			}
 		}

=== modified file 'src/ru/orangesoftware/financisto/export/flowzr/FlowzrSyncTask.java'
--- src/ru/orangesoftware/financisto/export/flowzr/FlowzrSyncTask.java	2014-06-17 15:17:07 +0000
+++ src/ru/orangesoftware/financisto/export/flowzr/FlowzrSyncTask.java	2014-06-25 21:52:59 +0000
@@ -66,7 +66,20 @@
     	this.http_client = new DefaultHttpClient(cm, params);
     	this.dba=new DatabaseAdapter(context);
     }
-    
+
+    public static android.accounts.Account getAndroidAccount(Context context) {
+        String accountName=MyPreferences.getFlowzrAccount(context);
+        AccountManager accountManager = AccountManager.get(context);
+        android.accounts.Account[] accounts = accountManager.getAccountsByType("com.google");
+        Account useCredential = null;
+        for (int i = 0; i < accounts.length; i++) {
+            if (accountName.equals(((android.accounts.Account) accounts[i]).name)) {
+                return accounts[i];
+            }
+        }
+        return null;
+    }
+
     protected Object work(Context context, DatabaseAdapter dba, String... params) throws ImportExportException {    	
 
     	AccountManager accountManager = AccountManager.get(context);

=== modified file 'src/ru/orangesoftware/financisto/model/Budget.java'
--- src/ru/orangesoftware/financisto/model/Budget.java	2014-01-11 07:30:57 +0000
+++ src/ru/orangesoftware/financisto/model/Budget.java	2014-06-25 21:52:59 +0000
@@ -21,7 +21,7 @@
 
 @Entity
 @Table(name = "budget")
-public class Budget {
+public class Budget  {
 	
 	@Id
 	@Column(name = "_id")

=== modified file 'src/ru/orangesoftware/financisto/service/FinancistoService.java'
--- src/ru/orangesoftware/financisto/service/FinancistoService.java	2014-05-16 12:24:22 +0000
+++ src/ru/orangesoftware/financisto/service/FinancistoService.java	2014-06-25 21:52:59 +0000
@@ -66,7 +66,6 @@
         db = new DatabaseAdapter(this);
         db.open();
         scheduler = new RecurrenceScheduler(db);
-        Log.i(TAG, "Created Finacisto service ...");
     }
 
     @Override
@@ -74,7 +73,6 @@
         if (db != null) {
             db.close();
         }
-        Log.i(TAG, "Finacisto service ...");
         super.onDestroy();
     }
 

=== modified file 'tests/project.properties'
--- tests/project.properties	2013-02-18 17:26:29 +0000
+++ tests/project.properties	2014-06-25 21:52:59 +0000
@@ -19,4 +19,4 @@
 #proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-15
+target=Google Inc.:Google APIs (x86 System Image):19

=== added file 'tests/src/ru/orangesoftware/financisto/export/FlowzrIntegrationTest.java'
--- tests/src/ru/orangesoftware/financisto/export/FlowzrIntegrationTest.java	1970-01-01 00:00:00 +0000
+++ tests/src/ru/orangesoftware/financisto/export/FlowzrIntegrationTest.java	2014-06-25 21:52:59 +0000
@@ -0,0 +1,480 @@
+/*
+ * Copyright (c) 2011 Denis Solonenko, Emmanuel Florent
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ */
+
+package ru.orangesoftware.financisto.activity;
+
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import android.test.InstrumentationTestCase;
+import android.util.Log;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import ru.orangesoftware.financisto.db.DatabaseAdapter;
+import ru.orangesoftware.financisto.db.DatabaseHelper;
+import ru.orangesoftware.financisto.export.flowzr.FlowzrSyncEngine;
+import ru.orangesoftware.financisto.export.flowzr.FlowzrSyncTask;
+import ru.orangesoftware.financisto.filter.WhereFilter;
+import ru.orangesoftware.financisto.model.*;
+import ru.orangesoftware.financisto.test.AccountBuilder;
+import ru.orangesoftware.financisto.test.CategoryBuilder;
+import ru.orangesoftware.financisto.test.CurrencyBuilder;
+import ru.orangesoftware.financisto.test.DateTime;
+import ru.orangesoftware.financisto.utils.MyPreferences;
+import ru.orangesoftware.orb.EntityManager;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Map;
+
+
+import static java.lang.String.*;
+
+public class FlowzrIntegrationTest extends InstrumentationTestCase {
+
+    //dev_appserver on this configuration doest not support 127.1 !
+    private final static String LAN_IP="10.42.0.32";
+    private final static String TEST_ACCOUNT = "[e-mail]";
+
+    protected Context context;
+    public static DefaultHttpClient http_client;
+    private static DatabaseAdapter dba;
+    public EntityManager em;
+    private SQLiteDatabase db;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        FlowzrSyncEngine.FLOWZR_BASE_URL = "http://" + LAN_IP + ":8080/";
+        FlowzrSyncEngine.FLOWZR_API_URL = "http://" + LAN_IP + ":8080/financisto3/";
+
+        context = getInstrumentation().getTargetContext();
+
+        BasicCookieStore cookieStore = new BasicCookieStore();
+        HttpGet request = getAuthenticateRequest("/");
+
+        this.http_client = new DefaultHttpClient();
+        this.dba = new DatabaseAdapter(context);
+
+        FlowzrSyncEngine.dba = this.dba;
+        FlowzrSyncEngine.db = this.dba.db();
+        FlowzrSyncEngine.em = this.dba.em();
+
+        FlowzrSyncEngine.nsString = TEST_ACCOUNT.replace("@","_");
+
+        FlowzrSyncEngine.http_client = this.http_client;
+
+        FlowzrSyncEngine.last_sync_ts = 1;
+        FlowzrSyncEngine.resetLastTime(context);
+        FlowzrSyncEngine.isCanceled = false;
+        FlowzrSyncEngine.isRunning = false;
+        FlowzrSyncEngine.startTimestamp = System.currentTimeMillis();
+        db=dba.db();
+        em = dba.em();
+
+    }
+
+    public void test_get_android_account() {
+        MyPreferences.setFlowzrAccount(context, TEST_ACCOUNT);
+        String accountName = MyPreferences.getFlowzrAccount(context);
+        assertEquals(TEST_ACCOUNT, accountName);
+        android.accounts.Account a = FlowzrSyncTask.getAndroidAccount(context);
+        assertEquals(TEST_ACCOUNT, a.name);
+    }
+
+    public void test_push_accounts() throws Exception {
+        if (dba.em().getAllAccounts().getCount()<1) {
+            Currency c = createCurrency("CZK");
+            ru.orangesoftware.financisto.model.Account a = new ru.orangesoftware.financisto.model.Account();
+            a.title = "My Bank Account";
+            a.type = AccountType.BANK.name();
+            a.currency = c;
+            a.totalAmount = 23450;
+            a.sortOrder = 50;
+            a.cardIssuer = "card issuer";
+            a.closingDay = 30;
+            a.creationDate = 0;
+            a.isActive = true;
+            a.isIncludeIntoTotals = true;
+            a.issuer = "issuer";
+            a.limitAmount = 1000;
+            a.note = "note";
+            a.number = "6004300";
+            a.paymentDay = 1;
+            a.sortOrder = 1;
+            a.id = -1;
+            dba.em().saveAccount(a);
+        }
+
+        FlowzrSyncEngine.fixCreatedEntities();
+        FlowzrSyncEngine.pushUpdate("currency", Currency.class);
+        FlowzrSyncEngine.pushUpdate("account", ru.orangesoftware.financisto.model.Account.class);
+
+        JSONObject json = getJsonResponse(FlowzrSyncEngine.FLOWZR_API_URL + "admin_example.com/account/?last_sync_ts=0");
+        JSONArray arr = json.getJSONArray("account");
+
+        Cursor cursor=dba.em().getAllAccounts();
+
+        assertEquals(valueOf(cursor.getCount()), valueOf(arr.length()));
+
+        if (cursor.moveToFirst()) {
+            do {
+                //Log.i("flowzr", "account:" + cursor.getInt(0) + " " + cursor.getString(cursor.getColumnIndex("name")) + " " + cursor.getInt(cursor.getColumnIndex("remote_key")));
+                // the view doesn't contains remote_key, the test is unoptimized
+                ru.orangesoftware.financisto.model.Account a = dba.em().getAccount(cursor.getInt(cursor.getColumnIndex("_id")));
+                //em.load(Attribute.class, cursor.getInt(cursor.getColumnIndex("_id")));
+                boolean gotIt = false;
+                for (int i = 0; i < arr.length(); i++) {
+                    if (a.remoteKey.equals(arr.getJSONObject(i).getString("key"))) {
+                        Log.i("flowzr", "got account " + a.title);
+                        assertEquals(a.title, arr.getJSONObject(i).getString("name"));
+                        assertEquals(a.type,arr.getJSONObject(i).getString("type"));
+                        assertEquals(a.currency.name,arr.getJSONObject(i).getString("currency_name"));
+                        assertEquals(a.sortOrder,arr.getJSONObject(i).getInt("sort_order"));;
+                        if (a.cardIssuer!=null) {
+                            assertEquals(a.cardIssuer, arr.getJSONObject(i).getString("card_issuer"));
+                        }
+                        assertEquals(a.closingDay,arr.getJSONObject(i).getInt("closing_day"));;
+                        assertFalse(a.isActive == arr.getJSONObject(i).getBoolean("hidden"));
+                        assertEquals(a.isIncludeIntoTotals,arr.getJSONObject(i).getBoolean("is_include_into_totals"));
+                        if (a.issuer!=null) {
+                            assertEquals(a.issuer, arr.getJSONObject(i).getString("issuer"));
+                        }
+                        assertEquals(a.limitAmount,arr.getJSONObject(i).getInt("total_limit"));
+                        if (a.note!=null) {
+                            assertEquals(a.note, arr.getJSONObject(i).getString("description"));
+                        }
+                        if (a.number!=null) {
+                            assertEquals(a.number, arr.getJSONObject(i).getString("code"));
+                        }
+                        assertEquals(a.paymentDay,arr.getJSONObject(i).getInt("payment_day"));;
+                        assertEquals(a.sortOrder,arr.getJSONObject(i).getInt("sort_order"));;
+                        gotIt = true;
+                    }
+                }
+                assertTrue(gotIt);
+            } while (cursor.moveToNext());
+        }
+        cursor.close();
+    }
+
+    public void test_pull_accounts() throws Exception {
+
+
+        //expect
+        JSONObject json = getJsonResponse(FlowzrSyncEngine.FLOWZR_API_URL + "test_example.com/account/?last_sync_ts=0");
+        JSONArray expect = json.getJSONArray("account");
+
+        FlowzrSyncEngine.pullUpdate("account", ru.orangesoftware.financisto.model.Account.class, 0);
+
+        for (int i = 0; i < expect.length(); i++) {
+            Log.i("flowzr" , "checking account " + expect.getJSONObject(i).getString("key"));
+            long id= FlowzrSyncEngine.getLocalKey(DatabaseHelper.ACCOUNT_TABLE,expect.getJSONObject(i).getString("key"));
+            ru.orangesoftware.financisto.model.Account c=dba.em().getAccount(id);
+            assertEquals(expect.getJSONObject(i).getString("name"),c.title );
+            assertEquals(expect.getJSONObject(i).getString("type"),c.type);
+            assertEquals(c.title, expect.getJSONObject(i).getString("name"));
+            assertEquals(c.type,expect.getJSONObject(i).getString("type"));
+            assertEquals(c.currency.name,expect.getJSONObject(i).getString("currency_name"));
+            assertEquals(c.sortOrder,expect.getJSONObject(i).getInt("sort_order"));
+            if (expect.getJSONObject(i).has("card_issuer")) {
+                assertEquals(c.cardIssuer, expect.getJSONObject(i).getString("card_issuer"));
+            }
+            assertEquals(c.closingDay,expect.getJSONObject(i).getInt("closing_day"));;
+            assertFalse(c.isActive == expect.getJSONObject(i).getBoolean("hidden"));
+            assertEquals(c.isIncludeIntoTotals,expect.getJSONObject(i).getBoolean("is_include_into_totals"));
+            if (expect.getJSONObject(i).has("issuer")) {
+                assertEquals(c.issuer, expect.getJSONObject(i).getString("issuer"));
+            }
+            assertEquals(c.limitAmount,expect.getJSONObject(i).getInt("total_limit"));
+            if (expect.getJSONObject(i).has("description")) {
+                assertEquals(c.note, expect.getJSONObject(i).getString("description"));
+            }
+            if (expect.getJSONObject(i).has("code")) {
+                assertEquals(c.number, expect.getJSONObject(i).getString("code"));
+            }
+            assertEquals(c.paymentDay,expect.getJSONObject(i).getInt("payment_day"));;
+            assertEquals(c.sortOrder,expect.getJSONObject(i).getInt("sort_order"));;
+        }
+    }
+
+
+    public void test_push_attributes() throws Exception {
+
+        if (dba.getAllCategories().getCount() == 2) { //only system categories
+            Map<String, Category> categories = CategoryBuilder.createDefaultHierarchy(dba);
+            FlowzrSyncEngine.fixCreatedEntities();
+        }
+
+        FlowzrSyncEngine.pushUpdate("attributes", Attribute.class);
+
+        JSONObject json = getJsonResponse(FlowzrSyncEngine.FLOWZR_API_URL + "admin_example.com/attributes/?last_sync_ts=0");
+        JSONArray arr = json.getJSONArray("attributes");
+        Cursor cursor = dba.getAllAttributes();
+        //minus two system attributes ???
+        assertEquals(valueOf(cursor.getCount()), valueOf(arr.length()));
+
+        if (cursor.moveToFirst()) {
+            do {
+                Log.i("flowzr", "attr:" + cursor.getInt(0) + " " + cursor.getString(cursor.getColumnIndex("name")) + " " + cursor.getInt(cursor.getColumnIndex("remote_key")));
+                // the view doesn't contains remote_key, the test is unoptimized
+                 Attribute c = dba.getAttribute(cursor.getInt(cursor.getColumnIndex("_id")));
+                        //em.load(Attribute.class, cursor.getInt(cursor.getColumnIndex("_id")));
+                boolean gotIt = false;
+                for (int i = 0; i < arr.length(); i++) {
+                    if (c.remoteKey.equals(arr.getJSONObject(i).getString("key"))) {
+                        Log.i("flowzr", "got attribute " + c.name);
+                        assertEquals(c.name,arr.getJSONObject(i).getString("name"));
+                        assertEquals(c.type,arr.getJSONObject(i).getInt("type"));
+                        if (c.listValues!=null) {
+                            assertEquals(c.listValues, arr.getJSONObject(i).getString("list_values"));
+                        }
+                        if (c.defaultValue!=null) {
+                            assertEquals(c.defaultValue, arr.getJSONObject(i).getString("default_value"));
+                        }
+                        gotIt = true;
+                    }
+                }
+                //is the object find ?
+                assertTrue(gotIt);
+            } while (cursor.moveToNext());
+
+        }
+        cursor.close();
+    }
+
+    public void test_push_category() throws Exception {
+
+        if (dba.getAllCategories().getCount() == 2) { //only system categories
+            Map<String, Category> categories = CategoryBuilder.createDefaultHierarchy(dba);
+            FlowzrSyncEngine.fixCreatedEntities();
+        }
+
+        FlowzrSyncEngine.pushUpdate("attributes", Attribute.class);
+        FlowzrSyncEngine.pushUpdate("category", Category.class);
+
+        JSONObject json = getJsonResponse(FlowzrSyncEngine.FLOWZR_API_URL + "admin_example.com/category/?last_sync_ts=0");
+        JSONArray result = json.getJSONArray("category");
+        Cursor cursor = dba.getCategories(false);
+        //minus two system categories
+        assertEquals(valueOf(cursor.getCount()), valueOf(result.length()));
+
+        if (cursor.moveToFirst()) {
+            do {
+                // the view doesn't contains remote_key, the test is unoptimized
+                Category expect = em.load(Category.class, cursor.getInt(cursor.getColumnIndex("_id")));
+                boolean gotIt = false;
+                for (int i = 0; i < result.length(); i++) {
+                    if (expect.remoteKey.equals(result.getJSONObject(i).getString("key"))) {
+
+                        assertEquals(expect.getTitle(), result.getJSONObject(i).getString("name"));
+                        if (expect.getParentId() > 0) {
+                            assertEquals(em.load(Category.class, expect.getParentId()).remoteKey, result.getJSONObject(i).getString("parentCategory"));
+                        }
+                        assertEquals(expect.type, result.getJSONObject(i).getInt("type"));
+                        gotIt = true;
+                    }
+                }
+                assertTrue(expect.title, gotIt);
+
+            } while (cursor.moveToNext());
+
+        }
+        cursor.close();
+
+    }
+
+    public void test_pull_category_when_none() throws Exception {
+
+        //expect
+        JSONObject json = getJsonResponse(FlowzrSyncEngine.FLOWZR_API_URL + "test_example.com/category/?last_sync_ts=0");
+        JSONArray expect = json.getJSONArray("category");
+
+        FlowzrSyncEngine.pullUpdate("category", Category.class, 0);
+
+        for (int i = 0; i < expect.length(); i++) {
+            Log.i("flowzr" , "checking " + expect.getJSONObject(i).getString("key"));
+            long id= FlowzrSyncEngine.getLocalKey(DatabaseHelper.CATEGORY_TABLE,expect.getJSONObject(i).getString("key"));
+            Category c=dba.getCategory(id);
+            if (expect.getJSONObject(i).has("parentCategory")) {
+                Category c2=em.load(Category.class, FlowzrSyncEngine.getLocalKey(DatabaseHelper.CATEGORY_TABLE, expect.getJSONObject(i).getString("parentCategory")));
+                Category c3=dba.getCategory(c.getParentId());
+                assertEquals(c2.id, c3.id);
+            }
+            if (expect.getJSONObject(i).has("attributes")) {
+                String[] attr_arr=expect.getJSONObject(i).getString("attributes").split(";");
+                for (int j=0;i<attr_arr.length;j++) {
+                    Long attrId=FlowzrSyncEngine.getLocalKey(DatabaseHelper.CATEGORY_TABLE,expect.getJSONObject(i).getString("key"));
+                    c.attributes.contains(dba.getAttribute(attrId));
+                }
+
+            }
+            assertEquals(expect.getJSONObject(i).getString("name"),c.title );
+            assertEquals(expect.getJSONObject(i).getInt("type"),c.type);
+        }
+    }
+
+
+    public void test_pull_category() throws Exception {
+        //expect
+        JSONObject json = getJsonResponse(FlowzrSyncEngine.FLOWZR_API_URL + "test_example.com/category/?last_sync_ts=0");
+        JSONArray expect = json.getJSONArray("category");
+        //result
+        FlowzrSyncEngine.pullUpdate("category", Category.class, 0);
+
+        for (int i = 0; i < expect.length(); i++) {
+            Log.i("flowzr" , "checking " + expect.getJSONObject(i).getString("key"));
+            long id= FlowzrSyncEngine.getLocalKey(DatabaseHelper.CATEGORY_TABLE,expect.getJSONObject(i).getString("key"));
+            Category c=dba.getCategory(id);
+            if (expect.getJSONObject(i).has("parentCategory")) {
+                Category c2=em.load(Category.class,FlowzrSyncEngine.getLocalKey(DatabaseHelper.CATEGORY_TABLE, expect.getJSONObject(i).getString("parentCategory")));
+                Category c3=dba.getCategory(c.getParentId());
+                assertEquals(c2.id, c3.id);
+            }
+            assertEquals(expect.getJSONObject(i).getString("name"),c.title );
+            assertEquals(expect.getJSONObject(i).getInt("type"),c.type);
+        }
+    }
+
+
+    public void test_push_budgets() throws Exception {
+        Budget budgetOne;
+        if (dba.em().getAllBudgets(WhereFilter.empty()).size()==0) {
+            budgetOne=createBudget();
+        } else {
+            budgetOne=dba.em().getAllBudgets(WhereFilter.empty()).get(0);
+        }
+        FlowzrSyncEngine.fixCreatedEntities();
+        FlowzrSyncEngine.pushUpdate("currency", Currency.class);
+        FlowzrSyncEngine.pushUpdate("account", Account.class);
+        FlowzrSyncEngine.pushUpdate("project", Project.class);
+        FlowzrSyncEngine.pushUpdate("payee", Payee.class);
+        FlowzrSyncEngine.pushUpdate("category", Category.class);
+
+        FlowzrSyncEngine.pushUpdate(DatabaseHelper.BUDGET_TABLE, Budget.class);
+        Thread.sleep(2000);
+        JSONObject json = getJsonResponse(FlowzrSyncEngine.FLOWZR_API_URL + "test_example.com/budget/?last_sync_ts=0");
+        JSONArray result = json.getJSONArray("budget");
+
+        assertEquals(result.length(),dba.em().getAllBudgets(WhereFilter.empty()).size());
+
+
+        budgetOne.recur="WEEKLY,startDate=1403582400000,period=EXACTLY_TIMES,periodParam=4,days=TUE";
+        dba.em().insertBudget(budgetOne);
+        FlowzrSyncEngine.fixCreatedEntities();
+        FlowzrSyncEngine.pushDelete();
+        Thread.sleep(2000);
+
+        FlowzrSyncEngine.db=this.db;
+        FlowzrSyncEngine.pushUpdate(DatabaseHelper.BUDGET_TABLE, Budget.class);
+
+        Thread.sleep(2000);
+        json = getJsonResponse(FlowzrSyncEngine.FLOWZR_API_URL + "test_example.com/budget/?last_sync_ts=0");
+        result = json.getJSONArray("budget");
+        assertEquals(result.length(),dba.em().getAllBudgets(WhereFilter.empty()).size());
+
+
+    }
+
+    /** Helper functions **/
+
+    private Budget createBudget() {
+        Account account;
+        Project project;
+        if (dba.em().getAllAccountsList().size()==0) {
+            account = AccountBuilder.createDefault(dba);
+        } else {
+            account=dba.em().getAllAccountsList().get(0);
+        }
+
+        Map<String,Category> categoriesMap;
+        if (dba.em().getAllCategoriesList(true).size()<=2) {
+            categoriesMap = CategoryBuilder.createDefaultHierarchy(dba);
+        } else {
+            categoriesMap = CategoryBuilder.allCategoriesAsMap(dba);
+        }
+
+        if ( MyEntity.asMap(dba.em().getAllProjectsList(true)).size()==0) {
+            project = new Project();
+            project.title = "P1";
+            em.saveOrUpdate(project);
+        } else {
+            project= dba.em().getAllProjectsList(true).get(0);
+        }
+
+        Budget budgetOne = new Budget();
+        budgetOne.currency = account.currency;
+        budgetOne.amount = 1000;
+        budgetOne.categories = String.valueOf(categoriesMap.get("A").id);
+        budgetOne.projects = String.valueOf(project.id);
+        budgetOne.expanded = true;
+        budgetOne.includeSubcategories = true;
+        budgetOne.startDate = DateTime.date(2011, 4, 1).atMidnight().asLong();
+        budgetOne.endDate = DateTime.date(2011, 4, 30).at(23, 59, 59, 999).asLong();
+        budgetOne.recur="WEEKLY,startDate=1403582400000,period=EXACTLY_TIMES,periodParam=12,days=TUE";
+        dba.em().insertBudget(budgetOne);
+        FlowzrSyncEngine.fixCreatedEntities();
+        return budgetOne;
+    }
+
+
+    public JSONObject getJsonResponse(String url) throws URISyntaxException, IOException, JSONException {
+
+        HttpGet request = getAuthenticateRequest(url);
+        HttpResponse response = http_client.execute(request);
+        HttpEntity entity = response.getEntity();
+        StringBuilder builder=new StringBuilder();
+
+        if (entity != null) {
+            InputStream inputStream = entity.getContent();
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+            for (String line = null; (line = bufferedReader.readLine()) != null;) {
+                builder.append(line).append("\n");
+            }
+            //Exception getting thrown in below line
+
+            return new JSONObject(builder.toString());
+
+        }
+        return null;
+
+    }
+
+
+    public HttpGet getAuthenticateRequest(String cont) {
+        HttpGet h= new HttpGet(FlowzrSyncEngine.FLOWZR_BASE_URL + "_ah/login?&email=[e-mail]&action=Login&continue=" + cont);
+        h.setHeader("Cookie","dev_appserver_login=[e-mail]:False:185804764220139124118");
+        return h;
+    }
+
+    private Currency createCurrency(String currency) {
+        Currency c = CurrencyBuilder.withDb(dba)
+                .title("Singapore Dollar")
+                .name(currency)
+                .separators("''", "'.'")
+                .symbol("S$")
+                .create();
+        return c;
+    }
+
+}

=== modified file 'tests/src/ru/orangesoftware/financisto/test/CategoryBuilder.java'
--- tests/src/ru/orangesoftware/financisto/test/CategoryBuilder.java	2012-07-06 19:20:38 +0000
+++ tests/src/ru/orangesoftware/financisto/test/CategoryBuilder.java	2014-06-25 21:52:59 +0000
@@ -41,7 +41,7 @@
         return this;
     }
 
-    private static Map<String, Category> allCategoriesAsMap(DatabaseAdapter db) {
+    public static Map<String, Category> allCategoriesAsMap(DatabaseAdapter db) {
         HashMap<String, Category> map = new HashMap<String, Category>();
         List<Category> categories = db.getAllCategoriesList();
         for (Category category : categories) {

=== removed file 'tests/tests.iml'
--- tests/tests.iml	2014-06-17 15:11:57 +0000
+++ tests/tests.iml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <includeAssetsFromLibraries>true</includeAssetsFromLibraries>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/bin" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android 4.0.3 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Financisto" scope="PROVIDED" />
-  </component>
-</module>
-