Merge lp:~openerp-dev/openobject-addons/6.1-opw-578235-rgo into lp:openobject-addons/6.1

[Ravi Gohil (OpenERP)]

Hello,

Reminding mail sent to partners for account followup do not have .pdf in as attachment, This MP contains fix for this issue. Kindly review the fix.

Thanks.

[lp:~openerp-dev/openobject-addons/6.1-opw-578235-rgo]

6953. By Quentin (OpenERP) <email address hidden> on 2012-08-20

[FIX] account_voucher: supplier payment, accounting entry generation

6954. By Xavier ALT on 2012-08-20

[MERGE] OPW 576484: account: fix invoice residual, avoid adding multiple times residual for same partial reconcile

6955. By Xavier ALT on 2012-08-20

[MERGE] OPW 577014: email_template: for not force mass_mail in mail.compose.message wizard, if user is working on a single resource

6956. By Xavier ALT on 2012-08-20

[MERGE] OPW 576491: edi + email_template: correctly generate edi_web_view_url when sending email from mail.compose.message wizard

 * edi: improve generation/usage of edi_web_url_view for template rendering

   - wrap edi_web_url_view generation to _edi_get_object_web_url_view() method.
   - automatically add 'edi_web_url_view' to all email.template rendering context

   - introduce LazyEdiWebUrlViewGetter class, to allow resolving record wihtin
     template rendering context - only when necessary. This to prevent generating
     unrequested edi_web_url_view links

 * mail & email_template: allow to modify render_template context

   - add _prepare_render_template_context() method to allow modifying context
     before rendering template.

6957. By Quentin (OpenERP) <email address hidden> on 2012-08-21

[MERGE] fixes in account_voucher

6958. By Xavier ALT on 2012-08-21

[FIX] OPW 577963: ir_attachment: speed up ir.attachment search for large databases

6959. By Olivier Dony (Odoo) on 2012-08-22

[FIX] document: complete previous fix, restore sort order after filtering

6960. By Xavier ALT on 2012-08-22

[MERGE] BUG 1039664: edi: fix wrong cursor when generating edi_web_url_view

  regression from revid: <email address hidden>

6961. By Xavier ALT on 2012-08-27

[MERGE] OPW 577140: stock: use float_compare() to check if initial and provided quantity equals - based on UoM rounding

6962. By Olivier Dony (Odoo) on 2012-08-27

[MERGE] OPW 576610: always reuse printed invoice instead of regenerating

Backport of trunk fix r.7215
revid:<email address hidden>

6963. By Xavier ALT on 2012-08-28

[MERGE] OPW 267641: crm/crm_action_rule: mail action are not sent to both action and current watchers

6964. By Launchpad Translations on behalf of openerp on 2012-08-28

Launchpad automatic translations update.

6965. By Quentin (OpenERP) <email address hidden> on 2012-08-28

[MERGE] staging branch with fixes

6966. By Xavier ALT on 2012-08-28

[MERGE] OPW 574251: account_voucher: voucher on bank statement, have to use period and date from bank statement / bank statement line - not today

6967. By Launchpad Translations on behalf of openerp on 2012-08-29

Launchpad automatic translations update.

6968. By Launchpad Translations on behalf of openerp on 2012-08-30

Launchpad automatic translations update.

6969. By Launchpad Translations on behalf of openerp on 2012-08-31

Launchpad automatic translations update.

6970. By Ravi Gohil (OpenERP) on 2012-08-31

[FIX] account_followup: mail sent using followup wizard do not have pdf attached: (Maintenance Case : 578235)

Unmerged revisions

6970. By Ravi Gohil (OpenERP) on 2012-08-31

[FIX] account_followup: mail sent using followup wizard do not have pdf attached: (Maintenance Case : 578235)

=== modified file 'account_followup/i18n/account_followup.pot'
--- account_followup/i18n/account_followup.pot	2012-02-08 01:08:30 +0000
+++ account_followup/i18n/account_followup.pot	2012-08-31 13:04:28 +0000
@@ -332,6 +332,12 @@
 msgstr ""
 
 #. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:303
+#, python-format
+msgid "Followup-"
+msgstr ""
+
+#. module: account_followup
 #: help:account.followup.print,date:0
 msgid "This field allow you to select a forecast date to plan your follow-ups"
 msgstr ""

=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py	2012-02-13 16:03:19 +0000
+++ account_followup/wizard/account_followup_print.py	2012-08-31 13:04:28 +0000
@@ -25,6 +25,8 @@
 import tools
 from osv import fields, osv
 from tools.translate import _
+import base64
+import netsvc
 
 class account_followup_print(osv.osv_memory):
     _name = 'account.followup.print'
@@ -227,7 +229,16 @@
             msg_sent = ''
             msg_unsent = ''
             data_user = user_obj.browse(cr, uid, uid, context=context)
-            for partner in self.pool.get('res.partner').browse(cr, uid, partners, context=context):
+            line_ids = line_obj.search(cr,uid,[('partner_id', 'in', partners)])
+            partners = []
+            dict_lines = {}
+            for line in line_obj.browse(cr, uid, line_ids, context=context):
+                if line.partner_id.id not in dict_lines.keys():
+                    partners.append(line.partner_id)
+                    dict_lines[line.partner_id.id] = [line]
+                else:
+                    dict_lines[line.partner_id.id].append(line)
+            for partner in partners:
                 ids_lines = move_obj.search(cr,uid,[('partner_id','=',partner.id),('reconcile_id','=',False),('account_id.type','in',['receivable']),('company_id','=',context.get('company_id', False))])
                 data_lines = move_obj.browse(cr, uid, ids_lines, context=context)
                 total_amt = 0.0
@@ -282,7 +293,17 @@
                 msg = ''
                 if dest:
                     try:
-                        mail_message.schedule_with_attach(cr, uid, src, dest, sub, body, context=context)
+                        company_id = context.get('company_id')
+                        data_dict = {'form':{'partner_ids':[partner.id * 10000 + company_id], 'date': time.strftime('%Y-%m-%d'), 'followup_id': context.get('followup_id')}}
+                        ctx = context.copy()
+                        ctx['lang'] = partner.lang or ctx.get('lang')
+                        datax,frmt = netsvc.LocalService('report.account_followup.followup.print').create(cr, uid, [], data_dict, ctx)
+                        params = {
+                            'datas': base64.encodestring( datax ),
+                            'datas_fname': _('Followup-') + str(partner.name) + '.' + frmt,
+                        }
+                        attach = dict(map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), [params]))
+                        mail_message.schedule_with_attach(cr, uid, src, dest, sub, body, attachments=attach, context=context)
                         msg_sent += partner.name + '\n'
                     except Exception, e:
                         raise osv.except_osv('Error !', e )