diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml index 0ac4aeb9245..0d1c7d53ad1 100644 --- a/addons/account/project/report/analytic_balance.rml +++ b/addons/account/project/report/analytic_balance.rml @@ -17,7 +17,7 @@ [[ company.name ]] - Analytic Balance + Analytic Balance - [[ company.currency_id.name ]] diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml index f3640e421d6..6c4b1edf992 100644 --- a/addons/account/project/report/cost_ledger.rml +++ b/addons/account/project/report/cost_ledger.rml @@ -10,7 +10,7 @@ [[ company.name ]] - Cost Ledger-[[ company.currency_id.name ]] + Cost Ledger - [[ company.currency_id.name ]] @@ -113,13 +113,13 @@ - + - - + + @@ -181,13 +181,13 @@ - [[ data['form']['date1'] ]] + [[ data['form']['date1'] ]] - [[ data['form']['date2'] ]] + [[ data['form']['date2'] ]] - [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] + [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] diff --git a/addons/account/project/report/quantity_cost_ledger.rml b/addons/account/project/report/quantity_cost_ledger.rml index f87c74f4d69..42fb7330a07 100644 --- a/addons/account/project/report/quantity_cost_ledger.rml +++ b/addons/account/project/report/quantity_cost_ledger.rml @@ -10,7 +10,7 @@ [[ company.name ]] - Cost Ledger-[[ company.currency_id.name ]] + Cost Ledger - [[ company.currency_id.name ]] @@ -114,13 +114,13 @@ - + - - + + @@ -181,13 +181,13 @@ - [[ data['form']['date1'] ]] + [[ data['form']['date1'] ]] - [[ data['form']['date2'] ]] + [[ data['form']['date2'] ]] - [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] + [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] diff --git a/addons/account/report/central_journal.rml b/addons/account/report/central_journal.rml index ade1659de58..92ed232beff 100644 --- a/addons/account/report/central_journal.rml +++ b/addons/account/report/central_journal.rml @@ -10,7 +10,7 @@ [[ company.name ]] - Central Journal-[[ company.currency_id.name ]] + Central Journal - [[ company.currency_id.name ]] @@ -103,13 +103,13 @@ - + - - + + @@ -162,13 +162,13 @@ - [[ o.journal_id.code or '' ]] + [[ o.journal_id.code or '' ]] - [[ o.journal_id.name ]] + [[ o.journal_id.name ]] - [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] + [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml index f89c7d201b6..d7775dd3cbb 100644 --- a/addons/account/report/general_journal.rml +++ b/addons/account/report/general_journal.rml @@ -82,13 +82,13 @@ - + - - + + @@ -130,7 +130,7 @@ Printing Date : - [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] + [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py index 187ae1e45b2..a03162cf11d 100644 --- a/addons/account/wizard/wizard_general_ledger_report.py +++ b/addons/account/wizard/wizard_general_ledger_report.py @@ -56,20 +56,16 @@ import time #} account_form = ''' -
+ ''' account_fields = { - 'Account_list': {'string':'Account', 'type':'many2one', 'relation':'account.account', 'required':True ,'domain':[('parent_id','=',False)]}, + 'Account_list': {'string':'Chart of Accounts', 'type':'many2one', 'relation':'account.account', 'required':True ,'domain':[('parent_id','=',False)]}, } - - - period_form = '''
- @@ -77,10 +73,8 @@ period_form = ''' - - diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index 6c26b7f1c6b..143c384e1fd 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -122,9 +122,12 @@ class hr_analytic_timesheet(osv.osv): res = super(hr_analytic_timesheet, self).create(cr, uid, vals, context) return res except Exception,e: - if 'journal_id' in e.args[0]: + if '"journal_id" viol' in e.args[0]: raise except_orm(_('ValidateError'), _('No analytic journal available for this employee.\nDefine an employee for the selected user and assign an analytic journal.')) + elif '"account_id" viol' in e.args[0]: + raise except_orm(_('ValidateError'), + _('No analytic account defined on the project.\nPlease set one or we can not automatically fill the timesheet.')) else: raise diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 0ad79129889..0b4720e4254 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -25,7 +25,6 @@ class project_work(osv.osv): vals_line['amount']=(-1) * vals['hours']*obj.browse(cr,uid,timeline_id).product_id.standard_price obj.write(cr, uid,[timeline_id],vals_line,{}) vals['hr_analytic_timesheet_id']=timeline_id - return super(project_work,self).create(cr, uid, vals, *args, **kwargs) def write(self, cr, uid, ids,vals,context={}):