diff --git a/__init__.py b/__init__.py index a0f083f..3e1ec47 100644 --- a/__init__.py +++ b/__init__.py @@ -1,9 +1,9 @@ # The COPYRIGHT file at the top level of this repository contains the full # copyright notices and license terms. from trytond.pool import Pool -import company -import sale -import account +from . import company +from . import sale +from . import account def register(): diff --git a/account.py b/account.py index be7cfaa..a65ac78 100644 --- a/account.py +++ b/account.py @@ -7,13 +7,6 @@ from trytond.model import fields from trytond.pool import PoolMeta, Pool from trytond.transaction import Transaction -__all__ = [ - 'PrintBalanceSheetCOLGAAPStart', 'PrintBalanceSheetCOLGAAP', - 'BalanceSheetCOLGAAP', 'PrintIncomeStatementCOLGAAPStart', - 'PrintIncomeStatementCOLGAAP', 'IncomeStatementCOLGAAP', - 'PrintTrialBalanceStart', 'PrintTrialBalance', 'TrialBalanceClassic' -] - _ZERO = Decimal('0.00') @@ -35,8 +28,8 @@ class TrialBalanceClassic(metaclass=PoolMeta): __name__ = 'account_col.trial_balance_classic' @classmethod - def get_context(cls, records, data): - report_context = super(TrialBalanceClassic, cls).get_context(records, data) + def get_context(cls, records, header, data): + report_context = super().get_context(records, header, data) Company = Pool().get('company.company') company = Company(Transaction().context.get('company')) result = {} @@ -137,8 +130,8 @@ class BalanceSheetCOLGAAP(metaclass=PoolMeta): __name__ = 'account_col.balance_sheet_colgaap' @classmethod - def get_context(cls, records, data): - report_context = super(BalanceSheetCOLGAAP, cls).get_context(records, data) + def get_context(cls, records, header, data): + report_context = super(BalanceSheetCOLGAAP, cls).get_context(records, header, data) Company = Pool().get('company.company') company = Company(Transaction().context.get('company')) result = {} diff --git a/company.py b/company.py index 48ef449..247a438 100644 --- a/company.py +++ b/company.py @@ -6,8 +6,6 @@ from trytond.model import ModelView, ModelSQL, fields from trytond.pool import PoolMeta from trytond.pyson import Bool, Eval -__all__ = ['Company'] - class Company(metaclass=PoolMeta): __name__ = 'company.company' @@ -25,4 +23,3 @@ class ConnectionCompanies(ModelSQL, ModelView): api_connection = fields.Char('Api Connection', required=True) company = fields.Many2One('company.company', 'Company', select=True, ondelete='CASCADE') - diff --git a/sale.py b/sale.py index dfdad5e..c1a911b 100644 --- a/sale.py +++ b/sale.py @@ -5,12 +5,6 @@ from trytond.pool import PoolMeta, Pool from trytond.transaction import Transaction from trytond.pyson import Eval -__all__ = [ - 'SaleIncomeDailyStart', 'SaleDailyReport', 'SaleMonthByShopStart', - 'SaleDetailedStart', 'SaleDetailedReport', 'ShopDailySummaryStart', - 'PortfolioDetailedReport', 'ExpiredPortfolioReport', 'MovesInvoicesReport', - 'PortfolioBySalesmanReport' -] # 'InvoicesStart' _ZERO = Decimal('0.00') @@ -42,7 +36,7 @@ class SaleDailyReport(metaclass=PoolMeta): __name__ = 'sale_goal.sale_daily_report' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): # report_context = super(SaleDailyReport, cls).get_context(records, data) report_context = {} pool = Pool() @@ -154,7 +148,7 @@ class SaleDetailedReport(metaclass=PoolMeta): __name__ = 'sale_pos.report_sale_detailed' @classmethod - def get_context(cls, records, data): + def get_context(cls, records, header, data): # report_context = super(SaleDetailedReport, cls).get_context(records, data) report_context = {} pool = Pool() diff --git a/tryton.cfg b/tryton.cfg index 67078af..62fd540 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=5.0.2 +version=6.0.0 depends: company account