merge from trunk

bzr revid: mit@openerp.com-20120831131118-6i2vljv4pdqb7iqo

diff --cc openerp/addons/base/module/module_view.xml
Simple merge

diff --cc openerp/addons/base/res/res_partner_view.xml
index 43a37d1,7e70e68..92a264f
--- 1/openerp/addons/base/res/res_partner_view.xml
--- 2/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@@ -176,8 -176,8 +176,8 @@@
                                              <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')" style="position: relative">
                                                  <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                  <div class="oe_module_vignette">
 -                                                <a type="open">
 +                                                <a type="edit">
-                                                     <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_smallbox"/>
+                                                     <img t-att-src="kanban_image('res.partner', 'image', record.id.value, {'preview_image': 'image_small'})" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                  </a>
                                                      <div class="oe_module_desc">
                                                          <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">

diff --cc setup.py
index 6e1adad,a26b74e..77a59d5
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -87,18 -87,15 +87,15 @@@ setuptools.setup
        scripts          = ['openerp-server'],
        data_files       = data(),
        packages         = setuptools.find_packages(),
+       dependency_links = ['http://download.gna.org/pychart/'],
        #include_package_data = True,
        install_requires = [
-         # TODO the pychart package we include in openerp corresponds to PyChart 1.37.
-         # It seems there is a single difference, which is a spurious print in generate_docs.py.
-         # It is probably safe to move to PyChart 1.39 (the latest one).
-         # (Let setup.py choose the latest one, and we should check we can remove pychart from
-         # our tree.) http://download.gna.org/pychart/
-         # TODO  'pychart',
+           'pychart',
            'babel',
+           'docutils',
            'feedparser',
            'gdata',
 -          'lxml < 3',
 +          'lxml',
            'mako',
            'psycopg2',
            'pydot',