Merge lp:~savoirfairelinux-openerp/openerp-canada/7.0-l10n_ca_account_check_writing-print-lang into lp:openerp-canada

[Virgil Dupras]

[lp:~savoirfairelinux-openerp/openerp-canada/7.0-l10n_ca_account_check_writing-print-lang]

13. By Maxime Chambreuil (http://www.savoirfairelinux.com) on 2013-05-25

[IMP] Bump version and update translation file

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

The amount in letter is not translated.

review: Needs Fixing (test)

[lp:~savoirfairelinux-openerp/openerp-canada/7.0-l10n_ca_account_check_writing-print-lang]

14. By Virgil Dupras on 2013-05-25

[MRG] Print supplier invoice reference on the cheque

15. By Joao Alfredo Gama Batista on 2013-05-25

[MRG] Currency

16. By Virgil Dupras on 2013-05-28

[ENH] Use num2words for number conversion in check printing.

OpenERP's built-in functionnality to do that doesn't work well at all in French.

[Virgil Dupras (hsoft)]

OpenERP's built-in function for num --> words translation are not very good, so I searched for a library that would do that in multiple languages. It's num2words at https://pypi.python.org/pypi/num2words

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

For check in the middle, amount in letter is well translated -> Good!

but cents are not present (should be there in digits).

and I have thoses errors in the log :

2013-05-28 23:37:11,410 21950 WARNING Check openerp.osv.orm.browse_record.account.voucher: Field 'chk_seq' does not exist in object 'browse_record(account.voucher, 1)'
2013-05-28 23:37:11,410 21950 ERROR Check openerp.tools.safe_eval: Cannot eval "voucher.journal_id.use_preprint_check and voucher.chk_seq or ''"
Traceback (most recent call last):
  File "/home/max/openerp/server/7.0/openerp/tools/safe_eval.py", line 241, in safe_eval
    return eval(test_expr(expr, _SAFE_OPCODES, mode=mode), globals_dict, locals_dict)
  File "", line 1, in <module>
  File "/home/max/openerp/server/7.0/openerp/osv/orm.py", line 486, in __getattr__
    raise AttributeError(e)
AttributeError: "Field 'chk_seq' does not exist in object 'browse_record(account.voucher, 1)'"
2013-05-28 23:37:11,423 21950 WARNING Check openerp.osv.orm.browse_record.account.voucher: Field 'chk_seq' does not exist in object 'browse_record(account.voucher, 1)'
2013-05-28 23:37:11,423 21950 ERROR Check openerp.tools.safe_eval: Cannot eval "voucher.journal_id.use_preprint_check and voucher.chk_seq or ''"
Traceback (most recent call last):
  File "/home/max/openerp/server/7.0/openerp/tools/safe_eval.py", line 241, in safe_eval
    return eval(test_expr(expr, _SAFE_OPCODES, mode=mode), globals_dict, locals_dict)
  File "", line 1, in <module>
  File "/home/max/openerp/server/7.0/openerp/osv/orm.py", line 486, in __getattr__
    raise AttributeError(e)
AttributeError: "Field 'chk_seq' does not exist in object 'browse_record(account.voucher, 1)'"
2013-05-28 23:37:11,425 21950 WARNING Check openerp.report.render.rml2pdf.trml2pdf: Warning: style not found, P26 - setting default!

2013-05-28 23:37:11,428 21950 WARNING Check openerp.osv.orm.browse_record.account.voucher: Field 'chk_seq' does not exist in object 'browse_record(account.voucher, 1)'
2013-05-28 23:37:11,428 21950 ERROR Check openerp.tools.safe_eval: Cannot eval "voucher.journal_id.use_preprint_check and voucher.chk_seq or ''"
Traceback (most recent call last):
  File "/home/max/openerp/server/7.0/openerp/tools/safe_eval.py", line 241, in safe_eval
    return eval(test_expr(expr, _SAFE_OPCODES, mode=mode), globals_dict, locals_dict)
  File "", line 1, in <module>
  File "/home/max/openerp/server/7.0/openerp/osv/orm.py", line 486, in __getattr__
    raise AttributeError(e)
AttributeError: "Field 'chk_seq' does not exist in object 'browse_record(account.voucher, 1)'"

For check on top, the amount in letters is not translated and I have the same error in the log.

review: Needs Fixing

[Virgil Dupras (hsoft)]

For the cents issue, the problem is I lack specifications. Where am I supposed to put them? I should replace the last 6 stars with something like "42/100"?

As for the errors, they were there before, but they don't seem to prevent the checks from being generated. I'd say it's a separate issue.

And for the top check, I was also getting language discrepancy until I tried to update the module in my OpenERP installation. The problems went away. Maybe it's the same case on your local install.

[lp:~savoirfairelinux-openerp/openerp-canada/7.0-l10n_ca_account_check_writing-print-lang]

17. By Virgil Dupras on 2013-05-31

[ENH] Add numerical cents values on the worded amount when printing checks.

18. By Virgil Dupras on 2013-05-31

[MRG] num2words mention

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Cent issue: Replace the first stars:

One hundred dollars and 42/100 ***************

Error message: Let's take this MP as an opportunity to fix them

Language discrepancy: I will test later today or this week-end.

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Cent issue: Sorry I was wrong, it should be:

One hundred and 42/100 canadian dollars ********
cent dollars canadiens et 42/100 ***************

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

I updated my branches to the latest revisions.

Check is not printed with the currency of the account voucher.

When I print the check in the middle, I have the address of the supplier on the check and an error message for a missing style :

2013-06-04 02:16:32,224 14069 WARNING Check openerp.report.render.rml2pdf.trml2pdf: Warning: style not found, P26 - setting default!

When I print the check on top, I don't have the address as I get this error message and I am missing the style too:

2013-06-04 02:14:20,648 14069 WARNING Check openerp.report.render.rml2pdf.trml2pdf: Warning: style not found, P26 - setting default!

2013-06-04 02:14:20,857 14069 INFO Check werkzeug: 127.0.0.1 - - [04/Jun/2013 02:14:20] "POST /web/report HTTP/1.1" 200 -
2013-06-04 02:14:21,629 14069 INFO Check werkzeug: 127.0.0.1 - - [04/Jun/2013 02:14:21] "POST /web/dataset/search_read HTTP/1.1" 200 -
2013-06-04 02:14:38,574 14069 INFO Check werkzeug: 127.0.0.1 - - [04/Jun/2013 02:14:38] "POST /web/action/load HTTP/1.1" 200 -
2013-06-04 02:14:38,654 14069 WARNING Check openerp.osv.orm.browse_record.res.partner: Field 'address' does not exist in object 'browse_record(res.partner, 5)'
2013-06-04 02:14:38,654 14069 ERROR Check openerp.tools.safe_eval: Cannot eval " voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') "
Traceback (most recent call last):
  File "/home/max/openerp/server/7.0/openerp/tools/safe_eval.py", line 241, in safe_eval
    return eval(test_expr(expr, _SAFE_OPCODES, mode=mode), globals_dict, locals_dict)
  File "", line 1, in <module>
  File "/home/max/openerp/server/7.0/openerp/osv/orm.py", line 486, in __getattr__
    raise AttributeError(e)
AttributeError: "Field 'address' does not exist in object 'browse_record(res.partner, 5)'"
2013-06-04 02:14:38,654 14069 WARNING Check openerp.report.render.rml2pdf.utils: rml_except: " voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') "
Traceback (most recent call last):
  File "/home/max/openerp/server/7.0/openerp/report/render/rml2pdf/utils.py", line 76, in _child_get
    eval(n.get('rml_except'), {}, self.localcontext)
  File "/home/max/openerp/server/7.0/openerp/tools/safe_eval.py", line 241, in safe_eval
    return eval(test_expr(expr, _SAFE_OPCODES, mode=mode), globals_dict, locals_dict)
  File "", line 1, in <module>
  File "/home/max/openerp/server/7.0/openerp/osv/orm.py", line 486, in __getattr__
    raise AttributeError(e)
AttributeError: "Field 'address' does not exist in object 'browse_record(res.partner, 5)'"
2013-06-04 02:14:38,654 14069 ERROR Check openerp.tools.safe_eval: Cannot eval 'get_zip_line(voucher.partner_id.address[0])'
Traceback (most recent call last):
  File "/home/max/openerp/server/7.0/openerp/tools/safe_eval.py", line 241, in safe_eval
    return eval(test_expr(expr, _SAFE_OPCODES, mode=mode), globals_dict, locals_dict)
  File "", line 1, in <module>
NameError: name 'get_zip_line' is not defined
2013-06-04 02:14:38,654 14069 WARNING Check openerp.osv.orm.browse_record.res.partner: Field 'address' does not exist in object 'brows...

review: Needs Fixing

[lp:~savoirfairelinux-openerp/openerp-canada/7.0-l10n_ca_account_check_writing-print-lang]

19. By Maxime Chambreuil (http://www.savoirfairelinux.com) on 2013-06-04

[FIX] Style and address

20. By Maxime Chambreuil (http://www.savoirfairelinux.com) on 2013-06-04

[FIX] Use same style across reports

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Hard-coded currency in the last issue for this MP to be merged.

Don't give up ;)

[lp:~savoirfairelinux-openerp/openerp-canada/7.0-l10n_ca_account_check_writing-print-lang]

21. By Virgil Dupras on 2013-06-08

[ADD] res_currency_display_name

22. By Virgil Dupras on 2013-06-10

[FIX] Renamed module name to be consistent with the supplied field's new name.

23. By Virgil Dupras on 2013-06-10

[IMP] Use res_currency_print_on_check to add the currency name on printed checks.

[Virgil Dupras (hsoft)]

There's one last, possibly very tricky) problem: pluralisation. Currently, currency names are displayed in their singular form.

Not all languages handle plurarisation the same way and not all currency names are pluralised the same way.

Should we change the display name constants from singular to plural?

[Virgil Dupras (hsoft)]

About the cents thing: so the logic is different in english and in french. How should the module handle languages that are neither french or english? Use the english cents order?

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Pluralisation : Use plural by default. User will be able to change the translation to have something like "canadian dollar(s)" if he wants.

Cents: use the english order by default.

[Virgil Dupras (hsoft)]

That's the thing: we don't have the plural form right now, only the singular one. Moreover, we dont't have a mechanism to easily switch from singular to plural (or the opposite). If we have plural, then that's all we have.

Should we change values from print_in_check's XML file to plural values?

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Yes

[lp:~savoirfairelinux-openerp/openerp-canada/7.0-l10n_ca_account_check_writing-print-lang]

24. By Virgil Dupras on 2013-06-10

[IMP] Properly localize amount's currency and format depending on the supplier language

25. By Virgil Dupras on 2013-06-10

[FIX] Pluralized and de-capitalized currency names in res_currency_print_on_check.

In short, changed the names so that they match what should be printed on a check.

26. By Virgil Dupras on 2013-06-11

[FIX] Fixed a cents rounding bug in check writing.

27. By Maxime Chambreuil (http://www.savoirfairelinux.com) on 2013-06-11

[IMP] Module name

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve

=== modified file 'l10n_ca_account_check_writing/__openerp__.py'
--- l10n_ca_account_check_writing/__openerp__.py	2013-06-08 22:30:59 +0000
+++ l10n_ca_account_check_writing/__openerp__.py	2013-06-11 13:35:38 +0000
@@ -31,8 +31,11 @@
 This module provides reports to print check using the canadian format from:
 http://www.cdnpay.ca/imis15/pdf/pdfs_rules/standard_006_fr.pdf
 
+To use this module, you will need to install num2words Python library:
+https://pypi.python.org/pypi/num2words
+
     """,
-    'depends': ['account_check_writing'],
+    'depends': ['account_check_writing', 'res_currency_print_on_check'],
     'data': [
         'l10n_ca_account_check_writing_report.xml',
     ],

=== modified file 'l10n_ca_account_check_writing/account_voucher.py'
--- l10n_ca_account_check_writing/account_voucher.py	2013-05-10 14:57:50 +0000
+++ l10n_ca_account_check_writing/account_voucher.py	2013-06-11 13:35:38 +0000
@@ -20,7 +20,41 @@
 ##############################################################################
 
 from openerp.osv import orm, fields
-from openerp.tools.amount_to_text_en import amount_to_text
+from openerp.tools.translate import _
+# OpenERP's built-in routines for converting numbers to words is pretty bad, especially in French
+# This is why we use the library below. You can get it at:
+# https://pypi.python.org/pypi/num2words
+from num2words import num2words
+
+# For the words we use in custom_translation(), we have to put dummy _() calls here so that OpenERP
+# picks them up during .pot generation
+_("and")
+
+def custom_translation(s, lang):
+    # OpenERP uses the current stack frame, yes, the *stack frame* to determine which language _()
+    # should translate a string in. If we want to translate a string in another language, such as
+    # a supplier's language, we have to resort to hacks such as this one. "context" is sought after
+    # in the stackframe, so we have to set it.
+    context = {'lang': lang}
+    return _(s)
+
+def get_amount_line(amount, currency, lang):
+    try:
+        amount_in_word = num2words(int(amount), lang=lang[:2])
+    except NotImplementedError:
+        amount_in_word = num2words(int(amount))
+    currency_name = currency.print_on_check
+    cents = int(amount * 100) % 100
+    total_length = len(amount_in_word) + len(currency_name)
+    if total_length < 87:
+        stars = '*' * (87 - total_length)
+    else:
+        stars = ''
+    AND = custom_translation("and", lang)
+    amount_line_fmt = '{amount_in_word} {AND} {cents}/100 {currency_name} {stars}'
+    if lang.startswith('fr'):
+        amount_line_fmt = '{amount_in_word} {currency_name} {AND} {cents}/100 {stars}'
+    return amount_line_fmt.format(**vars())
 
 class account_voucher(orm.Model):
     _inherit = 'account.voucher'
@@ -36,11 +70,18 @@
             ttype, date, payment_rate_currency_id, company_id, context=context)
         if 'value' in default:
             amount = 'amount' in default['value'] and default['value']['amount'] or amount
-
-            #TODO : generic amount_to_text is not ready yet, otherwise language (and country) and currency can be passed
-            #amount_in_word = amount_to_text(amount, context=context)
-            amount_in_word = amount_to_text(amount, currency='Canadian Dollars')
-            default['value'].update({'amount_in_word':amount_in_word})
+            if ids:
+                supplier_lang = self.browse(cr, uid, ids[0], context=context).partner_id.lang
+            else:
+                # It's a new record and we don't have access to our supplier lang yet
+                supplier_lang = 'en_US'
+            supplier_context = context.copy()
+            # for some calls, such as the currency browse() call, we want to separate our user's
+            # language from our supplier's. That's why we need a separate context.
+            supplier_context['lang'] = supplier_lang
+            currency = self.pool.get('res.currency').browse(cr, uid, currency_id, context=supplier_context)
+            amount_line = get_amount_line(amount, currency, supplier_lang)
+            default['value'].update({'amount_in_word':amount_line})
             if journal_id:
                 allow_check_writing = self.pool.get('account.journal').browse(
                     cr, uid, journal_id, context=context).allow_check_writing
@@ -72,3 +113,28 @@
                 },
             'nodestroy': True
             }
+
+# By default, the supplier reference number is not so easily accessible from a voucher line because
+# there's no direct link between the voucher and the invoice. Fortunately, there was this recently
+# submitted patch from Lorenzo Battistini (Agile) BG at
+# https://code.launchpad.net/~elbati/account-payment/adding_account_voucher_supplier_invoice_number_7/+merge/165622
+# which solves this exact problem and I shamelessely copied that code, which works well.
+
+class voucher_line(orm.Model):
+    _inherit = 'account.voucher.line'
+    
+    def get_suppl_inv_num(self, cr, uid, move_line_id, context=None):
+        move_line = self.pool.get('account.move.line').browse(cr, uid, move_line_id, context)
+        return (move_line.invoice and move_line.invoice.supplier_invoice_number or '')
+
+    def _get_supplier_invoice_number(self, cr, uid, ids, name, args, context=None):
+        res={}
+        for line in self.browse(cr, uid, ids, context):
+            res[line.id] = ''
+            if line.move_line_id:
+                res[line.id] = self.get_suppl_inv_num(cr, uid, line.move_line_id.id, context=context)
+        return res
+    
+    _columns = {
+        'supplier_invoice_number': fields.function(_get_supplier_invoice_number, type='char', size=64, string="Supplier Invoice Number"),
+    }

=== added file 'l10n_ca_account_check_writing/i18n/fr.po'
--- l10n_ca_account_check_writing/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ l10n_ca_account_check_writing/i18n/fr.po	2013-06-11 13:35:38 +0000
@@ -0,0 +1,94 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_ca_account_check_writing
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-25 15:55+0000\n"
+"PO-Revision-Date: 2013-05-25 15:55+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_ca_account_check_writing
+#: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
+msgid "Check Amount"
+msgstr "Montant du chèque"
+
+#. module: l10n_ca_account_check_writing
+#: code:addons/l10n_ca_account_check_writing/account_voucher.py:31
+#, python-format
+msgid "and"
+msgstr "et"
+
+#. module: l10n_ca_account_check_writing
+#: report:l10n.ca.account.print.check.top:0
+msgid "Open Balance"
+msgstr "Solde ouvert"
+
+#. module: l10n_ca_account_check_writing
+#: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
+msgid "Description"
+msgstr "Description"
+
+#. module: l10n_ca_account_check_writing
+#: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
+msgid "Due Date"
+msgstr "Date"
+
+#. module: l10n_ca_account_check_writing
+#: model:ir.actions.report.xml,name:l10n_ca_account_check_writing.l10n_ca_account_print_check_middle
+msgid "Print Check CA (Middle)"
+msgstr "Imprimer chèque CA (Milieu)"
+
+#. module: l10n_ca_account_check_writing
+#: model:ir.model,name:l10n_ca_account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Justificatif comptable"
+
+#. module: l10n_ca_account_check_writing
+#: model:ir.model,name:l10n_ca_account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: l10n_ca_account_check_writing
+#: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
+msgid "Discount"
+msgstr "Remise"
+
+#. module: l10n_ca_account_check_writing
+#: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
+msgid "Original Amount"
+msgstr "Montant original"
+
+#. module: l10n_ca_account_check_writing
+#: report:l10n.ca.account.print.check.middle:0
+msgid "Date"
+msgstr "Date"
+
+#. module: l10n_ca_account_check_writing
+#: report:l10n.ca.account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Solde dû"
+
+#. module: l10n_ca_account_check_writing
+#: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
+msgid "Payment"
+msgstr "Paiement"
+
+#. module: l10n_ca_account_check_writing
+#: model:ir.actions.report.xml,name:l10n_ca_account_check_writing.l10n_ca_account_print_check_top
+msgid "Print Check CA (Top)"
+msgstr "Imprimer chèque CA (Haut)"
+

=== modified file 'l10n_ca_account_check_writing/i18n/l10n_ca_account_check_writing.pot'
--- l10n_ca_account_check_writing/i18n/l10n_ca_account_check_writing.pot	2013-04-25 21:23:42 +0000
+++ l10n_ca_account_check_writing/i18n/l10n_ca_account_check_writing.pot	2013-06-11 13:35:38 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-23 20:44+0000\n"
-"PO-Revision-Date: 2013-04-23 20:44+0000\n"
+"POT-Creation-Date: 2013-06-10 18:26+0000\n"
+"PO-Revision-Date: 2013-06-10 18:26+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,51 +17,88 @@
 
 #. module: l10n_ca_account_check_writing
 #: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
 msgid "Check Amount"
-msgstr "Check Amount"
+msgstr ""
+
+#. module: l10n_ca_account_check_writing
+#: code:addons/l10n_ca_account_check_writing/account_voucher.py:31
+#, python-format
+msgid "and"
+msgstr ""
+
+#. module: l10n_ca_account_check_writing
+#: report:l10n.ca.account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
 
 #. module: l10n_ca_account_check_writing
 #: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
 msgid "Description"
-msgstr "Description"
+msgstr ""
 
 #. module: l10n_ca_account_check_writing
 #: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
 msgid "Due Date"
-msgstr "Due Date"
+msgstr ""
 
 #. module: l10n_ca_account_check_writing
 #: model:ir.actions.report.xml,name:l10n_ca_account_check_writing.l10n_ca_account_print_check_middle
-msgid "Print Check (CA)"
-msgstr "Print Check (CA)"
+msgid "Print Check CA (Middle)"
+msgstr ""
+
+#. module: l10n_ca_account_check_writing
+#: model:ir.model,name:l10n_ca_account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: l10n_ca_account_check_writing
+#: model:ir.model,name:l10n_ca_account_check_writing.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_ca_account_check_writing
+#: model:ir.model,name:l10n_ca_account_check_writing.model_account_voucher_line
+msgid "Voucher Lines"
+msgstr ""
 
 #. module: l10n_ca_account_check_writing
 #: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
 msgid "Discount"
-msgstr "Discount"
+msgstr ""
 
 #. module: l10n_ca_account_check_writing
 #: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
 msgid "Original Amount"
-msgstr "Original Amount"
+msgstr ""
 
 #. module: l10n_ca_account_check_writing
 #: report:l10n.ca.account.print.check.middle:0
 msgid "Date"
-msgstr "Date"
+msgstr ""
 
 #. module: l10n_ca_account_check_writing
 #: report:l10n.ca.account.print.check.middle:0
 msgid "Balance Due"
-msgstr "Balance Due"
+msgstr ""
+
+#. module: l10n_ca_account_check_writing
+#: field:account.voucher.line,supplier_invoice_number:0
+msgid "Supplier Invoice Number"
+msgstr ""
 
 #. module: l10n_ca_account_check_writing
 #: report:l10n.ca.account.print.check.middle:0
+#: report:l10n.ca.account.print.check.top:0
 msgid "Payment"
-msgstr "Payment"
+msgstr ""
 
 #. module: l10n_ca_account_check_writing
-#: report:l10n.ca.account.print.check.middle:0
-msgid "$"
-msgstr "$"
+#: model:ir.actions.report.xml,name:l10n_ca_account_check_writing.l10n_ca_account_print_check_top
+msgid "Print Check CA (Top)"
+msgstr ""
 

=== modified file 'l10n_ca_account_check_writing/report/l10n_ca_check_print.py'
--- l10n_ca_account_check_writing/report/l10n_ca_check_print.py	2013-05-10 16:02:52 +0000
+++ l10n_ca_account_check_writing/report/l10n_ca_check_print.py	2013-06-11 13:35:38 +0000
@@ -32,27 +32,27 @@
         self.localcontext.update({
             'time': time,
             'get_lines': self.get_lines,
-            'fill_stars' : self.fill_stars,
         })
-    def fill_stars(self, amount):
-        #amount = amount.replace('Dollars','')
-        if len(amount) < 90:
-            stars = 100 - len(amount)
-            return ' '.join([amount,'*'*stars])
-
-        else: return amount
     
     def get_lines(self, voucher_lines):
         result = []
         self.number_lines = len(voucher_lines)
         for i in range(0, min(10,self.number_lines)):
             if i < self.number_lines:
+                voucher_line = voucher_lines[i]
+                # In general, the supplier invoice reference number is a much better description
+                # for writing checks than our own reference number, but if we don't have it, we
+                # might as well use our internal number
+                if voucher_line.supplier_invoice_number:
+                    name = voucher_line.supplier_invoice_number
+                else:
+                    name = voucher_line.name
                 res = {
-                    'date_due' : voucher_lines[i].date_due,
-                    'name' : voucher_lines[i].name,
-                    'amount_original' : voucher_lines[i].amount_original and voucher_lines[i].amount_original or False,
-                    'amount_unreconciled' : voucher_lines[i].amount_unreconciled and voucher_lines[i].amount_unreconciled or False,
-                    'amount' : voucher_lines[i].amount and voucher_lines[i].amount or False,
+                    'date_due' : voucher_line.date_due,
+                    'name' : name,
+                    'amount_original' : voucher_line.amount_original and voucher_line.amount_original or False,
+                    'amount_unreconciled' : voucher_line.amount_unreconciled and voucher_line.amount_unreconciled or False,
+                    'amount' : voucher_line.amount and voucher_line.amount or False,
                 }
             else :
                 res = {

=== modified file 'l10n_ca_account_check_writing/report/l10n_ca_check_print.sxw'
Binary files l10n_ca_account_check_writing/report/l10n_ca_check_print.sxw	2013-04-25 21:23:42 +0000 and l10n_ca_account_check_writing/report/l10n_ca_check_print.sxw	2013-06-11 13:35:38 +0000 differ
=== modified file 'l10n_ca_account_check_writing/report/l10n_ca_check_print_middle.rml'
--- l10n_ca_account_check_writing/report/l10n_ca_check_print_middle.rml	2013-04-25 21:23:42 +0000
+++ l10n_ca_account_check_writing/report/l10n_ca_check_print_middle.rml	2013-06-11 13:35:38 +0000
@@ -99,6 +99,7 @@
   </stylesheet>
   <story>
     <para style="P1">[[repeatIn(objects,'voucher')]]</para>
+    <para style="P1">[[ setLang(voucher.partner_id.lang) ]]</para>
     <blockTable colWidths="568.0" style="Table2" rowHeights="280">
       <tr>
         <td>
@@ -149,7 +150,7 @@
                 <para style="P19">[[ l['name'] ]]</para>
               </td>
               <td>
-                <para style="P19">[[formatLang( l['amount_original']) ]]</para>
+                <para style="P19">[[ formatLang( l['amount_original']) ]]</para>
               </td>
               <td>
                 <para style="P19">[[ formatLang( l['amount_due']) ]]</para>
@@ -209,7 +210,7 @@
                 <para style="P3"><font color="white"> </font></para>
 	    </td>
 	    <td>
-                <para style="P26">[[ str(fill_stars(voucher.amount_in_word)) ]]</para>
+                <para style="P9">[[ voucher.amount_in_word ]]</para>
 	    </td>
 	</tr>
     </blockTable>

=== modified file 'l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml'
--- l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml	2013-04-25 21:23:42 +0000
+++ l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml	2013-06-11 13:35:38 +0000
@@ -97,6 +97,7 @@
   </stylesheet>
   <story>
     <para style="P1">[[repeatIn(objects,'voucher')]]</para>
+    <para style="P1">[[ setLang(voucher.partner_id.lang) ]]</para>
     <blockTable colWidths="568.0"  style="Table1">
       <tr>
         <td>
@@ -142,7 +143,7 @@
           <blockTable colWidths="550.0" rowHeights="18" style="Table5">
             <tr>
               <td>
-                <para style="P9">[[ fill_stars(voucher.amount_in_word) ]]</para>
+                <para style="P9">[[ voucher.amount_in_word ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -153,9 +154,7 @@
               </td>
               <td>
                 <para style="P9">[[ voucher.partner_id.name ]] </para>
-                <para style="P15">[[ voucher.partner_id.address and voucher.partner_id.address[0] and voucher.partner_id.address[0].street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id.address[0]) ]] </para>
-                <para style="P15">[[ voucher.partner_id.address[0].country_id.name]]</para>  
+		<para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
               </td>
               <td>
                 <para/>

=== added directory 'res_currency_print_on_check'
=== added file 'res_currency_print_on_check/__init__.py'
--- res_currency_print_on_check/__init__.py	1970-01-01 00:00:00 +0000
+++ res_currency_print_on_check/__init__.py	2013-06-11 13:35:38 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.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 currency

=== added file 'res_currency_print_on_check/__openerp__.py'
--- res_currency_print_on_check/__openerp__.py	1970-01-01 00:00:00 +0000
+++ res_currency_print_on_check/__openerp__.py	2013-06-11 13:35:38 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.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/>.
+#
+##############################################################################
+
+# NOTE: The name of the supplied field was initially "display_name", but it seems that OpenERP,
+# whenever it seems "name" in the field, returns the value for "name". Well...
+
+{
+    'name': 'Display name for currencies',
+    'version': '1.0',
+    'author': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'Generic Modules/Accounting',
+    'description': """
+Supply res.currency.print_on_check
+==================================
+
+This module improves res.currency by adding the "print_on_check" field, which stores the human
+readable name of the currency (US Dollar, Euro, Canadian Dollar, etc.)
+""",
+    'depends': ['base'],
+    'data': [
+        'currency_view.xml',
+        'currency_data.xml',
+    ],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+}

=== added file 'res_currency_print_on_check/currency.py'
--- res_currency_print_on_check/currency.py	1970-01-01 00:00:00 +0000
+++ res_currency_print_on_check/currency.py	2013-06-11 13:35:38 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.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/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+
+class res_currency(orm.Model):
+    _inherit = 'res.currency'
+    _columns = {
+        'print_on_check': fields.char('Display Name', size=64, translate=True),
+    }

=== added file 'res_currency_print_on_check/currency_data.xml'
--- res_currency_print_on_check/currency_data.xml	1970-01-01 00:00:00 +0000
+++ res_currency_print_on_check/currency_data.xml	2013-06-11 13:35:38 +0000
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="base.USD" model="res.currency">
+            <field name="print_on_check">U.S. dollars</field>
+        </record>
+        
+        <record id="base.EUR" model="res.currency">
+            <field name="print_on_check">euros</field>
+        </record>
+        
+        <record id="base.GBP" model="res.currency">
+            <field name="print_on_check">U.K. pounds</field>
+        </record>
+        
+        <record id="base.CAD" model="res.currency">
+            <field name="print_on_check">canadian dollars</field>
+        </record>
+        
+        <record id="base.AUD" model="res.currency">
+            <field name="print_on_check">australian dollars</field>
+        </record>
+        
+        <record id="base.JPY" model="res.currency">
+            <field name="print_on_check">japanese yens</field>
+        </record>
+        
+        <record id="base.INR" model="res.currency">
+            <field name="print_on_check">indian rupees</field>
+        </record>
+        
+        <record id="base.NZD" model="res.currency">
+            <field name="print_on_check">New Zealand dollars</field>
+        </record>
+        
+        <record id="base.CHF" model="res.currency">
+            <field name="print_on_check">swiss francs</field>
+        </record>
+        
+        <record id="base.ZAR" model="res.currency">
+            <field name="print_on_check">south african rands</field>
+        </record>
+        
+        <record id="base.AED" model="res.currency">
+            <field name="print_on_check">U.A.E. dirhams</field>
+        </record>
+        
+        <record id="base.ANG" model="res.currency">
+            <field name="print_on_check">Neth. Antilles florins</field>
+        </record>
+        
+        <record id="base.ARS" model="res.currency">
+            <field name="print_on_check">argentine pesos</field>
+        </record>
+        
+        <record id="base.BBD" model="res.currency">
+            <field name="print_on_check">barbadian dollars</field>
+        </record>
+        
+        <record id="base.BHD" model="res.currency">
+            <field name="print_on_check">bahraini dinars</field>
+        </record>
+        
+        <record id="base.BRL" model="res.currency">
+            <field name="print_on_check">brazilian reals</field>
+        </record>
+        
+        <record id="base.BSD" model="res.currency">
+            <field name="print_on_check">bahamian dollars</field>
+        </record>
+        
+        <record id="base.CLP" model="res.currency">
+            <field name="print_on_check">chilean pesos</field>
+        </record>
+        
+        <record id="base.CNY" model="res.currency">
+            <field name="print_on_check">chinese renminbis</field>
+        </record>
+        
+        <record id="base.COP" model="res.currency">
+            <field name="print_on_check">colombian pesos</field>
+        </record>
+        
+        <record id="base.CZK" model="res.currency">
+            <field name="print_on_check">Czech Republic korunas</field>
+        </record>
+        
+        <record id="base.DKK" model="res.currency">
+            <field name="print_on_check">danish krones</field>
+        </record>
+        
+        <record id="base.EGP" model="res.currency">
+            <field name="print_on_check">egyptian pounds</field>
+        </record>
+        
+        <record id="base.FJD" model="res.currency">
+            <field name="print_on_check">Fiji dollars</field>
+        </record>
+        
+        <record id="base.GHS" model="res.currency">
+            <field name="print_on_check">ghanaian cedis</field>
+        </record>
+        
+        <record id="base.HKD" model="res.currency">
+            <field name="print_on_check">Hong Kong dollars</field>
+        </record>
+        
+        <record id="base.HNL" model="res.currency">
+            <field name="print_on_check">honduran lempiras</field>
+        </record>
+        
+        <record id="base.HRK" model="res.currency">
+            <field name="print_on_check">croatian kunas</field>
+        </record>
+        
+        <record id="base.HUF" model="res.currency">
+            <field name="print_on_check">hungarian forints</field>
+        </record>
+        
+        <record id="base.IDR" model="res.currency">
+            <field name="print_on_check">indonesian rupiahs</field>
+        </record>
+        
+        <record id="base.ILS" model="res.currency">
+            <field name="print_on_check">israeli new shekels</field>
+        </record>
+        
+        <record id="base.ISK" model="res.currency">
+            <field name="print_on_check">icelandic kronas</field>
+        </record>
+        
+        <record id="base.JMD" model="res.currency">
+            <field name="print_on_check">jamaican dollars</field>
+        </record>
+        
+        <record id="base.KRW" model="res.currency">
+            <field name="print_on_check">south korean wons</field>
+        </record>
+        
+        <record id="base.LKR" model="res.currency">
+            <field name="print_on_check">Sri Lanka rupees</field>
+        </record>
+        
+        <record id="base.LTL" model="res.currency">
+            <field name="print_on_check">lithuanian litas</field>
+        </record>
+        
+        <record id="base.LVL" model="res.currency">
+            <field name="print_on_check">latvian lats</field>
+        </record>
+        
+        <record id="base.MAD" model="res.currency">
+            <field name="print_on_check">moroccan dirhams</field>
+        </record>
+        
+        <record id="base.MMK" model="res.currency">
+            <field name="print_on_check">Myanmar kyats</field>
+        </record>
+        
+        <record id="base.MXN" model="res.currency">
+            <field name="print_on_check">mexican pesos</field>
+        </record>
+        
+        <record id="base.MYR" model="res.currency">
+            <field name="print_on_check">malaysian ringgits</field>
+        </record>
+        
+        <record id="base.MZN" model="res.currency">
+            <field name="print_on_check">mozambican meticals</field>
+        </record>
+        
+        <record id="base.NIO" model="res.currency">
+            <field name="print_on_check">nicaraguan córdobas</field>
+        </record>
+        
+        <record id="base.NOK" model="res.currency">
+            <field name="print_on_check">norwegian krones</field>
+        </record>
+        
+        <record id="base.PAB" model="res.currency">
+            <field name="print_on_check">panamanian balboas</field>
+        </record>
+        
+        <record id="base.PEN" model="res.currency">
+            <field name="print_on_check">peruvian new sols</field>
+        </record>
+        
+        <record id="base.PHP" model="res.currency">
+            <field name="print_on_check">philippine pesos</field>
+        </record>
+        
+        <record id="base.PKR" model="res.currency">
+            <field name="print_on_check">pakistan rupees</field>
+        </record>
+        
+        <record id="base.PLN" model="res.currency">
+            <field name="print_on_check">polish zlotys</field>
+        </record>
+        
+        <record id="base.RON" model="res.currency">
+            <field name="print_on_check">romanian new leus</field>
+        </record>
+        
+        <record id="base.RSD" model="res.currency">
+            <field name="print_on_check">serbian dinars</field>
+        </record>
+        
+        <record id="base.RUB" model="res.currency">
+            <field name="print_on_check">russian roubles</field>
+        </record>
+        
+        <record id="base.SAR" model="res.currency">
+            <field name="print_on_check">saudi riyals</field>
+        </record>
+        
+        <record id="base.SEK" model="res.currency">
+            <field name="print_on_check">swedish kronas</field>
+        </record>
+        
+        <record id="base.SGD" model="res.currency">
+            <field name="print_on_check">Singapore dollars</field>
+        </record>
+        
+        <record id="base.SIT" model="res.currency">
+            <field name="print_on_check">slovenian tolars</field>
+        </record>
+        
+        <record id="base.SKK" model="res.currency">
+            <field name="print_on_check">slovak korunas</field>
+        </record>
+        
+        <record id="base.THB" model="res.currency">
+            <field name="print_on_check">thai bahts</field>
+        </record>
+        
+        <record id="base.TND" model="res.currency">
+            <field name="print_on_check">tunisian dinars</field>
+        </record>
+        
+        <record id="base.TRL" model="res.currency">
+            <field name="print_on_check">turkish liras</field>
+        </record>
+        
+        <record id="base.TWD" model="res.currency">
+            <field name="print_on_check">taiwanese new dollars</field>
+        </record>
+        
+        <record id="base.UAH" model="res.currency">
+            <field name="print_on_check">ukrainian hryvnias</field>
+        </record>
+        
+        <record id="base.VEF" model="res.currency">
+            <field name="print_on_check">venezuelan bolivars fuerte</field>
+        </record>
+        
+        <record id="base.VND" model="res.currency">
+            <field name="print_on_check">vietnamese dongs</field>
+        </record>
+        
+        <record id="base.XAF" model="res.currency">
+            <field name="print_on_check">CFA francs</field>
+        </record>
+        
+        <record id="base.XCD" model="res.currency">
+            <field name="print_on_check">east caribbean dollars</field>
+        </record>
+        
+        <record id="base.XPF" model="res.currency">
+            <field name="print_on_check">CFP francs</field>
+        </record>
+        
+    </data>
+</openerp>

=== added file 'res_currency_print_on_check/currency_view.xml'
--- res_currency_print_on_check/currency_view.xml	1970-01-01 00:00:00 +0000
+++ res_currency_print_on_check/currency_view.xml	2013-06-11 13:35:38 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_currency_form" model="ir.ui.view">
+            <field name="name">res.currency.form.print_on_check</field>
+            <field name="model">res.currency</field>
+            <field name="inherit_id" ref="base.view_currency_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='rate']" position="after">
+                    <field name="print_on_check"/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'res_currency_print_on_check/i18n'
=== added file 'res_currency_print_on_check/i18n/res_currency_print_on_check.pot'
--- res_currency_print_on_check/i18n/res_currency_print_on_check.pot	1970-01-01 00:00:00 +0000
+++ res_currency_print_on_check/i18n/res_currency_print_on_check.pot	2013-06-11 13:35:38 +0000
@@ -0,0 +1,27 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* res_currency_print_on_check
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-08 16:22+0000\n"
+"PO-Revision-Date: 2013-06-08 16:22+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: res_currency_print_on_check
+#: model:ir.model,name:res_currency_print_on_check.model_res_currency
+msgid "Currency"
+msgstr "Currency"
+
+#. module: res_currency_print_on_check
+#: field:res.currency,print_on_check:0
+msgid "Display Name"
+msgstr "Display Name"
+