[FIX] correct various date issues in reporting

[odoo/odoo.git] / addons / membership / report / report_membership.py

diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index 081a2f0..536edde 100644 (file)
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -39,17 +39,10 @@ class report_membership(osv.osv):
     _name = 'report.membership'
     _description = __doc__
     _auto = False
-    _rec_name = 'year'
+    _rec_name = 'start_date'
     _columns = {
-        'year': fields.char('Year', size=4, readonly=True, select=1),
-        'month': fields.selection([('01', 'January'), ('02', 'February'), \
-                                  ('03', 'March'), ('04', 'April'),\
-                                  ('05', 'May'), ('06', 'June'), \
-                                  ('07', 'July'), ('08', 'August'),\
-                                  ('09', 'September'), ('10', 'October'),\
-                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
-        'date_from': fields.datetime('Start Date', readonly=True, help="Start membership date"),
-        'date_to': fields.datetime('End Date', readonly=True, help="End membership date"),
+        'start_date': fields.date('Start Date', readonly=True),
+        'date_to': fields.date('End Date', readonly=True, help="End membership date"),
         'num_waiting': fields.integer('# Waiting', readonly=True),
         'num_invoiced': fields.integer('# Invoiced', readonly=True),
         'num_paid': fields.integer('# Paid', readonly=True),
@@ -75,10 +68,8 @@ class report_membership(osv.osv):
         membership_state,
         associate_member_id,
         membership_amount,
-        date_from,
         date_to,
-        year,
-        month,
+        start_date,
         COUNT(num_waiting) AS num_waiting,
         COUNT(num_invoiced) AS num_invoiced,
         COUNT(num_paid) AS num_paid,
@@ -94,10 +85,8 @@ class report_membership(osv.osv):
             p.membership_state AS membership_state,
             p.associate_member AS associate_member_id,
             p.membership_amount AS membership_amount,
-            TO_CHAR(p.membership_start, 'YYYY-MM-DD') AS date_from,
-            TO_CHAR(p.membership_stop, 'YYYY-MM-DD') AS date_to,
-            TO_CHAR(p.membership_start, 'YYYY') AS year,
-            TO_CHAR(p.membership_start,'MM') AS month,
+            p.membership_stop AS date_to,
+            p.membership_start AS start_date,
             CASE WHEN ml.state = 'waiting'  THEN ml.id END AS num_waiting,
             CASE WHEN ml.state = 'invoiced' THEN ml.id END AS num_invoiced,
             CASE WHEN ml.state = 'paid'     THEN ml.id END AS num_paid,
@@ -116,19 +105,14 @@ class report_membership(osv.osv):
               p.membership_state,
               p.associate_member,
               p.membership_amount,
-              TO_CHAR(p.membership_start, 'YYYY-MM-DD'),
-              TO_CHAR(p.membership_stop, 'YYYY-MM-DD'),
-              TO_CHAR(p.membership_start, 'YYYY'),
-              TO_CHAR(p.membership_start,'MM'),
+              p.membership_start,
               ml.membership_id,
               p.company_id,
               ml.state,
               ml.id
         ) AS foo
         GROUP BY
-            year,
-            month,
-            date_from,
+            start_date,
             date_to,
             partner_id,
             user_id,