10.0 17012018

telegram_expense_manager/data/telegram_command.xml

@@ -341,12 +341,14 @@ accounts = env["account.analytic.account"].sudo().search(
      order='id ASC',
 )
 data['accounts'] = accounts
+data['base_currency'] = partner.company_id.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()"/> (<t t-esc="acc.get_currency_balance(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(currency)"/> <t t-esc="currency.name"/></t>) — <t t-esc="acc.name"/></t>
+<b>Total</b>: <t t-esc="data['accounts'].get_currency_balance()"/> (<t t-esc="data['accounts'].get_currency_balance(data['base_currency'])"/> <t t-esc="data['base_currency'].name"/> <t t-foreach="data['currency_ids']" t-as="currency_all"> <t t-esc="data['accounts'].get_currency_balance(currency_all)"/> <t t-esc="currency_all.name"/></t>)</t>
         </field>
     </record>
 

telegram_expense_manager/models/account_analytic_account.py

@@ -52,3 +52,40 @@ 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, currency=None):
+        balance = 0.0
+        AccountMoveLine = self.env['account.move.line']
+        domain = [('analytic_account_id', 'in', self.mapped('id'))]
+
+        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']))
+
+        base_currency = self.env.user.partner_id.company_id.currency_id
+        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:
+            base_currency_sum = 0.0
+            domain.append(('currency_id', '=', False))
+            line_ids = AccountMoveLine.search(domain)
+            balance += sum(line_ids.mapped('balance'))
+        else:
+            domain.append(('currency_id', '!=', False))
+            all_currencies_line_ids = AccountMoveLine.search(domain)
+            currency_ids = all_currencies_line_ids.mapped('currency_id')
+            for currency_id in currency_ids:
+                balance += sum(all_currencies_line_ids.filtered(lambda r: r.currency_id == currency_id).mapped('balance')) * currency_id.rate
+            balance += self.get_currency_balance(currency=base_currency)
+
+        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:
@@ -466,9 +471,17 @@ def _em_add_record(self,
 
         journal = self.env.ref(journal_ref)
 
+        currency_id = currency and self.env['res.currency'].search([('name', '=', currency)], limit=1)
+
+        if 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.id or None,
         }
         if isinstance(amount, basestring):
             amount = float(amount.replace(',', '.'))