merge

bzr revid: fp@tinyerp.com-20090915112618-uyonjcy3ap3e7ob1

addons/account/company.py

@@ -25,7 +25,7 @@ from osv import fields, osv
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
-        'overdue_msg' : fields.text('Overdue Payments Message'),
+        'overdue_msg' : fields.text('Overdue Payments Message', translate=True),
     }
 
     _defaults = {

addons/account/report/overdue.py

@@ -35,6 +35,7 @@ class Overdue(report_sxw.rml_parse):
             'adr_get' : self._adr_get,
             'getLines' : self._lines_get,
             'tel_get' : self._tel_get,
+            'message' : self._message,
         })
         self.context = context
     def _adr_get(self, partner, type):
@@ -80,7 +81,12 @@ class Overdue(report_sxw.rml_parse):
                     ('state', '<>', 'draft'), ('reconcile_id', '=', False)])
         movelines = moveline_obj.browse(self.cr, self.uid, movelines)
         return movelines
-
+        
+    def _message(self, obj, company):
+        company_pool = pooler.get_pool(self.cr.dbname).get('res.company')
+        message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg 
+        return message
+        
 report_sxw.report_sxw('report.account.overdue', 'res.partner',
         'addons/account/report/overdue.rml', parser=Overdue)
 

addons/account/report/overdue.rml

@@ -127,7 +127,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ company.overdue_msg ]]</para>
+    <para style="terp_default_9">[[ message(o, company) ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>

addons/account_followup/followup_data.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="res.company" id="base.main_company">
+            <field name="follow_up_msg">Date : %(date)s
+
+Dear %(partner_name)s,
+
+Please find in attachment a reminder of all your unpaid invoices, for a total amount due of:
+
+%(followup_amount).2f %(company_currency)s
+
+Thanks,
+--
+%(user_signature)s
+%(company_name)s</field>
+        </record>
+    </data>
+</openerp>

addons/account_followup/wizard/wizard_followup_print.py

@@ -60,8 +60,9 @@ _followup_wizard_all_form = """<?xml version="1.0"?>
         </page>
         <page string="Email Settings">
             <field name="email_conf" colspan="4"/>
+            <field name="partner_lang" colspan="4"/>
             <field name="email_subject" colspan="4"/>
-            <separator string="Email body" colspan="4"/>
+            <separator string="Email body" colspan="4" attrs="{'readonly':[('partner_lang','=',True)]}"/>
             <field name="email_body" colspan="4" nolabel="1"/>
             <separator string="Legend" colspan="4"/>
 
@@ -94,6 +95,12 @@ _followup_wizard_all_fields = {
         'size': 64,
         'default': 'Invoices Reminder'
         },
+    'partner_lang':{
+        'string': "Send Email in Partner Language",
+        'type': 'boolean',
+        'default':True,
+        'help':'Do not change message text, if you want to send email in partner language, or configre from company'
+    },
     'email_body': {
         'string': "Email body",
         'type': 'text',
@@ -156,7 +163,13 @@ class followup_all_print(wizard.interface):
                             if adr.email:
                                 dest = [adr.email]
                 src = tools.config.options['smtp_user']
-                body=data['form']['email_body']
+                if not data['form']['partner_lang']:
+                    body = data['form']['email_body']
+                else:
+                    cxt = context.copy()
+                    cxt['lang'] = partner.lang
+                    body = pool.get('res.users').browse(cr, uid, uid, context=cxt).company_id.follow_up_msg
+                    
                 total_amt = followup_data.debit - followup_data.credit
                 move_line = ''
                 subtotal_due = 0.0
@@ -257,7 +270,7 @@ class followup_all_print(wizard.interface):
                     partner_list.append(partner_id)
                 to_update[str(id)] = fups[followup_line_id][1]
         
-        message = pool.get('res.users').browse(cr, uid, uid).company_id.follow_up_msg
+        message = pool.get('res.users').browse(cr, uid, uid, context=context).company_id.follow_up_msg
         
         return {'partner_ids': partner_list, 'to_update': to_update, 'email_body':message}