import tools
from tools.translate import _
+class project_project(osv.osv):
+ _inherit = 'project.project'
+ def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
+ result = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context=context)
+ if result.get('value', False):
+ try:
+ d = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')
+ if d:
+ result['value']['to_invoice'] = d[1]
+ except ValueError, e:
+ pass
+ return result
+project_project()
+
class project_work(osv.osv):
_inherit = "project.task.work"
raise osv.except_osv(_('Bad Configuration !'),
_('No journal defined on the related employee.\nFill in the timesheet tab of the employee form.'))
- 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 not a:
def create(self, cr, uid, vals, *args, **kwargs):
obj_timesheet = self.pool.get('hr.analytic.timesheet')
+ project_obj = self.pool.get('project.project')
task_obj = self.pool.get('project.task')
+ uom_obj = self.pool.get('product.uom')
+
vals_line = {}
context = kwargs.get('context', {})
- obj_task = task_obj.browse(cr, uid, vals['task_id'])
- result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
- vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
- vals_line['user_id'] = vals['user_id']
- vals_line['product_id'] = result['product_id']
- vals_line['date'] = vals['date'][:10]
- vals_line['unit_amount'] = vals['hours']
- acc_id = obj_task.project_id.analytic_account_id.id
- vals_line['account_id'] = acc_id
- res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id)
- if res.get('value'):
- vals_line.update(res['value'])
- vals_line['general_account_id'] = result['general_account_id']
- vals_line['journal_id'] = result['journal_id']
- vals_line['amount'] = 0.0
- vals_line['product_uom_id'] = result['product_uom_id']
- amount = vals_line['unit_amount']
- prod_id = vals_line['product_id']
- unit = False
- timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=context)
-
- # Compute based on pricetype
- amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
- prod_id, amount, unit, context=context)
- if amount_unit and 'amount' in amount_unit.get('value',{}):
- updv = { 'amount': amount_unit['value']['amount'] * (-1.0) }
- obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
- vals['hr_analytic_timesheet_id'] = timeline_id
+ if not context.get('no_analytic_entry',False):
+ obj_task = task_obj.browse(cr, uid, vals['task_id'])
+ result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
+ vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
+ vals_line['user_id'] = vals['user_id']
+ vals_line['product_id'] = result['product_id']
+ vals_line['date'] = vals['date'][:10]
+
+ #calculate quantity based on employee's product's uom
+ vals_line['unit_amount'] = vals['hours']
+
+ default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
+ if result['product_uom_id'] != default_uom:
+ vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
+ acc_id = obj_task.project_id and obj_task.project_id.analytic_account_id.id or False
+ if acc_id:
+ vals_line['account_id'] = acc_id
+ res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id)
+ if res.get('value'):
+ vals_line.update(res['value'])
+ vals_line['general_account_id'] = result['general_account_id']
+ vals_line['journal_id'] = result['journal_id']
+ vals_line['amount'] = 0.0
+ vals_line['product_uom_id'] = result['product_uom_id']
+ amount = vals_line['unit_amount']
+ prod_id = vals_line['product_id']
+ unit = False
+ timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=context)
+
+ # Compute based on pricetype
+ amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
+ prod_id, amount, False, unit, context=context)
+ if amount_unit and 'amount' in amount_unit.get('value',{}):
+ updv = { 'amount': amount_unit['value']['amount'] }
+ obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
+ vals['hr_analytic_timesheet_id'] = timeline_id
return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
def write(self, cr, uid, ids, vals, context=None):
if context is None:
context = {}
- obj = self.pool.get('hr.analytic.timesheet')
timesheet_obj = self.pool.get('hr.analytic.timesheet')
+ project_obj = self.pool.get('project.project')
+ uom_obj = self.pool.get('product.uom')
+ result = {}
+
if isinstance(ids, (long, int)):
ids = [ids,]
if 'date' in vals:
vals_line['date'] = vals['date'][:10]
if 'hours' in vals:
+ default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
vals_line['unit_amount'] = vals['hours']
prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set
+
+ if result.get('product_uom_id',False) and (not result['product_uom_id'] == default_uom):
+ vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
+
# Compute based on pricetype
- amount_unit = obj.on_change_unit_amount(cr, uid, line_id.id,
- prod_id=prod_id,
+ amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
+ prod_id=prod_id, company_id=False,
unit_amount=vals_line['unit_amount'], unit=False, context=context)
if amount_unit and 'amount' in amount_unit.get('value',{}):
- vals_line['amount'] = amount_unit['value']['amount'] * (-1.0)
+ vals_line['amount'] = amount_unit['value']['amount']
- obj.write(cr, uid, [line_id.id], vals_line, context=context)
+ self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
return super(project_work,self).write(cr, uid, ids, vals, context)
hat_ids = []
for task in self.browse(cr, uid, ids):
if task.hr_analytic_timesheet_id:
- hat_ids.append(task.hr_analytic_timesheet_id)
+ hat_ids.append(task.hr_analytic_timesheet_id.id)
# delete entry from timesheet too while deleting entry to task.
if hat_ids:
hat_obj.unlink(cr, uid, hat_ids, *args, **kwargs)
if vals.get('project_id',False) or vals.get('name',False):
vals_line = {}
hr_anlytic_timesheet = self.pool.get('hr.analytic.timesheet')
- task_obj_l = self.browse(cr, uid, ids, context)
+ task_obj_l = self.browse(cr, uid, ids, context=context)
if vals.get('project_id',False):
- project_obj = self.pool.get('project.project').browse(cr, uid, vals['project_id'])
+ project_obj = self.pool.get('project.project').browse(cr, uid, vals['project_id'], context=context)
acc_id = project_obj.analytic_account_id.id
for task_obj in task_obj_l:
if len(task_obj.work_ids):
for task_work in task_obj.work_ids:
+ if not task_work.hr_analytic_timesheet_id:
+ continue
line_id = task_work.hr_analytic_timesheet_id.id
if vals.get('project_id',False):
vals_line['account_id'] = acc_id
task()
-class project_project(osv.osv):
- _inherit = "project.project"
-
- def name_get(self, cr, user, ids, context=None):
- if context is None:
- context = {}
- result = []
- for project in self.browse(cr, user, ids, context):
- name = "[%s] %s" % (project.analytic_account_id and project.analytic_account_id.code or '?', project.name)
- result.append((project.id, name))
- return result
-
-project_project()
+class res_partner(osv.osv):
+ _inherit = 'res.partner'
+ def unlink(self, cursor, user, ids, context=None):
+ parnter_id=self.pool.get('project.project').search(cursor, user, [('partner_id', 'in', ids)])
+ if parnter_id:
+ raise osv.except_osv(_('Invalid action !'), _('Cannot delete Partner which is Assigned to project !'))
+ return super(res_partner,self).unlink(cursor, user, ids,
+ context=context)
+res_partner()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
projects / odoo / odoo.git / blobdiff