diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index e786eff6048..9ca3f0733be 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -11,7 +11,7 @@
- + @@ -248,7 +248,7 @@ - + diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py index a3effd98148..f4c04ada58a 100644 --- a/addons/base_setup/base_setup.py +++ b/addons/base_setup/base_setup.py @@ -212,14 +212,14 @@ class sale_config_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { 'module_crm': fields.boolean('CRM'), - 'module_plugin_thunderbird': fields.boolean('Thunderbird plugin', + 'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin', help="""The plugin allows you archive email and its attachments to the selected OpenERP objects. You can select a partner, a task, a project, an analytical account, or any other object and attach the selected mail as a .eml file in the attachment of a selected record. You can create documents for CRM Lead, HR Applicant and Project Issue from the selected emails. This installs the module plugin_thunderbird."""), - 'module_plugin_outlook': fields.boolean('Outlook plugin', + 'module_plugin_outlook': fields.boolean('Outlook Plugin', help="""The Outlook plugin allows you to select an object that you would like to add to your email and its attachments from MS Outlook. You can select a partner, a task, a project, an analytical account, or any other object and archive a selected diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 00f477a75d7..bac8ffd4f1f 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -169,7 +169,7 @@ class crm_lead(crm_case, osv.osv): 'date_closed': fields.datetime('Closed', readonly=True), 'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"), 'user_id': fields.many2one('res.users', 'Salesman'), - 'referred': fields.char('Referred By', size=64), + 'referred': fields.char('Referred by', size=64), 'date_open': fields.datetime('Opened', readonly=True), 'day_open': fields.function(_compute_day, string='Days to Open', \ multi='day_open', type="float", store=True), diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index d740a00cf02..802e39fed39 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -64,7 +64,7 @@ - + diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py index 41ec59bff2f..e4c27153c3d 100644 --- a/addons/crm/crm_segmentation.py +++ b/addons/crm/crm_segmentation.py @@ -45,7 +45,7 @@ added to partners that match the segmentation criterions after computation.'), 'partner_id': fields.integer('Max Partner ID processed'), 'segmentation_line': fields.one2many('crm.segmentation.line', \ 'segmentation_id', 'Criteria', required=True), - 'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation.\ + 'som_interval': fields.integer('Days per Period', help="A period is the average number of days between two cycle of sale or purchase for this segmentation.\ \nIt's mainly used to detect if a partner has not purchased or buy for a too long time, \ \nso we suppose that his state of mind has decreased because he probably bought goods to another supplier. \ \nUse this functionality for recurring businesses."), diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py index b4a9e368d4c..27acc487780 100644 --- a/addons/crm/res_config.py +++ b/addons/crm/res_config.py @@ -29,7 +29,7 @@ class crm_configuration(osv.osv_memory): 'module_crm_caldav': fields.boolean("Caldav Synchronization", help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird). This installs the module crm_caldav."""), - 'fetchmail_lead': fields.boolean("Create leads from an email account", + 'fetchmail_lead': fields.boolean("Create Leads from an E-mail Account", fetchmail_model='crm.lead', fetchmail_name='Incoming leads', help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""), 'lead_server': fields.char('Server', size=256), @@ -49,10 +49,10 @@ class crm_configuration(osv.osv_memory): 'module_import_google': fields.boolean("Google Import", help="""Import google contact in partner address and add google calendar events details in Meeting. This installs the module import_google."""), - 'module_wiki_sale_faq': fields.boolean("Install a sales FAQ", + 'module_wiki_sale_faq': fields.boolean("Install a Sales FAQ", help="""This provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki Sale FAQ. This installs the module wiki_sale_faq."""), - 'module_google_map': fields.boolean("Google maps on customer", + 'module_google_map': fields.boolean("Google Maps on Customer", help="""Locate customers on Google Map. This installs the module google_map."""), } diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml index c908125a2bf..ec388c1bb98 100644 --- a/addons/crm/res_config_view.xml +++ b/addons/crm/res_config_view.xml @@ -22,7 +22,7 @@ - + diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py index 1d5582f7929..2a7bdfe6f2d 100644 --- a/addons/event/res_partner.py +++ b/addons/event/res_partner.py @@ -29,7 +29,10 @@ class res_partner(osv.osv): 'event_ids': fields.one2many('event.event','main_speaker_id', readonly=True), 'event_registration_ids': fields.one2many('event.registration','partner_id', readonly=True), } + _defaults = { + 'speaker' : True, + } res_partner() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/event_moodle/event_moodle.py b/addons/event_moodle/event_moodle.py index 59d3e530b44..7414abe4613 100644 --- a/addons/event_moodle/event_moodle.py +++ b/addons/event_moodle/event_moodle.py @@ -177,7 +177,7 @@ class event_event(osv.osv): 'shortname': '', 'startdate': date, 'summary': event.note, - 'categoryid':1, #the category hardcoded is 'Miscelleanous' + 'categoryid':1, #the category hardcoded is 'Miscellaneous' }] #create a course in moodle and keep the id response_courses = moodle_pool.create_moodle_courses(cr, uid, moodle_config_wiz_id, dic_courses, context=context) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index a954d916385..e1bb0d6a795 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -242,7 +242,7 @@ - Subordonate Hierarchy + Subordinate Hierarchy ir.actions.act_window hr.employee [('id','in',active_ids)] @@ -254,7 +254,7 @@ - Subordonate Hierarchy + Subordinate Hierarchy @@ -315,7 +315,7 @@ parent="hr.menu_hr_configuration" sequence="1"/> - Categories structure + Categories Structure hr.employee.category tree diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 5d5d599be0e..6c9c1f82456 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -101,9 +101,9 @@ class mail_message_common(osv.osv_memory): _rec_name = 'subject' _columns = { 'subject': fields.char('Subject', size=512, required=True), - 'model': fields.char('Related Document model', size=128, select=1), + 'model': fields.char('Related Document Model', size=128, select=1), 'res_id': fields.integer('Related Document ID', select=1), - 'record_name': fields.function(get_record_name, type='string', string='Message record name', + 'record_name': fields.function(get_record_name, type='string', string='Message Record Name', help="Name of the record, matching the result of the name_get."), 'date': fields.datetime('Date'), 'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'), @@ -111,19 +111,19 @@ class mail_message_common(osv.osv_memory): 'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'), 'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'), 'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'), - 'headers': fields.text('Message headers', readonly=1, + 'headers': fields.text('Message Headers', readonly=1, help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"), 'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1), 'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1), - 'subtype': fields.char('Message type', size=32, help="Type of message, usually 'html' or 'plain', used to " + 'subtype': fields.char('Message Type', size=32, help="Type of message, usually 'html' or 'plain', used to " "select plaintext or rich text contents accordingly", readonly=1), - 'body_text': fields.text('Text contents', help="Plain-text version of the message"), - 'body_html': fields.text('Rich-text contents', help="Rich-text/HTML version of the message"), - 'body': fields.function(get_body, fnct_search = search_body, string='Message content', type='text', + 'body_text': fields.text('Text Contents', help="Plain-text version of the message"), + 'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"), + 'body': fields.function(get_body, fnct_search = search_body, string='Message Content', type='text', help="Content of the message. This content equals the body_text field for plain-test messages, and body_html for rich-text/HTML messages. This allows having one field if we want to access the content matching the message subtype."), - 'parent_id': fields.many2one('mail.message', 'Parent message', help="Parent message, used for displaying as threads with hierarchy", + 'parent_id': fields.many2one('mail.message', 'Parent Message', help="Parent message, used for displaying as threads with hierarchy", select=True, ondelete='set null',), - 'child_ids': fields.one2many('mail.message', 'parent_id', 'Child messages'), + 'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'), } _defaults = { diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index 05bc4213e85..2223d9e162a 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -36,7 +36,7 @@ class res_users(osv.osv): ('comments', 'Only comments'), ('to_me', 'Only when sent directly to me'), ('none', 'Never') - ], 'Receive feeds by email', required=True, + ], 'Receive Feeds by E-mail', required=True, help="Choose in which case you want to receive an email when you receive new feeds."), } diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml index 2d65a09a0f9..4b849f0824b 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -58,7 +58,7 @@