audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] Code review of analytic hours block

Browse Source 
(lp:c2c-addons/6.1  rev 6)
This commit is contained in:
Yannick Vaucher
2011-09-01 15:47:56 +02:00
parent a94ec61750
commit b8c394de72
2 changed files with 72 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
analytic_hours_block/__openerp__.py
View File

@@ -1,6 +1,11 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
## @author Bessi Nicolas, ported by Joel Grand-Guillaume #
# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
# All Right Reserved
#
# Author : Joël Grand-Guillaume (Camptocamp)
#
# WARNING: This program as such is intended to be used by professional # WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential # programmers who take the whole responsability of assessing all potential
# consequences resulting from its eventual inadequacies and bugs # consequences resulting from its eventual inadequacies and bugs
@@ -27,6 +32,7 @@
{ {
"name" : "Project Hours Blocks Management", "name" : "Project Hours Blocks Management",
"description" : """ "description" : """
This module allows you to handle hours blocks, to follow for example the user support contracts. This module allows you to handle hours blocks, to follow for example the user support contracts.
This means, you sell a product of type "hours block" then you input the spent hours on the hours block and This means, you sell a product of type "hours block" then you input the spent hours on the hours block and
you can track and follow how much has been used. you can track and follow how much has been used.

86
analytic_hours_block/hours_block.py
View File

@@ -1,7 +1,11 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# @author Bessi Nicolas # Copyright (c) 2010 Camptocamp SA
# All Rights Reserved
#
# Author : Vincent Renaville, ported by Joel Grand-Guillaume
#
# WARNING: This program as such is intended to be used by professional # WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential # programmers who take the whole responsability of assessing all potential
# consequences resulting from its eventual inadequacies and bugs # consequences resulting from its eventual inadequacies and bugs
@@ -25,12 +29,13 @@
# #
############################################################################## ##############################################################################
from osv import osv, fields
import time import time
from mx import DateTime
import netsvc
import string import string
from osv import osv, fields
import netsvc
############################################################################ ############################################################################
## Add hours blocks on invoice ## Add hours blocks on invoice
############################################################################ ############################################################################
@@ -38,24 +43,32 @@ import string
class AccountHoursBlock(osv.osv): class AccountHoursBlock(osv.osv):
_name = "account.hours.block" _name = "account.hours.block"
def _get_last_action(self, cr, uid, ids, name, arg, context={}): def _get_last_action(self, cr, uid, ids, name, arg, context=None):
"""TODO"""
context = context or {}
res = {} res = {}
for block in self.browse(cr, uid, ids): for block in self.browse(cr, uid, ids):
cr.execute('SELECT max(al.date) FROM account_analytic_line AS al WHERE al.invoice_id = ' + str(block.invoice_id.id)) cr.execute("SELECT max(al.date) FROM account_analytic_line AS al"
date = map(lambda x: x[0], cr.fetchall() or []) " WHERE al.invoice_id = %s", (block.invoice_id.id,))
res[block.id] = date[0] fetch_res = cr.fetchone()
if fetch_res:
date = fetch_res[0]
else:
date = False
res[block.id] = date
return res return res
def _compute_hours(self, cr, uid, ids, fields, args, context): def _compute_hours(self, cr, uid, ids, fields, args, context=None):
# Return a dict of [id][fields] """Return a dict of [id][fields]"""
context = context or {}
if not isinstance(ids, list):
ids=[ids]
result = {} result = {}
aal_obj = self.pool.get('account.analytic.line') aal_obj = self.pool.get('account.analytic.line')
for block in self.browse(cr,uid,ids): for block in self.browse(cr,uid,ids):
result[block.id] = { result[block.id] = {'amount_hours_block' : 0.0,
'amount_hours_block' : 0.0,
'amount_hours_block_done' : 0.0, 'amount_hours_block_done' : 0.0,
'amount_hours_block_delta' : 0.0 'amount_hours_block_delta' : 0.0}
}
# Compute hours bought # Compute hours bought
for line in block.invoice_id.invoice_line: for line in block.invoice_id.invoice_line:
hours_bought = 0.0 hours_bought = 0.0
@@ -70,13 +83,16 @@ class AccountHoursBlock(osv.osv):
# Compute hours spent # Compute hours spent
hours_used = 0.0 hours_used = 0.0
# Get ids of analytic line generated from timesheet associated to current block # Get ids of analytic line generated from timesheet associated to current block
cr.execute("SELECT al.id \ cr.execute("SELECT al.id "
FROM account_analytic_line AS al,account_analytic_journal AS aj \ " FROM account_analytic_line AS al,account_analytic_journal AS aj"
WHERE aj.id = al.journal_id AND\ " WHERE aj.id = al.journal_id AND"
aj.type='general' AND\ " aj.type='general' AND"
al.invoice_id = " + str(block.invoice_id.id) " al.invoice_id = %s", (block.invoice_id.id,))
) res2 = cr.fetchall()
ids2 = map(lambda x: x[0], cr.fetchall() or []) if res2:
ids2 = [x[0] for x in res2]
else:
ids2 = []
for line in aal_obj.browse(cr, uid, ids2, context): for line in aal_obj.browse(cr, uid, ids2, context):
if line.product_uom_id: if line.product_uom_id:
factor = line.product_uom_id.factor factor = line.product_uom_id.factor
@@ -96,11 +112,9 @@ class AccountHoursBlock(osv.osv):
aal_obj = self.pool.get('account.analytic.line') aal_obj = self.pool.get('account.analytic.line')
pricelist_obj = self.pool.get('product.pricelist') pricelist_obj = self.pool.get('product.pricelist')
for block in self.browse(cr,uid,ids): for block in self.browse(cr,uid,ids):
result[block.id] = { result[block.id] = {'amount_hours_block' : 0.0,
'amount_hours_block' : 0.0,
'amount_hours_block_done' : 0.0, 'amount_hours_block_done' : 0.0,
'amount_hours_block_delta' : 0.0 'amount_hours_block_delta' : 0.0}
}
# Compute amount bought # Compute amount bought
for line in block.invoice_id.invoice_line: for line in block.invoice_id.invoice_line:
@@ -116,13 +130,16 @@ class AccountHoursBlock(osv.osv):
# Compute total amount # Compute total amount
# Get ids of analytic line generated from timesheet associated to current block # Get ids of analytic line generated from timesheet associated to current block
cr.execute("SELECT al.id \ cr.execute("SELECT al.id FROM account_analytic_line AS al,"
FROM account_analytic_line AS al,account_analytic_journal AS aj \ " account_analytic_journal AS aj"
WHERE aj.id = al.journal_id AND\ " WHERE aj.id = al.journal_id"
aj.type='general' AND\ " AND aj.type='general'"
al.invoice_id = " + str(block.invoice_id.id) " AND al.invoice_id = %s", (block.invoice_id.id,))
) res2 = cr.fetchall()
ids2 = map(lambda x: x[0], cr.fetchall() or []) if res2:
ids2 = [x[0] for x in res2]
else:
ids2 = []
total_amount = 0.0 total_amount = 0.0
for line in aal_obj.browse(cr, uid, ids2, context): for line in aal_obj.browse(cr, uid, ids2, context):
factor_invoicing = 1.0 factor_invoicing = 1.0
@@ -149,9 +166,10 @@ class AccountHoursBlock(osv.osv):
block_per_types[block.type] = [] block_per_types[block.type] = []
block_per_types[block.type].append(block.id) block_per_types[block.type].append(block.id)
for block_type in block_per_types.keys(): for block_type in block_per_types:
if block_type: if block_type:
result.update(eval("self._compute_%s" % (block_type,))(cr, uid, ids, fields, args, context)) func = getattr(self, "_compute_%s" % (block_type,))
result.update(func(cr, uid, ids, fields, args, context))
for block in result: for block in result:
result[block]['amount_hours_block_delta'] = \ result[block]['amount_hours_block_delta'] = \