Merge lp:~openerp-dev/openobject-addons/6.1-opw-586027-cpa into lp:openobject-addons/6.1

[Chirag Patel (OpenERP)]

Hello,

Calendar view not display task same as gantt view.

In project, create new task and fill start and end date.

Created task display in gantt view but not in calendar view.
If we enter date deadline then it will display in calendar.

Expected: Both view start and end date should be same.

Thanks.

[Chris Biersbach (OpenERP) (cbi-openerp)]

I reject this because 6.1 is not an LTS and we no longer merge in 6.1. Ina ddition, I also rejected this on 7.0 because the calendar view becomes too cluttered too quickly.

Unmerged revisions

7153. By Chirag Patel (OpenERP) on 2013-02-14

[FIX] Fixed calendar view not display task same as gantt view.

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2012-03-12 10:20:01 +0000
+++ project/project_view.xml	2013-02-15 12:21:21 +0000
@@ -447,7 +447,7 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="user_id" date_start="date_deadline" string="Tasks">
+                <calendar color="user_id" date_start="date_start" date_stop="date_end" string="Tasks">
                     <field name="name"/>
                     <field name="project_id"/>
                 </calendar>