Merge lp:~openerp-dev/openobject-addons/7.0-opw-587841-pna into lp:openobject-addons/7.0

[Pinakin Nayi (OpenERP)]

Hello Sir,

I fixed issue in account/edi.

To Reproduce:

1. Take fresh db
2. Install account module
3. Give paypal account value in paypal_account (Setting>Configuraion>Accounting)
4. Create a customer invoices without validating it and then duplicate its give traceback.

Thanks,
pna

[Csaba TOTH (tsabi)]

There will be double spaces, because you make: "%s %s %s" % X, ' Invoice ', Y
Make like 'Invoice' or "%s%s%s"!

Another thing instead of % i suggest to use format. Because format handles better the unicode differences (with % you should use u"%s %s %s" to be sure it will work in every situation).

[Naresh(OpenERP) (nch-openerp)]

Hi Pinakin,

Agree with Csaba you will have an unwanted spaces added in case of missing values.

Please update the diff !

Thanks,
Naresh Soni
OpenERP Enterprise Services

review: Needs Fixing

[Csaba TOTH (tsabi)]

I suggest:

"item_name": ' '.join([x for x in [inv.company_id.name, _('Invoice'), inv.number] if x])

[lp:~openerp-dev/openobject-addons/7.0-opw-587841-pna]

8854. By Pinakin Nayi (OpenERP) on 2013-04-03

[IMP]account: remove unwanted space

Unmerged revisions

8854. By Pinakin Nayi (OpenERP) on 2013-04-03

[IMP]account: remove unwanted space

8853. By Pinakin Nayi (OpenERP) on 2013-03-14

[FIX]account: when try to dulpicate customer invoice with paypal account its gives traceback

=== modified file 'account/edi/invoice.py'
--- account/edi/invoice.py	2012-12-17 14:43:06 +0000
+++ account/edi/invoice.py	2013-04-03 05:43:23 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 from openerp.osv import osv, fields
 from openerp.addons.edi import EDIMixin
+from openerp.tools.translate import _
 
 from urllib import urlencode
 
@@ -266,7 +267,7 @@
                 params = {
                     "cmd": "_xclick",
                     "business": inv.company_id.paypal_account,
-                    "item_name": inv.company_id.name + " Invoice " + inv.number,
+                    "item_name": ' '.join([x for x in [inv.company_id.name, _('Invoice'), inv.number] if x]),
                     "invoice": inv.number,
                     "amount": inv.residual,
                     "currency_code": inv.currency_id.name,
 
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot	2013-03-07 12:19:34 +0000
+++ account/i18n/account.pot	2013-04-03 05:43:23 +0000
@@ -59,6 +59,12 @@
 msgstr ""
 
 #. module: account
+#: code:/addons/account/edi/invoice.py:270
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
 msgstr ""