diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-06-08 01:28:03 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-06-08 01:28:03 +0200 |
| commit | 9c8aa2cb967a0ffd3d468604672e4ee2020fc558 (patch) | |
| tree | d87a94ce3258d74b23f7269d3fbc7825b5a3f9ab | |
| parent | eb7b8c8fcb342377fc4f8f3c1884116157e17ad8 (diff) | |
remove unsed cruft
bzr revid: al@openerp.com-20120607232803-5263vpe6io9hm5h2
| -rw-r--r-- | addons/document/README.txt | 8 | ||||
| -rw-r--r-- | addons/document/__openerp__.py | 4 | ||||
| -rw-r--r-- | addons/document/board_document_demo.xml | 17 | ||||
| -rw-r--r-- | addons/document/custom_report.xml | 6 | ||||
| -rw-r--r-- | addons/document/custom_view.xml | 14 | ||||
| -rw-r--r-- | addons/document/dict_tools.py | 59 | ||||
| -rw-r--r-- | addons/document/document_demo.xml | 1 |
7 files changed, 3 insertions, 106 deletions
diff --git a/addons/document/README.txt b/addons/document/README.txt deleted file mode 100644 index 34887026aeb..00000000000 --- a/addons/document/README.txt +++ /dev/null @@ -1,8 +0,0 @@ -To be done: ------------ - -* Test to not create several times the same file / directory - -> May be put a sql_constraints uniq on several files - -> test through remove or put - -* Retest everything diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py index d8e42703efc..f518dac9903 100644 --- a/addons/document/__openerp__.py +++ b/addons/document/__openerp__.py @@ -55,7 +55,9 @@ ATTENTION: 'report/document_report_view.xml', 'board_document_view.xml', ], - 'demo_xml': [ 'document_demo.xml','board_document_demo.xml'], + 'demo_xml': [ + 'document_demo.xml', + ], 'test': [ 'test/document_test2.yml', ], diff --git a/addons/document/board_document_demo.xml b/addons/document/board_document_demo.xml deleted file mode 100644 index 672fb5cb268..00000000000 --- a/addons/document/board_document_demo.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<openerp> - <data noupdate="1"> - - <!-- - Administrator shortcut - Demo user startup menu - --> - <!-- <record model="ir.ui.view_sc" id="sc_document_dash"> - <field name="name">Documents dashboard</field> - <field name="user_id" ref="base.user_root"/> - <field name="resource">ir.ui.menu</field> - <field name="sequence">1</field> - <field name="res_id" ref="menu_board_document_manager"/> - </record> --> - </data> - </openerp> 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/custom_view.xml b/addons/document/custom_view.xml deleted file mode 100644 index 45c4b337d99..00000000000 --- a/addons/document/custom_view.xml +++ /dev/null @@ -1,14 +0,0 @@ -<openerp> -<data> - <record model="res.groups" id="group_compta_user"> - <field name="name">grcompta</field> - <field name="users" eval="[(4, ref('base.user_root'))]"/> - </record> - <record model="res.groups" id="group_compta_admin"> - <field name="name">grcomptaadmin</field> - <field name="users" eval="[(4, ref('base.user_root'))]"/> - </record> - <menuitem name="Administration" groups="admin,grcomptaadmin" icon="terp-stock" id="menu_admin_compta"/> -</data> -</openerp> - diff --git a/addons/document/dict_tools.py b/addons/document/dict_tools.py deleted file mode 100644 index e117b429f83..00000000000 --- a/addons/document/dict_tools.py +++ /dev/null @@ -1,59 +0,0 @@ -# -*- encoding: utf-8 -*- -# Copyright P. Christeas <p_christ@hol.gr> 2008-2010 -# Copyright 2010 OpenERP SA. http://www.openerp.com -# -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License -# as published by the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# 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. -############################################################################### - - -def dict_merge(*dicts): - """ Return a dict with all values of dicts - """ - res = {} - for d in dicts: - res.update(d) - return res - -def dict_merge2(*dicts): - """ Return a dict with all values of dicts. - If some key appears twice and contains iterable objects, the values - are merged (instead of overwritten). - """ - res = {} - for d in dicts: - for k in d.keys(): - if k in res and isinstance(res[k], (list, tuple)): - res[k] = res[k] + d[k] - elif k in res and isinstance(res[k], dict): - res[k].update(d[k]) - else: - res[k] = d[k] - return res - -def dict_filter(srcdic, keys, res=None): - ''' Return a copy of srcdic that has only keys set. - If any of keys are missing from srcdic, the result won't have them, - either. - @param res If given, result will be updated there, instead of a new dict. - ''' - if res is None: - res = {} - for k in keys: - if k in srcdic: - res[k] = srcdic[k] - return res - -#eof - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/document_demo.xml b/addons/document/document_demo.xml index b94048ec13c..fda125afb95 100644 --- a/addons/document/document_demo.xml +++ b/addons/document/document_demo.xml @@ -4,6 +4,5 @@ <record id="base.user_demo" model="res.users"> <field eval="[(4, ref('base.group_document_user'))]" name="groups_id"/> </record> - </data> </openerp> |
