diff options
| author | sgo@tinyerp.com <> | 2013-06-05 12:49:05 +0530 |
|---|---|---|
| committer | sgo@tinyerp.com <> | 2013-06-05 12:49:05 +0530 |
| commit | 6a3cdf718ce4f9bd2749bb75993cdbcfd86d3eb2 (patch) | |
| tree | 075af0421f75fd36ca9f5cd44551e58ffc73460a /addons/document_webdav | |
| parent | 143b485baf8adb7936d7784e314ccd405d1b8c14 (diff) | |
| parent | 5cc8c30adfeccc6db22ebf7487b8e4ebdbe10423 (diff) | |
[MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130605071905-o2ldzc6vxqnoe099
Diffstat (limited to 'addons/document_webdav')
| -rw-r--r-- | addons/document_webdav/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/document_webdav/test_davclient.py | 3 | ||||
| -rw-r--r-- | addons/document_webdav/webdav_server.py | 2 | ||||
| -rw-r--r-- | addons/document_webdav/webdav_setup.xml | 13 |
4 files changed, 9 insertions, 11 deletions
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py index ec112ec7c38..befb87829ed 100644 --- a/addons/document_webdav/__openerp__.py +++ b/addons/document_webdav/__openerp__.py @@ -24,7 +24,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################## diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py index 058dc1c748d..f3a8b35b582 100644 --- a/addons/document_webdav/test_davclient.py +++ b/addons/document_webdav/test_davclient.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- encoding: utf-8 -*- # # Copyright P. Christeas <p_christ@hol.gr> 2008,2009 @@ -24,7 +23,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################### """ A trivial HTTP/WebDAV client, used for testing the server diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py index f67de272e29..e495f5c9f2f 100644 --- a/addons/document_webdav/webdav_server.py +++ b/addons/document_webdav/webdav_server.py @@ -30,7 +30,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ############################################################################### diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml index d75c416a93e..dbf6bc8fbcc 100644 --- a/addons/document_webdav/webdav_setup.xml +++ b/addons/document_webdav/webdav_setup.xml @@ -1,4 +1,3 @@ -<?xml version="1.0"?> <openerp> <data noupdate="1"> <!--This file contains a typical setup of a WebDAV folders' structure, @@ -25,7 +24,7 @@ <field eval="0" name="ressource_tree"/> <field name="user_id" eval="False"/> <field name="company_id" ref="base.main_company"/> - <field model="document.directory" name="parent_id" ref="document_directory_principals0"/> + <field name="parent_id" ref="document_directory_principals0"/> <field name="type">directory</field> <field eval="[(6,0,[])]" name="group_ids"/> <field name="name">groups</field> @@ -36,7 +35,7 @@ <field eval="1" name="resource_find_all"/> <field eval="0" name="ressource_tree"/> <field name="company_id" ref="base.main_company"/> - <field model="document.directory" name="parent_id" ref="document_directory_principals0"/> + <field name="parent_id" ref="document_directory_principals0"/> <field name="type">directory</field> <field eval="[(6,0,[])]" name="group_ids"/> <field name="name">resources</field> @@ -48,7 +47,7 @@ <field name="user_id" eval="False"/> <field name="resource_field" ref="base.field_res_users_login"/> <field name="company_id" ref="base.main_company"/> - <field model="document.directory" name="parent_id" ref="document_directory_principals0"/> + <field name="parent_id" ref="document_directory_principals0"/> <field name="type">ressource</field> <field name="ressource_type_id" ref="base.model_res_users"/> <field eval="[(6,0,[])]" name="group_ids"/> @@ -61,7 +60,7 @@ <field name="user_id" eval="False"/> <field name="resource_field" ref="base.field_res_users_login"/> <field name="company_id" ref="base.main_company"/> - <field model="document.directory" name="parent_id" ref="document_directory_principals0"/> + <field name="parent_id" ref="document_directory_principals0"/> <field name="type">ressource</field> <field name="ressource_type_id" ref="base.model_res_users"/> <field eval="[(6,0,[])]" name="group_ids"/> @@ -72,7 +71,7 @@ <field eval="1" name="resource_find_all"/> <field eval="0" name="ressource_tree"/> <field name="company_id" ref="base.main_company"/> - <field model="document.directory" name="parent_id" ref="document_directory_principals0"/> + <field name="parent_id" ref="document_directory_principals0"/> <field name="type">directory</field> <field eval="[(6,0,[])]" name="group_ids"/> <field name="name">locations</field> @@ -91,4 +90,4 @@ </record> </data> -</openerp> +</openerp>
\ No newline at end of file |