diff --git a/README.rst b/README.rst index b70ba37..ce52f63 100644 --- a/README.rst +++ b/README.rst @@ -11,9 +11,59 @@ Requires ======== - Tryton 6.0 +Info +==== +Module cashbook_report adds the following evaluations: +- account balance as amount, +- price difference according to stock exchange price as amount, +- exchange rate difference in percent, +- current value according to stock exchange price, +- total yield + +The displayed data is selected according to cash books, +types of cash books and cash books by category. +The presentation can be done as pie, bar and line chart. +For each evaluation, a dashboard view is also created, +so that you can display several evaluations at the same time. + Changes ======= +*6.0.8 - 06.12.2023* + +- optimized code + +*6.0.7 - 11.03.2023* + +- add: type of evaluation 'total yield' for cashbook/type/category + +*6.0.6 - 06.02.2023* + +- add: profit/loss-values for btype-selection of cashbooks + +*6.0.5 - 06.02.2023* + +- fix: values on non-asset-cashbooks + +*6.0.4 - 05.02.2023* + +- add: investment to evaluation-types + +*6.0.3 - 08.11.2022* + +- add: cashbook-categories for evaluation +- updt: optimized update of evaluation with existing dashboard-actions +- updt: limit bookings in evaluation-result to today + +*6.0.2 - 05.11.2022* + +- evaluation-line: permissions optimized +- evaluation: sorting by sequence + +*6.0.1 - 05.11.2022* + +- works + *6.0.0 - 28.10.2022* - init diff --git a/__init__.py b/__init__.py index e4f23b7..38bf5dd 100644 --- a/__init__.py +++ b/__init__.py @@ -9,6 +9,8 @@ from .line import EvaluationLine from .currency import Currency from .evaluation_context import EvaluationContext from .evaluation_wizard import OpenChartWizard +from .investment import InvestmentEvaluation, InvestmentLine + def register(): Pool.register( @@ -20,3 +22,9 @@ def register(): Pool.register( OpenChartWizard, module='cashbook_report', type_='wizard') + Pool.register( + InvestmentEvaluation, + InvestmentLine, + module='cashbook_report', + type_='model', + depends=['cashbook_investment']) diff --git a/currency.py b/currency.py index f6155e3..2276cd8 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,18 +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)] # end Currency diff --git a/evaluation.py b/evaluation.py index 491a313..ed0be2b 100644 --- a/evaluation.py +++ b/evaluation.py @@ -3,21 +3,16 @@ # The COPYRIGHT file at the top level of this repository contains the # full copyright notices and license terms. -from trytond.model import ModelView, ModelSQL, fields +from trytond.model import ModelView, ModelSQL, fields, sequence_ordered from trytond.pyson import Eval from trytond.transaction import Transaction from trytond.pool import Pool +from trytond.i18n import gettext from .colors import sel_color as sel_bgcolor -from .templates import template_view_graph, template_view_line +from .templates import template_view_graph, template_view_line, \ + cashbook_types, category_types, booktype_types -sel_etype = [ - ('cashbooks', 'Cashbooks'), - ('types', 'Types of Cashbooks'), - ('currencies', 'Currencys'), - #('category', 'Category'), - ] - sel_chart = [ ('vbar', 'Vertical Bars'), ('hbar', 'Horizontal Bars'), @@ -36,61 +31,68 @@ sel_maincolor = [ ] -class Evaluation(ModelSQL, ModelView): +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=False, selection=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.', - selection=sel_maincolor, sort=False) - bgcolor = fields.Selection(string='Background Color', required=True, + 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, help='Background color of the chart area.', sort=False, selection=sel_bgcolor) - posted = fields.Boolean(string='Posted', help='Posted amounts only.') - 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', '') != 'cashbooks', - }, depends=['dtype']) - types = fields.Many2Many(string='Types', - relation_name='cashbook_report.eval_line', + states={'invisible': ~Eval('dtype', '').in_(cashbook_types)}, + depends=['dtype']) + types = fields.Many2Many( + string='Types', relation_name='cashbook_report.eval_line', origin='evaluation', target='dtype', - states={ - 'invisible': Eval('dtype', '') != 'types', - }, depends=['dtype']) - currencies = fields.Many2Many(string='Currencies', - relation_name='cashbook_report.eval_line', + states={'invisible': ~Eval('dtype', '').in_(booktype_types)}, + depends=['dtype']) + 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']) + states={'invisible': Eval('dtype', '') != 'currencies'}, + depends=['dtype']) + 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): @@ -108,12 +110,6 @@ class Evaluation(ModelSQL, ModelView): def default_company(): return Transaction().context.get('company') or None - @classmethod - def default_posted(cls): - """ default: False - """ - return False - @classmethod def default_bgcolor(cls): """ default: Yellow 5 @@ -144,6 +140,17 @@ class Evaluation(ModelSQL, ModelView): """ return 'pie' + @classmethod + def get_sel_etype(cls): + """ get list of evaluation-types + """ + return [ + ('cashbooks', gettext('cashbook_report.msg_dtype_cashbook')), + ('types', gettext('cashbook_report.msg_dtype_type')), + ('currencies', gettext('cashbook_report.msg_dtype_currency')), + ('categories', gettext('cashbook_report.msg_dtype_category')), + ] + @classmethod def get_create_view_data(cls, evaluation): """ generate dictionary to create view-xml @@ -154,18 +161,15 @@ class Evaluation(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', - 'string': evaluation.dtype_string, - }, - }, - } + 'string': evaluation.dtype_string}}} @classmethod def uiview_delete(cls, evaluations): @@ -184,8 +188,7 @@ class Evaluation(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: @@ -200,14 +203,16 @@ class Evaluation(ModelSQL, ModelView): ActWin = pool.get('ir.action.act_window') ActView = pool.get('ir.action.act_window.view') Evaluation2 = pool.get('cashbook_report.evaluation') - - cls.uiview_delete(evaluations) + try: + DashboardAction = pool.get('dashboard.action') + 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), ]) @@ -233,6 +238,24 @@ class Evaluation(ModelSQL, ModelView): 'dashb_actview': dashb_actview.id, }]) + # prepare update dasboard-action + if DashboardAction is not None: + if evaluation.dashb_actwin: + db_actions = DashboardAction.search([ + ('act_window.id', '=', evaluation.dashb_actwin.id), + ]) + if len(db_actions) > 0: + to_write_dbaction.extend([ + db_actions, + { + 'act_window': dashb_actwin.id, + }]) + + if len(to_write_dbaction) > 0: + DashboardAction.write(*to_write_dbaction) + + cls.uiview_delete(evaluations) + if len(to_write_eval) > 0: Evaluation2.write(*to_write_eval) @@ -254,8 +277,9 @@ class Evaluation(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 @@ -264,33 +288,18 @@ class Evaluation(ModelSQL, ModelView): if evaluation.dtype == values['dtype']: continue - if (values['dtype'] != 'cashbooks') and \ - (len(evaluation.cashbooks) > 0): - to_write.extend([ - [evaluation], - { - 'cashbooks': [ - ('remove', [x.id for x in evaluation.cashbooks]) - ], - }]) - - if (values['dtype'] != 'types') and (len(evaluation.types) > 0): - to_write.extend([ - [evaluation], - { - 'types': [ - ('remove', [x.id for x in evaluation.types]) - ], - }]) - - if (values['dtype'] != 'currencies') and (len(evaluation.currencies) > 0): - to_write.extend([ - [evaluation], - { - 'currencies': [ - ('remove', [x.id for x in evaluation.currencies]) - ], - }]) + 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)])], + }]) args = list(args) args.extend(to_write) @@ -307,4 +316,3 @@ class Evaluation(ModelSQL, ModelView): super(Evaluation, cls).delete(evaluations) # end Evaluation - 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..31e65c8 100644 --- a/evaluation_wizard.py +++ b/evaluation_wizard.py @@ -28,11 +28,10 @@ class OpenChartWizard(Wizard): if evaluation.ui_view_chart: action['pyson_context'] = PYSONEncoder().encode({ 'active_evaluation': evaluation.id, - 'evaluation': evaluation.id, - }) + 'evaluation': evaluation.id}) 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 new file mode 100644 index 0000000..35d9240 --- /dev/null +++ b/investment.py @@ -0,0 +1,259 @@ +# -*- 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. + +from trytond.pool import PoolMeta, Pool +from trytond.i18n import gettext +from decimal import Decimal + + +class InvestmentEvaluation(metaclass=PoolMeta): + __name__ = 'cashbook_report.evaluation' + + @classmethod + def get_sel_etype(cls): + """ get list of evaluation-types + """ + 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')), + ]) + return result + +# end InvestmentEvaluation + + +class InvestmentLine(metaclass=PoolMeta): + __name__ = 'cashbook_report.eval_line' + + def get_percent_by_query(self, query): + """ get percentual difference of bookings in categories + converted to currency of evaluation + """ + Book = Pool().get('cashbook.book') + + query2 = [('state', '=', 'open')] + query2.extend(query) + books = Book.search(query2) + + value = Decimal('0.0') + 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 + if (x.balance_ref is not None) and (x.feature == 'asset')]) + if amount != Decimal('0.0'): + return self.convert_to_evalcurrency( + books[0].company.currency, + Decimal('100.0') * value / amount - Decimal('100.0')) + return Decimal('0.0') + + def get_difference_by_query(self, query): + """ get difference amount of bookings in categories + converted to currency of evaluation + """ + Book = Pool().get('cashbook.book') + + query2 = [('state', '=', 'open')] + query2.extend(query) + books = Book.search(query2) + + 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 = self.convert_to_evalcurrency( + books[0].company.currency, result) + return result + + def get_currentvalue_by_query(self, query): + """ get current value of bookings in categories + converted to currency of evaluation + """ + Book = Pool().get('cashbook.book') + + query2 = [('state', '=', 'open')] + query2.extend(query) + books = Book.search(query2) + + result = Decimal('0.0') + 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)): + if book.current_value_ref is not None: + result += book.current_value_ref + else: + if book.balance_ref is not None: + result += book.balance_ref + return self.convert_to_evalcurrency( + books[0].company.currency, result) + return result + + def get_totalyield_by_query(self, query): + """ get total yield of cashbookings + converted to currency of evaluation + """ + Book = Pool().get('cashbook.book') + + query2 = [('state', '=', 'open')] + query2.extend(query) + books = Book.search(query2) + + result = Decimal('0.0') + if len(books) > 0: + for book in books: + if (book.feature == 'asset') and \ + (book.yield_balance is not None): + result += self.convert_to_evalcurrency( + books[0].currency, book.yield_balance) + return result + + def get_value_category_glperc(self): + """ get percent of profit/loss by category + """ + if self.category is None: + return None + + return self.get_percent_by_query([ + ('categories.id', '=', self.category.id)]) + + def get_value_category_gldiff(self): + """ get difference amount by category + """ + if self.category is None: + return None + + return self.get_difference_by_query([ + ('categories.id', '=', self.category.id)]) + + def get_value_category_glvalue(self): + """ get current value by category + """ + if self.category is None: + return None + + return self.get_currentvalue_by_query([ + ('categories.id', '=', self.category.id)]) + + def get_value_category_glyield(self): + """ get total yield by type + """ + if self.category is None: + return None + + return self.get_totalyield_by_query([ + ('categories.id', '=', self.category.id), + ]) + + def get_value_types_glperc(self): + """ get percent of profit/loss by type + """ + if self.dtype is None: + return None + + return self.get_percent_by_query([('btype.id', '=', self.dtype.id)]) + + def get_value_types_gldiff(self): + """ get difference amount by type + """ + if self.dtype is None: + return None + + return self.get_difference_by_query([ + ('btype.id', '=', self.dtype.id)]) + + def get_value_types_glvalue(self): + """ get current value by type + """ + if self.dtype is None: + return None + + return self.get_currentvalue_by_query([ + ('btype.id', '=', self.dtype.id)]) + + def get_value_types_glyield(self): + """ get total yield by type + """ + if self.dtype is None: + return None + + return self.get_totalyield_by_query([ + ('btype.id', '=', self.dtype.id)]) + + def get_value_cashbooks_glperc(self): + """ percent of profit/loss of cashbooks + """ + if self.cashbook: + if self.cashbook.feature == 'asset': + return self.cashbook.diff_percent + else: + return Decimal('0.0') + + def get_value_cashbooks_gldiff(self): + """ amount of profit/loss of cashbooks + """ + if self.cashbook: + if self.cashbook.feature == 'asset': + return self.convert_to_evalcurrency( + self.cashbook.currency, + self.cashbook.diff_amount) + else: + return Decimal('0.0') + + def get_value_cashbooks_glvalue(self): + """ current value of cashbooks + """ + if self.cashbook: + if (self.cashbook.feature == 'asset') or \ + ((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: + return self.convert_to_evalcurrency( + self.cashbook.currency, + self.cashbook.balance) + + def get_value_cashbooks_glyield(self): + """ total yield of investment + """ + if self.cashbook: + return self.get_totalyield_by_query([ + ('id', '=', self.cashbook.id)]) + +# end InvestmentLine diff --git a/line.py b/line.py index cb86ba8..0a51874 100644 --- a/line.py +++ b/line.py @@ -11,43 +11,57 @@ from trytond.transaction import Transaction from trytond.i18n import gettext from trytond.exceptions import UserError from trytond.pool import Pool +from .templates import cashbook_types, category_types, booktype_types 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', '') == 'cashbooks', + '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', '') == 'types', + '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', + 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), - 'on_change_with_eval_dtype') - eval_currency = fields.Function(fields.Many2One(model_name='currency.currency', + 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', 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') @@ -56,11 +70,7 @@ class EvaluationLine(ModelSQL, ModelView): def set_name_data(cls, lines, name, value): """ store updated name """ - cls.write(*[ - lines, - { - 'name_line': value, - }]) + cls.write(*[lines, {'name_line': value}]) @classmethod def fields_view_get(cls, view_id, view_type='form'): @@ -74,12 +84,12 @@ class EvaluationLine(ModelSQL, ModelView): # get id of origin chart-form form_id = ModelData.get_id('cashbook_report', 'evalline_view_graph') - # active_chart was added by tree_open-action + # active_evaluation was added by tree_open-action active_evaluation = context.get('active_evaluation', None) # 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 @@ -90,7 +100,7 @@ class EvaluationLine(ModelSQL, ModelView): @fields.depends('evaluation', '_parent_evaluation.dtype') def on_change_with_eval_dtype(self, name=None): - """ get dtape from parent + """ get dtype from parent """ if self.evaluation: return self.evaluation.dtype @@ -111,7 +121,9 @@ class EvaluationLine(ModelSQL, ModelView): else: return 2 - @fields.depends('eval_dtype', '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 """ @@ -122,55 +134,56 @@ 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}) + return getattr( - getattr(self, { - 'cashbooks': 'cashbook', - 'types': 'dtype', - 'currencies': 'currency', - }[self.eval_dtype], None), + getattr(self, dtype_sel[self.eval_dtype], None), 'rec_name', None) + def convert_to_evalcurrency(self, from_currency, amount): + """ convert amount to current evaluation-currency + """ + Currency = Pool().get('currency.currency') + + exp = Decimal(Decimal(1) / 10 ** self.currency_digits) + if amount is None: + return Decimal('0.0') + return Currency.compute( + from_currency, amount, self.eval_currency).quantize(exp) + @classmethod def validate(cls, records): """ check parent record """ super(EvaluationLine, cls).validate(records) for record in records: - if (record.evaluation.dtype != 'cashbooks') and \ - (record.cashbook is not None): + if (record.evaluation.dtype not in cashbook_types) and \ + (record.cashbook is not None): raise UserError(gettext( 'cashbook_report.msg_invalid_dtype', - typename = gettext('cashbook_report.msg_dtype_cashbook'), - )) - if (record.evaluation.dtype != 'types') and \ - (record.dtype is not None): + typename=gettext('cashbook_report.msg_dtype_cashbook'))) + if (record.evaluation.dtype not in booktype_types) and \ + (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): + raise UserError(gettext( + 'cashbook_report.msg_invalid_dtype', + typename=gettext('cashbook_report.msg_dtype_category'))) - def get_value_cashbooks(self): - """ balance of cashbooks - """ - Currency = Pool().get('currency.currency') - - if self.cashbook: - exp = Decimal(Decimal(1) / 10 ** self.currency_digits) - return Currency.compute( - self.cashbook.currency, - self.cashbook.balance, - self.eval_currency, - ).quantize(exp) - - def get_value_types(self): - """ get balance of bookings in cashbooks by 'type', - converted to currency of evaluation + def get_balance_by_query(self, query): + """ run 'query' on Lines, convert used + currencies to evaluation-currency """ pool = Pool() Lines = pool.get('cashbook.line') @@ -180,27 +193,21 @@ class EvaluationLine(ModelSQL, ModelView): tab_book = Cashbook.__table__() cursor = Transaction().connection.cursor() - if (self.evaluation is None) or (self.dtype is None) or \ - (self.eval_currency is None) or (self.currency_digits is None): - return None - total_amount = Decimal('0.0') with Transaction().set_context({ - '_check_access': True, - }): - lines = Lines.search([ - ('cashbook.btype.id', '=', self.dtype.id), - ('cashbook.state', '=', 'open'), - ('cashbook.owner.id', '=', Transaction().user), - ], query=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'), - group_by=[tab_book.currency], - ) + group_by=[tab_book.currency]) cursor.execute(*query) balances = cursor.fetchall() @@ -208,64 +215,70 @@ class EvaluationLine(ModelSQL, ModelView): (id_currency, bal1) = balance if bal1 is not None: - total_amount += Currency.compute( - Currency(id_currency), - bal1, - self.eval_currency, - ) - exp = Decimal(Decimal(1) / 10 ** self.currency_digits) - return total_amount.quantize(exp) + total_amount += self.convert_to_evalcurrency( + Currency(id_currency), bal1) + return total_amount + + def get_value_cashbooks(self): + """ balance of cashbooks + """ + if self.cashbook: + return self.convert_to_evalcurrency( + self.cashbook.currency, self.cashbook.balance) + + def get_value_categories(self): + """ get balance of bookings in categories + converted to currency of evaluation + """ + IrDate = Pool().get('ir.date') + + if self.category is None: + return None + + return self.get_balance_by_query([ + ('cashbook.categories.id', '=', self.category.id), + ('cashbook.state', '=', 'open'), + ('date', '<=', IrDate.today())]) + + def get_value_types(self): + """ get balance of bookings in cashbooks by 'type', + converted to currency of evaluation + """ + IrDate = Pool().get('ir.date') + + if self.dtype is None: + return None + + return self.get_balance_by_query([ + ('cashbook.btype.id', '=', self.dtype.id), + ('cashbook.state', '=', 'open'), + ('date', '<=', IrDate.today())]) def get_value_currencies(self): """ get balance of bookings in cashbooks by 'currency', converted to currency of evaluation """ - pool = Pool() - Lines = pool.get('cashbook.line') - Currency = pool.get('currency.currency') - tab_line = Lines.__table__() - cursor = Transaction().connection.cursor() + IrDate = Pool().get('ir.date') - if (self.evaluation is None) or (self.currency is None) or \ - (self.eval_currency is None) or (self.currency_digits is None): + if self.currency is None: return None - total_amount = Decimal('0.0') - with Transaction().set_context({ - '_check_access': True, - }): - lines = Lines.search([ + return self.get_balance_by_query([ ('cashbook.currency.id', '=', self.currency.id), ('cashbook.state', '=', 'open'), - ('cashbook.owner.id', '=', Transaction().user), - ], query=True) + ('date', '<=', IrDate.today())]) - query = lines.join(tab_line, condition=lines.id==tab_line.id, - ).select( - Sum(tab_line.credit - tab_line.debit).as_('balance'), - ) - cursor.execute(*query) - balances = cursor.fetchall() - - for balance in balances: - (bal1,) = balance - - if bal1 is not None: - total_amount += Currency.compute( - self.currency, - bal1, - self.eval_currency, - ) - exp = Decimal(Decimal(1) / 10 ** self.currency_digits) - return total_amount.quantize(exp) - - @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.eval_dtype: - return getattr(self, 'get_value_%s' % self.eval_dtype)() + if (self.evaluation is None) or (self.eval_currency is None) or \ + (self.currency_digits is None) or (self.eval_dtype is None): + return None + return getattr(self, 'get_value_%s' % self.eval_dtype)() # end EvaluationLine diff --git a/locale/de.po b/locale/de.po index f01597e..3c9b6b8 100644 --- a/locale/de.po +++ b/locale/de.po @@ -11,17 +11,69 @@ msgid "Type of evaluation must be '%(typename)s'." msgstr "Typ der Auswertung mus '%(typename)s' sein." msgctxt "model:ir.message,text:msg_dtype_cashbook" -msgid "Cashbooks" -msgstr "Kassenbücher" +msgid "Cashbooks [Amount]" +msgstr "Kassenbücher [Betrag]" + +msgctxt "model:ir.message,text:msg_dtype_cashbook_gldiff" +msgid "Cashbooks [Amount of Profit/Loss]" +msgstr "Kassenbücher [Betrag Gewinn/Verlust]" + +msgctxt "model:ir.message,text:msg_dtype_cashbook_glperc" +msgid "Cashbooks [Percent of Profit/Loss]" +msgstr "Kassenbücher [Prozent Gewinn/Verlust]" + +msgctxt "model:ir.message,text:msg_dtype_cashbooks_glvalue" +msgid "Cashbooks [Current Value]" +msgstr "Kassenbücher [aktueller Wert]" + +msgctxt "model:ir.message,text:msg_dtype_cashbooks_glyield" +msgid "Cashbooks [Total Yield]" +msgstr "Kassenbücher [Gesamtertrag]" msgctxt "model:ir.message,text:msg_dtype_type" -msgid "Types of Cashbooks" -msgstr "Typen von Kassenbüchern" +msgid "Types of Cashbooks [Amount]" +msgstr "Typen von Kassenbüchern [Betrag]" + +msgctxt "model:ir.message,text:msg_dtype_types_gldiff" +msgid "Types of Cashbooks [Amount of Profit/Loss]" +msgstr "Typen von Kassenbüchern [Betrag Gewinn/Verlust]" + +msgctxt "model:ir.message,text:msg_dtype_types_glvalue" +msgid "Types of Cashbooks [Current Value]" +msgstr "Typen von Kassenbüchern [aktueller Wert]" + +msgctxt "model:ir.message,text:msg_dtype_types_glperc" +msgid "Types of Cashbooks [Percent of Profit/Loss]" +msgstr "Typen von Kassenbüchern [Prozent Gewinn/Verlust]" + +msgctxt "model:ir.message,text:msg_dtype_types_glyield" +msgid "Types of Cashbooks [Total Yield]" +msgstr "Typen von Kassenbüchern [Gesamtertrag]" msgctxt "model:ir.message,text:msg_dtype_currency" msgid "Currencies" msgstr "Währungen" +msgctxt "model:ir.message,text:msg_dtype_category" +msgid "Categories [Amount]" +msgstr "Kategorien [Betrag]" + +msgctxt "model:ir.message,text:msg_dtype_category_gldiff" +msgid "Categories [Amount of Profit/Loss]" +msgstr "Kategorien [Betrag Gewinn/Verlust]" + +msgctxt "model:ir.message,text:msg_dtype_category_glvalue" +msgid "Categories [Current Value]" +msgstr "Kategorien [aktueller Wert]" + +msgctxt "model:ir.message,text:msg_dtype_category_glperc" +msgid "Categories [Percent of Profit/Loss]" +msgstr "Kategorien [Prozent Gewinn/Verlust]" + +msgctxt "model:ir.message,text:msg_dtype_category_glyield" +msgid "Categories [Total Yield]" +msgstr "Kategorien [Gesamtertrag]" + msgctxt "model:ir.message,text:msg_name_graph" msgid "Graph: %(gname)s" msgstr "Diagramm: %(gname)s" @@ -134,6 +186,10 @@ msgctxt "selection:cashbook_report.evaluation,dtype:" msgid "Currencys" msgstr "Währungen" +msgctxt "selection:cashbook_report.evaluation,dtype:" +msgid "Categories" +msgstr "Kategorien" + msgctxt "help:cashbook_report.evaluation,dtype:" msgid "Type of data displayed" msgstr "Art der dargestellten Daten" @@ -226,6 +282,10 @@ msgctxt "field:cashbook_report.evaluation,currencies:" msgid "Currencies" msgstr "Währungen" +msgctxt "field:cashbook_report.evaluation,categories:" +msgid "Categories" +msgstr "Kategorien" + msgctxt "field:cashbook_report.evaluation,line_values:" msgid "Line Values" msgstr "Zeilenwerte" diff --git a/locale/en.po b/locale/en.po index 6af9624..43d6aec 100644 --- a/locale/en.po +++ b/locale/en.po @@ -7,17 +7,69 @@ msgid "Type of evaluation must be '%(typename)s'." msgstr "Type of evaluation must be '%(typename)s'." msgctxt "model:ir.message,text:msg_dtype_cashbook" -msgid "Cashbooks" -msgstr "Cashbooks" +msgid "Cashbooks [Amount]" +msgstr "Cashbooks [Amount]" + +msgctxt "model:ir.message,text:msg_dtype_cashbook_gldiff" +msgid "Cashbooks [Amount of Profit/Loss]" +msgstr "Cashbooks [Amount of Profit/Loss]" + +msgctxt "model:ir.message,text:msg_dtype_cashbook_glperc" +msgid "Cashbooks [Percent of Profit/Loss]" +msgstr "Cashbooks [Percent of Profit/Loss]" + +msgctxt "model:ir.message,text:msg_dtype_cashbooks_glvalue" +msgid "Cashbooks [Current Value]" +msgstr "Cashbooks [Current Value]" + +msgctxt "model:ir.message,text:msg_dtype_cashbooks_glyield" +msgid "Cashbooks [Total Yield]" +msgstr "Cashbooks [Total Yield]" msgctxt "model:ir.message,text:msg_dtype_type" -msgid "Types of Cashbooks" -msgstr "Types of Cashbooks" +msgid "Types of Cashbooks [Amount]" +msgstr "Types of Cashbooks [Amount]" + +msgctxt "model:ir.message,text:msg_dtype_types_gldiff" +msgid "Types of Cashbooks [Amount of Profit/Loss]" +msgstr "Types of Cashbooks [Amount of Profit/Loss]" + +msgctxt "model:ir.message,text:msg_dtype_types_glvalue" +msgid "Types of Cashbooks [Current Value]" +msgstr "Types of Cashbooks [Current Value]" + +msgctxt "model:ir.message,text:msg_dtype_types_glperc" +msgid "Types of Cashbooks [Percent of Profit/Loss]" +msgstr "Types of Cashbooks [Percent of Profit/Loss]" + +msgctxt "model:ir.message,text:msg_dtype_types_glyield" +msgid "Types of Cashbooks [Total Yield]" +msgstr "Types of Cashbooks [Total Yield]" msgctxt "model:ir.message,text:msg_dtype_currency" msgid "Currencies" msgstr "Currencies" +msgctxt "model:ir.message,text:msg_dtype_category" +msgid "Categories [Amount]" +msgstr "Categories [Amount]" + +msgctxt "model:ir.message,text:msg_dtype_category_gldiff" +msgid "Categories [Amount of Profit/Loss]" +msgstr "Categories [Amount of Profit/Loss]" + +msgctxt "model:ir.message,text:msg_dtype_category_glvalue" +msgid "Categories [Current Value]" +msgstr "Categories [Current Value]" + +msgctxt "model:ir.message,text:msg_dtype_category_glperc" +msgid "Categories [Percent of Profit/Loss]" +msgstr "Categories [Percent of Profit/Loss]" + +msgctxt "model:ir.message,text:msg_dtype_category_glyield" +msgid "Categories [Total Yield]" +msgstr "Categories [Total Yield]" + msgctxt "model:ir.message,text:msg_name_graph" msgid "Graph: %(gname)s" msgstr "Graph: %(gname)s" @@ -114,6 +166,10 @@ msgctxt "selection:cashbook_report.evaluation,dtype:" msgid "Currencys" msgstr "Currencys" +msgctxt "selection:cashbook_report.evaluation,dtype:" +msgid "Categories" +msgstr "Categories" + msgctxt "help:cashbook_report.evaluation,dtype:" msgid "Type of data displayed" msgstr "Type of data displayed" @@ -206,6 +262,10 @@ msgctxt "field:cashbook_report.evaluation,currencies:" msgid "Currencies" msgstr "Currencies" +msgctxt "field:cashbook_report.evaluation,categories:" +msgid "Categories" +msgstr "Categories" + msgctxt "field:cashbook_report.evaluation,line_values:" msgid "Line Values" msgstr "Line Values" diff --git a/message.xml b/message.xml index 2b66901..e4f1a55 100644 --- a/message.xml +++ b/message.xml @@ -9,14 +9,53 @@ full copyright notices and license terms. --> Type of evaluation must be '%(typename)s'. - Cashbooks + Cashbooks [Amount] + + + Cashbooks [Amount of Profit/Loss] + + + Cashbooks [Percent of Profit/Loss] + + + Cashbooks [Current Value] + + + Cashbooks [Total Yield] - Types of Cashbooks + Types of Cashbooks [Amount] + + + Types of Cashbooks [Amount of Profit/Loss] + + + ypes of Cashbooks [Current Value] + + + Types of Cashbooks [Percent of Profit/Loss] + + + Types of Cashbooks [Total Yield] Currencies + + Categories [Amount] + + + Categories [Amount of Profit/Loss] + + + Categories [Current Value] + + + Categories [Percent of Profit/Loss] + + + Categories [Total Yield] + Graph: %(gname)s diff --git a/setup.py b/setup.py index 5b7501b..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 @@ -22,7 +22,7 @@ with open(path.join(here, 'README.rst'), encoding='utf-8') as f: # tryton.cfg einlesen config = ConfigParser() -config.readfp(open('tryton.cfg')) +config.read_file(open('tryton.cfg')) info = dict(config.items('tryton')) for key in ('depends', 'extras_depend', 'xml'): if key in info: @@ -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,42 +51,46 @@ 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, + long_description_content_type='text/x-rst', url='https://www.m-ds.de/', + download_url='https://scmdev.m-ds.de/Tryton/Extra/cashbook_report', author='martin-data services', 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', @@ -95,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 d3432f9..58d8764 100644 --- a/templates.py +++ b/templates.py @@ -3,8 +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', + 'cashbooks_glvalue', 'cashbooks_glyield'] +category_types = [ + 'categories', 'category_gldiff', 'category_glvalue', + 'category_glperc', 'category_glyield'] +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 f424f29..463e933 100644 --- a/tests/test_report.py +++ b/tests/test_report.py @@ -3,30 +3,40 @@ # 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 +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.tests import CashbookTestCase +from trytond.modules.cashbook_investment.tests import \ + CashbookInvestmentTestCase from datetime import date from decimal import Decimal -class ReportTestCase(CashbookTestCase): +class ReportTestCase(CashbookInvestmentTestCase): 'Test cashbook book report module' module = 'cashbook_report' + @classmethod + def setUpClass(cls): + """ add modelues + """ + super(ReportTestCase, cls).setUpClass() + activate_module(['dashboard', 'cashbook_investment']) + def prep_report_3books(self): """ create 3x cashbooks, add bookings, """ pool = Pool() Book = pool.get('cashbook.book') + Line = pool.get('cashbook.line') ResUser = pool.get('res.user') user_admin, = ResUser.search([]) + + company = self.prep_company() type_cash = self.prep_type() type_bank = self.prep_type(name='Bank', short='BK') - company = self.prep_company() ResUser.write(*[ [user_admin], @@ -36,9 +46,10 @@ class ReportTestCase(CashbookTestCase): }]) self.assertEqual(user_admin.company.id, company.id) - (usd, euro) = self.prep_2nd_currency(company) sequ_id = self.prep_sequence().id category = self.prep_category(cattype='in') + (usd, euro) = self.prep_2nd_currency(company) + party = self.prep_party() books = Book.create([{ 'name': 'Book 1', @@ -107,6 +118,7 @@ class ReportTestCase(CashbookTestCase): 'party': party.id, }])], }]) + Line.wfcheck([line for book in books for line in book.lines]) self.assertEqual(len(books), 3) self.assertEqual(books[0].name, 'Book 1') self.assertEqual(books[0].btype.rec_name, 'CAS - Cash') @@ -136,8 +148,7 @@ class ReportTestCase(CashbookTestCase): 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) @@ -151,6 +162,7 @@ class ReportTestCase(CashbookTestCase): ('cashbook_hasbookings', '=', True) ]), 2) + Lines.wfedit(books[2].lines) Lines.delete(books[2].lines) self.assertEqual(euro.cashbook_hasbookings, False) @@ -161,8 +173,10 @@ class ReportTestCase(CashbookTestCase): usd, = Currency.search([('code', '=', 'usd')]) self.assertEqual(usd.cashbook_hasbookings, True) + Lines.wfedit(books[0].lines) Lines.delete(books[0].lines) self.assertEqual(usd.cashbook_hasbookings, True) + Lines.wfedit(books[1].lines) Lines.delete(books[1].lines) self.assertEqual(usd.cashbook_hasbookings, False) @@ -183,13 +197,13 @@ class ReportTestCase(CashbookTestCase): 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', @@ -220,9 +234,8 @@ class ReportTestCase(CashbookTestCase): # 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') @@ -230,6 +243,15 @@ class ReportTestCase(CashbookTestCase): self.assertEqual(books_owner1[1].name, 'Book 2') self.assertEqual(books_owner1[1].balance, Decimal('12.5')) + # add category to cashbook + Cashbook.write(*[ + [books_owner1[0]], + { + 'categories': [('create', [{ + 'name': 'Book 1, User 1' + }])], + }]) + evaluation1, = Evaluation.create([{ 'name': 'Evaluation User 1 - Cashbooks', 'dtype': 'cashbooks', @@ -238,10 +260,18 @@ class ReportTestCase(CashbookTestCase): 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', @@ -252,32 +282,67 @@ class ReportTestCase(CashbookTestCase): 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])], + }]) + 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(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') + # add category to cashbook + Cashbook.write(*[ + [books_owner2[0]], + { + 'categories': [('create', [{ + 'name': 'Book 3, User 2' + }])], + }]) + evaluation1, = Evaluation.create([{ 'name': 'Evaluation User 2 - Cashbooks', 'dtype': 'cashbooks', @@ -286,8 +351,12 @@ class ReportTestCase(CashbookTestCase): 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', @@ -298,22 +367,152 @@ class ReportTestCase(CashbookTestCase): 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 3 - Currencies', + '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])], + }]) + 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(Evaluation.search_count([]), 4) + + # outside of context + # we should have access to all 8 evaluations + evaluations = Evaluation.search([], order=[('name', 'ASC')]) + self.assertEqual(len(evaluations), 8) + + self.assertEqual(evaluations[0].name, 'Evaluation User 1 - Cashbooks') + 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[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[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[1].name, 'usd') + 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[1].name, 'CAS - Cash') + 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[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[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[1].name, 'usd') + 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[1].name, 'CAS - Cash') + self.assertEqual( + evaluations[7].line_values[1].balance, + Decimal('35.71')) @with_transaction() def test_report_update_name_of_line(self): @@ -328,8 +527,7 @@ class ReportTestCase(CashbookTestCase): company = self.prep_company() with Transaction().set_context({ - 'company': company.id, - }): + 'company': company.id}): evaluation, = Evaluation.create([{ 'name': 'Evaluation 1', 'dtype': 'cashbooks', @@ -338,7 +536,9 @@ class ReportTestCase(CashbookTestCase): 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' @@ -347,8 +547,12 @@ class ReportTestCase(CashbookTestCase): { '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(*[ @@ -356,7 +560,9 @@ class ReportTestCase(CashbookTestCase): { '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() @@ -367,13 +573,22 @@ class ReportTestCase(CashbookTestCase): Evaluation = pool.get('cashbook_report.evaluation') Types = pool.get('cashbook.type') Currency = pool.get('currency.currency') + Category = pool.get('cashbook.bookcategory') books = self.prep_report_3books() company = self.prep_company() with Transaction().set_context({ - 'company': company.id, - }): + 'company': company.id}): + + Category.create([{ + 'name': 'Cat 1', + }, { + 'name': 'Cat 2', + }, { + 'name': 'Cat 3', + }]) + # valid evaluation, = Evaluation.create([{ 'name': 'Evaluation 1', @@ -383,6 +598,33 @@ class ReportTestCase(CashbookTestCase): self.assertEqual(len(evaluation.cashbooks), 3) self.assertEqual(len(evaluation.types), 0) self.assertEqual(len(evaluation.currencies), 0) + self.assertEqual(len(evaluation.categories), 0) + + # investment - profit/loss amount + if 'cashbooks_gldiff' in [ + x[0] for x in Evaluation.get_sel_etype()]: + # no change if switch between cashbook-types + Evaluation.write(*[ + [evaluation], + { + 'dtype': 'cashbooks_gldiff', + }]) + self.assertEqual(len(evaluation.cashbooks), 3) + self.assertEqual(len(evaluation.types), 0) + self.assertEqual(len(evaluation.currencies), 0) + self.assertEqual(len(evaluation.categories), 0) + + Evaluation.write(*[ + [evaluation], + { + 'dtype': 'cashbooks_glperc', + }]) + self.assertEqual(len(evaluation.cashbooks), 3) + self.assertEqual(len(evaluation.types), 0) + self.assertEqual(len(evaluation.currencies), 0) + self.assertEqual(len(evaluation.categories), 0) + else: + print('\n--== Module "cashbook_investment" not installed ==--') Evaluation.write(*[ [evaluation], @@ -393,6 +635,7 @@ class ReportTestCase(CashbookTestCase): self.assertEqual(len(evaluation.cashbooks), 0) self.assertEqual(len(evaluation.types), 2) self.assertEqual(len(evaluation.currencies), 0) + self.assertEqual(len(evaluation.categories), 0) # write same dtype again - no change Evaluation.write(*[ @@ -403,16 +646,31 @@ class ReportTestCase(CashbookTestCase): self.assertEqual(len(evaluation.cashbooks), 0) self.assertEqual(len(evaluation.types), 2) self.assertEqual(len(evaluation.currencies), 0) + self.assertEqual(len(evaluation.categories), 0) Evaluation.write(*[ [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) self.assertEqual(len(evaluation.currencies), 2) + self.assertEqual(len(evaluation.categories), 0) + + Evaluation.write(*[ + [evaluation], + { + 'dtype': 'categories', + 'categories': [('add', [ + x.id for x in Category.search([])])], + }]) + self.assertEqual(len(evaluation.cashbooks), 0) + self.assertEqual(len(evaluation.types), 0) + self.assertEqual(len(evaluation.currencies), 0) + self.assertEqual(len(evaluation.categories), 3) Evaluation.write(*[ [evaluation], @@ -422,6 +680,7 @@ class ReportTestCase(CashbookTestCase): self.assertEqual(len(evaluation.cashbooks), 0) self.assertEqual(len(evaluation.types), 0) self.assertEqual(len(evaluation.currencies), 0) + self.assertEqual(len(evaluation.categories), 0) @with_transaction() def test_report_dtype_validation(self): @@ -435,8 +694,7 @@ class ReportTestCase(CashbookTestCase): company = self.prep_company() with Transaction().set_context({ - 'company': company.id, - }): + 'company': company.id}): # valid evaluation, = Evaluation.create([{ 'name': 'Evaluation 1', @@ -445,8 +703,10 @@ class ReportTestCase(CashbookTestCase): }]) # 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', @@ -461,8 +721,10 @@ class ReportTestCase(CashbookTestCase): }]) # 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', @@ -470,6 +732,469 @@ class ReportTestCase(CashbookTestCase): 'types': [('add', [x.id for x in Types.search([])])], }]) + @with_transaction() + def test_report_check_update_of_actionviews(self): + """ create 3x cashbooks, add evaluation, check created + form + actionview + """ + pool = Pool() + Evaluation = pool.get('cashbook_report.evaluation') + try: + DashboardAction = pool.get('dashboard.action') + except Exception: + print('\n--== Module "dashboard" not installed ==--') + DashboardAction = None + + books = self.prep_report_3books() + + company = self.prep_company() + with Transaction().set_context({ + 'company': company.id}): + evaluation, = Evaluation.create([{ + 'name': 'Evaluation 1', + 'cashbooks': [('add', [x.id for x in books])], + }]) + + # add dashboard-action + if DashboardAction is not None: + dbaction, = DashboardAction.create([{ + 'user': Transaction().user, + 'act_window': evaluation.dashb_actwin.id, + }]) + self.assertEqual(dbaction.user.rec_name, 'Administrator') + self.assertEqual(dbaction.act_window.name, 'Evaluation 1') + + self.assertEqual(evaluation.dtype, 'cashbooks') + self.assertEqual(evaluation.chart, 'pie') + self.assertEqual(evaluation.legend, True) + self.assertEqual(evaluation.maincolor, 'default') + self.assertEqual(evaluation.bgcolor, '#ffffc0') + 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.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, + 'cashbook_report.eval_line') + self.assertEqual( + evaluation.dashb_actwin.usage, + 'dashboard') + 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, + evaluation.ui_view_chart.id) + self.assertEqual( + evaluation.dashb_actview.act_window.id, + evaluation.dashb_actwin.id) + + # update evaluation, this wil re-create the view/act-window + # and update the dashboard-view, without removing it + old_win_id = evaluation.dashb_actwin.id + Evaluation.write(*[ + [evaluation], + { + 'name': 'Evaluation 1a', + }]) + self.assertTrue(old_win_id != evaluation.dashb_actwin.id) + + if DashboardAction is not None: + self.assertEqual(DashboardAction.search_count([]), 1) + + @with_transaction() + def test_report_cashbook_yield(self): + """ create 3x cashbooks, add bookings, rates + create yield-reports + """ + pool = Pool() + Evaluation = pool.get('cashbook_report.evaluation') + Book = pool.get('cashbook.book') + Line = pool.get('cashbook.line') + BType = pool.get('cashbook.type') + Asset = pool.get('investment.asset') + CbCategory = pool.get('cashbook.bookcategory') + MemCache = pool.get('cashbook.memcache') + + company = self.prep_company() + with Transaction().set_context({ + 'company': company.id}): + asset_cfg = self.prep_yield_config( + fee='Fee', + dividend='Dividend', + gainloss='Gain-Loss', + company=company) + + cb_cat, = CbCategory.create([{'name': 'CB Category'}]) + category_in = self.prep_category(cattype='in') + type_depot = self.prep_type('Depot', 'D') + BType.write(*[ + [type_depot], + { + 'feature': 'asset', + }]) + asset = self.prep_asset_item( + company=company, + product=self.prep_asset_product(name='Product 1')) + self.assertEqual(asset.symbol, 'usd/u') + + Asset.write(*[ + [asset], + { + 'rates': [('create', [{ + 'date': date(2022, 5, 1), + 'rate': Decimal('102.0'), + }, { + 'date': date(2022, 5, 2), + 'rate': Decimal('105.5'), + }])], + }]) + self.assertEqual( + asset.rec_name, + 'Product 1 | 105.5000 usd/u | 05/02/2022') + + book_asset, = Book.create([{ + 'name': 'Depot', + 'btype': type_depot.id, + 'company': company.id, + 'currency': company.currency.id, + 'number_sequ': self.prep_sequence().id, + 'asset': asset.id, + 'quantity_uom': asset.uom.id, + 'categories': [('add', [cb_cat.id])], + 'start_date': date(2022, 5, 1), + 'lines': [('create', [{ + 'bookingtype': 'in', + 'date': date(2022, 5, 2), + 'amount': Decimal('100.0'), + 'quantity': Decimal('1.0'), + 'category': category_in.id, + 'description': 'Init', + }, { + 'bookingtype': 'in', + 'date': date(2022, 5, 3), + 'amount': Decimal('5.0'), + 'quantity': Decimal('0.0'), + 'category': asset_cfg.dividend_category.id, + 'description': 'Dividend', + }, { + 'bookingtype': 'out', + 'date': date(2022, 5, 4), + 'amount': Decimal('2.0'), + 'quantity': Decimal('0.0'), + 'category': asset_cfg.fee_category.id, + 'description': 'Fee', + }, { + 'bookingtype': 'mvin', + 'date': date(2022, 5, 5), + 'amount': Decimal('15.0'), + '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, + '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')) + self.assertEqual(book_asset.diff_amount, Decimal('-14.5')) + self.assertEqual(book_asset.yield_dividend_total, Decimal('5.0')) + self.assertEqual(book_asset.yield_fee_total, Decimal('2.0')) + self.assertEqual(book_asset.yield_sales, Decimal('15.0')) + self.assertEqual(book_asset.yield_balance, Decimal('5.5')) + + # evaluation: cashbooks - total yield + evaluation1, = Evaluation.create([{ + 'name': 'Evaluation 1', + 'dtype': 'cashbooks_glyield', + 'chart': 'hbar', + 'cashbooks': [('add', [book_asset.id])], + }]) + 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')) + + # evaluation: categories - total yield + evaluation2, = Evaluation.create([{ + 'name': 'Evaluation 2', + 'dtype': 'category_glyield', + 'chart': 'hbar', + 'categories': [('add', [book_asset.categories[0].id])], + }]) + 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')) + + # evaluation: types - total yield + evaluation3, = Evaluation.create([{ + 'name': 'Evaluation 3', + 'dtype': 'types_glyield', + 'chart': 'hbar', + 'types': [('add', [book_asset.btype.id])], + }]) + 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')) + + @with_transaction() + def test_report_chart_hbar_book_investment(self): + """ create 3x cashbooks, add bookings, rates + create report with cashbooks, check + """ + pool = Pool() + Evaluation = pool.get('cashbook_report.evaluation') + Book = pool.get('cashbook.book') + Line = pool.get('cashbook.line') + + company = self.prep_company() + with Transaction().set_context({ + 'company': company.id}): + AccType = pool.get('cashbook.type') + Asset = pool.get('investment.asset') + Product = pool.get('product.template') + Uom = pool.get('product.uom') + CbCategory = pool.get('cashbook.bookcategory') + MemCache = pool.get('cashbook.memcache') + + at, = AccType.create([{ + 'name': 'depot', + 'short': 'D', + 'feature': 'asset', + 'company': company.id, + }]) + + prod_templ, = Product.create([{ + 'name': 'Aurum', + 'type': 'assets', + 'list_price': Decimal('1.0'), + 'default_uom': Uom.search([('symbol', '=', 'u')])[0].id, + 'products': [('create', [{ + 'description': 'Au', + }])], + }]) + + asset, = Asset.create([{ + 'company': company.id, + 'product': prod_templ.products[0].id, + 'currency': company.currency.id, + 'currency_digits': 4, + 'uom': prod_templ.default_uom.id, + 'rates': [('create', [{ + 'date': date(2022, 5, 1), + 'rate': Decimal('1750.0'), + }, ])], + }]) + self.assertEqual( + asset.rec_name, + 'Aurum | 1,750.0000 usd/u | 05/01/2022') + + books = self.prep_report_3books() + self.assertEqual(books[0].rec_name, 'Book 1 | 25.00 usd | Open') + self.assertEqual(books[1].rec_name, 'Book 2 | 12.50 usd | Open') + self.assertEqual(books[2].rec_name, 'Book 3 | 23.00 € | Open') + + cb_cat, = CbCategory.create([{'name': 'CB Category'}]) + Line.wfedit([line for book in books for line in book.lines]) + Book.write(*[ + books, + { + 'btype': at.id, + 'asset': asset.id, + 'categories': [('add', [cb_cat.id])], + 'quantity_uom': asset.uom.id, + 'quantity_digits': 3, + }, + ]) + Line.write(*[ + [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 + {'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 + {'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].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].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].current_value, Decimal('6666.67')) + self.assertEqual(books[2].diff_amount, Decimal('-33.33')) + self.assertEqual(books[2].diff_percent, Decimal('-0.5')) + + # evaluation: amount-difference + evaluation, = Evaluation.create([{ + 'name': 'Evaluation 1', + 'dtype': 'cashbooks_gldiff', + 'chart': 'hbar', + 'cashbooks': [('add', [x.id for x in books])], + }]) + self.assertEqual(evaluation.dtype, 'cashbooks_gldiff') + self.assertEqual(evaluation.chart, 'hbar') + self.assertEqual(evaluation.legend, True) + self.assertEqual(evaluation.maincolor, 'default') + 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')) + + # evaluation: percent-difference + evaluation2, = Evaluation.create([{ + 'name': 'Evaluation 2', + 'dtype': 'cashbooks_glperc', + 'chart': 'hbar', + 'cashbooks': [('add', [x.id for x in books])], + }]) + self.assertEqual(evaluation2.dtype, 'cashbooks_glperc') + self.assertEqual(evaluation2.chart, 'hbar') + self.assertEqual(evaluation2.legend, True) + self.assertEqual(evaluation2.maincolor, 'default') + 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')) + + # evaluation: percent-difference + evaluation3, = Evaluation.create([{ + 'name': 'Evaluation 3', + 'dtype': 'cashbooks_glvalue', + 'chart': 'hbar', + 'cashbooks': [('add', [x.id for x in books])], + }]) + self.assertEqual(evaluation3.dtype, 'cashbooks_glvalue') + self.assertEqual(evaluation3.chart, 'hbar') + self.assertEqual(evaluation3.legend, True) + self.assertEqual(evaluation3.maincolor, 'default') + 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')) + + # evaluation: category-current value + evaluation4, = Evaluation.create([{ + 'name': 'Evaluation 4', + 'dtype': 'category_glvalue', + 'chart': 'hbar', + 'categories': [('add', [cb_cat.id])], + }]) + self.assertEqual(evaluation4.dtype, 'category_glvalue') + self.assertEqual(evaluation4.chart, 'hbar') + self.assertEqual(evaluation4.legend, True) + self.assertEqual(evaluation4.maincolor, 'default') + self.assertEqual(evaluation4.bgcolor, '#ffffc0') + self.assertEqual(evaluation4.currency.code, 'EUR') + + self.assertEqual(len(evaluation4.line_values), 1) + self.assertEqual( + evaluation4.line_values[0].balance, + Decimal('20000.01')) + + # evaluation: category- difference amount + evaluation5, = Evaluation.create([{ + 'name': 'Evaluation 5', + 'dtype': 'category_gldiff', + 'chart': 'hbar', + 'categories': [('add', [cb_cat.id])], + }]) + self.assertEqual(evaluation5.dtype, 'category_gldiff') + self.assertEqual(evaluation5.chart, 'hbar') + self.assertEqual(evaluation5.legend, True) + self.assertEqual(evaluation5.maincolor, 'default') + self.assertEqual(evaluation5.bgcolor, '#ffffc0') + self.assertEqual(evaluation5.currency.code, 'EUR') + + self.assertEqual(len(evaluation5.line_values), 1) + self.assertEqual( + evaluation5.line_values[0].balance, + Decimal('1300.01')) + + # evaluation: category- difference amount + evaluation6, = Evaluation.create([{ + 'name': 'Evaluation 6', + 'dtype': 'category_glperc', + 'chart': 'hbar', + 'categories': [('add', [cb_cat.id])], + }]) + self.assertEqual(evaluation6.dtype, 'category_glperc') + self.assertEqual(evaluation6.chart, 'hbar') + self.assertEqual(evaluation6.legend, True) + self.assertEqual(evaluation6.maincolor, 'default') + self.assertEqual(evaluation6.bgcolor, '#ffffc0') + self.assertEqual(evaluation6.currency.code, 'EUR') + + self.assertEqual(len(evaluation6.line_values), 1) + self.assertEqual( + evaluation6.line_values[0].balance, + Decimal('6.95')) + @with_transaction() def test_report_chart_pie_book_red(self): """ create 3x cashbooks, add bookings, @@ -481,8 +1206,7 @@ class ReportTestCase(CashbookTestCase): 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])], @@ -490,47 +1214,76 @@ class ReportTestCase(CashbookTestCase): self.assertEqual(evaluation.dtype, 'cashbooks') self.assertEqual(evaluation.chart, 'pie') self.assertEqual(evaluation.legend, True) - self.assertEqual(evaluation.posted, False) self.assertEqual(evaluation.maincolor, 'default') self.assertEqual(evaluation.bgcolor, '#ffffc0') 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, + """ - + """) 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): @@ -541,13 +1294,12 @@ class ReportTestCase(CashbookTestCase): 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', @@ -556,7 +1308,6 @@ class ReportTestCase(CashbookTestCase): self.assertEqual(evaluation.dtype, 'types') self.assertEqual(evaluation.chart, 'pie') self.assertEqual(evaluation.legend, True) - self.assertEqual(evaluation.posted, False) self.assertEqual(evaluation.maincolor, 'default') self.assertEqual(evaluation.bgcolor, '#ffffc0') self.assertEqual(evaluation.currency.code, 'EUR') @@ -566,16 +1317,26 @@ class ReportTestCase(CashbookTestCase): self.assertEqual(len(evaluation.types), 2) self.assertEqual(evaluation.types[0].rec_name, 'BK - Bank') self.assertEqual(evaluation.types[1].rec_name, 'CAS - Cash') - # 23.00 EUR + self.assertEqual(len(evaluation.line_values), 2) - self.assertEqual(evaluation.line_values[0].eval_currency.code, 'EUR') + + # 23.00 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): @@ -586,12 +1347,11 @@ class ReportTestCase(CashbookTestCase): 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', @@ -600,7 +1360,6 @@ class ReportTestCase(CashbookTestCase): self.assertEqual(evaluation.dtype, 'currencies') self.assertEqual(evaluation.chart, 'pie') self.assertEqual(evaluation.legend, True) - self.assertEqual(evaluation.posted, False) self.assertEqual(evaluation.maincolor, 'default') self.assertEqual(evaluation.bgcolor, '#ffffc0') self.assertEqual(evaluation.currency.code, 'EUR') @@ -611,8 +1370,15 @@ class ReportTestCase(CashbookTestCase): 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 diff --git a/tryton.cfg b/tryton.cfg index 7c0ce6c..74f58b0 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,8 +1,12 @@ [tryton] -version=6.0.0 +version=6.0.8 depends: res cashbook + cashbook_bookcategory +extras_depend: + dashboard + cashbook_investment xml: icon.xml message.xml diff --git a/versiondep.txt b/versiondep.txt index dd7b3c7..31e5e60 100644 --- a/versiondep.txt +++ b/versiondep.txt @@ -1 +1,3 @@ -cashbook;6.0.19;6.0.999;mds +cashbook;6.0.31;6.0.999;mds +cashbook_bookcategory;6.0.4;6.0.999;mds +cashbook_investment;6.0.11;6.0.999;mds diff --git a/view/evaluation_form.xml b/view/evaluation_form.xml index 0d413cb..236f65c 100644 --- a/view/evaluation_form.xml +++ b/view/evaluation_form.xml @@ -20,11 +20,10 @@ full copyright notices and license terms. -->