Browse Source

Merge pull request #158 from beescoop/12.0-beesdoo-easymycoop-fix

12.0 beesdoo easymycoop fix
pull/168/head
Houssine BAKKALI 4 years ago
committed by GitHub
parent
commit
ba8adea797
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      beesdoo_easy_my_coop/__manifest__.py
  2. 2
      beesdoo_easy_my_coop/views/res_company.xml
  3. 17
      beesdoo_easy_my_coop/views/res_partner.xml
  4. 2
      beesdoo_easy_my_coop/views/subscription_request.xml
  5. 12
      beesdoo_easy_my_coop/views/subscription_templates.xml

3
beesdoo_easy_my_coop/__manifest__.py

@ -4,7 +4,7 @@
"author": "BEES coop, Coop IT Easy SCRLfs",
"website": "https://github.com/beescoop/Obeesdoo",
"category": "Cooperative management",
"version": "12.0.1.0.0",
"version": "12.0.1.0.1",
"depends": [
"beesdoo_base",
"beesdoo_shift",
@ -14,6 +14,7 @@
],
"data": [
"views/res_company.xml",
'views/res_partner.xml',
"views/subscription_request.xml",
"views/subscription_templates.xml",
"views/product.xml",

2
beesdoo_easy_my_coop/views/res_company.xml

@ -9,7 +9,7 @@
<field name="model">res.company</field>
<field name="inherit_id" ref="easy_my_coop.view_company_inherit_form2"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='coop_grp']//field[@name='display_data_policy_approval']"
<xpath expr="//group[@name='coop_grp']//field[@name='display_internal_rules_approval']"
position="before">
<field name="display_info_session_confirmation"/>
<field name="info_session_confirmation_required"/>

17
beesdoo_easy_my_coop/views/res_partner.xml

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2019 Coop IT Easy SCRLfs
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="internal_rules_approved" position="before">
<field name="info_session_confirmed"
attrs="{'invisible':[('member','=',False)]}"/>
</field>
</field>
</record>
</odoo>

2
beesdoo_easy_my_coop/views/subscription_request.xml

@ -9,7 +9,7 @@
<field name="model">subscription.request</field>
<field name="inherit_id" ref="easy_my_coop.subscription_request_form"/>
<field name="arch" type="xml">
<field name="data_policy_approved" position="before">
<field name="internal_rules_approved" position="before">
<field name="info_session_confirmed"/>
</field>
</field>

12
beesdoo_easy_my_coop/views/subscription_templates.xml

@ -7,19 +7,19 @@
<template id="beesdoo_easy_my_coop.becomecooperator"
name="Become Cooperator (in beesdoo_easy_my_coop)"
inherit_id="easy_my_coop_website.becomecooperator">
<xpath expr="//div[@id='data_policy_approved']" position="before">
<div id="info_session_confirmed" t-if="display_info_session"
t-attf-class="form-group">
<xpath expr="//div[@id='internal_rules_approved']" position="before">
<div id="info_session_confirmed" t-if="display_info_session" t-attf-class="form-group" >
<label class="col-md-3 col-sm-4 control-label"
for="info_session_confirmed">Info Session
for="info_session_confirmed">
Info Session
</label>
<div class="col-md-9 col-sm-8">
<div class="checkbox">
<label for="info_session_confirmed">
<input type="checkbox"
name="info_session_confirmed"
t-att="{'required': 'required'} if info_session_required else {}"
t-attf-value="#{data_policy_approved or ''}"/>
t-att-required="info_session_required"
t-att-checked="data_policy_approved"/>
<t t-raw="info_session_text"/>
</label>
</div>

Loading…
Cancel
Save