pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Merge] with :lp:~openerp-commiter/openobject-addons/trunk-knowledge-view-imp-dbr-know-hsa

Browse Source 
bzr revid: dbr@tinyerp.com-20120627073718-dnv3nx8qkowzvecm
This commit is contained in:
DBR (OpenERP)
2012-06-27 13:07:18 +05:30
parent 5e764699c3 f09a9f673a
commit f2c0f2406e
3 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/document/document_view.xml
+37 -37
View File
@@ -241,45 +241,45 @@
<field name="arch" type="xml">
<form string="Documents" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<field name="parent_id"/>
<field name="user_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<notebook colspan="4">
<page string="Attachment">
<label for="name" class="oe_edit_only"/>
<h1>
<field name="name" class="oe_inline"/>
<field name="type" class="oe_inline oe_right"/>
</h1>
<label for="datas" class="oe_edit_only" attrs="{'invisible':[('type','=','url')]}"/>
<label for="url" class="oe_edit_only" attrs="{'invisible':[('type','=','binary')]}"/>
<h2>
<field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}" class="oe_inline"/>
<field name="datas_fname" invisible="1" attrs="{'invisible':[('type','=','url')]}" class="oe_inline oe_right"/>
<field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}" class="oe_inline"/>
</h2>
<group>
<group>
<group string="Data">
<field name="type"/>
<newline />
<field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
<field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
<field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
</group>
<group>
<field name="res_id" invisible="True"/>
<field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
<field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
<separator string="Related to" colspan="2"/>
<field name="partner_id"/>
</group>
<group groups="base.group_no_one" string="Created">
<field name="create_uid" readonly="1"/>
<field name="create_date" readonly="1"/>
</group>
<group groups="base.group_no_one" string="Modified">
<field name="write_uid" readonly="1"/>
<field name="write_date" readonly="1"/>
</group>
<field name="user_id"/>
<field name="parent_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="index_content" string="Tab Indexed Content"/>
</group>
</page>
<page string="Indexed Content - experimental" groups="base.group_no_one">
<field name="index_content"/>
</page>
<page string="Notes">
<field name="description"/>
</page>
<group>
<field name="res_id" invisible="True"/>
<field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
<field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
<field name="partner_id"/>
</group>
</group>
<notebook>
<page string="History">
<group>
<group groups="base.group_no_one" string="Created">
<field name="create_uid" readonly="1"/>
<field name="create_date" readonly="1"/>
</group>
<group groups="base.group_no_one" string="Modified">
<field name="write_uid" readonly="1"/>
<field name="write_date" readonly="1"/>
</group>
</group>
</page>
</notebook>
</sheet>
</form>
addons/document_ftp/wizard/ftp_browse_view.xml
-2
View File
@@ -9,9 +9,7 @@
<form string="Browse Document" version="7.0">
<header>
<button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok"/>
<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
</header>
<separator string="Browse Document"/>
<group>
<field name="url" widget="url"/>
</group>
addons/document_ftp/wizard/ftp_configuration_view.xml
+3 -1
View File
@@ -20,7 +20,9 @@
<group string="res_config_contents" position="replace">
<separator string="Configure FTP Server" />
<label string="Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself.."/>
<field name="host"/>
<group>
<field name="host"/>
</group>
</group>
<xpath expr="//button[@name='action_skip']" position="replace"/>
</data>