[MERGE] from trunk

bzr revid: rco@openerp.com-20120427131241-6gf7x3lzhux5qnnh

3 files changed, 348 insertions, 16 deletions

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index c10dee7b14b..a3effd98148 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -201,4 +201,30 @@ class specify_partner_terminology(osv.osv_memory):
                 self.make_translations(cr, uid, ids, act_ref, 'model', act_id.help, _case_insensitive_replace(act_id.help,'Customer',o.partner), res_id=act_id.id, context=context)
         return {}
 
+
+
+# Preferences wizard for Sales & CRM.
+# It is defined here because it is inherited independently in modules sale, crm,
+# plugin_outlook and plugin_thunderbird.
+#
+class sale_config_settings(osv.osv_memory):
+    _name = 'sale.config.settings'
+    _inherit = 'res.config.settings'
+    _columns = {
+        'module_crm': fields.boolean('CRM'),
+        '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',
+            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
+                email into an OpenERP mail message with attachments.
+                This installs the module plugin_outlook."""),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 4155c7e9957..40e88c604ef 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,21 +1,6 @@
 <openerp>
   <data>
 
-     <!-- Import or create customers configartion view  -->
-     <record id="action_import_create_installer" model="ir.actions.act_window">
-         <field name="name">Create or Import Customers</field>
-         <field name="type">ir.actions.act_window</field>
-         <field name="res_model">res.partner</field>
-         <field name="view_type">form</field>
-         <field name="view_mode">tree,form</field>
-         <field name="view_id" ref="base.view_partner_tree"/>
-         <field name="help">Create or Import Customers  and their contacts manually from this form or you can import your existing partners by CSV spreadsheet from "Import Data" wizard</field>
-     </record>
-     <record id="config_wizard_action_import_create_installer" model="ir.actions.todo">
-         <field name="action_id" ref="action_import_create_installer"/>
-         <field name="category_id" ref="base.category_sales_management_config"/>
-    </record>
-
      <!-- Define default users preferences-->
      <record id="view_user_preferences_config_form" model="ir.ui.view">
           <field name="name">Set default users preferences</field>
@@ -117,7 +102,7 @@
           <field name="view_mode">form</field>
           <field name="target">new</field>
       </record>
-   <!-- 
+   <!--
       <record id="config_action_partner_terminology_config_form" model="ir.actions.todo">
           <field name="action_id" ref="action_partner_terminology_config_form"/>
           <field name="category_id" ref="base.category_administration_config"/>
@@ -142,5 +127,44 @@
         <field name="sequence">1</field>
     </record>
 
+    <record id="base.view_sale_config_settings" model="ir.ui.view">
+        <field name="name">sale settings</field>
+        <field name="model">sale.config.settings</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Configure Sales" layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Apply" type="object" name="execute"/>
+                    <button string="Cancel" special="cancel"/>
+                </div>
+                <sheet layout="auto">
+                    <group>
+                        <group name="config_sale" colspan="4"/>
+
+                        <!-- this part is necessary to allow the plugins to extend the view -->
+                        <field name="module_crm" invisible="1"/>
+                        <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
+                            <separator string="Emails"/>
+                        </group>
+                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                        <newline/>
+                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
+
+                        <group name="config_crm" colspan="4"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="base.action_sale_config" model="ir.actions.act_window">
+        <field name="name">Configure Sales</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.config.settings</field>
+        <field name="view_id" ref="base.view_sale_config_settings"/>
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+    </record>
+
   </data>
 </openerp>
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
new file mode 100644
index 00000000000..d1c13691582
--- /dev/null
+++ b/addons/base_setup/i18n/ja.po
@@ -0,0 +1,282 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-26 09:08+0000\n"
+"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-27 04:38+0000\n"
+"X-Generator: Launchpad (build 15149)\n"
+
+#. module: base_setup
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr "ヒントを表示する。"
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "ゲスト"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr "product.installer"
+
+#. module: base_setup
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr "作成"
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "メンバー"
+
+#. module: base_setup
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr "Googleの連絡先を同期する。"
+
+#. module: base_setup
+#: help:user.preferences.config,context_tz:0
+msgid ""
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
+msgstr ""
+
+#. module: base_setup
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr "取り込む"
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr "提供者"
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr "会社のヘッダーとフッターを設定します。"
+
+#. module: base_setup
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
+msgid ""
+"Fill in your company data (address, logo, bank accounts) so that it's "
+"printed on your reports. You can click on the button 'Preview Header' in "
+"order to check the header/footer of PDF documents."
+msgstr ""
+
+#. module: base_setup
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr "顧客"
+
+#. module: base_setup
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr "拡張"
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr "お待ちください。"
+
+#. module: base_setup
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+msgid ""
+"Create or Import Customers  and their contacts manually from this form or "
+"you can import your existing partners by CSV spreadsheet from \"Import "
+"Data\" wizard"
+msgstr ""
+
+#. module: base_setup
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
+
+#. module: base_setup
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
+
+#. module: base_setup
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
+msgstr ""
+
+#. module: base_setup
+#: help:user.preferences.config,view:0
+msgid ""
+"If you use OpenERP for the first time we strongly advise you to select the "
+"simplified interface, which has less features but is easier. You can always "
+"switch later from the user preferences."
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: base_setup
+#: field:user.preferences.config,view:0
+msgid "Interface"
+msgstr "インターフェース"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
+msgstr "migrade.application.installer.modules"
+
+#. module: base_setup
+#: view:base.setup.terminology:0
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr "占有者"
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr "顧客"
+
+#. module: base_setup
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
+msgstr "言語"
+
+#. module: base_setup
+#: help:user.preferences.config,context_lang:0
+msgid ""
+"Sets default language for the all user interface, when UI translations are "
+"available. If you want to Add new Language, you can add it from 'Load an "
+"Official Translation' wizard  from 'Administration' menu."
+msgstr ""
+
+#. module: base_setup
+#: view:user.preferences.config:0
+msgid ""
+"This will set the default preferences for new users and update all existing "
+"ones. Afterwards, users are free to change those values on their own user "
+"preference form."
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
+
+#. module: base_setup
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr "取引先"
+
+#. module: base_setup
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr "Saleforceを取り込む"
+
+#. module: base_setup
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr "タイムゾーン"
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr "base.setup.terminology"
+
+#. module: base_setup
+#: help:user.preferences.config,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "画像"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
+msgstr "user.preferences.config"
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr "追加ユーザを作成します。"
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr "顧客を作成または取り込みます。"
+
+#. module: base_setup
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr "SugarCRMを取り込みます。"
+
+#. module: base_setup
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr "顧客を取り込みまたは作成します。"
+
+#. module: base_setup
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr "簡易化"
+
+#. module: base_setup
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
+msgstr "SugarCRMを取り込むために"
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "パートナー"
+
+#. module: base_setup
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
+
+#. module: base_setup
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr "Googleの連絡先を同期するために"