From e61bacbc43e84a0e5c3e751d0763cb9075daee7c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 7 Mar 2012 08:53:56 +0100
Subject: [ADD] base_setup: base config wizard for sale and crm

bzr revid: rco@openerp.com-20120307075356-fzv5643lnhx40syb
---
 addons/base_setup/base_setup_views.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 4155c7e9957..63bf79b37d7 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -142,5 +142,30 @@
         <field name="sequence">1</field>
     </record>
 
+    <record id="base.sale_settings_form_view" model="ir.ui.view">
+        <field name="name">sale.config.settings</field>
+        <field name="model">sale.config.settings</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Configure Sales &amp; CRM">
+                <group name="sales" colspan="4">
+                </group>
+                <group name="crm" colspan="4">
+                </group>
+                <group name="plugins" colspan="4">
+                </group>
+            </form>
+        </field>
+    </record>
+    
+    <record id="base.action_sale_config" model="ir.actions.act_window">
+        <field name="name">Configure Sales &amp; CRM</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.config.settings</field>
+        <field name="view_id" ref="base.sale_settings_form_view"/>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+    </record>
+
   </data>
 </openerp>
-- 
cgit v1.2.3


From aca13da679879bbe88e12fff23d82393dab37c20 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 14 Mar 2012 18:02:06 +0530
Subject: [IMP] improved code for incoming server configuration

bzr revid: tpa@tinyerp.com-20120314123206-zg8u3sc4oy3dc0u8
---
 addons/base_setup/base_setup_views.xml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 4155c7e9957..9986201f5bd 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -117,7 +117,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 +142,30 @@
         <field name="sequence">1</field>
     </record>
 
+
+   <record id="base.project_settings_form_view" model="ir.ui.view">
+        <field name="name">project.config.settings</field>
+        <field name="model">project.config.settings</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Configure Project">
+                <group name="Project" colspan="4">
+                </group>
+                <group name="Helpdesk and support" colspan="4">
+                <separator string="Helpdesk and support" colspan="4"/>
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <record id="base.action_project_config" model="ir.actions.act_window">
+        <field name="name">Configure Project</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.config.settings</field>
+        <field name="view_id" ref="base.project_settings_form_view"/>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+    </record>
+
   </data>
 </openerp>
-- 
cgit v1.2.3


From 0e526bd3299c105d54e2117d3aaaaa1b07e5752e Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 20 Mar 2012 14:50:02 +0100
Subject: [FIX] sale config: use model sale.config.settings instead of
 res.config.settings

bzr revid: rco@openerp.com-20120320135002-0gsazmlgock4gmnl
---
 addons/base_setup/base_setup_views.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 63bf79b37d7..fe3b73193b0 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -142,7 +142,7 @@
         <field name="sequence">1</field>
     </record>
 
-    <record id="base.sale_settings_form_view" model="ir.ui.view">
+    <record id="base.view_sale_config_settings" model="ir.ui.view">
         <field name="name">sale.config.settings</field>
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
@@ -151,8 +151,8 @@
                 <group name="sales" colspan="4">
                 </group>
                 <group name="crm" colspan="4">
-                </group>
-                <group name="plugins" colspan="4">
+                    <group name="plugin" colspan="4">
+                    </group>
                 </group>
             </form>
         </field>
@@ -162,7 +162,7 @@
         <field name="name">Configure Sales &amp; CRM</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.config.settings</field>
-        <field name="view_id" ref="base.sale_settings_form_view"/>
+        <field name="view_id" ref="base.view_sale_config_settings"/>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
     </record>
-- 
cgit v1.2.3


From 403211c254d8eaae656b4d15a208cecc5617b829 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 20 Mar 2012 15:27:59 +0100
Subject: [IMP] sale config: simplify structure of wizard form

bzr revid: rco@openerp.com-20120320142759-meyt05reg0sd886l
---
 addons/base_setup/base_setup_views.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index fe3b73193b0..12265dbd1df 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -148,12 +148,13 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Configure Sales &amp; CRM">
-                <group name="sales" colspan="4">
-                </group>
-                <group name="crm" colspan="4">
-                    <group name="plugin" colspan="4">
-                    </group>
-                </group>
+                <group name="invoice_policy" colspan="4"/>
+                <group name="sale_order" colspan="4"/>
+                <group name="contracts" colspan="4"/>
+                <group name="emails" colspan="4"/>
+                <group name="synchronization" colspan="4"/>
+                <group name="documents" colspan="4"/>
+                <group name="customer_form" colspan="4"/>
             </form>
         </field>
     </record>
-- 
cgit v1.2.3


From 697bd8546424260bfd049499c566c8cce3bb5098 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 21 Mar 2012 09:50:55 +0100
Subject: [IMP] sale config: simplify view structure and display as popup

bzr revid: rco@openerp.com-20120321085055-iqm99zcby5wz86cy
---
 addons/base_setup/base_setup_views.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 12265dbd1df..442986cff61 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -148,13 +148,13 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Configure Sales &amp; CRM">
-                <group name="invoice_policy" colspan="4"/>
-                <group name="sale_order" colspan="4"/>
-                <group name="contracts" colspan="4"/>
-                <group name="emails" colspan="4"/>
-                <group name="synchronization" colspan="4"/>
-                <group name="documents" colspan="4"/>
-                <group name="customer_form" colspan="4"/>
+                <group name="config_sale" colspan="4"/>
+                <group name="config_contracts" colspan="4"/>
+                <group name="config_emails" colspan="4"/>
+                <group name="config_crm" colspan="4"/>
+                <label colspan="2"/>
+                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                <button string="Apply" icon="gtk-ok" type="object" name="execute"/>
             </form>
         </field>
     </record>
@@ -164,8 +164,8 @@
         <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_type">form</field>
         <field name="view_mode">form</field>
+        <field name="target">new</field>
     </record>
 
   </data>
-- 
cgit v1.2.3


From dc008bb6c450655e4ee2a7706376c92dc296035b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 23 Mar 2012 09:36:16 +0100
Subject: [IMP] base_setup, mrp, purchase, stock: use plain page wizards

bzr revid: rco@openerp.com-20120323083616-ryb69234s3jy3yoi
---
 addons/base_setup/base_setup_views.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 442986cff61..1fdd250e864 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -152,9 +152,6 @@
                 <group name="config_contracts" colspan="4"/>
                 <group name="config_emails" colspan="4"/>
                 <group name="config_crm" colspan="4"/>
-                <label colspan="2"/>
-                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                <button string="Apply" icon="gtk-ok" type="object" name="execute"/>
             </form>
         </field>
     </record>
@@ -165,7 +162,6 @@
         <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">new</field>
     </record>
 
   </data>
-- 
cgit v1.2.3


From 4f3ae43615b2fff1dce9880a14bfcacdcd06f121 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 23 Mar 2012 16:52:48 +0100
Subject: [IMP] config wizards: move back to form in popup

bzr revid: rco@openerp.com-20120323155248-5ok844qr47ywiq46
---
 addons/base_setup/base_setup_views.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 1fdd250e864..7b2cd8af4b2 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -152,6 +152,10 @@
                 <group name="config_contracts" colspan="4"/>
                 <group name="config_emails" colspan="4"/>
                 <group name="config_crm" colspan="4"/>
+                <newline/>
+                <label colspan="2"/>
+                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                <button string="Apply" icon="gtk-ok" type="object" name="execute"/>
             </form>
         </field>
     </record>
@@ -162,6 +166,7 @@
         <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">new</field>
     </record>
 
   </data>
-- 
cgit v1.2.3


From 03a5d9e56c7411fd2bfa29102efa0c4efe38cd2f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 26 Mar 2012 16:17:41 +0200
Subject: [IMP] base_setup,project: move view for project settings inside
 project

bzr revid: rco@openerp.com-20120326141741-740zjvyudkesz0w3
---
 addons/base_setup/base_setup_views.xml | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 8f838d0f632..78d512b8d0d 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -169,31 +169,5 @@
         <field name="target">new</field>
     </record>
 
-    <record id="base.project_settings_form_view" model="ir.ui.view">
-        <field name="name">project.config.settings</field>
-        <field name="model">project.config.settings</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Configure Projects">
-                <group name="project" colspan="4"/>
-                <separator string="Helpdesk and support" colspan="4"/>
-                <group name="helpdesk" colspan="4"/>
-                <newline/>
-                <label colspan="2"/>
-                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                <button string="Apply" icon="gtk-ok" type="object" name="execute"/>
-            </form>
-        </field>
-    </record>
-
-    <record id="base.action_project_config" model="ir.actions.act_window">
-        <field name="name">Configure Projects</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">project.config.settings</field>
-        <field name="view_id" ref="base.project_settings_form_view"/>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
-
   </data>
 </openerp>
-- 
cgit v1.2.3


From d84dadad8bb96332944d48f0d446d4061c85b652 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 27 Mar 2012 13:39:38 +0200
Subject: [IMP] sale, purchase, stock, mrp, project: open wizards in main frame
 instead of popup

bzr revid: rco@openerp.com-20120327113938-hwjopircwmuqgwvf
---
 addons/base_setup/base_setup_views.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 78d512b8d0d..efc071fec68 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -143,30 +143,25 @@
     </record>
 
     <record id="base.view_sale_config_settings" model="ir.ui.view">
-        <field name="name">sale.config.settings</field>
+        <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 &amp; CRM">
+            <form string="Configure Sales">
                 <group name="config_sale" colspan="4"/>
                 <group name="config_contracts" colspan="4"/>
                 <group name="config_emails" colspan="4"/>
                 <group name="config_crm" colspan="4"/>
-                <newline/>
-                <label colspan="2"/>
-                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                <button string="Apply" icon="gtk-ok" type="object" name="execute"/>
             </form>
         </field>
     </record>
     
     <record id="base.action_sale_config" model="ir.actions.act_window">
-        <field name="name">Configure Sales &amp; CRM</field>
+        <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">new</field>
     </record>
 
   </data>
-- 
cgit v1.2.3


From b0847416f7b51e0810d1802b466bf0bd1c98a20c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 30 Mar 2012 14:38:33 +0200
Subject: [IMP] sale.config.settings: improve fields that manage contracts

bzr revid: rco@openerp.com-20120330123833-kadf4www18jh2etc
---
 addons/base_setup/base_setup_views.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index efc071fec68..861a8f32e2a 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -149,7 +149,6 @@
         <field name="arch" type="xml">
             <form string="Configure Sales">
                 <group name="config_sale" colspan="4"/>
-                <group name="config_contracts" colspan="4"/>
                 <group name="config_emails" colspan="4"/>
                 <group name="config_crm" colspan="4"/>
             </form>
-- 
cgit v1.2.3


From d56385b55f4eac78fdf944711fde2c9d1f15b556 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 30 Mar 2012 15:55:46 +0200
Subject: [IMP] sale.config.settings: show the 'Emails' section only when crm
 is installed

bzr revid: rco@openerp.com-20120330135546-jnmi8nbdmdg42rt7
---
 addons/base_setup/base_setup_views.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 861a8f32e2a..b720527da1d 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -149,7 +149,16 @@
         <field name="arch" type="xml">
             <form string="Configure Sales">
                 <group name="config_sale" colspan="4"/>
-                <group name="config_emails" 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"/>
             </form>
         </field>
-- 
cgit v1.2.3


From dade28f47d716d3ed856053a3809bb8876588666 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 3 Apr 2012 15:26:18 +0200
Subject: [IMP] config wizards: remove ir.actions.todo that are no longer
 useful

bzr revid: rco@openerp.com-20120403132618-qtwtg6aafig61wu4
---
 addons/base_setup/base_setup_views.xml | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index b720527da1d..e68dfaecb68 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>
-- 
cgit v1.2.3


From 2ce6626d126a3b4d17209dcbbc15c6a2c0b06960 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 4 Apr 2012 15:35:14 +0200
Subject: [IMP] config wizards: add buttons Cancel and Apply on forms

bzr revid: rco@openerp.com-20120404133514-o37mcojlvc2pklnk
---
 addons/base_setup/base_setup_views.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index e68dfaecb68..7b471ecc068 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -145,6 +145,11 @@
                 <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
 
                 <group name="config_crm" colspan="4"/>
+
+                <newline/>
+                <label colspan="2"/>
+                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
             </form>
         </field>
     </record>
-- 
cgit v1.2.3


From 42536dfc74f3faf3516f1012cee3c9d65e72f729 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 5 Apr 2012 12:22:35 +0200
Subject: [IMP] config wizards: open views with target 'inline'

bzr revid: rco@openerp.com-20120405102235-mw57wjnamwoglp3z
---
 addons/base_setup/base_setup_views.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/base_setup/base_setup_views.xml')

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 7b471ecc068..453d4b167c0 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -160,6 +160,7 @@
         <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>
-- 
cgit v1.2.3