odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIx] membership: rename create_date with date on membership analysis report. 

bzr revid: hmo@tinyerp.com-20100903104004-26ti7iuatn0isyqa
This commit is contained in:
Harry (OpenERP) 2010-09-03 16:10:04 +05:30
parent e4e5d50693
commit 07a505190e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/membership/report/report_membership.py
View File

@ -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()

4
addons/membership/report/report_membership_view.xml
View File

@ -31,9 +31,9 @@
<search string="Membership">
<group col="8" colspan="4">
<filter string="Last 365 Days" icon="terp-go-year"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
<filter string="Last 30 Days" icon="terp-go-month" name="month"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test"
string="Invoiced"