Merge lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-project-warning-imp-pna into lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr

Proposed by Pinakin Nayi (OpenERP)
Status: Merged
Merged at revision: 7024
Proposed branch: lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-project-warning-imp-pna
Merge into: lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr
Diff against target: 51 lines (+4/-4)
4 files modified
project_issue_sheet/i18n/project_issue_sheet.pot (+1/-1)
project_issue_sheet/project_issue_sheet.py (+1/-1)
project_timesheet/i18n/project_timesheet.pot (+1/-1)
project_timesheet/project_timesheet.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-project-warning-imp-pna
Reviewer Review Type Date Requested Status
Kuldeep Joshi(OpenERP) Approve
Review via email: mp+114798@code.launchpad.net

Description of the change

Hello,

  I improved Exceptions, Constraint errors and Warning message of project module.

Thanks,
pna

To post a comment you must log in.
Revision history for this message
Kuldeep Joshi(OpenERP) (kjo-openerp) wrote :

Look Good.

Thanks
KJO

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'project_issue_sheet/i18n/project_issue_sheet.pot'
2--- project_issue_sheet/i18n/project_issue_sheet.pot 2012-02-08 01:08:30 +0000
3+++ project_issue_sheet/i18n/project_issue_sheet.pot 2012-07-13 08:37:30 +0000
4@@ -23,7 +23,7 @@
5 #. module: project_issue_sheet
6 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
7 #, python-format
8-msgid "The Analytic Account is in pending !"
9+msgid "The Analytic Account is pending !"
10 msgstr ""
11
12 #. module: project_issue_sheet
13
14=== modified file 'project_issue_sheet/project_issue_sheet.py'
15--- project_issue_sheet/project_issue_sheet.py 2011-09-02 12:29:24 +0000
16+++ project_issue_sheet/project_issue_sheet.py 2012-07-13 08:37:30 +0000
17@@ -54,7 +54,7 @@
18 result = {}
19
20 if account and account.state == 'pending':
21- result = {'warning' : {'title' : _('Analytic Account'), 'message' : _('The Analytic Account is in pending !')}}
22+ result = {'warning' : {'title' : _('Analytic Account'), 'message' : _('The Analytic Account is pending !')}}
23
24 return result
25
26
27=== modified file 'project_timesheet/i18n/project_timesheet.pot'
28--- project_timesheet/i18n/project_timesheet.pot 2012-02-08 01:08:30 +0000
29+++ project_timesheet/i18n/project_timesheet.pot 2012-07-13 08:37:30 +0000
30@@ -355,7 +355,7 @@
31 #. module: project_timesheet
32 #: code:addons/project_timesheet/project_timesheet.py:247
33 #, python-format
34-msgid "You cannot select a Analytic Account which is in Close or Cancelled state"
35+msgid "You cannot select a Analytic Account which is in Close or Cancelled state."
36 msgstr ""
37
38 #. module: project_timesheet
39
40=== modified file 'project_timesheet/project_timesheet.py'
41--- project_timesheet/project_timesheet.py 2012-06-27 13:54:25 +0000
42+++ project_timesheet/project_timesheet.py 2012-07-13 08:37:30 +0000
43@@ -270,7 +270,7 @@
44 st = acc.to_invoice.id
45 res['value']['to_invoice'] = st or False
46 if acc.state == 'close' or acc.state == 'cancelled':
47- raise osv.except_osv(_('Invalid Analytic Account !'), _('You cannot select a Analytic Account which is in Close or Cancelled state'))
48+ raise osv.except_osv(_('Invalid Analytic Account !'), _('You cannot select a Analytic Account which is in Close or Cancelled state.'))
49 return res
50 account_analytic_line()
51 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

Subscribers

People subscribed via source and target branches