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

merge 

bzr revid: fp@tinyerp.com-20111111135414-2qk32ep1pbbco41v
This commit is contained in:
Fabien Pinckaers 2011-11-11 14:54:14 +01:00
parent 1825f5e284 d64a317ccb
commit b55a9cbcfe
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,7 @@ 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,
s.partner_id as partner_id,

6
addons/sale/report/sale_report_view.xml
View File

@ -22,7 +22,7 @@
<field name="nbr" sum="# of Lines"/>
<field name="product_uom_qty" sum="# of Qty"/>
<field name="shipped_qty_1" sum="Shipped"/>
<field name="uom_name" invisible="not context.get('set_visible',False)"/>
<field name="product_uom" invisible="not context.get('set_visible',False)"/>
<field name="price_total" sum="Total Price"/>
<field name="delay" sum="Commitment Delay"/>
<field name="state" invisible="1"/>
@ -98,7 +98,7 @@
<filter string="Partner" icon="terp-partner" name="Customer" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
<filter string="Reference UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
<filter string="Reference UoM" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
<filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
<filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
@ -208,7 +208,7 @@
<field name="price_total" />
<field name="user_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="uom_name" invisible="1"/>
<field name="product_uom" invisible="1"/>
<field name="categ_id" invisible="1"/>
<field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
<field name="state" invisible="1"/>