Merge lp:~openerp-dev/openobject-addons/7.0-today-filter-mat into lp:openobject-addons/7.0

[Martin Trigaux (OpenERP)]

Not to be merged in 7.0, info only

requires web branch https://code.launchpad.net/~openerp-dev/openerp-web/7.0-today-filter-mat/+merge/203589

fix filters to get correct today

[lp:~openerp-dev/openobject-addons/7.0-today-filter-mat]

9799. By Martin Trigaux (OpenERP) on 2014-01-30

[FIX] point_of_sale: group by day uses timezone

9800. By Martin Trigaux (OpenERP) on 2014-03-13

[MERGE] sync with 7.0 up to rev 9900

Unmerged revisions

9800. By Martin Trigaux (OpenERP) on 2014-03-13

[MERGE] sync with 7.0 up to rev 9900

9799. By Martin Trigaux (OpenERP) on 2014-01-30

[FIX] point_of_sale: group by day uses timezone

9798. By Martin Trigaux (OpenERP) on 2014-01-28

[FIX] filters to get valid today bounds

9797. By Martin Trigaux (OpenERP) on 2014-01-28

[FIX] point_of_sale: correct model and domain to have a valid today filter

=== modified file 'event/event_view.xml'
--- event/event_view.xml	2013-03-04 12:55:34 +0000
+++ event/event_view.xml	2014-03-13 15:56:20 +0000
@@ -293,7 +293,7 @@
                     <separator/>
                     <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
                     <separator/>
-                    <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Upcoming events from today" />
+                    <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', datetime.datetime.now().replace(hour=0, minute=0, second=0))]" help="Upcoming events from today" />
                     <field name="type"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">

=== modified file 'hr_attendance/hr_attendance_view.xml'
--- hr_attendance/hr_attendance_view.xml	2012-11-29 22:26:45 +0000
+++ hr_attendance/hr_attendance_view.xml	2014-03-13 15:56:20 +0000
@@ -52,7 +52,7 @@
                 <search string="Hr Attendance Search">
                     <field name="name" string="Attendance"/>
                     <field name="action"/>
-                    <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
+                    <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',datetime.datetime.now().replace(hour=0, minute=0, second=0)),('name','&lt;=',datetime.datetime.now().replace(hour=23, minute=59, second=59))]" />
                     <separator/>
                     <filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
                     <field name="employee_id"/>

=== modified file 'lunch/lunch_view.xml'
--- lunch/lunch_view.xml	2013-08-21 14:49:00 +0000
+++ lunch/lunch_view.xml	2014-03-13 15:56:20 +0000
@@ -19,7 +19,7 @@
                     <filter name="comfirmed" string="Received" domain="[('state','=','confirmed')]"/>
                     <filter name="cancelled" string="Cancelled" domain="[('state','=','cancelled')]"/>
                     <separator/>
-                    <filter name="today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
+                    <filter name="today" string="Today" domain="[('date','=',context_today().strftime('%%Y-%%m-%%d'))]"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter name="group_by_supplier" string="By Supplier" context="{'group_by':'supplier'}"/>

=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml	2013-11-07 11:02:56 +0000
+++ point_of_sale/point_of_sale_view.xml	2014-03-13 15:56:20 +0000
@@ -985,7 +985,7 @@
                     <field name="name" />
                     <filter string="Open" domain="[('state', '=', 'opened')]" />
                     <separator/>
-                    <filter string="Today" domain="[('start_at', '>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" />
+                    <filter string="Today" domain="[('start_at', '>=', datetime.datetime.now().replace(hour=0, minute=0, second=0))]" />
                     <field name="config_id" />
                     <field name="user_id" />
                     <group expand="0" string="Group By...">

=== modified file 'point_of_sale/report/pos_order_report.py'
--- point_of_sale/report/pos_order_report.py	2012-12-06 14:56:32 +0000
+++ point_of_sale/report/pos_order_report.py	2014-03-13 15:56:20 +0000
@@ -27,7 +27,7 @@
     _description = "Point of Sale Orders Statistics"
     _auto = False
     _columns = {
-        'date': fields.date('Date Order', readonly=True),
+        'date': fields.datetime('Date Order', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
@@ -57,7 +57,7 @@
                 select
                     min(l.id) as id,
                     count(*) as nbr,
-                    to_date(to_char(s.date_order, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
+                    s.date_order as date,
                     sum(l.qty * u.factor) as product_qty,
                     sum(l.qty * l.price_unit) as price_total,
                     sum((l.qty * l.price_unit) * (l.discount / 100)) as total_discount,
@@ -78,7 +78,7 @@
                     left join product_template pt on (pt.id=l.product_id)
                     left join product_uom u on (u.id=pt.uom_id)
                 group by
-                    to_char(s.date_order, 'dd-MM-YYYY'),to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),
+                    s.date_order,to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),
                     to_char(s.date_order, 'YYYY-MM-DD'), s.partner_id,s.state,
                     s.user_id,s.shop_id,s.company_id,s.sale_journal,l.product_id,s.create_date
                 having

=== modified file 'point_of_sale/report/pos_order_report_view.xml'
--- point_of_sale/report/pos_order_report_view.xml	2012-11-29 22:26:45 +0000
+++ point_of_sale/report/pos_order_report_view.xml	2014-03-13 15:56:20 +0000
@@ -38,7 +38,7 @@
                     <separator/>
                     <filter icon="terp-go-year" string="Year" name="year" domain="[('year','=',time.strftime('%%Y'))]" help="POS ordered created during current year"/>
                     <separator/>
-                    <filter icon="terp-go-today" string="Today" name="today" domain="[('date','=', time.strftime('%%Y-%%m-%%d'))]"
+                    <filter icon="terp-go-today" string="Today" name="today" domain="[('date','&gt;=', datetime.datetime.now().replace(hour=0, minute=0, second=0)), ('date','&lt;=', datetime.datetime.now().replace(hour=23, minute=59, second=59))]"
                          help="POS ordered created by today"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Sales" help="My Sales" domain="[('user_id','=',uid)]"/>
@@ -50,7 +50,7 @@
                         <filter string="Salesperson" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
                         <filter string="Customer" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of order date"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'date:day'}" help="Day of order date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of order date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of order date"/>
                     </group>

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2014-03-13 13:44:38 +0000
+++ stock/stock_view.xml	2014-03-13 15:56:20 +0000
@@ -1368,7 +1368,7 @@
                     <filter icon="terp-stock" string="To Do" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                     <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                     <separator/>
-                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
+                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',datetime.datetime.now().replace(hour=23, minute=59, second=59)),('date','&gt;=',datetime.datetime.now().replace(hour=0, minute=0, second=0))]" help="Orders processed Today or planned for Today"/>
                     <field name="product_id"/>
                     <field name="name" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
                     <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','child_of',self)]"/>