[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:
parent
a24a72e3d3
commit
9daabe3754
|
@ -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">
|
||||
|
|
|
@ -116,6 +116,7 @@ class crm_lead_report(osv.osv):
|
|||
for group in res:
|
||||
group['user_currency_probable_revenue'] = 0
|
||||
group['user_currency_planned_revenue'] = 0
|
||||
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():
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue