diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-07-09 21:12:53 +0300 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-07-09 21:12:53 +0300 |
| commit | 2d64ce69d07a55f827548e43cfcc73cd459dc39a (patch) | |
| tree | b217b2afe155395280d27a4c6cc0c43c89396c3b /bin/addons/base_setup/base_setup_data.xml | |
| parent | cb5e80507f5a8330ed4e0f2526343b97f8d506e6 (diff) | |
| parent | a2db1c09ba3a279a8d791c8914a19d2f0dbb2c18 (diff) | |
Merge origin/master into mdv-gpl3-py26
Conflicts:
bin/addons/base_setup/i18n/base_setup.pot
bin/openerp-server.py
bin/report/preprocess.py
bin/report/report_sxw.py
bin/tools/translate.py
bzr revid: p_christ@hol.gr-20090709181253-fu8nxy9b3ykrrd1c
Diffstat (limited to 'bin/addons/base_setup/base_setup_data.xml')
| -rw-r--r-- | bin/addons/base_setup/base_setup_data.xml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/bin/addons/base_setup/base_setup_data.xml b/bin/addons/base_setup/base_setup_data.xml deleted file mode 100644 index c715dbb6992..00000000000 --- a/bin/addons/base_setup/base_setup_data.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<openerp> - <data noupdate="1"> - - <record id="action_wizard_setup" model="ir.actions.wizard"> - <field name="name">Setup</field> - <field name="type">ir.actions.wizard</field> - <field name="wiz_name">base_setup.base_setup</field> - </record> - - <record id="base.user_root" model="res.users"> - <field name="action_id" ref="action_wizard_setup"/> - <field name="menu_id" ref="action_wizard_setup"/> - </record> - - </data> -</openerp> |