[FIX] Add OCA as author

Conflicts: mis_builder/__openerp__.py cherry-pick from v8
9 years ago · 116c501f19
2 changed files with 7 additions and 1 deletions
--- a/mis_builder/openerp.py
+++ b/mis_builder/openerp.py
@ -29,9 +29,14 @@
    'summary': """
        Build 'Management Information System' Reports and Dashboards
    """,
+<<<<<<< HEAD
    'description': """
    """,
    'author': 'ACSONE SA/NV',
+=======
+    'author': 'ACSONE SA/NV,'
+              'Odoo Community Association (OCA)',
+>>>>>>> 98a321c... [FIX] Add OCA as author
    'website': 'http://acsone.eu',
    'depends': [
        'account',
--- a/mis_builder_demo/openerp.py
+++ b/mis_builder_demo/openerp.py
@ -29,7 +29,8 @@
    'summary': """
        Demo data for the mis_builder module
    """,
-    'author': 'ACSONE SA/NV',
+    'author': 'ACSONE SA/NV,'
+              'Odoo Community Association (OCA)',
    'website': 'http://acsone.eu',
    'depends': [
        'account_accountant',