diff --git a/bpfin/financials/balance_sheet_projection.py b/bpfin/financials/balance_sheet_projection.py index 8c460f7b66d8f8a89e68220e15713c419698b9a5..2a34ef0377448e37fcd07ae598023c9b0e8e64c7 100644 --- a/bpfin/financials/balance_sheet_projection.py +++ b/bpfin/financials/balance_sheet_projection.py @@ -33,7 +33,7 @@ def balance_sheet_projection(cash_balance, liability, smallest_year = min(cash_balance) largest_year = max(cash_balance) - for an_year in analysis_years: + for an_year in sorted(analysis_years): if an_year in cash_balance: analysis_years[an_year] = cash_balance[an_year] # If the cash available value exists (balance sheet, bank statements), cash available = to that value diff --git a/bpfin/financials/cash_balance.py b/bpfin/financials/cash_balance.py index cf342d0cbc3badf05532da311b1d48203e824351..d28a045ee06ec40f476ad0d503a70b3fe8c93d05 100644 --- a/bpfin/financials/cash_balance.py +++ b/bpfin/financials/cash_balance.py @@ -41,14 +41,13 @@ def cash_balance(analysis_date, cash_dictionary): cash_balance_dictionary[year] = sum(value) / len(value) sum_cash = [] - for year in cash_balance_dictionary: + for year in sorted(cash_balance_dictionary): sum_cash.append(cash_balance_dictionary[year]) # cash_average = (sum(sum_cash)/len(sum_cash) if sum_cash else 0) cash_average = sum(sum_cash)/len(sum_cash) final_dict = {} for year in analysis_years: - # if cash_balance_dictionary: if year in cash_balance_dictionary: final_dict[year] = cash_balance_dictionary[year] if year < min(cash_balance_dictionary): diff --git a/bpfin/financials/liability.py b/bpfin/financials/liability.py index 0295991784103998d891475660c462c619ef6e5b..eaf71a140807cd5e1c8360e3d7613b2d02b9ec18 100644 --- a/bpfin/financials/liability.py +++ b/bpfin/financials/liability.py @@ -90,7 +90,7 @@ def final_liability_dict(analysis_date, liability_dictionary): debt_list = create_liability_dict(liability_dictionary) for pro_date in pro_forma_calendar: for debt_date_dict in debt_list: - for debt_date in debt_date_dict: + for debt_date in sorted(debt_date_dict): if pro_date.year == debt_date.year and pro_date.month == debt_date.month: if (pro_date.year, pro_date.month, calendar.monthrange( pro_date.year,