openerp-dev-web team mailing list archive

["atp\(OpenERP\)" <atp@xxxxxxxxxxx>]

atp(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/atp-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Harry (Open ERP) (hmo-tinyerp)



1)Add graph view in project_timesheet module for Task Hours Per Month Report.

2)Changed some Icon in Scrum Dashboard and Fix problem of project_scrum demo data.


-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/atp-dev-addons1/+merge/40249
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/atp-dev-addons1.

=== modified file 'project_scrum/board_project_scrum_view.xml'
--- project_scrum/board_project_scrum_view.xml	2010-10-13 07:51:20 +0000
+++ project_scrum/board_project_scrum_view.xml	2010-11-06 06:29:45 +0000
@@ -16,9 +16,9 @@
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
                     <field name="expected_hours" sum="Expected hours" widget="float_time"/>
                     <field name="state"/>
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-ok"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                    <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
                 	<button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" states="open,draft,close,cancel"
                                 	string="Burndown Chart" type="action" icon="gtk-print"/>

=== modified file 'project_scrum/project_scrum_demo.xml'
--- project_scrum/project_scrum_demo.xml	2010-10-18 13:04:41 +0000
+++ project_scrum/project_scrum_demo.xml	2010-11-06 06:29:45 +0000
@@ -154,7 +154,6 @@
         <!-- Resource: project.product.backlog -->
 
         <record id="scrum_product_backlog_0" model="project.scrum.product.backlog">
-            <field name="priority">3</field>
             <field name="name">Automatic migration system</field>
             <field name="expected_hours">6.0</field>
             <field name="note">This new system will enable you to migrate automatically from an old version of OpenERP to a new one. This system will migrate not only the OpenERP system but also the customers particularities. This happens without any kind of script or programming. It has been possible to carry out such a system thanks to the descriptive approach of OpenERP components. </field>
@@ -163,7 +162,6 @@
             <field name="project_id" ref="project.project_project_9"/>
         </record>
         <record id="scrum_product_backlog_1" model="project.scrum.product.backlog">
-            <field name="priority">3</field>
             <field name="name">New accounting module</field>
             <field name="expected_hours">111.0</field>
             <field name="note">The accounting module of OpenERP (financial accounting and management accounting) is being reshaped. New functionalities will be added: intangible assets, a new way of presenting ledgers and bookings, new stock valuation calculation, and lots of predefined reports. </field>
@@ -172,7 +170,6 @@
             <field name="project_id" ref="project.project_project_9"/>
         </record>
         <record id="scrum_product_backlog_2" model="project.scrum.product.backlog">
-            <field name="priority">3</field>
             <field name="name">Automated Plugin System to install/uninstall modules</field>
             <field name="expected_hours">4.0</field>
             <field name="note">We have to develop a plug-in system which will enable to install/remove modules. The basic version of OpenERP will include only the required minimum, and you will select the modules thanks to the plug-in manager. This allows you to limit your system to your real needs: quality management, localisations, project and service management, marketing campaigns, and so on... </field>
@@ -271,7 +268,7 @@
             <field name="project_id" ref="project.project_project_9"/>
             <field name="name">Review all English Terms</field>
             <field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_end"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_3"/>
         </record>
         <record id="scrum_task_4" model="project.task">
@@ -280,7 +277,7 @@
             <field name="project_id" ref="project.project_project_9"/>
             <field name="name">Review all french terms</field>
           	<field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_end"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_3"/>
         </record>
         <record id="scrum_task_5" model="project.task">
@@ -289,7 +286,7 @@
             <field name="project_id" ref="project.project_project_9"/>
             <field name="name">Analytic Accounting features</field>
           	<field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_end"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_1"/>
         </record>
         <record id="scrum_task_6" model="project.task">
@@ -346,7 +343,7 @@
             <field name="project_id" ref="project.project_project_9"/>
             <field name="name">Bugfix - memory leak</field>
           	<field name="state">done</field>
-            <field eval="time.strftime('%Y-%m-%d')" name="date_close"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_end"/>
             <field name="product_backlog_id" ref="scrum_product_backlog_4"/>
         </record>
         <record id="scrum_task_13" model="project.task">

=== modified file 'project_timesheet/report/task_report_view.xml'
--- project_timesheet/report/task_report_view.xml	2010-09-09 13:27:59 +0000
+++ project_timesheet/report/task_report_view.xml	2010-11-06 06:29:45 +0000
@@ -45,11 +45,25 @@
             	</search>
             </field>
         </record>
+        
+        <record id="view_task_hour_per_month_graph" model="ir.ui.view">
+            <field name="name">report.timesheet.task.user.graph</field>
+            <field name="model">report.timesheet.task.user</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Task Hours Per Month" type="bar">
+                     <field name="user_id"/>
+                     <field name="task_hrs" operator="+"/>
+                     <field name="timesheet_hrs" operator="+"/>
+                 </graph>
+            </field>
+        </record>
+                
         <record id="action_report_timesheet_task_user" model="ir.actions.act_window">
             <field name="name">Task Hours Per Month</field>
             <field name="res_model">report.timesheet.task.user</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">tree,graph</field>
             <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
         </record>