From 4252e4d2ada77af79e0cfbe8f34fba37f7d37f2b Mon Sep 17 00:00:00 2001 From: Fabien Bourgeois Date: Mon, 11 Jul 2016 20:12:13 +0200 Subject: [PATCH] [FIX]Dependencies problems --- golem_activity/__openerp__.py | 2 +- golem_activity_session/__openerp__.py | 4 ++-- golem_family/__openerp__.py | 4 +++- golem_family_minor/__openerp__.py | 2 +- golem_member/__openerp__.py | 19 ++++++------------- golem_membership/__openerp__.py | 6 +++--- golem_season/__openerp__.py | 2 +- 7 files changed, 17 insertions(+), 22 deletions(-) diff --git a/golem_activity/__openerp__.py b/golem_activity/__openerp__.py index 43eba00..722ec4e 100644 --- a/golem_activity/__openerp__.py +++ b/golem_activity/__openerp__.py @@ -25,6 +25,6 @@ 'license': 'AGPL-3', 'application': True, 'installable': True, - 'depends': ['membership', 'mail', 'golem_season'], + 'depends': ['product', 'mail'], 'data': ['data/golem_activity_data.xml', 'views/golem_activity_view.xml'] } diff --git a/golem_activity_session/__openerp__.py b/golem_activity_session/__openerp__.py index a9091ca..609dafa 100644 --- a/golem_activity_session/__openerp__.py +++ b/golem_activity_session/__openerp__.py @@ -25,7 +25,7 @@ 'license': 'AGPL-3', 'application': False, 'installable': True, - 'depends': ['golem_activity', 'golem_member', 'product', 'mail', - 'l10n_fr_tax_sale_ttc', 'l10n_fr_siret'], + 'auto_install': True, + 'depends': ['product', 'mail', 'golem_activity', 'golem_member'], 'data': ['views/golem_activity_view.xml', 'views/golem_member_view.xml'] } diff --git a/golem_family/__openerp__.py b/golem_family/__openerp__.py index b5f2875..ba692f6 100644 --- a/golem_family/__openerp__.py +++ b/golem_family/__openerp__.py @@ -26,5 +26,7 @@ 'application': False, 'installable': True, 'depends': ['golem_member'], - 'data': ['views/golem_family_view.xml', 'views/golem_member_view.xml'] + 'data': ['views/golem_family_view.xml', + 'views/golem_member_view.xml', + 'views/res_partner_view.xml'] } diff --git a/golem_family_minor/__openerp__.py b/golem_family_minor/__openerp__.py index e38de58..c35ff9e 100644 --- a/golem_family_minor/__openerp__.py +++ b/golem_family_minor/__openerp__.py @@ -27,6 +27,6 @@ 'application': False, 'installable': True, 'auto_install': True, - 'depends': ['golem_member', 'golem_family'], + 'depends': ['golem_family', 'golem_member_minor'], 'data': ['golem_member_view.xml'] } diff --git a/golem_member/__openerp__.py b/golem_member/__openerp__.py index fa4aec7..095f924 100644 --- a/golem_member/__openerp__.py +++ b/golem_member/__openerp__.py @@ -26,21 +26,14 @@ 'application': True, 'installable': True, 'depends': ['contacts', - 'partner_firstname', - 'partner_contact_birthdate', - 'partner_contact_gender', - 'partner_contact_nationality', - 'membership', - 'account_voucher', - 'mail', - 'l10n_fr_state', - 'l10n_fr_department', - 'l10n_fr_tax_sale_ttc', + 'partner_firstname', 'partner_contact_birthdate', + 'partner_contact_gender', 'partner_contact_nationality', + 'membership', 'account_voucher', 'mail', + 'l10n_fr_state', 'l10n_fr_department', 'l10n_fr_tax_sale_ttc', 'l10n_fr_siret', - 'web_widget_phone_check_fr', - 'web_widget_email_check', + 'web_widget_phone_check_fr', 'web_widget_email_check', 'web_widget_url_check', - 'golem_season'], + 'golem_activity', 'golem_season'], 'data': ['views/golem_member_view.xml', 'views/members_menu.xml', 'views/res_partner_view.xml', 'views/number_config.xml', 'data/number_config.xml'] diff --git a/golem_membership/__openerp__.py b/golem_membership/__openerp__.py index 3703cd6..1f59e58 100644 --- a/golem_membership/__openerp__.py +++ b/golem_membership/__openerp__.py @@ -25,7 +25,7 @@ 'license': 'AGPL-3', 'application': False, 'installable': True, - 'depends': ['sale', 'golem_member', 'decimal_precision'], - 'data': ['views/golem_member_view.xml', - 'views/golem_membership_invoice.xml'] + 'depends': ['golem_member', 'account', 'decimal_precision'], + 'data': ['views/golem_membership_invoice.xml', + 'views/golem_member_view.xml'] } diff --git a/golem_season/__openerp__.py b/golem_season/__openerp__.py index 14c2f50..63c5780 100644 --- a/golem_season/__openerp__.py +++ b/golem_season/__openerp__.py @@ -27,6 +27,6 @@ 'license': 'AGPL-3', 'application': False, 'installable': True, - 'depends': ['membership'], + 'depends': ['base'], 'data': ['views/golem_season_view.xml'] }