From e5cab3f3fd0e9cadda0335b5131181fa983934bc Mon Sep 17 00:00:00 2001
From: houssine <houssine.bakkali@gmail.com>
Date: Thu, 11 Jun 2020 20:24:35 +0200
Subject: [PATCH] [FIX] conflict work around move the view to another file.

two different PR create the res_partner.xm so I move temporarily the
view to another xml file
---
 beesdoo_easy_my_coop/views/res_partner.xml          | 13 -------------
 beesdoo_easy_my_coop/views/subscription_request.xml | 11 +++++++++++
 2 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 beesdoo_easy_my_coop/views/res_partner.xml

diff --git a/beesdoo_easy_my_coop/views/res_partner.xml b/beesdoo_easy_my_coop/views/res_partner.xml
deleted file mode 100644
index 289f1b0..0000000
--- a/beesdoo_easy_my_coop/views/res_partner.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<odoo>
-    <record id="view_partner_form_easy_my_coop" model="ir.ui.view">
-        <field name="name">res.partner.form.easy_my_coop</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="easy_my_coop.view_partner_form_easy_my_coop"/>
-        <field name="arch" type="xml">
-            <field name="data_policy_approved" position="after">
-                <field name="info_session_confirmed"
-                       attrs="{'invisible':[('member','=',False)]}"/>
-            </field>
-        </field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/beesdoo_easy_my_coop/views/subscription_request.xml b/beesdoo_easy_my_coop/views/subscription_request.xml
index 1b75719..683b73b 100644
--- a/beesdoo_easy_my_coop/views/subscription_request.xml
+++ b/beesdoo_easy_my_coop/views/subscription_request.xml
@@ -3,6 +3,17 @@
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 
 <odoo>
+	<record id="view_partner_form_easy_my_coop" model="ir.ui.view">
+        <field name="name">res.partner.form.easy_my_coop</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="easy_my_coop.view_partner_form_easy_my_coop"/>
+        <field name="arch" type="xml">
+            <field name="data_policy_approved" position="after">
+                <field name="info_session_confirmed"
+                       attrs="{'invisible':[('member','=',False)]}"/>
+            </field>
+        </field>
+    </record>
 
     <record model="ir.ui.view" id="subscription_request_form_view">
         <field name="name">subscription.request.form (in beesdoo_easy_my_coop)</field>