Merge lp:~camptocamp/openobject-addons/trunk-fix-1178617 into lp:openobject-addons

[Yannick Vaucher @ Camptocamp]

Patch taken from code of hr_timesheet_improvement

Unmerged revisions

8777. By Yannick Vaucher @ Camptocamp on 2013-06-19

[FIX] hr_timesheet - details tab must be sorted by date

=== modified file 'hr_timesheet/hr_timesheet.py'
--- hr_timesheet/hr_timesheet.py	2013-04-29 15:14:10 +0000
+++ hr_timesheet/hr_timesheet.py	2013-06-19 13:19:06 +0000
@@ -69,10 +69,31 @@
     _table = 'hr_analytic_timesheet'
     _description = "Timesheet Line"
     _inherits = {'account.analytic.line': 'line_id'}
-    _order = "id desc"
+    _order = "date_aal DESC, account_name ASC"
+
+    def _get_account_analytic_line(self, cr, uid, ids, context=None):
+        ts_line_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, [('line_id', 'in', ids)])
+        return ts_line_ids
+
+    def _get_account_analytic_account(self, cr, uid, ids, context=None):
+        ts_line_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, [('account_id', 'in', ids)])
+        return ts_line_ids
+
     _columns = {
         'line_id': fields.many2one('account.analytic.line', 'Analytic Line', ondelete='cascade', required=True),
         'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner', relation='res.partner', store=True),
+
+        'date_aal': fields.related('line_id', 'date', string="Analytic Line Date", type='date',
+            store={
+                'account.analytic.line': (_get_account_analytic_line, ['date'], 10),
+                'hr.analytic.timesheet': (lambda self,cr,uid,ids,context=None: ids, None, 10),
+                }),
+        'account_name': fields.related('account_id', 'name', string="Analytic Account Name", type='char', size=256,
+            store={
+                'account.analytic.account': (_get_account_analytic_account, ['name'], 10),
+                'hr.analytic.timesheet': (lambda self,cr,uid,ids,context=None: ids, None, 10),
+                }
+            ),
     }
 
     def unlink(self, cr, uid, ids, context=None):