diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index 5fa14e8c830..76d018680d2 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -33,6 +33,7 @@ class purchase_report(osv.osv): _columns = { 'date': fields.date('Date', readonly=True), 'name': fields.char('Year',size=64,required=False, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), 'state': fields.selection([ ('draft','Quotation'), ('waiting_date','Waiting Schedule'), @@ -73,6 +74,7 @@ class purchase_report(osv.osv): s.date_order as date, to_char(s.date_order, 'YYYY') as name, to_char(s.date_order, 'MM') as month, + to_char(s.date_order, 'YYYY-MM-DD') as day, s.state, s.warehouse_id as warehouse_id, s.partner_id as partner_id, @@ -99,6 +101,7 @@ class purchase_report(osv.osv): s.date_order, to_char(s.date_order, 'YYYY'), to_char(s.date_order, 'MM'), + to_char(s.date_order, 'YYYY-MM-DD'), s.state, s.warehouse_id, s.fiscal_position, diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 7e35c2dbe8b..153945e7537 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -20,14 +20,15 @@ tree - - - - - + + + + + + @@ -46,51 +47,63 @@ - - + + + + string="Quotations" + domain="[('state','=','draft')]"/> + string="Waiting Schedule" + domain="[('state','=','waiting_date')]"/> + + + string="My Purchaes" + help = "My Purchaes" + domain="[('user_id','=',uid)]" /> + - + - - - - - - - - + + + + + + + + + + - + @@ -98,8 +111,9 @@ - + + @@ -113,7 +127,7 @@ form tree,graph - {'search_default_Responsible': 1} + {'search_default_month':1,'search_default_Responsible':1,'group_by_no_leaf':1,'group_by':[]}