From 904b7b99fc097acb1caaeeeb55538c9215638daa Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 25 Oct 2011 16:13:28 +0200
Subject: [PATCH] [FIX] Fixed product kanban view

bzr revid: fme@openerp.com-20111025141328-dl3w7wg05spblo9i
---
 addons/product/product_view.xml | 34 ++++++++++++++-------------------
 addons/stock/product_view.xml   | 34 ++++++++++++++-------------------
 2 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 254a75fdcdc..7600eb93c87 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -202,39 +202,33 @@
             <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="type">
+                    <field name="color"/>
+                    <field name="type"/>
+                    <field name="product_image"/>
+                    <field name="list_price"/>
                     <templates>
                         <t t-name="kanban-box">
                             <t t-set="color" t-value="kanban_color(record.color.raw_value || record.type.raw_value)"/>
                             <div t-att-class="color + (record.color.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
                                 <div class="oe_kanban_box oe_kanban_color_border">
-                                    <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
-                                        <tr>
-                                            <td class="oe_kanban_title1" align="left" valign="middle">
-                                                <t t-if="record.default_code.raw_value">[<field name="default_code"/>]</t>
-                                                <field name="name"/>
-                                            </td>
-                                            <td align="right" valign="top" width="22">
-                                                <img t-att-src="kanban_gravatar(record.product_manager.raw_value, 22)" class="oe_kanban_gravatar"/>
-                                            </td>
-                                        </tr>
-                                    </table>
+                                    <div class="oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle oe_kanban_title1">
+                                        <field name="name"/>
+                                    </div>
                                     <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
                                         <table class="oe_kanban_table">
                                             <tr>
-                                                <td valign="top" width="22">
-                                                    <t t-if="record.product_image.raw_value">
-                                                        <img t-att-src="'data:image/png;base64,'+record.product_image.raw_value" width='48' height='48'/>
-                                                    </t>
-                                                    <t t-if="!record.product_image.raw_value">
-                                                        <img src="/web/static/src/img/product_default.png"/>
-                                                    </t> 
+                                                <td valign="top" width="48">
+                                                    <img t-att-src="kanban_image('product.product', 'product_image', record.id.value)" width="48"/>
                                                 </td>
                                                 <td>
                                                     <div class="oe_kanban_title2">
                                                         <t t-if="record.type.raw_value=='service'">No Stock</t>
                                                         <t t-if="record.type.raw_value!='service'">
                                                             <div><field name="qty_available"/> On Hand , <field name="virtual_available"/> Available</div>
-                                                            <div><t t-if="record.list_price.raw_value!=0">Public Price : <field name="lst_price"/> ,</t> Cost : <field name="standard_price"/></div>
+                                                            <div>
+                                                                <t t-if="record.list_price.raw_value!=0">Public Price : <field name="lst_price"/> ,</t>
+                                                                Cost : <field name="standard_price"/>
+                                                            </div>
                                                         </t>
                                                     </div>
                                                 </td>
@@ -255,7 +249,7 @@
                 </kanban>
             </field>
         </record>
-        
+
         <record id="product_normal_action" model="ir.actions.act_window">
             <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 39d155b57d4..4205efd3efa 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -127,39 +127,33 @@
             <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="type">
+                    <field name="color"/>
+                    <field name="type"/>
+                    <field name="product_image"/>
+                    <field name="list_price"/>
                     <templates>
                         <t t-name="kanban-box">
                             <t t-set="color" t-value="kanban_color(record.color.raw_value || record.type.raw_value)"/>
                             <div t-att-class="color + (record.color.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
                                 <div class="oe_kanban_box oe_kanban_color_border">
-                                    <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
-                                        <tr>
-                                            <td class="oe_kanban_title1" align="left" valign="middle">
-                                                <t t-if="record.default_code.raw_value">[<field name="default_code"/>]</t>
-                                                <field name="name"/>
-                                            </td>
-                                            <td align="right" valign="top" width="22">
-                                                <img t-att-src="kanban_gravatar(record.product_manager.raw_value, 22)" class="oe_kanban_gravatar"/>
-                                            </td>
-                                        </tr>
-                                    </table>
+                                    <div class="oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle oe_kanban_title1">
+                                        <field name="name"/>
+                                    </div>
                                     <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
                                         <table class="oe_kanban_table">
                                             <tr>
-                                                <td valign="top" width="22">
-                                                    <t t-if="record.product_image.raw_value">
-                                                        <img t-att-src="'data:image/png;base64,'+record.product_image.raw_value" width='48' height='48'/>
-                                                    </t>
-                                                    <t t-if="!record.product_image.raw_value">
-                                                        <img src="/web/static/src/img/product_default.png"/>
-                                                    </t> 
+                                                <td valign="top" width="48">
+                                                    <img t-att-src="kanban_image('product.product', 'product_image', record.id.value)" width="48"/>
                                                 </td>
                                                 <td>
                                                     <div class="oe_kanban_title2">
                                                         <t t-if="record.type.raw_value=='service'">No Stock</t>
                                                         <t t-if="record.type.raw_value!='service'">
                                                             <div><field name="qty_available"/> On Hand , <field name="virtual_available"/> Available</div>
-                                                            <div><t t-if="record.list_price.raw_value!=0">Public Price : <field name="lst_price"/> ,</t> Cost : <field name="standard_price"/></div>
+                                                            <div>
+                                                                <t t-if="record.list_price.raw_value!=0">Public Price : <field name="lst_price"/> ,</t>
+                                                                Cost : <field name="standard_price"/>
+                                                            </div>
                                                         </t>
                                                     </div>
                                                 </td>
@@ -170,7 +164,7 @@
                                         <div class="oe_kanban_left">
                                             <a string="Edit" icon="gtk-edit" type="edit"/>
                                             <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                            <a string="Update Stock" name="%(stock.action_view_change_product_quantity)d" icon="gtk-execute" type="action"/> 
+                                            <a string="Update Stock" name="%(stock.action_view_change_product_quantity)d" icon="gtk-execute" type="action"/>
                                          </div>
                                         <br class="oe_kanban_clear"/>
                                     </div>