[MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20110915113201-fgbs2d2qr45ljmsg

22 files changed, 142 insertions, 457 deletions

diff --git a/addons/project_issue/__init__.py b/addons/project_issue/__init__.py
index 21efa34f6f4..f519698a60c 100644
--- a/addons/project_issue/__init__.py
+++ b/addons/project_issue/__init__.py
@@ -22,6 +22,5 @@
 
 import project_issue
 import report
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 3b6a6bcd0a3..cfe285134a7 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -123,7 +123,7 @@
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','not in',('cancel','done')),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+            <field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
          <record id="view_my_open_project_issue_graph" model="ir.ui.view">
@@ -142,7 +142,7 @@
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form,</field>
-            <field name="domain">[('state','=','open'),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+            <field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
            <field name="view_id" ref="view_my_open_project_issue_graph"/>
         </record>
        <record id="board_my_project_issue_form" model="ir.ui.view">
diff --git a/addons/project_issue/i18n/ca.po b/addons/project_issue/i18n/ca.po
index d075394e764..46006f179ee 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-08-23 05:05+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
+"X-Generator: Launchpad (build 13830)\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 0d8ec770e50..bfbd9aa5fc6 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-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -222,7 +222,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (Kopie)"
@@ -243,6 +243,8 @@ msgid "Convert To Task"
 msgstr "Erzeuge Aufgabe"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Statistik Probleme"
@@ -995,155 +997,5 @@ msgstr "Dauer"
 msgid "My Open Issues by Creation Date"
 msgstr "Meine offenen Probleme nach Erstelldatum"
 
-#~ msgid "Severity"
-#~ msgstr "Schwere"
-
-#, python-format
-#~ msgid "is Open."
-#~ msgstr "ist Offen."
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Tage    "
-
-#, python-format
-#~ msgid "An Issue created"
-#~ msgstr "Ein Problem erfasst"
-
-#~ msgid "365 Days"
-#~ msgstr "365 Tage"
-
-#~ msgid "Fixed"
-#~ msgstr "Behoben"
-
-#~ msgid "Close Date"
-#~ msgstr "Datum Beendigung"
-
-#~ msgid "Version 4.4"
-#~ msgstr "Version 4.4"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafte Modellbezeichnung für diese Aktion."
-
-#~ msgid "Section"
-#~ msgstr "Sektion"
-
-#~ msgid "%Done"
-#~ msgstr "%Erledigt"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#~ msgid "Avg. Answers"
-#~ msgstr "Durch. Antw."
-
-#~ msgid "Won't fix"
-#~ msgstr "Kein Fehler"
-
-#~ msgid "%Cancel"
-#~ msgstr "%Abbrechen"
-
-#~ msgid "Communication history"
-#~ msgstr "Historie Kommunikation"
-
-#~ msgid "Salesman"
-#~ msgstr "Verkäufer"
-
-#~ msgid "Issue Stages"
-#~ msgstr "Problem Stufen"
-
-#~ msgid "Version 4.2"
-#~ msgstr "Version 4.2"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erzeugen."
-
-#~ msgid "Works For Me"
-#~ msgstr "Problem n. reproduzierbar"
-
-#~ msgid "7 Days"
-#~ msgstr "7 Tage"
-
-#, python-format
-#~ msgid "Issue "
-#~ msgstr "Problem "
-
-#~ msgid "30 Days"
-#~ msgstr "30 Tage"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Warte a. Rückmeldung"
-
-#~ msgid "Stages"
-#~ msgstr "Stufen"
-
-#, python-format
-#~ msgid "from Mailgate."
-#~ msgstr "von Mailgateway"
-
-#~ msgid "   Today   "
-#~ msgstr "   Heute   "
-
-#~ msgid "Accepted as Bug"
-#~ msgstr "Akzeptiert als Fehler"
-
-#~ msgid "Assignee"
-#~ msgstr "Bearbeiter"
-
-#~ msgid "In Progress"
-#~ msgstr "In Bearbeitung"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Object Bezeichnung muss mit x_ beginnen und darf kein Sonderzeichen "
-#~ "haben !"
-
-#~ msgid "Working Time"
-#~ msgstr "Arbeitszeit"
-
-#~ msgid "Invalid"
-#~ msgstr "Fehlerhaft"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "Tabelle der Arbeitszeit als Einstellung für das Gantt Diagramm"
-
-#~ msgid "Emails"
-#~ msgstr "Emails"
-
-#~ msgid "Name"
-#~ msgstr "Bezeichnung"
-
-#, python-format
-#~ msgid "is Closed."
-#~ msgstr "ist Beendet"
-
-#~ msgid "Todo"
-#~ msgstr "Offen"
-
-#~ msgid ""
-#~ "Issues such as system bugs, client complains, material breakdowns are "
-#~ "collected here. You can define the stages assigned to the resolution of the "
-#~ "issue on the project. (analysis, development, done) Using the mailgateway "
-#~ "module, the issues can be integrated to an email address (example: "
-#~ "support@mycompany.com)"
-#~ msgstr ""
-#~ "Probleme wie Softwarefehler, Beschwerden von Kunden, Materialfehler können "
-#~ "hier zentral gesammelt werden. Sie können Bearbeitungsschritte für die "
-#~ "Bearbeitung der Vorgänge zuweisen (Problemanalyse, Entwicklung, Abschluss "
-#~ "des Vorgangs). Über das Mailgateway, können Sie Probleme fest mit einer "
-#~ "Emailadresse verbinden (z.B. support@mycompany.com)."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
-
 #~ msgid "Maintenance"
 #~ msgstr "Wartung"
-
-#~ msgid "The name of the group must be unique !"
-#~ msgstr "Die Bezeichnung der Gruppe sollte eindeutig sein !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index 6dfdfd02a06..9e1c1c6f704 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-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -223,7 +223,7 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -244,6 +244,8 @@ msgid "Convert To Task"
 msgstr "Convertir a tarea"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Análisis de incidencias"
@@ -995,5 +997,5 @@ msgstr "Duración"
 msgid "My Open Issues by Creation Date"
 msgstr "Mis incidencias abiertas por fecha de creación"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre del modelo no válido en la definición de la acción."
+#~ msgid "Maintenance"
+#~ msgstr "Mantenimiento"
diff --git a/addons/project_issue/i18n/fi.po b/addons/project_issue/i18n/fi.po
index 800ed99793a..2bf3d8e142e 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-07-20 04:37+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
+"X-Generator: Launchpad (build 13830)\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 545ce59fc3f..c40683b38d4 100644
--- a/addons/project_issue/i18n/fr.po
+++ b/addons/project_issue/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-01-18 16:44+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -223,7 +223,7 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (copie)"
@@ -244,6 +244,8 @@ msgid "Convert To Task"
 msgstr "Convertir en tâche"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Analyse des incidents"
diff --git a/addons/project_issue/i18n/hu.po b/addons/project_issue/i18n/hu.po
index cfa80fa62df..696c7bc6885 100644
--- a/addons/project_issue/i18n/hu.po
+++ b/addons/project_issue/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
 "PO-Revision-Date: 2011-02-07 12:14+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.hu>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -213,7 +214,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (másolat)"
@@ -234,6 +235,8 @@ msgid "Convert To Task"
 msgstr ""
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr ""
diff --git a/addons/project_issue/i18n/it.po b/addons/project_issue/i18n/it.po
index 712ef54f301..7351f4f0f52 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-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -214,7 +214,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (copia)"
@@ -235,6 +235,8 @@ msgid "Convert To Task"
 msgstr "Converti ad attività"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Analisi problematiche"
@@ -366,7 +368,7 @@ msgstr "Stadio"
 #. module: project_issue
 #: view:project.issue:0
 msgid "History Information"
-msgstr ""
+msgstr "Storico Informazioni"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
@@ -377,7 +379,7 @@ msgstr "Problematiche di progetto"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Comunicazioni & Storico"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -982,3 +984,6 @@ msgstr "Durata"
 #: view:board.board:0
 msgid "My Open Issues by Creation Date"
 msgstr "Le mie problematiche per data di creazione"
+
+#~ msgid "Maintenance"
+#~ msgstr "Manutenzione"
diff --git a/addons/project_issue/i18n/lv.po b/addons/project_issue/i18n/lv.po
index 3880f547850..6b342ff1a32 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-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -212,7 +212,7 @@ msgid "Partner"
 msgstr "Partneris"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (kopija)"
@@ -233,6 +233,8 @@ msgid "Convert To Task"
 msgstr "Pārveidot par uzdevumu"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Incidentu analīze"
diff --git a/addons/project_issue/i18n/nb.po b/addons/project_issue/i18n/nb.po
index bb294245223..1209d83299a 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-06-10 04:37+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
+"X-Generator: Launchpad (build 13830)\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 403f0acbe50..d166f62b1d5 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-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -220,7 +220,7 @@ msgid "Partner"
 msgstr "Relatie"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (kopie)"
@@ -241,6 +241,8 @@ msgid "Convert To Task"
 msgstr "Omzetten naar taak"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Issues analyse"
diff --git a/addons/project_issue/i18n/pl.po b/addons/project_issue/i18n/pl.po
index 2825628479e..cbc1a07fc87 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-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -216,7 +216,7 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (kopia)"
@@ -237,6 +237,8 @@ msgid "Convert To Task"
 msgstr "Skonwertuj do zadania"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr "Analiza problemu"
@@ -983,118 +985,3 @@ msgstr "Czas trwania"
 #: view:board.board:0
 msgid "My Open Issues by Creation Date"
 msgstr "Moje otwarte problemy wg dat utworzenia"
-
-#, python-format
-#~ msgid "An Issue created"
-#~ msgstr "Utworzono problem"
-
-#~ msgid "365 Days"
-#~ msgstr "365 dni"
-
-#~ msgid "Close Date"
-#~ msgstr "Data zamknięcia"
-
-#~ msgid "Fixed"
-#~ msgstr "Naprawione"
-
-#~ msgid "%Done"
-#~ msgstr "%Wykonano"
-
-#~ msgid "Version 4.4"
-#~ msgstr "Wersja 4.4"
-
-#~ msgid "Section"
-#~ msgstr "Sekcja"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#~ msgid "Avg. Answers"
-#~ msgstr "Śred. odpowiedzi"
-
-#~ msgid "Won't fix"
-#~ msgstr "Nie do naprawienia"
-
-#~ msgid "%Cancel"
-#~ msgstr "%Anulowanych"
-
-#~ msgid "Communication history"
-#~ msgstr "Historia komunikacji"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu."
-
-#~ msgid "Issue Stages"
-#~ msgstr "Etapy problemów"
-
-#~ msgid "Salesman"
-#~ msgstr "Sprzedawca"
-
-#~ msgid "Works For Me"
-#~ msgstr "Praca dla mnie"
-
-#~ msgid "7 Days"
-#~ msgstr "7 dni"
-
-#~ msgid "Awaiting Response"
-#~ msgstr "Oczekuje na odpowiedź"
-
-#~ msgid "Stages"
-#~ msgstr "Etapy"
-
-#~ msgid "30 Days"
-#~ msgstr "30 Dni"
-
-#, python-format
-#~ msgid "Issue "
-#~ msgstr "Problem "
-
-#~ msgid "   Today   "
-#~ msgstr "   Dzisiaj   "
-
-#~ msgid "Accepted as Bug"
-#~ msgstr "Zaakceptowany jako błąd"
-
-#~ msgid "Assignee"
-#~ msgstr "Przypisany"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "In Progress"
-#~ msgstr "W toku"
-
-#~ msgid "Invalid"
-#~ msgstr "Niepoprawne"
-
-#~ msgid "Working Time"
-#~ msgstr "Czas pracy"
-
-#~ msgid "Emails"
-#~ msgstr "Emaile"
-
-#~ msgid "Name"
-#~ msgstr "Nazwa"
-
-#~ msgid "Todo"
-#~ msgstr "Do wykonania"
-
-#, python-format
-#~ msgid "is Closed."
-#~ msgstr "jest Zamknięte"
-
-#~ msgid "    7 Days    "
-#~ msgstr "    7 Dni    "
-
-#~ msgid "Severity"
-#~ msgstr "Ważność"
-
-#, python-format
-#~ msgid "is Open."
-#~ msgstr "jest Otwarte"
diff --git a/addons/project_issue/i18n/pt.po b/addons/project_issue/i18n/pt.po
index 84fe3ae57ff..1eab923360d 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-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -212,7 +212,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
@@ -233,6 +233,8 @@ msgid "Convert To Task"
 msgstr ""
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr ""
diff --git a/addons/project_issue/i18n/pt_BR.po b/addons/project_issue/i18n/pt_BR.po
index 282691b8667..55655745f4a 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-04-29 05:49+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
@@ -212,7 +212,7 @@ msgid "Partner"
 msgstr "Parceiro"
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:464
+#: code:addons/project_issue/project_issue.py:473
 #, python-format
 msgid " (copy)"
 msgstr " (cópia)"
@@ -233,6 +233,8 @@ msgid "Convert To Task"
 msgstr "Converter em Tarefa"
 
 #. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
 msgstr ""
diff --git a/addons/project_issue/i18n/zh_CN.po b/addons/project_issue/i18n/zh_CN.po
index 1c41a92d2f9..3a5a7edb653 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-07-01 04:54+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
+"X-Generator: Launchpad (build 13830)\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 2217bade5fa..af756d34c5f 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -26,7 +26,9 @@ from tools.translate import _
 import binascii
 import time
 import tools
+from crm import wizard
 
+wizard.mail_compose_message.SUPPORTED_MODELS.append('project.issue')
 
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
@@ -44,8 +46,8 @@ class project_issue(crm.crm_case, osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, create_date desc"
-    _inherit = ['mailgate.thread']
-    
+    _inherit = ['mail.thread']
+
     def case_open(self, cr, uid, ids, *args):
         """
         @param self: The object pointer
@@ -56,7 +58,7 @@ class project_issue(crm.crm_case, osv.osv):
         """
 
         res = super(project_issue, self).case_open(cr, uid, ids, *args)
-        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'assigned_to' : uid})
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id' : uid})
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("Issue '%s' has been opened.") % name
             self.log(cr, uid, id, message)
@@ -156,7 +158,7 @@ class project_issue(crm.crm_case, osv.osv):
         issues = []
         issue_pool = self.pool.get('project.issue')
         for task in self.pool.get('project.task').browse(cr, uid, ids, context=context):
-            issues += issue_pool.search(cr, uid, [('task_id','=',task.id)])            
+            issues += issue_pool.search(cr, uid, [('task_id','=',task.id)])
         return issues
 
     def _get_issue_work(self, cr, uid, ids, context=None):
@@ -174,8 +176,8 @@ class project_issue(crm.crm_case, osv.osv):
             progress = 0.0
             if issue.task_id:
                 progress = task_pool._hours_get(cr, uid, [issue.task_id.id], field_names, args, context=context)[issue.task_id.id]['progress']
-            res[issue.id] = {'progress' : progress}     
-        return res        
+            res[issue.id] = {'progress' : progress}
+        return res
 
     _columns = {
         'id': fields.integer('ID'),
@@ -189,7 +191,6 @@ class project_issue(crm.crm_case, osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'),
-        'user_id': fields.related('project_id', 'user_id', type='many2one', relation='res.users', store=True, select=1, string='Responsible'),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"),
@@ -206,14 +207,10 @@ class project_issue(crm.crm_case, osv.osv):
         # Project Issue fields
         'date_closed': fields.datetime('Closed', readonly=True,select=True),
         'date': fields.datetime('Date'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \
-                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'version_id': fields.many2one('project.issue.version', 'Version'),
-        'partner_name': fields.char("Partner Name", size=64),
-        'partner_mobile': fields.char('Mobile', size=32),
-        'partner_phone': fields.char('Phone', size=32),
         'type_id': fields.many2one ('project.task.type', 'Resolution', domain="[('project_ids', '=', project_id)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
@@ -222,14 +219,14 @@ class project_issue(crm.crm_case, osv.osv):
                                 multi='compute_day', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='compute_day', type="float", store=True),
-        'assigned_to': fields.many2one('res.users', 'Assigned to', required=False, select=1),
+        'user_id': fields.many2one('res.users', 'Assigned to', required=False, select=1),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
                                 multi='compute_day', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
                                 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"),
-        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+        '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),
         'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
@@ -247,19 +244,11 @@ class project_issue(crm.crm_case, osv.osv):
         return False
 
     def on_change_project(self, cr, uid, ids, project_id, context=None):
-        result = {}
-
-        if project_id:
-            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
-            if project.user_id:
-                result['value'] = {'user_id' : project.user_id.id}
-
-        return result
+        return {}
 
 
     _defaults = {
         'active': 1,
-        #'user_id': crm.crm_case._get_default_user,
         'partner_id': crm.crm_case._get_default_partner,
         'partner_address_id': crm.crm_case._get_default_partner_address,
         'email_from': crm.crm_case._get_default_email,
@@ -269,7 +258,6 @@ class project_issue(crm.crm_case, osv.osv):
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'project_id':_get_project,
         'categ_id' : lambda *a: False,
-        #'assigned_to' : lambda obj, cr, uid, context: uid,
     }
 
     def convert_issue_task(self, cr, uid, ids, context=None):
@@ -298,7 +286,7 @@ class project_issue(crm.crm_case, osv.osv):
                 'date': bug.date,
                 'project_id': bug.project_id.id,
                 'priority': bug.priority,
-                'user_id': bug.assigned_to.id,
+                'user_id': bug.user_id.id,
                 'planned_hours': 0.0,
             })
 
@@ -366,7 +354,7 @@ class project_issue(crm.crm_case, osv.osv):
         if not task_id:
             return {'value':{}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context=context)
-        return {'value':{'assigned_to': task.user_id.id,}}
+        return {'value':{'user_id': task.user_id.id,}}
 
     def case_escalate(self, cr, uid, ids, *args):
         """Escalates case to top level
@@ -388,26 +376,17 @@ class project_issue(crm.crm_case, osv.osv):
             else:
                 raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
             self.write(cr, uid, [case.id], data)
-        self._history(cr, uid, cases, _('Escalate'))
+        self.message_append(cr, uid, cases, _('Escalate'))
         return True
 
-    def message_new(self, cr, uid, msg, context=None):
-        """
-        Automatically calls when new email message arrives
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks
-        """
-        if context is None: 
+    def message_new(self, cr, uid, msg, custom_values=None, context=None):
+        """Automatically called when new email message arrives"""
+        if context is None:
             context = {}
-        mailgate_pool = self.pool.get('email.server.tools')
-
         subject = msg.get('subject') or _('No Title')
-        body = msg.get('body')
+        body = msg.get('body_text')
         msg_from = msg.get('from')
         priority = msg.get('priority')
-
         vals = {
             'name': subject,
             'email_from': msg_from,
@@ -415,37 +394,20 @@ class project_issue(crm.crm_case, osv.osv):
             'description': body,
             'user_id': False,
         }
-        if msg.get('priority', False):
+        if priority:
             vals['priority'] = priority
-
-        res = mailgate_pool.get_partner(cr, uid, msg.get('from'))
-        if res:
-            vals.update(res)
+        vals.update(self.message_partner_by_email(cr, uid, msg_from))
         context.update({'state_to' : 'draft'})
-        res = self.create(cr, uid, vals, context=context)
-        self.convert_to_bug(cr, uid, [res], context=context)
-
-        attachents = msg.get('attachments', [])
-        for attactment in attachents or []:
-            data_attach = {
-                'name': attactment,
-                'datas': binascii.b2a_base64(str(attachents.get(attactment))),
-                'datas_fname': attactment,
-                'description': 'Mail attachment',
-                'res_model': self._name,
-                'res_id': res,
-            }
-            self.pool.get('ir.attachment').create(cr, uid, data_attach)
 
-        return res
+        if custom_values and isinstance(custom_values, dict):
+            vals.update(custom_values)
 
-    def message_update(self, cr, uid, ids, vals=None, msg="", default_act='pending', context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of update mail’s IDs
-        """
+        res_id = self.create(cr, uid, vals, context)
+        self.message_append_dict(cr, uid, [res_id], msg, context=context)
+        self.convert_to_bug(cr, uid, [res_id], context=context)
+        return res_id
+
+    def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
 
         if vals is None:
             vals = {}
@@ -454,7 +416,7 @@ class project_issue(crm.crm_case, osv.osv):
             ids = [ids]
 
         vals.update({
-            'description': msg['body']
+            'description': msg['body_text']
         })
         if msg.get('priority', False):
             vals['priority'] = msg.get('priority')
@@ -471,7 +433,7 @@ class project_issue(crm.crm_case, osv.osv):
                 record.write({'state' : 'open'})
 
         vls = { }
-        for line in msg['body'].split('\n'):
+        for line in msg['body_text'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
@@ -480,20 +442,9 @@ class project_issue(crm.crm_case, osv.osv):
 
         vals.update(vls)
         res = self.write(cr, uid, ids, vals)
+        self.message_append_dict(cr, uid, ids, msg, context=context)
         return res
 
-    def msg_send(self, cr, uid, id, *args, **argv):
-
-        """ Send The Message
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of email’s IDs
-            @param *args: Return Tuple Value
-            @param **args: Return Dictionary of Keyword Value
-        """
-        return True
-
     def copy(self, cr, uid, id, default=None, context=None):
         issue = self.read(cr, uid, id, ['name'], context=context)
         if not default:
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 539cef5579e..12ff265b1e9 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -198,7 +198,6 @@
     </record>
 
     <record id="crm_case_createnewobject0" model="project.issue">
-        <field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
         <field name="partner_address_id" ref="base.res_partner_address_6"/>
         <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
         <field eval="&quot;3&quot;" name="priority"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 1154579960e..860dd73216b 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -55,8 +55,7 @@
                         <field name="name"/>
                         <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                        <field name="user_id" invisible="1" />
-                        <field name="assigned_to"/>
+                        <field name="user_id"/>                        
                         <field name="version_id" colspan="2" widget="selection"/>
                         <group colspan="2" col="4">
                             <field name="type_id" string="Resolution" />
@@ -97,15 +96,15 @@
                             <group colspan="4">
                             <field colspan="4" name="email_cc" string="Global CC" widget="url"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
-                                    <field name="history" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                        icon="terp-mail-replied" type="action" />
+                                    <field name="email_from" invisible="1"/>
+		                            <button
+		                                string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
+		                                name="%(mail.action_email_compose_message_wizard)d"
+		                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
                                     <group col="4" colspan="4">
@@ -113,20 +112,18 @@
                                         <field name="date"/>
                                         <field name="email_to" widget="char" size="512"/>
                                         <field name="email_cc" widget="char" size="512"/>
-                                        <field name="name" colspan="4" widget="char" size="512"/>
-                                        <field name="history" invisible="1"/>
+                                        <field name="subject" colspan="4" widget="char" size="512"/>
                                     </group>
                                     <notebook colspan="4">
                                         <page string="Details">
-                                            <group attrs="{'invisible': [('history', '!=', True)]}">
-                                                <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+                                            <group attrs="{'invisible': [('email_from', '=', False)]}">
+                                                <field name="body_text" colspan="4" nolabel="1" height="250"/>
+		                                        <button colspan="4" string="Reply"
+		                                            name="%(mail.action_email_compose_message_wizard)d"
+		                                            context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
-                                            <group attrs="{'invisible': [('history', '=', True)]}">
+                                            <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                             </group>
                                         </page>
@@ -141,10 +138,9 @@
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                            <button string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'project.issue'}"
-                               icon="terp-mail-message-new" type="action" />
+		                    <button string="Send New Email"
+		                        name="%(mail.action_email_compose_message_wizard)d"
+		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
@@ -191,7 +187,7 @@
                     <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                     <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="assigned_to"/>
+                    <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
@@ -219,8 +215,8 @@
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
-                        <field name="assigned_to">
-                            <filter domain="[('assigned_to','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
+                        <field name="user_id">
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
                         </field>
                         <field name="project_id"/>
                         <field name="id"/>
@@ -228,7 +224,7 @@
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
                         <filter string="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'assigned_to'}" />
+                            domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" domain="[]"
                             context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical"/>
@@ -259,7 +255,7 @@
             <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
-                <calendar string="Issues" date_start="date" color="assigned_to" date_delay="duration">
+                <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
                     <field name="name"/>
                     <field name="partner_id"/>
                 </calendar>
@@ -284,7 +280,7 @@
                     <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id"/>
-                    <field name="assigned_to"/>
+                    <field name="user_id"/>
                     <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"/>
@@ -307,7 +303,7 @@
                     <separator orientation="vertical"/>
                     <group>
                         <field name="name" select='1' string="Feature description"/>
-                        <field name="assigned_to" select="1"/>
+                        <field name="user_id" select="1"/>
                         <field name="state" select="1">
                             <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 29542f32912..36ce72f2a70 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -37,7 +37,6 @@ class project_issue_report(osv.osv):
 
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
@@ -64,9 +63,9 @@ class project_issue_report(osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
-        'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
+        'user_id' : fields.many2one('res.users', 'Assigned to',readonly=True),
         'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
+        'channel_id': fields.many2one('crm.case.channel', 'Channel',readonly=True),
         'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" ),
         'email': fields.integer('# Emails', size=128, readonly=True),
     }
@@ -95,14 +94,14 @@ class project_issue_report(osv.osv):
                     c.project_id as project_id,
                     c.version_id as version_id,
                     1 as nbr,
-                    c.assigned_to,
                     c.partner_id,
-                    c.canal_id,
+                    c.channel_id,
                     c.task_id,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open,
                     extract('epoch' from (c.date_closed-c.date_open))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mailgate_message WHERE model='project.issue' AND res_id=c.id) AS email
+                    (SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email
+
                 FROM
                     project_issue c
                 WHERE c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue'))
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 015a7750548..1ed21b8dc01 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -18,10 +18,9 @@
                     <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
-                    <field name="canal_id" invisible="1"/>
+                    <field name="channel_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="task_id" invisible="1"/>
-                    <field name="assigned_to" invisible="1"/>
+                    <field name="task_id" invisible="1"/>                    
                     <field name="date_closed" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>
@@ -89,31 +88,14 @@
 
                            </field>
                               <field name="project_id"/>
-                          <field name="user_id"  select="1" widget="selection"/>
+                          <field name="user_id"  select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
+                          <field name="partner_id"/>
+                          <field name="version_id" widget="selection" />
                    </group>
                    <newline/>
-                   <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
-                       <field name="partner_id"/>
-                       <field name="assigned_to" widget="selection"/>
-                       <separator orientation="vertical"/>
-                       <field name="priority" />
-                       <separator orientation="vertical"/>
-                       <field name="version_id" widget="selection" />
-                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                       <field name="type_id" widget="selection"/>
-                       <separator orientation="vertical"/>
-                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                       <newline/>
-                       <field name="creation_date"/>
-                       <field name="opening_date"/>
-                       <field name="date_closed" string="Date Closed"/>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                           <filter name="User" string="Responsible" icon="terp-personal"
-                        domain="[]" context="{'group_by':'user_id'}" />
+                   <group  expand="1" string="Group By..." colspan="4" col="8">                        
                         <filter string="Assigned to" name="Responsible" icon="terp-personal"
-                        domain="[]" context="{'group_by':'assigned_to'}" />
+                        domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Sale Team" icon="terp-personal+"
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index 177533462a0..01afcb73b09 100644
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -5,7 +5,7 @@
 "access_crm_case_categ_id","crm.case.categ","crm.model_crm_case_categ","project.group_project_manager",1,1,1,1
 "access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
 "access_project_issue_version_project_user","project_issue_version user","model_project_issue_version","project.group_project_user",1,0,0,0
-"access_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
+"access_mail_message_project_manager","mail.message.manager","mail.model_mail_message","project.group_project_manager",1,1,1,1
 "access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
 "access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
-"access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
+"access_mail_message_issue_project_user","mail.message.user","mail.model_mail_message","project.group_project_user",1,1,1,0