'name': fields.char('Description', size=128, required=True),
'id': fields.integer('Sheet ID', readonly=True),
'date': fields.date('Date', select=True),
- 'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is paid."),
+ 'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is done."),
'employee_id': fields.many2one('hr.employee', "Employee", required=True),
'user_id': fields.many2one('res.users', 'User', required=True),
'date_confirm': fields.date('Confirmation Date', select=True, help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
'note': fields.text('Note'),
- 'amount': fields.function(_amount, string='Total Amount'),
+ 'amount': fields.function(_amount, string='Total Amount', digits_compute= dp.get_precision('Account')),
'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'department_id':fields.many2one('hr.department','Department'),
('cancelled', 'Refused'),
('confirm', 'Waiting Approval'),
('accepted', 'Approved'),
- ('receipted', 'Receipted'),
- ('paid', 'Reimbursed')
+ ('done', 'Done'),
],
'Status', readonly=True, help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
- \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Receipted\'.\n If the expense is paid to user, the status is \'Reimbursed\'.'),
+ \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Done\'.'),
}
_defaults = {
'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),
'currency_id': _get_currency,
}
+ def onchange_currency_id(self, cr, uid, ids, currency_id=False, company_id=False, context=None):
+ res = {'value': {'journal_id': False}}
+ journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase'), ('currency','=',currency_id), ('company_id', '=', company_id)], context=context)
+ if journal_ids:
+ res['value']['journal_id'] = journal_ids[0]
+ return res
+
def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
emp_obj = self.pool.get('hr.employee')
department_id = False
return {'value': {'department_id': department_id, 'company_id': company_id}}
def expense_confirm(self, cr, uid, ids, *args):
+ for expense in self.browse(cr, uid, ids):
+ if expense.employee_id and expense.employee_id.parent_id.user_id:
+ self.message_subscribe_users(cr, uid, [expense.id], user_ids=[expense.employee_id.parent_id.user_id.id])
self.write(cr, uid, ids, {
'state':'confirm',
'date_confirm': time.strftime('%Y-%m-%d')
self.write(cr, uid, ids, {'state':'cancelled'})
return True
- def expense_paid(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state':'paid'})
- return True
-
- def receipt(self, cr, uid, ids, context=None):
- if not ids: return []
- mod_obj = self.pool.get('ir.model.data')
- wkf_service = netsvc.LocalService("workflow")
-
- voucher_ids = []
- for id in ids:
- wkf_service.trg_validate(uid, 'hr.expense.expense', id, 'receipt', cr)
- voucher_ids.append(self.browse(cr, uid, id, context=context).voucher_id.id)
- res = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
- res_id = res and res[1] or False
- return {
- 'name': _('Expense Receipt'),
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'account.voucher',
- 'views': [(res_id, 'form')],
- 'view_id': res_id,
- 'type': 'ir.actions.act_window',
- 'target': 'new',
- 'nodestroy': True,
- 'res_id': voucher_ids and voucher_ids[0] or False,
- }
-
def action_receipt_create(self, cr, uid, ids, context=None):
- res = False
property_obj = self.pool.get('ir.property')
sequence_obj = self.pool.get('ir.sequence')
analytic_journal_obj = self.pool.get('account.analytic.journal')
account_journal = self.pool.get('account.journal')
voucher_obj = self.pool.get('account.voucher')
-
- for exp in self.browse(cr, uid, ids, context=None):
+ currency_obj = self.pool.get('res.currency')
+ wkf_service = netsvc.LocalService("workflow")
+ if context is None:
+ context = {}
+ for exp in self.browse(cr, uid, ids, context=context):
company_id = exp.company_id.id
lines = []
total = 0.0
+ ctx = context.copy()
+ ctx.update({'date': exp.date})
+ journal = False
+ if exp.journal_id:
+ journal = exp.journal_id
+ else:
+ journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
+ if journal_id:
+ journal = account_journal.browse(cr, uid, journal_id, context=context)
for line in exp.line_ids:
if line.product_id:
acc = line.product_id.product_tmpl_id.property_account_expense
else:
acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
if not acc:
- raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase, `property_account_expense_categ`'))
-
+ raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
+ total_amount = line.total_amount
+ if journal.currency:
+ if exp.currency_id != journal.currency:
+ total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, total_amount, context=ctx)
+ elif exp.currency_id != exp.company_id.currency_id:
+ total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, total_amount, context=ctx)
lines.append((0, False, {
'name': line.name,
'account_id': acc.id,
'account_analytic_id': line.analytic_account.id,
- 'amount': line.total_amount,
+ 'amount': total_amount,
'type': 'dr'
}))
- total += line.total_amount
+ total += total_amount
if not exp.employee_id.address_home_id:
- raise osv.except_osv(_('Error !'), _('The employee must have a Home address.'))
+ raise osv.except_osv(_('Error!'), _('The employee must have a home address.'))
acc = exp.employee_id.address_home_id.property_account_payable.id
voucher = {
'name': exp.name,
'partner_id': exp.employee_id.address_home_id.id,
'company_id': company_id,
'line_ids': lines,
- 'amount': total
+ 'amount': total,
+ 'journal_id': journal.id,
}
- journal = False
- if exp.journal_id:
- voucher['journal_id'] = exp.journal_id.id
- journal = exp.journal_id
- else:
- journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
- if journal_id:
- voucher['journal_id'] = journal_id
- journal = account_journal.browse(cr, uid, journal_id, context=context)
if journal and not journal.analytic_journal_id:
analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')], context=context)
if analytic_journal_ids:
account_journal.write(cr, uid, [journal.id], {'analytic_journal_id': analytic_journal_ids[0]}, context=context)
voucher_id = voucher_obj.create(cr, uid, voucher, context=context)
- self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'}, context=context)
- res = voucher_id
- return res
+ wkf_service.trg_validate(uid, 'account.voucher', voucher_id, 'proforma_voucher', cr)
+ self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'done'}, context=context)
+ return True
def action_view_receipt(self, cr, uid, ids, context=None):
'''
This function returns an action that display existing receipt of given expense ids.
'''
+ assert len(ids) == 1, 'This option should only be used for a single id at a time'
voucher_id = self.browse(cr, uid, ids[0], context=context).voucher_id.id
res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
result = {
class product_product(osv.osv):
_inherit = "product.product"
_columns = {
- 'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
+ 'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Specify if the product can be selected in a HR expense line."),
}
def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok):
data_obj = self.pool.get('ir.model.data')
cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense')
categ_id = data_obj.browse(cr, uid, cat_id).res_id
- res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }}
+ res = {'value' : {'type':'service','sale_ok' :False,'categ_id':categ_id }}
return res
product_product()
res = dict(cr.fetchall())
return res
+ def _get_uom_id(self, cr, uid, context=None):
+ result = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_unit')
+ return result and result[1] or False
+
_columns = {
'name': fields.char('Expense Note', size=128, required=True),
'date_value': fields.date('Date', required=True),
'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
'total_amount': fields.function(_amount, string='Total', digits_compute=dp.get_precision('Account')),
- 'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Account')),
- 'unit_quantity': fields.float('Quantities' ),
+ 'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Product Price')),
+ 'unit_quantity': fields.float('Quantities', digits_compute= dp.get_precision('Product Unit of Measure')),
'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
- 'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
+ 'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True),
'description': fields.text('Description'),
'analytic_account': fields.many2one('account.analytic.account','Analytic account'),
'ref': fields.char('Reference', size=32),
_defaults = {
'unit_quantity': 1,
'date_value': lambda *a: time.strftime('%Y-%m-%d'),
+ 'uom_id': _get_uom_id,
}
_order = "sequence, date_value desc"
- def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
+ def onchange_product_id(self, cr, uid, ids, product_id, context=None):
res = {}
if product_id:
product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
res['name'] = product.name
amount_unit = product.price_get('standard_price')[product.id]
res['unit_amount'] = amount_unit
- if not uom_id:
- res['uom_id'] = product.uom_id.id
+ res['uom_id'] = product.uom_id.id
return {'value': res}
+ def onchange_uom(self, cr, uid, ids, product_id, uom_id, context=None):
+ res = {'value':{}}
+ if not uom_id or not product_id:
+ return res
+ product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+ uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
+ if uom.category_id.id != product.uom_id.category_id.id:
+ res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
+ res['value'].update({'uom_id': product.uom_id.id})
+ return res
+
hr_expense_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
projects / odoo / odoo.git / blobdiff