Saurang Suthar(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp_exception_warning-ssu
into lp:~openerp-dev/openobject-addons/trunk-exception-warning.
Requested reviews:
Priyesh (OpenERP) (pso-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-exception-warning-imp_exception_warning-ssu/+merge/118044
Hello sir,
I have improved another exception warnings in following modules as per
suggestion:
- account
- delivery
- marketing_campaign
- point_of_sale
- product
- project
Thank you.
Saurang Suthar
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-exception-warning-imp_exception_warning-ssu/+merge/118044
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-exception-warning.
=== modified file 'account/account.py'
--- account/account.py 2012-08-01 06:47:11 +0000
+++ account/account.py 2012-08-03 05:57:20 +0000
@@ -3464,7 +3464,7 @@
journal_data.append(vals)
ref_acc_bank = obj_wizard.chart_template_id.bank_account_view_id
if journal_data and not ref_acc_bank.code:
- raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of accounts hasnot a code.'))
+ raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of accounts has no code.'))
current_num = 1
for line in journal_data:
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2012-07-25 07:33:57 +0000
+++ account/i18n/account.pot 2012-08-03 05:57:20 +0000
@@ -7246,7 +7246,7 @@
#. module: account
#: code:addons/account/account.py:3446
#, python-format
-msgid "The bank account defined on the selected chart of accounts hasnot a code."
+msgid "The bank account defined on the selected chart of accounts has no code."
msgstr ""
#. module: account
=== modified file 'delivery/delivery.py'
--- delivery/delivery.py 2012-07-23 12:43:48 +0000
+++ delivery/delivery.py 2012-08-03 05:57:20 +0000
@@ -217,7 +217,7 @@
ok = True
break
if not ok:
- raise osv.except_osv(_('No price available!'), _('No line matched this product or order in the choosed delivery grid.'))
+ raise osv.except_osv(_('No price available!'), _('No line matched this product or order in the chosen delivery grid.'))
return price
=== modified file 'delivery/i18n/delivery.pot'
--- delivery/i18n/delivery.pot 2012-02-08 01:08:30 +0000
+++ delivery/i18n/delivery.pot 2012-08-03 05:57:20 +0000
@@ -212,7 +212,7 @@
#. module: delivery
#: code:addons/delivery/delivery.py:213
#, python-format
-msgid "No line matched this product or order in the choosed delivery grid."
+msgid "No line matched this product or order in the chosen delivery grid."
msgstr ""
#. module: delivery
=== modified file 'marketing_campaign/marketing_campaign.py'
--- marketing_campaign/marketing_campaign.py 2012-07-22 08:05:39 +0000
+++ marketing_campaign/marketing_campaign.py 2012-08-03 05:57:20 +0000
@@ -539,7 +539,7 @@
assert len(ids) == 1
transition = self.browse(cr, uid, ids[0], context=context)
if transition.trigger != 'time':
- raise ValueError('Delta is only relevant for timed transiton.')
+ raise ValueError('Delta is only relevant for timed transition.')
return relativedelta(**{str(transition.interval_type): transition.interval_nbr})
=== modified file 'point_of_sale/i18n/point_of_sale.pot'
--- point_of_sale/i18n/point_of_sale.pot 2012-07-25 10:49:32 +0000
+++ point_of_sale/i18n/point_of_sale.pot 2012-08-03 05:57:20 +0000
@@ -50,10 +50,10 @@
#, python-format
msgid ""
"You must define which payment method must be available through the point of "
-"sale by reusing existing bank and cash through \"Accounting > Configuration "
-"> Financial Accounting > Journals\". Select a journal and check the field "
+"sale by reusing existing bank and cash through \"Accounting / Configuration "
+"/ Journals / Journals\". Select a journal and check the field "
"\"PoS Payment Method\" from the \"Point of Sale\" tab. You can also create "
-"new payment methods directly from menu \"PoS Backend > Configuration > "
+"new payment methods directly from menu \"PoS Backend / Configuration / "
"Payment Methods\"."
msgstr ""
=== modified file 'point_of_sale/wizard/pos_open_statement.py'
--- point_of_sale/wizard/pos_open_statement.py 2012-04-16 09:01:22 +0000
+++ point_of_sale/wizard/pos_open_statement.py 2012-08-03 05:57:20 +0000
@@ -46,7 +46,7 @@
st_ids = []
j_ids = journal_obj.search(cr, uid, [('journal_user','=',1)], context=context)
if not j_ids:
- raise osv.except_osv(_('No Cash Register Defined !'), _('You must define which payment method must be available through the point of sale by reusing existing bank and cash through "Accounting > Configuration > Financial Accounting > Journals". Select a journal and check the field "PoS Payment Method" from the "Point of Sale" tab. You can also create new payment methods directly from menu "PoS Backend > Configuration > Payment Methods".'))
+ raise osv.except_osv(_('No Cash Register Defined !'), _('You must define which payment method must be available through the point of sale by reusing existing bank and cash through "Accounting / Configuration / Journals / Journals". Select a journal and check the field "PoS Payment Method" from the "Point of Sale" tab. You can also create new payment methods directly from menu "PoS Backend / Configuration / Payment Methods".'))
for journal in journal_obj.browse(cr, uid, j_ids, context=context):
ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
=== modified file 'product/i18n/product.pot'
--- product/i18n/product.pot 2012-05-10 13:41:19 +0000
+++ product/i18n/product.pot 2012-08-03 05:57:20 +0000
@@ -573,7 +573,7 @@
#. module: product
#: code:addons/product/product.py:363
#, python-format
-msgid "New UoM '%s' must belong to same UoM category '%s' as of old UoM '%s'. If you need to change the unit of measure, you may desactivate this product from the 'Procurement & Locations' tab and create a new one."
+msgid "New UoM '%s' must belong to same UoM category '%s' as of old UoM '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurement & Locations' tab and create a new one."
msgstr ""
#. module: product
=== modified file 'product/product.py'
--- product/product.py 2012-07-25 16:49:59 +0000
+++ product/product.py 2012-08-03 05:57:20 +0000
@@ -330,7 +330,7 @@
for product in self.browse(cr, uid, ids, context=context):
old_uom = product.uom_po_id
if old_uom.category_id.id != new_uom.category_id.id:
- raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may desactivate this product from the 'Procurement & Locations' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
+ raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurement & Locations' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
return super(product_template, self).write(cr, uid, ids, vals, context=context)
_defaults = {
=== modified file 'project/i18n/project.pot'
--- project/i18n/project.pot 2012-06-25 13:42:53 +0000
+++ project/i18n/project.pot 2012-08-03 05:57:20 +0000
@@ -793,7 +793,7 @@
#: code:addons/project/project.py:155
#, python-format
msgid ""
-"You cannot delete a project containing tasks. I suggest you to desactivate "
+"You cannot delete a project containing tasks. I suggest you to deactivate "
"it."
msgstr ""
=== modified file 'project/project.py'
--- project/project.py 2012-07-27 09:21:35 +0000
+++ project/project.py 2012-08-03 05:57:20 +0000
@@ -155,7 +155,7 @@
def unlink(self, cr, uid, ids, *args, **kwargs):
for proj in self.browse(cr, uid, ids):
if proj.tasks:
- raise osv.except_osv(_('Operation Not Permitted !'), _('You cannot delete a project containing tasks. I suggest you to desactivate it.'))
+ raise osv.except_osv(_('Operation Not Permitted !'), _('You cannot delete a project containing tasks. I suggest you to deactivate it.'))
return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
def _task_count(self, cr, uid, ids, field_name, arg, context=None):
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
