[MERGE] merged with maint runk

bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno

10 files changed, 24 insertions, 140 deletions

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 2c38b2e56c1..dad67f5dc30 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -53,8 +53,8 @@ Dashboard for project members that includes:
         "process/task_process.xml",
         "res_partner_view.xml",
         "report/project_report_view.xml",
-        "board_project_view.xml",
         'report/project_cumulative.xml',
+        "board_project_view.xml",
         'res_config_view.xml',
     ],
     'demo_xml': [
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 09a7fe57bab..9e532438a7c 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -2,41 +2,6 @@
 <openerp>
     <data>
 
-        <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
-            <field name="name">project.vs.remaining.hour.tree</field>
-            <field name="model">project.vs.hours</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Remaining Hours Per Project" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
-                    <field name="project"/>
-                    <field name="remaining_hours"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_project_vs_remaining_hours_graph" model="ir.ui.view">
-             <field name="name">project.vs.remaining.hour.graph</field>
-             <field name="model">project.vs.hours</field>
-             <field name="type">graph</field>
-             <field name="arch" type="xml">
-                 <graph string="Project vs remaining hours" type="bar">
-                     <field name="project"/>
-                     <field name="state" group="True"/>
-                     <field name="remaining_hours" operator="+"/>
-                 </graph>
-             </field>
-        </record>
-
-        <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
-            <field name="name">Remaining Hours Per Project</field>
-            <field name="res_model">project.vs.hours</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
-            <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
-        </record>
-
         <record id="view_task_tree" model="ir.ui.view">
             <field name="name">project.task.tree</field>
             <field name="model">project.task</field>
@@ -74,10 +39,10 @@
                 <form string="My Board" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action name="%(my_open_tasks_action)d" string="My Tasks" creatable="true"/>
+                            <action name="%(my_open_tasks_action)d" string="My Tasks"/>
                         </column>
                         <column>
-                            <action name="%(action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
+                            <action name="%(action_view_task_history_cumulative)d" string="Open Tasks"/>
                         </column>
                     </board>
                 </form>
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 7ec14fe77f2..2b0700612cb 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-10 15:16+0000\n"
+"PO-Revision-Date: 2012-06-28 12:50+0000\n"
 "Last-Translator: Erwin <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: 2012-06-28 04:36+0000\n"
+"X-Launchpad-Export-Date: 2012-06-29 04:38+0000\n"
 "X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
@@ -658,7 +658,7 @@ msgstr "Resterende uren"
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-mail samenstellen wizard"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 43d185150b3..b7d9bc12f32 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -30,11 +30,12 @@
                 <form string="Project" version="7.0">
                 <header>
                     <button name="set_done" string="Done" type="object" states="open,pending"/>
-                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close"/>
                     <button name="set_pending" string="Pending" type="object" states="open"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
@@ -318,12 +319,14 @@
                         <span groups="base.group_user">
                             <!--
                             <button name="do_open" string="Start Task" type="object"
-                                    states="draft,pending"/>
+                                    states="draft,pending" class="oe_highlight"/>
                             <button name="do_draft" string="Draft" type="object"
                                     states="cancel,done"/>
                             -->
                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                    states="done,cancelled" context="{'button_reactivate':True}"/>
+                                    states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
+                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
+                                    states="cancelled" context="{'button_reactivate':True}"/>
                             <button name="action_close" string="Done" type="object"
                                     states="draft,open,pending"/>
                             <button name="do_pending" string="Pending" type="object"
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 69daeefc758..22d43237538 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -79,7 +79,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_task_history_graph"/>
             <field eval="False" name="filter"/>
-            <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>
+            <field name="context">{"search_default_open":1, "search_default_this_month": 1}</field>
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 58f7739e96d..30d8717efb6 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -120,88 +120,3 @@ class report_project_task_user(osv.osv):
 
 report_project_task_user()
 
-#This class is generated for project deshboard purpose
-class project_vs_hours(osv.osv):
-    _name = "project.vs.hours"
-    _description = " Project vs  hours"
-    _auto = False
-    _columns = {
-        'project': fields.char('Project', size=128, required=True),
-        'remaining_hours': fields.float('Remaining Hours', readonly=True),
-        'user_id': fields.many2one('res.users', 'Assigned To', readonly=True),
-        'planned_hours': fields.float('Planned Hours', readonly=True),
-        'total_hours': fields.float('Total Hours', readonly=True),
-        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'Status', required=True, readonly=True)
-    }
-    _order = 'project desc'
-
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'project_vs_hours')
-        cr.execute("""
-            CREATE or REPLACE view project_vs_hours as (
-                select
-                      min(pt.id) as id,
-                      aaa.user_id as user_id,
-                      aaa.name as project,
-                      aaa.state,
-                      sum(pt.remaining_hours) as remaining_hours,
-                      sum(pt.planned_hours) as planned_hours,
-                      sum(pt.total_hours) as total_hours
-                 FROM project_project as pp,
-                       account_analytic_account as aaa,
-                       project_task as pt
-                 WHERE aaa.id=pp.analytic_account_id and pt.project_id=pp.id and pp.analytic_account_id=aaa.id
-                 GROUP BY aaa.user_id,aaa.state,aaa.name
-                 UNION All
-                 SELECT
-                      min(pt.id) as id,
-                      pur.uid as user_id,
-                      aaa.name as project,
-                      aaa.state,
-                      sum(pt.remaining_hours) as remaining_hours,
-                      sum(pt.planned_hours) as planned_hours,
-                      sum(pt.total_hours) as total_hours
-                 FROM project_project as pp,
-                      project_user_rel as pur,
-                      account_analytic_account as aaa,
-                      project_task as pt
-                 WHERE pur.project_id=pp.id and pt.project_id=pp.id and pp.analytic_account_id=aaa.id AND pur.uid != aaa.user_id
-                 GROUP BY pur.uid,aaa.state,aaa.name
-            )
-        """)
-
-project_vs_hours()
-
-class task_by_days(osv.osv):
-    _name = "task.by.days"
-    _description = "Task By Days"
-    _auto = False
-    _columns = {
-        'day': fields.char('Day', size=128, required=True),
-        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True),
-        'total_task': fields.float('Total tasks', readonly=True),
-        'project_id':fields.many2one('project.project', 'Project')
-     }
-    _order = 'day desc'
-
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'task_by_days')
-        cr.execute("""
-            CREATE or REPLACE view task_by_days as (
-                SELECT
-                    min(pt.id) as id,
-                    to_char(pt.create_date, 'YYYY-MM-DD') as day,
-                    count(*) as total_task,
-                    pt.state as state,
-                    pt.project_id
-                FROM
-                    project_task as pt
-                GROUP BY
-                    to_char(pt.create_date, 'YYYY-MM-DD'),pt.state,pt.project_id
-            )
-        """)
-
-task_by_days()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 28258c483ce..ff1511d49f2 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -8,8 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" type="object" name="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <group string="Project">
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 5b51dc85e7c..8cea913984d 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -5,8 +5,6 @@ access_project_task_type_user,project.task.type user,model_project_task_type,pro
 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1

 access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1

 access_report_project_task_user,report.project.task.user,model_report_project_task_user,project.group_project_manager,1,1,1,1

-access_project_vs_hours,project.vs.hours,model_project_vs_hours,project.group_project_user,1,1,1,1

-access_task_by_days,task.by.days,model_task_by_days,project.group_project_user,1,1,1,1

 access_partner_task user,base.res.partner user,base.model_res_partner,project.group_project_user,1,0,0,0

 access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0

 access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0

diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 9ed920eb534..7dd1cdb9465 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,8 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 4a452bca3ab..066f15582b4 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -9,8 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
                     <header>
-                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <separator string="Reevaluation Task"/>
                     <group>