Odoo Addons (MOVED TO GITHUB)

Merge lp:~syleam/openobject-addons/trunk-fix-310458-report-timesheet into lp:~openerp/openobject-addons/old_trunk

  1. trunk-fix-310458-report-timesheet
  2. Merge into old_trunk
Proposed by Christophe CHAUVET
Status: Merged
Merge reported by: Husen Daudi
Merged at revision: not available
Proposed branch: lp:~syleam/openobject-addons/trunk-fix-310458-report-timesheet
Merge into: lp:~openerp/openobject-addons/old_trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~syleam/openobject-addons/trunk-fix-310458-report-timesheet
Reviewer Review Type Date Requested Status
Husen Daudi (community) Approve
Review via email: mp+6865@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christophe CHAUVET (christophe-chauvet) wrote :

Fix bug 310458

Revision history for this message
Husen Daudi (husendaudi) wrote :

Already merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'report_timesheet/report_timesheet.py'
2--- report_timesheet/report_timesheet.py 2009-03-20 11:28:18 +0000
3+++ report_timesheet/report_timesheet.py 2009-05-28 16:45:42 +0000
4@@ -21,8 +21,7 @@
5 ##############################################################################
6
7 from osv import fields,osv
8-
9-import tools.sql
10+from tools.sql import drop_view_if_exists
11
12 class report_timesheet_user(osv.osv):
13 _name = "report_timesheet.user"
14@@ -36,7 +35,7 @@
15 }
16 _order = 'name desc,user_id desc'
17 def init(self, cr):
18- tools.sql.drop_view_if_exists(cr, 'report_timesheet_user')
19+ drop_view_if_exists(cr, 'report_timesheet_user')
20 cr.execute("""
21 create or replace view report_timesheet_user as (
22 select
23@@ -66,6 +65,7 @@
24 }
25 _order = 'name desc,account_id desc,user_id desc'
26 def init(self, cr):
27+ drop_view_if_exists(cr, 'report_timesheet_account')
28 cr.execute("""
29 create or replace view report_timesheet_account as (
30 select
31@@ -96,6 +96,7 @@
32 _order = 'name desc,account_id desc,user_id desc'
33
34 def init(self, cr):
35+ drop_view_if_exists(cr, 'report_timesheet_account_date')
36 cr.execute("""
37 create or replace view report_timesheet_account_date as (
38 select
39@@ -127,6 +128,7 @@
40 _rec_name = 'user_id'
41 _order = 'user_id desc'
42 def init(self, cr):
43+ drop_view_if_exists(cr, 'report_timesheet_invoice')
44 cr.execute("""
45 create or replace view report_timesheet_invoice as (
46 select
47@@ -181,6 +183,7 @@
48 return res
49
50 def init(self, cr, uid=1):
51+ drop_view_if_exists(cr, 'report_random_timesheet')
52
53 cr.execute("""create or replace view report_random_timesheet as (
54
55@@ -220,6 +223,7 @@
56 _order = "date desc"
57
58 def init(self, cr):
59+ drop_view_if_exists(cr, 'random_timesheet_lines')
60
61 cr.execute("""create or replace view random_timesheet_lines as (
62 select