Merge lp:~webkit-utils-core-editors/webkit-utils/7.0-port_of_base_header_webkit into lp:~webkit-utils-core-editors/webkit-utils/7.0

[Nicolas Bessi - Camptocamp]

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Port of base header webkit to version 7

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

=== modified file 'base_headers_webkit/__openerp__.py'
--- base_headers_webkit/__openerp__.py	2012-12-18 14:25:12 +0000
+++ base_headers_webkit/__openerp__.py	2012-12-18 16:23:25 +0000
@@ -30,7 +30,9 @@
  'version': '1.0',
  'category': 'Reports/Webkit',
  'description': """
-  Contains data headers and css to design standard reports, used by common modules like sale_order_wekbit, purchase_order_webkit, ...
+  Contains data headers and css to design standard reports, used by common modules like:
+   - sale_order_wekbit, 
+   - purchase_order_webkit, ...
     """,
   'author': 'Camptocamp',
   'website': 'http://www.camptocamp.com',
@@ -39,6 +41,6 @@
   'update_xml': ['base_headers_data.xml'],
   'demo_xml': [],
   'test': [],
-  'installable': False,
+  'installable': True,
   'active': False,
 }

=== modified file 'base_headers_webkit/base_headers_data.xml'
--- base_headers_webkit/base_headers_data.xml	2012-12-18 14:25:12 +0000
+++ base_headers_webkit/base_headers_data.xml	2012-12-18 16:23:25 +0000
@@ -65,15 +65,15 @@
                 <td/>
             </tr>
             <tr>
-                <td >${company.partner_id.address and company.partner_id.address[0].street or ''|entity}</td>
-                <td/>
-            </tr>
-            <tr>
-                <td>Phone: ${company.partner_id.address and company.partner_id.address[0].phone or ''|entity} </td>
-                <td/>
-            </tr>
-            <tr>
-                <td>Mail: ${company.partner_id.address and company.partner_id.address[0].email or ''|entity}<br/></td>
+                <td >${company.partner_id.street or ''|entity}</td>
+                <td/>
+            </tr>
+            <tr>
+                <td>Phone: ${company.partner_id.phone or ''|entity} </td>
+                <td/>
+            </tr>
+            <tr>
+                <td>Mail: ${company.partner_id.email or ''|entity}<br/></td>
             </tr>
         </table> ${_debug or ''|n} </body>
 </html>]]>
@@ -201,7 +201,6 @@
             </field>
             <field name="name">Base Reports Portrait Header</field>
         </record>
-
 <!-- ...................................MINIMALIST.......................................... -->
 <record id="base_minimum_reports_portrait_header" model="ir.header_webkit">
             <field name="footer_html"><![CDATA[