[MERGE] merge with lp:openobject-addons

bzr revid: nco@tinyerp.com-20121015045434-kp7a7h2l1mqa1x01
2012-10-15 10:24:34 +05:30
parent a7773f3f3a 7f23ad5de5
commit 99bf2fb663
27 changed files with 1427 additions and 1111 deletions
@@ -1425,7 +1425,7 @@ class project_task_history_cumulative(osv.osv):
    }

    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_event_registration')
+        tools.drop_view_if_exists(cr, 'project_task_history_cumulative')

        cr.execute(""" CREATE VIEW project_task_history_cumulative AS (
            SELECT