Browse Source

[FIX] Add OCA as author

Conflicts:
	mis_builder/__openerp__.py

cherry-pick from v8
pull/90/head
Laurent Mignon (ACSONE) 10 years ago
committed by Stéphane Bidoul
parent
commit
116c501f19
  1. 5
      mis_builder/__openerp__.py
  2. 3
      mis_builder_demo/__openerp__.py

5
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',

3
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',

Loading…
Cancel
Save