[MERGE]: Merge with latest trunk

bzr revid: rpa@tinyerp.com-20111102052827-0bctjrhb4amyg6pl

16 files changed, 42 insertions, 37 deletions

diff --git a/addons/project_issue/i18n/ca.po b/addons/project_issue/i18n/ca.po
index 46006f179ee..5d603523042 100644
--- a/addons/project_issue/i18n/ca.po
+++ b/addons/project_issue/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/de.po b/addons/project_issue/i18n/de.po
index bfbd9aa5fc6..6ae6a47e928 100644
--- a/addons/project_issue/i18n/de.po
+++ b/addons/project_issue/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index 9e1c1c6f704..f0a4b47312b 100644
--- a/addons/project_issue/i18n/es.po
+++ b/addons/project_issue/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/fi.po b/addons/project_issue/i18n/fi.po
index 2bf3d8e142e..e05f51d455d 100644
--- a/addons/project_issue/i18n/fi.po
+++ b/addons/project_issue/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/fr.po b/addons/project_issue/i18n/fr.po
index c40683b38d4..304e340320c 100644
--- a/addons/project_issue/i18n/fr.po
+++ b/addons/project_issue/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/hu.po b/addons/project_issue/i18n/hu.po
index 696c7bc6885..c42ea04a1a3 100644
--- a/addons/project_issue/i18n/hu.po
+++ b/addons/project_issue/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/it.po b/addons/project_issue/i18n/it.po
index 7351f4f0f52..a11dc5fb05f 100644
--- a/addons/project_issue/i18n/it.po
+++ b/addons/project_issue/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/lv.po b/addons/project_issue/i18n/lv.po
index 6b342ff1a32..606e655e976 100644
--- a/addons/project_issue/i18n/lv.po
+++ b/addons/project_issue/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/nb.po b/addons/project_issue/i18n/nb.po
index 1209d83299a..347644a2ce6 100644
--- a/addons/project_issue/i18n/nb.po
+++ b/addons/project_issue/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/nl.po b/addons/project_issue/i18n/nl.po
index d166f62b1d5..257d3b0cc7c 100644
--- a/addons/project_issue/i18n/nl.po
+++ b/addons/project_issue/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/pl.po b/addons/project_issue/i18n/pl.po
index cbc1a07fc87..3f8e71bcb73 100644
--- a/addons/project_issue/i18n/pl.po
+++ b/addons/project_issue/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/pt.po b/addons/project_issue/i18n/pt.po
index 1eab923360d..f80f6effbed 100644
--- a/addons/project_issue/i18n/pt.po
+++ b/addons/project_issue/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/pt_BR.po b/addons/project_issue/i18n/pt_BR.po
index 55655745f4a..f18e3c9f6a6 100644
--- a/addons/project_issue/i18n/pt_BR.po
+++ b/addons/project_issue/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/i18n/zh_CN.po b/addons/project_issue/i18n/zh_CN.po
index 3a5a7edb653..22a6ea26519 100644
--- a/addons/project_issue/i18n/zh_CN.po
+++ b/addons/project_issue/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:45+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index e94349e028f..228a899a640 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -92,8 +92,8 @@ class project_issue(crm.crm_case, osv.osv):
 
         res = {}
         for issue in self.browse(cr, uid, ids, context=context):
+            res[issue.id] = {}
             for field in fields:
-                res[issue.id] = {}
                 duration = 0
                 ans = False
                 hours = 0
@@ -226,7 +226,8 @@ class project_issue(crm.crm_case, osv.osv):
                                 multi='compute_day', type="float", store=True),
         'inactivity_days': fields.function(_compute_day, string='Days since last action', \
                                 multi='compute_day', type="integer", help="Difference in days between last action and current date"),
-         'color': fields.integer('Color Index'),
+        'color': fields.integer('Color Index'),
+        'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
         'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 916c67b15d4..c6d852cfde0 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -188,7 +188,7 @@
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id" widget="selection"/>
                     <field name="user_id"/>
-                    <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
+                    <field name="progress" widget="progressbar"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -261,15 +261,19 @@
         </record>
 
 
-	<!-- Project Issue Karban View-->
+    <!-- Project Issue Karban View-->
 
-	<record model="ir.ui.view" id="project_issue_kanban_view">
+    <record model="ir.ui.view" id="project_issue_kanban_view">
         <field name="name">Project Issue Kanban</field>
         <field name="model">project.issue</field>
         <field name="type">kanban</field>
         <field name="arch" type="xml">
             <kanban default_group_by="type_id">
-		<templates>
+                <field name="color"/>
+                <field name="state"/>
+                <field name="priority"/>
+                <field name="user_email"/>
+                <templates>
                     <t t-name="kanban-box">
                         <t t-set="color" t-value="kanban_color(record.color.raw_value || record.state.raw_value)"/>
                         <div t-att-class="color + (record.priority.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
@@ -283,7 +287,7 @@
                                                 <field name="name"/>
                                             </td>
                                             <td valign="top" width="22">
-                                                <img t-att-src="kanban_gravatar(record.user_id.value, 22)" class="oe_kanban_gravatar"/>
+                                                <img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar"/>
                                             </td>
                                         </tr>
                                     </table>
@@ -315,11 +319,11 @@
                                         <a string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
                                         <a string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action"/>
                                         <a string="Escalate" name="case_escalate"  icon="gtk-go-up" type="object"/>
-					<a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/> 
+                                        <a string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"/>
                                     </div>
                                     <div class="oe_kanban_right">
                                         <a name="case_open" string="Open" states="draft,pending" type="object" icon="lead-stage-won" />
-                                       	<a name="case_pending" string="Pending" states="draft,open" type="object" icon="lead-stage-pending"/>
+                                        <a name="case_pending" string="Pending" states="draft,open" type="object" icon="lead-stage-pending"/>
                                         <a name="case_close" string="Close" states="open,draft,pending" type="object" icon="lead-stage-lost"/>
                                     </div>
                                     <br class="oe_kanban_clear"/>