diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-06-25 08:32:07 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-06-25 08:32:07 +0530 |
| commit | f32f30aefb7db4b9f3ebfb23b1c15ee2ca9e99c2 (patch) | |
| tree | 45c13556a17b6ecf4b574af1f37a4262dbf69d1f /addons/base_setup | |
| parent | 1aa2d4c59cd3d59778b4c87c611478537217e998 (diff) | |
| parent | 59f9be67f791f40d698b7183b81f7a7abc34a654 (diff) | |
[MERGE] Merge with trunk addons
bzr revid: mra@mra-laptop-20100625030207-r995xyuf3zjt7eho
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/base_setup_installer.xml | 4 | ||||
| -rw-r--r-- | addons/base_setup/base_setup_todo.xml | 2 | ||||
| -rw-r--r-- | addons/base_setup/gtk_contact_form.xml | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index 46c4dbc6e0b..6608cea061b 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -13,9 +13,7 @@ <xpath expr="//label[@string='description']" position="attributes"> <attribute name="string" - >Now that OpenERP is installed, We have selected applications commonly useful to users which you can install directly, as well as sets of applications for more specific types or groups of businesses (the vertical modules). - -If you don't think you need any of these right now, you can easily install them later on.</attribute> + >The most common applications have been pre selected. You can directly install them. You can either choose generic modules, or select modules for specific business sectors and industries. If you do not think you need any of these right now, you can easily install them later.</attribute> </xpath> <xpath expr='//separator[@string="vsep"]' position='attributes'> <attribute name='string'></attribute> diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index 5ec9be53d76..0bf0fbb09be 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -26,9 +26,9 @@ <field name="company_id" invisible="1"/> <field name="name" required="True"/><field name="account_no"/> <field name="currency" widget="selection"/><field name="street"/> - <field name="zip"/> <field name="street2"/> <field name="country_id"/> + <field name="zip"/> <field name="state_id"/> <field name="city"/> <field name="email"/> diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml index 41711032bf0..fcbaa9867e7 100644 --- a/addons/base_setup/gtk_contact_form.xml +++ b/addons/base_setup/gtk_contact_form.xml @@ -11,7 +11,7 @@ <attribute name="string">Contact Information</attribute> </form> <xpath expr="//label[@string='description']" position="attributes"> - <attribute name="string">Information about you and the company you are related too. The Basic information related to the company has already been collected and some more information required by you to fill.</attribute> + <attribute name="string">To receive more information, please fill in the form about you and your company. Documentation and/or information will be sent to you as soon as possible.</attribute> </xpath> <xpath expr='//separator[@string="title"]' position='attributes'> <attribute name='string'>Would you like more information or documentation ?</attribute> |