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

Proposed by Hardik Sanchawat (OpenERP)
Status: Merged
Merged at revision: 7029
Proposed branch: lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-pos-hsa
Merge into: lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr
Diff against target: 63 lines (+6/-6)
4 files modified
point_of_sale/i18n/point_of_sale.pot (+2/-2)
point_of_sale/point_of_sale.py (+1/-1)
point_of_sale/wizard/pos_box_entries.py (+1/-1)
point_of_sale/wizard/pos_box_out.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-pos-hsa
Reviewer Review Type Date Requested Status
DBR (OpenERP) (community) Approve
Kuldeep Joshi(OpenERP) Pending
Review via email: mp+114843@code.launchpad.net

Description of the change

Hello,

I update warning messages in point of sale module.

Thanks
-hsa

To post a comment you must log in.
Revision history for this message
DBR (OpenERP) (dbr-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'point_of_sale/i18n/point_of_sale.pot'
2--- point_of_sale/i18n/point_of_sale.pot 2012-05-10 13:41:19 +0000
3+++ point_of_sale/i18n/point_of_sale.pot 2012-07-13 11:53:22 +0000
4@@ -1997,7 +1997,7 @@
5 #: code:addons/point_of_sale/wizard/pos_box_entries.py:100
6 #: code:addons/point_of_sale/wizard/pos_box_out.py:88
7 #, python-format
8-msgid "You have to open at least one cashbox"
9+msgid "You have to open at least one cashbox."
10 msgstr ""
11
12 #. module: point_of_sale
13@@ -2523,7 +2523,7 @@
14 #. module: point_of_sale
15 #: code:addons/point_of_sale/wizard/pos_box_out.py:86
16 #, python-format
17-msgid "please check that account is set to %s"
18+msgid "Please check that account is set to %s"
19 msgstr ""
20
21 #. module: point_of_sale
22
23=== modified file 'point_of_sale/point_of_sale.py'
24--- point_of_sale/point_of_sale.py 2012-05-04 11:57:48 +0000
25+++ point_of_sale/point_of_sale.py 2012-07-13 11:53:22 +0000
26@@ -304,7 +304,7 @@
27 ('user_id', '=', uid),
28 ('state', '=', 'open')], context=context)
29 if len(statement_id) == 0:
30- raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
31+ raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox.'))
32 if statement_id:
33 statement_id = statement_id[0]
34 args['statement_id'] = statement_id
35
36=== modified file 'point_of_sale/wizard/pos_box_entries.py'
37--- point_of_sale/wizard/pos_box_entries.py 2012-06-05 13:28:12 +0000
38+++ point_of_sale/wizard/pos_box_entries.py 2012-07-13 11:53:22 +0000
39@@ -97,7 +97,7 @@
40 curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id
41 statement_id = statement_obj.search(cr, uid, [('journal_id', '=', int(data['journal_id'])), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
42 if not statement_id:
43- raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
44+ raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox.'))
45
46 product = product_obj.browse(cr, uid, int(data['product_id']))
47 acc_id = product.property_account_income or product.categ_id.property_account_income_categ
48
49=== modified file 'point_of_sale/wizard/pos_box_out.py'
50--- point_of_sale/wizard/pos_box_out.py 2012-01-03 10:19:30 +0000
51+++ point_of_sale/wizard/pos_box_out.py 2012-07-13 11:53:22 +0000
52@@ -83,9 +83,9 @@
53 product = product_obj.browse(cr, uid, data['product_id'], context=context)
54 acc_id = product.property_account_expense or product.categ_id.property_account_expense_categ
55 if not acc_id:
56- raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product.name))
57+ raise osv.except_osv(_('Error !'), _('Please check that account is set to %s')%(product.name))
58 if not statement_ids:
59- raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
60+ raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox.'))
61 vals['statement_id'] = statement_ids[0]
62 vals['journal_id'] = data['journal_id']
63 vals['account_id'] = acc_id.id

Subscribers

People subscribed via source and target branches