Hardik Sanchawat (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-server/trunk-improve-view-sgo-db-st-hsa into
lp:~openerp-dev/openobject-server/trunk-improve-view-sgo.
Requested reviews:
Devishree Brahmbhatt (OpenERP) (dbr-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-server/trunk-improve-view-sgo-db-st-hsa/+merge/112559
Hello,
Views are improved :
Technical/Database Structure/Models
Technical/Database Structure/Fields
Technical/Workflow/Transitions
Configuration Wizards
Low level Object/ Actions/report
Low level Object/ Actions/ Window Actions
Thanks
-hsa
--
https://code.launchpad.net/~openerp-commiter/openobject-server/trunk-improve-view-sgo-db-st-hsa/+merge/112559
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-improve-view-sgo.
=== modified file 'openerp/addons/base/ir/ir.xml'
--- openerp/addons/base/ir/ir.xml 2012-06-28 10:58:47 +0000
+++ openerp/addons/base/ir/ir.xml 2012-06-28 13:03:03 +0000
@@ -342,16 +342,18 @@
<field name="arch" type="xml">
<form string="Report" version="7.0">
<sheet>
- <group col="6">
- <field name="name"/>
- <field name="model"/>
- <field name="usage"/>
-
- <field name="report_name"/>
- <field name="report_type"/>
- <field name="report_file"/>
+ <group>
+ <group>
+ <field name="name"/>
+ <field name="report_name"/>
+ <field name="model"/>
+ </group>
+ <group>
+ <field name="usage"/>
+ <field name="report_type"/>
+ <field name="report_file"/>
+ </group>
</group>
-
<notebook>
<page string="Other Configuration">
<group>
@@ -446,13 +448,17 @@
<field name="arch" type="xml">
<form string="Open a Window" version="7.0">
<sheet>
- <group col="6">
- <field name="name"/>
- <field name="res_model"/>
- <field name="type" readonly="1"/>
- <field name="src_model"/>
- <field name="usage"/>
- <field name="target"/>
+ <group>
+ <group>
+ <field name="name"/>
+ <field name="res_model"/>
+ <field name="src_model"/>
+ </group>
+ <group>
+ <field name="usage"/>
+ <field name="type" readonly="1"/>
+ <field name="target"/>
+ </group>
</group>
<notebook>
<page string="General Settings">
@@ -858,12 +864,16 @@
<field name="arch" type="xml">
<form string="Model Description" version="7.0">
<sheet>
- <group col="6">
- <field name="name"/>
- <field name="model"/>
- <field name="osv_memory"/>
- <field name="state"/>
- <field name="modules" colspan="4"/>
+ <group>
+ <group>
+ <field name="name"/>
+ <field name="model"/>
+ <field name="osv_memory"/>
+ </group>
+ <group>
+ <field name="state"/>
+ <field name="modules"/>
+ </group>
</group>
<notebook>
<page string="Fields">
@@ -980,38 +990,37 @@
<field name="arch" type="xml">
<form string="Fields" version="7.0">
<sheet>
- <group colspan="4" col="6">
- <field name="name" />
- <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
- <field name="field_description"/>
- <field name="state"/>
+ <group>
+ <group>
+ <field name="name" />
+ <field name="field_description"/>
+ </group>
+ <group>
+ <field name="state"/>
+ <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
+ <field name="modules"/>
+ </group>
</group>
- <notebook colspan="4">
- <page string="Properties">
- <group>
- <field name="ttype"/>
- <field name="relation" attrs="{'required': [('ttype','in', ['many2one','one2many','many2many'])],
+ <group>
+ <group>
+ <field name="ttype"/>
+ <field name="relation" attrs="{'required': [('ttype','in', ['many2one','one2many','many2many'])],
'readonly': [('ttype','not in', ['many2one','one2many','many2many'])]}"/>
- <field name="relation_field" attrs="{'required': [('ttype','=','one2many')], 'readonly': [('ttype','!=','one2many')]}"/>
- <field name="selection" attrs="{'required': [('ttype','in',['selection','reference'])], 'readonly': [('ttype','not in',['selection','reference'])]}"/>
- <field name="size" attrs="{'required': [('ttype','in',['char','reference'])], 'readonly': [('ttype','not in',['char','reference'])]}"/>
- <field name="domain" attrs="{'readonly': [('relation','=','')]}"/>
- <field name="serialization_field_id" attrs="{'readonly': [('state','=','base')]}" domain="[('ttype','=','serialized'), ('model_id', '=', model_id)]"/>
- </group>
-
- <group>
- <field name="required"/>
- <field name="readonly"/>
- <field name="select_level"/>
- <field name="translate"/>
- <field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/>
- <field name="modules"/>
- </group>
- </page>
- <page string="Security">
- <field name="groups"/>
- </page>
- </notebook>
+ <field name="relation_field" attrs="{'required': [('ttype','=','one2many')], 'readonly': [('ttype','!=','one2many')]}"/>
+ <field name="selection" attrs="{'required': [('ttype','in',['selection','reference'])], 'readonly': [('ttype','not in',['selection','reference'])]}"/>
+ <field name="size" attrs="{'required': [('ttype','in',['char','reference'])], 'readonly': [('ttype','not in',['char','reference'])]}"/>
+ <field name="domain" attrs="{'readonly': [('relation','=','')]}"/>
+ <field name="serialization_field_id" attrs="{'readonly': [('state','=','base')]}" domain="[('ttype','=','serialized'), ('model_id', '=', model_id)]"/>
+ <field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/>
+ </group>
+ <group>
+ <field name="required"/>
+ <field name="readonly"/>
+ <field name="select_level"/>
+ <field name="translate"/>
+ </group>
+ </group>
+ <field name="groups" invisible="1"/>
</sheet>
</form>
</field>
@@ -1778,15 +1787,6 @@
<form string="Config Wizard Steps" version="7.0">
<sheet>
<group col="4">
- <field name="action_id"/>
- <field name="type"/>
- <field name="sequence"/>
- <field name="category_id"/>
- </group>
- <group string="Groups">
- <field name="groups_id" nolabel="1" colspan="4"/>
- </group>
- <group col="4">
<field name="state" readonly="1"/>
<button name="action_launch"
states="open" string="Launch"
@@ -1796,6 +1796,15 @@
string="Set as Todo" type="object"
icon="gtk-convert"/>
</group>
+ <group col="4">
+ <field name="action_id"/>
+ <field name="type"/>
+ <field name="sequence"/>
+ <field name="category_id"/>
+ </group>
+ <group string="Groups">
+ <field name="groups_id" nolabel="1" colspan="4"/>
+ </group>
</sheet>
</form>
</field>
=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py 2012-06-22 14:12:22 +0000
+++ openerp/addons/base/ir/ir_model.py 2012-06-28 13:03:03 +0000
@@ -97,9 +97,9 @@
'field_id': fields.one2many('ir.model.fields', 'model_id', 'Fields', required=True),
'state': fields.selection([('manual','Custom Object'),('base','Base Object')],'Type',readonly=True),
'access_ids': fields.one2many('ir.model.access', 'model_id', 'Access'),
- 'osv_memory': fields.function(_is_osv_memory, string='In-Memory Model', type='boolean',
+ 'osv_memory': fields.function(_is_osv_memory, string='Transient Model', type='boolean',
fnct_search=_search_osv_memory,
- help="Indicates whether this object model lives in memory only, i.e. is not persisted (osv.osv_memory)"),
+ help="This field specifies whether the model is transient or not (i.e. if records are automatically deleted from the database or not)"),
'modules': fields.function(_in_modules, type='char', size=128, string='In Modules', help='List of modules in which the object is defined or inherited'),
'view_ids': fields.function(_view_ids, type='one2many', obj='ir.ui.view', string='Views'),
}
=== modified file 'openerp/addons/base/ir/workflow/workflow_view.xml'
--- openerp/addons/base/ir/workflow/workflow_view.xml 2012-06-22 10:11:46 +0000
+++ openerp/addons/base/ir/workflow/workflow_view.xml 2012-06-28 13:03:03 +0000
@@ -206,14 +206,18 @@
<field name="arch" type="xml">
<form string="Transition" version="7.0">
<sheet>
- <group col="6">
- <field name="act_from"/>
- <field name="act_to"/>
- <field name="signal"/>
- <field name="condition"/>
- <field name="trigger_model"/>
- <field name="trigger_expr_id"/>
- <field name="group_id"/>
+ <group>
+ <group>
+ <field name="act_from"/>
+ <field name="act_to"/>
+ <field name="signal"/>
+ <field name="condition"/>
+ </group>
+ <group>
+ <field name="group_id"/>
+ <field name="trigger_model"/>
+ <field name="trigger_expr_id"/>
+ </group>
</group>
</sheet>
</form>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
