diff options
| -rw-r--r-- | addons/account/wizard/account_vat_view.xml | 15 | ||||
| -rw-r--r-- | addons/association/profile_association.xml | 2 | ||||
| -rw-r--r-- | addons/base_setup/__init__.py | 2 | ||||
| -rw-r--r-- | addons/base_setup/base_setup_data.xml | 4 | ||||
| -rw-r--r-- | addons/document_ics/document_ics_config_wizard.py | 27 | ||||
| -rw-r--r-- | addons/event/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/profile_tools/installer.py | 8 | ||||
| -rw-r--r-- | addons/profile_tools/misc_tools_installer.xml | 3 | ||||
| -rw-r--r-- | addons/purchase/wizard/purchase_installer.xml | 2 | ||||
| -rw-r--r-- | addons/sale/sale_installer.xml | 2 | ||||
| -rw-r--r-- | addons/thunderbird/installer.py | 2 |
11 files changed, 30 insertions, 39 deletions
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml index d27a34c0fcb..748e4313803 100644 --- a/addons/account/wizard/account_vat_view.xml +++ b/addons/account/wizard/account_vat_view.xml @@ -8,14 +8,15 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Select Period"> - <field name="company_id" groups="base.group_multi_company" widget='selection'/> - <newline/> - <field name="based_on"/> - <newline/> - <field name="periods"/> + <field name="company_id" groups="base.group_multi_company" widget='selection'/> + <newline/> + <field name="based_on"/> + <newline/> + <separator string="Select Period(s)" colspan="4"/> + <field name="periods" nolabel="1" colspan="2"/> <group col="2" colspan="4"> - <button icon='gtk-cancel' special="cancel" string="Cancel" /> - <button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/> + <button icon='gtk-cancel' special="cancel" string="Cancel" /> + <button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/> </group> </form> </field> diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 88a8c2940d0..6aaea67dd0b 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -9,7 +9,7 @@ <field name="arch" type="xml"> <data> <form position="attributes"> - <attribute name="string">Install Extra Modules</attribute> + <attribute name="string">Association Profile Configuration</attribute> </form> <xpath expr='//separator[@string="vsep"]' position='attributes'> <attribute name='string'></attribute> diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py index efdcfe16135..1fa2e7c6557 100644 --- a/addons/base_setup/__init__.py +++ b/addons/base_setup/__init__.py @@ -47,7 +47,7 @@ class base_setup_config_choice(osv.osv_memory): user_obj = self.pool.get('res.users') user_ids = user_obj.search(cr, uid, []) users = user_obj.browse(cr, uid, user_ids) - user_str = '\n'.join(map(lambda x: ' - %s: %s / %s' % (x.name, x.login, x.password), users)) + 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 _columns = { diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml index f8f38bc644f..eabeef61334 100644 --- a/addons/base_setup/base_setup_data.xml +++ b/addons/base_setup/base_setup_data.xml @@ -6,7 +6,7 @@ <field name="model">base.setup.config</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Setup"> + <form string="Information about your new database"> <group colspan="4" col="8"> <group colspan="3" width="220"> <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/> @@ -15,7 +15,7 @@ </group> <separator string="" orientation="vertical" colspan="1" rowspan="8"/> <group colspan="4" width="400"> - <separator string="Installation Done" colspan="4"/> + <separator string="New Database" colspan="4"/> <label align="0.0" string="Your database is now created." colspan="4"/> <field name="installed_users" nolabel= "1" colspan="4"/> </group> diff --git a/addons/document_ics/document_ics_config_wizard.py b/addons/document_ics/document_ics_config_wizard.py index ca7c9f02eb0..611c804a62c 100644 --- a/addons/document_ics/document_ics_config_wizard.py +++ b/addons/document_ics/document_ics_config_wizard.py @@ -54,25 +54,16 @@ class document_ics_crm_wizard(osv.osv_memory): _columns = { 'name':fields.char('Name', size=64), - 'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar \ - of meetings of the users."), - 'lead': fields.boolean('Leads', help="Allows you to track and manage leads \ - which are pre-sales requests or contacts, the very first contact with a customer request."), - 'opportunity': fields.boolean('Business Opportunities', help="Tracks identified \ - business opportunities for your sales pipeline."), - 'jobs': fields.boolean('Jobs Hiring Process', help="Helps you to organise the jobs\ - hiring process: evaluation, meetings, email integration..."), - 'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise \ - your OpenERP calendars with your phone, outlook, Sunbird, ical, ..."), - 'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and \ - support requests on software"), + 'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."), + 'lead': fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."), + 'opportunity': fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."), + 'jobs': fields.boolean('Jobs Hiring Process', help="Helps you to organise the jobs hiring process: evaluation, meetings, email integration..."), + 'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."), + 'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on software"), 'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), - 'fund': fields.boolean('Fund Raising Operations', help="This may help associations in \ - their fund raising process and tracking."), - 'claims': fields.boolean('Claims', help="Manages the supplier and customers claims,\ - including your corrective or preventive actions."), - 'phonecall': fields.boolean('Phone Calls', help="Helps you to encode the result of \ - a phone call or to plan a list of phone calls to process."), + 'fund': fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."), + 'claims': fields.boolean('Claims', help="Manages the supplier and customers claims,including your corrective or preventive actions."), + 'phonecall': fields.boolean('Phone Calls', help="Helps you to encode the result of a phone call or to plan a list of phone calls to process."), } _defaults = { 'meeting': lambda *args: True, diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 0d8bd245db1..fdf64388a19 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -24,7 +24,7 @@ 'name': 'Event', 'version': '0.1', 'category': 'Generic Modules/Association', - 'description': """Organization and management of events. + 'description': """Oraganization and management of Event. This module allow you * to manage your events and their registrations diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py index 4037b073319..59e0cbab3db 100644 --- a/addons/profile_tools/installer.py +++ b/addons/profile_tools/installer.py @@ -26,10 +26,10 @@ class misc_tools_installer(osv.osv_memory): _columns = { # Tools - 'lunch':fields.boolean('Lunch Orders'), - 'subscription':fields.boolean('Recurring Documents'), - 'survey':fields.boolean('Survey'), - 'audittrail':fields.boolean('Audit Trail'), + 'lunch':fields.boolean('Lunch Orders',help='Installs tools for lunch module'), + 'subscription':fields.boolean('Recurring Documents',help='Installs tools for subscription module'), + 'survey':fields.boolean('Survey',help='Installs tools for survey module'), + 'audittrail':fields.boolean('Audit Trail',help='Installs tools for audittrail module'), } _defaults = { 'lunch': True, diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml index 69250f0dcf1..64bb428e278 100644 --- a/addons/profile_tools/misc_tools_installer.xml +++ b/addons/profile_tools/misc_tools_installer.xml @@ -19,8 +19,7 @@ </separator> <xpath expr="//label[@string='description']" position="attributes"> - <attribute name="string" - >Here are a few useful applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute> + <attribute name="string">Here are a few useful applications which, while they do not directly contribute to your business, can help you to improve your organization.</attribute> </xpath> <xpath expr="//button[@string='Install Modules']" position="attributes"> <attribute name="string">Configure</attribute> diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml index dc10beacd98..369849e1b18 100644 --- a/addons/purchase/wizard/purchase_installer.xml +++ b/addons/purchase/wizard/purchase_installer.xml @@ -9,7 +9,7 @@ <field name="arch" type="xml"> <data> <form position="attributes"> - <attribute name="string">Purchase Modules Installation</attribute> + <attribute name="string"> Purchase Modules Configuration</attribute> </form> <xpath expr='//separator[@string="vsep"]' position='attributes'> <attribute name='string'></attribute> diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml index c77faf905e6..0806ae941ac 100644 --- a/addons/sale/sale_installer.xml +++ b/addons/sale/sale_installer.xml @@ -8,7 +8,7 @@ <field name="arch" type="xml"> <data> <form position="attributes"> - <attribute name="string">Sale Management Modules Installation</attribute> + <attribute name="string">Sale Management Modules Configuration</attribute> </form> <separator string="title" position="attributes"> diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py index 82ea1c3042f..68ffc82fa0f 100644 --- a/addons/thunderbird/installer.py +++ b/addons/thunderbird/installer.py @@ -50,7 +50,7 @@ class thunderbird_installer(osv.osv_memory): 'thunderbird' : True, 'name' : 'OpenERP_plugin-2.0.xpi', 'pdf_name' : 'Installation Guide to OpenERP Thunderbid Plug-in.pdf', - 'description' : """ * Save the Thunderbird plugin. \n * Follows the step to install Thunderbird plugin. \n -> 1.From Menu Bar of Thunderbird, open Tools > Add ons. \n -> 2. Click on install button and a browser window appears. \n -> 3. Select the plug-in(.xpi file) and click Ok. \n -> 4. Software installation window appears and within a short time “Install Now” button will be enabled \n -> 5. Click "Install Now". \n -> 6. Restart Thunderbird. \n Follow the steps to configure OpenERP in Thunderbird. \n -> 1. Go to Tools > OpenERP Synchronization. \n -> 2. Check data (configured by default) \n -> 3. Click Test Connection. \n -> 4. A message appears with state of your connection. \n -> 5. If your connection failed, check if your database is open, and check your data. \n -> 6. If you have a good connection, click Ok and start to archive mail in OpenERP. """ + 'description' : """ * Save the Thunderbird plugin. \n * Follow the steps to install Thunderbird plugin. \n -> 1.From Menu Bar of Thunderbird, open Tools > Addons. \n -> 2. Click on install button and a browser window appears. \n -> 3. Select the plug-in(.xpi file) and click Ok. \n -> 4. Software installation window appears and within a short time “Install Now” button will be enabled \n -> 5. Click "Install Now". \n -> 6. Restart Thunderbird. \n Follow the steps to configure OpenERP in Thunderbird. \n -> 1. Go to Tools > OpenERP Synchronization. \n -> 2. Check data (configured by default) \n -> 3. Click Test Connection. \n -> 4. A message appears with state of your connection. \n -> 5. If your connection failed, check if your database is open, and check your data. \n -> 6. If you have a good connection, click Ok and start to archive mail in OpenERP. """ } thunderbird_installer() |
