From 07a505190e5df5a350123a0c5ce05f71fc079b7f Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Fri, 3 Sep 2010 16:10:04 +0530 Subject: [PATCH] [FIx] membership: rename create_date with date on membership analysis report. bzr revid: hmo@tinyerp.com-20100903104004-26ti7iuatn0isyqa --- addons/membership/report/report_membership.py | 8 ++++---- addons/membership/report/report_membership_view.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py index fc14b65f698..1bfdce82404 100644 --- a/addons/membership/report/report_membership.py +++ b/addons/membership/report/report_membership.py @@ -38,7 +38,7 @@ class report_membership(osv.osv): ('07', 'July'), ('08', 'August'),\ ('09', 'September'), ('10', 'October'),\ ('11', 'November'), ('12', 'December')], 'Month', readonly=True), - 'create_date': fields.datetime('Create Date', readonly=True), + 'date': fields.datetime('Create Date', readonly=True), 'canceled_number': fields.integer('Canceled', readonly=True), 'waiting_number': fields.integer('Waiting', readonly=True), 'invoiced_number': fields.integer('Invoiced', readonly=True), @@ -78,7 +78,7 @@ class report_membership(osv.osv): SUM(awaiting) as waiting_amount, year, month, - create_date, + date, partner_id, membership_id, state, @@ -104,7 +104,7 @@ class report_membership(osv.osv): ELSE 0 END AS awaiting, TO_CHAR(ml.date_from, 'YYYY') AS year, TO_CHAR(ml.date_from, 'MM')as month, - TO_CHAR(ml.date_from, 'YYYY-MM-DD') as create_date, + TO_CHAR(ml.date_from, 'YYYY-MM-DD') as date, ai.partner_id AS partner_id, ai.currency_id AS currency, ai.state as state, @@ -119,7 +119,7 @@ class report_membership(osv.osv): ON (ml.partner = p.id) GROUP BY TO_CHAR(ml.date_from, 'YYYY'), TO_CHAR(ml.date_from, 'MM'), TO_CHAR(ml.date_from, 'YYYY-MM-DD'), ai.state, ai.partner_id, ai.currency_id, ml.id, ml.membership_id) AS foo - GROUP BY year, month, create_date, currency, partner_id, membership_id, state) + GROUP BY year, month, date, currency, partner_id, membership_id, state) """) report_membership() diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index bdb5065b766..90330a92a55 100644 --- a/addons/membership/report/report_membership_view.xml +++ b/addons/membership/report/report_membership_view.xml @@ -31,9 +31,9 @@ + domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/> + domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>