From f672183ff142178f78df8ec70686bb9ff43057c3 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 1 Mar 2011 12:51:34 +0530
Subject: [IMP] Rework-Addons :Improvement Config wiz , ON Addonse Side

bzr revid: aag@tinyerp.co.in-20110301072134-3rrx10e53csav102
---
 addons/base_setup/base_setup_todo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 7cd0563aafe..c3a1bc24a8b 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,7 @@
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">onskip</field>
+        <field name="restart">on_trigger</field>
     </record>
   </data>
 </openerp>
-- 
cgit v1.2.3


From 233084fdc645d939282abef9e452b4c1daa83dea Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 31 Mar 2011 10:39:19 +0200
Subject: [IMP] base_setup: set restart=never and state=skip on the 'configure
 your company' wizard

bzr revid: qdp-launchpad@openerp.com-20110331083919-01lwi0uxtbra167f
---
 addons/base_setup/base_setup_todo.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index c3a1bc24a8b..234571b458e 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,8 @@
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">on_trigger</field>
+        <field name="restart">never</field>
+        <field name="state">skip</field>
     </record>
   </data>
 </openerp>
-- 
cgit v1.2.3


From 767f6571dc13fc3253d6bcddef233586493d26f2 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 8 Apr 2011 17:58:11 +0530
Subject: [IMP]ADDONS:Change Field Restart To Type

bzr revid: aag@tinyerp.co.in-20110408122811-dm029nwtkmjzcgdj
---
 addons/base_setup/base_setup_todo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 234571b458e..7467cad4d4b 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -67,7 +67,7 @@
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
         <field name="sequence">1</field>
-        <field name="restart">never</field>
+        <field name="type">normal</field>
         <field name="state">skip</field>
     </record>
   </data>
-- 
cgit v1.2.3


From f997cb6698ad98ee2c22484946b45b6b9a664b7c Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 29 Apr 2011 12:10:08 +0530
Subject: [IMP]: base_setup: Removed logo field from company setup wizard as we
 have a new wizard to upload logo in form view of company

bzr revid: rpa@tinyerp.com-20110429064008-7v5rvc87vogu10da
---
 addons/base_setup/base_setup_todo.xml | 5 -----
 1 file changed, 5 deletions(-)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 7467cad4d4b..e4beabea3fd 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -40,11 +40,6 @@
                     <field name="rml_header1" colspan="5" invisible="1" groups="base.group_extended"/>
                     <field name="rml_footer1" colspan="5" invisible="1" groups="base.group_extended"/>
                     <field name="rml_footer2" colspan="5" invisible="1" groups="base.group_extended"/>
-
-                    <separator colspan="4"
-                               string="Your Logo - Use a size of about 450x150 pixels."/>
-                    <field colspan="5" name="logo" widget="image"
-                           nolabel="1"/>
                   </group>
             </group>
            </group>
-- 
cgit v1.2.3


From f710164aff427805f8549e65ac4f9f9128171bf3 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 6 May 2011 12:13:03 +0530
Subject: [IMP]Base_setup:Add New Config Wiz - Company Configuration Current
 Form

bzr revid: aag@tinyerp.co.in-20110506064303-uvvsuyg2dyh3lzkh
---
 addons/base_setup/base_setup_todo.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index e4beabea3fd..886de220a87 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -65,5 +65,22 @@
         <field name="type">normal</field>
         <field name="state">skip</field>
     </record>
+ 
+    <record id="action_base_setup_company_current_form2" model="ir.actions.act_window">
+        <field name="name">Company Configuration Current Form</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.company</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="base.view_company_form2"/>
+    </record>
+        
+    <record id="action_base_setup_company_current_form_todo" model="ir.actions.todo">
+        <field name="action_id" ref="action_base_setup_company_current_form2"/>
+        <field name="type">normal</field>
+        <field name="state">skip</field>
+        <field name="target">current</field>
+    </record>
+    
   </data>
 </openerp>
-- 
cgit v1.2.3


From 4199b38fe71d908339b584c2aed0f6a80661cc58 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Thu, 12 May 2011 19:07:36 +0530
Subject: [REM]base_setup:Remove new  company  config wiz

bzr revid: aag@tinyerp.co.in-20110512133736-sdfg0no4k10iccaw
---
 addons/base_setup/base_setup_todo.xml | 16 ----------------
 1 file changed, 16 deletions(-)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 886de220a87..6d674ea0915 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -66,21 +66,5 @@
         <field name="state">skip</field>
     </record>
  
-    <record id="action_base_setup_company_current_form2" model="ir.actions.act_window">
-        <field name="name">Company Configuration Current Form</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">res.company</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="base.view_company_form2"/>
-    </record>
-        
-    <record id="action_base_setup_company_current_form_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_company_current_form2"/>
-        <field name="type">normal</field>
-        <field name="state">skip</field>
-        <field name="target">current</field>
-    </record>
-    
   </data>
 </openerp>
-- 
cgit v1.2.3


From 66d7ca89b74a486088e2d2f4f6c095781857bb2f Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 12 May 2011 19:09:28 +0530
Subject: [IMP]: base: Improvement in company config wizard

bzr revid: rpa@tinyerp.com-20110512133928-c6u5675fiurn7cf3
---
 addons/base_setup/base_setup_todo.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index e4beabea3fd..1a148c517c3 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -53,10 +53,9 @@
       <field name="name">Company Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">base.setup.company</field>
-      <field name="view_id" ref="view_base_setup_company"/>
+      <field name="view_id" ref="base.view_company_form"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
-      <field name="target">new</field>
     </record>
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
-- 
cgit v1.2.3


From 8caa6c7dabb9c37b12fdb97f3177fe7cb26db6ab Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 13 May 2011 12:36:27 +0530
Subject: [IMP, REM]: Fixed view of company after changes in server, Removed
 unwanted view

bzr revid: rpa@tinyerp.com-20110513070627-funzvol19b85ahwi
---
 addons/base_setup/base_setup_todo.xml | 48 -----------------------------------
 1 file changed, 48 deletions(-)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index aa39f270e64..f6b353bc937 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -1,53 +1,5 @@
 <openerp>
   <data>
-    <record id="view_base_setup_company" model="ir.ui.view">
-      <field name="name">Company Configuration</field>
-      <field name="model">base.setup.company</field>
-      <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_view_base"/>
-      <field name="arch" type="xml">
-        <data>
-          <form position="attributes">
-            <attribute name="string">Company Configuration</attribute>
-          </form>
-          <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more.</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Configure Your Company Information</attribute>
-          </xpath>
-          <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='rowspan'>25</attribute>
-                    <attribute name='string'></attribute>
-          </xpath>
-          <group string="res_config_contents" position="replace">
-              <group colspan="5">
-                  <group colspan="2">
-                    <field name="company_id" invisible="1"/>
-                    <field name="name" required="True"/><field name="website"/>
-                    <field name="street"/><field name="street2"/>
-                    <field name="zip"/>
-                    <field name="city"/>
-                    <field name="country_id"/>
-                    <field name="state_id"/>
-                    <field name="phone"/>
-                    <field name="email"/>
-                    <field name="account_no"/>
-                    <field name="currency" widget="selection"/>
-                </group>
-                <newline/>
-                <group colspan="2">
-                    <field name="rml_header1" colspan="5" invisible="1" groups="base.group_extended"/>
-                    <field name="rml_footer1" colspan="5" invisible="1" groups="base.group_extended"/>
-                    <field name="rml_footer2" colspan="5" invisible="1" groups="base.group_extended"/>
-                  </group>
-            </group>
-           </group>
-
-          <xpath expr='//button[@name="action_skip"]' position='replace'/>
-        </data>
-      </field>
-    </record>
 
     <record id="action_base_setup_company" model="ir.actions.act_window">
       <field name="name">Company Configuration</field>
-- 
cgit v1.2.3


From e97aed71bcdb0f3d6eeed2fdd8b575a4cd4d6fb5 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Tue, 31 May 2011 18:27:10 +0530
Subject: [ADD]Base_setup:In Company Configuration  add category compnay

bzr revid: aag@tinyerp.co.in-20110531125710-5cylzye6eaki36a2
---
 addons/base_setup/base_setup_todo.xml | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index f6b353bc937..7da7142ae3d 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -9,9 +9,15 @@
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
     </record>
+    
+    <record id="category_base_setup_company" model="ir.actions.todo.category">
+      <field name="name">Company</field>
+      <field name="sequence">1</field>
+    </record>    
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
+        <field name="category_id" ref="category_base_setup_company"/>
         <field name="sequence">1</field>
         <field name="type">normal</field>
         <field name="state">skip</field>
-- 
cgit v1.2.3


From bfbba02ce48215c5ef3de332a7ccd4ec243ba26b Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Wed, 1 Jun 2011 11:58:15 +0530
Subject: [ADD]Base_setup:In Company Configuration  add add to Admin - 2 seq 
 category

bzr revid: aag@tinyerp.co.in-20110601062815-0rixgmjpej97nhg1
---
 addons/base_setup/base_setup_todo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 7da7142ae3d..caaedeef974 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,8 +11,8 @@
     </record>
     
     <record id="category_base_setup_company" model="ir.actions.todo.category">
-      <field name="name">Company</field>
-      <field name="sequence">1</field>
+      <field name="name">Admin</field>
+      <field name="sequence">2</field>
     </record>    
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
-- 
cgit v1.2.3


From 4780b6202b86175bbbd7f967aaac06e3da05c9ce Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:07:44 +0530
Subject: [IMP]base_setup:Company Configuration in Administration-1 categ

bzr revid: aag@tinyerp.co.in-20110603063744-g49vxksi8nc7f0ca
---
 addons/base_setup/base_setup_todo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index caaedeef974..b8355778c95 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,8 +11,8 @@
     </record>
     
     <record id="category_base_setup_company" model="ir.actions.todo.category">
-      <field name="name">Admin</field>
-      <field name="sequence">2</field>
+      <field name="name">Administration</field>
+      <field name="sequence">1</field>
     </record>    
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
-- 
cgit v1.2.3


From 7db540e4eea26db44513e883f0504eeed41268e2 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 3 Jun 2011 12:36:36 +0530
Subject: [IMP]base_setup:Company Configuration in Administration-1 categ

bzr revid: aag@tinyerp.co.in-20110603070636-510h01n0phpdn9d9
---
 addons/base_setup/base_setup_todo.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index b8355778c95..7ea8e9e3a05 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -9,15 +9,10 @@
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
     </record>
-    
-    <record id="category_base_setup_company" model="ir.actions.todo.category">
-      <field name="name">Administration</field>
-      <field name="sequence">1</field>
-    </record>    
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_setup_company"/>
-        <field name="category_id" ref="category_base_setup_company"/>
+        <field name="category_id" ref="base.category_administration_config"/>
         <field name="sequence">1</field>
         <field name="type">normal</field>
         <field name="state">skip</field>
-- 
cgit v1.2.3


From a62aacaf7cc2d428f1b941a9546efeeb2ec807c9 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 24 Jun 2011 19:08:00 +0530
Subject: [IMP]: base_setup: Added context to open company wizard with data
 filled

bzr revid: rpa@tinyerp.com-20110624133800-q3owydbtbwz54e7d
---
 addons/base_setup/base_setup_todo.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 7ea8e9e3a05..6408cc08bba 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -8,6 +8,7 @@
       <field name="view_id" ref="base.view_company_form"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
+      <field name="context">{'res_id': 1}</field>
     </record>
 
     <record id="base_setup_company_todo" model="ir.actions.todo">
-- 
cgit v1.2.3


From 111aaad609ade44cac0ee5a0dbd426b825678d7a Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 27 Jun 2011 11:43:40 +0530
Subject: [REM]: base_setup: Removed unused code, cleaned code

bzr revid: rpa@tinyerp.com-20110627061340-yk7f5shyzj1qvcrj
---
 addons/base_setup/base_setup_todo.xml | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 addons/base_setup/base_setup_todo.xml

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

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
deleted file mode 100644
index 6408cc08bba..00000000000
--- a/addons/base_setup/base_setup_todo.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<openerp>
-  <data>
-
-    <record id="action_base_setup_company" model="ir.actions.act_window">
-      <field name="name">Company Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">res.company</field>
-      <field name="view_id" ref="base.view_company_form"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="context">{'res_id': 1}</field>
-    </record>
-
-    <record id="base_setup_company_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_company"/>
-        <field name="category_id" ref="base.category_administration_config"/>
-        <field name="sequence">1</field>
-        <field name="type">normal</field>
-        <field name="state">skip</field>
-    </record>
- 
-  </data>
-</openerp>
-- 
cgit v1.2.3