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)
+ 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')
vals_line = {}
context = kwargs.get('context', {})
- #TOFIX: after loading project_timesheet module, it's fail yml of other project* modules.
- #Temporary: pass context['withoutemployee'] = True in all yml.
- if 'withoutemployee' in context and context['withoutemployee']:
- return super(project_work,self).create(cr, uid, vals, context=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]
-
- #calculate quantity based on employee's product's uom
- vals_line['unit_amount'] = vals['hours']
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
- 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
+ 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 'date' in vals:
vals_line['date'] = vals['date'][:10]
if 'hours' in vals:
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
+ 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 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:
return super(task,self).write(cr, uid, ids, vals, context)
task()
+
+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