10.0 17012018

telegram_expense_manager/__manifest__.py

@@ -28,9 +28,13 @@
         "data/account.xml",
         "data/analytic.xml",
         "data/cron.xml",
+        "data/res_currency_data.xml",
         "views/schedule.xml",
         "views/account_account.xml",
+        "views/res_currency_view.xml",
+        "views/res_partner_view.xml",
         "security/ir.model.access.csv",
+        "security/base_security.xml",
     ],
     "qweb": [
     ],

telegram_expense_manager/data/res_currency_data.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <data noupdate="1">
+    <record id="base.RUB" model="res.currency">
+      <field name="active" eval="True"/>
+    </record>
+    <record id="rub_alias_1" model="res.currency.alias">
+      <field name="name">руб</field>
+      <field name="currency_id" eval="ref('base.RUB')"/>
+    </record>
+    <record id="rub_alias_2" model="res.currency.alias">
+      <field name="name">руб.</field>
+      <field name="currency_id" eval="ref('base.RUB')"/>
+    </record>
+    <record id="rub_alias_3" model="res.currency.alias">
+      <field name="name">р.</field>
+      <field name="currency_id" eval="ref('base.RUB')"/>
+    </record>
+    <record id="rub_alias_4" model="res.currency.alias">
+      <field name="name">рубль</field>
+      <field name="currency_id" eval="ref('base.RUB')"/>
+    </record>
+    <record id="rub_alias_5" model="res.currency.alias">
+      <field name="name">рубля</field>
+      <field name="currency_id" eval="ref('base.RUB')"/>
+    </record>
+    <record id="rub_alias_6" model="res.currency.alias">
+      <field name="name">рублей</field>
+      <field name="currency_id" eval="ref('base.RUB')"/>
+    </record>
+    <record id="usd_alias_1" model="res.currency.alias">
+      <field name="name">доллар</field>
+      <field name="currency_id" eval="ref('base.USD')"/>
+    </record>
+    <record id="usd_alias_2" model="res.currency.alias">
+      <field name="name">долларов</field>
+      <field name="currency_id" eval="ref('base.USD')"/>
+    </record>
+    <record id="eur_alias_1" model="res.currency.alias">
+      <field name="name">евро</field>
+      <field name="currency_id" eval="ref('base.EUR')"/>
+    </record>
+  </data>
+</odoo>

telegram_expense_manager/data/telegram_command.xml

@@ -88,6 +88,8 @@ if not error:
     data['analytic_liquidity'] = analytic_liquidity
     data['analytic_payable'] = analytic_payable
     data['record'] = record
+    data['base_currency'] = partner.em_currency_id
+    data['currency_ids'] = env["account.move.line"].sudo().search([('analytic_account_id', '=', analytic_liquidity.id)]).mapped('currency_id').sorted(key=lambda r: r.id)
         </field>
         <field name="response_template" type="xml">
 <t>
@@ -98,7 +100,7 @@ if not error:
     </t>
     <t t-else="">New record is added! Check or edit it here: /record_<t t-esc="data['record'].id"/>
 New Balance:
-<b t-esc="data['analytic_liquidity'].move_balance"/> — <t t-esc="data['analytic_liquidity'].name"/>
+<b><t t-esc="data['analytic_liquidity'].get_currency_balance(base_currency=data['base_currency'])"/></b> (<t t-esc="data['analytic_liquidity'].get_currency_balance(base_currency=data['base_currency'], currency=data['base_currency'])"/> <t t-esc="data['base_currency'].name"/><t t-foreach="data['analytic_liquidity'].currency_ids" t-as="currency"> <t t-esc="data['analytic_liquidity'].get_currency_balance(base_currency=data['base_currency'], currency=currency)"/> <t t-esc="currency.name"/></t>) — <t t-esc="data['analytic_liquidity'].name"/>
     </t>
 </t>
         </field>
@@ -341,12 +343,14 @@ accounts = env["account.analytic.account"].sudo().search(
      order='id ASC',
 )
 data['accounts'] = accounts
+data['base_currency'] = partner.em_currency_id
+data['currency_ids'] = env["account.move.line"].sudo().search([('analytic_account_id', 'in', accounts.ids)]).mapped('currency_id').sorted(key=lambda r: r.id)
 data['total'] = sum((acc.move_balance for acc in accounts))
         </field>
         <field name="response_template" type="xml">
             <t><t t-foreach="data['accounts']" t-as="acc">
-/account_<t t-esc="acc.id"/> — <t t-esc="acc.move_balance"/> — <t t-esc="acc.name"/></t>
-<b>Total</b>: <t t-esc="data['total']"/></t>
+/account_<t t-esc="acc.id"/> — <t t-esc="acc.get_currency_balance(base_currency=data['base_currency'])"/> (<t t-esc="acc.get_currency_balance(base_currency=data['base_currency'], currency=data['base_currency'])"/> <t t-esc="data['base_currency'].name"/><t t-foreach="acc.currency_ids" t-as="currency"> <t t-esc="acc.get_currency_balance(base_currency=data['base_currency'], currency=currency)"/> <t t-esc="currency.name"/></t>) — <t t-esc="acc.name"/></t>
+<b>Total</b>: <t t-esc="data['accounts'].get_currency_balance(base_currency=data['base_currency'])"/> (<t t-esc="data['accounts'].get_currency_balance(base_currency=data['base_currency'], currency=data['base_currency'])"/> <t t-esc="data['base_currency'].name"/> <t t-foreach="data['currency_ids']" t-as="currency"> <t t-esc="data['accounts'].get_currency_balance(base_currency=data['base_currency'], currency=currency)"/> <t t-esc="currency.name"/></t>)</t>
         </field>
     </record>
 

telegram_expense_manager/models/__init__.py

@@ -4,3 +4,5 @@
 from . import api
 from . import schedule
 from . import account_account
+from . import res_currency
+from . import res_partner

telegram_expense_manager/models/account_analytic_account.py

@@ -52,3 +52,48 @@ def _compute_move_debit_credit_balance(self):
     move_balance = fields.Monetary(compute='_compute_move_debit_credit_balance', string='Balance')
     move_debit = fields.Monetary(compute='_compute_move_debit_credit_balance', string='Debit')
     move_credit = fields.Monetary(compute='_compute_move_debit_credit_balance', string='Credit')
+    currency_ids = fields.Many2many("res.currency", "analytic_account_currency_rel")
+
+    @api.multi
+    def _attach_new_currency(self, currency):
+        for record in self:
+            if currency not in record.currency_ids:
+                record.currency_ids = [(4, currency.id)]
+
+    @api.multi
+    def get_currency_balance(self, base_currency=None, currency=None):
+        # this method runs in sudo() mode - see /account_all telegram command respose_code (acc search)
+        balance = 0.0
+        AccountMoveLine = self.env['account.move.line']
+        domain = [('analytic_account_id', 'in', self.mapped('id'))]
+
+        def get_base_currency_sum():
+            base_currency_sum = 0.0
+            domain.append(('currency_id', '=', False))
+            line_ids = AccountMoveLine.search(domain)
+            base_currency_sum += sum(line_ids.mapped('balance'))
+            return base_currency_sum
+
+        if self._context.get('from_date', False):
+            domain.append(('date', '>=', self._context['from_date']))
+        if self._context.get('to_date', False):
+            domain.append(('date', '<=', self._context['to_date']))
+
+        if currency and currency != base_currency:
+            domain.append(('currency_id', '=', currency.id))
+            balance = sum(AccountMoveLine.search(domain).mapped('balance'))
+        elif currency and currency == base_currency:
+            balance = get_base_currency_sum()
+        else:
+            # this is for tatal sum
+            currency_domain = domain[:]
+            currency_domain.append(('currency_id', '!=', False))
+            all_currencies_line_ids = AccountMoveLine.search(currency_domain)
+            currency_ids = all_currencies_line_ids.mapped('currency_id')
+            for currency_id in currency_ids:
+                rate = self.env['res.currency']._get_conversion_rate(base_currency, currency_id)
+                filtered_line_ids = all_currencies_line_ids.filtered(lambda r: r.currency_id == currency_id)
+                balance += sum(all_currencies_line_ids.filtered(lambda r: r.currency_id == currency_id).mapped('balance')) * rate
+            balance += get_base_currency_sum()
+
+        return round(balance, 1)

telegram_expense_manager/models/api.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import re
+
 from odoo import models, api, fields
 from odoo.exceptions import AccessError
 from odoo.tools.translate import _
@@ -233,10 +235,13 @@ def em_handle_callback_data(self, callback_data, raw_text, add_record=None):
         error = None
 
         if callback_data.get('action') == ASK_AMOUNT:
+            m = re.match(r'([0-9][ +\-\/0-9.,]*) ?([^0-9]*)', raw_text)
+            amount = m.group(1)
+            currency = m.group(2)
             if not record:
-                record = add_record('', raw_text)
+                record = add_record('', amount, currency=currency)
             else:
-                record.em_update_amount(raw_text)
+                record.em_update_amount(amount, currency=currency)
         elif callback_data.get('action') == ASK_NOTE:
             record.em_update_note(raw_text)
         elif callback_data.get('action') == ASK_ANALYTIC:
@@ -465,10 +470,20 @@ def _em_add_record(self,
                        journal_ref, from_data, to_data):
 
         journal = self.env.ref(journal_ref)
+        base_currency_id = self.em_currency_id
+
+        currency_id = currency and (self.env['res.currency'].search([('name', 'ilike', currency)], limit=1) \
+                or self.env['res.currency.alias'].sudo().search([('name', 'ilike', currency)], limit=1).currency_id)
+
+        if currency_id and currency_id != base_currency_id:
+            analytic_account_lst = [from_data.get('analytic_account_id'), to_data.get('analytic_account_id')]
+            analytic_account_ids = self.env['account.analytic.account'].browse(analytic_account_lst)
+            analytic_account_ids._attach_new_currency(currency_id)
 
         common = {
             'partner_id': self.id,
             'name': text or 'unknown',
+            'currency_id': currency_id and currency_id != base_currency_id and currency_id.id or None,
         }
         if isinstance(amount, basestring):
             amount = float(amount.replace(',', '.'))

telegram_expense_manager/models/res_currency.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, tools, _
+
+
+class CurrencyAlias(models.Model):
+    _name = "res.currency.alias"
+
+    name = fields.Char(string='Currency Alias')
+    _sql_constraints = [
+
+        ('unique_name', 'unique (name)', 'The currency alias must be unique!'),
+    ]
+
+    currency_id = fields.Many2one('res.currency', string='Currency', readonly=True)
+
+
+class Currency(models.Model):
+    _inherit = "res.currency"
+
+    alias_ids = fields.One2many('res.currency.alias', 'currency_id', string='Aliases')

telegram_expense_manager/models/res_partner.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, _
+
+
+class Partner(models.Model):
+    _inherit = "res.partner"
+
+    def _default_em_currency(self):
+        return self.env.user.company_id.currency_id
+
+    em_currency_id = fields.Many2one('res.currency',
+                                     string="Base currency for personal expense management",
+                                     ondelete='restrict',
+                                     default=_default_em_currency)

telegram_expense_manager/security/base_security.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<odoo>
+  <record id="base.group_user" model="res.groups">
+    <field name="implied_ids" eval="[(4, ref('base.group_multi_currency'))]"/>
+  </record>
+</odoo>

telegram_expense_manager/views/res_currency_view.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <record id="view_currency_form_inherit_expense_manager" model="ir.ui.view">
+    <field name="name">res.currency.form.inherit.expense_manager</field>
+    <field name="model">res.currency</field>
+    <field name="inherit_id" ref="base.view_currency_form"/>
+    <field name="arch" type="xml">
+      <xpath expr="//sheet" position="inside">
+        <notebook>
+          <page string="Aliases">
+            <field name="alias_ids">
+              <tree string="Currency Aliases" editable="bottom">
+                <field name="name"/>
+              </tree>
+            </field>
+          </page>
+        </notebook>
+      </xpath>
+    </field>
+  </record>
+</odoo>

telegram_expense_manager/views/res_partner_view.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <record id="view_partner_form_inherit_expense_manager" model="ir.ui.view">
+    <field name="name">res.partner.form.inherit.expense_manager</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="base.view_partner_form"/>
+    <field name="arch" type="xml">
+      <xpath expr="//notebook" position="inside">
+        <page string="Personal Expenses">
+          <group>
+            <field name="em_currency_id"/>
+          </group>
+        </page>
+      </xpath>
+    </field>
+  </record>
+</odoo>