from osv import fields
from osv import osv
-from osv.orm import except_orm
from tools.translate import _
class hr_employee(osv.osv):
_inherit = "hr.employee"
_columns = {
'product_id': fields.many2one('product.product', 'Product', help="Specifies employee's designation as a product with type 'service'."),
- 'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal')
+ 'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
+ 'uom_id': fields.related('product_id', 'uom_id', type='many2one', relation='product.uom', string='UoM', store=True, readonly=True)
+ }
+
+ def _getAnalyticJournal(self, cr, uid, context=None):
+ md = self.pool.get('ir.model.data')
+ try:
+ result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
+ return result[1]
+ except ValueError:
+ pass
+ return False
+
+ def _getEmployeeProduct(self, cr, uid, context=None):
+ md = self.pool.get('ir.model.data')
+ try:
+ result = md.get_object_reference(cr, uid, 'product', 'product_consultant')
+ return result[1]
+ except ValueError:
+ pass
+ return False
+
+ _defaults = {
+ 'journal_id': _getAnalyticJournal,
+ 'product_id': _getEmployeeProduct
}
hr_employee()
class hr_analytic_timesheet(osv.osv):
_name = "hr.analytic.timesheet"
_table = 'hr_analytic_timesheet'
- _description = "Timesheet line"
+ _description = "Timesheet Line"
_inherits = {'account.analytic.line': 'line_id'}
_order = "id desc"
_columns = {
- 'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'),
- 'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id',relation='account.analytic.account',store=True),
+ '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),
}
- def unlink(self, cr, uid, ids, context={}):
+ def unlink(self, cr, uid, ids, context=None):
toremove = {}
- for obj in self.browse(cr, uid, ids, context):
+ for obj in self.browse(cr, uid, ids, context=context):
toremove[obj.line_id.id] = True
- self.pool.get('account.analytic.line').unlink(cr, uid, toremove.keys(), context)
- return super(hr_analytic_timesheet, self).unlink(cr, uid, ids, context)
+ self.pool.get('account.analytic.line').unlink(cr, uid, toremove.keys(), context=context)
+ return super(hr_analytic_timesheet, self).unlink(cr, uid, ids, context=context)
- def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit, context={}):
- res = {}
-# if prod_id and unit_amount:
- if prod_id:
+ def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, company_id, unit=False, journal_id=False, context=None):
+ res = {'value':{}}
+ if prod_id and unit_amount:
# find company
- company_id=self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context)
- res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount,company_id,unit, context)
+ company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context)
+ r = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, journal_id, context=context)
+ if r:
+ res.update(r)
+ # update unit of measurement
+ if prod_id:
+ uom = self.pool.get('product.product').browse(cr, uid, prod_id, context=context)
+ if uom.uom_id:
+ res['value'].update({'product_uom_id': uom.uom_id.id})
+ else:
+ res['value'].update({'product_uom_id': False})
return res
- def _getEmployeeProduct(self, cr, uid, context):
+ def _getEmployeeProduct(self, cr, uid, context=None):
+ if context is None:
+ context = {}
emp_obj = self.pool.get('hr.employee')
- emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
if emp_id:
- emp=emp_obj.browse(cr, uid, emp_id[0], context)
+ emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
if emp.product_id:
return emp.product_id.id
return False
- def _getEmployeeUnit(self, cr, uid, context):
+ def _getEmployeeUnit(self, cr, uid, context=None):
emp_obj = self.pool.get('hr.employee')
- emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+ if context is None:
+ context = {}
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
if emp_id:
- emp=emp_obj.browse(cr, uid, emp_id[0], context)
+ emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
if emp.product_id:
return emp.product_id.uom_id.id
return False
- def _getGeneralAccount(self, cr, uid, context):
+ def _getGeneralAccount(self, cr, uid, context=None):
emp_obj = self.pool.get('hr.employee')
- emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+ if context is None:
+ context = {}
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
if emp_id:
emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
if bool(emp.product_id):
- a = emp.product_id.product_tmpl_id.property_account_expense.id
+ a = emp.product_id.product_tmpl_id.property_account_expense.id
if not a:
a = emp.product_id.categ_id.property_account_expense_categ.id
if a:
return a
return False
- def _getAnalyticJournal(self, cr, uid, context):
+ def _getAnalyticJournal(self, cr, uid, context=None):
emp_obj = self.pool.get('hr.employee')
- emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))])
+ if context is None:
+ context = {}
+ emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
if emp_id:
emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
if emp.journal_id:
_defaults = {
- 'product_uom_id' : _getEmployeeUnit,
- 'product_id' : _getEmployeeProduct,
- 'general_account_id' : _getGeneralAccount,
- 'journal_id' : _getAnalyticJournal,
- 'date' : lambda self,cr,uid,ctx: ctx.get('date', time.strftime('%Y-%m-%d')),
- 'user_id' : lambda obj, cr, uid, ctx : ctx.get('user_id', uid),
+ 'product_uom_id': _getEmployeeUnit,
+ 'product_id': _getEmployeeProduct,
+ 'general_account_id': _getGeneralAccount,
+ 'journal_id': _getAnalyticJournal,
+ 'date': lambda self, cr, uid, ctx: ctx.get('date', fields.date.context_today(self,cr,uid,context=ctx)),
+ 'user_id': lambda obj, cr, uid, ctx: ctx.get('user_id', uid),
}
def on_change_account_id(self, cr, uid, ids, account_id):
return {'value':{}}
def on_change_date(self, cr, uid, ids, date):
if ids:
- new_date = self.read(cr,uid,ids[0],['date'])['date']
+ new_date = self.read(cr, uid, ids[0], ['date'])['date']
if date != new_date:
warning = {'title':'User Alert!','message':'Changing the date will let this entry appear in the timesheet of the new date.'}
return {'value':{},'warning':warning}
return {'value':{}}
- def create(self, cr, uid, vals, context={}):
+ def create(self, cr, uid, vals, context=None):
+ if context is None:
+ context = {}
emp_obj = self.pool.get('hr.employee')
emp_id = emp_obj.search(cr, uid, [('user_id', '=', context.get('user_id', uid))], context=context)
ename = ''
def on_change_user_id(self, cr, uid, ids, user_id):
if not user_id:
return {}
- return {'value' : {
- 'product_id' : self._getEmployeeProduct(cr,user_id, context= {}),
- 'product_uom_id' : self._getEmployeeUnit(cr, user_id, context= {}),
- 'general_account_id' :self. _getGeneralAccount(cr, user_id, context= {}),
- 'journal_id' : self._getAnalyticJournal(cr, user_id, context= {}),
+ context = {'user_id': user_id}
+ return {'value': {
+ 'product_id': self. _getEmployeeProduct(cr, uid, context),
+ 'product_uom_id': self._getEmployeeUnit(cr, uid, context),
+ 'general_account_id': self._getGeneralAccount(cr, uid, context),
+ 'journal_id': self._getAnalyticJournal(cr, uid, context),
}}
+
hr_analytic_timesheet()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
projects / odoo / odoo.git / blobdiff