Merge lp:~openerp-dev/openobject-server/ssi-dev-framework into lp:~openerp-dev/openobject-server/trunk-dev-framework

[ssi (Open ERP)]

hello
i have fixed some bugs and development.
https://bugs.launchpad.net/openobject-addons/+bug/668320
https://bugs.launchpad.net/openobject-addons/+bug/670050

Kindly review it.
Thanks
ssi

[lp:~openerp-dev/openobject-server/ssi-dev-framework]

2264. By ssi (Open ERP) on 2010-11-04

Merge with lp:~openerp-dev/openobject-server/trunk-dev-framework

Unmerged revisions

=== modified file 'bin/addons/base/res/partner/partner_view.xml'
--- bin/addons/base/res/partner/partner_view.xml	2010-10-17 12:17:42 +0000
+++ bin/addons/base/res/partner/partner_view.xml	2010-11-04 11:42:51 +0000
@@ -337,7 +337,7 @@
                         <field name="name" select="1"/>
                         <field name="address" select="1"/>
                         <field name="country" select="1"/>
-                        <field name="category_id" select="1"/>
+                        <field name="category_id" select="1" groups="base.group_extended"/>
                         <field name="user_id" select="1">
                             <filter string="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
                         </field>

=== modified file 'bin/addons/base/res/partner/wizard/partner_wizard_spam.py'
--- bin/addons/base/res/partner/wizard/partner_wizard_spam.py	2010-10-11 14:45:40 +0000
+++ bin/addons/base/res/partner/wizard/partner_wizard_spam.py	2010-11-04 11:42:51 +0000
@@ -22,6 +22,7 @@
 import netsvc
 import tools
 from osv import fields, osv
+import re
 
 class partner_wizard_spam(osv.osv_memory):
     """ Mass Mailing """
@@ -51,6 +52,9 @@
         event_pool = self.pool.get('res.partner.event')
         active_ids = context and context.get('active_ids', [])
         partners = partner_pool.browse(cr, uid, active_ids, context)
+        type_ = 'plain'
+        if re.search('(<(pre)|[pubi].*>)', data.text):
+            type_ = 'html'
         for partner in partners:
             for adr in partner.address:
                 if adr.email:
@@ -58,7 +62,7 @@
                     to = '%s <%s>' % (name, adr.email)
     #TODO: add some tests to check for invalid email addresses
     #CHECKME: maybe we should use res.partner/email_send
-                    tools.email_send(data.email_from, [to], data.subject, data.text,subtype='html')
+                    tools.email_send(data.email_from, [to], data.subject, data.text,subtype=type_)
                     nbr += 1
             event_pool.create(cr, uid,
                     {'name': 'Email(s) sent through mass mailing',

=== modified file 'bin/addons/base/res/res_log_view.xml'
--- bin/addons/base/res/res_log_view.xml	2010-10-17 21:47:55 +0000
+++ bin/addons/base/res/res_log_view.xml	2010-11-04 11:42:51 +0000
@@ -50,7 +50,7 @@
         </record>
 
         <record id="res_log_act_window" model="ir.actions.act_window">
-            <field name="name">Logs</field>
+           <field name="name">Client Logs</field>
             <field name="res_model">res.log</field>
             <field name="view_type">form</field>
             <field name="context">{'search_default_my': 1}</field>

=== modified file 'bin/tools/misc.py'
--- bin/tools/misc.py	2010-10-20 16:38:22 +0000
+++ bin/tools/misc.py	2010-11-04 11:42:51 +0000
@@ -38,6 +38,10 @@
 from itertools import islice
 import threading
 from which import which
+try:
+    from html2text import html2text
+except ImportError:
+    html2text = None
 
 import smtplib
 from email.MIMEText import MIMEText
@@ -532,7 +536,11 @@
     # Add dynamic X Header
     for key, value in x_headers.iteritems():
         msg['%s' % key] = str(value)
-
+        
+    if html2text and subtype == 'html':
+        text = html2text(body.decode('utf-8')).encode('utf-8')
+        msg.attach(MIMEText(text, _charset='utf-8', _subtype='plain'))
+        
     if attach:
         msg.attach(email_text)
         for (fname,fcontent) in attach: