odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REN] renamed e-mail, E-mail, E-Mail to email, Email 

bzr revid: jam@tinyerp.com-20120625134253-sebauihl53zctcu0
This commit is contained in:
Jigar Amin - OpenERP 2012-06-25 19:12:53 +05:30
parent 0a22debf5f
commit d9db3c44df
38 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account_followup/i18n/account_followup.pot
View File

@ -286,7 +286,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:296 #: code:addons/account_followup/wizard/account_followup_print.py:296
#, python-format #, python-format
msgid "All E-mails have been successfully sent to Partners:.\n" msgid "All Emails have been successfully sent to Partners:.\n"
"\n" "\n"
"%s" "%s"
msgstr "" msgstr ""
@ -326,7 +326,7 @@ msgstr ""
#, python-format #, python-format
msgid "\n" msgid "\n"
"\n" "\n"
"E-Mail sent to following Partners successfully. !\n" "Email sent to following Partners successfully. !\n"
"\n" "\n"
"%s" "%s"
msgstr "" msgstr ""
@ -522,7 +522,7 @@ msgstr ""
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:298 #: code:addons/account_followup/wizard/account_followup_print.py:298
#, python-format #, python-format
msgid "E-Mail not sent to following Partners, E-mail not available !\n" msgid "Email not sent to following Partners, Email not available !\n"
"\n" "\n"
"%s" "%s"
msgstr "" msgstr ""

8
addons/account_followup/wizard/account_followup_print.py
View File

@ -289,15 +289,15 @@ 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%s") % msg_sent summary = _("All Emails have been successfully sent to Partners:.\n\n%s") % msg_sent
else: else:
msg_unsent = _("E-Mail not sent to following Partners, E-mail not available !\n\n%s") % msg_unsent msg_unsent = _("Email 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%s") % msg_sent msg_sent = msg_sent and _("\n\nEmail 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})
else: else:
context.update({'summary': '\n\n\nE-Mail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'}) context.update({'summary': '\n\n\nEmail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'})
return { return {
'name': _('Followup Summary'), 'name': _('Followup Summary'),

2
addons/base_action_rule/base_action_rule.py
View File

@ -327,7 +327,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
reply_to = emailfrom reply_to = emailfrom
if not emailfrom: if not emailfrom:
raise osv.except_osv(_('Error!'), raise osv.except_osv(_('Error!'),
_("No E-Mail ID Found for your Company address!")) _("No Email ID Found for your Company address!"))
return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id) return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id)

2
addons/base_action_rule/i18n/base_action_rule.pot
View File

@ -286,7 +286,7 @@ msgstr ""
#. module: base_action_rule #. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:329 #: code:addons/base_action_rule/base_action_rule.py:329
#, python-format #, python-format
msgid "No E-Mail ID Found for your Company address!" msgid "No Email ID Found for your Company address!"
msgstr "" msgstr ""
#. module: base_action_rule #. module: base_action_rule

2
addons/crm/crm_action_rule.py
View File

@ -59,7 +59,7 @@ class base_action_rule(osv.osv):
else: else:
reply_to = emailfrom reply_to = emailfrom
if not emailfrom: if not emailfrom:
raise osv.except_osv(_('Error!'), _("No E-Mail Found for your Company address!")) raise osv.except_osv(_('Error!'), _("No Email Found for your Company address!"))
return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id) return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id)
def do_check(self, cr, uid, action, obj, context=None): def do_check(self, cr, uid, action, obj, context=None):

2
addons/crm/crm_data.xml
View File

@ -11,7 +11,7 @@
<field name="name">direct</field> <field name="name">direct</field>
</record> </record>
<record model="crm.case.channel"> <record model="crm.case.channel">
<field name="name">e-mail</field> <field name="name">email</field>
</record> </record>
<record model="crm.case.section" id="section_sales_department"> <record model="crm.case.section" id="section_sales_department">
<field name="name">Sales Department</field> <field name="name">Sales Department</field>

2
addons/crm/crm_lead.py
View File

@ -193,7 +193,7 @@ class crm_lead(base_stage, osv.osv):
'active': fields.boolean('Active', required=False), 'active': fields.boolean('Active', required=False),
'date_action_last': fields.datetime('Last Action', readonly=1), 'date_action_last': fields.datetime('Last Action', readonly=1),
'date_action_next': fields.datetime('Next Action', readonly=1), 'date_action_next': fields.datetime('Next Action', readonly=1),
'email_from': fields.char('Email', size=128, help="E-mail address of the contact", select=1), 'email_from': fields.char('Email', size=128, help="Email address of the contact", select=1),
'section_id': fields.many2one('crm.case.section', 'Sales Team', \ 'section_id': fields.many2one('crm.case.section', 'Sales Team', \
select=True, help='When sending mails, the default email address is taken from the sales team.'), select=True, help='When sending mails, the default email address is taken from the sales team.'),
'create_date': fields.datetime('Creation Date' , readonly=True), 'create_date': fields.datetime('Creation Date' , readonly=True),

2
addons/crm/crm_lead_demo.xml
View File

@ -263,7 +263,7 @@
<field name="categ_id" ref="crm.categ_oppor3"/> <field name="categ_id" ref="crm.categ_oppor3"/>
<field name="stage_id" ref="crm.stage_lead3"/> <field name="stage_id" ref="crm.stage_lead3"/>
<field eval="'Interest in your Kitchen Design Project'" name="name"/> <field eval="'Interest in your Kitchen Design Project'" name="name"/>
<field eval="'Send Catalogue by E-Mail'" name="title_action"/> <field eval="'Send Catalogue by Email'" name="title_action"/>
<field eval="time.strftime('%Y-01-10')" name="date_action"/> <field eval="time.strftime('%Y-01-10')" name="date_action"/>
<field eval="time.strftime('%Y-02-23')" name="date_deadline"/> <field eval="time.strftime('%Y-02-23')" name="date_deadline"/>
<field name="partner_name">Lucie Vonck</field> <field name="partner_name">Lucie Vonck</field>

8
addons/crm/i18n/crm.pot
View File

@ -540,7 +540,7 @@ msgstr ""
#. module: crm #. module: crm
#: field:crm.lead,email:0 #: field:crm.lead,email:0
msgid "E-Mail" msgid "Email"
msgstr "" msgstr ""
#. module: crm #. module: crm
@ -2675,7 +2675,7 @@ msgstr ""
#. module: crm #. module: crm
#: help:crm.lead,email_from:0 #: help:crm.lead,email_from:0
msgid "E-mail address of the contact" msgid "Email address of the contact"
msgstr "" msgstr ""
#. module: crm #. module: crm
@ -3401,7 +3401,7 @@ msgstr ""
#. module: crm #. module: crm
#: code:addons/crm/crm_action_rule.py:61 #: code:addons/crm/crm_action_rule.py:61
#, python-format #, python-format
msgid "No E-Mail Found for your Company address!" msgid "No Email Found for your Company address!"
msgstr "" msgstr ""
#. module: crm #. module: crm
@ -3563,7 +3563,7 @@ msgstr ""
#. module: crm #. module: crm
#: model:ir.model,name:crm.model_mail_compose_message #: model:ir.model,name:crm.model_mail_compose_message
msgid "E-mail composition wizard" msgid "Email composition wizard"
msgstr "" msgstr ""
#. module: crm #. module: crm

2
addons/crm_partner_assign/i18n/crm_partner_assign.pot
View File

@ -832,7 +832,7 @@ msgstr ""
#. module: crm_partner_assign #. module: crm_partner_assign
#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
msgid "E-mail composition wizard" msgid "Email composition wizard"
msgstr "" msgstr ""
#. module: crm_partner_assign #. module: crm_partner_assign

2
addons/email_template/__openerp__.py
View File

@ -21,7 +21,7 @@
############################################################################## ##############################################################################
{ {
"name" : "E-Mail Templates", "name" : "Email Templates",
"version" : "1.1", "version" : "1.1",
"author" : "OpenERP,OpenLabs", "author" : "OpenERP,OpenLabs",
"website" : "http://openerp.com", "website" : "http://openerp.com",

2
addons/email_template/i18n/email_template.pot
View File

@ -173,7 +173,7 @@ msgstr ""
#. module: email_template #. module: email_template
#: model:ir.model,name:email_template.model_mail_compose_message #: model:ir.model,name:email_template.model_mail_compose_message
msgid "E-mail composition wizard" msgid "Email composition wizard"
msgstr "" msgstr ""
#. module: email_template #. module: email_template

2
addons/hr/hr.py
View File

@ -190,7 +190,7 @@ class hr_employee(osv.osv):
'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',address_home_id)]", help="Employee bank salary account"), 'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',address_home_id)]", help="Employee bank salary account"),
'work_phone': fields.char('Work Phone', size=32, readonly=False), 'work_phone': fields.char('Work Phone', size=32, readonly=False),
'mobile_phone': fields.char('Work Mobile', size=32, readonly=False), 'mobile_phone': fields.char('Work Mobile', size=32, readonly=False),
'work_email': fields.char('Work E-mail', size=240), 'work_email': fields.char('Work Email', size=240),
'work_location': fields.char('Office Location', size=32), 'work_location': fields.char('Office Location', size=32),
'notes': fields.text('Notes'), 'notes': fields.text('Notes'),
'parent_id': fields.many2one('hr.employee', 'Manager'), 'parent_id': fields.many2one('hr.employee', 'Manager'),

2
addons/hr/i18n/hr.pot
View File

@ -249,7 +249,7 @@ msgstr ""
#. module: hr #. module: hr
#: field:hr.employee,work_email:0 #: field:hr.employee,work_email:0
msgid "Work E-mail" msgid "Work Email"
msgstr "" msgstr ""
#. module: hr #. module: hr

2
addons/hr_evaluation/i18n/hr_evaluation.pot
View File

@ -307,7 +307,7 @@ msgstr ""
#. module: hr_evaluation #. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_mail_compose_message #: model:ir.model,name:hr_evaluation.model_mail_compose_message
msgid "E-mail composition wizard" msgid "Email composition wizard"
msgstr "" msgstr ""
#. module: hr_evaluation #. module: hr_evaluation

2
addons/l10n_ch/report/bvr.mako
View File

@ -116,7 +116,7 @@
<tr><td>${_("Fax") |entity}: ${inv.partner_id.fax|entity}</td></tr> <tr><td>${_("Fax") |entity}: ${inv.partner_id.fax|entity}</td></tr>
%endif %endif
%if inv.partner_id.email : %if inv.partner_id.email :
<tr><td>${_("E-mail") |entity}: ${inv.partner_id.email|entity}</td></tr> <tr><td>${_("Email") |entity}: ${inv.partner_id.email|entity}</td></tr>
%endif %endif
%if inv.partner_id.vat : %if inv.partner_id.vat :
<tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr> <tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr>

2
addons/l10n_ch/report/report_webkit_html.mako
View File

@ -23,7 +23,7 @@
<tr><td>${_("Fax") |entity}: ${inv.partner_id.fax|entity}</td></tr> <tr><td>${_("Fax") |entity}: ${inv.partner_id.fax|entity}</td></tr>
%endif %endif
%if inv.partner_id.email : %if inv.partner_id.email :
<tr><td>${_("E-mail") |entity}: ${inv.partner_id.email|entity}</td></tr> <tr><td>${_("Email") |entity}: ${inv.partner_id.email|entity}</td></tr>
%endif %endif
%if inv.partner_id.vat : %if inv.partner_id.vat :
<tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr> <tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr>

2
addons/l10n_ch/report/report_webkit_html_view.xml
View File

@ -42,7 +42,7 @@
<td>${company.partner_id and company.partner_id.street2 or ''|entity}</td><td>${_('Fax')}:</td><td>${company.partner_id and company.partner_id.fax or ''|entity} </td><td></td> <td>${company.partner_id and company.partner_id.street2 or ''|entity}</td><td>${_('Fax')}:</td><td>${company.partner_id and company.partner_id.fax or ''|entity} </td><td></td>
</tr> </tr>
<tr> <tr>
<td>${company.partner_id and company.partner_id.zip or ''|entity} ${company.partner_id and company.partner_id.city or ''|entity}</td><td>${_('e-mail')}:</td><td><a href="mailto:${company.partner_id and company.partner_id.email or ''|entity}">${company.partner_id and company.partner_id.email or ''|entity}</a></td><td></td> <td>${company.partner_id and company.partner_id.zip or ''|entity} ${company.partner_id and company.partner_id.city or ''|entity}</td><td>${_('email')}:</td><td><a href="mailto:${company.partner_id and company.partner_id.email or ''|entity}">${company.partner_id and company.partner_id.email or ''|entity}</a></td><td></td>
</tr> </tr>
<tr> <tr>
<td>${company.partner_id and company.partner_id.country_id.name or ''|entity}</td><td></td><td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td> <td>${company.partner_id and company.partner_id.country_id.name or ''|entity}</td><td></td><td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td>

2
addons/mail/i18n/mail.pot
View File

@ -194,7 +194,7 @@ msgstr ""
#. module: mail #. module: mail
#: model:ir.model,name:mail.model_mail_compose_message #: model:ir.model,name:mail.model_mail_compose_message
msgid "E-mail composition wizard" msgid "Email composition wizard"
msgstr "" msgstr ""
#. module: mail #. module: mail

6
addons/mail/mail_message.py
View File

@ -202,10 +202,10 @@ class mail_message(osv.osv):
_columns = { _columns = {
'type': fields.selection([ 'type': fields.selection([
('email', 'e-mail'), ('email', 'email'),
('comment', 'Comment'), ('comment', 'Comment'),
('notification', 'System notification'), ('notification', 'System notification'),
], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"), ], 'Type', help="Message type: email for email message, notification for system message, comment for other messages such as user replies"),
'partner_id': fields.many2one('res.partner', 'Related partner'), 'partner_id': fields.many2one('res.partner', 'Related partner'),
'user_id': fields.many2one('res.users', 'Related User', readonly=1), 'user_id': fields.many2one('res.users', 'Related User', readonly=1),
'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'), 'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
@ -228,7 +228,7 @@ class mail_message(osv.osv):
} }
#------------------------------------------------------ #------------------------------------------------------
# E-Mail api # Email api
#------------------------------------------------------ #------------------------------------------------------
def init(self, cr): def init(self, cr):

2
addons/mail/res_users.py
View File

@ -36,7 +36,7 @@ class res_users(osv.osv):
('comments', 'Only comments'), ('comments', 'Only comments'),
('to_me', 'Only when sent directly to me'), ('to_me', 'Only when sent directly to me'),
('none', 'Never') ('none', 'Never')
], 'Receive Feeds by E-mail', required=True, ], 'Receive Feeds by Email', required=True,
help="Choose in which case you want to receive an email when you receive new feeds."), help="Choose in which case you want to receive an email when you receive new feeds."),
} }

4
addons/mail/wizard/mail_compose_message.py
View File

@ -34,7 +34,7 @@ from ..mail_message import to_email
EXPRESSION_PATTERN = re.compile('(\$\{.+?\})') EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
class mail_compose_message(osv.osv_memory): class mail_compose_message(osv.osv_memory):
"""Generic E-mail composition wizard. This wizard is meant to be inherited """Generic Email composition wizard. This wizard is meant to be inherited
at model and view level to provide specific wizard features. at model and view level to provide specific wizard features.
The behavior of the wizard can be modified through the use of context The behavior of the wizard can be modified through the use of context
@ -58,7 +58,7 @@ class mail_compose_message(osv.osv_memory):
""" """
_name = 'mail.compose.message' _name = 'mail.compose.message'
_inherit = 'mail.message.common' _inherit = 'mail.message.common'
_description = 'E-mail composition wizard' _description = 'Email composition wizard'
def default_get(self, cr, uid, fields, context=None): def default_get(self, cr, uid, fields, context=None):
"""Overridden to provide specific defaults depending on the context """Overridden to provide specific defaults depending on the context

4
addons/marketing_campaign/i18n/marketing_campaign.pot
View File

@ -491,7 +491,7 @@ msgstr ""
#. module: marketing_campaign #. module: marketing_campaign
#: help:marketing.campaign.activity,email_template_id:0 #: help:marketing.campaign.activity,email_template_id:0
msgid "The e-mail to send when this activity is activated" msgid "The email to send when this activity is activated"
msgstr "" msgstr ""
#. module: marketing_campaign #. module: marketing_campaign
@ -837,7 +837,7 @@ msgstr ""
#. module: marketing_campaign #. module: marketing_campaign
#: selection:marketing.campaign.activity,type:0 #: selection:marketing.campaign.activity,type:0
msgid "E-mail" msgid "Email"
msgstr "" msgstr ""
#. module: marketing_campaign #. module: marketing_campaign

4
addons/marketing_campaign/marketing_campaign.py
View File

@ -392,7 +392,7 @@ class marketing_campaign_activity(osv.osv):
_description = "Campaign Activity" _description = "Campaign Activity"
_action_types = [ _action_types = [
('email', 'E-mail'), ('email', 'Email'),
('report', 'Report'), ('report', 'Report'),
('action', 'Custom Action'), ('action', 'Custom Action'),
# TODO implement the subcampaigns. # TODO implement the subcampaigns.
@ -423,7 +423,7 @@ class marketing_campaign_activity(osv.osv):
- Report: print an existing Report defined on the resource item and save it into a specific directory - Report: print an existing Report defined on the resource item and save it into a specific directory
- Custom Action: execute a predefined action, e.g. to modify the fields of the resource record - Custom Action: execute a predefined action, e.g. to modify the fields of the resource record
"""), """),
'email_template_id': fields.many2one('email.template', "Email Template", help='The e-mail to send when this activity is activated'), 'email_template_id': fields.many2one('email.template', "Email Template", help='The email to send when this activity is activated'),
'report_id': fields.many2one('ir.actions.report.xml', "Report", help='The report to generate when this activity is activated', ), 'report_id': fields.many2one('ir.actions.report.xml', "Report", help='The report to generate when this activity is activated', ),
'report_directory_id': fields.many2one('document.directory','Directory', 'report_directory_id': fields.many2one('document.directory','Directory',
help="This folder is used to store the generated reports"), help="This folder is used to store the generated reports"),

2
addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
View File

@ -52,7 +52,7 @@ msgstr ""
#. module: plugin_thunderbird #. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0 #: view:plugin_thunderbird.installer:0
msgid "" msgid ""
"This plug-in allows you to link your e-mail to OpenERP's documents. You can " "This plug-in allows you to link your email to OpenERP's documents. You can "
"attach it to any existing one in OpenERP or create a new one." "attach it to any existing one in OpenERP or create a new one."
msgstr "" msgstr ""

2
addons/plugin_thunderbird/plugin_thunderbird.xml
View File

@ -12,7 +12,7 @@
<attribute name="string">Install Thunderbird Plug-In</attribute> <attribute name="string">Install Thunderbird Plug-In</attribute>
</form> </form>
<separator string="title" position="before"> <separator string="title" position="before">
<label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/> <label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
</separator> </separator>
<xpath expr="//button[@string='Install Modules']" position="replace"> <xpath expr="//button[@string='Install Modules']" position="replace">
<button colspan="1" icon="gtk-close" special="cancel" string="_Close"/> <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>

2
addons/portal/i18n/portal.pot
View File

@ -60,7 +60,7 @@ msgstr ""
#. module: portal #. module: portal
#: field:res.portal.wizard.user,user_email:0 #: field:res.portal.wizard.user,user_email:0
msgid "E-mail" msgid "Email"
msgstr "" msgstr ""
#. module: portal #. module: portal

2
addons/portal/wizard/portal_wizard.py
View File

@ -197,7 +197,7 @@ class wizard_user(osv.osv_memory):
string='User Name', string='User Name',
help="The user's real name"), help="The user's real name"),
'user_email': fields.char(size=64, required=True, 'user_email': fields.char(size=64, required=True,
string='E-mail', string='Email',
help="Will be used as user login. " help="Will be used as user login. "
"Also necessary to send the account information to new users"), "Also necessary to send the account information to new users"),
'lang': fields.selection(_lang_get, required=True, 'lang': fields.selection(_lang_get, required=True,

2
addons/project/i18n/project.pot
View File

@ -663,7 +663,7 @@ msgstr ""
#. module: project #. module: project
#: model:ir.model,name:project.model_mail_compose_message #: model:ir.model,name:project.model_mail_compose_message
msgid "E-mail composition wizard" msgid "Email composition wizard"
msgstr "" msgstr ""
#. module: project #. module: project

2
addons/report_webkit_sample/i18n/report_webkit_sample.pot
View File

@ -72,7 +72,7 @@ msgstr ""
#. module: report_webkit_sample #. module: report_webkit_sample
#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
msgid "E-mail" msgid "Email"
msgstr "" msgstr ""
#. module: report_webkit_sample #. module: report_webkit_sample

2
addons/report_webkit_sample/report/report_webkit_html.mako
View File

@ -22,7 +22,7 @@
<tr><td>${_("Fax")}: ${inv.address_invoice_id.fax|entity}</td></tr> <tr><td>${_("Fax")}: ${inv.address_invoice_id.fax|entity}</td></tr>
%endif %endif
%if inv.address_invoice_id.email : %if inv.address_invoice_id.email :
<tr><td>${_("E-mail")}: ${inv.address_invoice_id.email|entity}</td></tr> <tr><td>${_("Email")}: ${inv.address_invoice_id.email|entity}</td></tr>
%endif %endif
%if inv.partner_id.vat : %if inv.partner_id.vat :
<tr><td>${_("VAT")}: ${inv.partner_id.vat|entity}</td></tr> <tr><td>${_("VAT")}: ${inv.partner_id.vat|entity}</td></tr>

10
addons/share/i18n/share.pot
View File

@ -52,7 +52,7 @@ msgstr ""
#. module: share #. module: share
#: view:share.wizard:0 #: view:share.wizard:0
msgid "Share with these People (one e-mail per line)" msgid "Share with these People (one email per line)"
msgstr "" msgstr ""
#. module: share #. module: share
@ -372,7 +372,7 @@ msgstr ""
#. module: share #. module: share
#: view:share.wizard:0 #: view:share.wizard:0
msgid "" msgid ""
"An e-mail notification with instructions has been sent to the following " "An email notification with instructions has been sent to the following "
"people:" "people:"
msgstr "" msgstr ""
@ -404,7 +404,7 @@ msgstr ""
#. module: share #. module: share
#: help:share.wizard,message:0 #: help:share.wizard,message:0
msgid "" msgid ""
"An optional personal message, to be included in the e-mail notification." "An optional personal message, to be included in the email notification."
msgstr "" msgstr ""
#. module: share #. module: share
@ -472,7 +472,7 @@ msgstr ""
#. module: share #. module: share
#: code:addons/share/wizard/share_wizard.py:197 #: code:addons/share/wizard/share_wizard.py:197
#, python-format #, python-format
msgid "No e-mail address configured" msgid "No email address configured"
msgstr "" msgstr ""
#. module: share #. module: share
@ -512,7 +512,7 @@ msgstr ""
#: code:addons/share/wizard/share_wizard.py:198 #: code:addons/share/wizard/share_wizard.py:198
#, python-format #, python-format
msgid "" msgid ""
"You must configure your e-mail address in the user preferences before using " "You must configure your email address in the user preferences before using "
"the Share button." "the Share button."
msgstr "" msgstr ""

6
addons/share/wizard/share_wizard.py
View File

@ -176,7 +176,7 @@ class share_wizard(osv.osv_memory):
help='Main access page for users that are granted shared access'), help='Main access page for users that are granted shared access'),
'name': fields.char('Share Title', size=64, required=True, help="Title for the share (displayed to users as menu and shortcut name)"), 'name': fields.char('Share Title', size=64, required=True, help="Title for the share (displayed to users as menu and shortcut name)"),
'record_name': fields.char('Record name', size=128, help="Name of the shared record, if sharing a precise record"), 'record_name': fields.char('Record name', size=128, help="Name of the shared record, if sharing a precise record"),
'message': fields.text("Personal Message", help="An optional personal message, to be included in the e-mail notification."), 'message': fields.text("Personal Message", help="An optional personal message, to be included in the email notification."),
'embed_code': fields.function(_embed_code, type='text'), 'embed_code': fields.function(_embed_code, type='text'),
'embed_option_title': fields.boolean("Display title"), 'embed_option_title': fields.boolean("Display title"),
@ -200,8 +200,8 @@ class share_wizard(osv.osv_memory):
def go_step_1(self, cr, uid, ids, context=None): def go_step_1(self, cr, uid, ids, context=None):
wizard_data = self.browse(cr,uid,ids,context)[0] wizard_data = self.browse(cr,uid,ids,context)[0]
if wizard_data.user_type == 'emails' and not self.has_email(cr, uid, context=context): if wizard_data.user_type == 'emails' and not self.has_email(cr, uid, context=context):
raise osv.except_osv(_('No e-mail address configured'), raise osv.except_osv(_('No email address configured'),
_('You must configure your e-mail address in the user preferences before using the Share button.')) _('You must configure your email address in the user preferences before using the Share button.'))
model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'action_share_wizard_step1') model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'action_share_wizard_step1')
action = self.pool.get(model).read(cr, uid, res_id, context=context) action = self.pool.get(model).read(cr, uid, res_id, context=context)
action['res_id'] = ids[0] action['res_id'] = ids[0]

6
addons/share/wizard/share_wizard_view.xml
View File

@ -37,10 +37,10 @@
<field name="user_type" invisible="1"/> <field name="user_type" invisible="1"/>
<field name="invite" invisible="1"/> <field name="invite" invisible="1"/>
<group> <group>
<group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)"> <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one email per line)">
<field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/> <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
</group> </group>
<group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one e-mail per line)"> <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one email per line)">
<field name="email_1"/> <field name="email_1"/>
<field name="email_2"/> <field name="email_2"/>
<field name="email_3"/> <field name="email_3"/>
@ -69,7 +69,7 @@
<field name="access_mode" invisible="1"/> <field name="access_mode" invisible="1"/>
</header> </header>
<group attrs="{'invisible':[('user_type','=','embedded')]}"> <group attrs="{'invisible':[('user_type','=','embedded')]}">
<separator string="An e-mail notification with instructions has been sent to the following people:"/> <separator string="An email notification with instructions has been sent to the following people:"/>
<field name="result_line_ids" nolabel="1" mode="tree"> <field name="result_line_ids" nolabel="1" mode="tree">
<tree string="Summary"> <tree string="Summary">
<field name="login"/> <field name="login"/>

4
addons/survey/i18n/survey.pot
View File

@ -996,7 +996,7 @@ msgstr ""
#. module: survey #. module: survey
#: field:survey,send_response:0 #: field:survey,send_response:0
msgid "E-mail Notification on Answer" msgid "Email Notification on Answer"
msgstr "" msgstr ""
#. module: survey #. module: survey
@ -1211,7 +1211,7 @@ msgstr ""
#. module: survey #. module: survey
#: field:survey.request,email:0 #: field:survey.request,email:0
msgid "E-mail" msgid "Email"
msgstr "" msgstr ""
#. module: survey #. module: survey

4
addons/survey/survey.py
View File

@ -66,7 +66,7 @@ class survey(osv.osv):
'note': fields.text('Description', size=128), 'note': fields.text('Description', size=128),
'history': fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True), 'history': fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True),
'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'), 'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
'send_response': fields.boolean('E-mail Notification on Answer'), 'send_response': fields.boolean('Email Notification on Answer'),
'type': fields.many2one('survey.type', 'Type'), 'type': fields.many2one('survey.type', 'Type'),
'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'), 'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
} }
@ -699,7 +699,7 @@ class survey_request(osv.osv):
_columns = { _columns = {
'date_deadline': fields.date("Deadline date"), 'date_deadline': fields.date("Deadline date"),
'user_id': fields.many2one("res.users", "User"), 'user_id': fields.many2one("res.users", "User"),
'email': fields.char("E-mail", size=64), 'email': fields.char("Email, size=64),
'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'), 'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
'response': fields.many2one('survey.response', 'Answer'), 'response': fields.many2one('survey.response', 'Answer'),
'state': fields.selection([('draft','Draft'),('cancel', 'Cancelled'),('waiting_answer', 'Waiting Answer'),('done', 'Done')], 'Status', readonly=1) 'state': fields.selection([('draft','Draft'),('cancel', 'Cancelled'),('waiting_answer', 'Waiting Answer'),('done', 'Done')], 'Status', readonly=1)

2
addons/survey/wizard/survey_answer.py
View File

@ -435,7 +435,7 @@ class survey_question_wiz(osv.osv_memory):
def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None): def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
""" """
If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Answer' set True in survey then send mail on responsible person of this survey and attach survey answer report in pdf format. If any user give answer of survey then last create report of this answer and if 'Email Notification on Answer' set True in survey then send mail on responsible person of this survey and attach survey answer report in pdf format.
""" """
if not report_name or not res_ids: if not report_name or not res_ids:
return (False, Exception('Report name and Resources ids are required !!!')) return (False, Exception('Report name and Resources ids are required !!!'))

2
addons/survey/wizard/survey_send_invitation.py
View File

@ -191,7 +191,7 @@ class survey_send_invitation(osv.osv_memory):
if skipped: if skipped:
note += "%d contacts where ignored (an email address is missing).\n\n" % (skipped) note += "%d contacts where ignored (an email address is missing).\n\n" % (skipped)
if error: if error:
note += 'E-Mail not send successfully:\n====================\n%s\n' % (error) note += 'Email not send successfully:\n====================\n%s\n' % (error)
context.update({'note' : note}) context.update({'note' : note})
return { return {
'view_type': 'form', 'view_type': 'form',