Browse Source

[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
pull/158/head
houssine 5 years ago
parent
commit
e5cab3f3fd
  1. 13
      beesdoo_easy_my_coop/views/res_partner.xml
  2. 11
      beesdoo_easy_my_coop/views/subscription_request.xml

13
beesdoo_easy_my_coop/views/res_partner.xml

@ -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>

11
beesdoo_easy_my_coop/views/subscription_request.xml

@ -3,6 +3,17 @@
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo> <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"> <record model="ir.ui.view" id="subscription_request_form_view">
<field name="name">subscription.request.form (in beesdoo_easy_my_coop)</field> <field name="name">subscription.request.form (in beesdoo_easy_my_coop)</field>

Loading…
Cancel
Save