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

fix 

bzr revid: fp@tinyerp.com-20110917145407-qp45yk4ma7mo6pp3
This commit is contained in:
Fabien Pinckaers 2011-09-17 16:54:07 +02:00
parent e75ca7fba8 bf78f7778d
commit 696b7100be
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_move_line.py
View File

@ -1256,7 +1256,7 @@ class account_move_line(osv.osv):
vals['amount_currency'] = cur_obj.compute(cr, uid, account.company_id.currency_id.id,
account.currency_id.id, vals.get('debit', 0.0)-vals.get('credit', 0.0), context=ctx)
if not ok:
raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !'))
raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal, check the tab \'Entry Controls\' on the related journal !'))
if vals.get('analytic_account_id',False):
if journal.analytic_journal_id:

3
addons/hr_timesheet/security/ir.model.access.csv
View File

@ -10,4 +10,5 @@
"access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
"hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
"hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","model_hr_analytic_timesheet","base.group_user",1,1,1,0
"access_account_analytic_journal_user","account.account.analytic.journal.user","account.model_account_analytic_journal","base.group_user",1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
10 access_account_fiscalyear_hr_user account.account.fiscalyear.user account.model_account_fiscalyear base.group_hr_user 1 1 1 1
11 hr.access_account_journal_view_hruser account.journal.view hruser account.model_account_journal_view base.group_hr_user 1 0 0 0
12 hr.access_account_journal_column_hruser account.journal.column hruser account.model_account_journal_column base.group_hr_user 1 0 0 0
13 access_hr_analytic_timesheet_user hr.analytic.timesheet.user model_hr_analytic_timesheet base.group_user 1 0 1 0 1 0
14 access_account_analytic_journal_user account.account.analytic.journal.user account.model_account_analytic_journal base.group_user 1 0 0 0