Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reports updated mostly for currency conversion, split where appropriate and ignore Duplicate Tx #60

Merged
merged 56 commits into from
Dec 12, 2019

Conversation

siowena
Copy link
Contributor

@siowena siowena commented Apr 28, 2019

Using some of the points in #53 as a guide (and also updated as I needed them to work)

  • AccountForecast

    • Exclude Duplicate transactions
    • Formatting of values - Support Accounts with Multiple currencies
    • Formatting currency figures - Using values from currency table to format values correctly using currency values (prefix; suffix; decimal; group separator) on the reports using javascript. If values don't exist, then use the base currency values
    • General updates - Changed so account name come from SQL and no editing of htt is needed
    • Use account's currency & display on page - Display the currency the report is in (using the account's currency setting) and format the amounts as numbers correctly with the decimal & 1000's grouping characters.
  • AccountSummary

    • Exclude Duplicate transactions
    • Formatting of values - Support Accounts with Multiple currencies
    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE
    • Formatting currency figures - Using values from currency table to format values correctly using currency values (prefix; suffix; decimal; group separator) on the reports using javascript. If values don't exist, then use the base currency values
  • AccountTrend4

    • Exclude Duplicate transactions
    • Support for accounts in non-base currency - Display values in the account's currency formats
    • Formatting currency figures - Using values from currency table to format values correctly using currency values (prefix; suffix; decimal; group separator) on the reports using javascript. If values don't exist, then use the base currency values
    • General updates - Changed so account name come from SQL and no editing of htt is needed.
  • AttachmentList

    • HTML5 checks
    • Exclude Duplicate & Void transactions.
  • BlankNotes

    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
    • Formatting currency figures - Using values from currency table to format values correctly using currency values (prefix; suffix; decimal; group separator) on the reports using javascript. If values don't exist, then use the base currency values
    • template.htt file changes to UTF-8 encoding
  • BudgetMonitoringCurrenctMonth

    • Exclude Duplicate transactions
  • BudgetMonitoringLastMonth

    • Exclude Duplicate transactions
  • CategoriesStatLast12Months

    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
  • CategoryForecast

    • Exclude Duplicate transactions
    • Convert to BaseCurrency and use Split Transactions
    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
    • CheckingAccount also now use SplitTransactions (check CATEGID = -1)
    • Billdeposits Account also now use BudgetSplitTransactions (check CATEGID = -1)
  • CategoryTrend

    • Exclude Duplicate transactions
    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
    • Changed the SUBCATEGORY_V1 to left join as not all Categories have a subcategory (Other Expenses) and Transactions can be put at Category level by user.
  • CreditReport

    • report now picks up Credit Limit from the account record.
    • Support Accounts in difference currencies
    • Formatting currency figures - Using values from currency table to format values correctly using currency values (prefix; suffix; decimal; group separator) on the reports using javascript. If values don't exist, then use the base currency values
    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
    • HTML5 checks
    • Exclude Duplicate transactions
  • CreditReport2

    • HTML5 checks
    • Exclude Duplicate transactions
    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
    • correct transactions records to use TOTRANSAMOUNT as this is needed for transfer between accounts of difference currencies
  • CurrencySummary

    • Currency format and rates
    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
    • Displayed prefix & suffix symbol(s) of the currency
    • Displayed example formatting for each currency.
  • DepositVsExpensesAndLoadRepaymentsByMonth

    • Exclude Duplicate transactions
  • ExpenditureHistory

    • Support for multiple currencies
    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
    • CheckingAccount also now use SplitTransactions (check CATEGID = -1)
    • Correction to Total column, now include current month's expenses.
  • IncomeVsExpenseTransactionsByYear

    • New Report Income vs. Expense Transactions By Year
    • Made report configurable for Calendar or Financial Year - The report has two parameters in SQL, one to set to Calendar or Financial Year and the 2nd to set the years the report should show collated values for
  • PayeeTrend

    • Exclude Duplicate transactions
  • SavingsProgress

    • Exclude Duplicate transactions
  • usercoloredtransactions

    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
    • Formatting currency figures - Using values from currency table to format values correctly using currency values (prefix; suffix; decimal; group separator) on the reports using javascript. If values don't exist, then use the base currency values
  • YearlyExpenseAndRevenue

    • Switch to ChartNew.js from Chart.js.
    • Exclude Void & Duplicates & Transfers.
    • Currency conversion - Pickup the latest currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
    • Formatting currency figures - Using values from currency table to format values correctly using currency values (prefix; suffix; decimal; group separator) on the reports using javascript. If values don't exist, then use the base currency values

siowena and others added 30 commits March 13, 2019 17:34
Changed so account name come from SQL and no editing of htt is needed.
Using SQL values from currency table to format correctly currency values on the reports using javascript.
The report has two parameters in SQL, one to set to Calendar or Financial Year and the 2nd to set the years the report should show collated values for.
Display the currency the report is in (using the account's currency setting) and format the amounts as numbers correctly with the dec & group characters.
Pickup the latets currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
Display values in the account's currency formats.
Pickup the latets currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
Now get the conversion rate from CURRENCYHISTORY_V1, if not found then uses CURRENCYHISTORY_V1.BASECONVRATE
Pickup the latets currency conversion from the CURRENCYHISTORY_V1 table. If there are no value, then use CURRENCYFORMATS_V1.BASECONVRATE.
Changed the SUBCATEGORY_V1 to left join as not all Categories have a subcategory (Other Expenses) and Transactions can be put at Category level by user.
Format currency and deal with various currencies.
- Switch to ChartNew.js
- Exclude Void & Duplicates & Transfers
- Switch to base currency using History values or default
- Display currency
- SQL now pulls both the Currency rate from currency record and latets historical currency rate
- Displayed prefix & suffix symbol(s) of the currency
Displayed example formatting for each currency.
-- Convert to Base Currency from Tx Acc Currency using Curr History or Curr Conv 2 Base Rate
-- CheckingAccount also now use SplitTransactions (check CATEGID = -1)-- Billdeposits Account also now use BudgetSplitTransactions (check CATEGID = -1)
Support for accounts in multiple currencies converted to base currency.
Conversion uses latest History Rate, or Currency Record rate.
Correction to Total column, now include current month's expenses.
- support accounts in difference currencies
- display curency of account on report
- pickup currency conversion rate from History if available
- report now picks up Credit Limit from the account record.
- correct date range
- Remove zero dataset
- more description
- Displays the amounts in currency of the account
- HTML5 check on template
- refined SQL to reduce number of JOINS
siowena and others added 17 commits April 4, 2019 16:02
Save the template in UTF8 for the internation characters
Upgraded to use the ChartNew.js script file.
Used Historic Values before using Conversion Based currency rate
Used Historic Values before using Conversion Based currency rate
Report gets Payee from SQL.
New report showing same as built-in but for multiple years.
Remove the legend js and use the options for legend.
- Correct graph value titles (from color)
- add legend to graph
- format description.txt
- display account values in account currency
- display totals in base currency
- use historical currency value before currency base conv value
Check_gm.py
 - now includes traceback for more informative error reporting
- opens files in read text mode (binary was failing) and force encoding utf-8
tables_v1.sql
- copy the file from v7 release as CURRENCYHISTORY_V1 table (and other DB changes) are not in the file in master repository
commented out v3 line as travis-ci is upgrading soon
Reference in SQL changed case, Lua needs to change also as it's case sensitive
On Apr 167th, travis-ci.org moved to Python 3, print syntax updated
Missing the ="" in the where clause. Fixed.
@slodki
Copy link
Contributor

slodki commented Apr 28, 2019

Please remove check_gm.py, pack_gm.py and tables_v1.sql files from your PR

@slodki
Copy link
Contributor

slodki commented Apr 28, 2019

@siowena please re-add .DS_Store to .gitignore and remove it from PR.
Then all technical problems will be fixed. I've no time to verify your reports' changes.

@siowena
Copy link
Contributor Author

siowena commented Apr 28, 2019

Will do on the .gitignore file.

However, the SQL check_gm.py now fails travis-ci after the DB V12 checks due to tablename changes - is that OK, or am I missing something?

Shouldn't have pushed from mac
@slodki
Copy link
Contributor

slodki commented Apr 28, 2019

We have reports for the old db schema only - so it's ok SQL queries are not working with MMEX 1.4.x db. We need something like #52 to support users with different MMEX versions.

- Report was present twice with spaces and underscores in the name
- Renamed report name to bring in line with other report namings and removed the duplicate report
@vomikan vomikan merged commit e303885 into moneymanagerex:master Dec 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants