[IMP] : account,account_followup,project,project_scrum: string formatting
bzr revid: rha@tinyerp.com-20110309045822-pcvetf2a2nd0o8kv
This commit is contained in:
parent
64f9d7e94f
commit
5cd5e83cbf
|
@ -2947,7 +2947,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
||||||
analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
|
analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False
|
||||||
|
|
||||||
vals_journal['name']= vals['name']
|
vals_journal['name']= vals['name']
|
||||||
vals_journal['code']= _('BNK') + str(current_num)
|
vals_journal['code']= _('BNK%s') % str(current_num)
|
||||||
vals_journal['sequence_id'] = seq_id
|
vals_journal['sequence_id'] = seq_id
|
||||||
vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
|
vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
|
||||||
vals_journal['company_id'] = company_id
|
vals_journal['company_id'] = company_id
|
||||||
|
|
|
@ -303,8 +303,7 @@ class account_bank_statement(osv.osv):
|
||||||
st = self.browse(cr, uid, st_id, context=context)
|
st = self.browse(cr, uid, st_id, context=context)
|
||||||
if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
|
if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
|
||||||
raise osv.except_osv(_('Error !'),
|
raise osv.except_osv(_('Error !'),
|
||||||
_('The statement balance is incorrect !\n') +
|
_('The statement balance is incorrect !\nThe expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
|
||||||
_('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
|
def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
|
||||||
|
|
|
@ -674,13 +674,6 @@ msgstr ""
|
||||||
msgid "Partners Reconciled Today"
|
msgid "Partners Reconciled Today"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
|
||||||
#: code:addons/account/account_bank_statement.py:306
|
|
||||||
#, python-format
|
|
||||||
msgid "The statement balance is incorrect !\n"
|
|
||||||
""
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: selection:account.payment.term.line,value:0
|
#: selection:account.payment.term.line,value:0
|
||||||
#: selection:account.tax.template,type:0
|
#: selection:account.tax.template,type:0
|
||||||
|
@ -2459,9 +2452,10 @@ msgid "August"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account_bank_statement.py:307
|
#: code:addons/account/account_bank_statement.py:306
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
|
msgid "The statement balance is incorrect !\n"
|
||||||
|
"The expected balance (%.2f) is different than the computed one. (%.2f)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
|
@ -2681,6 +2675,12 @@ msgstr ""
|
||||||
msgid "View"
|
msgid "View"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#. module: account
|
||||||
|
#: code:addons/account/account.py:2951
|
||||||
|
#, python-format
|
||||||
|
msgid "BNK%s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/account.py:2906
|
#: code:addons/account/account.py:2906
|
||||||
#: code:addons/account/installer.py:296
|
#: code:addons/account/installer.py:296
|
||||||
|
@ -3997,12 +3997,6 @@ msgstr ""
|
||||||
msgid "Account Balance -"
|
msgid "Account Balance -"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
|
||||||
#: code:addons/account/invoice.py:989
|
|
||||||
#, python-format
|
|
||||||
msgid "Invoice "
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: field:account.automatic.reconcile,date1:0
|
#: field:account.automatic.reconcile,date1:0
|
||||||
msgid "Starting Date"
|
msgid "Starting Date"
|
||||||
|
@ -5238,9 +5232,9 @@ msgid "As soon as the reconciliation is done, the invoice's state turns to “do
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
#: code:addons/account/invoice.py:989
|
#: code:addons/account/invoice.py:997
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "is validated."
|
msgid "Invoice '%s' is validated."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account
|
#. module: account
|
||||||
|
|
|
@ -994,7 +994,7 @@ class account_invoice(osv.osv):
|
||||||
ctx = context.copy()
|
ctx = context.copy()
|
||||||
if obj_inv.type in ('out_invoice', 'out_refund'):
|
if obj_inv.type in ('out_invoice', 'out_refund'):
|
||||||
ctx = self.get_log_context(cr, uid, context=ctx)
|
ctx = self.get_log_context(cr, uid, context=ctx)
|
||||||
message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
|
message = _("Invoice '%s' is validated.") % name
|
||||||
self.log(cr, uid, inv_id, message, context=ctx)
|
self.log(cr, uid, inv_id, message, context=ctx)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
|
@ -54,13 +54,13 @@ msgid "Group By..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account_followup
|
#. module: account_followup
|
||||||
#: code:addons/account_followup/wizard/account_followup_print.py:287
|
#: code:addons/account_followup/wizard/account_followup_print.py:290
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "\n"
|
msgid "\n"
|
||||||
"\n"
|
"\n"
|
||||||
"E-Mail sent to following Partners successfully. !\n"
|
"E-Mail sent to following Partners successfully. !\n"
|
||||||
"\n"
|
"\n"
|
||||||
""
|
"%s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account_followup
|
#. module: account_followup
|
||||||
|
@ -430,11 +430,11 @@ msgid "Send email confirmation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account_followup
|
#. module: account_followup
|
||||||
#: code:addons/account_followup/wizard/account_followup_print.py:284
|
#: code:addons/account_followup/wizard/account_followup_print.py:287
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "All E-mails have been successfully sent to Partners:.\n"
|
msgid "All E-mails have been successfully sent to Partners:.\n"
|
||||||
"\n"
|
"\n"
|
||||||
""
|
"%s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account_followup
|
#. module: account_followup
|
||||||
|
@ -615,11 +615,11 @@ msgid "Maturity"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account_followup
|
#. module: account_followup
|
||||||
#: code:addons/account_followup/wizard/account_followup_print.py:286
|
#: code:addons/account_followup/wizard/account_followup_print.py:289
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "E-Mail not sent to following Partners, Email not available !\n"
|
msgid "E-Mail not sent to following Partners, Email not available !\n"
|
||||||
"\n"
|
"\n"
|
||||||
""
|
"%s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account_followup
|
#. module: account_followup
|
||||||
|
|
|
@ -284,10 +284,10 @@ class account_followup_print_all(osv.osv_memory):
|
||||||
msg += partner.name + '\n'
|
msg += partner.name + '\n'
|
||||||
msg_unsent += msg
|
msg_unsent += msg
|
||||||
if not msg_unsent:
|
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%s") % msg_sent
|
||||||
else:
|
else:
|
||||||
msg_unsent = _("E-Mail not sent to following Partners, Email not available !\n\n") + msg_unsent
|
msg_unsent = _("E-Mail not sent to following Partners, Email not available !\n\n%s") % msg_unsent
|
||||||
msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n") + msg_sent
|
msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n%s") % msg_sent
|
||||||
line = '=========================================================================='
|
line = '=========================================================================='
|
||||||
summary = msg_unsent + line + msg_sent
|
summary = msg_unsent + line + msg_sent
|
||||||
context.update({'summary': summary})
|
context.update({'summary': summary})
|
||||||
|
|
|
@ -58,6 +58,12 @@ msgstr ""
|
||||||
msgid "Operation Not Permitted !"
|
msgid "Operation Not Permitted !"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#. module: project
|
||||||
|
#: code:addons/project/wizard/project_task_delegate.py:67
|
||||||
|
#, python-format
|
||||||
|
msgid "CHECK: %s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#. module: project
|
#. module: project
|
||||||
#: code:addons/project/wizard/project_task_delegate.py:55
|
#: code:addons/project/wizard/project_task_delegate.py:55
|
||||||
#: code:addons/project/wizard/project_task_delegate.py:56
|
#: code:addons/project/wizard/project_task_delegate.py:56
|
||||||
|
|
|
@ -64,7 +64,7 @@ class project_task_delegate(osv.osv_memory):
|
||||||
newname = tools.ustr(task_name).replace(_('CHECK: '), '')
|
newname = tools.ustr(task_name).replace(_('CHECK: '), '')
|
||||||
else:
|
else:
|
||||||
newname = tools.ustr(task_name or '')
|
newname = tools.ustr(task_name or '')
|
||||||
prefix = _('CHECK: ') + newname
|
prefix = _('CHECK: %s') % newname
|
||||||
res.update({'prefix': prefix})
|
res.update({'prefix': prefix})
|
||||||
if 'new_task_description' in fields:
|
if 'new_task_description' in fields:
|
||||||
res.update({'new_task_description': task.description})
|
res.update({'new_task_description': task.description})
|
||||||
|
|
|
@ -219,6 +219,18 @@ msgstr ""
|
||||||
msgid "Scrum Meeting of %s"
|
msgid "Scrum Meeting of %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#. module: project_scrum
|
||||||
|
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
|
||||||
|
#, python-format
|
||||||
|
msgid "Product Backlog '%s' is converted into Task %d."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#. module: project_scrum
|
||||||
|
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
|
||||||
|
#, python-format
|
||||||
|
msgid "Product Backlog '%s' is assigned sprint:%s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#. module: project_scrum
|
#. module: project_scrum
|
||||||
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
|
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
|
||||||
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
|
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
|
||||||
|
@ -253,12 +265,6 @@ msgstr ""
|
||||||
msgid "None"
|
msgid "None"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: project_scrum
|
|
||||||
#: code:addons/project_scrum/project_scrum.py:325
|
|
||||||
#, python-format
|
|
||||||
msgid "*Blocks encountered:"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_scrum
|
#. module: project_scrum
|
||||||
#: view:project.scrum.product.backlog:0
|
#: view:project.scrum.product.backlog:0
|
||||||
msgid "Change Stage"
|
msgid "Change Stage"
|
||||||
|
@ -390,12 +396,6 @@ msgstr ""
|
||||||
msgid "Daily Scrum"
|
msgid "Daily Scrum"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: project_scrum
|
|
||||||
#: code:addons/project_scrum/project_scrum.py:324
|
|
||||||
#, python-format
|
|
||||||
msgid "for the Sprint"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_scrum
|
#. module: project_scrum
|
||||||
#: view:project.scrum.backlog.create.task:0
|
#: view:project.scrum.backlog.create.task:0
|
||||||
msgid "C_onvert"
|
msgid "C_onvert"
|
||||||
|
@ -433,12 +433,6 @@ msgstr ""
|
||||||
msgid "Scrum"
|
msgid "Scrum"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: project_scrum
|
|
||||||
#: code:addons/project_scrum/project_scrum.py:324
|
|
||||||
#, python-format
|
|
||||||
msgid "Hello "
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_scrum
|
#. module: project_scrum
|
||||||
#: field:project.scrum.meeting,question_today:0
|
#: field:project.scrum.meeting,question_today:0
|
||||||
msgid "Tasks for today"
|
msgid "Tasks for today"
|
||||||
|
@ -601,12 +595,6 @@ msgstr ""
|
||||||
msgid "The person who is responsible for the product"
|
msgid "The person who is responsible for the product"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: project_scrum
|
|
||||||
#: code:addons/project_scrum/project_scrum.py:325
|
|
||||||
#, python-format
|
|
||||||
msgid "*Tasks since yesterday:"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_scrum
|
#. module: project_scrum
|
||||||
#: view:project.scrum.meeting:0
|
#: view:project.scrum.meeting:0
|
||||||
#: view:project.scrum.sprint:0
|
#: view:project.scrum.sprint:0
|
||||||
|
@ -745,12 +733,6 @@ msgstr ""
|
||||||
msgid "View sprint backlog"
|
msgid "View sprint backlog"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: project_scrum
|
|
||||||
#: code:addons/project_scrum/project_scrum.py:325
|
|
||||||
#, python-format
|
|
||||||
msgid "No Blocks"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_scrum
|
#. module: project_scrum
|
||||||
#: field:project.scrum.meeting,question_backlog:0
|
#: field:project.scrum.meeting,question_backlog:0
|
||||||
msgid "Backlog Accurate"
|
msgid "Backlog Accurate"
|
||||||
|
@ -922,7 +904,23 @@ msgstr ""
|
||||||
#. module: project_scrum
|
#. module: project_scrum
|
||||||
#: code:addons/project_scrum/project_scrum.py:324
|
#: code:addons/project_scrum/project_scrum.py:324
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "I am sending you Daily Meeting Details of date"
|
msgid "Hello %s,\n"
|
||||||
|
" \n"
|
||||||
|
"I am sending you Daily Meeting Details of date %s for the Sprint %s\n"
|
||||||
|
""
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#. module: project_scrum
|
||||||
|
#: code:addons/project_scrum/project_scrum.py:325
|
||||||
|
#, python-format
|
||||||
|
msgid "\n"
|
||||||
|
"*Tasks since yesterday:\n"
|
||||||
|
"_______________________%s\n"
|
||||||
|
"*Task for Today:\n"
|
||||||
|
"_______________________ %s\n"
|
||||||
|
"\n"
|
||||||
|
"*Blocks encountered:\n"
|
||||||
|
"_______________________ %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: project_scrum
|
#. module: project_scrum
|
||||||
|
@ -970,12 +968,6 @@ msgstr ""
|
||||||
msgid "This wizard merge backlogs and create one new backlog with draft state (Old backlogs Will be deleted). And it also merge old tasks from backlogs"
|
msgid "This wizard merge backlogs and create one new backlog with draft state (Old backlogs Will be deleted). And it also merge old tasks from backlogs"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: project_scrum
|
|
||||||
#: code:addons/project_scrum/project_scrum.py:325
|
|
||||||
#, python-format
|
|
||||||
msgid "*Task for Today:"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_scrum
|
#. module: project_scrum
|
||||||
#: code:addons/project_scrum/project_scrum.py:303
|
#: code:addons/project_scrum/project_scrum.py:303
|
||||||
#, python-format
|
#, python-format
|
||||||
|
|
|
@ -321,9 +321,9 @@ class project_scrum_meeting(osv.osv):
|
||||||
meeting_id = self.browse(cr, uid, ids, context=context)[0]
|
meeting_id = self.browse(cr, uid, ids, context=context)[0]
|
||||||
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
|
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
|
||||||
user_email = email_from or user.address_id.email or email_from
|
user_email = email_from or user.address_id.email or email_from
|
||||||
body = _('Hello ') + meeting_id.sprint_id.scrum_master_id.name + ",\n" + " \n" +_('I am sending you Daily Meeting Details of date')+ ' %s ' % (meeting_id.date)+ _('for the Sprint')+ ' %s\n' % (meeting_id.sprint_id.name)
|
body = _("Hello %s,\n \nI am sending you Daily Meeting Details of date %s for the Sprint %s\n") %(meeting_id.sprint_id.scrum_master_id.name, meeting_id.date, meeting_id.sprint_id.name)
|
||||||
body += "\n"+ _('*Tasks since yesterday:')+ '\n_______________________%s' % (meeting_id.question_yesterday) + '\n' +_("*Task for Today:")+ '\n_______________________ %s\n' % (meeting_id.question_today )+ '\n' +_('*Blocks encountered:') +'\n_______________________ %s' % (meeting_id.question_blocks or _('No Blocks'))
|
body += _('\n*Tasks since yesterday:\n_______________________%s\n*Task for Today:\n_______________________ %s\n\n*Blocks encountered:\n_______________________ %s') %(meeting_id.question_yesterday,meeting_id.question_today, meeting_id.question_blocks or _('No Blocks'))
|
||||||
body += "\n\n"+_('Thank you')+",\n"+ user.name
|
body += _("\n\nThank you,\n%s") % user.name
|
||||||
sub_name = meeting_id.name or _('Scrum Meeting of %s') % meeting_id.date
|
sub_name = meeting_id.name or _('Scrum Meeting of %s') % meeting_id.date
|
||||||
flag = tools.email_send(user_email , [email], sub_name, body, reply_to=None, openobject_id=str(meeting_id.id))
|
flag = tools.email_send(user_email , [email], sub_name, body, reply_to=None, openobject_id=str(meeting_id.id))
|
||||||
if not flag:
|
if not flag:
|
||||||
|
|
|
@ -54,12 +54,12 @@ class backlog_sprint_assign(osv.osv_memory):
|
||||||
'planned_hours':backlog.expected_hours,
|
'planned_hours':backlog.expected_hours,
|
||||||
'remaining_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)
|
self.log(cr, uid, backlog.id, message)
|
||||||
if data['state_open'] and backlog.state == "draft":
|
if data['state_open'] and backlog.state == "draft":
|
||||||
backlog_obj.write(cr, uid, backlog.id, {'state':'open'})
|
backlog_obj.write(cr, uid, backlog.id, {'state':'open'})
|
||||||
sprint = sprint_obj.browse(cr, uid, data['sprint_id'], context=context)
|
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)
|
self.log(cr, uid, backlog.id, message)
|
||||||
backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context)
|
backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context)
|
||||||
return {'type': 'ir.actions.act_window_close'}
|
return {'type': 'ir.actions.act_window_close'}
|
||||||
|
|
Loading…
Reference in New Issue