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

[Josse Colpaert (OpenERP)]

In this branch the field payment_no_email was added, which makes it possible not to send emails for a certain customer when launching follow-up if a manual action was assigned.

[qdp (OpenERP) (qdp)]

as i understand, this field is used to say "i talked to this partner yesterday and he promised to pay the money at the end of the month, so in the meanwhile i should not remind him"... but if i'm right about the use of this field,
1) i think an example of use should be stated in the help tooltip
2) i wonder if it shouldn't also be excluded of paper printing, and then the usability could be improved (label would be "Exclude from followups in the meanwhile" or something alike)

also,
1) is it intended to put a second '⇾' after 'Mark Done' button?
2) can you remerge trunk in it, there are some conflicts :-s

thanks

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-followupclean-jco]

8600. By Josse Colpaert (OpenERP) on 2013-05-22

[MERGE] Merge from trunk

Unmerged revisions

8600. By Josse Colpaert (OpenERP) on 2013-05-22

[MERGE] Merge from trunk

8599. By Josse Colpaert (OpenERP) on 2013-02-25

[MERGE] Merge with trunk and resolve conflicts

8598. By Josse Colpaert (OpenERP) on 2013-02-25

[FIX] Followuptable html titles depend on language

8597. By Josse Colpaert (OpenERP) on 2013-02-08

[MERGE] Merge from trunk

8596. By Josse Colpaert (OpenERP) on 2013-02-05

[IMP] Don't pass tz in create context will remove warnings

8595. By Josse Colpaert (OpenERP) on 2013-02-06

[FIX] Tests for setting manual actions are passed in UTC

8594. By Josse Colpaert (OpenERP) on 2013-01-30

[FIX] payment_no_email has to be on res_partner not wizard partner

8593. By Josse Colpaert (OpenERP) on 2013-01-24

[IMP] Not emailed clients by payment_no_email not anymore in number of clients emailed

8592. By Josse Colpaert (OpenERP) on 2013-01-23

[MERGE] Merge from trunk

8591. By Josse Colpaert (OpenERP) on 2013-01-23

[IMP] Adding payment_no_email again for trunk

=== modified file 'account_followup/account_followup.py'
--- account_followup/account_followup.py	2013-03-14 11:27:40 +0000
+++ account_followup/account_followup.py	2013-05-22 08:22:28 +0000
@@ -208,12 +208,13 @@
         for partner in self.browse(cr, uid, partner_ids, context=ctx):
             if partner.email and partner.email.strip():
                 level = partner.latest_followup_level_id_without_lit
-                if level and level.send_email and level.email_template_id and level.email_template_id.id:
-                    mtp.send_mail(cr, uid, level.email_template_id.id, partner.id, context=ctx)
-                else:
-                    mail_template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 
-                                                    'account_followup', 'email_template_account_followup_default')
-                    mtp.send_mail(cr, uid, mail_template_id[1], partner.id, context=ctx)
+                if not partner.payment_no_email:
+                    if level and level.send_email and level.email_template_id and level.email_template_id.id:
+                        mtp.send_mail(cr, uid, level.email_template_id.id, partner.id, context=ctx)
+                    else:
+                        mail_template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 
+                                                        'account_followup', 'email_template_account_followup_default')
+                        mtp.send_mail(cr, uid, mail_template_id[1], partner.id, context=ctx)
             else:
                 unknown_mails = unknown_mails + 1
                 action_text = _("Email not sent because of email address of partner not filled in")
@@ -288,6 +289,7 @@
                     #Find partner_id of user put as responsible
                     responsible_partner_id = self.pool.get("res.users").browse(cr, uid, vals['payment_responsible_id'], context=context).partner_id.id
                     self.pool.get("mail.thread").message_post(cr, uid, 0, 
+
                                       body = _("You became responsible to do the next action for the payment follow-up of") + " <b><a href='#id=" + str(part.id) + "&view_type=form&model=res.partner'> " + part.name + " </a></b>",
                                       type = 'comment',
                                       subtype = "mail.mt_comment", context = context,
@@ -295,8 +297,9 @@
                                       partner_ids = [responsible_partner_id])
         return super(res_partner, self).write(cr, uid, ids, vals, context=context)
 
+
     def action_done(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'payment_next_action_date': False, 'payment_next_action':'', 'payment_responsible_id': False}, context=context)
+        return self.write(cr, uid, ids, {'payment_next_action_date': False, 'payment_next_action':'', 'payment_responsible_id': False, 'payment_no_email': False}, context=context) 
 
     def do_button_print(self, cr, uid, ids, context=None):
         assert(len(ids) == 1)
@@ -446,6 +449,8 @@
                                     help="This is when the manual follow-up is needed. " \
                                     "The date will be set to the current date when the partner gets a follow-up level that requires a manual action. "\
                                     "Can be practical to set manually e.g. to see if he keeps his promises."),
+        'payment_no_email':fields.boolean('Don\'t send follow-up emails meanwhile', help='When checked, the follow-up wizard will go to the next level,'\
+                                          ' print letters and set manual actions, but mails will not be sent. Follow-up will happen by doing manual actions. '), 
         'unreconciled_aml_ids':fields.one2many('account.move.line', 'partner_id', domain=['&', ('reconcile_id', '=', False), '&', 
                             ('account_id.active','=', True), '&', ('account_id.type', '=', 'receivable'), ('state', '!=', 'draft')]), 
         'latest_followup_date':fields.function(_get_latest, method=True, type='date', string="Latest Follow-up Date", 
 
=== modified file 'account_followup/account_followup_customers.xml'
--- account_followup/account_followup_customers.xml	2013-04-22 15:34:49 +0000
+++ account_followup/account_followup_customers.xml	2013-05-22 08:22:28 +0000
@@ -94,10 +94,12 @@
                             <label for="payment_next_action"/>
                             <div>
                                 <field name="payment_next_action_date" class="oe_inline"/>
-                                <button name="action_done" type="object" string="⇾ Mark as Done"
+                                <button name="action_done" type="object" string="⇾ Mark as Done ⇾"
                                      help="Click to mark the action as done." class="oe_link"
                                      attrs="{'invisible':[('payment_next_action_date','=', False)]}"
                                      groups="base.group_partner_manager"/>
+                                <field name="payment_no_email" attrs="{'invisible': [('payment_next_action_date','=', False)]}" groups="base.group_partner_manager"/>
+                                <i><label for="payment_no_email" attrs="{'invisible': [('payment_next_action_date','=', False)]}" groups="base.group_partner_manager"/></i>
                                 <field name="payment_next_action" placeholder="Action to be taken e.g. Give a phonecall, Check if it's paid, ..."/>
                             </div>
                         </group>
 
=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py	2013-04-15 10:23:49 +0000
+++ account_followup/wizard/account_followup_print.py	2013-05-22 08:22:28 +0000
@@ -155,7 +155,7 @@
                     manuals[key]= 1
                 else:
                     manuals[key] = manuals[key] + 1
-            if partner.max_followup_id.send_email:
+            if partner.max_followup_id.send_email and not partner.partner_id.payment_no_email:
                 nbunknownmails += partner_obj.do_partner_mail(cr, uid, [partner.partner_id.id], context=context)
                 nbmails += 1
             if partner.max_followup_id.send_letter:
@@ -299,6 +299,7 @@
         for partner_id, followup_line_id, date_maturity,date, id in move_lines:
             if not partner_id:
                 continue
+
             if followup_line_id not in fups:
                 continue
             stat_line_id = partner_id * 10000 + company_id
 
=== modified file 'account_followup/wizard/account_followup_print_view.xml'
--- account_followup/wizard/account_followup_print_view.xml	2013-02-11 15:13:52 +0000
+++ account_followup/wizard/account_followup_print_view.xml	2013-05-22 08:22:28 +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>