-# -*- 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/>.
#
##############################################################################
class hr_timesheet_invoice_factor(osv.osv):
_name = "hr_timesheet_invoice.factor"
- _description = "Invoice rate"
+ _description = "Invoice Rate"
_columns = {
- 'name': fields.char('Internal name', size=128, required=True),
- 'customer_name': fields.char('Visible name', size=128),
- 'factor': fields.float('Discount (%)', required=True),
+ 'name': fields.char('Internal name', size=128, required=True, translate=True),
+ 'customer_name': fields.char('Name', size=128, help="Label for the customer"),
+ 'factor': fields.float('Discount (%)', required=True, help="Discount in percentage"),
}
_defaults = {
'factor': lambda *a: 0.0,
class account_analytic_account(osv.osv):
- def _invoiced_calc(self, cr, uid, ids, name, arg, context={}):
+ def _invoiced_calc(self, cr, uid, ids, name, arg, context=None):
+ obj_invoice = self.pool.get('account.invoice')
res = {}
- for account in self.browse(cr, uid, ids):
- invoiced = {}
- cr.execute('select distinct l.invoice_id from hr_analytic_timesheet h left join account_analytic_line l on (h.line_id=l.id) where account_id=1', (account.id,))
- invoice_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
- for invoice in self.pool.get('account.invoice').browse(cr, uid, invoice_ids, context):
+
+ cr.execute('SELECT account_id as account_id, l.invoice_id '
+ 'FROM hr_analytic_timesheet h LEFT JOIN account_analytic_line l '
+ 'ON (h.line_id=l.id) '
+ 'WHERE l.account_id = ANY(%s)', (ids,))
+ account_to_invoice_map = {}
+ for rec in cr.dictfetchall():
+ account_to_invoice_map.setdefault(rec['account_id'], []).append(rec['invoice_id'])
+
+ for account in self.browse(cr, uid, ids, context=context):
+ invoice_ids = filter(None, list(set(account_to_invoice_map.get(account.id, []))))
+ for invoice in obj_invoice.browse(cr, uid, invoice_ids, context=context):
res.setdefault(account.id, 0.0)
res[account.id] += invoice.amount_untaxed
for id in ids:
res[id] = round(res.get(id, 0.0),2)
+
return res
_inherit = "account.analytic.account"
_columns = {
- 'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist'),
+ 'pricelist_id': fields.many2one('product.pricelist', 'Sale Pricelist',
+ help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
'amount_max': fields.float('Max. Invoice Price'),
'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount',
help="Total invoiced"),
- 'to_invoice': fields.many2one('hr_timesheet_invoice.factor','Reinvoice Costs',
- help="Check this field if you plan to automatically generate invoices based " \
+ 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Reinvoice Costs',
+ help="Fill this field if you plan to automatically generate invoices based " \
"on the costs in this analytic account: timesheets, expenses, ..." \
"You can configure an automatic invoice rate on analytic accounts."),
}
_defaults = {
- 'pricelist_id': lambda self,cr, uid, ctx: ctx.get('pricelist_id', False),
+ 'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
}
+
+ def set_close(self, cr, uid, ids, context=None):
+ return self.write(cr, uid, ids, {'state':'close'}, context=context)
+
+ def set_cancel(self, cr, uid, ids, context=None):
+ return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+
+ def set_open(self, cr, uid, ids, context=None):
+ return self.write(cr, uid, ids, {'state':'open'}, context=context)
+
+ def set_pending(self, cr, uid, ids, context=None):
+ return self.write(cr, uid, ids, {'state':'pending'}, context=context)
+
account_analytic_account()
class account_analytic_line(osv.osv):
_inherit = 'account.analytic.line'
_columns = {
- 'invoice_id': fields.many2one('account.invoice', 'Invoice'),
- 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoicing'),
+ 'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete="set null"),
+ 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"),
}
def unlink(self, cursor, user, ids, context=None):
- self._check(cursor, user, ids)
return super(account_analytic_line,self).unlink(cursor, user, ids,
context=context)
def write(self, cr, uid, ids, vals, context=None):
- self._check(cr, uid, ids)
+ self._check_inv(cr, uid, ids, vals)
return super(account_analytic_line,self).write(cr, uid, ids, vals,
context=context)
- def _check(self, cr, uid, ids):
+ def _check_inv(self, cr, uid, ids, vals):
select = ids
if isinstance(select, (int, long)):
select = [ids]
- for line in self.browse(cr, uid, select):
- if line.invoice_id:
- raise osv.except_osv(_('Error !'),
+ if ( not vals.has_key('invoice_id')) or vals['invoice_id' ] == False:
+ for line in self.browse(cr, uid, select):
+ if line.invoice_id:
+ raise osv.except_osv(_('Error !'),
_('You can not modify an invoiced analytic line!'))
return True
default = default.copy()
default.update({'invoice_id': False})
return super(account_analytic_line, self).copy(cursor, user, obj_id,
- default, context)
+ default, context=context)
account_analytic_line()
default = default.copy()
default.update({'invoice_id': False})
return super(hr_analytic_timesheet, self).copy(cursor, user, obj_id,
- default, context)
+ default, context=context)
hr_analytic_timesheet()
inv = self.browse(cr, uid, [id])[0]
if inv.type == 'in_invoice':
+ obj_analytic_account = self.pool.get('account.analytic.account')
for il in iml:
if il['account_analytic_id']:
- to_invoice = self.pool.get('account.analytic.account').read(cr, uid, [il['account_analytic_id']], ['to_invoice'])[0]['to_invoice']
+ # *-* browse (or refactor to avoid read inside the loop)
+ to_invoice = obj_analytic_account.read(cr, uid, [il['account_analytic_id']], ['to_invoice'])[0]['to_invoice']
if to_invoice:
il['analytic_lines'][0][2]['to_invoice'] = to_invoice[0]
return iml
projects / odoo / odoo.git / blobdiff