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

[IMP] show sales analysis based on cretion date for quatation and for sales based on confirm date. 

bzr revid: tpa@tinyerp.com-20130806091124-650f98bm7d1e004e
This commit is contained in:
Turkesh Patel (Open ERP) 2013-08-06 14:41:24 +05:30
parent a24a72e3d3
commit 9daabe3754
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/crm/crm_demo.xml
View File

@ -9,11 +9,13 @@
<record model="crm.case.section" id="crm_case_section_1">
<field name="name">Indirect Sales</field>
<field name="code">IM</field>
<field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
</record>
<record model="crm.case.section" id="crm_case_section_2">
<field name="name">Marketing</field>
<field name="code">SPD</field>
<field name="member_ids" eval="[(4, ref('base.user_root')),(4, ref('base.user_demo'))]"/>
</record>
<record model="crm.segmentation" id="crm_segmentation0">

11
addons/crm/report/crm_lead_report.py
View File

@ -116,11 +116,12 @@ class crm_lead_report(osv.osv):
for group in res:
group['user_currency_probable_revenue'] = 0
group['user_currency_planned_revenue'] = 0
group_ids = self.search(cr, uid, group.get('__domain'),context=context)
record = self._compute_amounts_in_user_currency(cr, uid, group_ids, context=context)
for id, rec in record.iteritems():
group['user_currency_planned_revenue'] += rec['user_currency_planned_revenue']
group['user_currency_probable_revenue'] += rec['user_currency_probable_revenue']
if group.get('__domain'):
group_ids = self.search(cr, uid, group.get('__domain'),context=context)
record = self._compute_amounts_in_user_currency(cr, uid, group_ids, context=context)
for id, rec in record.iteritems():
group['user_currency_planned_revenue'] += rec['user_currency_planned_revenue']
group['user_currency_probable_revenue'] += rec['user_currency_probable_revenue']
return res
def init(self, cr):

6
addons/sale/report/sale_report.py
View File

@ -70,9 +70,9 @@ class sale_report(osv.osv):
1 as nbr,
s.date_order as date,
s.date_confirm as date_confirm,
to_char(s.date_order, 'YYYY') as year,
to_char(s.date_order, 'MM') as month,
to_char(s.date_order, 'YYYY-MM-DD') as day,
case when (s.state='draft') then to_char(s.date_order, 'YYYY') else to_char(s.date_confirm, 'YYYY') end as year,
case when (s.state='draft') then to_char(s.date_order, 'MM') else to_char(s.date_confirm, 'MM') end as month,
case when (s.state='draft') then to_char(s.date_order, 'YYYY-MM-DD') else to_char(s.date_confirm, 'YYYY-MM-DD') end as day,
s.partner_id as partner_id,
s.user_id as user_id,
s.company_id as company_id,