openerp-dev-web team mailing list archive

["Atik Agewan\(OpenERP\)" <aag@xxxxxxxxxxx>]

Atik Agewan(OpenERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-configuration-rework-tool-tip-aag into lp:~openerp-dev/openobject-server/trunk-configuration-rework.

Requested reviews:
  Rucha (Open ERP) (rpa-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-configuration-rework-tool-tip-aag/+merge/61551


Hello 

In this Proposel add a new field category on config wizard and 
Remove Create Users config  wizard


Thanks
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-configuration-rework-tool-tip-aag/+merge/61551
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-configuration-rework.

=== modified file 'openerp/addons/base/base_update.xml'
--- openerp/addons/base/base_update.xml	2011-05-13 10:19:13 +0000
+++ openerp/addons/base/base_update.xml	2011-05-19 12:22:25 +0000
@@ -309,16 +309,6 @@
             </field>
         </record>
 
-        <record id="action_config_user_form" model="ir.actions.act_window">
-            <field name="name">Create Users</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.config.users</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_users_configuration_form"/>
-            <field name="target">new</field>
-        </record>
-
         <record id="view_confirm_simple_view_form" model="ir.ui.view">
             <field name="name">Configure Your Interface</field>
             <field name="model">res.config.view</field>
@@ -360,12 +350,6 @@
             <field name="target">new</field>
         </record>
 
-        <record id="config_wizard_step_user" model="ir.actions.todo">
-            <field name="action_id" ref="action_config_user_form"/>
-            <field name="sequence">10</field>
-            <field name="type">normal</field>
-            <field name="state">done</field>
-        </record>
         <record id="config_wizard_simple_view" model="ir.actions.todo">
             <field name="action_id" ref="action_config_simple_view_form"/>
             <field name="type">special</field>

=== modified file 'openerp/addons/base/ir/ir.xml'
--- openerp/addons/base/ir/ir.xml	2011-04-28 10:50:46 +0000
+++ openerp/addons/base/ir/ir.xml	2011-05-19 12:22:25 +0000
@@ -1899,6 +1899,7 @@
                         <field name="action_id"/>
                         <field name="type"/>
                         <field name="sequence"/>
+                        <field name="category_id"/>
                     </group>
                     <separator string="Groups" colspan="4"/>
                     <field name="groups_id" nolabel="1" colspan="4"/>
@@ -1953,6 +1954,30 @@
             <field name="function">power_on</field>
             <field name="args">()</field>
         </record>
+        
+        <record id="todo_category_form" model="ir.ui.view">
+            <field name="name">todo.category.form</field>
+            <field name="model">todo.category</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Wizard Category">
+                        <field name="name"/>
+                        <field name="sequence"/>
+                </form>
+            </field>
+        </record>
+        
+        <record id="todo_category_tree" model="ir.ui.view">
+            <field name="name">todo.category.tree</field>
+            <field name="model">todo.category</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Wizard Category">
+                        <field name="name"/>
+                        <field name="sequence"/>
+                </tree>
+            </field>
+        </record>
 
     </data>
 </openerp>

=== modified file 'openerp/addons/base/ir/ir_actions.py'
--- openerp/addons/base/ir/ir_actions.py	2011-04-11 12:25:09 +0000
+++ openerp/addons/base/ir/ir_actions.py	2011-05-19 12:22:25 +0000
@@ -800,6 +800,14 @@
     }
 act_window_close()
 
+class todo_category(osv.osv):
+    _name = 'todo.category'
+    _columns = {
+         'name':fields.char('Name', size=64),       
+        'sequence': fields.integer('Sequence'),
+    }
+todo_category()
+
 # This model use to register action services.
 TODO_STATES = [('open', 'To Do'),
                ('done', 'Done'),
@@ -818,6 +826,7 @@
         'type': fields.selection([('special','Special'),('normal','Normal'),('normal_recurring','Normal Recurring')],'Type',required=True),
         'groups_id':fields.many2many('res.groups', 'res_groups_action_rel', 'uid', 'gid', 'Groups'),
         'note':fields.text('Text', translate=True),
+        'category_id': fields.many2one('todo.category','Category'),
     }
     _defaults={
         'state': 'open',