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

crm : Sort cases by date in desc 

report_purchase : fixed bug if Purchase Order has not any line
report_sale : Put graph views all  these reports of this module. and Open in graph view by default.

bzr revid: hmo@tinyerp.com-20080819132854-ae1554twlwsr5f7x
This commit is contained in:
Harshad Modi 2008-08-19 18:58:54 +05:30
parent 02a3ce47f4
commit dc468f95ff
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/crm/crm.py
View File

@ -379,7 +379,7 @@ class crm_case(osv.osv):
'priority': lambda *a: AVAILABLE_PRIORITIES[2][0],
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
}
_order = 'priority, date_deadline desc, id desc'
_order = 'priority, date_deadline desc, date desc,id desc'
def _action(self, cr, uid, cases, state_to, scrit=None, context={}):
if not scrit:

2
addons/report_purchase/report_purchase.py
View File

@ -72,6 +72,7 @@ class report_purchase_order_product(osv.osv):
from purchase_order s
left join purchase_order_line l on (s.id=l.order_id)
left join product_uom u on (u.id=l.product_uom)
where l.product_id is not null
group by l.product_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
)
""")
@ -117,6 +118,7 @@ class report_purchase_order_category(osv.osv):
left join product_product p on (p.id=l.product_id)
left join product_template t on (t.id=p.product_tmpl_id)
left join product_uom u on (u.id=l.product_uom)
where l.product_id is not null
group by t.categ_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
)
""")

35
addons/report_sale/report_sale_view.xml
View File

@ -37,12 +37,24 @@
</tree>
</field>
</record>
<record id="view_order_product_graph" model="ir.ui.view">
<field name="name">report.sale.order.product.graph</field>
<field name="model">report.sale.order.product</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Sales by Product" type="pie">
<field name="product_id"/>
<field name="price_average"/>
</graph>
</field>
</record>
<record id="action_order_product_tree" model="ir.actions.act_window">
<field name="name">Sales by Product (this month)</field>
<field name="res_model">report.sale.order.product</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem id="next_id_80" name="Reporting" parent="sale.menu_sale_root"/><menuitem id="next_id_81" name="This Month" parent="next_id_80"/><menuitem action="action_order_product_tree" id="menu_report_order_product" parent="next_id_81"/>
@ -50,7 +62,7 @@
<field name="name">Sales by Product</field>
<field name="res_model">report.sale.order.product</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_mode">graph,tree</field>
</record>
<menuitem id="next_id_82" name="All Months" parent="report_sale.next_id_80"/><menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_82"/>
@ -105,7 +117,7 @@
<field name="name">Sales by Category of Product (this month)</field>
<field name="res_model">report.sale.order.category</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
</record>
<menuitem action="action_order_category_tree" id="menu_report_order_category" parent="report_sale.next_id_81"/>
@ -113,16 +125,27 @@
<field name="name">Sales by Category of Products</field>
<field name="res_model">report.sale.order.category</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="view_mode">graph,tree</field>
</record>
<menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_sale.next_id_82"/>
<!-- Sales of the month -->
<record id="view_order_graph" model="ir.ui.view">
<field name="name">sale.order.graph</field>
<field name="model">sale.order</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Sales orders" type="pie">
<field name="partner_id"/>
<field name="amount_untaxed"/>
</graph>
</field>
</record>
<record id="action_order_sale_list" model="ir.actions.act_window">
<field name="name">Sales of the Month</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">graph,tree,form</field>
<field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
</record>
<menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="report_sale.next_id_81"/>
@ -131,4 +154,4 @@
</data>
</terp>
</terp>