From f917fe27b07a4e95b6bc4d02b9308f0dd34bfbe9 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 26 Aug 2010 15:48:50 +0530
Subject: [IMP] Import module wizard convert into osv memory wizard

bzr revid: ksa@tinyerp.co.in-20100826101850-e8tsrqre2ksdpr3b
---
 .../base/module/wizard/base_module_import_view.xml | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 bin/addons/base/module/wizard/base_module_import_view.xml

(limited to 'bin/addons/base/module/wizard/base_module_import_view.xml')

diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml
new file mode 100644
index 00000000000..818a7317c61
--- /dev/null
+++ b/bin/addons/base/module/wizard/base_module_import_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_base_module_import" model="ir.ui.view">
+            <field name="name">Module Import</field>
+            <field name="model">base.module.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Module import">
+            <separator string="Module Import" colspan="4"/>
+            <label string="Please give your module .ZIP file to import." colspan="4"/>
+            <field name="module_file"/>
+            <separator string="" colspan="4" />
+            <newline/>
+            <group colspan="6" >
+                <button special="cancel" string="Close" icon="gtk-cancel"/>
+                <button name="action_module_open" string="Import module" type="object" icon="gtk-ok"/>
+            </group>
+             </form>
+            </field>
+        </record>
+
+        <record id="action_view_base_module_import" model="ir.actions.act_window">
+            <field name="name">Module Import</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.module.import</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+        name="Import Module"
+        action="action_view_base_module_import"
+        id="menu_view_base_module_import"
+       parent="menu_management"
+       sequence="1"/>
+
+
+    </data>
+</openerp>
\ No newline at end of file
-- 
cgit v1.2.3


From 086e88d4ce2494d8f242599db13a59418bec091b Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 26 Aug 2010 18:05:54 +0530
Subject: [IMP]: convert old wizard into osv memory wizard for update module

bzr revid: ksa@tinyerp.co.in-20100826123554-2zd5yvp33slx8xfm
---
 .../base/module/wizard/base_module_import_view.xml | 28 ++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'bin/addons/base/module/wizard/base_module_import_view.xml')

diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml
index 818a7317c61..f46c7ebf293 100644
--- a/bin/addons/base/module/wizard/base_module_import_view.xml
+++ b/bin/addons/base/module/wizard/base_module_import_view.xml
@@ -15,7 +15,7 @@
             <newline/>
             <group colspan="6" >
                 <button special="cancel" string="Close" icon="gtk-cancel"/>
-                <button name="action_module_open" string="Import module" type="object" icon="gtk-ok"/>
+                <button name="importzip" string="Import module" type="object" icon="gtk-ok"/>
             </group>
              </form>
             </field>
@@ -37,6 +37,30 @@
        parent="menu_management"
        sequence="1"/>
 
+        <record id="view_base_module_import_msg" model="ir.ui.view">
+            <field name="name">Module Import Message</field>
+            <field name="model">base.module.import.msg</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Message">
+            <label string="Module successfully imported !"/>
+            <separator string="" colspan="4"/>
+            <newline/>
+            <group>
+            <button name="action_module_open" string="Close" type="object" icon="gtk-cancel"/>
+            </group>
+            </form>
+            </field>
+        </record>
 
+        <record id="action_view_base_module_import_msg" model="ir.actions.act_window">
+            <field name="name">Module Import Message</field>
+            <field name="res_model">base.module.import.msg</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_base_module_import"/>
+            <field name="target">new</field>
+        </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
+
-- 
cgit v1.2.3


From 2889dd48cfddb7a21e1d15ac768c9a01957242ae Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 21 Sep 2010 13:22:50 +0530
Subject: [IMP] useability

bzr revid: hmo@tinyerp.com-20100921075250-9gd4n4cg34fp2ho4
---
 bin/addons/base/module/wizard/base_module_import_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin/addons/base/module/wizard/base_module_import_view.xml')

diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml
index f46c7ebf293..8cb974167d9 100644
--- a/bin/addons/base/module/wizard/base_module_import_view.xml
+++ b/bin/addons/base/module/wizard/base_module_import_view.xml
@@ -14,7 +14,7 @@
             <separator string="" colspan="4" />
             <newline/>
             <group colspan="6" >
-                <button special="cancel" string="Close" icon="gtk-cancel"/>
+                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                 <button name="importzip" string="Import module" type="object" icon="gtk-ok"/>
             </group>
              </form>
@@ -47,7 +47,7 @@
             <separator string="" colspan="4"/>
             <newline/>
             <group>
-            <button name="action_module_open" string="Close" type="object" icon="gtk-cancel"/>
+            <button name="action_module_open" string="Cancel" type="object" icon="gtk-cancel"/>
             </group>
             </form>
             </field>
-- 
cgit v1.2.3


From 55bec50ff09b29eb616ffbd56949b9ca194753d0 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 29 Sep 2010 13:28:01 +0530
Subject: [IMP]: base : Improvements in base module

bzr revid: jas@tinyerp.com-20100929075801-l569rvj9tiq2ha9w
---
 bin/addons/base/module/wizard/base_module_import_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/addons/base/module/wizard/base_module_import_view.xml')

diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml
index 8cb974167d9..9d1aa1bce49 100644
--- a/bin/addons/base/module/wizard/base_module_import_view.xml
+++ b/bin/addons/base/module/wizard/base_module_import_view.xml
@@ -7,7 +7,7 @@
             <field name="model">base.module.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Module import">
+            <form string="Import module">
             <separator string="Module Import" colspan="4"/>
             <label string="Please give your module .ZIP file to import." colspan="4"/>
             <field name="module_file"/>
-- 
cgit v1.2.3


From cd527b6c9d3a7337ae689b54325a1bb574b3b285 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 4 Oct 2010 16:33:36 +0200
Subject: [IMP] base: refactor/unify base module wizards

bzr revid: odo@openerp.com-20101004143336-nh0vnvbipt5dvmna
---
 .../base/module/wizard/base_module_import_view.xml | 80 +++++++++++-----------
 1 file changed, 40 insertions(+), 40 deletions(-)

(limited to 'bin/addons/base/module/wizard/base_module_import_view.xml')

diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml
index 9d1aa1bce49..b04bc050e97 100644
--- a/bin/addons/base/module/wizard/base_module_import_view.xml
+++ b/bin/addons/base/module/wizard/base_module_import_view.xml
@@ -7,17 +7,41 @@
             <field name="model">base.module.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Import module">
-            <separator string="Module Import" colspan="4"/>
-            <label string="Please give your module .ZIP file to import." colspan="4"/>
-            <field name="module_file"/>
-            <separator string="" colspan="4" />
-            <newline/>
-            <group colspan="6" >
-                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="importzip" string="Import module" type="object" icon="gtk-ok"/>
-            </group>
-             </form>
+                <form string="Import module">
+                    <group col="8">
+                        <group colspan="3">
+                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+                            <newline/>
+                            <label colspan="4" width="220" string="This wizard helps you add a new language to you OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
+                            <label colspan="4" width="220"/>
+                            <label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
+                            <field name="state" invisible="1"/>
+                        </group>
+                        <separator orientation="vertical" rowspan="15"/>
+                        <group colspan="4">
+                            <separator string="Module Import" colspan="4"/>
+                            <group states="init" colspan="4" col="4">
+                                <label string="Select module package to import (.zip file):" colspan="4"/>
+                                <field name="module_file" colspan="4"/>
+                            </group>
+                            <group states="done" colspan="4" col="4">
+                                <label string="Module file successfully imported!" colspan="4"/>
+                            </group>
+                        </group>
+                        <group colspan="8" col="8" states="init">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                            <button name="importzip" string="Import module" type="object" icon="gtk-apply"/>
+                        </group>
+                        <group colspan="8" col="8" states="done">
+                            <separator string="" colspan="8"/>
+                            <label colspan="6" width="220"/>
+                            <button special="cancel" string="Close" icon="gtk-ok"/>
+                            <button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward"/>
+                        </group>
+                    </group>
+                </form>
             </field>
         </record>
 
@@ -31,36 +55,12 @@
         </record>
 
         <menuitem
-        name="Import Module"
-        action="action_view_base_module_import"
-        id="menu_view_base_module_import"
-       parent="menu_management"
-       sequence="1"/>
+            name="Import Module"
+            action="action_view_base_module_import"
+            id="menu_view_base_module_import"
+            parent="menu_management"
+            sequence="1"/>
 
-        <record id="view_base_module_import_msg" model="ir.ui.view">
-            <field name="name">Module Import Message</field>
-            <field name="model">base.module.import.msg</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Message">
-            <label string="Module successfully imported !"/>
-            <separator string="" colspan="4"/>
-            <newline/>
-            <group>
-            <button name="action_module_open" string="Cancel" type="object" icon="gtk-cancel"/>
-            </group>
-            </form>
-            </field>
-        </record>
-
-        <record id="action_view_base_module_import_msg" model="ir.actions.act_window">
-            <field name="name">Module Import Message</field>
-            <field name="res_model">base.module.import.msg</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_base_module_import"/>
-            <field name="target">new</field>
-        </record>
     </data>
 </openerp>
 
-- 
cgit v1.2.3


From b1cf8c3afb4d45904174c133d6951b9a8102c75f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Nov 2010 16:24:55 +0100
Subject: [FIX] layout of base_module_import_view

bzr revid: xmo@openerp.com-20101103152455-o79qfxbjw7k9kasd
---
 bin/addons/base/module/wizard/base_module_import_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'bin/addons/base/module/wizard/base_module_import_view.xml')

diff --git a/bin/addons/base/module/wizard/base_module_import_view.xml b/bin/addons/base/module/wizard/base_module_import_view.xml
index b04bc050e97..8e43789b057 100644
--- a/bin/addons/base/module/wizard/base_module_import_view.xml
+++ b/bin/addons/base/module/wizard/base_module_import_view.xml
@@ -9,22 +9,22 @@
             <field name="arch" type="xml">
                 <form string="Import module">
                     <group col="8">
-                        <group colspan="3">
+                        <group colspan="3" col="1">
                             <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
                             <newline/>
-                            <label colspan="4" width="220" string="This wizard helps you add a new language to you OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
-                            <label colspan="4" width="220"/>
-                            <label colspan="4" width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
+                            <label width="220" string="This wizard helps you add a new language to you OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
+                            <label width="220"/>
+                            <label width="220" string="Please be patient, this operation may take a few minutes (depending on the number of modules currently installed)..."/>
                             <field name="state" invisible="1"/>
                         </group>
-                        <separator orientation="vertical" rowspan="15"/>
+                        <separator orientation="vertical" rowspan="5"/>
                         <group colspan="4">
                             <separator string="Module Import" colspan="4"/>
-                            <group states="init" colspan="4" col="4">
+                            <group states="init" col="4">
                                 <label string="Select module package to import (.zip file):" colspan="4"/>
                                 <field name="module_file" colspan="4"/>
                             </group>
-                            <group states="done" colspan="4" col="4">
+                            <group states="done" col="4">
                                 <label string="Module file successfully imported!" colspan="4"/>
                             </group>
                         </group>
-- 
cgit v1.2.3