Merge 97df419 into 082aac9

OCA · Mar 28, 2015 · 7e6dfc8 · 7e6dfc8
2 parents 082aac9 + 97df419
commit 7e6dfc8
Show file tree

Hide file tree

Showing 14 changed files with 553 additions and 557 deletions.
diff --git a/__unported__/base_custom_attributes/custom_attributes.py b/__unported__/base_custom_attributes/custom_attributes.py
diff --git a/base_custom_attributes/README.rst b/base_custom_attributes/README.rst
@@ -0,0 +1,26 @@
+A module add custom attribute for models 
+===========================================
+
+
+
+
+Credits
+=======
+
+Contributors
+------------
+
+* Qing Wang <wang.qing@elico-corp.com>
+
+Maintainer
+----------
+
+.. image:: http://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: http://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.
diff --git a/...rted__/base_custom_attributes/__init__.py → base_custom_attributes/__init__.py b/...rted__/base_custom_attributes/__init__.py → base_custom_attributes/__init__.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ###############################################################################
 #                                                                             #
-#   product_custom_attributes for OpenERP                                      #
+#   product_custom_attributes for OpenERP                                     #
 #   Copyright (C) 2011 Akretion Benoît GUILLOT <benoit.guillot@akretion.com>  #
 #                                                                             #
 #   This program is free software: you can redistribute it and/or modify      #
@@ -18,12 +18,5 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.     #
 #                                                                             #
 ###############################################################################
-
-
-
-import ir_model
-import custom_attributes
-
-
-
-
+from . import ir_model
+from . import custom_attributes
diff --git a/...d__/base_custom_attributes/__openerp__.py → base_custom_attributes/__openerp__.py b/...d__/base_custom_attributes/__openerp__.py → base_custom_attributes/__openerp__.py
@@ -18,31 +18,28 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.     #
 #                                                                             #
 ###############################################################################
-
-
-
 {
     'name': 'base_custom_attributes',
     'version': '0.1.1',
     'category': 'Generic Modules/Others',
     'license': 'AGPL-3',
-    'description': """This module adds the possibility to easily create custom attributes in any OpenERP business object. See the product_custom_attributes module for instance.
+    'description': """
+    This module adds the possibility to easily create custom attributes
+    in any OpenERP business object.
+    See the product_custom_attributes module for instance.
     """,
     'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com/',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
-           'security/ir.model.access.csv',
-           'security/attribute_security.xml',
-           'custom_attributes_view.xml',
+    'demo': [],
+    'data': [
+        'security/ir.model.access.csv',
+        'security/attribute_security.xml',
+        'custom_attributes_view.xml',
     ],
-    'demo_xml': [],
-    'installable': False,
+    'installable': True,
     'active': False,
-    'external_dependencies' : {
-        'python' : ['unidecode'],
+    'external_dependencies': {
+        'python': ['unidecode'],
     }
-
 }
-