# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+# 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 Affero General Public License as
# GNU Affero General Public License for more details.
#
# 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/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-import time
-
from osv import fields
from osv import osv
from tools.translate import _
-import tools
class account_analytic_line(osv.osv):
- _name = 'account.analytic.line'
- _description = 'Analytic lines'
+ _inherit = 'account.analytic.line'
+ _description = 'Analytic Line'
_columns = {
- 'name' : fields.char('Description', size=256, required=True),
- 'date' : fields.date('Date', required=True),
- 'amount' : fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price.'),
- 'unit_amount' : fields.float('Quantity', help='Specifies the amount of quantity to count.'),
- 'product_uom_id' : fields.many2one('product.uom', 'UoM'),
- 'product_id' : fields.many2one('product.product', 'Product'),
- 'account_id' : fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True),
- 'general_account_id' : fields.many2one('account.account', 'General Account', required=True, ondelete='cascade'),
- 'move_id' : fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
- 'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
- 'code' : fields.char('Code', size=8),
- 'user_id' : fields.many2one('res.users', 'User',),
- 'ref': fields.char('Reference', size=32),
+ 'product_uom_id': fields.many2one('product.uom', 'UoM'),
+ 'product_id': fields.many2one('product.product', 'Product'),
+ 'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
+ 'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
+ 'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
+ 'code': fields.char('Code', size=8),
+ 'ref': fields.char('Ref.', size=64),
+ 'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
+ 'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
}
+
_defaults = {
- 'date': lambda *a: time.strftime('%Y-%m-%d'),
+ 'date': fields.date.context_today,
+ 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
}
- _order = 'date'
-
-
+ _order = 'date desc'
+
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
-
if context.get('from_date',False):
- args.append(['date', '>=',context['from_date']])
-
+ args.append(['date', '>=', context['from_date']])
if context.get('to_date',False):
- args.append(['date','<=',context['to_date']])
-
+ args.append(['date','<=', context['to_date']])
return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
order, context=context, count=count)
-
- def _check_company(self, cr, uid, ids):
- lines = self.browse(cr, uid, ids)
+
+ def _check_company(self, cr, uid, ids, context=None):
+ lines = self.browse(cr, uid, ids, context=context)
for l in lines:
if l.move_id and not l.account_id.company_id.id == l.move_id.account_id.company_id.id:
return False
return True
- _constraints = [
-# (_check_company, 'You can not create analytic line that is not in the same company than the account line', ['account_id'])
- ]
-
- def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount,
- unit=False, context=None):
- uom_obj = self.pool.get('product.uom')
+
+ # Compute the cost based on the price type define into company
+ # property_valuation_price_type property
+ def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
+ unit=False, journal_id=False, context=None):
+ if context==None:
+ context={}
+ if not journal_id:
+ j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=','purchase')])
+ journal_id = j_ids and j_ids[0] or False
+ if not journal_id or not prod_id:
+ return {}
product_obj = self.pool.get('product.product')
-# if unit_amount and prod_id:
- if prod_id:
- prod = product_obj.browse(cr, uid, prod_id)
+ analytic_journal_obj =self.pool.get('account.analytic.journal')
+ product_price_type_obj = self.pool.get('product.price.type')
+ j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
+ prod = product_obj.browse(cr, uid, prod_id, context=context)
+ result = 0.0
+ if prod_id:
+ unit = prod.uom_id.id
+ if j_id.type == 'purchase':
+ unit = prod.uom_po_id.id
+ if j_id.type <> 'sale':
a = prod.product_tmpl_id.property_account_expense.id
if not a:
a = prod.categ_id.property_account_expense_categ.id
_('There is no expense account defined ' \
'for this product: "%s" (id:%d)') % \
(prod.name, prod.id,))
- amount = unit_amount * uom_obj._compute_price(cr, uid,
- prod.uom_id.id, prod.standard_price, unit)
- return {'value': {
- 'amount': - round(amount, 2),
- 'general_account_id': a,
- }}
- return {}
+ else:
+ a = prod.product_tmpl_id.property_account_income.id
+ if not a:
+ a = prod.categ_id.property_account_income_categ.id
+ if not a:
+ raise osv.except_osv(_('Error !'),
+ _('There is no income account defined ' \
+ 'for this product: "%s" (id:%d)') % \
+ (prod.name, prod_id,))
+
+ flag = False
+ # Compute based on pricetype
+ product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context=context)
+ pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+ if journal_id:
+ journal = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
+ if journal.type == 'sale':
+ product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context)
+ if product_price_type_ids:
+ pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+ # Take the company currency as the reference one
+ if pricetype.field == 'list_price':
+ flag = True
+ ctx = context.copy()
+ if unit:
+ # price_get() will respect a 'uom' in its context, in order
+ # to return a default price for those units
+ ctx['uom'] = unit
+ amount_unit = prod.price_get(pricetype.field, context=ctx)[prod.id]
+ prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+ amount = amount_unit * quantity or 0.0
+ result = round(amount, prec)
+ if not flag:
+ result *= -1
+ return {'value': {
+ 'amount': result,
+ 'general_account_id': a,
+ 'product_uom_id': unit
+ }
+ }
- def view_header_get(self, cr, user, view_id, view_type, context):
+ def view_header_get(self, cr, user, view_id, view_type, context=None):
+ if context is None:
+ context = {}
if context.get('account_id', False):
# account_id in context may also be pointing to an account.account.id
cr.execute('select name from account_analytic_account where id=%s', (context['account_id'],))
account_analytic_line()
+class res_partner(osv.osv):
+ """ Inherits partner and adds contract information in the partner form """
+ _inherit = 'res.partner'
-class timesheet_invoice(osv.osv):
- _name = "report.hr.timesheet.invoice.journal"
- _description = "Analytic account costs and revenues"
- _auto = False
_columns = {
- 'name': fields.char('Year',size=64,required=False, readonly=True),
- 'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, select=True),
- 'journal_id': fields.many2one('account.analytic.journal', 'Journal', readonly=True),
- 'quantity': fields.float('Quantities', readonly=True),
- 'cost': fields.float('Credit', readonly=True),
- 'revenue': fields.float('Debit', readonly=True),
- 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
- ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
+ 'contract_ids': fields.one2many('account.analytic.account', \
+ 'partner_id', 'Contracts', readonly=True),
}
- _order = 'name desc, account_id'
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'report_hr_timesheet_invoice_journal')
- cr.execute("""
- create or replace view report_hr_timesheet_invoice_journal as (
- select
- min(l.id) as id,
- to_char(l.date, 'YYYY') as name,
- to_char(l.date,'MM') as month,
- sum(
- CASE WHEN l.amount>0 THEN 0 ELSE l.amount
- END
- ) as cost,
- sum(
- CASE WHEN l.amount>0 THEN l.amount ELSE 0
- END
- ) as revenue,
- sum(l.unit_amount* COALESCE(u.factor, 1)) as quantity,
- journal_id,
- account_id
- from account_analytic_line l
- LEFT OUTER join product_uom u on (u.id=l.product_uom_id)
- group by
- to_char(l.date, 'YYYY'),
- to_char(l.date,'MM'),
- journal_id,
- account_id
- )""")
-timesheet_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+res_partner()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
projects / odoo / odoo.git / blobdiff