Moved the "accounting.report.reports.utils" module to "accounting.report.utils". It does not make sense to have a wierd and long module name just to make the import pretty.

src/accounting/report/reports/balance_sheet.py

@@ -27,14 +27,16 @@ from accounting.locale import gettext
 from accounting.models import Currency, BaseAccount, Account, Transaction, \
     JournalEntry
 from accounting.report.period import Period
-from .utils.base_page_params import BasePageParams
+from accounting.report.utils.base_page_params import BasePageParams
-from .utils.base_report import BaseReport
+from accounting.report.utils.base_report import BaseReport
-from .utils.csv_export import BaseCSVRow, csv_download, period_spec
+from accounting.report.utils.csv_export import BaseCSVRow, csv_download, \
-from .utils.option_link import OptionLink
+    period_spec
-from .utils.period_choosers import PeriodChooser
+from accounting.report.utils.option_link import OptionLink
-from .utils.report_chooser import ReportChooser
+from accounting.report.utils.period_choosers import PeriodChooser
-from .utils.report_type import ReportType
+from accounting.report.utils.report_chooser import ReportChooser
-from .utils.urls import ledger_url, balance_sheet_url, income_statement_url
+from accounting.report.utils.report_type import ReportType
+from accounting.report.utils.urls import ledger_url, balance_sheet_url, \
+    income_statement_url
 
 
 class ReportAccount:

src/accounting/report/reports/income_expenses.py

@@ -29,15 +29,16 @@ from accounting.locale import gettext
 from accounting.models import Currency, Account, Transaction, JournalEntry
 from accounting.report.income_expense_account import IncomeExpensesAccount
 from accounting.report.period import Period
+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_choosers 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
 from accounting.utils.pagination import Pagination
-from .utils.base_page_params import BasePageParams
-from .utils.base_report import BaseReport
-from .utils.csv_export import BaseCSVRow, csv_download, period_spec
-from .utils.option_link import OptionLink
-from .utils.period_choosers import PeriodChooser
-from .utils.report_chooser import ReportChooser
-from .utils.report_type import ReportType
-from .utils.urls import income_expenses_url
 
 
 class ReportEntry:

src/accounting/report/reports/income_statement.py

@@ -27,14 +27,15 @@ from accounting.locale import gettext
 from accounting.models import Currency, BaseAccount, Account, Transaction, \
     JournalEntry
 from accounting.report.period import Period
-from .utils.base_page_params import BasePageParams
+from accounting.report.utils.base_page_params import BasePageParams
-from .utils.base_report import BaseReport
+from accounting.report.utils.base_report import BaseReport
-from .utils.csv_export import BaseCSVRow, csv_download, period_spec
+from accounting.report.utils.csv_export import BaseCSVRow, csv_download, \
-from .utils.option_link import OptionLink
+    period_spec
-from .utils.period_choosers import PeriodChooser
+from accounting.report.utils.option_link import OptionLink
-from .utils.report_chooser import ReportChooser
+from accounting.report.utils.period_choosers import PeriodChooser
-from .utils.report_type import ReportType
+from accounting.report.utils.report_chooser import ReportChooser
-from .utils.urls import ledger_url, income_statement_url
+from accounting.report.utils.report_type import ReportType
+from accounting.report.utils.urls import ledger_url, income_statement_url
 
 
 class ReportAccount:

src/accounting/report/reports/journal.py

@@ -27,14 +27,15 @@ from sqlalchemy.orm import selectinload
 from accounting.locale import gettext
 from accounting.models import Currency, Account, Transaction, JournalEntry
 from accounting.report.period import Period
+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_choosers 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
 from accounting.utils.pagination import Pagination
-from .utils.base_page_params import BasePageParams
-from .utils.base_report import BaseReport
-from .utils.csv_export import BaseCSVRow, csv_download, period_spec
-from .utils.period_choosers import PeriodChooser
-from .utils.report_chooser import ReportChooser
-from .utils.report_type import ReportType
-from .utils.urls import journal_url
 
 
 class ReportEntry:

src/accounting/report/reports/ledger.py

@@ -28,15 +28,16 @@ from accounting import db
 from accounting.locale import gettext
 from accounting.models import Currency, Account, Transaction, JournalEntry
 from accounting.report.period import Period
+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_choosers 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
 from accounting.utils.pagination import Pagination
-from .utils.base_page_params import BasePageParams
-from .utils.base_report import BaseReport
-from .utils.csv_export import BaseCSVRow, csv_download, period_spec
-from .utils.option_link import OptionLink
-from .utils.period_choosers import PeriodChooser
-from .utils.report_chooser import ReportChooser
-from .utils.report_type import ReportType
-from .utils.urls import ledger_url
 
 
 class ReportEntry:

src/accounting/report/reports/search.py

@@ -27,14 +27,14 @@ from sqlalchemy.orm import selectinload
 from accounting.locale import gettext
 from accounting.models import Currency, CurrencyL10n, Account, AccountL10n, \
     Transaction, JournalEntry
+from accounting.report.utils.base_page_params import BasePageParams
+from accounting.report.utils.base_report import BaseReport
+from accounting.report.utils.csv_export import csv_download
+from accounting.report.utils.report_chooser import ReportChooser
+from accounting.report.utils.report_type import ReportType
 from accounting.utils.pagination import Pagination
 from accounting.utils.query import parse_query_keywords
 from .journal import get_csv_rows
-from .utils.base_page_params import BasePageParams
-from .utils.base_report import BaseReport
-from .utils.csv_export import csv_download
-from .utils.report_chooser import ReportChooser
-from .utils.report_type import ReportType
 
 
 class EntryCollector:

src/accounting/report/reports/trial_balance.py

@@ -26,14 +26,15 @@ from accounting import db
 from accounting.locale import gettext
 from accounting.models import Currency, Account, Transaction, JournalEntry
 from accounting.report.period import Period
-from .utils.base_page_params import BasePageParams
+from accounting.report.utils.base_page_params import BasePageParams
-from .utils.base_report import BaseReport
+from accounting.report.utils.base_report import BaseReport
-from .utils.csv_export import BaseCSVRow, csv_download, period_spec
+from accounting.report.utils.csv_export import BaseCSVRow, csv_download, \
-from .utils.option_link import OptionLink
+    period_spec
-from .utils.period_choosers import PeriodChooser
+from accounting.report.utils.option_link import OptionLink
-from .utils.report_chooser import ReportChooser
+from accounting.report.utils.period_choosers import PeriodChooser
-from .utils.report_type import ReportType
+from accounting.report.utils.report_chooser import ReportChooser
-from .utils.urls import ledger_url, trial_balance_url
+from accounting.report.utils.report_type import ReportType
+from accounting.report.utils.urls import ledger_url, trial_balance_url
 
 
 class ReportAccount:

src/accounting/report/utils/__init__.py

@@ -14,6 +14,6 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-"""The utilities to generate reports.
+"""The utilities for the reports.
 
 """