[MERGE] lp:~openerp-dev/openobject-server/trunk-addons-issues3-base-base_imp-pna

bzr revid: stw@openerp.com-20120802074417-ldc41m3bgdefxnj3
This commit is contained in:
Stephane Wirtel 2012-08-02 09:44:17 +02:00
commit 66d44c11e1
2 changed files with 6 additions and 6 deletions

View File

@ -41,7 +41,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search modules">
<field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Module"/>
<field name="description" string="Keywords" filter_domain="['|', ('description', 'ilike', self), ('summary', 'ilike', self)]"/>
<filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
<filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
@ -127,7 +127,7 @@
<group>
<group>
<field name="author"/>
<field name="website" widget="url"/>
<field name="website" widget="url" attrs="{'invisible':[('website','=',False)]}"/>
<field name="category_id" widget="selection"/>
</group>
<group>
@ -140,12 +140,14 @@
<page string="Description">
<field name="description"/>
</page>
<page string="Technical Data">
<page string="Technical Data" groups="base.group_no_one">
<group col="4">
<field name="demo"/>
<field name="application"/>
<field name="state"/>
</group>
<label for="views_by_module" string="Created Views"/>
<field name="views_by_module"/>
<label for="dependencies_id"/>
<field name="dependencies_id">
<tree string="Dependencies">
@ -157,8 +159,6 @@
<page string="Features" attrs="{'invisible':[('state','!=','installed')]}">
<label for="menus_by_module" string="Created Menus"/>
<field name="menus_by_module"/>
<label for="views_by_module" string="Created Views"/>
<field name="views_by_module"/>
<label for="reports_by_module" string="Defined Reports"/>
<field name="reports_by_module"/>
</page>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="menu_publisher_warranty" name="OpenERP Entreprise" parent="base.menu_administration" sequence="5"
<menuitem id="menu_publisher_warranty" name="OpenERP Enterprise" parent="base.menu_administration" sequence="5"
groups="base.group_no_one"/>
<record id="publisher_warranty_contract_tree_view" model="ir.ui.view">