diff --git a/__init__.py b/__init__.py
index 4706fe2..38bf5dd 100644
--- a/__init__.py
+++ b/__init__.py
@@ -25,4 +25,6 @@ def register():
Pool.register(
InvestmentEvaluation,
InvestmentLine,
- module='cashbook_report', type_='model', depends=['cashbook_investment'])
+ module='cashbook_report',
+ type_='model',
+ depends=['cashbook_investment'])
diff --git a/currency.py b/currency.py
index f6155e3..f184720 100644
--- a/currency.py
+++ b/currency.py
@@ -13,8 +13,9 @@ from sql.conditionals import Case
class Currency(metaclass=PoolMeta):
__name__ = 'currency.currency'
- cashbook_hasbookings = fields.Function(fields.Boolean(string='Has Bookings',
- readonly=True), 'on_change_with_cashbook_hasbookings',
+ cashbook_hasbookings = fields.Function(fields.Boolean(
+ string='Has Bookings', readonly=True),
+ 'on_change_with_cashbook_hasbookings',
searcher='search_cashbook_hasbookings')
@fields.depends('id')
@@ -24,11 +25,9 @@ class Currency(metaclass=PoolMeta):
Lines = Pool().get('cashbook.line')
with Transaction().set_context({
- '_check_access': True,
- }):
+ '_check_access': True}):
if Lines.search_count([
- ('cashbook.currency.id', '=', self.id),
- ]) > 0:
+ ('cashbook.currency.id', '=', self.id)]) > 0:
return True
return False
@@ -45,17 +44,19 @@ class Currency(metaclass=PoolMeta):
tab_line = Line.__table__()
Operator = fields.SQL_OPERATORS[clause[1]]
- query = tab_book.join(tab_line,
- condition=tab_book.id==tab_line.cashbook,
- ).join(tab_cur,
- condition=tab_cur.id==tab_book.currency,
+ query = tab_book.join(
+ tab_line,
+ condition=tab_book.id == tab_line.cashbook,
+ ).join(
+ tab_cur,
+ condition=tab_cur.id == tab_book.currency,
).select(
tab_cur.id,
having=Operator(Case(
(Count(tab_line.id) > 0, True),
- else_ = False,
+ else_=False,
), clause[2]),
- group_by=[tab_cur.id,],
+ group_by=[tab_cur.id],
)
return [('id', 'in', query)]
diff --git a/evaluation.py b/evaluation.py
index a8b6f2d..3e4108b 100644
--- a/evaluation.py
+++ b/evaluation.py
@@ -35,62 +35,69 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
'Evaluation'
__name__ = 'cashbook_report.evaluation'
- company = fields.Many2One(string='Company', model_name='company.company',
+ company = fields.Many2One(
+ string='Company', model_name='company.company',
required=True, ondelete="RESTRICT")
name = fields.Char(string='Name', required=True)
- dtype = fields.Selection(string='Data type', required=True,
- sort=True, selection='get_sel_etype',
- help='Type of data displayed')
+ dtype = fields.Selection(
+ string='Data type', required=True, sort=True,
+ selection='get_sel_etype', help='Type of data displayed')
dtype_string = dtype.translated('dtype')
- chart = fields.Selection(string='Chart type', required=True,
- sort=False, selection=sel_chart,
- help='Type of graphical presentation.')
+ chart = fields.Selection(
+ string='Chart type', required=True, sort=False,
+ selection=sel_chart, help='Type of graphical presentation.')
legend = fields.Boolean(string='Legend')
- maincolor = fields.Selection(string='Color scheme', required=True,
- help='The color scheme determines the hue of all components of the chart.',
+ maincolor = fields.Selection(
+ string='Color scheme', required=True,
+ help='The color scheme determines the hue of all ' +
+ 'components of the chart.',
selection=sel_maincolor, sort=False)
- bgcolor = fields.Selection(string='Background Color', required=True,
+ bgcolor = fields.Selection(
+ string='Background Color', required=True,
help='Background color of the chart area.', sort=False,
selection=sel_bgcolor)
- currency = fields.Many2One(string='Currency', ondelete='RESTRICT',
+ currency = fields.Many2One(
+ string='Currency', ondelete='RESTRICT',
model_name='currency.currency')
- cashbooks = fields.Many2Many(string='Cashbooks',
- relation_name='cashbook_report.eval_line',
+ cashbooks = fields.Many2Many(
+ string='Cashbooks', relation_name='cashbook_report.eval_line',
origin='evaluation', target='cashbook',
states={
'invisible': ~Eval('dtype', '').in_(cashbook_types),
}, depends=['dtype'])
- types = fields.Many2Many(string='Types',
- relation_name='cashbook_report.eval_line',
+ types = fields.Many2Many(
+ string='Types', relation_name='cashbook_report.eval_line',
origin='evaluation', target='dtype',
states={
'invisible': ~Eval('dtype', '').in_(booktype_types),
}, depends=['dtype'])
- currencies = fields.Many2Many(string='Currencies',
- relation_name='cashbook_report.eval_line',
+ currencies = fields.Many2Many(
+ string='Currencies', relation_name='cashbook_report.eval_line',
origin='evaluation', target='currency',
filter=[('cashbook_hasbookings', '=', True)],
states={
'invisible': Eval('dtype', '') != 'currencies',
}, depends=['dtype'])
- categories = fields.Many2Many(string='Categories',
- relation_name='cashbook_report.eval_line',
+ categories = fields.Many2Many(
+ string='Categories', relation_name='cashbook_report.eval_line',
origin='evaluation', target='category',
states={
'invisible': ~Eval('dtype', '').in_(category_types),
}, depends=['dtype'])
- line_values = fields.One2Many(string='Line Values',
- field='evaluation', readonly=True,
+ line_values = fields.One2Many(
+ string='Line Values', field='evaluation', readonly=True,
model_name='cashbook_report.eval_line')
- ui_view_chart = fields.Many2One(string='UI View Chart',
- model_name='ir.ui.view', ondelete='SET NULL')
- dashb_actwin = fields.Many2One(string='Dashboard Window',
- model_name='ir.action.act_window', ondelete='SET NULL')
- dashb_actview = fields.Many2One(string='Dashboard View',
- model_name='ir.action.act_window.view', ondelete='SET NULL')
+ ui_view_chart = fields.Many2One(
+ string='UI View Chart', model_name='ir.ui.view', ondelete='SET NULL')
+ dashb_actwin = fields.Many2One(
+ string='Dashboard Window', model_name='ir.action.act_window',
+ ondelete='SET NULL')
+ dashb_actview = fields.Many2One(
+ string='Dashboard View', model_name='ir.action.act_window.view',
+ ondelete='SET NULL')
@classmethod
def default_currency(cls):
@@ -159,11 +166,11 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
'priority': 10,
'type': 'graph',
'data': template_view_graph % {
- 'bgcol': '' if evaluation.bgcolor == 'default' \
+ 'bgcol': '' if evaluation.bgcolor == 'default'
else 'background="%s"' % evaluation.bgcolor,
- 'legend': '1' if evaluation.legend == True else '0',
+ 'legend': '1' if evaluation.legend is True else '0',
'type': evaluation.chart,
- 'colscheme': '' if evaluation.maincolor == 'default' \
+ 'colscheme': '' if evaluation.maincolor == 'default'
else 'color="%s"' % evaluation.maincolor,
'lines': template_view_line % {
'fill': '1',
@@ -189,8 +196,7 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
to_delete_window.append(evaluation.dashb_actwin)
with Transaction().set_context({
- '_check_access': False,
- }):
+ '_check_access': False}):
if len(to_delete_uiview) > 0:
UiView.delete(to_delete_uiview)
if len(to_delete_window) > 0:
@@ -205,17 +211,16 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
ActWin = pool.get('ir.action.act_window')
ActView = pool.get('ir.action.act_window.view')
Evaluation2 = pool.get('cashbook_report.evaluation')
- try :
+ try:
DashboardAction = pool.get('dashboard.action')
- except:
+ except Exception:
DashboardAction = None
to_write_eval = []
to_write_dbaction = []
for evaluation in evaluations:
with Transaction().set_context({
- '_check_access': False,
- }):
+ '_check_access': False}):
view_graph, = UiView.create([
cls.get_create_view_data(evaluation),
])
@@ -280,8 +285,9 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
actions = iter(args)
for evaluations, values in zip(actions, actions):
# update ui-view if related fields change
- if len(set({'name', 'dtype', 'bgcolor', 'maincolor',
- 'legend', 'chart'}).intersection(values.keys())) > 0:
+ if len(set({
+ 'name', 'dtype', 'bgcolor', 'maincolor',
+ 'legend', 'chart'}).intersection(values.keys())) > 0:
to_update_uiview.extend(evaluations)
# unlink records if dtype changes
@@ -290,15 +296,17 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
if evaluation.dtype == values['dtype']:
continue
- for dt in ['cashbooks', 'types', 'currencies', 'categories']:
+ for dt in [
+ 'cashbooks', 'types', 'currencies',
+ 'categories']:
if (not values['dtype'].startswith(dt)) and \
(len(getattr(evaluation, dt)) > 0):
to_write.extend([
[evaluation],
{
- dt: [
- ('remove', [x.id for x in getattr(evaluation, dt)])
- ],
+ dt: [('remove', [
+ x.id for x in getattr(
+ evaluation, dt)])],
}])
args = list(args)
diff --git a/evaluation_context.py b/evaluation_context.py
index fa1e3f3..e7cc197 100644
--- a/evaluation_context.py
+++ b/evaluation_context.py
@@ -11,7 +11,8 @@ class EvaluationContext(ModelView):
'Evaluation Context'
__name__ = 'cashbook_report.evaluation.context'
- evaluation = fields.Many2One(string='Evaluation', readonly=True,
+ evaluation = fields.Many2One(
+ string='Evaluation', readonly=True,
model_name='cashbook_report.evaluation')
@classmethod
diff --git a/evaluation_wizard.py b/evaluation_wizard.py
index b317daa..26c62b3 100644
--- a/evaluation_wizard.py
+++ b/evaluation_wizard.py
@@ -32,7 +32,7 @@ class OpenChartWizard(Wizard):
})
action['name'] = gettext(
'cashbook_report.msg_name_graph',
- gname = evaluation.rec_name)
+ gname=evaluation.rec_name)
return action, {}
# end OpenChartWizard
diff --git a/investment.py b/investment.py
index ffe7540..2440f08 100644
--- a/investment.py
+++ b/investment.py
@@ -17,18 +17,30 @@ class InvestmentEvaluation(metaclass=PoolMeta):
"""
result = super(InvestmentEvaluation, cls).get_sel_etype()
result.extend([
- ('cashbooks_gldiff', gettext('cashbook_report.msg_dtype_cashbook_gldiff')),
- ('cashbooks_glperc', gettext('cashbook_report.msg_dtype_cashbook_glperc')),
- ('cashbooks_glvalue', gettext('cashbook_report.msg_dtype_cashbooks_glvalue')),
- ('cashbooks_glyield', gettext('cashbook_report.msg_dtype_cashbooks_glyield')),
- ('category_gldiff', gettext('cashbook_report.msg_dtype_category_gldiff')),
- ('category_glvalue', gettext('cashbook_report.msg_dtype_category_glvalue')),
- ('category_glperc', gettext('cashbook_report.msg_dtype_category_glperc')),
- ('category_glyield', gettext('cashbook_report.msg_dtype_category_glyield')),
- ('types_gldiff', gettext('cashbook_report.msg_dtype_types_gldiff')),
- ('types_glvalue', gettext('cashbook_report.msg_dtype_types_glvalue')),
- ('types_glperc', gettext('cashbook_report.msg_dtype_types_glperc')),
- ('types_glyield', gettext('cashbook_report.msg_dtype_types_glyield')),
+ ('cashbooks_gldiff', gettext(
+ 'cashbook_report.msg_dtype_cashbook_gldiff')),
+ ('cashbooks_glperc', gettext(
+ 'cashbook_report.msg_dtype_cashbook_glperc')),
+ ('cashbooks_glvalue', gettext(
+ 'cashbook_report.msg_dtype_cashbooks_glvalue')),
+ ('cashbooks_glyield', gettext(
+ 'cashbook_report.msg_dtype_cashbooks_glyield')),
+ ('category_gldiff', gettext(
+ 'cashbook_report.msg_dtype_category_gldiff')),
+ ('category_glvalue', gettext(
+ 'cashbook_report.msg_dtype_category_glvalue')),
+ ('category_glperc', gettext(
+ 'cashbook_report.msg_dtype_category_glperc')),
+ ('category_glyield', gettext(
+ 'cashbook_report.msg_dtype_category_glyield')),
+ ('types_gldiff', gettext(
+ 'cashbook_report.msg_dtype_types_gldiff')),
+ ('types_glvalue', gettext(
+ 'cashbook_report.msg_dtype_types_glvalue')),
+ ('types_glperc', gettext(
+ 'cashbook_report.msg_dtype_types_glperc')),
+ ('types_glyield', gettext(
+ 'cashbook_report.msg_dtype_types_glyield')),
])
return result
@@ -52,9 +64,12 @@ class InvestmentLine(metaclass=PoolMeta):
amount = Decimal('0.0')
if len(books) > 0:
- value = sum([x.current_value_ref for x in books
- if (x.current_value_ref is not None) and (x.feature == 'asset')])
- amount = sum([x.balance_ref for x in books
+ value = sum([
+ x.current_value_ref for x in books
+ if (x.current_value_ref is not None)
+ and (x.feature == 'asset')])
+ amount = sum([
+ x.balance_ref for x in books
if (x.balance_ref is not None) and (x.feature == 'asset')])
if amount != Decimal('0.0'):
return self.convert_to_evalcurrency(
@@ -75,10 +90,11 @@ class InvestmentLine(metaclass=PoolMeta):
result = Decimal('0.0')
if len(books) > 0:
- result = sum([x.current_value_ref - x.balance_ref for x in books
- if (x.current_value_ref is not None) and \
- (x.balance_ref is not None) and \
- (x.feature == 'asset')])
+ result = sum([
+ x.current_value_ref - x.balance_ref for x in books
+ if (x.current_value_ref is not None) and
+ (x.balance_ref is not None) and
+ (x.feature == 'asset')])
result = self.convert_to_evalcurrency(
books[0].company.currency, result)
return result
@@ -97,10 +113,11 @@ class InvestmentLine(metaclass=PoolMeta):
if len(books) > 0:
for book in books:
if (book.feature == 'asset') or \
- ((book.feature is None) and (book.current_value_ref is not None)):
+ ((book.feature is None) and
+ (book.current_value_ref is not None)):
if book.current_value_ref is not None:
result += book.current_value_ref
- else :
+ else:
if book.balance_ref is not None:
result += book.balance_ref
return self.convert_to_evalcurrency(
@@ -120,7 +137,8 @@ class InvestmentLine(metaclass=PoolMeta):
result = Decimal('0.0')
if len(books) > 0:
for book in books:
- if (book.feature == 'asset') and (book.yield_balance is not None):
+ if (book.feature == 'asset') and \
+ (book.yield_balance is not None):
result += self.convert_to_evalcurrency(
books[0].currency, book.yield_balance)
return result
@@ -211,34 +229,31 @@ class InvestmentLine(metaclass=PoolMeta):
if self.cashbook:
if self.cashbook.feature == 'asset':
return self.cashbook.diff_percent
- else :
+ else:
return Decimal('0.0')
def get_value_cashbooks_gldiff(self):
""" amount of profit/loss of cashbooks
"""
- Currency = Pool().get('currency.currency')
-
if self.cashbook:
if self.cashbook.feature == 'asset':
return self.convert_to_evalcurrency(
self.cashbook.currency,
self.cashbook.diff_amount)
- else :
+ else:
return Decimal('0.0')
def get_value_cashbooks_glvalue(self):
""" current value of cashbooks
"""
- Currency = Pool().get('currency.currency')
-
if self.cashbook:
if (self.cashbook.feature == 'asset') or \
- ((self.cashbook.feature is None) and (self.cashbook.current_value is not None)):
+ ((self.cashbook.feature is None) and
+ (self.cashbook.current_value is not None)):
return self.convert_to_evalcurrency(
self.cashbook.currency,
self.cashbook.current_value)
- else :
+ else:
return self.convert_to_evalcurrency(
self.cashbook.currency,
self.cashbook.balance)
diff --git a/line.py b/line.py
index b77dd7a..d4e4ab4 100644
--- a/line.py
+++ b/line.py
@@ -18,42 +18,51 @@ class EvaluationLine(ModelSQL, ModelView):
'Evaluation Line Relation'
__name__ = 'cashbook_report.eval_line'
- evaluation = fields.Many2One(string='Evaluation', required=True,
+ evaluation = fields.Many2One(
+ string='Evaluation', required=True,
select=True, ondelete='CASCADE',
model_name='cashbook_report.evaluation')
- cashbook = fields.Many2One(string='Cashbook', select=True, ondelete='CASCADE',
+ cashbook = fields.Many2One(
+ string='Cashbook', select=True, ondelete='CASCADE',
model_name='cashbook.book',
states={
'required': Eval('eval_dtype', '').in_(cashbook_types),
}, depends=['eval_dtype'])
- dtype = fields.Many2One(string='Type', select=True, ondelete='CASCADE',
+ dtype = fields.Many2One(
+ string='Type', select=True, ondelete='CASCADE',
model_name='cashbook.type',
states={
'required': Eval('eval_dtype', '').in_(booktype_types),
}, depends=['eval_dtype'])
- currency = fields.Many2One(string='Currency', select=True, ondelete='CASCADE',
+ currency = fields.Many2One(
+ string='Currency', select=True, ondelete='CASCADE',
model_name='currency.currency',
states={
'required': Eval('eval_dtype', '') == 'currencies',
}, depends=['eval_dtype'])
- category = fields.Many2One(string='Category', select=True, ondelete='CASCADE',
+ category = fields.Many2One(
+ string='Category', select=True, ondelete='CASCADE',
model_name='cashbook.bookcategory',
states={
'required': Eval('eval_dtype', '').in_(category_types),
}, depends=['eval_dtype'])
# dtype + currency of evaluation
- eval_dtype = fields.Function(fields.Char(string='Data type', readonly=True),
+ eval_dtype = fields.Function(fields.Char(
+ string='Data type', readonly=True),
'on_change_with_eval_dtype')
- eval_currency = fields.Function(fields.Many2One(model_name='currency.currency',
+ eval_currency = fields.Function(fields.Many2One(
+ model_name='currency.currency',
string="Currency", readonly=True), 'on_change_with_eval_currency')
- currency_digits = fields.Function(fields.Integer(string='Currency Digits',
- readonly=True), 'on_change_with_currency_digits')
+ currency_digits = fields.Function(fields.Integer(
+ string='Currency Digits', readonly=True),
+ 'on_change_with_currency_digits')
- name = fields.Function(fields.Char(string='Name'),
- 'on_change_with_name', setter='set_name_data')
+ name = fields.Function(fields.Char(
+ string='Name'), 'on_change_with_name', setter='set_name_data')
name_line = fields.Char(string='Name', states={'invisible': True})
- balance = fields.Function(fields.Numeric(string='Balance',
+ balance = fields.Function(fields.Numeric(
+ string='Balance',
readonly=True, digits=(16, Eval('currency_digits', 2)),
depends=['currency_digits']),
'on_change_with_balance')
@@ -85,7 +94,7 @@ class EvaluationLine(ModelSQL, ModelView):
# check if we are requested for our default form...
if (view_type == 'graph') and (view_id == form_id) and \
- (active_evaluation is not None):
+ (active_evaluation is not None):
evaluation, = Evaluation.browse([active_evaluation])
if evaluation.ui_view_chart:
# ... switch to view, created by evaluation-config
@@ -117,7 +126,9 @@ class EvaluationLine(ModelSQL, ModelView):
else:
return 2
- @fields.depends('eval_dtype', 'category', 'cashbook', 'dtype', 'currency', 'name_line')
+ @fields.depends(
+ 'eval_dtype', 'category', 'cashbook', 'dtype', 'currency',
+ 'name_line')
def on_change_with_name(self, name=None):
""" get name of Type
"""
@@ -129,9 +140,9 @@ class EvaluationLine(ModelSQL, ModelView):
# otherwise use rec_name of linked record
if self.eval_dtype:
dtype_sel = {'currencies': 'currency'}
- dtype_sel.update({x:'cashbook' for x in cashbook_types})
- dtype_sel.update({x:'category' for x in category_types})
- dtype_sel.update({x:'dtype' for x in booktype_types})
+ dtype_sel.update({x: 'cashbook' for x in cashbook_types})
+ dtype_sel.update({x: 'category' for x in category_types})
+ dtype_sel.update({x: 'dtype' for x in booktype_types})
return getattr(
getattr(self, dtype_sel[self.eval_dtype], None),
@@ -156,28 +167,28 @@ class EvaluationLine(ModelSQL, ModelView):
super(EvaluationLine, cls).validate(records)
for record in records:
if (record.evaluation.dtype not in cashbook_types) and \
- (record.cashbook is not None):
+ (record.cashbook is not None):
raise UserError(gettext(
'cashbook_report.msg_invalid_dtype',
- typename = gettext('cashbook_report.msg_dtype_cashbook'),
+ typename=gettext('cashbook_report.msg_dtype_cashbook'),
))
if (record.evaluation.dtype not in booktype_types) and \
- (record.dtype is not None):
+ (record.dtype is not None):
raise UserError(gettext(
'cashbook_report.msg_invalid_dtype',
- typename = gettext('cashbook_report.msg_dtype_type'),
+ typename=gettext('cashbook_report.msg_dtype_type'),
))
if (record.evaluation.dtype != 'currencies') and \
- (record.currency is not None):
+ (record.currency is not None):
raise UserError(gettext(
'cashbook_report.msg_invalid_dtype',
- typename = gettext('cashbook_report.msg_dtype_currency'),
+ typename=gettext('cashbook_report.msg_dtype_currency'),
))
if (record.evaluation.dtype not in category_types) and \
- (record.category is not None):
+ (record.category is not None):
raise UserError(gettext(
'cashbook_report.msg_invalid_dtype',
- typename = gettext('cashbook_report.msg_dtype_category'),
+ typename=gettext('cashbook_report.msg_dtype_category'),
))
def get_balance_by_query(self, query):
@@ -194,12 +205,15 @@ class EvaluationLine(ModelSQL, ModelView):
total_amount = Decimal('0.0')
with Transaction().set_context({
- '_check_access': True,
- }):
+ '_check_access': True}):
lines = Lines.search(query, query=True)
- query = lines.join(tab_line, condition=lines.id==tab_line.id,
- ).join(tab_book, condition=tab_book.id==tab_line.cashbook,
+ query = lines.join(
+ tab_line,
+ condition=lines.id == tab_line.id,
+ ).join(
+ tab_book,
+ condition=tab_book.id == tab_line.cashbook,
).select(
tab_book.currency,
Sum(tab_line.credit - tab_line.debit).as_('balance'),
@@ -219,8 +233,6 @@ class EvaluationLine(ModelSQL, ModelView):
def get_value_cashbooks(self):
""" balance of cashbooks
"""
- Currency = Pool().get('currency.currency')
-
if self.cashbook:
return self.convert_to_evalcurrency(
self.cashbook.currency,
@@ -272,15 +284,16 @@ class EvaluationLine(ModelSQL, ModelView):
('date', '<=', IrDate.today()),
])
- @fields.depends('eval_dtype', 'eval_currency', 'currency_digits', \
- 'cashbook', '_parent_cashbook.currency', '_parent_cashbook.balance',\
+ @fields.depends(
+ 'eval_dtype', 'eval_currency', 'currency_digits',
+ 'cashbook', '_parent_cashbook.currency', '_parent_cashbook.balance',
'category', '_parent_category.id',
'evaluation', '_parent_evaluation.id', 'dtype', 'currency')
def on_change_with_balance(self, name=None):
""" balance of cashbook
"""
if (self.evaluation is None) or (self.eval_currency is None) or \
- (self.currency_digits is None) or (self.eval_dtype is None):
+ (self.currency_digits is None) or (self.eval_dtype is None):
return None
return getattr(self, 'get_value_%s' % self.eval_dtype)()
diff --git a/setup.py b/setup.py
index 8a7194e..f77e4eb 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
"""
# Always prefer setuptools over distutils
-from setuptools import setup, find_packages
+from setuptools import setup
# To use a consistent encoding
from codecs import open
from os import path
@@ -36,7 +36,7 @@ with open(path.join(here, 'versiondep.txt'), encoding='utf-8') as f:
l2 = i.strip().split(';')
if len(l2) < 4:
continue
- modversion[l2[0]] = {'min':l2[1], 'max':l2[2], 'prefix':l2[3]}
+ modversion[l2[0]] = {'min': l2[1], 'max': l2[2], 'prefix': l2[3]}
# tryton-version
major_version = 6
@@ -51,19 +51,21 @@ for dep in info.get('depends', []):
prefix = modversion[dep]['prefix']
if len(modversion[dep]['max']) > 0:
- requires.append('%s_%s >= %s, <= %s' %
- (prefix, dep, modversion[dep]['min'], modversion[dep]['max']))
- else :
- requires.append('%s_%s >= %s' %
- (prefix, dep, modversion[dep]['min']))
- else :
- requires.append('%s_%s >= %s.%s, < %s.%s' %
- ('trytond', dep, major_version, minor_version,
+ requires.append('%s_%s >= %s, <= %s' % (
+ prefix, dep, modversion[dep]['min'],
+ modversion[dep]['max']))
+ else:
+ requires.append('%s_%s >= %s' % (
+ prefix, dep, modversion[dep]['min']))
+ else:
+ requires.append('%s_%s >= %s.%s, < %s.%s' % (
+ 'trytond', dep, major_version, minor_version,
major_version, minor_version + 1))
-requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' % (
+ major_version, minor_version, major_version, minor_version + 1))
-setup(name='%s_%s' % (PREFIX, MODULE),
+setup(
+ name='%s_%s' % (PREFIX, MODULE),
version=info.get('version', '0.0.1'),
description='Tryton module to add reports to cashbook.',
long_description=long_description,
@@ -74,21 +76,21 @@ setup(name='%s_%s' % (PREFIX, MODULE),
author_email='service@m-ds.de',
license='GPL-3',
classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Environment :: Plugins',
- 'Framework :: Tryton',
- 'Intended Audience :: Developers',
- 'Intended Audience :: Customer Service',
- 'Intended Audience :: Information Technology',
- 'Intended Audience :: Financial and Insurance Industry',
- 'Topic :: Office/Business',
- 'Topic :: Office/Business :: Financial :: Accounting',
- 'Natural Language :: German',
- 'Natural Language :: English',
- 'Operating System :: OS Independent',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
- 'Programming Language :: Python :: 3.7',
- 'Programming Language :: Python :: 3.8',
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Framework :: Tryton',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Customer Service',
+ 'Intended Audience :: Information Technology',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Topic :: Office/Business',
+ 'Topic :: Office/Business :: Financial :: Accounting',
+ 'Natural Language :: German',
+ 'Natural Language :: English',
+ 'Operating System :: OS Independent',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
],
keywords='tryton cashbook report',
@@ -97,7 +99,8 @@ setup(name='%s_%s' % (PREFIX, MODULE),
'trytond.modules.%s' % MODULE,
],
package_data={
- 'trytond.modules.%s' % MODULE: (info.get('xml', [])
+ 'trytond.modules.%s' % MODULE: (
+ info.get('xml', [])
+ ['tryton.cfg', 'locale/*.po', 'tests/*.py',
'view/*.xml', 'icon/*.svg',
'report/*.fods', 'versiondep.txt', 'README.rst']),
diff --git a/templates.py b/templates.py
index 3e6f022..58d8764 100644
--- a/templates.py
+++ b/templates.py
@@ -3,14 +3,18 @@
# The COPYRIGHT file at the top level of this repository contains the
# full copyright notices and license terms.
-cashbook_types = ['cashbooks', 'cashbooks_gldiff', 'cashbooks_glperc',
+cashbook_types = [
+ 'cashbooks', 'cashbooks_gldiff', 'cashbooks_glperc',
'cashbooks_glvalue', 'cashbooks_glyield']
-category_types = ['categories', 'category_gldiff', 'category_glvalue',
+category_types = [
+ 'categories', 'category_gldiff', 'category_glvalue',
'category_glperc', 'category_glyield']
-booktype_types = ['types', 'types_gldiff', 'types_glvalue',
+booktype_types = [
+ 'types', 'types_gldiff', 'types_glvalue',
'types_glperc', 'types_glyield']
-template_view_line = ''
+template_view_line = ''
template_view_graph = """
diff --git a/tests/__init__.py b/tests/__init__.py
index 48e2d3c..5180a5b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,7 @@
-# This file is part of Tryton. The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
+# -*- coding: utf-8 -*-
+# This file is part of the cashbook-module from m-ds for Tryton.
+# The COPYRIGHT file at the top level of this repository contains the
+# full copyright notices and license terms.
import trytond.tests.test_tryton
import unittest
@@ -10,15 +12,7 @@ from trytond.modules.cashbook_report.tests.test_report import ReportTestCase
__all__ = ['suite']
-class CashbookReportTestCase(\
- ReportTestCase,\
- ):
- 'Test cashbook report module'
- module = 'cashbook_report'
-
-# end CashbookReportTestCase
-
def suite():
suite = trytond.tests.test_tryton.suite()
- suite.addTests(unittest.TestLoader().loadTestsFromTestCase(CashbookReportTestCase))
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(ReportTestCase))
return suite
diff --git a/tests/test_report.py b/tests/test_report.py
index 592ca85..463e933 100644
--- a/tests/test_report.py
+++ b/tests/test_report.py
@@ -3,11 +3,12 @@
# The COPYRIGHT file at the top level of this repository contains the
# full copyright notices and license terms.
-from trytond.tests.test_tryton import ModuleTestCase, with_transaction, activate_module
+from trytond.tests.test_tryton import with_transaction, activate_module
from trytond.pool import Pool
from trytond.transaction import Transaction
from trytond.exceptions import UserError
-from trytond.modules.cashbook_investment.tests import CashbookInvestmentTestCase
+from trytond.modules.cashbook_investment.tests import \
+ CashbookInvestmentTestCase
from datetime import date
from decimal import Decimal
@@ -147,8 +148,7 @@ class ReportTestCase(CashbookInvestmentTestCase):
company = self.prep_company()
with Transaction().set_context({
- 'company': company.id,
- }):
+ 'company': company.id}):
self.assertEqual(len(books[0].lines), 2)
self.assertEqual(books[0].currency.code, 'usd')
self.assertEqual(len(books[1].lines), 2)
@@ -197,13 +197,13 @@ class ReportTestCase(CashbookInvestmentTestCase):
Evaluation = pool.get('cashbook_report.evaluation')
Type = pool.get('cashbook.type')
Cashbook = pool.get('cashbook.book')
- Line = pool.get('cashbook_report.eval_line')
books = self.prep_report_3books()
company = self.prep_company()
# add 2x user, set owner of cashbooks to them
- group_cashbook = ResGroup(ModelData.get_id('cashbook', 'group_cashbook'))
+ group_cashbook = ResGroup(ModelData.get_id(
+ 'cashbook', 'group_cashbook'))
users = ResUser.create([{
'name': 'User 1',
'login': 'user1',
@@ -234,9 +234,8 @@ class ReportTestCase(CashbookInvestmentTestCase):
# check access to data
with Transaction().set_user(users[0].id):
with Transaction().set_context({
- '_check_access': True,
- 'company': company.id,
- }):
+ '_check_access': True,
+ 'company': company.id}):
books_owner1 = Cashbook.search([])
self.assertEqual(len(books_owner1), 2)
self.assertEqual(books_owner1[0].name, 'Book 1')
@@ -261,10 +260,18 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(len(evaluation1.cashbooks), 2)
self.assertEqual(evaluation1.currency.rec_name, 'Euro')
self.assertEqual(len(evaluation1.line_values), 2)
- self.assertEqual(evaluation1.line_values[0].name, 'Book 1 | 25.00 usd | Open')
- self.assertEqual(evaluation1.line_values[0].balance, Decimal('23.81'))
- self.assertEqual(evaluation1.line_values[1].name, 'Book 2 | 12.50 usd | Open')
- self.assertEqual(evaluation1.line_values[1].balance, Decimal('11.9'))
+ self.assertEqual(
+ evaluation1.line_values[0].name,
+ 'Book 1 | 25.00 usd | Open')
+ self.assertEqual(
+ evaluation1.line_values[0].balance,
+ Decimal('23.81'))
+ self.assertEqual(
+ evaluation1.line_values[1].name,
+ 'Book 2 | 12.50 usd | Open')
+ self.assertEqual(
+ evaluation1.line_values[1].balance,
+ Decimal('11.9'))
evaluation2, = Evaluation.create([{
'name': 'Evaluation User 1 - Types',
@@ -275,41 +282,54 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation2.currency.rec_name, 'Euro')
self.assertEqual(len(evaluation2.line_values), 2)
self.assertEqual(evaluation2.line_values[0].name, 'BK - Bank')
- self.assertEqual(evaluation2.line_values[0].balance, Decimal('0.0'))
+ self.assertEqual(
+ evaluation2.line_values[0].balance,
+ Decimal('0.0'))
self.assertEqual(evaluation2.line_values[1].name, 'CAS - Cash')
- self.assertEqual(evaluation2.line_values[1].balance, Decimal('35.71'))
+ self.assertEqual(
+ evaluation2.line_values[1].balance,
+ Decimal('35.71'))
evaluation3, = Evaluation.create([{
'name': 'Evaluation User 1 - Currencies',
'dtype': 'currencies',
- 'currencies': [('add', [x.id for x in Currency.search([])])],
+ 'currencies': [('add', [
+ x.id for x in Currency.search([])])],
}])
self.assertEqual(len(evaluation3.currencies), 2)
self.assertEqual(evaluation3.currency.rec_name, 'Euro')
self.assertEqual(len(evaluation3.line_values), 2)
self.assertEqual(evaluation3.line_values[0].name, 'Euro')
- self.assertEqual(evaluation3.line_values[0].balance, Decimal('0.0'))
+ self.assertEqual(
+ evaluation3.line_values[0].balance,
+ Decimal('0.0'))
self.assertEqual(evaluation3.line_values[1].name, 'usd')
- self.assertEqual(evaluation3.line_values[1].balance, Decimal('35.71'))
+ self.assertEqual(
+ evaluation3.line_values[1].balance,
+ Decimal('35.71'))
evaluation4, = Evaluation.create([{
'name': 'Evaluation User 1 - Categories',
'dtype': 'categories',
- 'categories': [('add', [x.id for x in books_owner1[0].categories])],
+ 'categories': [('add', [
+ x.id for x in books_owner1[0].categories])],
}])
self.assertEqual(len(evaluation4.categories), 1)
self.assertEqual(evaluation4.currency.rec_name, 'Euro')
self.assertEqual(len(evaluation4.line_values), 1)
- self.assertEqual(evaluation4.line_values[0].name, 'Book 1, User 1')
- self.assertEqual(evaluation4.line_values[0].balance, Decimal('23.81'))
+ self.assertEqual(
+ evaluation4.line_values[0].name,
+ 'Book 1, User 1')
+ self.assertEqual(
+ evaluation4.line_values[0].balance,
+ Decimal('23.81'))
self.assertEqual(Evaluation.search_count([]), 4)
with Transaction().set_user(users[1].id):
with Transaction().set_context({
- '_check_access': True,
- 'company': company.id,
- }):
+ '_check_access': True,
+ 'company': company.id}):
books_owner2 = Cashbook.search([])
self.assertEqual(len(books_owner2), 1)
self.assertEqual(books_owner2[0].name, 'Book 3')
@@ -331,8 +351,12 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(len(evaluation1.cashbooks), 1)
self.assertEqual(evaluation1.currency.rec_name, 'Euro')
self.assertEqual(len(evaluation1.line_values), 1)
- self.assertEqual(evaluation1.line_values[0].name, 'Book 3 | 23.00 € | Open')
- self.assertEqual(evaluation1.line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluation1.line_values[0].name,
+ 'Book 3 | 23.00 € | Open')
+ self.assertEqual(
+ evaluation1.line_values[0].balance,
+ Decimal('23.0'))
evaluation2, = Evaluation.create([{
'name': 'Evaluation User 2 - Types',
@@ -343,33 +367,47 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation2.currency.rec_name, 'Euro')
self.assertEqual(len(evaluation2.line_values), 2)
self.assertEqual(evaluation2.line_values[0].name, 'BK - Bank')
- self.assertEqual(evaluation2.line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluation2.line_values[0].balance,
+ Decimal('23.0'))
self.assertEqual(evaluation2.line_values[1].name, 'CAS - Cash')
- self.assertEqual(evaluation2.line_values[1].balance, Decimal('0.0'))
+ self.assertEqual(
+ evaluation2.line_values[1].balance,
+ Decimal('0.0'))
evaluation3, = Evaluation.create([{
'name': 'Evaluation User 2 - Currencies',
'dtype': 'currencies',
- 'currencies': [('add', [x.id for x in Currency.search([])])],
+ 'currencies': [('add', [
+ x.id for x in Currency.search([])])],
}])
self.assertEqual(len(evaluation3.currencies), 2)
self.assertEqual(evaluation3.currency.rec_name, 'Euro')
self.assertEqual(len(evaluation3.line_values), 2)
self.assertEqual(evaluation3.line_values[0].name, 'Euro')
- self.assertEqual(evaluation3.line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluation3.line_values[0].balance,
+ Decimal('23.0'))
self.assertEqual(evaluation3.line_values[1].name, 'usd')
- self.assertEqual(evaluation3.line_values[1].balance, Decimal('0.0'))
+ self.assertEqual(
+ evaluation3.line_values[1].balance,
+ Decimal('0.0'))
evaluation4, = Evaluation.create([{
'name': 'Evaluation User 2 - Categories',
'dtype': 'categories',
- 'categories': [('add', [x.id for x in books_owner2[0].categories])],
+ 'categories': [('add', [
+ x.id for x in books_owner2[0].categories])],
}])
self.assertEqual(len(evaluation4.categories), 1)
self.assertEqual(evaluation4.currency.rec_name, 'Euro')
self.assertEqual(len(evaluation4.line_values), 1)
- self.assertEqual(evaluation4.line_values[0].name, 'Book 3, User 2')
- self.assertEqual(evaluation4.line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluation4.line_values[0].name,
+ 'Book 3, User 2')
+ self.assertEqual(
+ evaluation4.line_values[0].balance,
+ Decimal('23.0'))
self.assertEqual(Evaluation.search_count([]), 4)
@@ -382,67 +420,99 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(len(evaluations[0].cashbooks), 2)
self.assertEqual(evaluations[0].currency.rec_name, 'Euro')
self.assertEqual(len(evaluations[0].line_values), 2)
- self.assertEqual(evaluations[0].line_values[0].name, 'Book 1 | 25.00 usd | Open')
- self.assertEqual(evaluations[0].line_values[0].balance, Decimal('23.81'))
- self.assertEqual(evaluations[0].line_values[1].name, 'Book 2 | 12.50 usd | Open')
- self.assertEqual(evaluations[0].line_values[1].balance, Decimal('11.9'))
+ self.assertEqual(
+ evaluations[0].line_values[0].name,
+ 'Book 1 | 25.00 usd | Open')
+ self.assertEqual(
+ evaluations[0].line_values[0].balance,
+ Decimal('23.81'))
+ self.assertEqual(
+ evaluations[0].line_values[1].name,
+ 'Book 2 | 12.50 usd | Open')
+ self.assertEqual(
+ evaluations[0].line_values[1].balance,
+ Decimal('11.9'))
self.assertEqual(evaluations[1].name, 'Evaluation User 1 - Categories')
self.assertEqual(len(evaluations[1].categories), 1)
self.assertEqual(evaluations[1].currency.rec_name, 'Euro')
self.assertEqual(len(evaluations[1].line_values), 1)
self.assertEqual(evaluations[1].line_values[0].name, 'Book 1, User 1')
- self.assertEqual(evaluations[1].line_values[0].balance, Decimal('23.81'))
+ self.assertEqual(
+ evaluations[1].line_values[0].balance,
+ Decimal('23.81'))
self.assertEqual(evaluations[2].name, 'Evaluation User 1 - Currencies')
self.assertEqual(len(evaluations[2].currencies), 2)
self.assertEqual(evaluations[2].currency.rec_name, 'Euro')
self.assertEqual(len(evaluations[2].line_values), 2)
self.assertEqual(evaluations[2].line_values[0].name, 'Euro')
- self.assertEqual(evaluations[2].line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluations[2].line_values[0].balance,
+ Decimal('23.0'))
self.assertEqual(evaluations[2].line_values[1].name, 'usd')
- self.assertEqual(evaluations[2].line_values[1].balance, Decimal('35.71'))
+ self.assertEqual(
+ evaluations[2].line_values[1].balance,
+ Decimal('35.71'))
self.assertEqual(evaluations[3].name, 'Evaluation User 1 - Types')
self.assertEqual(len(evaluations[3].types), 2)
self.assertEqual(evaluations[3].currency.rec_name, 'Euro')
self.assertEqual(len(evaluations[3].line_values), 2)
self.assertEqual(evaluations[3].line_values[0].name, 'BK - Bank')
- self.assertEqual(evaluations[3].line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluations[3].line_values[0].balance,
+ Decimal('23.0'))
self.assertEqual(evaluations[3].line_values[1].name, 'CAS - Cash')
- self.assertEqual(evaluations[3].line_values[1].balance, Decimal('35.71'))
+ self.assertEqual(
+ evaluations[3].line_values[1].balance,
+ Decimal('35.71'))
self.assertEqual(evaluations[4].name, 'Evaluation User 2 - Cashbooks')
self.assertEqual(len(evaluations[4].cashbooks), 1)
self.assertEqual(evaluations[4].currency.rec_name, 'Euro')
self.assertEqual(len(evaluations[4].line_values), 1)
- self.assertEqual(evaluations[4].line_values[0].name, 'Book 3 | 23.00 € | Open')
- self.assertEqual(evaluations[4].line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluations[4].line_values[0].name,
+ 'Book 3 | 23.00 € | Open')
+ self.assertEqual(
+ evaluations[4].line_values[0].balance,
+ Decimal('23.0'))
self.assertEqual(evaluations[5].name, 'Evaluation User 2 - Categories')
self.assertEqual(len(evaluations[5].categories), 1)
self.assertEqual(evaluations[5].currency.rec_name, 'Euro')
self.assertEqual(len(evaluations[5].line_values), 1)
self.assertEqual(evaluations[5].line_values[0].name, 'Book 3, User 2')
- self.assertEqual(evaluations[5].line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluations[5].line_values[0].balance,
+ Decimal('23.0'))
self.assertEqual(evaluations[6].name, 'Evaluation User 2 - Currencies')
self.assertEqual(len(evaluations[6].currencies), 2)
self.assertEqual(evaluations[6].currency.rec_name, 'Euro')
self.assertEqual(len(evaluations[6].line_values), 2)
self.assertEqual(evaluations[6].line_values[0].name, 'Euro')
- self.assertEqual(evaluations[6].line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluations[6].line_values[0].balance,
+ Decimal('23.0'))
self.assertEqual(evaluations[6].line_values[1].name, 'usd')
- self.assertEqual(evaluations[6].line_values[1].balance, Decimal('35.71'))
+ self.assertEqual(
+ evaluations[6].line_values[1].balance,
+ Decimal('35.71'))
self.assertEqual(evaluations[7].name, 'Evaluation User 2 - Types')
self.assertEqual(len(evaluations[7].types), 2)
self.assertEqual(evaluations[7].currency.rec_name, 'Euro')
self.assertEqual(len(evaluations[7].line_values), 2)
self.assertEqual(evaluations[7].line_values[0].name, 'BK - Bank')
- self.assertEqual(evaluations[7].line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluations[7].line_values[0].balance,
+ Decimal('23.0'))
self.assertEqual(evaluations[7].line_values[1].name, 'CAS - Cash')
- self.assertEqual(evaluations[7].line_values[1].balance, Decimal('35.71'))
+ self.assertEqual(
+ evaluations[7].line_values[1].balance,
+ Decimal('35.71'))
@with_transaction()
def test_report_update_name_of_line(self):
@@ -457,8 +527,7 @@ class ReportTestCase(CashbookInvestmentTestCase):
company = self.prep_company()
with Transaction().set_context({
- 'company': company.id,
- }):
+ 'company': company.id}):
evaluation, = Evaluation.create([{
'name': 'Evaluation 1',
'dtype': 'cashbooks',
@@ -467,7 +536,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(len(evaluation.cashbooks), 3)
self.assertEqual(len(evaluation.line_values), 3)
- self.assertEqual(evaluation.line_values[0].name, 'Book 1 | 25.00 usd | Open')
+ self.assertEqual(
+ evaluation.line_values[0].name,
+ 'Book 1 | 25.00 usd | Open')
self.assertEqual(evaluation.line_values[0].name_line, None)
# update 'name'
@@ -476,8 +547,12 @@ class ReportTestCase(CashbookInvestmentTestCase):
{
'name': 'Book updated',
}])
- self.assertEqual(evaluation.line_values[0].name, 'Book updated')
- self.assertEqual(evaluation.line_values[0].name_line, 'Book updated')
+ self.assertEqual(
+ evaluation.line_values[0].name,
+ 'Book updated')
+ self.assertEqual(
+ evaluation.line_values[0].name_line,
+ 'Book updated')
# delete 'name' value to reset to origin
Line.write(*[
@@ -485,7 +560,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
{
'name': None,
}])
- self.assertEqual(evaluation.line_values[0].name, 'Book 1 | 25.00 usd | Open')
+ self.assertEqual(
+ evaluation.line_values[0].name,
+ 'Book 1 | 25.00 usd | Open')
self.assertEqual(evaluation.line_values[0].name_line, None)
@with_transaction()
@@ -502,10 +579,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
company = self.prep_company()
with Transaction().set_context({
- 'company': company.id,
- }):
+ 'company': company.id}):
- categories = Category.create([{
+ Category.create([{
'name': 'Cat 1',
}, {
'name': 'Cat 2',
@@ -525,7 +601,8 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(len(evaluation.categories), 0)
# investment - profit/loss amount
- if 'cashbooks_gldiff' in [x[0] for x in Evaluation.get_sel_etype()]:
+ if 'cashbooks_gldiff' in [
+ x[0] for x in Evaluation.get_sel_etype()]:
# no change if switch between cashbook-types
Evaluation.write(*[
[evaluation],
@@ -546,7 +623,7 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(len(evaluation.types), 0)
self.assertEqual(len(evaluation.currencies), 0)
self.assertEqual(len(evaluation.categories), 0)
- else :
+ else:
print('\n--== Module "cashbook_investment" not installed ==--')
Evaluation.write(*[
@@ -575,7 +652,8 @@ class ReportTestCase(CashbookInvestmentTestCase):
[evaluation],
{
'dtype': 'currencies',
- 'currencies': [('add', [x.id for x in Currency.search([])])],
+ 'currencies': [('add', [
+ x.id for x in Currency.search([])])],
}])
self.assertEqual(len(evaluation.cashbooks), 0)
self.assertEqual(len(evaluation.types), 0)
@@ -586,7 +664,8 @@ class ReportTestCase(CashbookInvestmentTestCase):
[evaluation],
{
'dtype': 'categories',
- 'categories': [('add', [x.id for x in Category.search([])])],
+ 'categories': [('add', [
+ x.id for x in Category.search([])])],
}])
self.assertEqual(len(evaluation.cashbooks), 0)
self.assertEqual(len(evaluation.types), 0)
@@ -615,8 +694,7 @@ class ReportTestCase(CashbookInvestmentTestCase):
company = self.prep_company()
with Transaction().set_context({
- 'company': company.id,
- }):
+ 'company': company.id}):
# valid
evaluation, = Evaluation.create([{
'name': 'Evaluation 1',
@@ -625,8 +703,10 @@ class ReportTestCase(CashbookInvestmentTestCase):
}])
# must fail
- self.assertRaisesRegex(UserError,
- 'A value is required for field "Data type" in "Evaluation Line Relation".',
+ self.assertRaisesRegex(
+ UserError,
+ 'A value is required for field "Data type" in ' +
+ '"Evaluation Line Relation".',
Evaluation.create,
[{
'name': 'Evaluation 1',
@@ -641,8 +721,10 @@ class ReportTestCase(CashbookInvestmentTestCase):
}])
# must fail
- self.assertRaisesRegex(UserError,
- 'A value is required for field "Cashbook" in "Evaluation Line Relation".',
+ self.assertRaisesRegex(
+ UserError,
+ 'A value is required for field "Cashbook" in ' +
+ '"Evaluation Line Relation".',
Evaluation.create,
[{
'name': 'Evaluation 3',
@@ -657,9 +739,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
"""
pool = Pool()
Evaluation = pool.get('cashbook_report.evaluation')
- try :
+ try:
DashboardAction = pool.get('dashboard.action')
- except:
+ except Exception:
print('\n--== Module "dashboard" not installed ==--')
DashboardAction = None
@@ -667,8 +749,7 @@ class ReportTestCase(CashbookInvestmentTestCase):
company = self.prep_company()
with Transaction().set_context({
- 'company': company.id,
- }):
+ 'company': company.id}):
evaluation, = Evaluation.create([{
'name': 'Evaluation 1',
'cashbooks': [('add', [x.id for x in books])],
@@ -691,23 +772,32 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation.currency.code, 'EUR')
# check uiview
- self.assertEqual(evaluation.ui_view_chart.model, 'cashbook_report.eval_line')
- self.assertEqual(evaluation.ui_view_chart.module, 'cashbook_report')
+ self.assertEqual(
+ evaluation.ui_view_chart.model,
+ 'cashbook_report.eval_line')
+ self.assertEqual(
+ evaluation.ui_view_chart.module,
+ 'cashbook_report')
self.assertEqual(evaluation.ui_view_chart.priority, 10)
self.assertEqual(evaluation.ui_view_chart.type, 'graph')
# action-window for dashbord
self.assertEqual(evaluation.dashb_actwin.name, 'Evaluation 1')
- self.assertEqual(evaluation.dashb_actwin.res_model,
+ self.assertEqual(
+ evaluation.dashb_actwin.res_model,
'cashbook_report.eval_line')
- self.assertEqual(evaluation.dashb_actwin.usage,
+ self.assertEqual(
+ evaluation.dashb_actwin.usage,
'dashboard')
- self.assertEqual(evaluation.dashb_actwin.domain,
+ self.assertEqual(
+ evaluation.dashb_actwin.domain,
'[["evaluation", "=", %d]]' % evaluation.id)
# action-view
self.assertEqual(evaluation.dashb_actview.sequence, 10)
- self.assertEqual(evaluation.dashb_actview.view.id,
+ self.assertEqual(
+ evaluation.dashb_actview.view.id,
evaluation.ui_view_chart.id)
- self.assertEqual(evaluation.dashb_actview.act_window.id,
+ self.assertEqual(
+ evaluation.dashb_actview.act_window.id,
evaluation.dashb_actwin.id)
# update evaluation, this wil re-create the view/act-window
@@ -739,13 +829,12 @@ class ReportTestCase(CashbookInvestmentTestCase):
company = self.prep_company()
with Transaction().set_context({
- 'company': company.id,
- }):
+ 'company': company.id}):
asset_cfg = self.prep_yield_config(
- fee = 'Fee',
- dividend = 'Dividend',
- gainloss = 'Gain-Loss',
- company = company)
+ fee='Fee',
+ dividend='Dividend',
+ gainloss='Gain-Loss',
+ company=company)
cb_cat, = CbCategory.create([{'name': 'CB Category'}])
category_in = self.prep_category(cattype='in')
@@ -757,7 +846,7 @@ class ReportTestCase(CashbookInvestmentTestCase):
}])
asset = self.prep_asset_item(
company=company,
- product = self.prep_asset_product(name='Product 1'))
+ product=self.prep_asset_product(name='Product 1'))
self.assertEqual(asset.symbol, 'usd/u')
Asset.write(*[
@@ -771,7 +860,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
'rate': Decimal('105.5'),
}])],
}])
- self.assertEqual(asset.rec_name, 'Product 1 | 105.5000 usd/u | 05/02/2022')
+ self.assertEqual(
+ asset.rec_name,
+ 'Product 1 | 105.5000 usd/u | 05/02/2022')
book_asset, = Book.create([{
'name': 'Depot',
@@ -811,12 +902,13 @@ class ReportTestCase(CashbookInvestmentTestCase):
'quantity': Decimal('0.0'),
'booktransf': asset_cfg.gainloss_book.id,
'description': 'Gain',
- },])],
+ }])],
}])
Line.wfcheck(book_asset.lines)
MemCache._cashbook_value_cache.clear_all()
- self.assertEqual(book_asset.rec_name,
+ self.assertEqual(
+ book_asset.rec_name,
'Depot | 118.00 usd | Open | 1.0000 u')
self.assertEqual(book_asset.balance, Decimal('118.0'))
self.assertEqual(book_asset.current_value, Decimal('105.5'))
@@ -836,7 +928,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation1.dtype, 'cashbooks_glyield')
self.assertEqual(evaluation1.currency.code, 'usd')
self.assertEqual(len(evaluation1.line_values), 1)
- self.assertEqual(evaluation1.line_values[0].balance, Decimal('5.5'))
+ self.assertEqual(
+ evaluation1.line_values[0].balance,
+ Decimal('5.5'))
# evaluation: categories - total yield
evaluation2, = Evaluation.create([{
@@ -848,7 +942,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation2.dtype, 'category_glyield')
self.assertEqual(evaluation2.currency.code, 'usd')
self.assertEqual(len(evaluation2.line_values), 1)
- self.assertEqual(evaluation2.line_values[0].balance, Decimal('5.5'))
+ self.assertEqual(
+ evaluation2.line_values[0].balance,
+ Decimal('5.5'))
# evaluation: types - total yield
evaluation3, = Evaluation.create([{
@@ -860,7 +956,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation3.dtype, 'types_glyield')
self.assertEqual(evaluation3.currency.code, 'usd')
self.assertEqual(len(evaluation3.line_values), 1)
- self.assertEqual(evaluation3.line_values[0].balance, Decimal('5.5'))
+ self.assertEqual(
+ evaluation3.line_values[0].balance,
+ Decimal('5.5'))
@with_transaction()
def test_report_chart_hbar_book_investment(self):
@@ -874,8 +972,7 @@ class ReportTestCase(CashbookInvestmentTestCase):
company = self.prep_company()
with Transaction().set_context({
- 'company': company.id,
- }):
+ 'company': company.id}):
AccType = pool.get('cashbook.type')
Asset = pool.get('investment.asset')
Product = pool.get('product.template')
@@ -911,7 +1008,8 @@ class ReportTestCase(CashbookInvestmentTestCase):
'rate': Decimal('1750.0'),
}, ])],
}])
- self.assertEqual(asset.rec_name,
+ self.assertEqual(
+ asset.rec_name,
'Aurum | 1,750.0000 usd/u | 05/01/2022')
books = self.prep_report_3books()
@@ -932,32 +1030,38 @@ class ReportTestCase(CashbookInvestmentTestCase):
},
])
Line.write(*[
- [books[0].lines[0]], # usd
+ [books[0].lines[0]], # usd
{'quantity': Decimal('2.0'), 'amount': Decimal('3000.0')},
[books[0].lines[1]],
{'quantity': Decimal('2.0'), 'amount': Decimal('3100.0')},
- [books[1].lines[0]], # usd
+ [books[1].lines[0]], # usd
{'quantity': Decimal('2.0'), 'amount': Decimal('3200.0')},
[books[1].lines[1]],
{'quantity': Decimal('2.0'), 'amount': Decimal('3300.0')},
- [books[2].lines[0]], # euro
+ [books[2].lines[0]], # euro
{'quantity': Decimal('2.0'), 'amount': Decimal('3300.0')},
[books[2].lines[1]],
{'quantity': Decimal('2.0'), 'amount': Decimal('3400.0')},
])
MemCache._cashbook_value_cache.clear_all()
- self.assertEqual(books[0].rec_name, 'Book 1 | 6,100.00 usd | Open | 4.000 u')
+ self.assertEqual(
+ books[0].rec_name,
+ 'Book 1 | 6,100.00 usd | Open | 4.000 u')
self.assertEqual(books[0].current_value, Decimal('7000.0'))
self.assertEqual(books[0].diff_amount, Decimal('900.0'))
self.assertEqual(books[0].diff_percent, Decimal('14.75'))
- self.assertEqual(books[1].rec_name, 'Book 2 | 6,500.00 usd | Open | 4.000 u')
+ self.assertEqual(
+ books[1].rec_name,
+ 'Book 2 | 6,500.00 usd | Open | 4.000 u')
self.assertEqual(books[1].current_value, Decimal('7000.0'))
self.assertEqual(books[1].diff_amount, Decimal('500.0'))
self.assertEqual(books[1].diff_percent, Decimal('7.69'))
- self.assertEqual(books[2].rec_name, 'Book 3 | 6,700.00 € | Open | 4.000 u')
+ self.assertEqual(
+ books[2].rec_name,
+ 'Book 3 | 6,700.00 € | Open | 4.000 u')
self.assertEqual(books[2].current_value, Decimal('6666.67'))
self.assertEqual(books[2].diff_amount, Decimal('-33.33'))
self.assertEqual(books[2].diff_percent, Decimal('-0.5'))
@@ -976,9 +1080,15 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation.bgcolor, '#ffffc0')
self.assertEqual(evaluation.currency.code, 'EUR')
- self.assertEqual(evaluation.line_values[0].balance, Decimal('857.14'))
- self.assertEqual(evaluation.line_values[1].balance, Decimal('476.19'))
- self.assertEqual(evaluation.line_values[2].balance, Decimal('-33.33'))
+ self.assertEqual(
+ evaluation.line_values[0].balance,
+ Decimal('857.14'))
+ self.assertEqual(
+ evaluation.line_values[1].balance,
+ Decimal('476.19'))
+ self.assertEqual(
+ evaluation.line_values[2].balance,
+ Decimal('-33.33'))
# evaluation: percent-difference
evaluation2, = Evaluation.create([{
@@ -994,9 +1104,15 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation2.bgcolor, '#ffffc0')
self.assertEqual(evaluation2.currency.code, 'EUR')
- self.assertEqual(evaluation2.line_values[0].balance, Decimal('14.75'))
- self.assertEqual(evaluation2.line_values[1].balance, Decimal('7.69'))
- self.assertEqual(evaluation2.line_values[2].balance, Decimal('-0.5'))
+ self.assertEqual(
+ evaluation2.line_values[0].balance,
+ Decimal('14.75'))
+ self.assertEqual(
+ evaluation2.line_values[1].balance,
+ Decimal('7.69'))
+ self.assertEqual(
+ evaluation2.line_values[2].balance,
+ Decimal('-0.5'))
# evaluation: percent-difference
evaluation3, = Evaluation.create([{
@@ -1012,9 +1128,15 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation3.bgcolor, '#ffffc0')
self.assertEqual(evaluation3.currency.code, 'EUR')
- self.assertEqual(evaluation3.line_values[0].balance, Decimal('6666.67'))
- self.assertEqual(evaluation3.line_values[1].balance, Decimal('6666.67'))
- self.assertEqual(evaluation3.line_values[2].balance, Decimal('6666.67'))
+ self.assertEqual(
+ evaluation3.line_values[0].balance,
+ Decimal('6666.67'))
+ self.assertEqual(
+ evaluation3.line_values[1].balance,
+ Decimal('6666.67'))
+ self.assertEqual(
+ evaluation3.line_values[2].balance,
+ Decimal('6666.67'))
# evaluation: category-current value
evaluation4, = Evaluation.create([{
@@ -1031,7 +1153,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation4.currency.code, 'EUR')
self.assertEqual(len(evaluation4.line_values), 1)
- self.assertEqual(evaluation4.line_values[0].balance, Decimal('20000.01'))
+ self.assertEqual(
+ evaluation4.line_values[0].balance,
+ Decimal('20000.01'))
# evaluation: category- difference amount
evaluation5, = Evaluation.create([{
@@ -1048,7 +1172,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation5.currency.code, 'EUR')
self.assertEqual(len(evaluation5.line_values), 1)
- self.assertEqual(evaluation5.line_values[0].balance, Decimal('1300.01'))
+ self.assertEqual(
+ evaluation5.line_values[0].balance,
+ Decimal('1300.01'))
# evaluation: category- difference amount
evaluation6, = Evaluation.create([{
@@ -1065,7 +1191,9 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation6.currency.code, 'EUR')
self.assertEqual(len(evaluation6.line_values), 1)
- self.assertEqual(evaluation6.line_values[0].balance, Decimal('6.95'))
+ self.assertEqual(
+ evaluation6.line_values[0].balance,
+ Decimal('6.95'))
@with_transaction()
def test_report_chart_pie_book_red(self):
@@ -1078,8 +1206,7 @@ class ReportTestCase(CashbookInvestmentTestCase):
company = self.prep_company()
with Transaction().set_context({
- 'company': company.id,
- }):
+ 'company': company.id}):
evaluation, = Evaluation.create([{
'name': 'Evaluation 1',
'cashbooks': [('add', [x.id for x in books])],
@@ -1092,11 +1219,17 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(evaluation.currency.code, 'EUR')
# check uiview
- self.assertEqual(evaluation.ui_view_chart.model, 'cashbook_report.eval_line')
- self.assertEqual(evaluation.ui_view_chart.module, 'cashbook_report')
+ self.assertEqual(
+ evaluation.ui_view_chart.model,
+ 'cashbook_report.eval_line')
+ self.assertEqual(
+ evaluation.ui_view_chart.module,
+ 'cashbook_report')
self.assertEqual(evaluation.ui_view_chart.priority, 10)
self.assertEqual(evaluation.ui_view_chart.type, 'graph')
- self.assertEqual(evaluation.ui_view_chart.data, """
+ self.assertEqual(
+ evaluation.ui_view_chart.data,
+ """
@@ -1108,25 +1241,49 @@ class ReportTestCase(CashbookInvestmentTestCase):
""")
self.assertEqual(len(evaluation.cashbooks), 3)
- self.assertEqual(evaluation.cashbooks[0].rec_name, 'Book 1 | 25.00 usd | Open')
- self.assertEqual(evaluation.cashbooks[1].rec_name, 'Book 2 | 12.50 usd | Open')
- self.assertEqual(evaluation.cashbooks[2].rec_name, 'Book 3 | 23.00 € | Open')
+ self.assertEqual(
+ evaluation.cashbooks[0].rec_name,
+ 'Book 1 | 25.00 usd | Open')
+ self.assertEqual(
+ evaluation.cashbooks[1].rec_name,
+ 'Book 2 | 12.50 usd | Open')
+ self.assertEqual(
+ evaluation.cashbooks[2].rec_name,
+ 'Book 3 | 23.00 € | Open')
self.assertEqual(evaluation.cashbooks[0].currency.code, 'usd')
self.assertEqual(evaluation.cashbooks[1].currency.code, 'usd')
self.assertEqual(evaluation.cashbooks[2].currency.code, 'EUR')
self.assertEqual(len(evaluation.line_values), 3)
- self.assertEqual(evaluation.line_values[0].name, 'Book 1 | 25.00 usd | Open')
- self.assertEqual(evaluation.line_values[1].name, 'Book 2 | 12.50 usd | Open')
- self.assertEqual(evaluation.line_values[2].name, 'Book 3 | 23.00 € | Open')
+ self.assertEqual(
+ evaluation.line_values[0].name,
+ 'Book 1 | 25.00 usd | Open')
+ self.assertEqual(
+ evaluation.line_values[1].name,
+ 'Book 2 | 12.50 usd | Open')
+ self.assertEqual(
+ evaluation.line_values[2].name,
+ 'Book 3 | 23.00 € | Open')
- self.assertEqual(evaluation.line_values[0].eval_currency.code, 'EUR')
- self.assertEqual(evaluation.line_values[1].eval_currency.code, 'EUR')
- self.assertEqual(evaluation.line_values[2].eval_currency.code, 'EUR')
+ self.assertEqual(
+ evaluation.line_values[0].eval_currency.code,
+ 'EUR')
+ self.assertEqual(
+ evaluation.line_values[1].eval_currency.code,
+ 'EUR')
+ self.assertEqual(
+ evaluation.line_values[2].eval_currency.code,
+ 'EUR')
- self.assertEqual(evaluation.line_values[0].balance, Decimal('23.81'))
- self.assertEqual(evaluation.line_values[1].balance, Decimal('11.90'))
- self.assertEqual(evaluation.line_values[2].balance, Decimal('23.00'))
+ self.assertEqual(
+ evaluation.line_values[0].balance,
+ Decimal('23.81'))
+ self.assertEqual(
+ evaluation.line_values[1].balance,
+ Decimal('11.90'))
+ self.assertEqual(
+ evaluation.line_values[2].balance,
+ Decimal('23.00'))
@with_transaction()
def test_report_chart_pie_type_red(self):
@@ -1137,13 +1294,12 @@ class ReportTestCase(CashbookInvestmentTestCase):
Evaluation = pool.get('cashbook_report.evaluation')
Types = pool.get('cashbook.type')
- books = self.prep_report_3books()
+ self.prep_report_3books()
company = self.prep_company()
with Transaction().set_context({
- 'company': company.id, # company-currency: EUR
- 'date': date(2022, 5, 15),
- }):
+ 'company': company.id, # company-currency: EUR
+ 'date': date(2022, 5, 15)}):
evaluation, = Evaluation.create([{
'name': 'Evaluation 1',
'dtype': 'types',
@@ -1165,14 +1321,22 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(len(evaluation.line_values), 2)
# 23.00 EUR
- self.assertEqual(evaluation.line_values[0].eval_currency.code, 'EUR')
+ self.assertEqual(
+ evaluation.line_values[0].eval_currency.code,
+ 'EUR')
self.assertEqual(evaluation.line_values[0].name, 'BK - Bank')
- self.assertEqual(evaluation.line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluation.line_values[0].balance,
+ Decimal('23.0'))
# 37.50 USD --> EUR
self.assertEqual(evaluation.line_values[1].name, 'CAS - Cash')
- self.assertEqual(evaluation.line_values[1].eval_currency.code, 'EUR')
- self.assertEqual(evaluation.line_values[1].balance, Decimal('35.71'))
+ self.assertEqual(
+ evaluation.line_values[1].eval_currency.code,
+ 'EUR')
+ self.assertEqual(
+ evaluation.line_values[1].balance,
+ Decimal('35.71'))
@with_transaction()
def test_report_chart_pie_currency_red(self):
@@ -1183,12 +1347,11 @@ class ReportTestCase(CashbookInvestmentTestCase):
Evaluation = pool.get('cashbook_report.evaluation')
Currency = pool.get('currency.currency')
- books = self.prep_report_3books()
+ self.prep_report_3books()
company = self.prep_company()
with Transaction().set_context({
- 'company': company.id,
- }):
+ 'company': company.id}):
evaluation, = Evaluation.create([{
'name': 'Evaluation 1',
'dtype': 'currencies',
@@ -1207,8 +1370,15 @@ class ReportTestCase(CashbookInvestmentTestCase):
self.assertEqual(len(evaluation.line_values), 2)
self.assertEqual(evaluation.line_values[0].name, 'Euro')
- self.assertEqual(evaluation.line_values[0].balance, Decimal('23.0'))
+ self.assertEqual(
+ evaluation.line_values[0].balance,
+ Decimal('23.0'))
self.assertEqual(evaluation.line_values[1].name, 'usd')
- self.assertEqual(evaluation.line_values[1].balance, Decimal('35.71'))
+ self.assertEqual(
+ evaluation.line_values[1].balance,
+ Decimal('35.71'))
# end ReportTestCase
+
+
+del CashbookInvestmentTestCase