Merge lp:~openerp-dev/openobject-addons/6.1-opw-585231-skh into lp:openobject-addons/6.1

[Somesh Khare]

Hello Sir,

[FIX]EDI: due to the less time interval where system wait for commit of parent transaction when confirming the invoice and sending emails, created email do not have reference number into the email message and attached invoice report have state draft.

Steps:
1. Configure outgoing emails server and set the schedule Action "Email Queue Manager" from "Settings > Configuration > Scheduler >Schedule Action" for interval unit -1.
2. Now create some customers invoice eg: 10 invoice for any one customer (set opt_out=False on partner form on Sales and Purchase tab).
3. Now Select all invoices and press "Confirm Draft Invoice" action Press Confirm Invoices button.
4. Go to Settings > Configuration > Email > Message, look at the email messages, some of the emails have 'n/a' as a reference (Not all). and the attachment in these email have "Draft Invoice" in place of Invoice Reference Number.

The problem is due to the time interval which did not finished the parent transaction as a result it goes into the exception and did not set invoice reference in the new email messages. I have increased the time interval from 3 to 60 seconds.

kindly review the branch and share your views on it.

Thanks,
Somesh Khare

=== modified file 'edi/models/edi.py'
--- edi/models/edi.py	2012-08-21 21:47:08 +0000
+++ edi/models/edi.py	2013-02-28 15:18:24 +0000
@@ -459,7 +459,11 @@
             db = pooler.get_db(cr.dbname)
             local_cr = None
             try:
-                time.sleep(3) # lame workaround to wait for commit of parent transaction
+                # lame workaround to wait for commit of parent transaction
+                wait_try, wait_max_try = 0, 50
+                while not cr._Cursor__closed and wait_try < wait_max_try:
+                    time.sleep(3)
+                    wait_try += 1
                 # grab a fresh browse_record on local cursor
                 local_cr = db.cursor()
                 web_root_url = self.pool.get('ir.config_parameter').get_param(local_cr, uid, 'web.base.url')