diff options
| author | DBR (OpenERP) <dbr@tinyerp.com> | 2012-07-02 15:19:00 +0530 |
|---|---|---|
| committer | DBR (OpenERP) <dbr@tinyerp.com> | 2012-07-02 15:19:00 +0530 |
| commit | 3c162d0575e9ee1da88e4bb8e4c500aed0a3c27a (patch) | |
| tree | 45f1925c2eac86da0904823a761a644bf77fc0cb /addons/document | |
| parent | 34636c3d4b27f7ba4923a3895f5d7aa5565ce256 (diff) | |
| parent | 9c9141cc65892d2fc28f0b26bbd2acd40fff69c4 (diff) | |
[Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20120702094900-x21fcj4p1yn2tjs8
Diffstat (limited to 'addons/document')
| -rw-r--r-- | addons/document/custom_report.xml | 6 | ||||
| -rw-r--r-- | addons/document/document_view.xml | 4 | ||||
| -rw-r--r-- | addons/document/report/document_report_view.xml | 16 | ||||
| -rw-r--r-- | addons/document/wizard/document_configuration_view.xml | 1 |
4 files changed, 10 insertions, 17 deletions
diff --git a/addons/document/custom_report.xml b/addons/document/custom_report.xml deleted file mode 100644 index ebfe70e4c50..00000000000 --- a/addons/document/custom_report.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<openerp> - <data> - - </data> -</openerp> diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index da4b6c2284d..6fb99d936d4 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -93,7 +93,7 @@ </group> <group col="4"> <field name="ressource_parent_type_id"/> - <field name="ressource_id" select="2" readonly="1"/> + <field name="ressource_id" readonly="1"/> </group> <group col="2" attrs="{'invisible': [('type','!=','ressource'),('ressource_parent_type_id','=',False)]}"> <field name="resource_find_all"/> @@ -421,7 +421,7 @@ <act_window domain="[('parent_id', '=', active_id)]" context="{'default_parent_id': active_id}" - id="zoom_directory" name="Related Documents" + id="zoom_directory" name="Related Documents" res_model="ir.attachment" src_model="document.directory"/> </data> diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index e688707086a..98016d2fee2 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -7,10 +7,10 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Files"> - <field name="name" select="1"/> - <field name="user" select="1"/> - <field name="directory" select="1"/> - <field name="datas_fname" select="1"/> + <field name="name"/> + <field name="user"/> + <field name="directory"/> + <field name="datas_fname"/> <field name="file_size"/> <field name="create_date"/> </form> @@ -24,10 +24,10 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Files"> - <field name="name" select="1"/> - <field name="month" select="1"/> - <field name="user" select="1" invisible="1"/> - <field name="directory" select="1" invisible="1"/> + <field name="name"/> + <field name="month"/> + <field name="user" invisible="1"/> + <field name="directory" invisible="1"/> <field name="file_size" invisible="1"/> <field name="create_date" invisible="1"/> <field name="nbr"/> diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml index 4a2f131d42a..d924e471aca 100644 --- a/addons/document/wizard/document_configuration_view.xml +++ b/addons/document/wizard/document_configuration_view.xml @@ -16,7 +16,6 @@ <label align="0.0" string="When executing this wizard, it will configure your directories automatically according to modules installed."/> </group> </group> - <xpath expr="//button[@name='action_skip']" position="replace"/> </data> </field> </record> |