Saurang Suthar(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-exception-warning-exception_improvement-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-exception_improvement-ssu/+merge/117425
Hello sir,
I have improved exception warnings as per suggestion in following modules:
- hr_timesheet_sheet
- import_google
- mrp-operations
- purchase
- sale
- stock
Thank you.
Saurang Suthar
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-exception-warning-exception_improvement-ssu/+merge/117425
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-exception-warning.
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py 2012-07-25 12:13:54 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py 2012-07-31 12:54:03 +0000
@@ -315,7 +315,7 @@
def check_sign(self, cr, uid, ids, typ, context=None):
sheet = self.browse(cr, uid, ids, context=context)[0]
if not sheet.date_current == time.strftime('%Y-%m-%d'):
- raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from an other date than today.'))
+ raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from other date than today.'))
return True
def sign(self, cr, uid, ids, typ, context=None):
=== modified file 'hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot'
--- hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot 2012-07-25 12:13:54 +0000
+++ hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot 2012-07-31 12:54:03 +0000
@@ -971,7 +971,7 @@
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
#, python-format
-msgid "You cannot sign in/sign out from an other date than today."
+msgid "You cannot sign in/sign out from other date than today."
msgstr ""
#. module: hr_timesheet_sheet
=== modified file 'import_google/i18n/import_google.pot'
--- import_google/i18n/import_google.pot 2012-07-22 07:42:14 +0000
+++ import_google/i18n/import_google.pot 2012-07-31 12:54:03 +0000
@@ -33,8 +33,8 @@
#. module: import_google
#: code:addons/import_google/wizard/import_google_data.py:71
#, python-format
-msgid "No Google username or password is defined for user.\n"
-"Please define in user view."
+msgid "No Google Username or password is defined for user.\n"
+"Please define on user's form."
msgstr ""
#. module: import_google
=== modified file 'import_google/wizard/import_google_data.py'
--- import_google/wizard/import_google_data.py 2012-07-22 07:42:14 +0000
+++ import_google/wizard/import_google_data.py 2012-07-31 12:54:03 +0000
@@ -73,7 +73,7 @@
user_obj = self.pool.get('res.users').browse(cr, uid, uid,context=context)
google=self.pool.get('google.login')
if not user_obj.gmail_user or not user_obj.gmail_password:
- raise osv.except_osv(_('Warning !'), _("No Google username or password is defined for user.\nPlease define in user view."))
+ raise osv.except_osv(_('Warning !'), _("No Google Username or password is defined for user.\nPlease define on user's form."))
gd_client = google.google_login(user_obj.gmail_user,user_obj.gmail_password,type='group')
if not gd_client:
return [('failed', 'Connection to google fail')]
=== modified file 'mrp_operations/i18n/mrp_operations.pot'
--- mrp_operations/i18n/mrp_operations.pot 2012-07-18 06:55:50 +0000
+++ mrp_operations/i18n/mrp_operations.pot 2012-07-31 12:54:03 +0000
@@ -164,7 +164,7 @@
#. module: mrp_operations
#: code:addons/mrp_operations/mrp_operations.py:486
#, python-format
-msgid "There is no Operation to be cancelled!"
+msgid "No operation to cancel."
msgstr ""
#. module: mrp_operations
=== modified file 'mrp_operations/mrp_operations.py'
--- mrp_operations/mrp_operations.py 2012-07-18 06:55:50 +0000
+++ mrp_operations/mrp_operations.py 2012-07-31 12:54:03 +0000
@@ -533,7 +533,7 @@
return False
if code.start_stop=='cancel':
if not 'start' in code_lst :
- raise osv.except_osv(_('Error!'),_('There is no Operation to be cancelled!'))
+ raise osv.except_osv(_('Error!'),_('No operation to cancel.'))
return False
if 'done' in code_lst:
raise osv.except_osv(_('Error!'),_('Operation is already finished!'))
=== modified file 'purchase/i18n/purchase.pot'
--- purchase/i18n/purchase.pot 2012-07-25 10:12:29 +0000
+++ purchase/i18n/purchase.pot 2012-07-31 12:54:03 +0000
@@ -443,7 +443,7 @@
#. module: purchase
#: code:addons/purchase/purchase.py:499
#, python-format
-msgid "First cancel all receptions related to this purchase order."
+msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
#. module: purchase
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2012-07-25 12:53:32 +0000
+++ purchase/purchase.py 2012-07-31 12:54:03 +0000
@@ -503,7 +503,7 @@
if inv and inv.state not in ('cancel','draft'):
raise osv.except_osv(
_('Unable to cancel this purchase order.'),
- _('First cancel all receptions related to this purchase order.'))
+ _('You must first cancel all receptions related to this purchase order.'))
if inv:
wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
self.write(cr,uid,ids,{'state':'cancel'})
=== modified file 'sale/i18n/sale.pot'
--- sale/i18n/sale.pot 2012-07-25 11:07:02 +0000
+++ sale/i18n/sale.pot 2012-07-31 12:54:03 +0000
@@ -131,7 +131,7 @@
#: code:addons/sale/sale.py:295
#, python-format
msgid ""
-"In order to delete a confirmed sales order, you must cancel it before ! To "
+"In order to delete a confirmed sales order, you must cancel it! To "
"cancel a sale order, you must first cancel related picking for delivery "
"orders."
msgstr ""
@@ -1492,7 +1492,7 @@
#. module: sale
#: code:addons/sale/sale.py:604
#, python-format
-msgid "First cancel all picking attached to this sales order."
+msgid "You must first cancel all delivery order(s) attached to this sales order."
msgstr ""
#. module: sale
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-07-25 11:07:02 +0000
+++ sale/sale.py 2012-07-31 12:54:03 +0000
@@ -295,7 +295,7 @@
if s['state'] in ['draft', 'cancel']:
unlink_ids.append(s['id'])
else:
- raise osv.except_osv(_('Invalid action !'), _('In order to delete a confirmed sales order, you must cancel it before ! To cancel a sale order, you must first cancel related picking for delivery orders.'))
+ raise osv.except_osv(_('Invalid action !'), _('In order to delete a confirmed sales order, you must cancel it! To cancel a sale order, you must first cancel related picking for delivery orders.'))
return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
@@ -703,7 +703,7 @@
if pick.state not in ('draft', 'cancel'):
raise osv.except_osv(
_('Cannot cancel sales order!'),
- _('First cancel all picking attached to this sales order.'))
+ _('You must first cancel all delivery order(s) attached to this sales order.'))
if pick.state == 'cancel':
for mov in pick.move_lines:
proc_ids = proc_obj.search(cr, uid, [('move_id', '=', mov.id)])
@@ -1210,7 +1210,7 @@
account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account_id)
if not account_id:
raise osv.except_osv(_('Error !'),
- _('Please define Fiscal Position or income category account for Product Categories default Properties.'))
+ _('There is no Fiscal Position defined or Income category account defined for default properties of Product categories.'))
return {
'name': line.name,
'origin': line.order_id.name,
=== modified file 'stock/i18n/stock.pot'
--- stock/i18n/stock.pot 2012-07-25 10:30:41 +0000
+++ stock/i18n/stock.pot 2012-07-31 12:54:03 +0000
@@ -2842,7 +2842,7 @@
#: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
#: code:addons/stock/wizard/stock_partial_picking.py:141
#, python-format
-msgid "Please provide proper quantity."
+msgid "Please provide proper Quantity."
msgstr ""
#. module: stock
=== modified file 'stock/wizard/stock_partial_picking.py'
--- stock/wizard/stock_partial_picking.py 2012-07-25 12:53:32 +0000
+++ stock/wizard/stock_partial_picking.py 2012-07-31 12:54:03 +0000
@@ -167,7 +167,7 @@
#Quantiny must be Positive
if wizard_line.quantity < 0:
- raise osv.except_osv(_('Warning!'), _('Please provide proper quantity.'))
+ raise osv.except_osv(_('Warning!'), _('Please provide proper Quantity.'))
#Compute the quantity for respective wizard_line in the line uom (this jsut do the rounding if necessary)
qty_in_line_uom = uom_obj._compute_qty(cr, uid, line_uom.id, wizard_line.quantity, line_uom.id)
_______________________________________________
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
