Merge lp:~openerp-dev/openobject-addons/trunk-account_check_writing_jam-amount-in-word-sgo into lp:~openerp-dev/openobject-addons/trunk-account_check_writing_jam

[Sanjay Gohel (Open ERP)]

Hello,
   Remove amount word usd specific implementation (will be improve in future). Made amt to tax field char which will get values on amount change which can be changed.

Thank You.

Sanjay Gohel

Unmerged revisions

8386. By Sanjay Gohel (Open ERP) on 2013-10-25

[REM/IMP]remove amount word usd specific implementation (will be improve in future). Made amt to tax field char which will get values on amount change which can be changed

8385. By Sanjay Gohel (Open ERP) on 2013-10-25

[MERGE]with parent

=== modified file 'account_check_writing/__init__.py'
--- account_check_writing/__init__.py	2012-12-16 09:54:23 +0000
+++ account_check_writing/__init__.py	2013-10-25 13:24:03 +0000
@@ -18,7 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import amount_to_text_en
 import res_company
 import account
 import account_voucher

=== modified file 'account_check_writing/account_voucher.py'
--- account_check_writing/account_voucher.py	2013-10-15 08:42:29 +0000
+++ account_check_writing/account_voucher.py	2013-10-25 13:24:03 +0000
@@ -22,7 +22,7 @@
 from lxml import etree
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
-from openerp.addons.account_check_writing.amount_to_text_en import amount_to_text
+from openerp.tools import amount_to_text_en
 
 
 class account_voucher(osv.Model):
@@ -45,22 +45,8 @@
             return journal_pool.search(cr, uid, [('allow_check_writing', '=', True)], limit=1, context=context)
         return journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1, context=context)
 
-    def _get_amount_in_word(self, cr, uid, ids, field_name, arg, context=None):
-        """
-        fields.function method to generate the textual representation of the
-        float amount, to be printed on check later.
-        """
-        res = {}
-        for check in self.browse(cr, uid, ids, context=context):
-            language = 'en'
-            if context.get('lang'):
-                language = context.get('lang')[0:2]
-            currency = check.currency_id.name.lower()
-            res.update({check.id: amount_to_text(check.amount, lang=language, currency=currency)})
-        return res
-
     _columns = {
-        'amount_in_word': fields.function(_get_amount_in_word, type='char', readonly=True, store=True),
+        'amount_in_word': fields.char("Amount in words", size=1024),
         'allow_check': fields.related('journal_id', 'allow_check_writing', type='boolean', string='Allow Check Writing'),
         'check_number': fields.char('Check Number', size=32),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft': [('readonly', False)]}),
@@ -85,7 +71,7 @@
             if context.get('lang'):
                 language = context.get('lang')[0:2]
             currency = currency.name.lower()
-            amount_in_word = amount_to_text(amount, lang=language, currency=currency)
+            amount_in_word = amount_to_text_en.amount_to_text(amount, lang=language, currency=currency)
             default['value'].update({'amount_in_word': amount_in_word})
             if journal_id:
                 allow_check_writing = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context).allow_check_writing

=== removed file 'account_check_writing/amount_to_text_en.py'
--- account_check_writing/amount_to_text_en.py	2013-10-10 12:38:31 +0000
+++ account_check_writing/amount_to_text_en.py	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-Today OpenERP S.A. (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import logging
-from openerp.tools.translate import _
-from openerp.tools import amount_to_text_en
-
-_logger = logging.getLogger(__name__)
-
-#This will file methods will facilitates the US specific check amount to text 
-#conversion. When we convert the amount to text using server tools api it 
-#produces following output for amount 4500.00: 
-#    Four Thousand, Five Hundred euro and Zero Cent
-#but when it comes to USd check expected output should is:
-#    Four Thousand, Five Hundred and 0/100
-#So this method below will generate the above output for the USD currency for 
-#the places where we have this specific function called.
-
-
-def amount_to_text(number, currency):
-    if currency == "usd":
-        number = '%.2f' % number
-        list = str(number).split('.')
-        start_word = amount_to_text_en.english_number(int(list[0]))
-        end_word = "%d/%d"%(int(list[1]),100)
-        return ' '.join(filter(None, [start_word, 'and', end_word]))
-    else:
-        return amount_to_text_en.amount_to_text(number, currency)
-
-
-_translate_funcs = {'en' : amount_to_text}
-
-def amount_to_text(nbr, lang='en', currency='euro'):
-    """ 
-    Converts an integer to its textual representation, using the 
-    language set in the context if any.
-    """
-    if lang not in _translate_funcs:
-        _logger.warning(_("no translation function found for lang: '%s'"), lang)
-        lang = 'en'
-    return _translate_funcs[lang](abs(nbr), currency)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: