Moved the period and period chooser to the "accounting.report.period" module.

src/accounting/report/reports/balance_sheet.py

@@ -26,13 +26,12 @@ from accounting import db
 from accounting.locale import gettext
 from accounting.models import Currency, BaseAccount, Account, Transaction, \
     JournalEntry
+from accounting.report.period import Period, PeriodChooser
 from accounting.report.utils.base_page_params import BasePageParams
 from accounting.report.utils.base_report import BaseReport
 from accounting.report.utils.csv_export import BaseCSVRow, csv_download, \
     period_spec
 from accounting.report.utils.option_link import OptionLink
-from accounting.report.utils.period import Period
-from accounting.report.utils.period_chooser import PeriodChooser
 from accounting.report.utils.report_chooser import ReportChooser
 from accounting.report.utils.report_type import ReportType
 from accounting.report.utils.urls import ledger_url, balance_sheet_url, \

src/accounting/report/reports/income_expenses.py

@@ -27,6 +27,7 @@ from sqlalchemy.orm import selectinload
 from accounting import db
 from accounting.locale import gettext
 from accounting.models import Currency, Account, Transaction, JournalEntry
+from accounting.report.period import Period, PeriodChooser
 from accounting.report.utils.base_page_params import BasePageParams
 from accounting.report.utils.base_report import BaseReport
 from accounting.report.utils.csv_export import BaseCSVRow, csv_download, \
@@ -34,8 +35,6 @@ from accounting.report.utils.csv_export import BaseCSVRow, csv_download, \
 from accounting.report.utils.income_expense_account import \
     IncomeExpensesAccount
 from accounting.report.utils.option_link import OptionLink
-from accounting.report.utils.period import Period
-from accounting.report.utils.period_chooser import PeriodChooser
 from accounting.report.utils.report_chooser import ReportChooser
 from accounting.report.utils.report_type import ReportType
 from accounting.report.utils.urls import income_expenses_url

src/accounting/report/reports/income_statement.py

@@ -26,13 +26,12 @@ from accounting import db
 from accounting.locale import gettext
 from accounting.models import Currency, BaseAccount, Account, Transaction, \
     JournalEntry
+from accounting.report.period import Period, PeriodChooser
 from accounting.report.utils.base_page_params import BasePageParams
 from accounting.report.utils.base_report import BaseReport
 from accounting.report.utils.csv_export import BaseCSVRow, csv_download, \
     period_spec
 from accounting.report.utils.option_link import OptionLink
-from accounting.report.utils.period import Period
-from accounting.report.utils.period_chooser import PeriodChooser
 from accounting.report.utils.report_chooser import ReportChooser
 from accounting.report.utils.report_type import ReportType
 from accounting.report.utils.urls import ledger_url, income_statement_url

src/accounting/report/reports/journal.py

@@ -26,12 +26,11 @@ from sqlalchemy.orm import selectinload
 
 from accounting.locale import gettext
 from accounting.models import Currency, Account, Transaction, JournalEntry
+from accounting.report.period import Period, PeriodChooser
 from accounting.report.utils.base_page_params import BasePageParams
 from accounting.report.utils.base_report import BaseReport
 from accounting.report.utils.csv_export import BaseCSVRow, csv_download, \
     period_spec
-from accounting.report.utils.period import Period
-from accounting.report.utils.period_chooser import PeriodChooser
 from accounting.report.utils.report_chooser import ReportChooser
 from accounting.report.utils.report_type import ReportType
 from accounting.report.utils.urls import journal_url

src/accounting/report/reports/ledger.py

@@ -27,13 +27,12 @@ from sqlalchemy.orm import selectinload
 from accounting import db
 from accounting.locale import gettext
 from accounting.models import Currency, Account, Transaction, JournalEntry
+from accounting.report.period import Period, PeriodChooser
 from accounting.report.utils.base_page_params import BasePageParams
 from accounting.report.utils.base_report import BaseReport
 from accounting.report.utils.csv_export import BaseCSVRow, csv_download, \
     period_spec
 from accounting.report.utils.option_link import OptionLink
-from accounting.report.utils.period import Period
-from accounting.report.utils.period_chooser import PeriodChooser
 from accounting.report.utils.report_chooser import ReportChooser
 from accounting.report.utils.report_type import ReportType
 from accounting.report.utils.urls import ledger_url

src/accounting/report/reports/trial_balance.py

@@ -25,13 +25,12 @@ from flask import Response, render_template
 from accounting import db
 from accounting.locale import gettext
 from accounting.models import Currency, Account, Transaction, JournalEntry
+from accounting.report.period import Period, PeriodChooser
 from accounting.report.utils.base_page_params import BasePageParams
 from accounting.report.utils.base_report import BaseReport
 from accounting.report.utils.csv_export import BaseCSVRow, csv_download, \
     period_spec
 from accounting.report.utils.option_link import OptionLink
-from accounting.report.utils.period import Period
-from accounting.report.utils.period_chooser import PeriodChooser
 from accounting.report.utils.report_chooser import ReportChooser
 from accounting.report.utils.report_type import ReportType
 from accounting.report.utils.urls import ledger_url, trial_balance_url