lp:~abdsandr/financisto/abdsandr

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~financisto-dev/financisto/trunk

Financisto Developers: Pending requested 2010-08-22

Diff: 2474 lines (+1698/-46)

28 files modified

.classpath (+1/-0)
AndroidManifest.xml (+2/-0)
assets/database/alter/20100721_0737_add_bill_filtering_pars_to_account.sql (+3/-0)
res/layout/credit_card_transaction.xml (+25/-0)
res/layout/monthly_view.xml (+77/-0)
res/menu/blotter_menu.xml (+5/-0)
res/menu/ccard_blotter_menu.xml (+8/-0)
res/values-pt-rBR/strings.xml (+47/-9)
res/values/ids.xml (+2/-1)
res/values/strings.xml (+37/-1)
res/xml/preferences.xml (+11/-0)
src/ru/orangesoftware/financisto/activity/AbstractTransactionActivity.java (+20/-0)
src/ru/orangesoftware/financisto/activity/AccountActivity.java (+63/-0)
src/ru/orangesoftware/financisto/activity/BlotterActivity.java (+84/-0)
src/ru/orangesoftware/financisto/activity/MainActivity.java (+250/-3)
src/ru/orangesoftware/financisto/activity/MonthlyViewActivity.java (+510/-0)
src/ru/orangesoftware/financisto/adapter/CreditCardStatementAdapter.java (+217/-0)
src/ru/orangesoftware/financisto/backup/DatabaseImport.java (+30/-4)
src/ru/orangesoftware/financisto/backup/SettingsNotConfiguredException.java (+33/-0)
src/ru/orangesoftware/financisto/db/DatabaseAdapter.java (+129/-0)
src/ru/orangesoftware/financisto/db/DatabaseHelper.java (+23/-3)
src/ru/orangesoftware/financisto/export/Export.java (+51/-6)
src/ru/orangesoftware/financisto/export/ImportExportAsyncTask.java (+10/-10)
src/ru/orangesoftware/financisto/model/Account.java (+9/-0)
src/ru/orangesoftware/financisto/model/AccountType.java (+12/-8)
src/ru/orangesoftware/financisto/model/Transaction.java (+10/-0)
src/ru/orangesoftware/financisto/utils/MyPreferences.java (+24/-0)
src/ru/orangesoftware/financisto/widget/AmountInput.java (+5/-1)

api

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

52. By Abdsandryk <abdsandr@abdsandr-laptop> on 2010-08-22

Closing cursors to solve problem described by Denis.

51. By Abdsandryk <abdsandr@abdsandr-laptop> on 2010-08-22

Adding google docs backup, credit card statements and monthly preview functionalities

50. By Denis Solonenko on 2010-08-20

Fix last-weekday recurrence

49. By Denis Solonenko on 2010-08-19

Update what's new

48. By Denis Solonenko on 2010-08-19

All transactions in the blotter marked with color based on transaction status

47. By Denis Solonenko on 2010-08-19

Allow to open accounts with negative balance

46. By Denis Solonenko on 2010-08-19

Some improvements and bug fixes

45. By Denis Solonenko on 2010-08-13

Merged from lp:~thyarles/financisto/pt-br

44. By Denis Solonenko on 2010-08-05

Fix database export/import

43. By Denis Solonenko on 2010-08-05

Merged from trunk