[IMP]:sale:Sales Analysis
-Rename the menu "Report > Sales" by "Sales Analysis". -Rename the column name Avg Closing Delay by "Days to Close". -Add the field "Category of Product" for group_by or filters. -Remove the field "Payment Term" and "Fiscal Position" from this object (and group by). -The buttons that filters on State must be: [Quotation] [Sales]. -Extended options: (put in one line) - just put date, category of product, shop, state. bzr revid: apa@tinyerp.com-20100525102006-ytkcnux68fsoc7br
This commit is contained in:
apa-tiny
parent
06a3f0dfe9
commit
f39751be85
|
|
@ -36,16 +36,15 @@ class sale_report(osv.osv):
|
|||
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
|
||||
'day': fields.char('Day', size=128, readonly=True),
|
||||
'product_id':fields.many2one('product.product', 'Product', readonly=True),
|
||||
'product_qty':fields.float('Qty', readonly=True),
|
||||
'product_qty':fields.float('# of Qty', readonly=True),
|
||||
'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
|
||||
'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
|
||||
'company_id':fields.many2one('res.company', 'Company', readonly=True),
|
||||
'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True),
|
||||
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True),
|
||||
'user_id':fields.many2one('res.users', 'Salesman', readonly=True),
|
||||
'price_total':fields.float('Total Price', readonly=True),
|
||||
'delay':fields.float('Avg Closing Days', digits=(16,2), readonly=True),
|
||||
'delay':fields.float('Days to Close', digits=(16,2), readonly=True),
|
||||
'price_average':fields.float('Average Price', readonly=True),
|
||||
'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
|
||||
'nbr':fields.integer('# of Lines', readonly=True),
|
||||
'state': fields.selection([
|
||||
('draft', 'Quotation'),
|
||||
|
|
@ -57,12 +56,8 @@ class sale_report(osv.osv):
|
|||
('done', 'Done'),
|
||||
('cancel', 'Cancelled')
|
||||
], 'Order State', readonly=True),
|
||||
'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
|
||||
'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact Name', readonly=True),
|
||||
'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address Name', readonly=True),
|
||||
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True),
|
||||
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True),
|
||||
'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
|
||||
'date_confirm': fields.date('Confirmation Date', readonly=True)
|
||||
}
|
||||
_order = 'date desc'
|
||||
def init(self, cr):
|
||||
|
|
@ -80,42 +75,32 @@ class sale_report(osv.osv):
|
|||
s.partner_id as partner_id,
|
||||
s.user_id as user_id,
|
||||
s.shop_id as shop_id,
|
||||
s.fiscal_position as fiscal_position,
|
||||
s.payment_term as payment_term,
|
||||
s.company_id as company_id,
|
||||
extract(epoch from avg(s.date_confirm-s.create_date))/(24*60*60)::decimal(16,2) as delay,
|
||||
sum(l.product_uom_qty*l.price_unit) as price_total,
|
||||
(sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor))::decimal(16,2) as price_average,
|
||||
count(*) as nbr,
|
||||
s.state,
|
||||
s.partner_invoice_id as partner_invoice_id,
|
||||
s.partner_order_id as partner_order_id,
|
||||
s.partner_shipping_id as partner_shipping_id,
|
||||
pt.categ_id,
|
||||
s.pricelist_id as pricelist_id,
|
||||
s.project_id as analytic_account_id,
|
||||
s.date_confirm as date_confirm
|
||||
s.project_id as analytic_account_id
|
||||
from
|
||||
sale_order_line l
|
||||
left join
|
||||
sale_order s on (s.id=l.order_id)
|
||||
left join product_uom u on (u.id=l.product_uom)
|
||||
left join sale_order s on (s.id=l.order_id)
|
||||
left join product_uom u on (u.id=l.product_uom)
|
||||
left join product_template pt on (pt.id=l.product_id)
|
||||
group by
|
||||
s.date_order,
|
||||
s.partner_id,
|
||||
l.product_id,
|
||||
l.product_uom,
|
||||
s.user_id,
|
||||
pt.categ_id,
|
||||
s.state,
|
||||
s.shop_id,
|
||||
s.company_id,
|
||||
s.fiscal_position,
|
||||
s.payment_term,
|
||||
s.partner_invoice_id,
|
||||
s.partner_order_id,
|
||||
s.partner_shipping_id,
|
||||
s.pricelist_id,
|
||||
s.project_id,
|
||||
s.date_confirm
|
||||
s.project_id
|
||||
)
|
||||
""")
|
||||
sale_report()
|
||||
|
|
@ -212,7 +197,7 @@ class product_bought_by_sale_order(osv.osv):
|
|||
where
|
||||
s.state='manual' or s.state='progress'
|
||||
group by
|
||||
l.product_id, to_char(l.create_date, 'MM'), to_char(l.create_date, 'YYYY')
|
||||
l.product_id, to_char(l.create_date, 'MM'), to_char(l.create_date, 'YYYY')
|
||||
)
|
||||
""")
|
||||
product_bought_by_sale_order()
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<record id="view_order_product_tree" model="ir.ui.view">
|
||||
<field name="name">sale.report.tree</field>
|
||||
<field name="model">sale.report</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Sales Orders Statistics">
|
||||
<tree string="Sales Analysis">
|
||||
<field name="date" invisible="1"/>
|
||||
<field name="user_id" invisible="1"/>
|
||||
<field name="year" invisible="1"/>
|
||||
|
|
@ -16,20 +17,15 @@
|
|||
<field name="company_id" invisible="1"/>
|
||||
<field name="partner_id" invisible="1"/>
|
||||
<field name="product_id" invisible="1"/>
|
||||
<field name="product_qty" invisible="1"/>
|
||||
<field name="delay" avg="Days to Close"/>
|
||||
<field name="categ_id" invisible="1"/>
|
||||
<field name="nbr" sum="# of Lines"/>
|
||||
<field name="product_qty" sum="# of Qty"/>
|
||||
<field name="price_average" avg="Average Price"/>
|
||||
<field name="price_total" sum="Total Price"/>
|
||||
<field name="delay" avg="Days to Close"/>
|
||||
<field name="state" invisible="1"/>
|
||||
<field name="fiscal_position" invisible="1"/>
|
||||
<field name="payment_term" invisible="1"/>
|
||||
<field name="partner_invoice_id" invisible="1"/>
|
||||
<field name="partner_order_id" invisible="1"/>
|
||||
<field name="partner_shipping_id" invisible="1"/>
|
||||
<field name="pricelist_id" invisible="1"/>
|
||||
<field name="analytic_account_id" invisible="1"/>
|
||||
<field name="date_confirm" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -39,9 +35,10 @@
|
|||
<field name="model">sale.report</field>
|
||||
<field name="type">graph</field>
|
||||
<field name="arch" type="xml">
|
||||
<graph string="Sales Orders Statistics" type="bar">
|
||||
<graph string="Sales Analysis" type="bar">
|
||||
<field name="product_id"/>
|
||||
<field name="price_total"/>
|
||||
<field name="state" group="True"/>
|
||||
</graph>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -51,84 +48,60 @@
|
|||
<field name="model">sale.report</field>
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Sale Orders">
|
||||
<search string="Sales Analysis">
|
||||
<group>
|
||||
<filter icon="terp-sale" string="This Year"
|
||||
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
|
||||
help="Tasks performed in this year"/>
|
||||
<filter icon="terp-sale" string="This Month"
|
||||
name="month"
|
||||
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
|
||||
help="Tasks performed in this month"/>
|
||||
<filter icon="terp-sale" string="Last 365 Days"
|
||||
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
|
||||
help="Tasks performed in last 365 days"/>
|
||||
<filter icon="terp-sale" string="Last 30 Days"
|
||||
name="month"
|
||||
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
|
||||
help="Tasks performed in last 30 days"/>
|
||||
<filter icon="gtk-media-rewind"
|
||||
string=" 7 Days "
|
||||
separator="1"
|
||||
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
|
||||
help="Tasks during last 7 days"/>
|
||||
string=" 7 Days "
|
||||
separator="1"
|
||||
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
|
||||
help="Tasks during last 7 days"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-sale"
|
||||
string="Quotations"
|
||||
domain="[('state','=','draft')]"/>
|
||||
string="Quotations"
|
||||
domain="[('state','=','draft')]"/>
|
||||
<filter icon="terp-sale"
|
||||
string="Waiting Schedule"
|
||||
domain="[('state','=','waiting_date')]"/>
|
||||
<filter icon="terp-sale"
|
||||
string="In progress"
|
||||
domain="[('state','=','progress')]"/>
|
||||
|
||||
string="Sales"
|
||||
domain="[('state','not in',('draft','done','cancel'))]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="product_id"/>
|
||||
<field name="user_id" widget="selection">
|
||||
<filter icon="terp-sale"
|
||||
string="sale Non User"
|
||||
help="sale Non User"
|
||||
domain="[('user_id','=',False)]"/>
|
||||
string="My Sales"
|
||||
help="My Sales"
|
||||
domain="[('user_id','=',uid)]"/>
|
||||
</field>
|
||||
<field name="partner_id"/>
|
||||
<field name="product_id"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="0" string="Extended options..." colspan="10" col="12">
|
||||
<filter icon="terp-sale" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
|
||||
<filter icon="terp-sale" string=" Invoice Exception " domain="[('state','=','invoice_except')]"/>
|
||||
<field name="date"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="shop_id" widget="selection"/>
|
||||
<field name="payment_term" widget="selection"/>
|
||||
<field name="fiscal_position" widget="selection"/>
|
||||
<newline/>
|
||||
<filter icon="terp-sale" string="Manual In Progress" domain="[('state','=','manual')]"/>
|
||||
<filter icon="terp-sale" string="Done" domain="[('state','=','done')]"/>
|
||||
<filter icon="terp-sale" string="Cancelled" domain="[('state','=','cancel')]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="partner_invoice_id"/>
|
||||
<field name="partner_order_id"/>
|
||||
<field name="partner_shipping_id"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="pricelist_id" widget="selection"/>
|
||||
<field name="analytic_account_id"/>
|
||||
<newline/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<field name="date"/>
|
||||
<field name="date_confirm"/>
|
||||
<field name="state"/>
|
||||
<field name="categ_id" widget="selection"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<newline/>
|
||||
<group expand="1" string="Group By..." colspan="10" col="12">
|
||||
<filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
|
||||
<filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
|
||||
<filter string="Salesman" icon="terp-sale" name="User" context="{'group_by':'user_id'}"/>
|
||||
<filter string="Fiscal Position" icon="terp-sale" context="{'group_by':'fiscal_position'}"/>
|
||||
<filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
|
||||
<filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
|
||||
<filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
|
||||
<filter string="Payment Term" icon="terp-sale" context="{'group_by':'payment_term'}"/>
|
||||
<filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Pricelist" icon="terp-sale" context="{'group_by':'pricelist_id'}"/>
|
||||
<filter string="Analytic Account" icon="terp-sale" context="{'group_by':'analytic_account_id'}"/>
|
||||
<newline/>
|
||||
<filter string="Invoice Address Name" icon="terp-sale" context="{'group_by':'partner_invoice_id'}"/>
|
||||
<filter string="Ordering Contact Name" icon="terp-sale" context="{'group_by':'partner_order_id'}"/>
|
||||
<filter string="Shipping Address Name" icon="terp-sale" context="{'group_by':'partner_shipping_id'}"/>
|
||||
<filter string="Category of Product" icon="terp-sale" context="{'group_by':'categ_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
|
||||
<filter string="Month" icon="terp-sale" context="{'group_by':'month'}"/>
|
||||
|
|
@ -139,19 +112,19 @@
|
|||
</record>
|
||||
|
||||
<record id="action_order_report_all" model="ir.actions.act_window">
|
||||
<field name="name">Sales Orders</field>
|
||||
<field name="name">Sales Analysis</field>
|
||||
<field name="res_model">sale.report</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="search_view_id" ref="view_order_product_search"/>
|
||||
<field name="context">{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}</field>
|
||||
<field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
|
||||
<menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="3"/>
|
||||
|
||||
<!-- This views used in board_sale module -->
|
||||
<record id="view_sale_order_by_clients_tree" model="ir.ui.view">
|
||||
<!--This views used in board_sale module -->
|
||||
<record id="view_sale_order_by_clients_tree" model="ir.ui.view">
|
||||
<field name="name">sale.order.by.clients.tree</field>
|
||||
<field name="model">sale.order.by.clients</field>
|
||||
<field name="type">tree</field>
|
||||
|
|
@ -216,7 +189,7 @@
|
|||
<field name="view_id" ref="view_uninvoiced_lines_per_month_tree"/>
|
||||
</record>
|
||||
|
||||
<record id="view_product_bought_by_sale_order_tree" model="ir.ui.view">
|
||||
<record id="view_product_bought_by_sale_order_tree" model="ir.ui.view">
|
||||
<field name="name">product.bought.by.sale.order.tree</field>
|
||||
<field name="model">product.bought.by.sale.order</field>
|
||||
<field name="type">tree</field>
|
||||
|
|
@ -283,5 +256,6 @@
|
|||
<field name="view_mode">tree,graph</field>
|
||||
<field name="view_id" ref="view_sales_by_regions_tree"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
Loading…
Reference in New Issue