From e6db9e4b715150d3756d56ad2f1980770039b97f Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 28 Aug 2011 02:13:14 +0200 Subject: [PATCH] [IMP] renames in base/res bzr revid: al@openerp.com-20110828001314-roc7o38bz22mr580 --- openerp/addons/base/__openerp__.py | 24 ++++++------- openerp/addons/base/res/__init__.py | 13 +++++-- openerp/addons/base/res/partner/__init__.py | 34 ------------------- .../base/res/partner/partner_report.xml | 9 ----- .../base/res/{partner => }/report/__init__.py | 0 .../{partner => }/report/business_card.xml | 0 .../{partner => }/report/business_card.xsl | 0 .../{partner => }/report/partner_address.xml | 0 .../{partner => }/report/partner_address.xsl | 0 .../base/res/{partner/bank.py => res_bank.py} | 0 .../bank_view.xml => res_bank_view.xml} | 0 .../base/res/{country.py => res_country.py} | 0 ...{country_view.xml => res_country_view.xml} | 0 .../{partner/partner.py => res_partner.py} | 0 .../partner_data.xml => res_partner_data.xml} | 0 .../partner_demo.xml => res_partner_demo.xml} | 0 .../{partner/crm.py => res_partner_event.py} | 0 ...rm_view.xml => res_partner_event_view.xml} | 0 .../addons/base/res/res_partner_report.xml | 9 +++++ ...data.xml => res_partner_shortcut_data.xml} | 0 .../partner_view.xml => res_partner_view.xml} | 0 .../base/res/{partner => }/wizard/__init__.py | 0 .../{partner => }/wizard/partner_clear_ids.py | 0 .../wizard/partner_clear_ids_view.xml | 0 .../{partner => }/wizard/partner_sms_send.py | 0 .../wizard/partner_sms_send_view.xml | 0 .../wizard/partner_wizard_ean_check.py | 0 .../wizard/partner_wizard_ean_check_view.xml | 0 .../wizard/partner_wizard_spam.py | 0 .../wizard/partner_wizard_spam_view.xml | 0 30 files changed, 31 insertions(+), 58 deletions(-) delete mode 100644 openerp/addons/base/res/partner/__init__.py delete mode 100644 openerp/addons/base/res/partner/partner_report.xml rename openerp/addons/base/res/{partner => }/report/__init__.py (100%) rename openerp/addons/base/res/{partner => }/report/business_card.xml (100%) rename openerp/addons/base/res/{partner => }/report/business_card.xsl (100%) rename openerp/addons/base/res/{partner => }/report/partner_address.xml (100%) rename openerp/addons/base/res/{partner => }/report/partner_address.xsl (100%) rename openerp/addons/base/res/{partner/bank.py => res_bank.py} (100%) rename openerp/addons/base/res/{partner/bank_view.xml => res_bank_view.xml} (100%) rename openerp/addons/base/res/{country.py => res_country.py} (100%) rename openerp/addons/base/res/{country_view.xml => res_country_view.xml} (100%) rename openerp/addons/base/res/{partner/partner.py => res_partner.py} (100%) rename openerp/addons/base/res/{partner/partner_data.xml => res_partner_data.xml} (100%) rename openerp/addons/base/res/{partner/partner_demo.xml => res_partner_demo.xml} (100%) rename openerp/addons/base/res/{partner/crm.py => res_partner_event.py} (100%) rename openerp/addons/base/res/{partner/crm_view.xml => res_partner_event_view.xml} (100%) create mode 100644 openerp/addons/base/res/res_partner_report.xml rename openerp/addons/base/res/{partner/partner_shortcut_data.xml => res_partner_shortcut_data.xml} (100%) rename openerp/addons/base/res/{partner/partner_view.xml => res_partner_view.xml} (100%) rename openerp/addons/base/res/{partner => }/wizard/__init__.py (100%) rename openerp/addons/base/res/{partner => }/wizard/partner_clear_ids.py (100%) rename openerp/addons/base/res/{partner => }/wizard/partner_clear_ids_view.xml (100%) rename openerp/addons/base/res/{partner => }/wizard/partner_sms_send.py (100%) rename openerp/addons/base/res/{partner => }/wizard/partner_sms_send_view.xml (100%) rename openerp/addons/base/res/{partner => }/wizard/partner_wizard_ean_check.py (100%) rename openerp/addons/base/res/{partner => }/wizard/partner_wizard_ean_check_view.xml (100%) rename openerp/addons/base/res/{partner => }/wizard/partner_wizard_spam.py (100%) rename openerp/addons/base/res/{partner => }/wizard/partner_wizard_spam_view.xml (100%) diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py index d7c73930b5f..37f26edc177 100644 --- a/openerp/addons/base/__openerp__.py +++ b/openerp/addons/base/__openerp__.py @@ -59,18 +59,18 @@ 'res/res_request_view.xml', 'res/res_lang_view.xml', 'res/res_log_view.xml', - 'res/partner/partner_report.xml', - 'res/partner/partner_view.xml', - 'res/partner/partner_shortcut_data.xml', - 'res/partner/bank_view.xml', - 'res/country_view.xml', + 'res/res_partner_report.xml', + 'res/res_partner_view.xml', + 'res/res_partner_shortcut_data.xml', + 'res/res_bank_view.xml', + 'res/res_country_view.xml', 'res/res_currency_view.xml', - 'res/partner/crm_view.xml', - 'res/partner/wizard/partner_sms_send_view.xml', - 'res/partner/wizard/partner_wizard_spam_view.xml', - 'res/partner/wizard/partner_clear_ids_view.xml', - 'res/partner/wizard/partner_wizard_ean_check_view.xml', - 'res/partner/partner_data.xml', + 'res/res_partner_event_view.xml', + 'res/wizard/partner_sms_send_view.xml', + 'res/wizard/partner_wizard_spam_view.xml', + 'res/wizard/partner_clear_ids_view.xml', + 'res/wizard/partner_wizard_ean_check_view.xml', + 'res/res_partner_data.xml', 'res/ir_property_view.xml', 'security/base_security.xml', 'publisher_warranty/publisher_warranty_view.xml', @@ -81,7 +81,7 @@ ], 'demo_xml': [ 'base_demo.xml', - 'res/partner/partner_demo.xml', + 'res/res_partner_demo.xml', 'res/res_widget_demo.xml', ], 'test': [ diff --git a/openerp/addons/base/res/__init__.py b/openerp/addons/base/res/__init__.py index de00fc54153..9ce69f0c317 100644 --- a/openerp/addons/base/res/__init__.py +++ b/openerp/addons/base/res/__init__.py @@ -21,9 +21,11 @@ import tools -import country +import res_country import res_lang -import partner +import res_partner +import res_partner_event +import res_bank import res_config import res_currency import res_company @@ -31,6 +33,11 @@ import res_user import res_request import res_lang import res_log -import ir_property import res_widget +import ir_property + +import wizard +import report + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/res/partner/__init__.py b/openerp/addons/base/res/partner/__init__.py deleted file mode 100644 index 3a9b989162f..00000000000 --- a/openerp/addons/base/res/partner/__init__.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import tools - -from partner import * -from bank import * -from crm import * - -import wizard -import report - - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/openerp/addons/base/res/partner/partner_report.xml b/openerp/addons/base/res/partner/partner_report.xml deleted file mode 100644 index 61e3876527f..00000000000 --- a/openerp/addons/base/res/partner/partner_report.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/openerp/addons/base/res/partner/report/__init__.py b/openerp/addons/base/res/report/__init__.py similarity index 100% rename from openerp/addons/base/res/partner/report/__init__.py rename to openerp/addons/base/res/report/__init__.py diff --git a/openerp/addons/base/res/partner/report/business_card.xml b/openerp/addons/base/res/report/business_card.xml similarity index 100% rename from openerp/addons/base/res/partner/report/business_card.xml rename to openerp/addons/base/res/report/business_card.xml diff --git a/openerp/addons/base/res/partner/report/business_card.xsl b/openerp/addons/base/res/report/business_card.xsl similarity index 100% rename from openerp/addons/base/res/partner/report/business_card.xsl rename to openerp/addons/base/res/report/business_card.xsl diff --git a/openerp/addons/base/res/partner/report/partner_address.xml b/openerp/addons/base/res/report/partner_address.xml similarity index 100% rename from openerp/addons/base/res/partner/report/partner_address.xml rename to openerp/addons/base/res/report/partner_address.xml diff --git a/openerp/addons/base/res/partner/report/partner_address.xsl b/openerp/addons/base/res/report/partner_address.xsl similarity index 100% rename from openerp/addons/base/res/partner/report/partner_address.xsl rename to openerp/addons/base/res/report/partner_address.xsl diff --git a/openerp/addons/base/res/partner/bank.py b/openerp/addons/base/res/res_bank.py similarity index 100% rename from openerp/addons/base/res/partner/bank.py rename to openerp/addons/base/res/res_bank.py diff --git a/openerp/addons/base/res/partner/bank_view.xml b/openerp/addons/base/res/res_bank_view.xml similarity index 100% rename from openerp/addons/base/res/partner/bank_view.xml rename to openerp/addons/base/res/res_bank_view.xml diff --git a/openerp/addons/base/res/country.py b/openerp/addons/base/res/res_country.py similarity index 100% rename from openerp/addons/base/res/country.py rename to openerp/addons/base/res/res_country.py diff --git a/openerp/addons/base/res/country_view.xml b/openerp/addons/base/res/res_country_view.xml similarity index 100% rename from openerp/addons/base/res/country_view.xml rename to openerp/addons/base/res/res_country_view.xml diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/res_partner.py similarity index 100% rename from openerp/addons/base/res/partner/partner.py rename to openerp/addons/base/res/res_partner.py diff --git a/openerp/addons/base/res/partner/partner_data.xml b/openerp/addons/base/res/res_partner_data.xml similarity index 100% rename from openerp/addons/base/res/partner/partner_data.xml rename to openerp/addons/base/res/res_partner_data.xml diff --git a/openerp/addons/base/res/partner/partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml similarity index 100% rename from openerp/addons/base/res/partner/partner_demo.xml rename to openerp/addons/base/res/res_partner_demo.xml diff --git a/openerp/addons/base/res/partner/crm.py b/openerp/addons/base/res/res_partner_event.py similarity index 100% rename from openerp/addons/base/res/partner/crm.py rename to openerp/addons/base/res/res_partner_event.py diff --git a/openerp/addons/base/res/partner/crm_view.xml b/openerp/addons/base/res/res_partner_event_view.xml similarity index 100% rename from openerp/addons/base/res/partner/crm_view.xml rename to openerp/addons/base/res/res_partner_event_view.xml diff --git a/openerp/addons/base/res/res_partner_report.xml b/openerp/addons/base/res/res_partner_report.xml new file mode 100644 index 00000000000..06ea859d007 --- /dev/null +++ b/openerp/addons/base/res/res_partner_report.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/openerp/addons/base/res/partner/partner_shortcut_data.xml b/openerp/addons/base/res/res_partner_shortcut_data.xml similarity index 100% rename from openerp/addons/base/res/partner/partner_shortcut_data.xml rename to openerp/addons/base/res/res_partner_shortcut_data.xml diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/res_partner_view.xml similarity index 100% rename from openerp/addons/base/res/partner/partner_view.xml rename to openerp/addons/base/res/res_partner_view.xml diff --git a/openerp/addons/base/res/partner/wizard/__init__.py b/openerp/addons/base/res/wizard/__init__.py similarity index 100% rename from openerp/addons/base/res/partner/wizard/__init__.py rename to openerp/addons/base/res/wizard/__init__.py diff --git a/openerp/addons/base/res/partner/wizard/partner_clear_ids.py b/openerp/addons/base/res/wizard/partner_clear_ids.py similarity index 100% rename from openerp/addons/base/res/partner/wizard/partner_clear_ids.py rename to openerp/addons/base/res/wizard/partner_clear_ids.py diff --git a/openerp/addons/base/res/partner/wizard/partner_clear_ids_view.xml b/openerp/addons/base/res/wizard/partner_clear_ids_view.xml similarity index 100% rename from openerp/addons/base/res/partner/wizard/partner_clear_ids_view.xml rename to openerp/addons/base/res/wizard/partner_clear_ids_view.xml diff --git a/openerp/addons/base/res/partner/wizard/partner_sms_send.py b/openerp/addons/base/res/wizard/partner_sms_send.py similarity index 100% rename from openerp/addons/base/res/partner/wizard/partner_sms_send.py rename to openerp/addons/base/res/wizard/partner_sms_send.py diff --git a/openerp/addons/base/res/partner/wizard/partner_sms_send_view.xml b/openerp/addons/base/res/wizard/partner_sms_send_view.xml similarity index 100% rename from openerp/addons/base/res/partner/wizard/partner_sms_send_view.xml rename to openerp/addons/base/res/wizard/partner_sms_send_view.xml diff --git a/openerp/addons/base/res/partner/wizard/partner_wizard_ean_check.py b/openerp/addons/base/res/wizard/partner_wizard_ean_check.py similarity index 100% rename from openerp/addons/base/res/partner/wizard/partner_wizard_ean_check.py rename to openerp/addons/base/res/wizard/partner_wizard_ean_check.py diff --git a/openerp/addons/base/res/partner/wizard/partner_wizard_ean_check_view.xml b/openerp/addons/base/res/wizard/partner_wizard_ean_check_view.xml similarity index 100% rename from openerp/addons/base/res/partner/wizard/partner_wizard_ean_check_view.xml rename to openerp/addons/base/res/wizard/partner_wizard_ean_check_view.xml diff --git a/openerp/addons/base/res/partner/wizard/partner_wizard_spam.py b/openerp/addons/base/res/wizard/partner_wizard_spam.py similarity index 100% rename from openerp/addons/base/res/partner/wizard/partner_wizard_spam.py rename to openerp/addons/base/res/wizard/partner_wizard_spam.py diff --git a/openerp/addons/base/res/partner/wizard/partner_wizard_spam_view.xml b/openerp/addons/base/res/wizard/partner_wizard_spam_view.xml similarity index 100% rename from openerp/addons/base/res/partner/wizard/partner_wizard_spam_view.xml rename to openerp/addons/base/res/wizard/partner_wizard_spam_view.xml