Release v6.0
This commit is contained in:
parent
2065a0fb9a
commit
bc64439d10
|
@ -1,9 +1,9 @@
|
||||||
# The COPYRIGHT file at the top level of this repository contains the full
|
# The COPYRIGHT file at the top level of this repository contains the full
|
||||||
# copyright notices and license terms.
|
# copyright notices and license terms.
|
||||||
from trytond.pool import Pool
|
from trytond.pool import Pool
|
||||||
import company
|
from . import company
|
||||||
import sale
|
from . import sale
|
||||||
import account
|
from . import account
|
||||||
|
|
||||||
|
|
||||||
def register():
|
def register():
|
||||||
|
|
15
account.py
15
account.py
|
@ -7,13 +7,6 @@ from trytond.model import fields
|
||||||
from trytond.pool import PoolMeta, Pool
|
from trytond.pool import PoolMeta, Pool
|
||||||
from trytond.transaction import Transaction
|
from trytond.transaction import Transaction
|
||||||
|
|
||||||
__all__ = [
|
|
||||||
'PrintBalanceSheetCOLGAAPStart', 'PrintBalanceSheetCOLGAAP',
|
|
||||||
'BalanceSheetCOLGAAP', 'PrintIncomeStatementCOLGAAPStart',
|
|
||||||
'PrintIncomeStatementCOLGAAP', 'IncomeStatementCOLGAAP',
|
|
||||||
'PrintTrialBalanceStart', 'PrintTrialBalance', 'TrialBalanceClassic'
|
|
||||||
]
|
|
||||||
|
|
||||||
_ZERO = Decimal('0.00')
|
_ZERO = Decimal('0.00')
|
||||||
|
|
||||||
|
|
||||||
|
@ -35,8 +28,8 @@ class TrialBalanceClassic(metaclass=PoolMeta):
|
||||||
__name__ = 'account_col.trial_balance_classic'
|
__name__ = 'account_col.trial_balance_classic'
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def get_context(cls, records, data):
|
def get_context(cls, records, header, data):
|
||||||
report_context = super(TrialBalanceClassic, cls).get_context(records, data)
|
report_context = super().get_context(records, header, data)
|
||||||
Company = Pool().get('company.company')
|
Company = Pool().get('company.company')
|
||||||
company = Company(Transaction().context.get('company'))
|
company = Company(Transaction().context.get('company'))
|
||||||
result = {}
|
result = {}
|
||||||
|
@ -137,8 +130,8 @@ class BalanceSheetCOLGAAP(metaclass=PoolMeta):
|
||||||
__name__ = 'account_col.balance_sheet_colgaap'
|
__name__ = 'account_col.balance_sheet_colgaap'
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def get_context(cls, records, data):
|
def get_context(cls, records, header, data):
|
||||||
report_context = super(BalanceSheetCOLGAAP, cls).get_context(records, data)
|
report_context = super(BalanceSheetCOLGAAP, cls).get_context(records, header, data)
|
||||||
Company = Pool().get('company.company')
|
Company = Pool().get('company.company')
|
||||||
company = Company(Transaction().context.get('company'))
|
company = Company(Transaction().context.get('company'))
|
||||||
result = {}
|
result = {}
|
||||||
|
|
|
@ -6,8 +6,6 @@ from trytond.model import ModelView, ModelSQL, fields
|
||||||
from trytond.pool import PoolMeta
|
from trytond.pool import PoolMeta
|
||||||
from trytond.pyson import Bool, Eval
|
from trytond.pyson import Bool, Eval
|
||||||
|
|
||||||
__all__ = ['Company']
|
|
||||||
|
|
||||||
|
|
||||||
class Company(metaclass=PoolMeta):
|
class Company(metaclass=PoolMeta):
|
||||||
__name__ = 'company.company'
|
__name__ = 'company.company'
|
||||||
|
@ -25,4 +23,3 @@ class ConnectionCompanies(ModelSQL, ModelView):
|
||||||
api_connection = fields.Char('Api Connection', required=True)
|
api_connection = fields.Char('Api Connection', required=True)
|
||||||
company = fields.Many2One('company.company', 'Company', select=True,
|
company = fields.Many2One('company.company', 'Company', select=True,
|
||||||
ondelete='CASCADE')
|
ondelete='CASCADE')
|
||||||
|
|
||||||
|
|
10
sale.py
10
sale.py
|
@ -5,12 +5,6 @@ from trytond.pool import PoolMeta, Pool
|
||||||
from trytond.transaction import Transaction
|
from trytond.transaction import Transaction
|
||||||
from trytond.pyson import Eval
|
from trytond.pyson import Eval
|
||||||
|
|
||||||
__all__ = [
|
|
||||||
'SaleIncomeDailyStart', 'SaleDailyReport', 'SaleMonthByShopStart',
|
|
||||||
'SaleDetailedStart', 'SaleDetailedReport', 'ShopDailySummaryStart',
|
|
||||||
'PortfolioDetailedReport', 'ExpiredPortfolioReport', 'MovesInvoicesReport',
|
|
||||||
'PortfolioBySalesmanReport'
|
|
||||||
]
|
|
||||||
# 'InvoicesStart'
|
# 'InvoicesStart'
|
||||||
|
|
||||||
_ZERO = Decimal('0.00')
|
_ZERO = Decimal('0.00')
|
||||||
|
@ -42,7 +36,7 @@ class SaleDailyReport(metaclass=PoolMeta):
|
||||||
__name__ = 'sale_goal.sale_daily_report'
|
__name__ = 'sale_goal.sale_daily_report'
|
||||||
|
|
||||||
@classmethod
|
@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 = super(SaleDailyReport, cls).get_context(records, data)
|
||||||
report_context = {}
|
report_context = {}
|
||||||
pool = Pool()
|
pool = Pool()
|
||||||
|
@ -154,7 +148,7 @@ class SaleDetailedReport(metaclass=PoolMeta):
|
||||||
__name__ = 'sale_pos.report_sale_detailed'
|
__name__ = 'sale_pos.report_sale_detailed'
|
||||||
|
|
||||||
@classmethod
|
@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 = super(SaleDetailedReport, cls).get_context(records, data)
|
||||||
report_context = {}
|
report_context = {}
|
||||||
pool = Pool()
|
pool = Pool()
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[tryton]
|
[tryton]
|
||||||
version=5.0.2
|
version=6.0.0
|
||||||
depends:
|
depends:
|
||||||
company
|
company
|
||||||
account
|
account
|
||||||
|
|
Loading…
Reference in New Issue