##############################################################################
import time
-import mx.DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
from osv import fields, osv
-from tools.translate import _
+import tools
class one2many_mod3(fields.one2many):
def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
- if not context:
- context = context
res = {}
for obj in obj.browse(cr, user, ids, context=context):
res[obj.id] = []
list_ids = []
- for item in obj.user_id.child_ids:
- list_ids.append(item.id)
+ children = obj.pool.get('report_account_analytic.planning')._child_compute(cr, user, [obj.user_id.id], '', [])
+ for u_id in children.get(obj.user_id.id, []):
+ list_ids.append(u_id)
list_ids.append(obj.user_id.id)
ids2 = obj.pool.get(self._obj).search(cr, user, ['&',(self._fields_id,'=',obj.id),'|',('user_id','in',list_ids),('user_id','=',False)], limit=self._limit)
for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
_name = "report_account_analytic.planning"
_description = "Planning"
+ def _child_compute(self, cr, uid, ids, name, args, context=None):
+ obj_dept = self.pool.get('hr.department')
+ obj_user = self.pool.get('res.users')
+ result = {}
+ for user_id in ids:
+ child_ids = []
+ cr.execute('SELECT dept.id FROM hr_department AS dept \
+ LEFT JOIN hr_employee AS emp ON dept.manager_id = emp.id \
+ WHERE emp.id IN \
+ (SELECT emp.id FROM hr_employee \
+ JOIN resource_resource r ON r.id = emp.resource_id WHERE r.user_id=' + str(user_id) + ') ')
+ mgnt_dept_ids = [x[0] for x in cr.fetchall()]
+ ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context)
+ if ids_dept:
+ data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context)
+ children = map(lambda x: x['member_ids'], data_dept)
+ children = tools.flatten(children)
+ children = obj_user.search(cr, uid, [('id', 'in', children),('active', '=', True)], context=context)
+ if user_id in children:
+ children.remove(user_id)
+ child_ids.extend(tools.flatten(children))
+ set = {}
+ map(set.__setitem__, child_ids, [])
+ child_ids = set.keys()
+ result[user_id] = child_ids
+ return result
+
def _get_total_planned(self, cr, uid, ids, name, args, context=None):
result = {}
- for plan in self.browse(cr, uid, ids, context):
+ for plan in self.browse(cr, uid, ids, context=context):
plan_hrs=0.0
for p in plan.planning_user_ids:
if not p.plan_open : p.plan_open = 0.0
def _get_total_free(self, cr, uid, ids, name, args, context=None):
result = {}
- for plan in self.browse(cr, uid, ids, context):
+ for plan in self.browse(cr, uid, ids, context=context):
total_free = 0.0
for p in plan.planning_user_ids:
if p.free:
return result
def _check_planning_responsible(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
for obj_plan in self.browse(cr, uid, ids, context=context):
cr.execute("""
SELECT id FROM report_account_analytic_planning plan
'total_free': fields.function(_get_total_free, method=True, string='Total Free'),
}
_defaults = {
- 'date_from': time.strftime('%Y-%m-01'),
- 'date_to': (mx.DateTime.now()+mx.DateTime.RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d'),
+ 'date_from': lambda *a: time.strftime('%Y-%m-01'),
+ 'date_to': lambda *a: (datetime.now()+relativedelta(months=1, day=1, days=-1)).strftime('%Y-%m-%d'),
'user_id': lambda self, cr, uid, c: uid,
'state': 'draft',
'business_days': 20,
]
def action_open(self, cr, uid, id, context=None):
- if context is None:
- context = {}
self.write(cr, uid, id, {'state' : 'open'}, context=context)
return True
def action_cancel(self, cr, uid, id, context=None):
- if context is None:
- context = {}
self.write(cr, uid, id, {'state' : 'cancel'}, context=context)
return True
def action_draft(self, cr, uid, id, context=None):
- if context is None:
- context = {}
self.write(cr, uid, id, {'state' : 'draft'}, context=context)
return True
def action_done(self, cr, uid, id, context=None):
- if context is None:
- context = {}
self.write(cr, uid, id, {'state' : 'done'}, context=context)
return True
_rec_name = 'user_id'
def name_get(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
if not len(ids):
return []
- reads = self.read(cr, uid, ids, ['user_id', 'planning_id', 'note'], context)
+ reads = self.read(cr, uid, ids, ['user_id', 'planning_id', 'note'], context=context)
res = []
for record in reads:
name = '['+record['planning_id'][1]
return res
def _amount_base_uom(self, cr, uid, ids, name, args, context=None):
- if context is None:
- context = {}
users_obj = self.pool.get('res.users')
result = {}
- tm = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+ tm = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
if tm and tm.factor:
div = tm.factor
else:
div = 1.0
- for line in self.browse(cr, uid, ids, context):
+ for line in self.browse(cr, uid, ids, context=context):
result[line.id] = line.amount / line.amount_unit.factor * div
return result
_columns = {
- 'account_id': fields.many2one('account.analytic.account', 'Analytic account', required=True),
+ 'account_id': fields.many2one('account.analytic.account', 'Analytic account'),
'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'),
'user_id': fields.many2one('res.users', 'User'),
'amount': fields.float('Quantity', required=True),
}
def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
- if not context:
- context = context
+ if context is None:
+ context = {}
if not context.get('planning', False):
return super(project_task,self).search(cr, user, args, offset, limit, order, context)
cr.execute(" SELECT t.id, t.name \
_auto = False
def _get_tasks(self, cr, uid, ids, name, args, context=None):
- if context is None:
- context = {}
users_obj = self.pool.get('res.users')
result = {}
tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
div2 = tm2.factor
else:
div2 = 1.0
- for line in self.browse(cr, uid, ids, context):
+ for line in self.browse(cr, uid, ids, context=context):
if line.user_id:
cr.execute("""select COALESCE(sum(tasks.remaining_hours),0) from project_task tasks \
where tasks.planning_line_id IN (select id from report_account_analytic_planning_line\
return result
def _get_free(self, cr, uid, ids, name, args, context=None):
- if context is None:
- context = {}
result = {}
- for line in self.browse(cr, uid, ids, context):
+ for line in self.browse(cr, uid, ids, context=context):
if line.user_id:
result[line.id] = line.planning_id.business_days - line.plan_tasks - line.plan_open - line.holiday
else:
return result
def _get_timesheets(self, cr, uid, ids, name, args, context=None):
- if context is None:
- context = {}
users_obj = self.pool.get('res.users')
result = {}
- tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+ tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
if tm2 and tm2.factor:
div2 = tm2.factor
else:
div2 = 1.0
- for line in self.browse(cr, uid, ids, context):
+ for line in self.browse(cr, uid, ids, context=context):
if line.user_id:
cr.execute("""
SELECT sum(unit_amount/uom.factor) FROM account_analytic_line acc
_auto = False
def _get_tasks(self, cr, uid, ids, name, args, context=None):
- if context is None:
- context = {}
users_obj = self.pool.get('res.users')
result = {}
- tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
+ tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
if tm and tm.factor:
div = tm.factor
else:
div = 1.0
- tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+ tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
if tm2 and tm2.factor:
div2 = tm2.factor
else:
div2 = 1.0
- for line in self.browse(cr, uid, ids, context):
+ for line in self.browse(cr, uid, ids, context=context):
cr.execute("""
SELECT COALESCE(sum(tasks.remaining_hours),0)
FROM project_task tasks
SELECT id
FROM report_account_analytic_planning_line
WHERE planning_id = %s AND account_id=%s
- )""", (line.planning_id.id,line.account_id.id ))
+ )""", (line.planning_id.id, line.account_id and line.account_id.id or None))
result[line.id] = cr.fetchall()[0][0] / div * div2
return result
def _get_timesheets(self, cr, uid, ids, name, args, context=None):
- if context is None:
- context = {}
users_obj = self.pool.get('res.users')
result = {}
- tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+ tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
if tm2 and tm2.factor:
div2 = tm2.factor
else:
div2 = 1.0
- for line in self.browse(cr, uid, ids, context):
+ for line in self.browse(cr, uid, ids, context=context):
cr.execute("""
SELECT SUM(unit_amount/uom.factor) FROM account_analytic_line acc
LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
- WHERE acc.date>=%s and acc.date<=%s and acc.account_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.account_id.id, ))
+ WHERE acc.date>=%s and acc.date<=%s and acc.account_id=%s""", (line.planning_id.date_from, line.planning_id.date_to, line.account_id and line.account_id.id or None))
res = cr.fetchall()[0][0]
if res:
result[line.id] = res * div2
_order = 'planning_id,user_id'
def _sum_amount_real(self, cr, uid, ids, name, args, context=None):
- if context is None:
- context = {}
users_obj = self.pool.get('res.users')
result = {}
- tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+ tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
if tm2 and tm2.factor:
div2 = tm2.factor
else:
div2 = 1.0
- for line in self.browse(cr, uid, ids, context):
+ for line in self.browse(cr, uid, ids, context=context):
if line.user_id:
cr.execute('''SELECT sum(acc.unit_amount/uom.factor) FROM account_analytic_line acc
LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
-WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
+WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.id, line.account_id and line.account_id.id or None, line.planning_id.date_from, line.planning_id.date_to))
else:
- cr.execute('SELECT sum(unit_amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s', (line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
-
+ cr.execute('SELECT sum(unit_amount) FROM account_analytic_line WHERE account_id=%s AND date>=%s AND date<=%s', (line.account_id and line.account_id.id or None, line.planning_id.date_from, line.planning_id.date_to))
+
sum = cr.fetchone()
if sum and sum[0]:
result[line.id] = sum[0] * div2
return result
def _sum_amount_tasks(self, cr, uid, ids, name, args, context=None):
- if context is None:
- context = {}
users_obj = self.pool.get('res.users')
result = {}
- tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
+ tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
if tm and tm.factor:
div = tm.factor
else:
div = 1.0
- tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+ tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
if tm2 and tm2.factor:
div2 = tm2.factor
else:
div2 = 1.0
- for line in self.browse(cr, uid, ids, context):
+ for line in self.browse(cr, uid, ids, context=context):
where = ''
if line.user_id:
where = 'user_id=' + str(line.user_id.id) + ' and '
project_id IN (select id from project_project where analytic_account_id=%s) AND
date_end>=%s AND
date_end<=%s''', (
- line.account_id.id,
+ line.account_id and line.account_id.id or None,
line.planning_id.date_from,
line.planning_id.date_to)
)
'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
'user_id': fields.many2one('res.users', 'User'),
'manager_id': fields.many2one('res.users', 'Manager'),
- 'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
+ 'account_id': fields.many2one('account.analytic.account', 'Account'),
'sum_amount': fields.float('Planned Days', required=True),
'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
}
res_company()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
projects / odoo / odoo.git / blobdiff