odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP/FIX]: base : Improvement in User,Security menu 

bzr revid: jas@tinyerp.com-20100929111200-fs00cbqhpo4uzz3z
This commit is contained in:
jas 2010-09-29 16:42:00 +05:30
parent 55bec50ff0
commit b4779a1bd3
9 changed files with 223 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
bin/addons/base/base_update.xml
View File

@ -114,21 +114,30 @@
<newline/> <newline/>
<notebook colspan="4"> <notebook colspan="4">
<page string="User"> <page string="User">
<field name="company_id" required="1" <group colspan="1" col="2">
context="{'user_id': self, 'user_preference': 1}" <separator string="Contact" colspan="2"/>
on_change="on_change_company_id(company_id)" <field name="company_id" required="1"
groups="base.group_multi_company" context="{'user_id': self, 'user_preference': 1}"
/> on_change="on_change_company_id(company_id)"
<field name="address_id" select="1"/> groups="base.group_multi_company"
<field name="user_email" widget="email"/> />
<field name="context_lang"/> <field name="address_id" select="1"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/> <field name="user_email" widget="email"/>
<field name="action_id" required="True"/> </group>
<group colspan="1" col="2" groups="base.group_extended">
<separator string="Action" colspan="2"/>
<field name="context_tz"/> <field name="action_id" required="True"/>
<field name="view" readonly="0"/> <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
<field name="menu_tips" colspan="2"/> </group>
<group colspan="1" col="2">
<separator string="Preferences" colspan="2"/>
<field name="context_lang"/>
<field name="context_tz"/>
<group colspan="2" col="4">
<field name="view" readonly="0"/>
<field name="menu_tips" colspan="2"/>
</group>
</group>
<newline/> <newline/>
<group colspan="2" col="2"> <group colspan="2" col="2">
<separator string="Signature" colspan="2"/> <separator string="Signature" colspan="2"/>
@ -142,7 +151,7 @@
<page string="Roles"> <page string="Roles">
<field colspan="4" nolabel="1" name="roles_id"/> <field colspan="4" nolabel="1" name="roles_id"/>
</page> </page>
<page string="Companies"> <page string="Companies" groups="base.group_multi_company">
<field colspan="4" nolabel="1" name="company_ids" select="1"/> <field colspan="4" nolabel="1" name="company_ids" select="1"/>
</page> </page>
</notebook> </notebook>
@ -157,7 +166,7 @@
<tree string="Users"> <tree string="Users">
<field name="name"/> <field name="name"/>
<field name="login"/> <field name="login"/>
<field name="address_id" string="Address" /> <field name="context_lang"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
</tree> </tree>
</field> </field>
@ -172,7 +181,7 @@
<field name="name"/> <field name="name"/>
<field name="login"/> <field name="login"/>
<field name="address_id" string="Address"/> <field name="address_id" string="Address"/>
<field name="company_ids" string="Company"/> <field name="company_ids" string="Company" groups="base.group_multi_company"/>
</search> </search>
</field> </field>
</record> </record>

293
bin/addons/base/ir/ir.xml
View File

@ -10,22 +10,14 @@
<field name="priority">20</field> <field name="priority">20</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Connect Events to Actions"> <form string="Connect Events to Actions">
<group col="6" colspan="4">
<field name="name" required="1"/> <field name="name" required="1"/>
<field name="model_id" on_change="onchange_object_id(model_id)"/> <field name="model_id" on_change="onchange_object_id(model_id)"/>
<field name="action_id" on_change="onchange_action_id(action_id)"/> <field name="action_id" on_change="onchange_action_id(action_id)"/>
<field name="key2" required="1"/> <field name="key2" required="1"/>
<field name="res_id"/>
<field name="object" readonly="1"/> <field name="object" readonly="1"/>
</group> <field name="res_id"/>
<group col="2" colspan="2"> <field name="value_unpickle"/>
<separator colspan="2" string="Value"/> <field name="meta_unpickle"/>
<field name="value_unpickle" nolabel="1"/>
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Metadata"/>
<field name="meta_unpickle" nolabel="1"/>
</group>
<field name="user_id"/> <field name="user_id"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
</form> </form>
@ -55,17 +47,12 @@
<field name="name"/> <field name="name"/>
<field name="model"/> <field name="model"/>
<field name="key2"/> <field name="key2"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>
<record id="act_values_form_action" model="ir.actions.act_window"> <record id="act_values_form_action" model="ir.actions.act_window">
<field name="name">Client Events</field> <field name="name">Client Actions</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">ir.values</field> <field name="res_model">ir.values</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -89,9 +76,7 @@
<field name="act_window_id" ref="act_values_form_action"/> <field name="act_window_id" ref="act_values_form_action"/>
</record> </record>
<menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/> <menuitem action="act_values_form_action" id="menu_values_form_action" parent="base.menu_custom_action"/>
<menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
<!-- Values --> <!-- Values -->
@ -269,7 +254,7 @@
</record> </record>
<record id="ir_sequence_type" model="ir.actions.act_window"> <record id="ir_sequence_type" model="ir.actions.act_window">
<field name="name">Sequence Codes</field> <field name="name">Sequence Types</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">ir.sequence.type</field> <field name="res_model">ir.sequence.type</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@ -325,8 +310,7 @@
<field name="view_id" ref="action_view_tree"/> <field name="view_id" ref="action_view_tree"/>
<field name="search_view_id" ref="action_view_search"/> <field name="search_view_id" ref="action_view_search"/>
</record> </record>
<menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
<menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/> <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
<!--Filters form view--> <!--Filters form view-->
@ -842,29 +826,23 @@
<search string="Role"> <search string="Role">
<field name="name"/> <field name="name"/>
<field name="parent_id"/> <field name="parent_id"/>
<field name="description"/>
<newline/>
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
<filter string="Parent" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'parent_id'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>
<record id="action_res_roles" model="ir.actions.act_window"> <record id="action_res_roles_form" model="ir.actions.act_window">
<field name="name">Roles Structure</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.roles</field>
<field name="view_type">tree</field>
<field eval="[('parent_id','=',False)]" name="domain"/>
</record>
<menuitem action="action_res_roles"
groups="base.group_extended"
id="menu_action_res_roles" parent="base.menu_users"/>
<record id="action_res_roles_form" model="ir.actions.act_window">
<field name="name">Roles</field> <field name="name">Roles</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">res.roles</field> <field name="res_model">res.roles</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="search_view_id" ref="view_roles_search"/> <field name="search_view_id" ref="view_roles_search"/>
</record> </record>
<menuitem action="action_res_roles_form" id="menu_action_res_roles_form" parent="menu_action_res_roles"/> <menuitem action="action_res_roles_form" id="menu_action_res_roles_form" parent="base.menu_users"/>
<!-- View --> <!-- View -->
<record id="view_view_form" model="ir.ui.view"> <record id="view_view_form" model="ir.ui.view">
@ -873,25 +851,21 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Views"> <form string="Views">
<group colspan="4" col="6"> <group colspan="2" col="2">
<field name="name" select="1" colspan="6"/> <separator string="General" colspan="2"/>
<field name="type" select="1"/> <field name="name" select="1"/>
<field name="model" select="1"/> <field name="type" select="1"/>
<field name="priority"/> <field name="model" select="1"/>
</group> <field name="priority"/>
<notebook colspan="4"> </group>
<page string="Architecture"> <group colspan="2" col="2">
<field colspan="4" nolabel="1" name="arch"/> <separator string="Advanced" colspan="2"/>
</page> <field name="field_parent"/>
<page string="Extra Info"> <field name="inherit_id" select="1"/>
<separator string="Advanced" colspan="4"/> <field name="xml_id" select="1"/>
<newline/> </group>
<field name="field_parent"/> <separator string="View architecture" colspan="4"/>
<field name="inherit_id" select="1"/> <field colspan="4" nolabel="1" name="arch"/>
<field name="xml_id" select="1"/>
</page>
</notebook>
</form> </form>
</field> </field>
</record> </record>
@ -918,13 +892,6 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Views"> <search string="Views">
<filter icon="terp-stock_zoom" string="Search"
domain="[('type', '=', 'search')]" />
<filter icon="gtk-indent" string="Tree"
domain="[('type', '=', 'tree')]" />
<filter icon="gtk-new" string="Form"
domain="[('type', '=','form')]" />
<separator orientation="vertical"/>
<field name="name"/> <field name="name"/>
<field name="type"/> <field name="type"/>
<field name="model"/> <field name="model"/>
@ -932,7 +899,7 @@
<field name="xml_id"/> <field name="xml_id"/>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/> <filter string="Object" icon="terp-stage" domain="[]" context="{'group_by':'model'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
</group> </group>
</search> </search>
@ -954,14 +921,14 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Attachments"> <form string="Attachments">
<group colspan="4" col="2"> <group colspan="4" col="4">
<field name="name" select="1" /> <field name="name" select="1" />
<field name="type"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Attachment"> <page string="Attachment">
<group col="4" colspan="4"> <group col="4" colspan="4">
<separator string="Data" colspan="2"/> <separator string="Data" colspan="4"/>
<field name="type"/>
<newline /> <newline />
<group col="2" colspan="4" attrs="{'invisible':[('type','=','url')]}"> <group col="2" colspan="4" attrs="{'invisible':[('type','=','url')]}">
<field name="datas" filename="datas_fname"/> <field name="datas" filename="datas_fname"/>
@ -1010,13 +977,21 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Attachments"> <search string="Attachments">
<group colspan="4" col="10"> <group colspan="4" col="10">
<filter icon="terp-stage"
string="URL"
domain="[('type','=','url')]"/>
<filter icon="terp-stock_align_left_24"
string="Binary"
domain="[('type','=','binary')]"/>
<separator orientation="vertical"/>
<field name="name"/> <field name="name"/>
<field name="datas_fname"/>
<field name="type"/> <field name="type"/>
<field name="datas_fname"/>
</group> </group>
<newline/> <newline/>
<group expand="0" string="Group By" colspan="4"> <group expand="0" string="Group By...">
<filter string="File Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Creator" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
<filter string="Date" icon="terp-calendar" domain="[]" context="{'group_by':'create_date'}"/>
</group> </group>
</search> </search>
</field> </field>
@ -1182,7 +1157,7 @@
<field name="translate"/> <field name="translate"/>
<field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/> <field name="on_delete" attrs="{'readonly': [('ttype','!=','many2one')]}"/>
</group> </group>
<separator string="Security on Groups" colspan="4"/> <separator string="Groups" colspan="4"/>
<field name="groups" colspan="4" nolabel="1"/> <field name="groups" colspan="4" nolabel="1"/>
</form> </form>
</field> </field>
@ -1235,18 +1210,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Model Description"> <search string="Model Description">
<filter icon="terp-camera_test" string="In Memory"
domain="[('osv_memory', '=', True)]" />
<separator orientation="vertical" />
<filter icon="terp-stock_symbol-selection"
string="Custom" domain="[('state', '=', 'manual')]" />
<separator orientation="vertical" />
<filter icon="terp-stock_align_left_24" string="Base"
domain="[('state', '=', 'base')]" />
<separator orientation="vertical" />
<field name="name"/> <field name="name"/>
<field name="model"/> <field name="model"/>
<newline/> <field name="osv_memory"/>
<field name="state"/>
<field name="access_ids"/>
<field name="info"/>
</search> </search>
</field> </field>
</record> </record>
@ -1258,12 +1227,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Fields"> <form string="Fields">
<group colspan="4" col="6"> <group colspan="4" col="4">
<field name="name" select="1" /> <field name="name" select="1"/>
<field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/> <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
<field name="field_description"/> <field name="field_description"/>
<field name="state"/> <field name="state"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Properties"> <page string="Properties">
<group colspan="2" col="2"> <group colspan="2" col="2">
@ -1313,29 +1282,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Fields"> <search string="Fields">
<filter icon="terp-camera_test"
string="Required"
domain="[('required', '=', True)]"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_align_left_24"
string="Readonly"
domain="[('readonly', '=', True)]"/>
<separator orientation="vertical"/>
<filter icon="terp-translate"
string="Translate"
domain="[('translate', '=', True)]"/>
<newline/>
<field name="name"/> <field name="name"/>
<field name="field_description"/> <field name="field_description"/>
<field name="model_id"/> <field name="model_id"/>
<field name="ttype"/> <field name="ttype"/>
<field name="required"/> <field name="required"/>
<field name="readonly"/> <field name="readonly"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -1378,10 +1330,6 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Module Data"> <search string="Module Data">
<filter icon="terp-stock_effects-object-colorize"
string="Updatable"
domain="[('noupdate', '=', False)]"/>
<separator orientation="vertical"/>
<field name="module"/> <field name="module"/>
<field name="name"/> <field name="name"/>
<field name="model"/> <field name="model"/>
@ -1389,8 +1337,8 @@
<field name="noupdate"/> <field name="noupdate"/>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/> <filter string="Module" icon="terp-stage" domain="[]" context="{'group_by':'module'}"/>
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/> <filter string="Object" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'model'}"/>
</group> </group>
</search> </search>
</field> </field>
@ -1433,7 +1381,7 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Translations"> <search string="Translations">
<filter icon="terp-project" <filter icon="terp-document-new"
string="Untranslated" string="Untranslated"
domain="['|',('value', '=', False),('value','=','')]"/> domain="['|',('value', '=', False),('value','=','')]"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
@ -1454,16 +1402,15 @@
<field name="type"/> <field name="type"/>
<field name="name"/> <field name="name"/>
<field name="res_id"/> <field name="res_id"/>
<group colspan="4" col="4"> <group colspan="2" col="2">
<group colspan="2" col="2"> <separator string="Source Term" colspan="2"/>
<separator string="Source Term" colspan="2"/> <field name="src" nolabel="1" height="400"/>
<field name="src" nolabel="1" height="400"/>
</group>
<group colspan="2" col="2">
<separator string="Tranlsation Term" colspan="2"/>
<field name="value" nolabel="1" height="400"/>
</group>
</group> </group>
<group colspan="2" col="2">
<separator string="Tranlsation" colspan="2"/>
<field name="value" nolabel="1" height="400"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -1488,7 +1435,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="view_translation_tree"/> <field name="view_id" ref="view_translation_tree"/>
</record> </record>
<menuitem action="action_translation" id="menu_action_translation" parent="base.menu_translation_app"/> <menuitem action="action_translation" id="menu_action_translation" parent="base.menu_translation_app" />
<!-- <!--
============================================================= =============================================================
@ -1548,7 +1495,7 @@
<field name="icon_pict" widget="picture" nolabel="1" colspan="2"/> <field name="icon_pict" widget="picture" nolabel="1" colspan="2"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Security on Groups"> <page string="Groups">
<field name="groups_id" colspan="4" nolabel="1"/> <field name="groups_id" colspan="4" nolabel="1"/>
</page> </page>
</notebook> </notebook>
@ -1569,13 +1516,13 @@
</record> </record>
<record id="grant_menu_access" model="ir.actions.act_window"> <record id="grant_menu_access" model="ir.actions.act_window">
<field name="name">Manage Menus</field> <field name="name">Menu Items</field>
<field name="res_model">ir.ui.menu</field> <field name="res_model">ir.ui.menu</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="edit_menu"/> <field name="view_id" ref="edit_menu"/>
<field name="search_view_id" ref="edit_menu_access_search"/> <field name="search_view_id" ref="edit_menu_access_search"/>
</record> </record>
<menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.menu_security" sequence="1"/> <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.next_id_2" sequence="1"/>
<!-- <!--
============================================================= =============================================================
@ -1622,8 +1569,7 @@
<separator string="Action to Trigger" colspan="4"/> <separator string="Action to Trigger" colspan="4"/>
<field name="model" groups="base.group_extended"/> <field name="model" groups="base.group_extended"/>
<field name="function"/> <field name="function"/>
<separator string="Arguments" colspan="4"/> <field colspan="4" name="args"/>
<field colspan="4" name="args" nolabel="1"/>
</page> </page>
</notebook> </notebook>
</form> </form>
@ -1642,8 +1588,8 @@
<field name="active"/> <field name="active"/>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="User" icon="terp-personal-" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Execution" icon="terp-go-month" <filter string="Next Call" icon="terp-go-month"
domain="[]" context="{'group_by':'nextcall'}" /> domain="[]" context="{'group_by':'nextcall'}" />
</group> </group>
</search> </search>
@ -1698,14 +1644,18 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Access Controls"> <form string="Access Controls">
<field colspan="4" name="name"/> <group col="6" colspan="4">
<field name="model_id"/> <field name="name"/>
<field name="group_id"/> <field name="model_id"/>
<newline/> <field name="group_id"/>
<field name="perm_read"/> </group>
<field name="perm_write"/> <separator string="Access" colspan="4"/>
<field name="perm_create"/> <group col="4" colspan="4">
<field name="perm_unlink"/> <field name="perm_read"/>
<field name="perm_write"/>
<field name="perm_create"/>
<field name="perm_unlink"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -1715,9 +1665,22 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Access Controls"> <search string="Access Controls">
<field name="name"/> <group>
<field name="model_id"/> <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
<field name="group_id"/> <separator orientation="vertical"/>
<filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
<filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True),('perm_write','=',False),('perm_create','=',False),('perm_unlink','=',False)]"/>
<filter string="Write Access" icon="terp-tools" domain="[('perm_read','=',False),('perm_write','=',True),('perm_create','=',False),('perm_unlink','=',False)]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="model_id"/>
<field name="group_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
<filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -1729,8 +1692,7 @@
<field name="view_id" ref="ir_access_view_tree"/> <field name="view_id" ref="ir_access_view_tree"/>
<field name="search_view_id" ref="ir_access_view_search"/> <field name="search_view_id" ref="ir_access_view_search"/>
</record> </record>
<menuitem name="Access Controls" id="menu_security_access" parent="menu_security" sequence="5"/> <menuitem action="ir_access_act" id="menu_ir_access_act" parent="base.menu_security"/>
<menuitem action="ir_access_act" id="menu_ir_access_act" parent="menu_security_access"/>
<!-- Rules --> <!-- Rules -->
@ -1796,9 +1758,21 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Record rules"> <search string="Record rules">
<field name="model_id"/> <group>
<field name="global"/> <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
<field name="groups"/> <separator orientation="vertical"/>
<filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
<filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True),('perm_write','=',False),('perm_create','=',False),('perm_unlink','=',False)]"/>
<filter string="Write Access" icon="terp-tools" domain="[('perm_read','=',False),('perm_write','=',True),('perm_create','=',False),('perm_unlink','=',False)]"/>
<separator orientation="vertical"/>
<field name="model_id"/>
<field name="global"/>
<field name="groups"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
</search> </search>
</field> </field>
</record> </record>
@ -1943,15 +1917,7 @@
<field name="search_view_id" ref="view_server_action_search"/> <field name="search_view_id" ref="view_server_action_search"/>
<field name="context">{'key':'server_action'}</field> <field name="context">{'key':'server_action'}</field>
</record> </record>
<menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/> <menuitem action="action_server_action" id="menu_server_action" parent="base.menu_custom_action"/>
<record model="ir.actions.act_window" id="action_model_grid_security">
<field name="name">Access Controls Grid</field>
<field name="res_model">ir.model.grid</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_model_grid_security" id="menu_ir_access_grid" parent="menu_security_access"/>
<record id="ir_actions_todo_tree" model="ir.ui.view"> <record id="ir_actions_todo_tree" model="ir.ui.view">
<field name="model">ir.actions.todo</field> <field name="model">ir.actions.todo</field>
@ -1961,10 +1927,11 @@
<tree editable="bottom" string="Config Wizard Steps"> <tree editable="bottom" string="Config Wizard Steps">
<field name="sequence"/> <field name="sequence"/>
<field name="action_id"/> <field name="action_id"/>
<field name="restart"/>
<field name="state" readonly="1"/> <field name="state" readonly="1"/>
<button name="action_open" states="cancel,skip,done" string="Set as todo" type="object" icon="gtk-convert"/> <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch Configuration Wizard"/>
<button name="action_launch" states="open" string="Launch this wizard" type="object" icon="gtk-execute"/> <button name="action_open" states="cancel,skip,done"
string="Todo" type="object" help="Set as Todo"
icon="gtk-convert"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -1984,8 +1951,10 @@
<field name="groups_id" nolabel="1" colspan="4"/> <field name="groups_id" nolabel="1" colspan="4"/>
<group colspan="4" col="4"> <group colspan="4" col="4">
<field name="state" colspan="2" readonly="1"/> <field name="state" colspan="2" readonly="1"/>
<button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch this wizard"/> <button name="action_launch" states="open" string="Launch" type="object" icon="gtk-execute" help="Launch Configuration Wizard"/>
<button name="action_open" states="cancel,skip,done" string="Set as todo" type="object" icon="gtk-convert"/> <button name="action_open" states="cancel,skip,done"
string="Set as Todo" type="object"
icon="gtk-convert"/>
</group> </group>
</form> </form>
</field> </field>
@ -1999,8 +1968,8 @@
<search string="Search Actions"> <search string="Search Actions">
<filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/> <filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="state"/> <field name="state"/>
<field name="restart"/> <field name="restart"/>
</search> </search>
</field> </field>
</record> </record>
@ -2013,8 +1982,14 @@
</record> </record>
<menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/> <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
<wizard id="wizard_configuration" model="ir.module.module" name="module.configuration" string="Start Configuration"/>
<menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form" <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
parent="next_id_11" groups="base.group_extended" sequence="20"/> parent="next_id_11" groups="base.group_extended" sequence="20"/>
<menuitem
action="wizard_configuration" name="Start Configuration"
id="menu_configurator_module" parent="next_id_11"
type="wizard"/>
</data> </data>
</openerp> </openerp>

1
bin/addons/base/ir/ir_model.py
View File

@ -63,6 +63,7 @@ class ir_model(osv.osv):
is_osv_mem = self._is_osv_memory(cr, uid, all_model_ids, 'osv_memory', arg=None, context=context) is_osv_mem = self._is_osv_memory(cr, uid, all_model_ids, 'osv_memory', arg=None, context=context)
return [('id', 'in', [id for id in is_osv_mem if bool(is_osv_mem[id]) == value])] return [('id', 'in', [id for id in is_osv_mem if bool(is_osv_mem[id]) == value])]
_columns = { _columns = {
'name': fields.char('Object Name', size=64, translate=True, required=True), 'name': fields.char('Object Name', size=64, translate=True, required=True),
'model': fields.char('Object', size=64, required=True, select=1), 'model': fields.char('Object', size=64, required=True, select=1),

12
bin/addons/base/maintenance/maintenance_view.xml
View File

@ -23,10 +23,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Maintenance Contract"> <form string="Maintenance Contract">
<separator string="Information" colspan="4"/> <separator string="Information" colspan="4"/>
<field name="name"/> <group col="6" colspan="4">
<newline/> <field name="name"/>
<field name="date_start"/> <field name="date_start"/>
<field name="date_stop"/> <field name="date_stop"/>
</group>
<separator string="Covered Modules" colspan="4"/> <separator string="Covered Modules" colspan="4"/>
<field name="module_ids" nolabel="1" colspan="4"> <field name="module_ids" nolabel="1" colspan="4">
<tree string="Covered Modules"> <tree string="Covered Modules">
@ -89,8 +90,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Add Maintenance Contract" col="2"> <form string="Add Maintenance Contract" col="2">
<image name="gtk-dialog-info" /> <group col="1">
<group col="1">
<separator string="Add Maintenance Contract" /> <separator string="Add Maintenance Contract" />
<group states="draft"> <group states="draft">
<field name="name" width="250" /> <field name="name" width="250" />

62
bin/addons/base/module/wizard/base_export_language_view.xml
View File

@ -7,38 +7,44 @@
<field name="model">base.language.export</field> <field name="model">base.language.export</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Export language"> <form string="Export Translation File">
<notebook> <group colspan="3">
<page string="Export Data"> <group colspan="1">
<group colspan="4" states="choose">
<separator colspan="4" string="Export translation file"/>
<field name="lang" required="1"/>
<field name="format" required="1"/>
<field height="200" name="modules" nolabel="1" colspan="4"/>
<field invisible="1" name="state"/>
</group>
<group colspan="4" states="get">
<separator string="Export done" colspan="4"/>
<field name="name" invisible="1" colspan="4"/>
<field name="data" nolabel="1" readonly="1" fieldname="name" colspan="4"/>
<field height="80" name="advice" nolabel="1" colspan="4"/>
</group>
<separator string="" colspan="4"/>
<group col="2" colspan="2">
</group>
<group col="2" colspan="2">
<button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Cancel" type="object"/>
<button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
<button icon="gtk-cancel" name="act_destroy" special="cancel" states="get" string="_Cancel" type="object"/>
</group>
</page>
<page string="Help">
<label align="0.0" colspan="4" string="The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."/> <label align="0.0" colspan="4" string="The official translations pack of all OpenERP/OpenObjects module are managed through launchpad. We use their online interface to synchronize all translations efforts."/>
<label align="0.0" colspan="4" string=""/>
<label align="0.0" colspan="4" string="To improve some terms of the official translations of OpenERP, you should modify the terms directly on the launchpad interface. If you made lots of translations for your own module, you can also publish all your translation at once."/> <label align="0.0" colspan="4" string="To improve some terms of the official translations of OpenERP, you should modify the terms directly on the launchpad interface. If you made lots of translations for your own module, you can also publish all your translation at once."/>
<label align="0.0" colspan="4" string=""/>
<label align="0.0" colspan="4" string="To browse official translations, you can visit this link: "/> <label align="0.0" colspan="4" string="To browse official translations, you can visit this link: "/>
<label align="0.0" colspan="4" string="https://translations.launchpad.net/openobject"/> <label align="0.0" colspan="4" string="https://translations.launchpad.net/openobject"/>
</page> </group>
</notebook> <group colspan="1">
<separator orientation="vertical" rowspan="15"/>
</group>
<group colspan="1">
<group colspan="4" states="choose">
<separator colspan="4" string="Export Translation File"/>
<field name="lang" required="1"/>
<field name="format" required="1"/>
<field height="200" name="modules" nolabel="1" colspan="4"/>
<field invisible="1" name="state"/>
</group>
<group colspan="4" states="get">
<separator string="Export done" colspan="4"/>
<field name="name" invisible="1" colspan="4"/>
<field name="data" nolabel="1" readonly="1" fieldname="name" colspan="4"/>
<field height="80" name="advice" nolabel="1" colspan="4"/>
</group>
<separator string="" colspan="4"/>
<group colspan="2" col="2">
</group>
<group col="2" colspan="2">
<button icon="gtk-cancel" name="act_cancel" special="cancel" states="choose" string="_Close" type="object"/>
<button icon="gtk-ok" name="act_getfile" states="choose" string="_Export" type="object"></button>
<button icon="gtk-close" name="act_destroy" special="cancel" states="get" string="_Close" type="object"/>
</group>
</group>
</group>
</form> </form>
</field> </field>
</record> </record>

32
bin/addons/base/module/wizard/base_import_language_view.xml
View File

@ -7,11 +7,21 @@
<field name="model">base.language.import</field> <field name="model">base.language.import</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Import language"> <form string="Import Translation File">
<notebook colspan="4"> <group colspan="3">
<page string="Import Data"> <group colspan="1">
<label string="You have to import a .CSV file which is encoded in UTF-8."/>
<label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
<label string="type,name,res_id,src,value" colspan="4"/>
<label string="module,type,name,res_id,src,value" colspan="4"/>
<label string="You can also import .po files." colspan="4" align="0.0"/>
</group>
<group colspan="1">
<separator orientation="vertical" rowspan="8"/>
</group>
<group colspan="1">
<group colspan="4" col="4"> <group colspan="4" col="4">
<separator string="Import New Language" colspan="4"/> <separator string="Import Translation File" colspan="4"/>
<field name="name" width="200"/> <field name="name" width="200"/>
<field name="code"/> <field name="code"/>
<field name="data" colspan="4"/> <field name="data" colspan="4"/>
@ -20,19 +30,11 @@
<group colspan="2" col="2"> <group colspan="2" col="2">
</group> </group>
<group colspan="2" col="2"> <group colspan="2" col="2">
<button special="cancel" string="_Cancel" icon="gtk-cancel"/> <button special="cancel" string="_Close" icon="gtk-cancel"/>
<button name="import_lang" string="_Import" type="object" icon="gtk-ok"/> <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
</group> </group>
</page> </group>
<page string="Help"> </group>
<label string="You have to import a .CSV file which is encoded in UTF-8."/>
<label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
<label string="type,name,res_id,src,value" colspan="4"/>
<label string="module,type,name,res_id,src,value" colspan="4"/>
<label string="You can also import .po files." colspan="4" align="0.0"/>
</page>
</notebook>
</form> </form>
</field> </field>
</record> </record>

4
bin/addons/base/module/wizard/base_module_upgrade.py
View File

@ -39,7 +39,7 @@ class base_module_upgrade(osv.osv_memory):
@param self: The object pointer. @param self: The object pointer.
@param cr: A database cursor @param cr: A database cursor
@param uid: ID of the user currently logged in @param uid: ID of the user currently logged in
@param context: A standard dictionary @param context: A standard dictionary
@return: New arch of view. @return: New arch of view.
""" """
res = super(base_module_upgrade, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False) res = super(base_module_upgrade, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
@ -50,7 +50,7 @@ class base_module_upgrade(osv.osv_memory):
ids = self.get_module_list(cr, uid, context=context) ids = self.get_module_list(cr, uid, context=context)
if not ids: if not ids:
res['arch'] = '''<form string="System update done"> res['arch'] = '''<form string="Apply Scheduled Upgrades">
<separator string="System update completed" colspan="4"/> <separator string="System update completed" colspan="4"/>
<label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/> <label align="0.0" string="The selected modules have been updated / installed !" colspan="4"/>
<label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/> <label align="0.0" string="We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)." colspan="4"/>

5
bin/addons/base/res/res_log_view.xml
View File

@ -33,9 +33,8 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Logs"> <form string="Logs">
<field name="name" colspan="3"/> <field name="name"/>
<newline/> <group colspan="4" col="8">
<group colspan="4" col="8">
<field name="user_id" /> <field name="user_id" />
<field name="res_model"/> <field name="res_model"/>
<field name="res_id"/> <field name="res_id"/>

2
bin/addons/base/security/ir.model.access.csv
View File

@ -8,12 +8,10 @@
"access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,1,1,1 "access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,1,1,1
"access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1 "access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1
"access_ir_model_access_group_erp_manager","ir_model_access_group_erp_manager","model_ir_model_access","group_erp_manager",1,1,1,1 "access_ir_model_access_group_erp_manager","ir_model_access_group_erp_manager","model_ir_model_access","group_erp_manager",1,1,1,1
"access_ir_model_grid_group_erp_manager","ir_model_access_grid_group_erp_manager","model_ir_model_grid","group_erp_manager",1,1,1,1
"access_ir_model_data_group_erp_manager","ir_model_data group_erp_manager","model_ir_model_data","group_erp_manager",1,1,1,1 "access_ir_model_data_group_erp_manager","ir_model_data group_erp_manager","model_ir_model_data","group_erp_manager",1,1,1,1
"access_ir_model_fields_group_erp_manager","ir_model_fields group_erp_manager","model_ir_model_fields","group_erp_manager",1,1,1,1 "access_ir_model_fields_group_erp_manager","ir_model_fields group_erp_manager","model_ir_model_fields","group_erp_manager",1,1,1,1
"access_ir_model_all","ir_model_all","model_ir_model",,1,0,0,0 "access_ir_model_all","ir_model_all","model_ir_model",,1,0,0,0
"access_ir_model_access_all","ir_model_access_all","model_ir_model_access",,1,0,0,0 "access_ir_model_access_all","ir_model_access_all","model_ir_model_access",,1,0,0,0
"access_ir_model_grid_all","ir_model_access_grid_all","model_ir_model_grid",,0,0,0,0
"access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0 "access_ir_model_data_all","ir_model_data all","model_ir_model_data",,1,0,0,0
"access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0 "access_ir_model_fields_all","ir_model_fields all","model_ir_model_fields",,1,0,0,0
"access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category","group_system",1,0,0,0 "access_ir_module_category_group_user","ir_module_category group_user","model_ir_module_category","group_system",1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
8 access_ir_exports_line_group_system ir_exports_line group_system model_ir_exports_line base.group_user 1 1 1 1
9 access_ir_model_group_erp_manager ir_model group_erp_manager model_ir_model group_erp_manager 1 1 1 1
10 access_ir_model_access_group_erp_manager ir_model_access_group_erp_manager model_ir_model_access group_erp_manager 1 1 1 1
access_ir_model_grid_group_erp_manager ir_model_access_grid_group_erp_manager model_ir_model_grid group_erp_manager 1 1 1 1
11 access_ir_model_data_group_erp_manager ir_model_data group_erp_manager model_ir_model_data group_erp_manager 1 1 1 1
12 access_ir_model_fields_group_erp_manager ir_model_fields group_erp_manager model_ir_model_fields group_erp_manager 1 1 1 1
13 access_ir_model_all ir_model_all model_ir_model 1 0 0 0
14 access_ir_model_access_all ir_model_access_all model_ir_model_access 1 0 0 0
access_ir_model_grid_all ir_model_access_grid_all model_ir_model_grid 0 0 0 0
15 access_ir_model_data_all ir_model_data all model_ir_model_data 1 0 0 0
16 access_ir_model_fields_all ir_model_fields all model_ir_model_fields 1 0 0 0
17 access_ir_module_category_group_user ir_module_category group_user model_ir_module_category group_system 1 0 0 0