Merge lp:~openerp-dev/openobject-addons/trunk-followupimprov3-jco into lp:openobject-addons

[Josse Colpaert (OpenERP)]

Clear manual actions should return the right length of ids. (used in the message of the wizard afterwards to tell how many actions were cleared)

Unmerged revisions

8212. By Josse Colpaert (OpenERP) on 2012-12-18

[MERGE] Merge from trunk

8211. By Josse Colpaert (OpenERP) on 2012-12-18

[IMP] Correct escapes (rco)

8210. By Josse Colpaert (OpenERP) on 2012-12-18

[MERGE] Merge from trunk

8209. By Josse Colpaert (OpenERP) on 2012-12-07

[IMP] Merge from trunk

8208. By Josse Colpaert (OpenERP) on 2012-12-07

[IMP] Wizard clear action message now with correct ids

8207. By Josse Colpaert (OpenERP) on 2012-12-07

[IMP] remove one empty line

8206. By Josse Colpaert (OpenERP) on 2012-12-07

[IMP] Changing tabs -> spaces

=== modified file 'account_followup/account_followup.py'
--- account_followup/account_followup.py	2012-12-17 14:43:06 +0000
+++ account_followup/account_followup.py	2012-12-18 13:00:47 +0000
@@ -113,6 +113,67 @@
     }
 
 
+
+
+class email_template(osv.osv):
+    _inherit = 'email.template'
+
+    def _get_followup_table_html(self, cr, uid, res_id, context=None):
+        ''' 
+        Build the html tables to be included in emails send to partners, when reminding them their
+        overdue invoices.
+
+        :param res_id: ID of the partner for whom we are building the tables
+        :rtype: string
+        '''
+        from report import account_followup_print
+        partner = self.pool.get('res.partner').browse(cr, uid, res_id, context=context)
+        followup_table = ''
+        if partner.unreconciled_aml_ids: 
+            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+            current_date = fields.date.context_today(cr, uid, context)
+            rml_parse = account_followup_print.report_rappel(cr, uid, "followup_rml_parser")
+            final_res = rml_parse._lines_get_with_partner(partner, company.id)
+
+            for currency_dict in final_res:
+                currency = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id']
+                followup_table += '''
+                <table border="2" width=100%%>
+                <tr>
+                    <td>Invoice date</td>
+                    <td>Reference</td>
+                    <td>Due date</td>
+                    <td>Amount (%s)</td>
+                    <td>Lit.</td>
+                </tr>
+                ''' % (currency.symbol)
+                total = 0
+                for aml in currency_dict['line']:
+                    block = aml['blocked'] and 'X' or ' '
+                    total += aml['balance']
+                    strbegin = "<TD>"
+                    strend = "</TD>"
+                    date = aml['date_maturity'] or aml['date']
+                    if date <= current_date and aml['balance'] > 0:
+                        strbegin = "<TD><B>"
+                        strend = "</B></TD>"
+                    followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
+                total = rml_parse.formatLang(total, dp='Account', currency_obj=currency)
+                followup_table += '''<tr> </tr>
+                                </table>
+                                <center>Amount due: %s </center>''' % (total)
+        return followup_table
+
+
+    def render_template(self, cr, uid, template, model, res_id, context=None):
+        if model == 'res.partner' and context.get('followup'):
+            context['followup_table'] = self._get_followup_table_html(cr, uid, res_id, context=context)
+            # Adds current_date to the context. That way it can be used to put
+            # the account move lines in bold that are overdue in the email
+            context['current_date'] = fields.date.context_today(cr, uid, context)
+        return super(email_template, self).render_template(cr, uid, template, model, res_id, context=context)
+
+
 class res_partner(osv.osv):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=None, context=None, toolbar=False, submenu=False):
@@ -308,7 +369,7 @@
             for aml in partner.unreconciled_aml_ids:
                 if (aml.company_id == company):
                     date_maturity = aml.date_maturity or aml.date
-                    if not worst_due_date or date_maturity < worst_due_date:
+                    if not worst_due_date or worst_due_date > date_maturity:
                         worst_due_date = date_maturity
                     amount_due += aml.result
                     if (date_maturity <= current_date):

=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py	2012-12-10 11:16:54 +0000
+++ account_followup/wizard/account_followup_print.py	2012-12-18 13:00:47 +0000
@@ -195,16 +195,17 @@
         # Partnerlist is list to exclude
         # Will clear the actions of partners that have no due payments anymore
         partner_list_ids = [partner.partner_id.id for partner in self.pool.get('account_followup.stat.by.partner').browse(cr, uid, partner_list, context=context)]
-        ids = self.pool.get('res.partner').search(cr, uid, ['&', ('id', 'not in', partner_list_ids), '|', 
-                                                             ('payment_responsible_id', '!=', False), 
+
+        ids = self.pool.get('res.partner').search(cr, uid, [ '&', ('id', 'not in', partner_list_ids), '|', 
+                                                             ('payment_responsible_id', '!=', False), '|', '&', 
+                                                             ('payment_next_action', '!=', False), ('payment_next_action', '!=', ''), 
                                                              ('payment_next_action_date', '!=', False)], context=context)
-
         partners_to_clear = []
         for part in self.pool.get('res.partner').browse(cr, uid, ids, context=context): 
             if not part.unreconciled_aml_ids: 
                 partners_to_clear.append(part.id)
         self.pool.get('res.partner').action_done(cr, uid, partners_to_clear, context=context)
-        return len(ids)
+        return len(partners_to_clear)
 
     def do_process(self, cr, uid, ids, context=None):
         if context is None:
@@ -296,7 +297,7 @@
 
         partner_list = []
         to_update = {}
-        
+
         #Fill dictionary of accountmovelines to_update with the partners that need to be updated
         for partner_id, followup_line_id, date_maturity,date, id in move_lines:
             if not partner_id:

=== modified file 'account_followup/wizard/account_followup_print_view.xml'
--- account_followup/wizard/account_followup_print_view.xml	2012-12-06 16:40:06 +0000
+++ account_followup/wizard/account_followup_print_view.xml	2012-12-18 13:00:47 +0000
@@ -11,7 +11,7 @@
                     <field name="followup_id" groups="base.group_multi_company"/>
                     <field name="date" groups="base.group_no_one"/>
                 </group>
-                	<p class ="oe_grey">
+                    <p class ="oe_grey">
                         This action will send follow-up emails, print the letters and
                         set the manual actions per customer, according to the follow-up levels defined. 
                     </p>