openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00625
[Merge] lp:~openerp-dev/openobject-addons/ssi-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
ssi (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/ssi-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#635705 [v6][trunk] Calendars collection not linked when creating a new one
https://bugs.launchpad.net/bugs/635705
#673050 Schedule a meeting is not linked with the associated partner
https://bugs.launchpad.net/bugs/673050
#674411 undefined search screen on m2o "Stages"
https://bugs.launchpad.net/bugs/674411
Hello,
I have done following modifications.
[FIX]all:modified messages to translate were not correctly enclosed in _(' ')
[I18N] all: Updated translations templates.
Kindly review
Thanks
ssi
--
https://code.launchpad.net/~openerp-dev/openobject-addons/ssi-dev-addons1/+merge/41460
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/ssi-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
=== modified file 'account_analytic_plans/i18n/account_analytic_plans.pot'
--- account_analytic_plans/i18n/account_analytic_plans.pot 2010-11-18 16:25:12 +0000
+++ account_analytic_plans/i18n/account_analytic_plans.pot 2010-11-22 13:41:53 +0000
@@ -481,6 +481,12 @@
msgid "Start Date"
msgstr ""
+#. module: account
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
+#, python-format
+msgid "There are no Analytic lines related to \"%s\" Account"
+msgstr ""
+
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "at"
=== modified file 'account_analytic_plans/wizard/account_crossovered_analytic.py'
--- account_analytic_plans/wizard/account_crossovered_analytic.py 2010-11-04 12:42:42 +0000
+++ account_analytic_plans/wizard/account_crossovered_analytic.py 2010-11-22 13:41:53 +0000
@@ -57,7 +57,7 @@
flag = False
break
if flag:
- raise osv.except_osv(_('User Error'),_('There are no Analytic lines related to Account %s' % name))
+ raise osv.except_osv(_('User Error'),_('There are no Analytic lines related to Account %s') % name)
datas = {
'ids': [],
=== modified file 'account_coda/wizard/account_coda_import.py'
--- account_coda/wizard/account_coda_import.py 2010-10-28 06:54:18 +0000
+++ account_coda/wizard/account_coda_import.py 2010-11-22 13:41:53 +0000
@@ -164,7 +164,7 @@
bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_receivable.id})
else:
nb_err += 1
- err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number, contry_name)
+ err_log += _('The bank account %s is not defined for the partner %s')%(cntry_number, contry_name)
bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']})
bank_statement["bank_statement_line"]=bank_statement_lines
=== modified file 'account_followup/i18n/account_followup.pot'
--- account_followup/i18n/account_followup.pot 2010-11-18 16:25:12 +0000
+++ account_followup/i18n/account_followup.pot 2010-11-22 13:41:53 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:11:19+0000\n"
-"PO-Revision-Date: 2010-11-18 16:11:19+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:04+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,28 +27,6 @@
msgstr ""
#. module: account_followup
-#: model:ir.module.module,description:account_followup.module_meta_information
-msgid "\n"
-" Modules to automate letters for unpaid invoices, with multi-level recalls.\n"
-"\n"
-" You can define your multiple levels of recall through the menu:\n"
-" Accounting/Configuration/Miscellaneous/Follow-Ups\n"
-"\n"
-" Once it is defined, you can automatically print recalls every day\n"
-" through simply clicking on the menu:\n"
-" Accounting/Periodical Processing/Billing/Send followups\n"
-"\n"
-" It will generate a PDF with all the letters according to the the\n"
-" different levels of recall defined. You can define different policies\n"
-" for different companies. You can also send mail to the customer.\n"
-"\n"
-" Note that if you want to change the followup level for a given partner/account entry, you can do from in the menu:\n"
-" Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups Sent\n"
-"\n"
-""
-msgstr ""
-
-#. module: account_followup
#: view:account_followup.stat:0
msgid "Group By..."
msgstr ""
@@ -69,7 +47,6 @@
#: field:account_followup.followup,company_id:0
#: view:account_followup.stat:0
#: field:account_followup.stat,company_id:0
-#: field:account_followup.stat.by.partner,company_id:0
msgid "Company"
msgstr ""
@@ -84,11 +61,6 @@
msgstr ""
#. module: account_followup
-#: model:ir.actions.act_window,help:account_followup.action_followup_stat
-msgid "Follow up on the reminders sent over to your partners for unpaid invoices."
-msgstr ""
-
-#. module: account_followup
#: view:account.followup.print.all:0
#: view:account_followup.followup.line:0
msgid "Legend"
@@ -100,11 +72,6 @@
msgstr ""
#. module: account_followup
-#: view:account.followup.print.all:0
-msgid "Select Partners to Remind"
-msgstr ""
-
-#. module: account_followup
#: field:account.followup.print,date:0
msgid "Follow-up Sending Date"
msgstr ""
@@ -121,8 +88,8 @@
msgstr ""
#. module: account_followup
-#: view:account_followup.stat.by.partner:0
-msgid "Balance > 0"
+#: report:account_followup.followup.print:0
+msgid "VAT:"
msgstr ""
#. module: account_followup
@@ -141,14 +108,7 @@
msgstr ""
#. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "VAT:"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.stat:0
-#: field:account_followup.stat,partner_id:0
-#: field:account_followup.stat.by.partner,partner_id:0
+#: field:account_followup.stat,name:0
msgid "Partner"
msgstr ""
@@ -163,12 +123,6 @@
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid "Invoices Reminder"
-msgstr ""
-
-#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup
msgid "Account Follow Up"
msgstr ""
@@ -184,11 +138,6 @@
msgstr ""
#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: account_followup
#: view:account.followup.print.all:0
msgid "%(user_signature)s: User name"
msgstr ""
@@ -199,8 +148,8 @@
msgstr ""
#. module: account_followup
-#: view:account.followup.print:0
-msgid "This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."
+#: field:account_followup.stat,account_type:0
+msgid "Account Type"
msgstr ""
#. module: account_followup
@@ -214,11 +163,6 @@
msgstr ""
#. module: account_followup
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: account_followup
#: view:account.followup.print.all:0
#: field:account.followup.print.all,email_body:0
msgid "Email body"
@@ -231,7 +175,6 @@
#. module: account_followup
#: field:account_followup.stat,date_followup:0
-#: field:account_followup.stat.by.partner,date_followup:0
msgid "Latest followup"
msgstr ""
@@ -265,6 +208,11 @@
#. module: account_followup
#: view:account.followup.print.all:0
+msgid "Select partners to remind"
+msgstr ""
+
+#. module: account_followup
+#: view:account.followup.print.all:0
msgid "Partner Selection"
msgstr ""
@@ -283,11 +231,6 @@
msgstr ""
#. module: account_followup
-#: view:account_followup.stat.by.partner:0
-msgid "Partner to Remind"
-msgstr ""
-
-#. module: account_followup
#: field:account_followup.followup.line,followup_id:0
#: field:account_followup.stat,followup_id:0
msgid "Follow Ups"
@@ -307,6 +250,12 @@
msgstr ""
#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "All E-mails have been successfully sent to Partners:."
+msgstr ""
+
+#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
msgid "\n"
"Dear %(partner_name)s,\n"
@@ -334,11 +283,6 @@
msgstr ""
#. module: account_followup
-#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
-msgid "Followup Statistics by Partner"
-msgstr ""
-
-#. module: account_followup
#: model:ir.module.module,shortdesc:account_followup.module_meta_information
msgid "Accounting follow-ups management"
msgstr ""
@@ -425,14 +369,6 @@
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid "All E-mails have been successfully sent to Partners:.\n"
-"\n"
-""
-msgstr ""
-
-#. module: account_followup
#: view:account.followup.print.all:0
msgid "%(company_name)s: User's Company name"
msgstr ""
@@ -475,7 +411,6 @@
#. module: account_followup
#: view:account_followup.stat:0
#: field:account_followup.stat,balance:0
-#: field:account_followup.stat.by.partner,balance:0
msgid "Balance"
msgstr ""
@@ -492,7 +427,6 @@
#. module: account_followup
#: field:account_followup.stat,date_move_last:0
-#: field:account_followup.stat.by.partner,date_move_last:0
msgid "Last move"
msgstr ""
@@ -507,6 +441,12 @@
msgstr ""
#. module: account_followup
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "E-Mail not sent to following Partners, Email not available !"
+msgstr ""
+
+#. module: account_followup
#: view:account.followup.print:0
#: view:account.followup.print.all:0
msgid "Cancel"
@@ -518,8 +458,9 @@
msgstr ""
#. module: account_followup
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "\n\nE-Mail sent to following Partners successfully. !"
msgstr ""
#. module: account_followup
@@ -528,11 +469,6 @@
msgstr ""
#. module: account_followup
-#: field:account_followup.stat.by.partner,max_followup_id:0
-msgid "Max Follow Up Level"
-msgstr ""
-
-#. module: account_followup
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgstr ""
@@ -600,7 +536,6 @@
#. module: account_followup
#: field:account_followup.stat,date_move:0
-#: field:account_followup.stat.by.partner,date_move:0
msgid "First move"
msgstr ""
@@ -615,14 +550,6 @@
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
-#, python-format
-msgid "E-Mail not sent to following Partners, Email not available !\n"
-"\n"
-""
-msgstr ""
-
-#. module: account_followup
#: view:account.followup.print:0
msgid "Continue"
msgstr ""
=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py 2010-11-16 06:07:20 +0000
+++ account_followup/wizard/account_followup_print.py 2010-11-22 13:41:53 +0000
@@ -281,10 +281,10 @@
msg += partner.name + '\n'
msg_unsent += msg
if not msg_unsent:
- summary = _("All E-mails have been successfully sent to Partners:.\n\n") + msg_sent
+ summary = _("All E-mails have been successfully sent to Partners:.") +'\n\n'+ msg_sent
else:
- msg_unsent = _("E-Mail not sent to following Partners, Email not available !\n\n") + msg_unsent
- msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n") + msg_sent
+ msg_unsent = _("E-Mail not sent to following Partners, Email not available !") +'\n\n'+ msg_unsent
+ msg_sent = msg_sent and _("E-Mail sent to following Partners successfully. !") +'\n\n'+ msg_sent
line = '=========================================================================='
summary = msg_unsent + line + msg_sent
context.update({'summary': summary})
=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py 2010-10-17 17:30:00 +0000
+++ audittrail/audittrail.py 2010-11-22 13:41:53 +0000
@@ -208,7 +208,7 @@
else:
field_ids = field_pool.search(cr, uid, [('name', '=', field_name), ('model_id', '=', model.id)])
field_id = field_ids and field_ids[0] or False
- assert field_id, _("'%s' field does not exist in '%s' model" %(field_name, model.model))
+ assert field_id, (_("'%s' field does not exist in '%s' model") % (field_name, model.model))
field = field_pool.read(cr, uid, field_id)
relation_model = field['relation']
@@ -254,7 +254,7 @@
else:
field_ids = field_pool.search(cr, uid, [('name', '=', line['name']), ('model_id', '=', model.id)])
field_id = field_ids and field_ids[0] or False
- assert field_id, _("'%s' field does not exist in '%s' model" %(line['name'], model.model))
+ assert field_id, (_("'%s' field does not exist in '%s' model") %(line['name'], model.model))
field = field_pool.read(cr, uid, field_id)
old_value = 'old_value' in line and line['old_value'] or ''
@@ -303,7 +303,7 @@
model_ids = model_pool.search(cr, uid, [('model', '=', model)])
model_id = model_ids and model_ids[0] or False
- assert model_id, _("'%s' Model does not exist..." %(model))
+ assert model_id, (_("'%s' Model does not exist...")%(model))
model = model_pool.browse(cr, uid, model_id)
if method in ('create'):
=== modified file 'base_calendar/i18n/base_calendar.pot'
--- base_calendar/i18n/base_calendar.pot 2010-11-18 16:25:12 +0000
+++ base_calendar/i18n/base_calendar.pot 2010-11-22 13:41:53 +0000
@@ -1189,7 +1189,7 @@
#. module: base_calendar
#: help:calendar.alarm,description:0
-msgid "Provides a more complete description of the calendar component, than that provided by the \"SUMMARY\" property"
+msgid "Provides a more complete description of the calendar component, than that provided by the \"SUMMARY\" property"
msgstr ""
#. module: base_calendar
@@ -1421,7 +1421,7 @@
#. module: base_calendar
#: help:calendar.alarm,name:0
-msgid "Contains the text to be used as the message subject for email or contains the text to be used for display"
+msgid "Contains the text to be used as the message subject for email or contains the text to be used for display"
msgstr ""
#. module: base_calendar
=== modified file 'base_module_quality/i18n/base_module_quality.pot'
--- base_module_quality/i18n/base_module_quality.pot 2010-11-18 16:25:12 +0000
+++ base_module_quality/i18n/base_module_quality.pot 2010-11-22 13:41:53 +0000
@@ -135,15 +135,6 @@
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
-#, python-format
-msgid "Error in Read method:\" + str(e))]\n"
-" else:\n"
-" if size < 5:\n"
-" speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _(\"Warning! Not enough demo data"
-msgstr ""
-
-#. module: base_module_quality
#: view:module.quality.detail:0
msgid "Save Report"
msgstr ""
=== modified file 'base_module_quality/speed_test/speed_test.py'
--- base_module_quality/speed_test/speed_test.py 2010-09-07 09:50:55 +0000
+++ base_module_quality/speed_test/speed_test.py 2010-11-22 13:41:53 +0000
@@ -113,7 +113,7 @@
except Exception, e:
self.log.warning('Error in read method', exc_info=True)
list2 = [obj, _("Error in Read method")]
- speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Error in Read method:" + str(e))]
+ speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Error in Read method") + ": %s " % e]
else:
if size < 5:
speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Warning! Not enough demo data")]
=== modified file 'base_setup/__init__.py'
--- base_setup/__init__.py 2010-10-09 09:36:34 +0000
+++ base_setup/__init__.py 2010-11-22 13:41:53 +0000
@@ -47,7 +47,7 @@
user_ids = user_obj.search(cr, uid, [])
users = user_obj.browse(cr, uid, user_ids)
user_str = '\n'.join(map(lambda x: ' - %s :\n\t\tLogin : %s \n\t\tPassword : %s' % (x.name, x.login, x.password), users))
- return _('The following users have been installed : \n')+ user_str
+ return _('The following users have been installed :')+'\n' + user_str
_columns = {
'installed_users':fields.text('Installed Users', readonly=True),
=== modified file 'base_setup/i18n/base_setup.pot'
--- base_setup/i18n/base_setup.pot 2010-11-18 16:25:12 +0000
+++ base_setup/i18n/base_setup.pot 2010-11-22 13:41:53 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:11:48+0000\n"
-"PO-Revision-Date: 2010-11-18 16:11:48+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:19+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,11 +46,6 @@
msgstr ""
#. module: base_setup
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: base_setup
#: field:base.setup.company,account_no:0
msgid "Bank Account No"
msgstr ""
@@ -96,10 +91,8 @@
msgstr ""
#. module: base_setup
-#: code:addons/base_setup/__init__.py:0
-#, python-format
-msgid "The following users have been installed : \n"
-""
+#: view:base.setup.config:0
+msgid "You can start configuring the system or connect directly to the database as an administrator."
msgstr ""
#. module: base_setup
@@ -145,11 +138,6 @@
msgstr ""
#. module: base_setup
-#: view:base.setup.config:0
-msgid "You can start configuring the system or connect directly to the database as an administrator."
-msgstr ""
-
-#. module: base_setup
#: field:base.setup.installer,report_designer:0
msgid "Advanced Reporting"
msgstr ""
@@ -170,16 +158,16 @@
msgstr ""
#. module: base_setup
+#: view:base.setup.config:0
+msgid "Use Directly"
+msgstr ""
+
+#. module: base_setup
#: field:base.setup.installer,knowledge:0
msgid "Knowledge Management"
msgstr ""
#. module: base_setup
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: base_setup
#: help:base.setup.installer,product_expiry:0
msgid "Installs a preselected set of OpenERP applications which will help you manage your industry."
msgstr ""
@@ -195,11 +183,6 @@
msgstr ""
#. module: base_setup
-#: view:base.setup.config:0
-msgid "Skip Configuration Wizards"
-msgstr ""
-
-#. module: base_setup
#: help:base.setup.installer,hr:0
msgid "Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more."
msgstr ""
@@ -433,7 +416,8 @@
msgstr ""
#. module: base_setup
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
+#: code:addons/base_setup/__init__.py:0
+#, python-format
+msgid "The following users have been installed :"
msgstr ""
=== modified file 'board/i18n/board.pot'
--- board/i18n/board.pot 2010-11-18 16:25:12 +0000
+++ board/i18n/board.pot 2010-11-22 13:41:53 +0000
@@ -264,7 +264,7 @@
#. module: board
#: help:board.board.line,sequence:0
-msgid "Gives the sequence order when displaying a list of board lines."
+msgid "Gives the sequence order when displaying a list of board lines."
msgstr ""
#. module: board
=== modified file 'caldav/calendar.py'
--- caldav/calendar.py 2010-11-18 16:21:31 +0000
+++ caldav/calendar.py 2010-11-22 13:41:53 +0000
@@ -770,7 +770,8 @@
res = cr.fetchone()
if res:
if res[0] > 0:
- raise osv.except_osv(_('Warning !'), _('Can not create line "%s" more than once') % (vals.get('name')))
+ raise osv.except_osv(_('Warning !'), _('Can not create \
+line "%s" more than once' % (vals.get('name'))))
return super(basic_calendar_line, self).create(cr, uid, vals, context=context)
basic_calendar_line()
=== modified file 'caldav/i18n/caldav.pot'
--- caldav/i18n/caldav.pot 2010-11-18 16:25:12 +0000
+++ caldav/i18n/caldav.pot 2010-11-22 13:41:53 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:11:50+0000\n"
-"PO-Revision-Date: 2010-11-18 16:11:50+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:20+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,133 +21,8 @@
msgstr ""
#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: caldav
@@ -161,100 +36,13 @@
msgstr ""
#. module: caldav
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,description:0
-msgid "description"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr ""
-
-#. module: caldav
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-msgid "Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
msgstr ""
#. module: caldav
@@ -263,50 +51,24 @@
msgstr ""
#. module: caldav
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
#: field:basic.calendar,has_webcal:0
msgid "WebCal"
msgstr ""
#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
msgstr ""
#. module: caldav
@@ -315,24 +77,8 @@
msgstr ""
#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
msgstr ""
#. module: caldav
@@ -341,67 +87,113 @@
msgstr ""
#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS file"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: caldav
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr ""
-
-#. module: caldav
#: help:basic.calendar,has_webcal:0
msgid "Also export a <name>.ics entry next to the calendar folder, with WebCal content."
msgstr ""
#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
#: field:basic.calendar.fields,fn:0
msgid "Function"
msgstr ""
#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
#: view:basic.calendar:0
msgid "Description"
msgstr ""
#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
#: help:basic.calendar.alias,cal_line_id:0
msgid "The calendar/line this mapping applies to"
msgstr ""
#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
#: field:basic.calendar.fields,mapping:0
msgid "Mapping"
msgstr ""
#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
#: view:calendar.event.import:0
msgid "_Import"
msgstr ""
@@ -412,13 +204,28 @@
msgstr ""
#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
#: model:ir.model,name:caldav.model_calendar_event_import
msgid "Event Import"
msgstr ""
#. module: caldav
#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
msgstr ""
#. module: caldav
@@ -432,6 +239,22 @@
msgstr ""
#. module: caldav
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
#: field:basic.calendar,name:0
#: field:basic.calendar.attributes,name:0
#: field:basic.calendar.fields,name:0
@@ -439,14 +262,20 @@
msgstr ""
#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
#: selection:basic.calendar.attributes,type:0
#: selection:basic.calendar.lines,name:0
msgid "Alarm"
msgstr ""
#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "_Cancel"
msgstr ""
#. module: caldav
@@ -456,14 +285,45 @@
msgstr ""
#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
#: model:ir.actions.act_window,name:caldav.action_calendar_event_export
#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
msgid "Export .ics File"
msgstr ""
#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
msgstr ""
#. module: caldav
@@ -472,6 +332,29 @@
msgstr ""
#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,description:0
+msgid "description"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
#: model:ir.module.module,shortdesc:caldav.module_meta_information
msgid "Share Calendar using CalDAV"
msgstr ""
@@ -482,8 +365,8 @@
msgstr ""
#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
msgstr ""
#. module: caldav
@@ -492,19 +375,70 @@
msgstr ""
#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
#: view:calendar.event.import:0
msgid "Import Message"
msgstr ""
#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+msgid "Calendar"
msgstr ""
#. module: caldav
@@ -517,3 +451,15 @@
msgid "For supporting clients, the order of this folder among the calendars"
msgstr ""
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
=== modified file 'crm/crm_action_rule.py'
--- crm/crm_action_rule.py 2010-09-17 05:54:54 +0000
+++ crm/crm_action_rule.py 2010-11-22 13:41:53 +0000
@@ -124,8 +124,7 @@
# Put state change by rule in communication history
if hasattr(obj, 'state') and action.act_state:
- model_obj._history(cr, uid, [obj], _(action.act_state))
-
+ model_obj._history(cr, uid, [obj], action.act_state)
model_obj.write(cr, uid, [obj.id], write, context)
emails = []
=== modified file 'crm/i18n/crm.pot'
--- crm/i18n/crm.pot 2010-11-18 16:25:12 +0000
+++ crm/i18n/crm.pot 2010-11-22 13:41:53 +0000
@@ -657,7 +657,7 @@
#. module: crm
#: help:crm.phonecall,canal_id:0
-msgid "The channels represent the different communication modes available with the customer. With each commercial opportunity, you can indicate the canall which is this opportunity source."
+msgid "The channels represent the different communication modes available with the customer. With each commercial opportunity, you can indicate the canall which is this opportunity source."
msgstr ""
#. module: crm
@@ -2451,9 +2451,9 @@
#. module: crm
#: help:crm.lead,state:0
#: help:crm.phonecall,state:0
-msgid "The state is set to 'Draft', when a case is created. \n"
-"If the case is in progress the state is set to 'Open'. \n"
-"When the case is over, the state is set to 'Done'. \n"
+msgid "The state is set to 'Draft', when a case is created. \n"
+"If the case is in progress the state is set to 'Open'. \n"
+"When the case is over, the state is set to 'Done'. \n"
"If the case needs to be reviewed then the state is set to 'Pending'."
msgstr ""
@@ -2928,7 +2928,7 @@
#. module: crm
#: help:crm.segmentation,exclusif:0
-msgid "Check if the category is limited to partners that match the segmentation criterions. \n"
+msgid "Check if the category is limited to partners that match the segmentation criterions.\n"
"If checked, remove the category from partners that doesn't match segmentation criterions"
msgstr ""
@@ -2944,7 +2944,7 @@
#. module: crm
#: help:crm.meeting,date_deadline:0
-msgid "Deadline Date is automatically computed from Start Date + Duration"
+msgid "Deadline Date is automatically computed from Start Date + Duration"
msgstr ""
#. module: crm
@@ -3053,7 +3053,7 @@
#. module: crm
#: help:crm.segmentation,som_interval:0
msgid "A period is the average number of days between two cycle of sale or purchase for this segmentation. \n"
-"It's mainly used to detect if a partner has not purchased or buy for a too long time, \n"
+"It's mainly used to detect if a partner has not purchased or buy for a too long time, \n"
"so we suppose that his state of mind has decreased because he probably bought goods to another supplier. \n"
"Use this functionality for recurring businesses."
msgstr ""
=== modified file 'crm/wizard/crm_send_email.py'
--- crm/wizard/crm_send_email.py 2010-10-28 06:54:18 +0000
+++ crm/wizard/crm_send_email.py 2010-11-22 13:41:53 +0000
@@ -138,10 +138,10 @@
)
if not flag:
- raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
+ raise osv.except_osv(_('Error!'), _('Unable to send mail.Please check SMTP is configured properly.'))
msg_dict = {'new': 'Send', 'reply': 'Reply', 'forward': 'Forward'}
- case_pool.history(cr, uid, [case], _(msg_dict[context.get('mail', 'new')]), history=True, \
+ case_pool.history(cr, uid, [case], (_('%s') %msg_dict[context.get('mail', 'new')]), history=True, \
email=obj.email_to, details=body, \
subject=obj.subject, email_from=email_from, \
email_cc=', '.join(email_cc), message_id=message_id, \
=== modified file 'crm_profiling/i18n/crm_profiling.pot'
--- crm_profiling/i18n/crm_profiling.pot 2010-11-18 16:25:12 +0000
+++ crm_profiling/i18n/crm_profiling.pot 2010-11-22 13:41:53 +0000
@@ -130,7 +130,7 @@
#. module: crm_profiling
#: help:crm.segmentation,profiling_active:0
-msgid "Check this box if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
+msgid "Check this box if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
msgstr ""
#. module: crm_profiling
=== modified file 'email_template/email_template_mailbox.py'
--- email_template/email_template_mailbox.py 2010-11-18 16:21:31 +0000
+++ email_template/email_template_mailbox.py 2010-11-22 13:41:53 +0000
@@ -43,9 +43,9 @@
self.send_all_mail(cursor, user, context)
except Exception, e:
LOGGER.notifyChannel(
- "Email Template",
+ _("Email Template"),
netsvc.LOG_ERROR,
- _("Error sending mail: %s") % e)
+ (_("Error sending mail: %s") % str(e)))
def send_all_mail(self, cr, uid, ids=None, context=None):
if ids is None:
=== modified file 'email_template/i18n/email_template.pot'
--- email_template/i18n/email_template.pot 2010-11-18 16:25:12 +0000
+++ email_template/i18n/email_template.pot 2010-11-22 13:41:53 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:12:02+0000\n"
-"PO-Revision-Date: 2010-11-18 16:12:02+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:26+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,18 +32,6 @@
msgstr ""
#. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
-#, python-format
-msgid "No personal email accounts are configured for you. \n"
-"Either ask admin to enforce an account for this template or get yourself a personal email account."
-msgstr ""
-
-#. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid "An email template is an email document that will be sent as part of a marketing campaign. You can personalize it based on specific customer profile fields so that their names or other partner related information can be automatically inserted in it."
-msgstr ""
-
-#. module: email_template
#: view:email_template.mailbox:0
msgid "Personal Emails"
msgstr ""
@@ -69,10 +57,9 @@
msgstr ""
#. module: email_template
-#: help:email.template,model_object_field:0
-msgid "Select the field from the model you want to use.\n"
-"If it is a relationship field you will be able to choose the nested values in the box below\n"
-"(Note:If there are no values make sure you have selected the correct model)"
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed on login. Probable Reason:Could not login to server\nError: %s"
msgstr ""
#. module: email_template
@@ -117,11 +104,6 @@
msgstr ""
#. module: email_template
-#: help:email_template.account,smtpuname:0
-msgid "Specify the username if your SMTP server requires authentication, otherwise leave it empty."
-msgstr ""
-
-#. module: email_template
#: field:email_template.mailbox,server_ref:0
msgid "Server Reference of mail"
msgstr ""
@@ -159,12 +141,6 @@
msgstr ""
#. module: email_template
-#: field:email_template.preview,to:0
-#: field:email_template.send.wizard,to:0
-msgid "To"
-msgstr ""
-
-#. module: email_template
#: field:email.template,from_account:0
msgid "Email Account"
msgstr ""
@@ -397,11 +373,6 @@
msgstr ""
#. module: email_template
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: email_template
#: selection:email.template,template_language:0
msgid "Mako Templates"
msgstr ""
@@ -418,6 +389,12 @@
msgstr ""
#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid "Sending of Mail %s failed. Probable Reason:Could not login to server\nError: %s"
+msgstr ""
+
+#. module: email_template
#: view:email_template.account:0
msgid "Test Outgoing Connection"
msgstr ""
@@ -462,8 +439,10 @@
msgstr ""
#. module: email_template
-#: field:email.template,sub_model_object_field:0
-msgid "Sub Field"
+#: help:email.template,model_object_field:0
+msgid "Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
msgstr ""
#. module: email_template
@@ -558,11 +537,6 @@
msgstr ""
#. module: email_template
-#: selection:email_template.account,state:0
-msgid "Initiated"
-msgstr ""
-
-#. module: email_template
#: field:email.template,report_template:0
msgid "Report to send"
msgstr ""
@@ -624,6 +598,13 @@
msgstr ""
#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Datetime Extraction failed.Date:%s \\n"
+" \tError:%s"
+msgstr ""
+
+#. module: email_template
#: selection:email_template.account,send_pref:0
msgid "HTML, otherwise Text"
msgstr ""
@@ -713,9 +694,8 @@
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Datetime Extraction failed.Date:%s Error:%s"
+#: selection:email_template.account,state:0
+msgid "Initiated"
msgstr ""
#. module: email_template
@@ -752,6 +732,11 @@
msgstr ""
#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr ""
+
+#. module: email_template
#: help:email.template,attachment_ids:0
msgid "You may attach existing files to this template, so they will be added in all emails created from this template"
msgstr ""
@@ -778,13 +763,6 @@
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Mail from Account %s failed. Probable Reason:MIME Error\n"
-"Description: %s"
-msgstr ""
-
-#. module: email_template
#: field:email_template.account,smtptls:0
msgid "TLS"
msgstr ""
@@ -797,6 +775,7 @@
#. module: email_template
#: code:addons/email_template/email_template.py:0
#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_mailbox.py:0
#: code:addons/email_template/wizard/email_template_send_wizard.py:0
#: model:ir.ui.menu,name:email_template.menu_email_template
#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
@@ -817,6 +796,19 @@
msgstr ""
#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid "Error sending mail: %s\" % str(e)))\n"
+" \n"
+" def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+" if ids is None:\n"
+" ids = []\n"
+" if context is None:\n"
+" context = {}\n"
+" filters = [('folder', '=', 'outbox"
+msgstr ""
+
+#. module: email_template
#: help:email.template,allowed_groups:0
msgid "Only users from these groups will be allowed to send mails from this Template"
msgstr ""
@@ -864,8 +856,9 @@
msgstr ""
#. module: email_template
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
msgstr ""
#. module: email_template
@@ -895,17 +888,6 @@
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
-#, python-format
-msgid "Error sending mail: %s"
-msgstr ""
-
-#. module: email_template
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: email_template
#: view:email_template.mailbox:0
msgid "Body (HTML-Web Client Only)"
msgstr ""
@@ -922,6 +904,12 @@
msgstr ""
#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "No personal email accounts are configured for you. \nEither ask admin to enforce an account for this template or get yourself a personal email account."
+msgstr ""
+
+#. module: email_template
#: field:email.template,allowed_groups:0
msgid "Allowed User Groups"
msgstr ""
@@ -937,11 +925,6 @@
msgstr ""
#. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr ""
-
-#. module: email_template
#: view:email_template.account:0
#: selection:email_template.account,state:0
msgid "Suspended"
@@ -953,26 +936,24 @@
msgstr ""
#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr ""
+
+#. module: email_template
#: help:email_template.mailbox,date_mail:0
msgid "Date on which Email Sent or Received"
msgstr ""
#. module: email_template
-#: view:email_template.mailbox:0
-#: selection:email_template.mailbox,folder:0
-msgid "Trash"
-msgstr ""
-
-#. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr ""
-
-#. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
-#, python-format
-msgid "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
-"Error: %s"
+#: help:email_template.account,smtpuname:0
+msgid "Specify the username if your SMTP server requires authentication, otherwise leave it empty."
msgstr ""
#. module: email_template
@@ -1029,6 +1010,11 @@
msgstr ""
#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
+#. module: email_template
#: field:email.template,template_language:0
msgid "Templating Language"
msgstr ""
@@ -1148,13 +1134,6 @@
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Mail from Account %s failed on login. Probable Reason:Could not login to server\n"
-"Error: %s"
-msgstr ""
-
-#. module: email_template
#: model:ir.model,name:email_template.model_email_template_send_wizard
msgid "This is the wizard for sending mail"
msgstr ""
@@ -1170,13 +1149,19 @@
msgstr ""
#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:MIME Error\nDescription: %s"
+msgstr ""
+
+#. module: email_template
#: field:email_template.account,send_pref:0
msgid "Mail Format"
msgstr ""
#. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
+#: view:email.template:0
+msgid "Actions"
msgstr ""
#. module: email_template
=== modified file 'fetchmail/fetchmail.py'
--- fetchmail/fetchmail.py 2010-11-04 13:21:37 +0000
+++ fetchmail/fetchmail.py 2010-11-22 13:41:53 +0000
@@ -125,7 +125,7 @@
#TODO: use this to remove only unread messages
#pop_server.user("recent:"+server.user)
pop_server.user(server.user)
- pop_server.pass_(server.password)
+ pop_server.pass_('%s') % server.password
ret_server = pop_server
self.write(cr, uid, [server.id], {'state':'done'})
=== modified file 'hr_attendance/hr_attendance.py'
--- hr_attendance/hr_attendance.py 2010-11-01 06:07:10 +0000
+++ hr_attendance/hr_attendance.py 2010-11-22 13:41:53 +0000
@@ -143,7 +143,7 @@
warning_sign = "Sign Out"
for emp in self.read(cr, uid, ids, ['id'], context=context):
if not self._action_check(cr, uid, emp['id'], dt, context):
- raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,))
+ raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !Try to contact the administrator to correct attendances.') +'\n' %(warning_sign,))
res = {'action': type, 'employee_id': emp['id']}
if dt:
=== modified file 'hr_evaluation/i18n/hr_evaluation.pot'
--- hr_evaluation/i18n/hr_evaluation.pot 2010-11-18 16:25:12 +0000
+++ hr_evaluation/i18n/hr_evaluation.pot 2010-11-22 13:41:53 +0000
@@ -186,26 +186,6 @@
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
-#, python-format
-msgid "\n"
-"Date: %(date)s\n"
-"\n"
-"Dear %(employee_name)s,\n"
-"\n"
-"I am doing an evaluation regarding %(eval_name)s.\n"
-"\n"
-"Kindly submit your response.\n"
-"\n"
-"\n"
-"Thanks,\n"
-"--\n"
-"%(user_signature)s\n"
-"\n"
-" "
-msgstr ""
-
-#. module: hr_evaluation
#: view:hr_evaluation.plan.phase:0
msgid "Send to Employees"
msgstr ""
=== modified file 'hr_expense/i18n/hr_expense.pot'
--- hr_expense/i18n/hr_expense.pot 2010-11-18 16:25:12 +0000
+++ hr_expense/i18n/hr_expense.pot 2010-11-22 13:41:53 +0000
@@ -781,7 +781,7 @@
#. module: hr_expense
#: help:hr.expense.expense,state:0
msgid "When the expense request is created the state is 'Draft'.\n"
-" It is confirmed by the user and request is sent to admin, the state is 'Waiting Confirmation'. \n"
+" It is confirmed by the user and request is sent to admin, the state is 'Waiting Confirmation'.\n"
"If the admin accepts it, the state is 'Accepted'.\n"
" If an invoice is made for the expense request, the state is 'Invoiced'.\n"
" If the expense is paid to user, the state is 'Reimbursed'."
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2010-11-10 11:20:09 +0000
+++ hr_holidays/hr_holidays.py 2010-11-22 13:41:53 +0000
@@ -366,13 +366,13 @@
if record.employee_id and not record.holiday_status_id.limit:
leaves_rest = self.pool.get('hr.holidays.status').get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
if leaves_rest < leave_asked:
- raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.' %(record.employee_id.name)))
+ raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.') %(record.employee_id.name))
nb = -(record.number_of_days_temp)
elif record.holiday_type == 'category' and record.type == 'remove':
if record.category_id and not record.holiday_status_id.limit:
leaves_rest = obj_hr_holiday_status.get_days_cat( cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
if leaves_rest < leave_asked:
- raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.' %(record.category_id.name)))
+ raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for %s while available leaves are less than asked leaves.') %(record.category_id.name))
nb = -(record.number_of_days_temp)
else:
nb = record.number_of_days_temp
=== modified file 'hr_holidays/i18n/hr_holidays.pot'
--- hr_holidays/i18n/hr_holidays.pot 2010-11-18 16:25:12 +0000
+++ hr_holidays/i18n/hr_holidays.pot 2010-11-22 13:41:53 +0000
@@ -49,18 +49,6 @@
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "You cannot validate leaves for %s while available leaves are less than asked leaves.' %(record.employee_id.name)))\n"
-" nb = -(record.number_of_days_temp)\n"
-" elif record.holiday_type == 'category' and record.type == 'remove':\n"
-" if record.category_id and not record.holiday_status_id.limit:\n"
-" leaves_rest = obj_hr_holiday_status.get_days_cat( cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']\n"
-" if leaves_rest < leave_asked:\n"
-" raise osv.except_osv(_('Warning!"
-msgstr ""
-
-#. module: hr_holidays
#: view:available.holidays.report:0
#: view:hr.holidays:0
#: view:hr.holidays.status:0
@@ -261,7 +249,7 @@
#. module: hr_holidays
#: help:hr.holidays,state:0
msgid "When the holiday request is created the state is 'Draft'.\n"
-" It is confirmed by the user and request is sent to admin, the state is 'Waiting Approval'. If the admin accepts it, the state is 'Approved'. If it is refused, the state is 'Refused'."
+" It is confirmed by the user and request is sent to admin, the state is 'Waiting Approval'.If the admin accepts it, the state is 'Approved'. If it is refused, the state is 'Refused'."
msgstr ""
#. module: hr_holidays
@@ -568,25 +556,6 @@
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "You cannot validate leaves for %s while available leaves are less than asked leaves.' %(record.category_id.name)))\n"
-" nb = -(record.number_of_days_temp)\n"
-" else:\n"
-" nb = record.number_of_days_temp\n"
-"\n"
-" if record.holiday_type == 'employee' and record.employee_id:\n"
-" user_id = record.employee_id.user_id and record.employee_id.user_id.id or uid\n"
-"\n"
-" self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id })\n"
-" return True\n"
-"\n"
-" def holidays_refuse(self, cr, uid, ids, *args):\n"
-" vals = {'state': 'refuse'}\n"
-" ids2 = self.pool.get('hr.employee"
-msgstr ""
-
-#. module: hr_holidays
#: view:available.holidays.report:0
msgid " Year "
msgstr ""
=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py 2010-11-18 16:21:31 +0000
+++ hr_payroll/hr_payroll.py 2010-11-22 13:41:53 +0000
@@ -176,7 +176,7 @@
exp = line.category_id.condition
calculate = eval(exp, obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ' % (e)))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
if not calculate:
continue
@@ -191,7 +191,7 @@
#Please have a look at the configuration guide.
amt = eval(base, obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ' % (e)))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
if sal_type in ('gross', 'net'):
if line.amount_type == 'per':
@@ -855,7 +855,7 @@
try:
amount = line.amount * eval(str(line.category_id.base), obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ' % (e)))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
elif line.amount_type in ('fix', 'func'):
amount = line.amount
cd = line.category_id.code.lower()
@@ -1147,7 +1147,7 @@
exp = line.category_id.condition
calculate = eval(exp, obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ' % (e)))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
if not calculate:
continue
@@ -1162,7 +1162,7 @@
#Please have a look at the configuration guide.
amt = eval(base, obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ' % (e)))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s') % (e))
if sal_type in ('gross', 'net'):
if line.amount_type == 'per':
@@ -1261,7 +1261,7 @@
paid_leave = 0.0
for hday in holiday_pool.browse(cr, uid, leave_ids, context=context):
if not hday.holiday_status_id.head_id:
- raise osv.except_osv(_('Error !'), _('Please check configuration of %s, payroll head is missing') % (hday.holiday_status_id.name))
+ raise osv.except_osv(_('Error !'), _('Please check configuration of %s, payroll head is missing' % (hday.holiday_status_id.name)))
res = {
'slip_id':slip.id,
@@ -1448,7 +1448,7 @@
try:
amt = eval(base, obj)
except Exception, e:
- raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
+ raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s')% (e))
amount = 0.0
if line.amount_type == 'per':
amount = amt * line.amount
=== modified file 'hr_payroll/i18n/hr_payroll.pot'
--- hr_payroll/i18n/hr_payroll.pot 2010-11-18 16:25:12 +0000
+++ hr_payroll/i18n/hr_payroll.pot 2010-11-22 13:41:53 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:12:11+0000\n"
-"PO-Revision-Date: 2010-11-18 16:12:11+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:31+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:31+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -148,12 +148,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Variable Error: %s "
-msgstr ""
-
-#. module: hr_payroll
#: view:hr.passport:0
msgid "Expire"
msgstr ""
@@ -259,12 +253,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
-msgstr ""
-
-#. module: hr_payroll
#: selection:company.contribution,amount_type:0
msgid "Percentage"
msgstr ""
@@ -286,13 +274,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Variable Error: %s ' % (e)))\n"
-" elif line.amount_type in ('fix', 'func"
-msgstr ""
-
-#. module: hr_payroll
#: selection:hr.allounce.deduction.categoty,type:0
#: selection:hr.payslip.line,type:0
msgid "Other Deduction"
@@ -541,11 +522,6 @@
msgstr ""
#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: hr_payroll
#: code:addons/hr_payroll/hr_payroll.py:0
#, python-format
msgid "Error !"
@@ -681,14 +657,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Variable Error: %s ' % (e)))\n"
-"\n"
-" if sal_type in ('gross', 'net"
-msgstr ""
-
-#. module: hr_payroll
#: view:hr.contibution.register:0
msgid "Contribution Lines"
msgstr ""
@@ -1216,11 +1184,6 @@
msgstr ""
#. module: hr_payroll
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: hr_payroll
#: report:salary.structure:0
msgid "Salary"
msgstr ""
@@ -1399,27 +1362,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Variable Error: %s ' % (e)))\n"
-"\n"
-" if not calculate:\n"
-" continue\n"
-"\n"
-" percent = 0.0\n"
-" value = 0.0\n"
-" base = False\n"
-"# company_contrib = 0.0\n"
-" base = line.category_id.base\n"
-"\n"
-" try:\n"
-" #Please have a look at the configuration guide.\n"
-" amt = eval(base, obj)\n"
-" except Exception, e:\n"
-" raise osv.except_osv(_('Variable Error !"
-msgstr ""
-
-#. module: hr_payroll
#: report:hr.payroll.register.sheet:0
msgid "Net Sal."
msgstr ""
@@ -1561,12 +1503,6 @@
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: hr_payroll
#: field:hr.passport,date_issue:0
msgid "Passport Issue Date"
msgstr ""
@@ -1648,8 +1584,3 @@
msgid "Contributions"
msgstr ""
-#. module: hr_payroll
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py 2010-11-18 16:21:31 +0000
+++ hr_payroll_account/hr_payroll_account.py 2010-11-22 13:41:53 +0000
@@ -277,10 +277,10 @@
if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
year_exist = True
if not year_exist:
- raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s') % slip.date)
+ raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s') %slip.date)
search_periods = period_pool.search(cr, uid, [('date_start','<=',slip.date),('date_stop','>=',slip.date)], context=context)
if not search_periods:
- raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s') % slip.date)
+ raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s') %slip.date)
period_id = search_periods[0]
name = 'Payment of Salary to %s' % (slip.employee_id.name)
move = {
@@ -428,10 +428,10 @@
partner_id = False
if not slip.employee_id.bank_account_id:
- raise osv.except_osv(_('Integrity Error !'), _('Please defined bank account for %s !') % (slip.employee_id.name))
+ raise osv.except_osv(_('Integrity Error !'), _('Please define bank account for %s !' % (slip.employee_id.name)))
if not slip.employee_id.bank_account_id.partner_id:
- raise osv.except_osv(_('Integrity Error !'), _('Please defined partner in bank account for %s !') % (slip.employee_id.name))
+ raise osv.except_osv(_('Integrity Error !'), _('Please define partner in bank account for %s !') % (slip.employee_id.name))
partner = slip.employee_id.bank_account_id.partner_id
partner_id = slip.employee_id.bank_account_id.partner_id.id
@@ -450,10 +450,10 @@
if ((fiscal_year['date_start'] <= slip.date) and (fiscal_year['date_stop'] >= slip.date)):
year_exist = True
if not year_exist:
- raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s') % slip.date)
+ raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s')%slip.date)
search_periods = period_pool.search(cr,uid,[('date_start','<=',slip.date),('date_stop','>=',slip.date)], context=context)
if not search_periods:
- raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s') % slip.date)
+ raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s')%slip.date)
period_id = search_periods[0]
move = {
@@ -667,4 +667,4 @@
}
account_move_link_slip()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== modified file 'hr_payroll_account/i18n/hr_payroll_account.pot'
--- hr_payroll_account/i18n/hr_payroll_account.pot 2010-11-18 16:25:12 +0000
+++ hr_payroll_account/i18n/hr_payroll_account.pot 2010-11-22 13:41:53 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:12:12+0000\n"
-"PO-Revision-Date: 2010-11-18 16:12:12+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46:32+0000\n"
+"PO-Revision-Date: 2010-10-18 17:46:32+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,16 +27,6 @@
msgstr ""
#. module: hr_payroll_account
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: hr_payroll_account
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: hr_payroll_account
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
@@ -83,11 +73,6 @@
msgstr ""
#. module: hr_payroll_account
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: hr_payroll_account
#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
msgid "Payroll Register"
msgstr ""
@@ -109,9 +94,8 @@
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
-#, python-format
-msgid "Please defined partner in bank account for %s !"
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: hr_payroll_account
@@ -120,12 +104,6 @@
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
-#, python-format
-msgid "Please defined bank account for %s !"
-msgstr ""
-
-#. module: hr_payroll_account
#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
msgid "Human Resource Payroll Accounting"
msgstr ""
@@ -240,11 +218,6 @@
msgstr ""
#. module: hr_payroll_account
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: hr_payroll_account
#: field:hr.payslip.account.move,slip_id:0
#: model:ir.model,name:hr_payroll_account.model_hr_payslip
msgid "Pay Slip"
@@ -262,12 +235,6 @@
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
-#, python-format
-msgid "Fiscal Year is not defined for slip date %s"
-msgstr ""
-
-#. module: hr_payroll_account
#: field:hr.contibution.register,analytic_account_id:0
#: field:hr.employee,analytic_account:0
#: field:hr.holidays.status,analytic_account_id:0
@@ -303,12 +270,6 @@
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
-#, python-format
-msgid "Period is not defined for slip date %s"
-msgstr ""
-
-#. module: hr_payroll_account
#: view:hr.employee:0
msgid "Accounting"
msgstr ""
=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py 2010-10-27 12:49:59 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py 2010-11-22 13:41:53 +0000
@@ -75,7 +75,7 @@
partner = account.partner_id
if (not partner) or not (account.pricelist_id):
raise osv.except_osv(_('Analytic Account incomplete'),
- _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
+ _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:%s')+'\n' % (account.name,))
if not partner.address:
raise osv.except_osv(_('Partner incomplete'),
=== modified file 'hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot'
--- hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot 2010-11-18 16:25:12 +0000
+++ hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot 2010-11-22 13:41:53 +0000
@@ -731,8 +731,8 @@
#. module: hr_timesheet_sheet
#: help:hr_timesheet_sheet.sheet,state:0
-msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed timesheet. \n"
-"* The 'Confirmed' state is used for to confirm the timesheet by user. \n"
+msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed timesheet.\n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.\n"
"* The 'Done' state is used when users timesheet is accepted by his/her senior."
msgstr ""
=== modified file 'mrp_repair/i18n/mrp_repair.pot'
--- mrp_repair/i18n/mrp_repair.pot 2010-11-18 16:25:12 +0000
+++ mrp_repair/i18n/mrp_repair.pot 2010-11-22 13:41:53 +0000
@@ -22,11 +22,11 @@
#. module: mrp_repair
#: help:mrp.repair,state:0
-msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed repair order. \n"
+msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed repair order.\n"
"* The 'Confirmed' state is used when a user confirms the repair order. \n"
-"* The 'Ready to Repair' state is used to start to repairing, user can start repairing only after repair order is confirmed. \n"
-"* The 'To be Invoiced' state is used to generate the invoice before or after repairing done. \n"
-"* The 'Done' state is set when repairing is completed. \n"
+"* The 'Ready to Repair' state is used to start to repairing, user can start repairing only after repair order is confirmed.\n"
+"* The 'To be Invoiced' state is used to generate the invoice before or after repairing done.\n"
+"* The 'Done' state is set when repairing is completed.\n"
"* The 'Cancelled' state is used when user cancel repair order."
msgstr ""
@@ -279,9 +279,9 @@
#. module: mrp_repair
#: help:mrp.repair.line,state:0
-msgid " * The 'Draft' state is set automatically as draft when repair order in draft state. \n"
-"* The 'Confirmed' state is set automatically as confirm when repair order in confirm state. \n"
-"* The 'Done' state is set automatically when repair order is completed. \n"
+msgid " * The 'Draft' state is set automatically as draft when repair order in draft state.\n"
+"* The 'Confirmed' state is set automatically as confirm when repair order in confirm state. \n"
+"* The 'Done' state is set automatically when repair order is completed.\n"
"* The 'Cancelled' state is set automatically when user cancel repair order."
msgstr ""
=== modified file 'point_of_sale/i18n/point_of_sale.pot'
--- point_of_sale/i18n/point_of_sale.pot 2010-11-18 16:25:12 +0000
+++ point_of_sale/i18n/point_of_sale.pot 2010-11-22 13:41:53 +0000
@@ -359,19 +359,6 @@
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
-#, python-format
-msgid "You can not open a Cashbox for \"%s\".\n"
-"Please close its related cash register.' %(journal.name)))\n"
-"\n"
-" number = \n"
-" if journal.sequence_id:\n"
-" number = sequence_obj.get_id(cr, uid, journal.sequence_id.id)\n"
-" else:\n"
-" number = sequence_obj.get(cr, uid, 'account.cash.statement"
-msgstr ""
-
-#. module: point_of_sale
#: constraint:stock.move:0
msgid "You try to assign a lot which is not from the same product"
msgstr ""
=== modified file 'point_of_sale/wizard/pos_open_statement.py'
--- point_of_sale/wizard/pos_open_statement.py 2010-10-29 13:06:59 +0000
+++ point_of_sale/wizard/pos_open_statement.py 2010-11-22 13:41:53 +0000
@@ -49,7 +49,7 @@
for journal in journal_obj.browse(cr, uid, journal_ids, context=context):
ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
if len(ids):
- raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related cash register.' %(journal.name)))
+ raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related cash register.') %(journal.name))
number = ''
if journal.sequence_id:
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py 2010-10-17 17:30:00 +0000
+++ project_issue/project_issue.py 2010-11-22 13:41:53 +0000
@@ -365,7 +365,7 @@
if case.task_id:
self.pool.get('project.task').write(cr, uid, [case.task_id.id], {'project_id': data['project_id'], 'user_id': False})
else:
- raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
+ raise osv.except_osv(_('Warning !'), _('You cannot escalate this issue.The relevant Project has not configured the Escalation Project!'))
self.write(cr, uid, [case.id], data)
self._history(cr, uid, cases, _('Escalate'))
return True
=== modified file 'project_scrum/i18n/project_scrum.pot'
--- project_scrum/i18n/project_scrum.pot 2010-11-18 16:25:12 +0000
+++ project_scrum/i18n/project_scrum.pot 2010-11-22 13:41:53 +0000
@@ -811,14 +811,6 @@
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid " Email Not send to the product owner %s!' % meeting_id.sprint_id.product_owner_id.name))\n"
-" else:\n"
-" raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgstr ""
@@ -829,14 +821,6 @@
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
-#, python-format
-msgid " Email Not send to the scrum master %s!' % meeting_id.sprint_id.scrum_master_id.name))\n"
-" else:\n"
-" raise osv.except_osv(_('Error !"
-msgstr ""
-
-#. module: project_scrum
#: view:project.scrum.sprint:0
msgid "Responsible"
msgstr ""
=== modified file 'project_scrum/project_scrum.py'
--- project_scrum/project_scrum.py 2010-11-15 07:00:33 +0000
+++ project_scrum/project_scrum.py 2010-11-22 13:41:53 +0000
@@ -330,7 +330,7 @@
if meeting_id and meeting_id.sprint_id.scrum_master_id.user_email:
res = self.email_send(cr, uid, ids, meeting_id.sprint_id.scrum_master_id.user_email)
if not res:
- raise osv.except_osv(_('Error !'), _(' Email Not send to the scrum master %s!' % meeting_id.sprint_id.scrum_master_id.name))
+ raise osv.except_osv(_('Error !'), _('Email Not send to the scrum master %s!') % meeting_id.sprint_id.scrum_master_id.name)
else:
raise osv.except_osv(_('Error !'), _('Please provide email address for scrum master defined on sprint.'))
return True
@@ -343,7 +343,7 @@
if meeting_id.sprint_id.product_owner_id.user_email:
res = self.email_send(cr,uid,ids,meeting_id.sprint_id.product_owner_id.user_email)
if not res:
- raise osv.except_osv(_('Error !'), _(' Email Not send to the product owner %s!' % meeting_id.sprint_id.product_owner_id.name))
+ raise osv.except_osv(_('Error !'), _('Email Not send to the product owner %s!') % meeting_id.sprint_id.product_owner_id.name)
else:
raise osv.except_osv(_('Error !'), _('Please provide email address for product owner defined on sprint.'))
return True
=== modified file 'project_scrum/wizard/project_scrum_backlog_sprint.py'
--- project_scrum/wizard/project_scrum_backlog_sprint.py 2010-08-27 15:04:44 +0000
+++ project_scrum/wizard/project_scrum_backlog_sprint.py 2010-11-22 13:41:53 +0000
@@ -54,12 +54,12 @@
'planned_hours':backlog.expected_hours,
'remaining_hours':backlog.expected_hours,
})
- message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is converted into Task %d."%(task_id,))
+ message = _("Product Backlog '%s' is converted into Task %d.") %(backlog.name,task_id)
self.log(cr, uid, backlog.id, message)
if data['state_open'] and backlog.state == "draft":
backlog_obj.write(cr, uid, backlog.id, {'state':'open'})
sprint = sprint_obj.browse(cr, uid, data['sprint_id'], context=context)
- message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is assigned sprint:%s"%(sprint.name))
+ message = _("Product Backlog '%s' is assigned sprint:%s") %(backlog.name,sprint.name)
self.log(cr, uid, backlog.id, message)
backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context)
return {}
=== modified file 'purchase/i18n/purchase.pot'
--- purchase/i18n/purchase.pot 2010-11-18 16:25:12 +0000
+++ purchase/i18n/purchase.pot 2010-11-22 13:41:53 +0000
@@ -1539,8 +1539,8 @@
#. module: purchase
#: help:purchase.order.line,state:0
msgid " * The 'Draft' state is set automatically when purchase order in draft state. \n"
-"* The 'Confirmed' state is set automatically as confirm when purchase order in confirm state. \n"
-"* The 'Done' state is set automatically when purchase order is set as done. \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order in confirm state.\n"
+"* The 'Done' state is set automatically when purchase order is set as done. \n"
"* The 'Cancelled' state is set automatically when user cancel purchase order."
msgstr ""
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2010-11-02 17:07:13 +0000
+++ purchase/purchase.py 2010-11-22 13:41:53 +0000
@@ -229,7 +229,7 @@
if s['state'] in ['draft','cancel']:
unlink_ids.append(s['id'])
else:
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!') % _(dict(purchase_order.STATE_SELECTION).get(s['state'])))
+ raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!') % (_('%s') % dict(purchase_order.STATE_SELECTION).get(s['state'])))
# TODO: temporary fix in 5.0, to remove in 5.2 when subflows support
# automatically sending subflow.delete upon deletion
@@ -639,9 +639,9 @@
partner_id, date_order=False, fiscal_position=False, date_planned=False,
name=False, price_unit=False, notes=False):
if not pricelist:
- raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !\nPlease set one before choosing a product.'))
+ raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist or a supplier in the purchase form !Please set one before choosing a product.'))
if not partner_id:
- raise osv.except_osv(_('No Partner!'), _('You have to select a partner in the purchase form !\nPlease set one partner before choosing a product.'))
+ raise osv.except_osv(_('No Partner!'), _('You have to select a partner in the purchase form !Please set one partner before choosing a product.'))
if not product:
return {'value': {'price_unit': price_unit or 0.0, 'name': name or '',
'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
=== modified file 'report_webkit/webkit_report.py'
--- report_webkit/webkit_report.py 2010-10-26 13:22:54 +0000
+++ report_webkit/webkit_report.py 2010-11-22 13:41:53 +0000
@@ -144,7 +144,7 @@
status = commands.getstatusoutput(generate_command)
if status[0] :
raise except_osv(
- _('Webkit raise an error' ),
+ _('Webkit raise an error'),
status[1]
)
except Exception:
=== modified file 'sale/i18n/sale.pot'
--- sale/i18n/sale.pot 2010-11-18 16:25:12 +0000
+++ sale/i18n/sale.pot 2010-11-22 13:41:53 +0000
@@ -702,7 +702,7 @@
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
#, python-format
-msgid "You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."
+msgid "You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."
msgstr ""
#. module: sale
=== modified file 'sale/wizard/sale_line_invoice.py'
--- sale/wizard/sale_line_invoice.py 2010-10-25 12:54:08 +0000
+++ sale/wizard/sale_line_invoice.py 2010-11-22 13:41:53 +0000
@@ -108,7 +108,7 @@
sales_order_obj.write(cr, uid, [line.order_id.id], {'state': 'progress'})
if not invoices:
- raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!'))
+ raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sale Order Line due to one of the following reasons: 1.The state of this sale order line is either "draft" or "cancel"! 2.The Sale Order Line is Invoiced!'))
return {}
=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py 2010-10-22 07:23:46 +0000
+++ sale_crm/wizard/crm_make_sale.py 2010-11-22 13:41:53 +0000
@@ -107,7 +107,7 @@
new_id = sale_obj.create(cr, uid, vals)
case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
new_ids.append(new_id)
- message = _('Opportunity ') + " '" + case.name + "' "+ _("is converted to Quotation.")
+ message = (_("Opportunity '%s' is converted to Quotation.") %case.name)
self.log(cr, uid, case.id, message)
case_obj._history(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id))
=== modified file 'share/wizard/share_wizard.py'
--- share/wizard/share_wizard.py 2010-11-12 16:23:38 +0000
+++ share/wizard/share_wizard.py 2010-11-22 13:41:53 +0000
@@ -283,7 +283,7 @@
except Exception:
self.__logger.exception('Failed to create share access')
raise osv.except_osv(_('Sharing access could not be setup'),
- _('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.'))
+ _('Sorry, the current screen and filter you are trying to share are not supported at the moment.You may want to try a simpler filter.'))
def _create_result_lines(self, cr, uid, wizard_data, context=None):
user_obj = self.pool.get('res.users')
@@ -419,16 +419,16 @@
for result_line in wizard_data.result_line_ids:
email_to = result_line.login
subject = _('%s has shared OpenERP %s information with you') % (user.name, wizard_data.action_id.name)
- body = _("Dear,\n\n") + subject + "\n\n"
- body += _("To access it, you can go to the following URL:\n %s") % wizard_data.share_root_url
+ body = _("Dear,") + "\n\n " + subject + "\n\n"
+ body += _("To access it, you can go to the following URL: %s")+ "\n" % wizard_data.share_root_url
body += "\n\n"
if result_line.newly_created:
body += _("You may use the following login and password to get access to this protected area:") + "\n"
body += "%s: %s" % (_("Username"), result_line.login) + "\n"
body += "%s: %s" % (_("Password"), result_line.password) + "\n"
else:
- body += _("This additional data has been automatically added to your current access.\n")
- body += _("You may use your existing login and password to view it. As a reminder, your login is %s.\n") % result_line.login
+ body += _("This additional data has been automatically added to your current access.") + "\n"
+ body += _("You may use your existing login and password to view it. As a reminder, your login is %s.")+ '\n' % result_line.login
if not tools.email_send(
user.user_email,
=== modified file 'stock/i18n/stock.pot'
--- stock/i18n/stock.pot 2010-11-18 16:25:12 +0000
+++ stock/i18n/stock.pot 2010-11-22 13:41:53 +0000
@@ -88,18 +88,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-" product_qty = partial_data.get('product_qty',0.0)\n"
-" move_product_qty[move.id] = product_qty\n"
-" product_uom = partial_data.get('product_uom',False)\n"
-" product_price = partial_data.get('product_price',0.0)\n"
-" product_currency = partial_data.get('product_currency',False)\n"
-" prodlot_ids[move.id] = partial_data.get('prodlot_id"
-msgstr ""
-
-#. module: stock
#: model:ir.actions.act_window,help:stock.action_picking_tree
msgid "This is the list of all delivery orders that must be prepared, according to your different sales orders and your logistics rules."
msgstr ""
@@ -290,7 +278,7 @@
msgid "When the stock move is created it is in the 'Draft' state.\n"
" After that it is set to 'Confirmed' state.\n"
" If stock is available state is set to 'Available'.\n"
-" When the picking is done the state is 'Done'. \n"
+" When the picking is done the state is 'Done'.\n"
"The state is 'Waiting' if the move is waiting for another one."
msgstr ""
@@ -1205,18 +1193,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
-" product_qty = partial_data.get('product_qty',0.0)\n"
-" move_product_qty[move.id] = product_qty\n"
-" product_uom = partial_data.get('product_uom',False)\n"
-" product_price = partial_data.get('product_price',0.0)\n"
-" product_currency = partial_data.get('product_currency',False)\n"
-" prodlot_id = partial_data.get('prodlot_id"
-msgstr ""
-
-#. module: stock
#: view:report.stock.inventory:0
#: view:report.stock.move:0
msgid "Total quantity"
@@ -1658,14 +1634,6 @@
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
-#, python-format
-msgid "Variation Account is not specified for Product Category: %s' % (product_obj.categ_id.name)))\n"
-" move_ids = []\n"
-" loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
-msgstr ""
-
-#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_UNDO"
msgstr ""
=== modified file 'stock/product.py'
--- stock/product.py 2010-10-27 12:59:05 +0000
+++ stock/product.py 2010-11-22 13:41:53 +0000
@@ -71,7 +71,7 @@
product_obj=self.browse(cr,uid,ids)[0]
account_variation = product_obj.categ_id.property_stock_variation
account_variation_id = account_variation and account_variation.id or False
- if not account_variation_id: raise osv.except_osv(_('Error!'), _('Variation Account is not specified for Product Category: %s' % (product_obj.categ_id.name)))
+ if not account_variation_id: raise osv.except_osv(_('Error!'), _('Variation Account is not specified for Product Category: %s') % (product_obj.categ_id.name))
move_ids = []
loc_ids = location_obj.search(cr, uid,[('usage','=','internal')])
for rec_id in ids:
@@ -171,7 +171,7 @@
res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
if res: return res
if (context.get('active_id', False)) and (context.get('active_model') == 'stock.location'):
- return _('Products: ')+self.pool.get('stock.location').browse(cr, user, context['active_id'], context).name
+ return _('Products:')+self.pool.get('stock.location').browse(cr, user, context['active_id'], context).name
return res
def get_product_available(self, cr, uid, ids, context=None):
=== modified file 'stock/stock.py'
--- stock/stock.py 2010-11-08 18:27:35 +0000
+++ stock/stock.py 2010-11-22 13:41:53 +0000
@@ -1143,7 +1143,7 @@
if move.state in ('done', 'cancel'):
continue
partial_data = partial_datas.get('move%s'%(move.id), False)
- assert partial_data, _('Do not Found Partial data of Stock Move Line :%s' %(move.id))
+ assert partial_data, (_('Do not Found Partial data of Stock Move Line :%s') %(move.id))
product_qty = partial_data.get('product_qty',0.0)
move_product_qty[move.id] = product_qty
product_uom = partial_data.get('product_uom',False)
@@ -2244,7 +2244,7 @@
product_obj = self.pool.get('product.product')
for new_move in self.browse(cr, uid, res, context=context):
for (id, name) in product_obj.name_get(cr, uid, [new_move.product_id.id]):
- message = _('Product ') + " '" + name + "' "+ _("is consumed with") + " '" + str(new_move.product_qty) + "' "+ _("quantity.")
+ message = (_("Product '%s' is consumed with '%s'") %(name,str(new_move.product_qty)))
self.log(cr, uid, new_move.id, message)
self.action_done(cr, uid, res)
@@ -2274,7 +2274,7 @@
if move.state in ('done', 'cancel'):
continue
partial_data = partial_datas.get('move%s'%(move.id), False)
- assert partial_data, _('Do not Found Partial data of Stock Move Line :%s' %(move.id))
+ assert partial_data, (_('Do not Found Partial data of Stock Move Line :%s') %(move.id))
product_qty = partial_data.get('product_qty',0.0)
move_product_qty[move.id] = product_qty
product_uom = partial_data.get('product_uom',False)
@@ -2442,7 +2442,7 @@
'product_qty': line.product_qty
})
move_ids.append(self._inventory_line_hook(cr, uid, line, value))
- message = _('Inventory') + " '" + inv.name + "' "+ _("is done.")
+ message = _("Inventory '%s' is done") % inv.name
self.log(cr, uid, inv.id, message)
self.write(cr, uid, [inv.id], {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S'), 'move_ids': [(6, 0, move_ids)]})
return True
=== modified file 'stock_planning/stock_planning.py'
--- stock_planning/stock_planning.py 2010-09-30 05:28:13 +0000
+++ stock_planning/stock_planning.py 2010-11-22 13:41:53 +0000
@@ -632,13 +632,13 @@
'location_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or obj.warehouse_id.lot_input_id.id,
'procure_method': 'make_to_order',
'note' : _("Procurement created in MPS by user: ") + str(user.login) + _(" Creation Date: ") + \
- time.strftime('%Y-%m-%d %H:%M:%S') + \
- _("\nFor period: ") + obj.period_id.name + _(" according to state:") + \
- _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) + \
- _("\n Initial Stock: ") + str(obj.stock_start) + \
- _("\n Planned Out: ") + str(obj.planned_outgoing) + _(" Planned In: ") + str(obj.to_procure) + \
- _("\n Already Out: ") + str(obj.already_out) + _(" Already In: ") + str(obj.already_in) + \
- _("\n Confirmed Out: ") + str(obj.outgoing) + _(" Confirmed In: ") + str(obj.incoming) + \
+ time.strftime('%Y-%m-%d %H:%M:%S') + '\n' +\
+ _("For period: ") + obj.period_id.name + _(" according to state:") +'\n' + \
+ _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) +'\n' + \
+ _("\n Initial Stock: ") + str(obj.stock_start) +'\n' +\
+ _("\n Planned Out: ") + str(obj.planned_outgoing) + _(" Planned In: ") + str(obj.to_procure) + '\n' +\
+ _("\n Already Out: ") + str(obj.already_out) + _(" Already In: ") + str(obj.already_in) + '\n' +\
+ _("\n Confirmed Out: ") + str(obj.outgoing) + _(" Confirmed In: ") + str(obj.incoming) + '\n' +\
_("\n Planned Out Before: ") + str(obj.outgoing_before) + _(" Confirmed In Before: ") + \
str(obj.incoming_before) + \
_("\n Expected Out: ") + str(obj.outgoing_left) + _(" Incoming Left: ") + str(obj.incoming_left) + \
=== modified file 'subscription/subscription.py'
--- subscription/subscription.py 2010-11-15 11:12:22 +0000
+++ subscription/subscription.py 2010-11-22 13:41:53 +0000
@@ -41,7 +41,7 @@
def write(self, cr, uid, ids, vals, context=None):
if 'model' in vals:
- raise osv.except_osv(_('Error !'),_('You cannot modify the Object linked to the Document Type!\nCreate another Document instead !'))
+ raise osv.except_osv(_('Error !'),_('You cannot modify the Object linked to the Document Type! Create another Document instead !'))
return super(subscription_document, self).write(cr, uid, ids, vals, context=context)
subscription_document()
@@ -112,7 +112,7 @@
id = int(id)
model = self.pool.get(model_name)
except:
- raise osv.except_osv(_('Wrong Source Document !'), _('Please provide another source document.\nThis one does not exist !'))
+ raise osv.except_osv(_('Wrong Source Document !'), _('Please provide another source document.This one does not exist !'))
default = {'state':'draft'}
doc_obj = self.pool.get('subscription.document')
=== modified file 'survey/i18n/survey.pot'
--- survey/i18n/survey.pot 2010-11-18 16:25:12 +0000
+++ survey/i18n/survey.pot 2010-11-22 13:41:53 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-11-18 16:13:19+0000\n"
-"PO-Revision-Date: 2010-11-18 16:13:19+0000\n"
+"POT-Creation-Date: 2010-10-18 17:47:06+0000\n"
+"PO-Revision-Date: 2010-10-18 17:47:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,15 +16,24 @@
"Plural-Forms: \n"
#. module: survey
-#: view:survey.print:0
-#: view:survey.print.answer:0
-msgid "Print Option"
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
msgstr ""
#. module: survey
#: code:addons/survey/survey.py:0
#, python-format
-msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
+msgid "You must enter one or more menu choices\\n"
+" in column heading"
msgstr ""
#. module: survey
@@ -39,9 +48,8 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
msgstr ""
#. module: survey
@@ -56,15 +64,6 @@
msgstr ""
#. module: survey
-#: model:ir.actions.act_window,name:survey.action_survey_form1
-#: model:ir.ui.menu,name:survey.menu_print_survey_form
-#: model:ir.ui.menu,name:survey.menu_reporting
-#: model:ir.ui.menu,name:survey.menu_survey_form
-#: model:ir.ui.menu,name:survey.menu_surveys
-msgid "Surveys"
-msgstr ""
-
-#. module: survey
#: view:survey:0
msgid "Set to draft"
msgstr ""
@@ -113,12 +112,6 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "You must enter one or more menu choices in column heading (white spaces not allowed)"
-msgstr ""
-
-#. module: survey
#: view:survey:0
#: view:survey.page:0
#: view:survey.question:0
@@ -155,6 +148,12 @@
msgstr ""
#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr ""
+
+#. module: survey
#: view:survey:0
msgid "Completed"
msgstr ""
@@ -165,8 +164,16 @@
msgstr ""
#. module: survey
-#: view:survey:0
-msgid "Open Date"
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Maximum Required Answer you\\n"
+"entered for your maximum is greater than the number of answer.\\n"
+"Please use a number that is smaller than %d."
msgstr ""
#. module: survey
@@ -180,9 +187,8 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
+#: selection:survey.request,state:0
+msgid "Wating Answer"
msgstr ""
#. module: survey
@@ -201,16 +207,16 @@
msgstr ""
#. module: survey
-#: model:ir.actions.act_window,name:survey.action_survey_question_form
-msgid "Survey Questions"
-msgstr ""
-
-#. module: survey
#: view:survey.response.line:0
msgid "Table Answer"
msgstr ""
#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr ""
+
+#. module: survey
#: selection:survey.question,type:0
msgid "Matrix of Choices (Only One Answers Per Row)"
msgstr ""
@@ -292,9 +298,8 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "Error!"
+#: field:survey.answer,type:0
+msgid "Type of Answer"
msgstr ""
#. module: survey
@@ -308,6 +313,11 @@
msgstr ""
#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr ""
+
+#. module: survey
#: model:ir.actions.report.xml,name:survey.survey_analysis
msgid "Survey Statistics"
msgstr ""
@@ -325,6 +335,12 @@
msgstr ""
#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid "You can not give answer because of survey is not open for answer"
+msgstr ""
+
+#. module: survey
#: field:survey.question,comment_field_type:0
msgid "Comment Field Type"
msgstr ""
@@ -360,8 +376,11 @@
msgstr ""
#. module: survey
-#: view:survey.response.line:0
-msgid "Survey Answer Line"
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Maximum Required Answer you \\n"
+"entered for your maximum is greater than the number of answer.\\n"
+"Please use a number that is smaller than %d."
msgstr ""
#. module: survey
@@ -375,8 +394,15 @@
msgstr ""
#. module: survey
-#: field:survey.question,is_validation_require:0
-msgid "Validate Text"
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
msgstr ""
#. module: survey
@@ -385,12 +411,6 @@
msgstr ""
#. module: survey
-#: selection:survey.print,paper_size:0
-#: selection:survey.print.answer,paper_size:0
-msgid "Letter (8.5\" x 11\")"
-msgstr ""
-
-#. module: survey
#: view:survey:0
#: field:survey,responsible_id:0
msgid "Responsible"
@@ -414,8 +434,8 @@
msgstr ""
#. module: survey
-#: selection:survey.request,state:0
-msgid "Wating Answer"
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
msgstr ""
#. module: survey
@@ -460,27 +480,11 @@
msgstr ""
#. module: survey
-#: view:survey.send.invitation:0
-msgid "Send"
-msgstr ""
-
-#. module: survey
#: field:survey.question.wiz,name:0
msgid "Number"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "You must enter one or more menu choices in column heading"
-msgstr ""
-
-#. module: survey
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: survey
#: view:survey:0
#: view:survey.request:0
#: field:survey.request,state:0
@@ -528,11 +532,6 @@
msgstr ""
#. module: survey
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: survey
#: selection:survey.response,state:0
msgid "Not Finished"
msgstr ""
@@ -543,6 +542,12 @@
msgstr ""
#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
#: view:survey.send.invitation:0
msgid "Select Partner"
msgstr ""
@@ -553,23 +558,11 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "You can not answer this survey more than %s times"
-msgstr ""
-
-#. module: survey
#: model:ir.actions.act_window,name:survey.act_survey_answer
msgid "Answers"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "You can not answer because the survey is not open"
-msgstr ""
-
-#. module: survey
#: selection:survey.response,response_type:0
msgid "Link"
msgstr ""
@@ -658,14 +651,8 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "Please enter an integer value"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_browse_answer
-msgid "survey.browse.answer"
+#: view:survey.send.invitation:0
+msgid "Send"
msgstr ""
#. module: survey
@@ -674,12 +661,6 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
-msgstr ""
-
-#. module: survey
#: view:survey.request:0
msgid "Watting Answer"
msgstr ""
@@ -688,13 +669,6 @@
#: view:survey:0
#: view:survey.page:0
#: view:survey.question:0
-msgid "When the question is not answered, display this error message:"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.page:0
-#: view:survey.question:0
msgid "Options"
msgstr ""
@@ -720,8 +694,11 @@
msgstr ""
#. module: survey
-#: selection:survey.answer,type:0
-msgid "Selection"
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "#Required Answer you entered \\n"
+" is greater than the number of answer. \\n"
+" Please use a number that is smaller than %d."
msgstr ""
#. module: survey
@@ -748,6 +725,13 @@
msgstr ""
#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr ""
+
+#. module: survey
#: field:survey.question,comment_column:0
msgid "Add comment column in matrix"
msgstr ""
@@ -771,9 +755,11 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_selection.py:0
-#, python-format
-msgid "You can not give more response. Please contact the author of this survey for further assistance."
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
msgstr ""
#. module: survey
@@ -814,9 +800,9 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "Cannot locate survey for the question wizard!"
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
msgstr ""
#. module: survey
@@ -845,6 +831,12 @@
msgstr ""
#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid "You can not give answer for this survey more than %s times"
+msgstr ""
+
+#. module: survey
#: field:survey,date_close:0
msgid "Survey Close Date"
msgstr ""
@@ -855,8 +847,8 @@
msgstr ""
#. module: survey
-#: field:survey.question.column.heading,in_visible_rating_weight:0
-msgid "Is Rating Scale Invisible ??"
+#: view:survey:0
+msgid "Open Date"
msgstr ""
#. module: survey
@@ -922,18 +914,11 @@
msgstr ""
#. module: survey
-#: field:survey,max_response_limit:0
-msgid "Maximum Answer Limit"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
-msgid "Send Invitations"
-msgstr ""
-
-#. module: survey
-#: field:survey.name.wiz,store_ans:0
-msgid "Store Answer"
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "#Required Answer you entered is \\n"
+" greater than the number of answer.\\n"
+" Please use a number that is smaller than %d."
msgstr ""
#. module: survey
@@ -987,11 +972,6 @@
msgstr ""
#. module: survey
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
-#. module: survey
#: field:survey.question,no_of_rows:0
msgid "No of Rows"
msgstr ""
@@ -1018,10 +998,8 @@
msgstr ""
#. module: survey
-#: view:survey:0
-#: view:survey.page:0
-#: view:survey.question:0
-msgid "Validation"
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
msgstr ""
#. module: survey
@@ -1057,14 +1035,6 @@
msgstr ""
#. module: survey
-#: field:survey.history,user_id:0
-#: view:survey.request:0
-#: field:survey.request,user_id:0
-#: field:survey.response,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: survey
#: field:survey.name.wiz,transfer:0
msgid "Page Transfer"
msgstr ""
@@ -1087,8 +1057,20 @@
msgstr ""
#. module: survey
-#: model:ir.model,name:survey.model_survey_tbl_column_heading
-msgid "survey.tbl.column.heading"
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Maximum Required Answer is greater \\n"
+" than Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
msgstr ""
#. module: survey
@@ -1097,9 +1079,8 @@
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_selection.py:0
-#, python-format
-msgid "You can not give response for this survey more than %s times"
+#: selection:survey.answer,type:0
+msgid "Selection"
msgstr ""
#. module: survey
@@ -1134,16 +1115,19 @@
msgstr ""
#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Minimum Required Answer\\n"
+"you entered is greater than the number of answer.\\n"
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
#: model:ir.model,name:survey.model_survey_question_wiz
msgid "survey.question.wiz"
msgstr ""
#. module: survey
-#: view:survey:0
-msgid "History"
-msgstr ""
-
-#. module: survey
#: help:survey.browse.answer,response_id:0
msgid "If this field is empty, all answers of the selected survey will be print."
msgstr ""
@@ -1201,6 +1185,13 @@
#. module: survey
#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
msgid "Other"
msgstr ""
@@ -1249,11 +1240,6 @@
msgstr ""
#. module: survey
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
-#. module: survey
#: field:survey,tot_start_survey:0
msgid "Total Started Survey"
msgstr ""
@@ -1295,11 +1281,6 @@
msgstr ""
#. module: survey
-#: model:ir.actions.act_window,name:survey.action_view_survey_name
-msgid "Give Survey Answer"
-msgstr ""
-
-#. module: survey
#: model:ir.model,name:survey.model_res_users
msgid "res.users"
msgstr ""
@@ -1326,25 +1307,13 @@
msgstr ""
#. module: survey
-#: field:survey.answer,type:0
-msgid "Type of Answer"
-msgstr ""
-
-#. module: survey
#: field:survey.question,required_type:0
msgid "Respondent must answer"
msgstr ""
#. module: survey
-#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
-#: view:survey.send.invitation:0
-msgid "Send Invitation"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
-#, python-format
-msgid "You cannot select the same answer more than one time"
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
msgstr ""
#. module: survey
@@ -1353,11 +1322,6 @@
msgstr ""
#. module: survey
-#: field:survey,title:0
-msgid "Survey Title"
-msgstr ""
-
-#. module: survey
#: selection:survey.question,type:0
msgid "Single Textbox"
msgstr ""
@@ -1382,6 +1346,19 @@
msgstr ""
#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You must enter one or more menu \\n"
+" choices in column heading (white spaces not allowed)"
+msgstr ""
+
+#. module: survey
#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
#: model:ir.model,name:survey.model_survey_send_invitation_log
msgid "survey.send.invitation.log"
@@ -1426,6 +1403,11 @@
msgstr ""
#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
#: model:ir.actions.report.xml,name:survey.survey_browse_response
#: field:survey.browse.answer,response_id:0
msgid "Survey Answers"
@@ -1447,15 +1429,14 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_selection.py:0
#, python-format
-msgid "You cannot select same answer more than one time'"
+msgid "You can not give more response. Please contact the author of this survey for further assistance."
msgstr ""
#. module: survey
@@ -1505,27 +1486,16 @@
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
-msgstr ""
-
-#. module: survey
#: field:survey.answer,menu_choice:0
msgid "Menu Choices"
msgstr ""
#. module: survey
-#: field:survey,page_ids:0
-#: view:survey.question:0
-#: field:survey.response.line,page_id:0
-msgid "Page"
-msgstr ""
-
-#. module: survey
#: code:addons/survey/survey.py:0
#, python-format
-msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgid "Minimum Required Answer you\\n"
+" entered is greater than the number of answer. \\n"
+" Please use a number that is smaller than %d."
msgstr ""
#. module: survey
@@ -1570,11 +1540,6 @@
msgstr ""
#. module: survey
-#: view:survey.response.line:0
-msgid "Single Textboxes"
-msgstr ""
-
-#. module: survey
#: code:addons/survey/wizard/survey_send_invitation.py:0
#, python-format
msgid "%sSurvey is not in open state"
=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py 2010-11-18 16:21:31 +0000
+++ survey/wizard/survey_answer.py 2010-11-22 13:41:53 +0000
@@ -120,14 +120,14 @@
if ((context.has_key('active') and not context.get('active', False)) \
or not context.has_key('active')) and not sur_name_rec.page_no + 1:
if sur_rec.state != "open" :
- raise osv.except_osv(_('Warning !'),_("You can not answer because the survey is not open"))
+ raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
cr.execute('select count(id) from survey_history where user_id=%s\
and survey_id=%s', (uid,survey_id))
res = cr.fetchone()[0]
user_limit = survey_obj.browse(cr, uid, survey_id)
user_limit = user_limit.response_user
if user_limit and res >= user_limit:
- raise osv.except_osv(_('Warning !'),_("You can not answer this survey more than %s times") % (user_limit))
+ raise osv.except_osv(_('Warning !'),_("You can not give answer for this survey more than %s times") % (user_limit))
if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey and not sur_name_rec.page_no + 1:
survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
@@ -692,7 +692,7 @@
if error:
for res in resp_id_list:
sur_name_read['store_ans'].pop(res)
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['comment_valid_err_msg']))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['comment_valid_err_msg']))
resp_obj.write(cr, uid, resp_id, {'comment':val1})
sur_name_read['store_ans'][resp_id].update({key1:val1})
@@ -731,7 +731,7 @@
if error:
for res in resp_id_list:
sur_name_read['store_ans'].pop(res)
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['validation_valid_err_msg']))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['validation_valid_err_msg']))
if key1.split('_')[1] == "single" :
resp_obj.write(cr, uid, resp_id, {'single_text':val1})
@@ -785,7 +785,7 @@
if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
for res in resp_id_list:
sur_name_read['store_ans'].pop(res)
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "'\n" + _("You cannot select the same answer more than one time"))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + _("You cannot select the same answer more than one time"))
if not select_count:
resp_obj.write(cr, uid, resp_id, {'state':'skip'})
@@ -892,7 +892,7 @@
if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
error = True
if error:
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['comment_valid_err_msg']))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['comment_valid_err_msg']))
resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
sur_name_read['store_ans'][update].update({key:val})
@@ -928,7 +928,7 @@
if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
error = True
if error:
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['validation_valid_err_msg']))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + tools.ustr(que_rec['validation_valid_err_msg']))
if key.split('_')[1] == "single" :
resp_obj.write(cr, uid, update, {'single_text':val,'state': 'done'})
else:
@@ -975,7 +975,6 @@
if comment_field and comment_value:
raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' " + tools.ustr(que_rec['make_comment_field_err_msg']))
-
if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "\n" + _("You cannot select same answer more than one time'"))
Follow ups
