odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] hr: 'exepnse', 'recruitment' and 'timesheet' dynamic reports now uses decimal.precision 

bzr revid: olt@tinyerp.com-20101005113421-8svidbt2oflfkzsj
This commit is contained in:
olt@tinyerp.com 2010-10-05 13:34:21 +02:00
parent 4e7dfb3843
commit e4ecbb0a71
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/hr_expense/report/hr_expense_report.py
View File

@ -21,6 +21,7 @@
import tools
from osv import fields,osv
from decimal_precision import decimal_precision as dp
class hr_expense_report(osv.osv):
@ -47,11 +48,11 @@ class hr_expense_report(osv.osv):
'company_id':fields.many2one('res.company', 'Company', readonly=True),
'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
'price_total':fields.float('Total Price', readonly=True),
'price_total':fields.float('Total Price', readonly=True, digits_compute=dp.get_precision('Account')),
'delay_valid':fields.float('Delay to Valid', readonly=True),
'delay_confirm':fields.float('Delay to Confirm', readonly=True),
'analytic_account': fields.many2one('account.analytic.account','Analytic account',readonly=True),
'price_average':fields.float('Average Price', readonly=True),
'price_average':fields.float('Average Price', readonly=True, digits_compute=dp.get_precision('Account')),
'nbr':fields.integer('# of Lines', readonly=True),
'no_of_products':fields.integer('# of Products', readonly=True),
'no_of_account':fields.integer('# of Accounts', readonly=True),

9
addons/hr_recruitment/report/hr_recruitment_report.py
View File

@ -21,6 +21,8 @@
import tools
from osv import fields,osv
from hr_recruitment import hr_recruitment
from decimal_precision import decimal_precision as dp
AVAILABLE_STATES = [
('draft','New'),
@ -72,9 +74,9 @@ class hr_recruitment_report(osv.osv):
'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
'department_id':fields.many2one('hr.department','Department',readonly=True),
'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
'salary_prop' : fields.float("Salary Proposed"),
'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg"),
'salary_exp' : fields.float("Salary Expected"),
'salary_prop' : fields.float("Salary Proposed", digits_compute=dp.get_precision('Account')),
'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg", digits_compute=dp.get_precision('Account')),
'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Account')),
'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
'available' : fields.float("Availability"),
@ -82,7 +84,6 @@ class hr_recruitment_report(osv.osv):
help="Number of Days to close the project issue"),
'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
help="Number of Days to close the project issue"),
}
_order = 'date desc'
def init(self, cr):

4
addons/hr_timesheet_sheet/report/hr_timesheet_report.py
View File

@ -21,6 +21,8 @@
import tools
from osv import fields,osv
from decimal_precision import decimal_precision as dp
class hr_timesheet_report(osv.osv):
_name = "hr.timesheet.report"
@ -40,7 +42,7 @@ class hr_timesheet_report(osv.osv):
'user_id': fields.many2one('res.users', 'User',readonly=True),
'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
'company_id': fields.many2one('res.company', 'Company',readonly=True),
'cost': fields.float('Cost',readonly=True),
'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')),
'quantity': fields.float('Quantity',readonly=True),
}