From a01cf31d87c5306cc27a0a20d29d193e0b5d65bd Mon Sep 17 00:00:00 2001
From: sonal <sonal.arora@hstpl.com>
Date: Wed, 5 Aug 2020 12:40:36 +0530
Subject: [PATCH] resolve issues

---
 diet_template/views/menuitem_hide.xml | 15 +++++++++++++++
 gym/__manifest__.py                   | 18 +++++++++---------
 gym/views/membership_view.xml         |  1 +
 gym/views/product_template.xml        | 11 -----------
 gym/views/workout_view.xml            |  5 -----
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/diet_template/views/menuitem_hide.xml b/diet_template/views/menuitem_hide.xml
index c91ec91..7a49291 100644
--- a/diet_template/views/menuitem_hide.xml
+++ b/diet_template/views/menuitem_hide.xml
@@ -7,4 +7,19 @@
               web_icon="project,static/description/icon.png"
               sequence="50"/>
 
+    <!--Configuration menu -->
+    <menuitem 
+        id="menu_Configuration" 
+        name="Configuration" 
+        parent="menu_workout_main"
+        groups='gym.group_gym_operator'/>
+
+    <!-- Menu of the exercise_type -->
+    <menuitem id="menu_exercise" action="gym.action_exercise"
+              parent="menu_Configuration" sequence="2"/>
+
+    <!-- Menu of the Exercises -->
+    <menuitem id="menu_exercise_exercise" action="gym.action_exercise_exercise"
+              parent="menu_Configuration" sequence="3"/>`
+
 </odoo>
diff --git a/gym/__manifest__.py b/gym/__manifest__.py
index aca91ab..95c61de 100644
--- a/gym/__manifest__.py
+++ b/gym/__manifest__.py
@@ -31,15 +31,15 @@
         'data/exercise_for_demo.xml',
         'data/exercise_demo.xml',
         'data/mail_templates.xml',
-        # 'views/menuitem_hide.xml',
-        # 'views/product_template.xml',
-        # 'views/membership_view.xml',
-        # 'views/project_task_view.xml',
-        # 'views/member_view.xml',
-        # 'views/trainer_view.xml',
-        # 'views/workout_view.xml',
-        # 'views/company_view.xml',
-        # 'views/gym_skills_view.xml',
+        'views/menuitem_hide.xml',
+        'views/product_template.xml',
+        'views/membership_view.xml',
+        'views/project_task_view.xml',
+        'views/member_view.xml',
+        'views/trainer_view.xml',
+        'views/workout_view.xml',
+        'views/company_view.xml',
+        'views/gym_skills_view.xml',
     ],
     
     'demo': [
diff --git a/gym/views/membership_view.xml b/gym/views/membership_view.xml
index d4d315c..72aaaaa 100644
--- a/gym/views/membership_view.xml
+++ b/gym/views/membership_view.xml
@@ -69,6 +69,7 @@
                                 <field name="zip" placeholder="ZIP" class="o_address_zip" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
                                 <field name="country_id" placeholder="Country" class="o_address_country" options="{&quot;no_open&quot;: True, &quot;no_create&quot;: True}" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
                             </div>
+                            <field name="is_member" invisible="1"/>
                             <field name="vat" placeholder="e.g. BE0477472701" attrs="{'readonly': [('parent_id','!=',False)]}"/>
                             <field name="marketing_source"/>
                             <field name="account_manager_id"/>
diff --git a/gym/views/product_template.xml b/gym/views/product_template.xml
index 9bc7860..7db2340 100644
--- a/gym/views/product_template.xml
+++ b/gym/views/product_template.xml
@@ -5,13 +5,6 @@
               web_icon="gym,static/description/icon.png"
               name="Gym Management"/>
 
-    <!--Configuration menu -->
-    <menuitem 
-        id="menu_Configuration" 
-        name="Configuration" 
-        parent="workout_template.menu_workout_main"
-        groups='gym.group_gym_operator'/>
-
     <!-- Inherited view of product -->
     <record id="view_equipments_form_view" model="ir.ui.view">
         <field name="name">view.equipments.form.view</field>
@@ -225,10 +218,6 @@
         </field>
     </record>
 
-    <!-- Menu of the exercise_type -->
-    <menuitem id="menu_exercise" action="action_exercise"
-              parent="gym.menu_Configuration" sequence="2"/>
-
     <record id="view_service_form_inherit" model="ir.ui.view">
         <field name="name">view.service.form.inherit</field>
         <field name="model">product.template</field>
diff --git a/gym/views/workout_view.xml b/gym/views/workout_view.xml
index adb0634..2dcc2b3 100644
--- a/gym/views/workout_view.xml
+++ b/gym/views/workout_view.xml
@@ -163,9 +163,4 @@
             </p>
         </field>
     </record>
-
-    <!-- Menu of the Exercises -->
-    <menuitem id="menu_exercise_exercise" action="action_exercise_exercise"
-              parent="gym.menu_Configuration" sequence="3"/>
-
 </odoo>