diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-08-14 17:26:34 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-08-14 17:26:34 +0200 |
| commit | aac03b547ddf71f064b2ee55e1a401c03f850372 (patch) | |
| tree | 2c4ef01d16a7073f16bca21a11c3e1038b81a581 /addons/document_ftp/wizard | |
| parent | a381c0adce6ff6a6db3ca34d24cd13a65f5d1a39 (diff) | |
| parent | caa053c252d29a31bf7f4300d7b47860fdba9f1e (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120814152634-ix63oxwcyrfkku4t
Diffstat (limited to 'addons/document_ftp/wizard')
| -rw-r--r-- | addons/document_ftp/wizard/ftp_browse_view.xml | 1 | ||||
| -rw-r--r-- | addons/document_ftp/wizard/ftp_configuration_view.xml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml index 52f012a92ff..c1613b29a70 100644 --- a/addons/document_ftp/wizard/ftp_browse_view.xml +++ b/addons/document_ftp/wizard/ftp_browse_view.xml @@ -4,7 +4,6 @@ <record id="ftp_browse_form" model="ir.ui.view"> <field name="name">Document FTP Browse</field> <field name="model">document.ftp.browse</field> - <field name="type">form</field> <field name="arch" type="xml"> <form string="Browse Document" version="7.0"> <group> diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml index 95528b75594..36fb80c51af 100644 --- a/addons/document_ftp/wizard/ftp_configuration_view.xml +++ b/addons/document_ftp/wizard/ftp_configuration_view.xml @@ -11,7 +11,6 @@ <record id="view_auto_config_form" model="ir.ui.view"> <field name="name">FTP Server Configuration</field> <field name="model">document.ftp.configuration</field> - <field name="type">form</field> <field name="inherit_id" ref="base.res_config_view_base"/> <field name="arch" type="xml"> <data> |