-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-# $Id$
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-from mx import DateTime
import time
from osv import fields, osv
from tools.translate import _
-def _employee_get(obj,cr,uid,context={}):
+def _employee_get(obj, cr, uid, context=None):
ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
if ids:
return ids[0]
return False
class hr_expense_expense(osv.osv):
- def copy(self, cr, uid, id, default=None, context={}):
+
+ def copy(self, cr, uid, id, default=None, context=None):
if not default: default = {}
default.update( {'invoice_id':False,'date_confirm':False,'date_valid':False,'user_valid':False})
return super(hr_expense_expense, self).copy(cr, uid, id, default, context)
def _amount(self, cr, uid, ids, field_name, arg, context):
- id_set = ",".join(map(str, ids))
- cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) WHERE s.id IN ("+id_set+") GROUP BY s.id ")
+ cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) WHERE s.id =ANY(%s) GROUP BY s.id ",(ids,))
res = dict(cr.fetchall())
return res
return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
_name = "hr.expense.expense"
- _description = "Expense"
+ _description = "HR Expense"
_columns = {
'name': fields.char('Expense Sheet', size=128, required=True),
'id': fields.integer('Sheet ID', readonly=True),
'ref': fields.char('Reference', size=32),
'date': fields.date('Date'),
- 'journal_id': fields.many2one('account.journal', 'Force Journal'),
- 'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
+ 'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
+ 'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True),
'user_id': fields.many2one('res.users', 'User', required=True),
- 'date_confirm': fields.date('Date Confirmed'),
- 'date_valid': fields.date('Date Valided'),
+ 'date_confirm': fields.date('Confirmation Date', help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
+ 'date_valid': fields.date('Validation Date', help = "Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
'user_valid': fields.many2one('res.users', 'Validation User'),
- 'account_move_id': fields.many2one('account.move', 'Account Move'),
- 'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines'),
+ '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, method=True, string='Total Amount'),
- 'invoice_id': fields.many2one('account.invoice', 'Invoice'),
+ 'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
-
+ 'department_id':fields.many2one('hr.department','Department'),
+ 'company_id': fields.many2one('res.company', 'Company', required=True),
'state': fields.selection([
('draft', 'Draft'),
('confirm', 'Waiting confirmation'),
('accepted', 'Accepted'),
('invoiced', 'Invoiced'),
('paid', 'Reimbursed'),
- ('canceled', 'Canceled')],
- 'State', readonly=True),
+ ('cancelled', 'Cancelled')],
+ 'State', readonly=True, help='When the expense request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
+ \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
}
_defaults = {
'date' : lambda *a: time.strftime('%Y-%m-%d'),
'state': lambda *a: 'draft',
'employee_id' : _employee_get,
- 'user_id' : lambda cr,uid,id,c={}: id,
+ 'user_id' : lambda cr, uid, id, c={}: id,
'currency_id': _get_currency,
+ 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
def expense_confirm(self, cr, uid, ids, *args):
#for exp in self.browse(cr, uid, ids):
return True
def expense_canceled(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state':'canceled'})
+ self.write(cr, uid, ids, {'state':'cancelled'})
return True
def expense_paid(self, cr, uid, ids, *args):
tax_id = [x.id for x in l.product_id.supplier_taxes_id]
else:
acc = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
+ if not acc:
+ raise osv.except_osv(_('Error !'), _('Please configure Default Expanse account for Product purchase, `property_account_expense_categ`'))
+
lines.append((0, False, {
'name': l.name,
'account_id': acc,
'account_analytic_id': l.analytic_account.id,
}))
if not exp.employee_id.address_id:
- raise osv.except_osv(_('Error !'), _('The employee must have a contact address'))
+ raise osv.except_osv(_('Error !'), _('The employee must have a working address'))
acc = exp.employee_id.address_id.partner_id.property_account_payable.id
payment_term_id = exp.employee_id.address_id.partner_id.property_payment_term.id
inv = {
'price_type': 'tax_included',
'currency_id': exp.currency_id.id,
'payment_term': payment_term_id,
+ 'fiscal_position': exp.employee_id.address_id.partner_id.property_account_position.id
}
if payment_term_id:
to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [],
return res
hr_expense_expense()
+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."),
+ }
+
+product_product()
class hr_expense_line(osv.osv):
_name = "hr.expense.line"
_description = "Expense Line"
+
def _amount(self, cr, uid, ids, field_name, arg, context):
if not len(ids):
return {}
- id_set = ",".join(map(str, ids))
- cr.execute("SELECT l.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_line l WHERE id IN ("+id_set+") GROUP BY l.id ")
+ cr.execute("SELECT l.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_line l WHERE id =ANY(%s) GROUP BY l.id ",(ids,))
res = dict(cr.fetchall())
return res
'date_value': fields.date('Date', required=True),
'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
'total_amount': fields.function(_amount, method=True, string='Total'),
- 'unit_amount': fields.float('Unit Price', readonly=True, states={'draft':[('readonly',False)]}),
- 'unit_quantity': fields.float('Quantities', readonly=True, states={'draft':[('readonly',False)]}),
- 'product_id': fields.many2one('product.product', 'Product', readonly=True, states={'draft':[('readonly',False)]}),
- 'uom_id': fields.many2one('product.uom', 'UoM', readonly=True, states={'draft':[('readonly',False)]}),
+ 'unit_amount': fields.float('Unit Price'),
+ 'unit_quantity': fields.float('Quantities' ),
+ 'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
+ 'uom_id': fields.many2one('product.uom', 'UoM' ),
'description': fields.text('Description'),
'analytic_account': fields.many2one('account.analytic.account','Analytic account'),
'ref': fields.char('Reference', size=32),
- 'sequence' : fields.integer('Sequence'),
+ 'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of expense lines."),
}
_defaults = {
'unit_quantity': lambda *a: 1,
'date_value' : lambda *a: time.strftime('%Y-%m-%d'),
}
_order = "sequence"
- def onchange_product_id(self, cr, uid, ids, product_id, uom_id, context={}):
- v={}
+
+ def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
+ if context is None:
+ context = {}
+ v = {}
if product_id:
product=self.pool.get('product.product').browse(cr,uid,product_id, context=context)
v['name']=product.name
- v['unit_amount']=product.standard_price
+
+ # Compute based on pricetype of employee company
+ pricetype_id = self.pool.get('hr.employee').browse(cr,uid,employee_id).user_id.company_id.property_valuation_price_type.id
+ context['currency_id']=self.pool.get('hr.employee').browse(cr,uid,employee_id).user_id.company_id.currency_id.id
+ pricetype=self.pool.get('product.price.type').browse(cr,uid,pricetype_id)
+ amount_unit=product.price_get(pricetype.field, context)[product.id]
+
+ v['unit_amount']=amount_unit
if not uom_id:
v['uom_id']=product.uom_id.id
- return {'value':v}
+ return {'value': v}
hr_expense_line()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
projects / odoo / odoo.git / blobdiff