From 57651c32a1d05e7eb7daa8f6c1982623b723e251 Mon Sep 17 00:00:00 2001
From: houssine <houssine.bakkali@gmail.com>
Date: Wed, 1 May 2019 14:00:20 +0200
Subject: [PATCH] [MIG] migration module to v12.

This make the base module installable. Still in WIP. Need fixing warning
and subscription template
---
 easy_my_coop/__init__.py                      |    2 +-
 .../{__openerp__.py => __manifest__.py}       |   38 +-
 easy_my_coop/models/account_invoice.py        |    4 +-
 easy_my_coop/models/account_journal.py        |    4 +-
 easy_my_coop/models/company.py                |    3 +-
 easy_my_coop/models/coop.py                   |    9 +-
 easy_my_coop/models/operation_request.py      |    4 +-
 easy_my_coop/models/partner.py                |    3 +-
 easy_my_coop/models/product.py                |    3 +-
 easy_my_coop/models/res_partner_bank.py       |    3 +-
 easy_my_coop/report/account_invoice_report.py |   14 +-
 easy_my_coop/view/account_journal_view.xml    |   48 +-
 .../view/cooperator_register_view.xml         |  152 ++-
 easy_my_coop/view/operation_request_view.xml  |  214 ++--
 easy_my_coop/view/product_view.xml            |  287 +++--
 easy_my_coop/view/res_company_view.xml        |   56 +-
 easy_my_coop/view/res_partner_view.xml        |    2 +-
 .../view/subscription_request_view.xml        |  447 ++++---
 easy_my_coop/view/subscription_template.xml   | 1069 ++++++++---------
 easy_my_coop/wizard/__init__.py               |    1 -
 easy_my_coop/wizard/account_invoice_refund.py |    3 +-
 .../create_subscription_from_partner.py       |    7 +-
 easy_my_coop/wizard/update_partner_info.py    |    6 +-
 easy_my_coop/wizard/update_share_line.py      |    6 +-
 .../wizard/validate_subscription_request.py   |    4 +-
 .../wizard/validate_subscription_request.xml  |   65 +-
 theme_light/__manifest__.py                   |   21 +
 theme_light/__openerp__.py                    |   36 -
 theme_light/report/header_report_G002.xml     |   36 +-
 theme_light/views/layout_template.xml         |    6 +-
 website_recaptcha_reloaded/__openerp__.py     |   45 +-
 31 files changed, 1260 insertions(+), 1338 deletions(-)
 rename easy_my_coop/{__openerp__.py => __manifest__.py} (57%)
 create mode 100644 theme_light/__manifest__.py
 delete mode 100644 theme_light/__openerp__.py

diff --git a/easy_my_coop/__init__.py b/easy_my_coop/__init__.py
index c360b64..897ad37 100644
--- a/easy_my_coop/__init__.py
+++ b/easy_my_coop/__init__.py
@@ -1,4 +1,4 @@
 from . import models
 from . import controllers
 from . import report
-from . import wizard
\ No newline at end of file
+from . import wizard
diff --git a/easy_my_coop/__openerp__.py b/easy_my_coop/__manifest__.py
similarity index 57%
rename from easy_my_coop/__openerp__.py
rename to easy_my_coop/__manifest__.py
index d9cef39..0801543 100644
--- a/easy_my_coop/__openerp__.py
+++ b/easy_my_coop/__manifest__.py
@@ -1,41 +1,25 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013-2018 Open Architects Consulting SPRL.
-#    Copyright (C) 2018-     Coop IT Easy SCRL.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# Copyright 2013-2018 Open Architects Consulting SPRL.
+# Copyright 2018-Coop IT Easy SCRLfs (<http://www.coopiteasy.be>)
+# - Houssine BAKKALI - <houssine@coopiteasy.be>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).#
+
 {
     "name": "Easy My Coop",
-    "version": "1.1",
+    "version": "'12.0.1.0.0'",
     "depends": ["base",
                 "sale",
-                "purchase",
-                "account_accountant",
+                "account",
+                "base_iban",
                 "product",
                 "partner_firstname",
                 "partner_contact_birthdate",
                 "partner_contact_address",
                 "website",
-                "website_recaptcha_reloaded",
+                "website_form_recaptcha",
                 "theme_light",
-                "base_iban",
                 "email_template_config",
                 ],
-    "author": "Houssine BAKKALI <houssine@coopiteasy.be>",
+    "author": "Coop IT Easy SCRLfs",
     "category": "Cooperative management",
     "website": "www.coopiteasy.be",
     "license": "AGPL-3",
@@ -56,7 +40,7 @@
         'view/cooperator_register_view.xml',
         'view/operation_request_view.xml',
         'view/account_invoice_view.xml',
-        'view/subscription_template.xml',
+        # 'view/subscription_template.xml',
         'view/product_view.xml',
         'view/res_company_view.xml',
         'view/account_journal_view.xml',
diff --git a/easy_my_coop/models/account_invoice.py b/easy_my_coop/models/account_invoice.py
index e294768..3b3c05e 100644
--- a/easy_my_coop/models/account_invoice.py
+++ b/easy_my_coop/models/account_invoice.py
@@ -1,6 +1,6 @@
-# -*- coding: utf-8 -*-
 from datetime import datetime
-from openerp import api, fields, models
+
+from odoo import api, fields, models
 
 
 class account_invoice(models.Model):
diff --git a/easy_my_coop/models/account_journal.py b/easy_my_coop/models/account_journal.py
index 4b036a0..32c0104 100644
--- a/easy_my_coop/models/account_journal.py
+++ b/easy_my_coop/models/account_journal.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-from openerp import fields, models
+from odoo import fields, models
 
 
 class AccountJournal(models.Model):
diff --git a/easy_my_coop/models/company.py b/easy_my_coop/models/company.py
index 95c8db3..4859fa3 100644
--- a/easy_my_coop/models/company.py
+++ b/easy_my_coop/models/company.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-from openerp import fields, models
+from odoo import fields, models
 
 
 class ResCompany(models.Model):
diff --git a/easy_my_coop/models/coop.py b/easy_my_coop/models/coop.py
index 5496e83..ffa9298 100644
--- a/easy_my_coop/models/coop.py
+++ b/easy_my_coop/models/coop.py
@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 from datetime import datetime
 
-from openerp import api, fields, models, _
-from openerp.addons.base_iban import base_iban
-from openerp.exceptions import UserError, ValidationError
+from odoo import api, fields, models, _
+from odoo.addons.base_iban.models.res_partner_bank import validate_iban
+from odoo.exceptions import UserError, ValidationError
 
 _REQUIRED = ['email',
              'firstname',
@@ -107,7 +106,7 @@ class subscription_request(models.Model):
     def check_iban(self, iban):
         validated = True
         try:
-            base_iban.validate_iban(iban)
+            validate_iban(iban)
         except ValidationError:
             validated = False
         return validated
diff --git a/easy_my_coop/models/operation_request.py b/easy_my_coop/models/operation_request.py
index f9eddea..19c1e6d 100644
--- a/easy_my_coop/models/operation_request.py
+++ b/easy_my_coop/models/operation_request.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from datetime import datetime
 
-from openerp import api, fields, models, _
-from openerp.exceptions import ValidationError
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
 
 
 class operation_request(models.Model):
diff --git a/easy_my_coop/models/partner.py b/easy_my_coop/models/partner.py
index d3699a5..1e5661a 100644
--- a/easy_my_coop/models/partner.py
+++ b/easy_my_coop/models/partner.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-from openerp import api, fields, models
+from odoo import api, fields, models
 
 
 class ResPartner(models.Model):
diff --git a/easy_my_coop/models/product.py b/easy_my_coop/models/product.py
index 12cfb52..5ca3ed6 100644
--- a/easy_my_coop/models/product.py
+++ b/easy_my_coop/models/product.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-from openerp import api, fields, models
+from odoo import api, fields, models
 
 
 class ProductTemplate(models.Model):
diff --git a/easy_my_coop/models/res_partner_bank.py b/easy_my_coop/models/res_partner_bank.py
index f1b6769..1a3aa98 100644
--- a/easy_my_coop/models/res_partner_bank.py
+++ b/easy_my_coop/models/res_partner_bank.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-from openerp import models
+from odoo import models
 
 
 class ResPartnerBank(models.Model):
diff --git a/easy_my_coop/report/account_invoice_report.py b/easy_my_coop/report/account_invoice_report.py
index 7bd6e40..bd1fb90 100644
--- a/easy_my_coop/report/account_invoice_report.py
+++ b/easy_my_coop/report/account_invoice_report.py
@@ -1,13 +1,13 @@
-# -*- coding: utf-8 -*-
-from openerp import api, fields, models, _
+from odoo import fields, models
+
 
 class AccountInvoiceReport(models.Model):
     _inherit = "account.invoice.report"
-    
+
     release_capital_request = fields.Boolean(string="Release capital request")
-    
+
     def _select(self):
-        return  super(AccountInvoiceReport, self)._select() + ", sub.release_capital_request as release_capital_request"
-            
+        return super(AccountInvoiceReport, self)._select() + ", sub.release_capital_request as release_capital_request"
+
     def _sub_select(self):
-        return  super(AccountInvoiceReport, self)._sub_select() + ", ai.release_capital_request as release_capital_request"
\ No newline at end of file
+        return super(AccountInvoiceReport, self)._sub_select() + ", ai.release_capital_request as release_capital_request"
diff --git a/easy_my_coop/view/account_journal_view.xml b/easy_my_coop/view/account_journal_view.xml
index 31acd75..42784f2 100644
--- a/easy_my_coop/view/account_journal_view.xml
+++ b/easy_my_coop/view/account_journal_view.xml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-	<data>
-		<record id="view_account_journal_form_coop" model="ir.ui.view">
-            <field name="name">account.journal.form</field>
-            <field name="model">account.journal</field>
-            <field name="inherit_id" ref="account.view_account_journal_form"/>
-            <field name="arch" type="xml">
-            	<xpath expr="//field[@name='display_on_footer']" position="after">
-            		<field name="get_cooperator_payment" groups="easy_my_coop.group_energiris_super_manager"/>
-            		<field name="get_general_payment"/>
-            	</xpath>
-            </field>
-    	</record>
-    	
-    	<record id="view_account_bank_journal_form_coop" model="ir.ui.view">
-            <field name="name">account.bank.journal.form</field>
-            <field name="model">account.journal</field>
-            <field name="inherit_id" ref="account.view_account_bank_journal_form"/>
-            <field name="arch" type="xml">
-            	<xpath expr="//field[@name='display_on_footer']" position="after">
-            		<field name="get_cooperator_payment" groups="easy_my_coop.group_energiris_super_manager"/>
-            		<field name="get_general_payment"/>
-            	</xpath>
-            </field>
-        </record>
-	</data>
+	<record id="view_account_journal_form_coop" model="ir.ui.view">
+        <field name="name">account.journal.form</field>
+        <field name="model">account.journal</field>
+        <field name="inherit_id" ref="account.view_account_journal_form"/>
+        <field name="arch" type="xml">
+        	<field name="bank_id" position="after">
+        		<field name="get_cooperator_payment" groups="easy_my_coop.group_energiris_super_manager"/>
+        		<field name="get_general_payment"/>
+        	</field>
+        </field>
+	</record>
+	
+	<record id="view_account_bank_journal_form_coop" model="ir.ui.view">
+        <field name="name">account.bank.journal.form</field>
+        <field name="model">account.journal</field>
+        <field name="inherit_id" ref="account.view_account_bank_journal_form"/>
+        <field name="arch" type="xml">
+        	<field name="currency_id" position="after">
+        		<field name="get_cooperator_payment" groups="easy_my_coop.group_energiris_super_manager"/>
+        		<field name="get_general_payment"/>
+        	</field>
+        </field>
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/easy_my_coop/view/cooperator_register_view.xml b/easy_my_coop/view/cooperator_register_view.xml
index 07ce46e..ffd253c 100644
--- a/easy_my_coop/view/cooperator_register_view.xml
+++ b/easy_my_coop/view/cooperator_register_view.xml
@@ -1,80 +1,78 @@
-<openerp>
-	<data>
-		<record id="subscription_register_tree" model="ir.ui.view">
-            <field name="name">subscription.register.tree</field>
-            <field name="model">subscription.register</field>
-            <field name="arch" type="xml">
-                <tree string="Subscription Register">
-	                <field name="register_number_operation"/>
-          			<field name="date"/>
-          			<field name="partner_id"/>
-          			<field name="share_short_name"/>
-          			<field name="quantity" sum="Total quantity"/>
-          			<field name="share_unit_price"/>
-		          	<field name="total_amount_line" sum="Total amount"/>
-          			<field name="type"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record id="subscription_register_form" model="ir.ui.view">
-            <field name="name">subscription.register.form</field>
-            <field name="model">subscription.register</field>
-            <field name="arch" type="xml">
-                <form string="Subscription Register">
+<odoo>
+	<record id="subscription_register_tree" model="ir.ui.view">
+           <field name="name">subscription.register.tree</field>
+           <field name="model">subscription.register</field>
+           <field name="arch" type="xml">
+               <tree string="Subscription Register">
+                <field name="register_number_operation"/>
+         			<field name="date"/>
+         			<field name="partner_id"/>
+         			<field name="share_short_name"/>
+         			<field name="quantity" sum="Total quantity"/>
+         			<field name="share_unit_price"/>
+	          	<field name="total_amount_line" sum="Total amount"/>
+         			<field name="type"/>
+               </tree>
+           </field>
+       </record>
+       
+       <record id="subscription_register_form" model="ir.ui.view">
+           <field name="name">subscription.register.form</field>
+           <field name="model">subscription.register</field>
+           <field name="arch" type="xml">
+               <form string="Subscription Register">
+                <group>
 	                <group>
-		                <group>
-			                <field name="register_number_operation"/>
-		          			<field name="date"/>
-		          			<field name="partner_id"/>
-							<field name="share_short_name"/>
-		          			<field name="quantity"/>
-		          			<field name="share_unit_price"/>
-		          			<field name="total_amount_line"/>
-	          			</group>
-	          			<group>
-		          			<field name="partner_id_to" attrs="{'invisible':[('type','!=','transfer')]}"/>
-		          			<field name="type"/>
-		          			<field name="share_to_short_name"/>
-		          			<field name="quantity_to"/>
-		          			<field name="share_to_unit_price"/>
-		          			<field name="user_id" invisible="True"/>
-	          			</group>
-	          		</group>
-                </form>
-            </field>
-        </record>
-        
-		<record id="view_subscription_register_filter" model="ir.ui.view">
-            <field name="name">Subscription Register Search</field>
-            <field name="model">subscription.register</field>
-            <field name="arch" type="xml">
-                <search string="Search Subscription Register">
-                   <field name="partner_id"
-                       filter_domain="[('partner_id','ilike',self)]"/>
-                   <field name="register_number_operation"/>
-                   <separator/>
-                   <filter string="Subscription" name="type_subscription" domain="[('type','=','subscription')]"/>
-                   <filter string="Transfer" name="type_transfer" domain="[('type','=','transfer')]"/>
-                   <filter string="Sell back" name="type_sell_back" domain="[('type','=','sell_back')]"/>
-                   <filter string="Convert" name="type_convert" domain="[('type','=','convert')]"/>
-                   <separator/>
-                   <group expand="0" name="group_by" string="Group By">
-                       <filter string="Entry type" context="{'group_by' : 'type'}" />
-                       <filter string="Date Month" context="{'group_by': 'date'}"/>
-                   </group>
-               </search>
-            </field>
-        </record>
+		                <field name="register_number_operation"/>
+	          			<field name="date"/>
+	          			<field name="partner_id"/>
+						<field name="share_short_name"/>
+	          			<field name="quantity"/>
+	          			<field name="share_unit_price"/>
+	          			<field name="total_amount_line"/>
+          			</group>
+          			<group>
+	          			<field name="partner_id_to" attrs="{'invisible':[('type','!=','transfer')]}"/>
+	          			<field name="type"/>
+	          			<field name="share_to_short_name"/>
+	          			<field name="quantity_to"/>
+	          			<field name="share_to_unit_price"/>
+	          			<field name="user_id" invisible="True"/>
+          			</group>
+          		</group>
+               </form>
+           </field>
+       </record>
+       
+	<record id="view_subscription_register_filter" model="ir.ui.view">
+           <field name="name">Subscription Register Search</field>
+           <field name="model">subscription.register</field>
+           <field name="arch" type="xml">
+               <search string="Search Subscription Register">
+                  <field name="partner_id"
+                      filter_domain="[('partner_id','ilike',self)]"/>
+                  <field name="register_number_operation"/>
+                  <separator/>
+                  <filter string="Subscription" name="type_subscription" domain="[('type','=','subscription')]"/>
+                  <filter string="Transfer" name="type_transfer" domain="[('type','=','transfer')]"/>
+                  <filter string="Sell back" name="type_sell_back" domain="[('type','=','sell_back')]"/>
+                  <filter string="Convert" name="type_convert" domain="[('type','=','convert')]"/>
+                  <separator/>
+                  <group expand="0" name="group_by" string="Group By">
+                      <filter name="entry_type" string="Entry type" context="{'group_by' : 'type'}" />
+                      <filter name="date_month" string="Date Month" context="{'group_by': 'date'}"/>
+                  </group>
+              </search>
+           </field>
+       </record>
 
-        <record id="subscription_register_action" model="ir.actions.act_window">
-            <field name="name">Subscription Register</field>
-            <field name="res_model">subscription.register</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="subscription_register_tree"/>
-            <field name="search_view_id" ref="view_subscription_register_filter"/>
-        </record>
+       <record id="subscription_register_action" model="ir.actions.act_window">
+           <field name="name">Subscription Register</field>
+           <field name="res_model">subscription.register</field>
+           <field name="view_type">form</field>
+           <field name="view_id" ref="subscription_register_tree"/>
+           <field name="search_view_id" ref="view_subscription_register_filter"/>
+       </record>
 
-		<menuitem action="subscription_register_action" name="Subscription Register" id="menu_easy_my_coop_subscription_register"  parent="menu_easy_my_coop_main_subscription" sequence="20"/>
-	</data>
-</openerp>
\ No newline at end of file
+	<menuitem action="subscription_register_action" name="Subscription Register" id="menu_easy_my_coop_subscription_register"  parent="menu_easy_my_coop_main_subscription" sequence="20"/>
+</odoo>
\ No newline at end of file
diff --git a/easy_my_coop/view/operation_request_view.xml b/easy_my_coop/view/operation_request_view.xml
index 7f07bda..77a1d57 100644
--- a/easy_my_coop/view/operation_request_view.xml
+++ b/easy_my_coop/view/operation_request_view.xml
@@ -1,110 +1,108 @@
-<openerp>
-	<data>
-		<record id="operation_request_tree" model="ir.ui.view">
-            <field name="name">operation.request.tree</field>
-            <field name="model">operation.request</field>
-            <field name="arch" type="xml">
-                <tree string="Operation requests" colors="green:state in ('approved'); blue:state in ('draft');grey: state in ('done')">
-	                <field name="request_date"/>
-          			<field name="partner_id"/>
-          			<field name="operation_type"/>
-          			<field name="quantity"/>
-          			<field name="user_id"/>
-          			<field name="state"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record id="operation_request_form" model="ir.ui.view">
-            <field name="name">operation.request.form</field>
-            <field name="model">operation.request</field>
-            <field name="arch" type="xml">
-        		<form string="Operation request">
-       				<header>
-       					<button string="Submit" type="object" name="submit_operation" states="draft"/>
-       					<button string="Approve" type="object" name="approve_operation" states="waiting"/>
-       					<button string="Refuse" type="object" name="refuse_operation" states="waiting"/>
-       					<button string="Cancel" type="object" name="cancel_operation" states="draft,waiting,approved"/>
-       					<button string="Draft" type="object" name="reset_to_draft" states="waiting,cancelled"/>
-       					<button string="Execute" type="object" name="execute_operation" states="approved"/>
-	                    <field name="state" widget="statusbar" statusbar_visible="draft,done,cancelled,refused" statusbar_colors='{"draft":"grey","done":"green","cancelled":"orange","refused":"red"}'/>
-	                </header>
-       				<sheet>
+<odoo>
+	<record id="operation_request_tree" model="ir.ui.view">
+           <field name="name">operation.request.tree</field>
+           <field name="model">operation.request</field>
+           <field name="arch" type="xml">
+               <tree string="Operation requests" colors="green:state in ('approved'); blue:state in ('draft');grey: state in ('done')">
+                <field name="request_date"/>
+         			<field name="partner_id"/>
+         			<field name="operation_type"/>
+         			<field name="quantity"/>
+         			<field name="user_id"/>
+         			<field name="state"/>
+               </tree>
+           </field>
+       </record>
+       
+       <record id="operation_request_form" model="ir.ui.view">
+           <field name="name">operation.request.form</field>
+           <field name="model">operation.request</field>
+           <field name="arch" type="xml">
+       		<form string="Operation request">
+      				<header>
+      					<button string="Submit" type="object" name="submit_operation" states="draft"/>
+      					<button string="Approve" type="object" name="approve_operation" states="waiting"/>
+      					<button string="Refuse" type="object" name="refuse_operation" states="waiting"/>
+      					<button string="Cancel" type="object" name="cancel_operation" states="draft,waiting,approved"/>
+      					<button string="Draft" type="object" name="reset_to_draft" states="waiting,cancelled"/>
+      					<button string="Execute" type="object" name="execute_operation" states="approved"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,done,cancelled,refused" statusbar_colors='{"draft":"grey","done":"green","cancelled":"orange","refused":"red"}'/>
+                </header>
+      				<sheet>
+       				<group>
 	       				<group>
-		       				<group>
-		       					<field name="state"/>
-		       					<field name="request_date" attrs="{'readonly':[('state','!=','draft')]}"/>
-			          			<field name="operation_type" attrs="{'readonly':[('state','!=','draft')]}"/>
-			          			<field name="receiver_not_member" attrs="{'invisible':[('operation_type','!=','transfer')]}"/>
-			          			<field name="partner_id" options="{'no_create':True}" attrs="{'readonly':[('state','!=','draft')]}"/>
-			          			<field name="partner_id_to" options="{'no_create':True}" attrs="{'invisible':['|',('operation_type','!=','transfer'), ('receiver_not_member','=',True)]}"/>
-		       				</group>
-		       				<group>
-			          			<field name="user_id"/>
-			          			<field name="share_product_id" attrs="{'readonly':[('state','!=','draft')]}" widget="selection"/>
-			          			<field name="share_short_name" readonly="True"/>
-			          			<field name="share_to_product_id" attrs="{'invisible':[('operation_type','!=','convert')],'required':[('operation_type','=','convert')],'readonly':[('state','!=','draft')]}" widget="selection"/>
-			          			<field name="share_to_short_name" readonly="True"/>
-			          			<field name="quantity" attrs="{'readonly':[('state','!=','draft')]}"/>
-			          			<field name="share_unit_price" readonly="True"/>
-			          			<field name="subscription_amount" readonly="True" />
-		       				</group>
-		       			</group>
-		       			<group>
-		       				<field name="subscription_request" attrs="{'invisible':['|',('operation_type','!=','transfer'),('receiver_not_member','=',False)]}" context="{'default_is_operation': True, 'default_ordered_parts':quantity,'default_share_product_id': share_product_id, 'default_source':'operation'}">
-		       					<tree>
-		       						<field name="name"/>
-					                <field name="no_registre"/>
-					                <field name="birthdate"/>
-					                <field name="phone"/>
-				          			<field name="email"/>
-				          			<field name="iban"/>
-				          			<field name="state" invisible="True"/>
-		       					</tree>
-			       				<form string="Subscription Requests">
-			       					<sheet>
+	       					<field name="state"/>
+	       					<field name="request_date" attrs="{'readonly':[('state','!=','draft')]}"/>
+		          			<field name="operation_type" attrs="{'readonly':[('state','!=','draft')]}"/>
+		          			<field name="receiver_not_member" attrs="{'invisible':[('operation_type','!=','transfer')]}"/>
+		          			<field name="partner_id" options="{'no_create':True}" attrs="{'readonly':[('state','!=','draft')]}"/>
+		          			<field name="partner_id_to" options="{'no_create':True}" attrs="{'invisible':['|',('operation_type','!=','transfer'), ('receiver_not_member','=',True)]}"/>
+	       				</group>
+	       				<group>
+		          			<field name="user_id"/>
+		          			<field name="share_product_id" attrs="{'readonly':[('state','!=','draft')]}" widget="selection"/>
+		          			<field name="share_short_name" readonly="True"/>
+		          			<field name="share_to_product_id" attrs="{'invisible':[('operation_type','!=','convert')],'required':[('operation_type','=','convert')],'readonly':[('state','!=','draft')]}" widget="selection"/>
+		          			<field name="share_to_short_name" readonly="True"/>
+		          			<field name="quantity" attrs="{'readonly':[('state','!=','draft')]}"/>
+		          			<field name="share_unit_price" readonly="True"/>
+		          			<field name="subscription_amount" readonly="True" />
+	       				</group>
+	       			</group>
+	       			<group>
+	       				<field name="subscription_request" attrs="{'invisible':['|',('operation_type','!=','transfer'),('receiver_not_member','=',False)]}" context="{'default_is_operation': True, 'default_ordered_parts':quantity,'default_share_product_id': share_product_id, 'default_source':'operation'}">
+	       					<tree>
+	       						<field name="name"/>
+				                <field name="no_registre"/>
+				                <field name="birthdate"/>
+				                <field name="phone"/>
+			          			<field name="email"/>
+			          			<field name="iban"/>
+			          			<field name="state" invisible="True"/>
+	       					</tree>
+		       				<form string="Subscription Requests">
+		       					<sheet>
+			       				<group>
+				       				<group>
+				       					<field name="name"/>
+				       					<field name="firstname"/>
+				       					<field name="lastname"/>
+				       					<field name="birthdate"/>
+				       					<field name="gender"/>
+				       					<field name="email"/>
+				       					<field name="phone"/>
+				       					<field name="no_registre"/>
+				       					<field name="iban"/>
+				       				</group>
 				       				<group>
-					       				<group>
-					       					<field name="name"/>
-					       					<field name="firstname"/>
-					       					<field name="lastname"/>
-					       					<field name="birthdate"/>
-					       					<field name="gender"/>
-					       					<field name="email"/>
-					       					<field name="phone"/>
-					       					<field name="no_registre"/>
-					       					<field name="iban"/>
-					       				</group>
-					       				<group>
-					       					<field name="address"/>
-					       					<field name="zip_code"/>
-					       					<field name="city"/>
-					       					<field name="country_id"/>
-					       					<field name="lang"/>
-					       					<field name="validated"/>
-					       					<field name="skip_control_ng"/>
-					       					<field name="ordered_parts" invisible="True"/>
-					       					<field name="source" invisible="True"/>
-					       					<field name="state" invisible="True"/>
-					       					<field name="share_product_id" invisible="True"/>
-					       				</group>
-					       			</group>
-				       				</sheet>
-				       			</form>
-		       				</field>
-		       			</group>
-       				</sheet>
-       			</form>
-            </field>
-        </record>    
-        
-        <record id="operation_request_action" model="ir.actions.act_window">
-            <field name="name">Operation request</field>
-            <field name="res_model">operation.request</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="operation_request_tree"/>
-        </record>
-	
-		<menuitem action="operation_request_action" name="Operation request" id="menu_easy_my_coop_operation_request" parent="menu_easy_my_coop_main_subscription" sequence="20" groups="easy_my_coop.group_energiris_manager"/>
-	</data>
-</openerp>
\ No newline at end of file
+				       					<field name="address"/>
+				       					<field name="zip_code"/>
+				       					<field name="city"/>
+				       					<field name="country_id"/>
+				       					<field name="lang"/>
+				       					<field name="validated"/>
+				       					<field name="skip_control_ng"/>
+				       					<field name="ordered_parts" invisible="True"/>
+				       					<field name="source" invisible="True"/>
+				       					<field name="state" invisible="True"/>
+				       					<field name="share_product_id" invisible="True"/>
+				       				</group>
+				       			</group>
+			       				</sheet>
+			       			</form>
+	       				</field>
+	       			</group>
+      				</sheet>
+      			</form>
+           </field>
+       </record>    
+       
+       <record id="operation_request_action" model="ir.actions.act_window">
+           <field name="name">Operation request</field>
+           <field name="res_model">operation.request</field>
+           <field name="view_type">form</field>
+           <field name="view_id" ref="operation_request_tree"/>
+       </record>
+
+	<menuitem action="operation_request_action" name="Operation request" id="menu_easy_my_coop_operation_request" parent="menu_easy_my_coop_main_subscription" sequence="20" groups="easy_my_coop.group_energiris_manager"/>
+</odoo>
\ No newline at end of file
diff --git a/easy_my_coop/view/product_view.xml b/easy_my_coop/view/product_view.xml
index dfddcaf..75afaf2 100644
--- a/easy_my_coop/view/product_view.xml
+++ b/easy_my_coop/view/product_view.xml
@@ -1,146 +1,145 @@
-<openerp>
-	<data>
-		<record id="product_template_share_form_view" model="ir.ui.view">
-            <field name="name">product.template.share.form</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="purchase.view_product_supplier_inherit"/>
-            <field name="arch" type="xml">
-                <xpath expr="//label[@for='purchase_ok']/.." position="after">
-                    <div groups="easy_my_coop.group_energiris_super_manager">
-                        <field name="is_share"/>
-                    	<label for="is_share"/>
-                    </div>
-                    <div attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user">
-                    	<field name="display_on_website"/>
-                    	<label for="display_on_website"/>
-                    </div>
-                </xpath>
-            </field>
-        </record>
-        
-        <record id="product_template_form_view" model="ir.ui.view">
-            <field name="name">product.template.common.form</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_form_view"/>
-            <field name="arch" type="xml">
-            	<xpath expr="//field[@name='type']" position="after">
-            		<field name="short_name" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
-            		<field name="default_share_product" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
-            		<field name="force_min_qty" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
-            		<field name="minimum_quantity" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
-            		<field name="customer" attrs="{'invisible':[('is_share','=',False)]}"/>
-            		<field name="by_company" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
-            		<field name="by_individual" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
-            		<field name="mail_template" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
-            	</xpath>
-            </field>
-        </record>
-        
-        
-        <record id="share_product_action" model="ir.actions.act_window">
-	        <field name="name">Share type</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="res_model">product.template</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">kanban,tree,form</field>
-	        <!-- <field name="context">{"search_default_filter_to_purchase":1}</field> -->
-	        <field name="search_view_id" eval="False"/> <!-- Force empty -->
-	        <field name="view_id" eval="False"/> <!-- Force empty -->
-	        <field name="domain">[('is_share','=',True)]</field>
-	        <field name="help" type="html">
-	          <p class="oe_view_nocontent_create">
-	            Click to define a new share product.
-	          </p>
-	        </field>
-	    </record>
-        
-        <menuitem action="share_product_action" name="Share type" id="menu_easy_my_coop_share_product"  parent="menu_easy_my_coop_main_subscription" sequence="20"/>
-        
-        <!-- overriding product views to not display share product in the purchase and sale views-->
-        
-        <record id="product.product_normal_action" model="ir.actions.act_window">
-            <field name="name">Product</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.product</field>
-            <field name="view_mode">tree,form,kanban</field>
-            <field name="view_type">form</field>
-            <field name="search_view_id" ref="product.product_search_form_view"/>
-            <field name="view_id" eval="False"/> <!-- Force empty -->
-            <field name="domain">[('is_share','=',False)]</field>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to define a new product.
-              </p><p>
-                You must define a product for everything you sell, whether it's
-                a physical product, a consumable or a service you offer to
-                customers.
-              </p><p>
-                The product form contains information to simplify the sale
-                process: price, notes in the quotation, accounting data,
-                procurement methods, etc.
-              </p>
-            </field>
-        </record>
-        
-        <record id="product.product_template_action" model="ir.actions.act_window">
-            <field name="name">Products</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.template</field>
-            <field name="view_mode">tree,form,kanban</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="product.product_template_kanban_view"/>
-            <field name="context">{"search_default_filter_to_sell":1}</field>
-            <field name="domain">[('is_share','=',False)]</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to define a new product.
-                </p><p>
-                    You must define a product for everything you sell, whether it's a physical product, a consumable or a service you offer to  customers.               
-                </p><p>
-                    The product form contains information to simplify the sale process: price, notes in the quotation, accounting data, procurement methods, etc.
-                </p>
-            </field>
-        </record>
+<odoo>
+	<record id="product_template_share_form_view" model="ir.ui.view">
+           <field name="name">product.template.share.form</field>
+           <field name="model">product.template</field>
+           <field name="inherit_id" ref="purchase.view_product_supplier_inherit"/>
+           <field name="arch" type="xml">
+               <xpath expr="//label[@for='purchase_ok']/.." position="after">
+                   <div groups="easy_my_coop.group_energiris_super_manager">
+                       <field name="is_share"/>
+                   	<label for="is_share"/>
+                   </div>
+                   <div attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user">
+                   	<field name="display_on_website"/>
+                   	<label for="display_on_website"/>
+                   </div>
+               </xpath>
+           </field>
+       </record>
+       
+       <record id="product_template_form_view" model="ir.ui.view">
+           <field name="name">product.template.common.form</field>
+           <field name="model">product.template</field>
+           <field name="inherit_id" ref="product.product_template_form_view"/>
+           <field name="arch" type="xml">
+           	<xpath expr="//field[@name='type']" position="after">
+           		<field name="short_name" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
+           		<field name="default_share_product" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
+           		<field name="force_min_qty" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
+           		<field name="minimum_quantity" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
+           		<field name="customer" attrs="{'invisible':[('is_share','=',False)]}"/>
+           		<field name="by_company" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
+           		<field name="by_individual" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
+           		<field name="mail_template" attrs="{'invisible':[('is_share','=',False)]}" groups="easy_my_coop.group_energiris_user"/>
+           	</xpath>
+           </field>
+       </record>
+       
+       
+       <record id="share_product_action" model="ir.actions.act_window">
+        <field name="name">Share type</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">product.template</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <!-- <field name="context">{"search_default_filter_to_purchase":1}</field> -->
+        <field name="search_view_id" eval="False"/> <!-- Force empty -->
+        <field name="view_id" eval="False"/> <!-- Force empty -->
+        <field name="domain">[('is_share','=',True)]</field>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to define a new share product.
+          </p>
+        </field>
+    </record>
+       
+       <menuitem action="share_product_action" name="Share type" id="menu_easy_my_coop_share_product"  parent="menu_easy_my_coop_main_subscription" sequence="20"/>
+       
+       <!-- overriding product views to not display share product in the purchase and sale views-->
+       
+       <record id="product.product_normal_action" model="ir.actions.act_window">
+           <field name="name">Product</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">product.product</field>
+           <field name="view_mode">tree,form,kanban</field>
+           <field name="view_type">form</field>
+           <field name="search_view_id" ref="product.product_search_form_view"/>
+           <field name="view_id" eval="False"/> <!-- Force empty -->
+           <field name="domain">[('is_share','=',False)]</field>
+           <field name="help" type="html">
+             <p class="oe_view_nocontent_create">
+               Click to define a new product.
+             </p><p>
+               You must define a product for everything you sell, whether it's
+               a physical product, a consumable or a service you offer to
+               customers.
+             </p><p>
+               The product form contains information to simplify the sale
+               process: price, notes in the quotation, accounting data,
+               procurement methods, etc.
+             </p>
+           </field>
+       </record>
+       
+       <record id="product.product_template_action" model="ir.actions.act_window">
+           <field name="name">Products</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">product.template</field>
+           <field name="view_mode">tree,form,kanban</field>
+           <field name="view_type">form</field>
+           <field name="view_id" ref="product.product_template_kanban_view"/>
+           <field name="context">{"search_default_filter_to_sell":1}</field>
+           <field name="domain">[('is_share','=',False)]</field>
+           <field name="help" type="html">
+               <p class="oe_view_nocontent_create">
+                   Click to define a new product.
+               </p><p>
+                   You must define a product for everything you sell, whether it's a physical product, a consumable or a service you offer to  customers.               
+               </p><p>
+                   The product form contains information to simplify the sale process: price, notes in the quotation, accounting data, procurement methods, etc.
+               </p>
+           </field>
+       </record>
 
-        <record id="product.product_template_action_product" model="ir.actions.act_window">
-            <field name="name">Products</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.template</field>
-            <field name="view_mode">tree,form,kanban</field>
-            <field name="view_type">form</field>
-            <field name="context">{"search_default_products": 1, 'default_type': 'product'}</field>
-            <field name="domain">[('is_share','=',False)]</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to define a new product.
-                </p>
-            </field>
-        </record>
-        
+       <record id="product.product_template_action" model="ir.actions.act_window">
+           <field name="name">Products</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">product.template</field>
+           <field name="view_mode">tree,form,kanban</field>
+           <field name="view_type">form</field>
+           <field name="context">{"search_default_products": 1, 'default_type': 'product'}</field>
+           <field name="domain">[('is_share','=',False)]</field>
+           <field name="help" type="html">
+               <p class="oe_view_nocontent_create">
+                   Click to define a new product.
+               </p>
+           </field>
+       </record>
+       
+       <!-- move this action to another module cause the original action has been
+            moved to purchase module. So we want to avoid make purchase module installed
         <record id="product.product_normal_action_puchased" model="ir.actions.act_window">
-	        <field name="name">Products</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="res_model">product.template</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">kanban,tree,form</field>
-	        <field name="context">{"search_default_filter_to_purchase":1}</field>
-	        <field name="search_view_id" eval="False"/> <!-- Force empty -->
-	        <field name="view_id" eval="False"/> <!-- Force empty -->
-	        <field name="domain">[('is_share','=',False)]</field>
-	        <field name="help" type="html">
-	          <p class="oe_view_nocontent_create">
-	            Click to define a new product.
-	          </p><p>
-	            You must define a product for everything you purchase, whether
-	            it's a physical product, a consumable or services you buy to
-	            subcontractants.
-	          </p><p>
-	            The product form contains detailed information to improve the
-	            purchase process: prices, procurement logistics, accounting data,
-	            available vendors, etc.
-	          </p>
-	        </field>
-	    </record>
-        
-	</data>
-</openerp>
+        <field name="name">Products</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">product.template</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <field name="context">{"search_default_filter_to_purchase":1}</field>
+        <field name="search_view_id" eval="False"/> Force empty 
+        <field name="view_id" eval="False"/> Force empty 
+        <field name="domain">[('is_share','=',False)]</field>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to define a new product.
+          </p><p>
+            You must define a product for everything you purchase, whether
+            it's a physical product, a consumable or services you buy to
+            subcontractants.
+          </p><p>
+            The product form contains detailed information to improve the
+            purchase process: prices, procurement logistics, accounting data,
+            available vendors, etc.
+          </p>
+        </field>
+    </record> -->
+</odoo>
diff --git a/easy_my_coop/view/res_company_view.xml b/easy_my_coop/view/res_company_view.xml
index 3bfdd48..3a1123d 100644
--- a/easy_my_coop/view/res_company_view.xml
+++ b/easy_my_coop/view/res_company_view.xml
@@ -1,29 +1,27 @@
-<openerp>
-	<data>
-		<record model="ir.ui.view" id="view_company_inherit_form2">
-            <field name="name">res.company.form.easymy.coop</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="model">res.company</field>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='account_grp']" position="after">
-                    <group name="coop_grp" string="EasyMy Coop" groups="easy_my_coop.group_energiris_manager">
-                        <field name="unmix_share_type"/>
-                        <field name="allow_id_card_upload"/>
-                        <field name="create_user"/>
-                        <field name="display_logo1"/>
-                        <field name="bottom_logo1"/>
-                        <field name="display_logo2"/>
-                        <field name="bottom_logo2"/>
-                        <field name="coop_email_contact"/>
-                        <field name="subscription_maximum_amount"/>
-                        <field name="property_cooperator_account"/>
-                        <field name="default_country_id"/>
-                        <field name="default_lang_id"/>
-                        <field name="board_representative"/>
-                        <field name="signature_scan"/>
-                    </group>
-                </xpath>
-            </field>
-        </record>
-	</data>
-</openerp>
\ No newline at end of file
+<odoo>
+	<record model="ir.ui.view" id="view_company_inherit_form2">
+           <field name="name">res.company.form.easymy.coop</field>
+           <field name="inherit_id" ref="base.view_company_form"/>
+           <field name="model">res.company</field>
+           <field name="arch" type="xml">
+               <group name="social_media" position="before">
+                   <group name="coop_grp" string="EasyMy Coop" groups="easy_my_coop.group_energiris_manager">
+                       <field name="unmix_share_type"/>
+                       <field name="allow_id_card_upload"/>
+                       <field name="create_user"/>
+                       <field name="display_logo1"/>
+                       <field name="bottom_logo1"/>
+                       <field name="display_logo2"/>
+                       <field name="bottom_logo2"/>
+                       <field name="coop_email_contact"/>
+                       <field name="subscription_maximum_amount"/>
+                       <field name="property_cooperator_account"/>
+                       <field name="default_country_id"/>
+                       <field name="default_lang_id"/>
+                       <field name="board_representative"/>
+                       <field name="signature_scan"/>
+                   </group>
+               </group>
+           </field>
+       </record>
+</odoo>
\ No newline at end of file
diff --git a/easy_my_coop/view/res_partner_view.xml b/easy_my_coop/view/res_partner_view.xml
index e775cdb..c5525f9 100644
--- a/easy_my_coop/view/res_partner_view.xml
+++ b/easy_my_coop/view/res_partner_view.xml
@@ -161,7 +161,7 @@
         <record id="remove_partner_follower" model="ir.ui.view">
             <field name="name">res.partner.remove.follower.inherit</field>
             <field name="model">res.partner</field>
-            <field name="inherit_id" ref="mail.view_emails_partner_info_form"/>
+            <field name="inherit_id" ref="mail.res_partner_view_form_inherit_mail"/>
             <field name="arch" type="xml">
             	<field name="message_follower_ids" position="replace"/>
             </field>
diff --git a/easy_my_coop/view/subscription_request_view.xml b/easy_my_coop/view/subscription_request_view.xml
index 745596a..882b13f 100644
--- a/easy_my_coop/view/subscription_request_view.xml
+++ b/easy_my_coop/view/subscription_request_view.xml
@@ -1,241 +1,240 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-		<menuitem name="Easy-My Coop" id="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_energiris_user"/>
-		<menuitem name="Subscription" id="menu_easy_my_coop_main_subscription" parent="menu_main_easy_my_coop" sequence="10" groups="easy_my_coop.group_energiris_manager"/>
-		<menuitem name="Reporting" id="menu_easy_my_coop_main_reporting" parent="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_energiris_manager"/>
+<odoo>
+	<menuitem name="Easy-My Coop" id="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_energiris_user"/>
+	<menuitem name="Subscription" id="menu_easy_my_coop_main_subscription" parent="menu_main_easy_my_coop" sequence="10" groups="easy_my_coop.group_energiris_manager"/>
+	<menuitem name="Reporting" id="menu_easy_my_coop_main_reporting" parent="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_energiris_manager"/>
 
-		<record id="subscription_request_tree" model="ir.ui.view">
-            <field name="name">subscription.request.tree</field>
-            <field name="model">subscription.request</field>
-            <field name="arch" type="xml">
-                <tree string="Cooperator Subscriptions Request" colors="red:validated == False; blue:state in ('draft');grey: state in ('done')">
-	                <field name="name"/>
-	                <field name="date" string="Request Date"/>
-          			<field name="type"/>
-          			<field name="share_short_name" string="Share Type"/>
-          			<field name="ordered_parts" string="Quantity" sum="Total ordered parts"/>
-          			<field name="subscription_amount" sum="Total amount"/>
-          			<field name="email"/>
-          			<field name="iban"/>
-          			<field name="partner_id"/>
-          			<field name="source"/>
-          			<field name="state"/>
-          			<field name="validated" invisible="True"/>
-                    <button type="object" name="validate_subscription_request" attrs="{'invisible':['|',('state','!=','draft'),('validated','=',False)]}" icon="STOCK_MEDIA_PLAY" />
-                    <button type="object" name="block_subscription_request" states="draft" groups="easy_my_coop.group_energiris_user" icon="gtk-cancel"/>
-                    <button type="object" name="unblock_subscription_request" states="block" groups="easy_my_coop.group_energiris_manager" icon="gtk-jump-to"/>
-                </tree>
-            </field>
-        </record>
+	<record id="subscription_request_tree" model="ir.ui.view">
+        <field name="name">subscription.request.tree</field>
+        <field name="model">subscription.request</field>
+        <field name="arch" type="xml">
+            <!--<tree string="Cooperator Subscriptions Request" colors="red:validated == False; blue:state in ('draft');grey: state in ('done')">-->
+            <tree string="Cooperator Subscriptions Request">
+                <field name="name"/>
+                <field name="date" string="Request Date"/>
+      			<field name="type"/>
+      			<field name="share_short_name" string="Share Type"/>
+      			<field name="ordered_parts" string="Quantity" sum="Total ordered parts"/>
+      			<field name="subscription_amount" sum="Total amount"/>
+      			<field name="email"/>
+      			<field name="iban"/>
+      			<field name="partner_id"/>
+      			<field name="source"/>
+      			<field name="state"/>
+      			<field name="validated" invisible="True"/>
+                <button type="object" name="validate_subscription_request" attrs="{'invisible':['|',('state','!=','draft'),('validated','=',False)]}" icon="STOCK_MEDIA_PLAY" />
+                <button type="object" name="block_subscription_request" states="draft" groups="easy_my_coop.group_energiris_user" icon="gtk-cancel"/>
+                <button type="object" name="unblock_subscription_request" states="block" groups="easy_my_coop.group_energiris_manager" icon="gtk-jump-to"/>
+            </tree>
+        </field>
+    </record>
 
-        <record id="subscription_request_form" model="ir.ui.view">
-            <field name="name">subscription.request.form</field>
-            <field name="model">subscription.request</field>
-            <field name="arch" type="xml">
-        		<form string="Subscription Requests">
-       				<header>
-       					<button string="Validate" type="object" name="validate_subscription_request" attrs="{'invisible':['|',('state','not in',['draft','waiting']),('validated','=',False)]}"/>
-       					<button string="Waiting list" type="object" name="put_on_waiting_list" states="draft"/>
-       					<button string="Cancel" type="object" name="cancel_subscription_request" states="draft,done,block" groups="easy_my_coop.group_energiris_manager"/>
-       					<field name="state" widget="statusbar" statusbar_visible="draft,cancelled,done,failed"/>
-       				</header>
-       				<sheet>
+    <record id="subscription_request_form" model="ir.ui.view">
+        <field name="name">subscription.request.form</field>
+        <field name="model">subscription.request</field>
+        <field name="arch" type="xml">
+    		<form string="Subscription Requests">
+   				<header>
+   					<button string="Validate" type="object" name="validate_subscription_request" attrs="{'invisible':['|',('state','not in',['draft','waiting']),('validated','=',False)]}"/>
+   					<button string="Waiting list" type="object" name="put_on_waiting_list" states="draft"/>
+   					<button string="Cancel" type="object" name="cancel_subscription_request" states="draft,done,block" groups="easy_my_coop.group_energiris_manager"/>
+   					<field name="state" widget="statusbar" statusbar_visible="draft,cancelled,done,failed"/>
+   				</header>
+   				<sheet>
+       				<group>
 	       				<group>
-		       				<group>
-		       					<field name="already_cooperator"/>
-		       					<field name="is_company" groups="easy_my_coop.group_energiris_super_manager"/>
-		       					<field name="is_operation" invisible="True"/>
-		       					<field name="company_name" attrs="{'invisible':[('is_company','=',False)]}"/>
-		       					<field name="company_email" attrs="{'invisible':[('is_company','=',False)]}"/>
-		       					<field name="company_type" attrs="{'invisible':[('is_company','=',False)]}"/>
-		       					<field name="company_register_number" attrs="{'invisible':[('is_company','=',False)]}"/>
-		       					<field name="name"/>
-		       					<field name="firstname"/>
-		       					<field name="lastname"/>
-		       					<field name="birthdate"/>
-		       					<field name="gender"/>
-		       					<field name="email"/>
-		       					<field name="phone"/>
-		       					<field name="contact_person_function" attrs="{'invisible':[('is_company','=',False)]}"/>
-		       					<field name="no_registre"/>
-		       					<field name="iban"/>
-		       					<field name="address"/>
-		       					<field name="zip_code"/>
-		       					<field name="city"/>
-		       					<field name="country_id" options="{'no_create':True}"/>
-		       				</group>
-		       				<group>
-		       					<field name="capital_release_request_date" groups="easy_my_coop.group_energiris_super_manager"/>
-		       					<field name="date"/>
-		       					<field name="source"/>
-		       					<field name="ordered_parts"/>
-		       					<field name="share_product_id" widget="selection"/>
-		       					<field name="share_short_name"/>
-		       					<field name="share_unit_price"/>
-		       					<field name="subscription_amount"/>
-		       					<field name="partner_id" options="{'no_create':True}"/>
-		       					<field name="type"/>
-		       					<field name="lang"/>
-		       					<field name="validated"/>
-		       					<field name="skip_control_ng"/>
-		       				</group>
-		       			</group>
-		       			<notebook>
-		       				<page name="capital_release_request" string="Capital release request">
-		       					<field name="capital_release_request">
-			       					<tree options="{'no_create':True}">
-			       						<field string="Cooperator"  name="partner_id"/>
-			       						<field name="date_invoice"/>
-			       						<field name="number"/>
-			       						<field string="Reference" name="reference"/>
-			       						<field name="date_due"/>
-			       						<field name="amount_total_signed"/>
-			       						<field name="residual_signed"/>
-			       						<field name="state"/>
-			       					</tree>
-		       					</field>
-		       				</page>
-		       			</notebook>
-       				</sheet>
-       			</form>
-            </field>
-        </record>    
+	       					<field name="already_cooperator"/>
+	       					<field name="is_company" groups="easy_my_coop.group_energiris_super_manager"/>
+	       					<field name="is_operation" invisible="True"/>
+	       					<field name="company_name" attrs="{'invisible':[('is_company','=',False)]}"/>
+	       					<field name="company_email" attrs="{'invisible':[('is_company','=',False)]}"/>
+	       					<field name="company_type" attrs="{'invisible':[('is_company','=',False)]}"/>
+	       					<field name="company_register_number" attrs="{'invisible':[('is_company','=',False)]}"/>
+	       					<field name="name"/>
+	       					<field name="firstname"/>
+	       					<field name="lastname"/>
+	       					<field name="birthdate"/>
+	       					<field name="gender"/>
+	       					<field name="email"/>
+	       					<field name="phone"/>
+	       					<field name="contact_person_function" attrs="{'invisible':[('is_company','=',False)]}"/>
+	       					<field name="no_registre"/>
+	       					<field name="iban"/>
+	       					<field name="address"/>
+	       					<field name="zip_code"/>
+	       					<field name="city"/>
+	       					<field name="country_id" options="{'no_create':True}"/>
+	       				</group>
+	       				<group>
+	       					<field name="capital_release_request_date" groups="easy_my_coop.group_energiris_super_manager"/>
+	       					<field name="date"/>
+	       					<field name="source"/>
+	       					<field name="ordered_parts"/>
+	       					<field name="share_product_id" widget="selection"/>
+	       					<field name="share_short_name"/>
+	       					<field name="share_unit_price"/>
+	       					<field name="subscription_amount"/>
+	       					<field name="partner_id" options="{'no_create':True}"/>
+	       					<field name="type"/>
+	       					<field name="lang"/>
+	       					<field name="validated"/>
+	       					<field name="skip_control_ng"/>
+	       				</group>
+	       			</group>
+	       			<notebook>
+	       				<page name="capital_release_request" string="Capital release request">
+	       					<field name="capital_release_request">
+		       					<tree options="{'no_create':True}">
+		       						<field string="Cooperator"  name="partner_id"/>
+		       						<field name="date_invoice"/>
+		       						<field name="number"/>
+		       						<field string="Reference" name="reference"/>
+		       						<field name="date_due"/>
+		       						<field name="amount_total_signed"/>
+		       						<field name="residual_signed"/>
+		       						<field name="state"/>
+		       					</tree>
+	       					</field>
+	       				</page>
+	       			</notebook>
+   				</sheet>
+   			</form>
+        </field>
+    </record>    
 
-        <record id="view_subscription_request_filter" model="ir.ui.view">
-            <field name="name">Cooperator Subscription Search</field>
-            <field name="model">subscription.request</field>
-            <field name="arch" type="xml">
-                <search string="Search Subscription Request">
-                   <field name="name"/>
-                   <separator/>
-                   <filter string="draft" name="state_draft" domain="[('state','=','draft')]"/>
-                   <filter string="done" name="state_done" domain="[('state','=','done')]"/>
-                   <separator/>
-                   <filter string="Unvalid" name="Unvalid" domain="[('validated', '=', False)]"/>
-                   <group expand="0" name="group_by" string="Group By">
-                       <filter string="Request type" context="{'group_by' : 'type'}" />
-                       <filter string="Date Month" context="{'group_by': 'date'}"/>
-                   </group>
-               </search>
-            </field>
-        </record>
+    <record id="view_subscription_request_filter" model="ir.ui.view">
+        <field name="name">Cooperator Subscription Search</field>
+        <field name="model">subscription.request</field>
+        <field name="arch" type="xml">
+            <search string="Search Subscription Request">
+               <field name="name"/>
+               <separator/>
+               <filter string="draft" name="state_draft" domain="[('state','=','draft')]"/>
+               <filter string="done" name="state_done" domain="[('state','=','done')]"/>
+               <separator/>
+               <filter string="Unvalid" name="Unvalid" domain="[('validated', '=', False)]"/>
+               <group expand="0" name="group_by" string="Group By">
+                   <filter name="request_type" string="Request type" context="{'group_by' : 'type'}" />
+                   <filter name="date_month" string="Date Month" context="{'group_by': 'date'}"/>
+               </group>
+           </search>
+        </field>
+    </record>
 
-        <record id="subscription_request_action" model="ir.actions.act_window">
-            <field name="name">Cooperator Subscription</field>
-            <field name="res_model">subscription.request</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('is_company','=',False),('is_operation','=',False)]</field>
-            <field name="context">{'default_source':'manual'}</field>
-            <field name="view_id" ref="subscription_request_tree"/>
-            <field name="search_view_id" ref="view_subscription_request_filter"/>
-        </record>
+    <record id="subscription_request_action" model="ir.actions.act_window">
+        <field name="name">Cooperator Subscription</field>
+        <field name="res_model">subscription.request</field>
+        <field name="view_type">form</field>
+        <field name="domain">[('is_company','=',False),('is_operation','=',False)]</field>
+        <field name="context">{'default_source':'manual'}</field>
+        <field name="view_id" ref="subscription_request_tree"/>
+        <field name="search_view_id" ref="view_subscription_request_filter"/>
+    </record>
 
-		<menuitem action="subscription_request_action" name="Cooperator Subscription" id="menu_easy_my_coop_subscription_request"  parent="menu_easy_my_coop_main_subscription" sequence="10"/>
+	<menuitem action="subscription_request_action" name="Cooperator Subscription" id="menu_easy_my_coop_subscription_request"  parent="menu_easy_my_coop_main_subscription" sequence="10"/>
 
-		<record id="company_subscription_request_tree" model="ir.ui.view">
-            <field name="name">subscription.request.tree</field>
-            <field name="model">subscription.request</field>
-            <field name="arch" type="xml">
-                <tree string="Company Cooperator Subscriptions Request" colors="red:validated == False; blue:state in ('draft');grey: state in ('done')">
-	                <field name="company_name"/>
-	                <field name="name"/>
-	                <field name="date" string="Request Date"/>
-          			<field name="type"/>
-          			<field name="share_short_name" string="Share Type"/>
-          			<field name="ordered_parts" string="Quantity" sum="Total ordered parts"/>
-          			<field name="subscription_amount" sum="Total amount"/>
-          			<field name="email"/>
-          			<field name="iban"/>
-          			<field name="partner_id"/>
-          			<field name="source"/>
-          			<field name="state"/>
-          			<field name="validated" invisible="True"/>
-                    <button type="object" name="validate_subscription_request" attrs="{'invisible':['|',('state','!=','draft'),('validated','=',False)]}" icon="STOCK_MEDIA_PLAY"/>
-                    <button type="object" name="block_subscription_request" states="draft" groups="easy_my_coop.group_energiris_user" icon="gtk-cancel"/>
-                    <button type="object" name="unblock_subscription_request" states="block" groups="easy_my_coop.group_energiris_manager" icon="gtk-jump-to"/>
-                </tree>
-            </field>
-        </record>
+	<record id="company_subscription_request_tree" model="ir.ui.view">
+        <field name="name">subscription.request.tree</field>
+        <field name="model">subscription.request</field>
+        <field name="arch" type="xml">
+            <tree string="Company Cooperator Subscriptions Request" colors="red:validated == False; blue:state in ('draft');grey: state in ('done')">
+                <field name="company_name"/>
+                <field name="name"/>
+                <field name="date" string="Request Date"/>
+      			<field name="type"/>
+      			<field name="share_short_name" string="Share Type"/>
+      			<field name="ordered_parts" string="Quantity" sum="Total ordered parts"/>
+      			<field name="subscription_amount" sum="Total amount"/>
+      			<field name="email"/>
+      			<field name="iban"/>
+      			<field name="partner_id"/>
+      			<field name="source"/>
+      			<field name="state"/>
+      			<field name="validated" invisible="True"/>
+                <button type="object" name="validate_subscription_request" attrs="{'invisible':['|',('state','!=','draft'),('validated','=',False)]}" icon="STOCK_MEDIA_PLAY"/>
+                <button type="object" name="block_subscription_request" states="draft" groups="easy_my_coop.group_energiris_user" icon="gtk-cancel"/>
+                <button type="object" name="unblock_subscription_request" states="block" groups="easy_my_coop.group_energiris_manager" icon="gtk-jump-to"/>
+            </tree>
+        </field>
+    </record>
 
-		<record id="company_subscription_request_action" model="ir.actions.act_window">
-            <field name="name">Company Subscription</field>
-            <field name="res_model">subscription.request</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('is_company','=',True),('is_operation','=',False)]</field>
-            <field name="context">{'default_is_company': True,'default_source':'manual'}</field>
-            <field name="view_id" ref="company_subscription_request_tree"/>
-            <field name="search_view_id" ref="view_subscription_request_filter"/>
-        </record>
+	<record id="company_subscription_request_action" model="ir.actions.act_window">
+        <field name="name">Company Subscription</field>
+        <field name="res_model">subscription.request</field>
+        <field name="view_type">form</field>
+        <field name="domain">[('is_company','=',True),('is_operation','=',False)]</field>
+        <field name="context">{'default_is_company': True,'default_source':'manual'}</field>
+        <field name="view_id" ref="company_subscription_request_tree"/>
+        <field name="search_view_id" ref="view_subscription_request_filter"/>
+    </record>
 
-		<menuitem action="company_subscription_request_action" name="Company Subscription" id="menu_easy_my_coop_company_subscription_request"  parent="menu_easy_my_coop_main_subscription" sequence="12"/>
+	<menuitem action="company_subscription_request_action" name="Company Subscription" id="menu_easy_my_coop_company_subscription_request"  parent="menu_easy_my_coop_main_subscription" sequence="12"/>
 
-        <record id="share_line_form" model="ir.ui.view">
-            <field name="name">share.line.form</field>
-            <field name="model">share.line</field>
-            <field name="arch" type="xml">
-        		<form string="Share line">
-       				<header>
-       					<button string="Update info" name="%(action_view_update_share_line_info)d"
-                                type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_energiris_super_manager"/>
-       				</header>
-       				<sheet>
+    <record id="share_line_form" model="ir.ui.view">
+        <field name="name">share.line.form</field>
+        <field name="model">share.line</field>
+        <field name="arch" type="xml">
+    		<form string="Share line">
+   				<header>
+   					<button string="Update info" name="%(action_view_update_share_line_info)d"
+                            type="action" context="{'default_active_id': active_id}" groups="easy_my_coop.group_energiris_super_manager"/>
+   				</header>
+   				<sheet>
+       				<group>
+       					<group>
+       						<field name="partner_id"/>
+       						<field name="share_product_id"/>
+       						<field name="share_number"/>
+	       				</group>
 	       				<group>
-	       					<group>
-	       						<field name="partner_id"/>
-	       						<field name="share_product_id"/>
-	       						<field name="share_number"/>
-		       				</group>
-		       				<group>
-		       					<field name="share_short_name"/>
-		       					<field name="share_unit_price"/>
-		       					<field name="effective_date"/>
-		       					<field name="total_amount_line"/>
-		       				</group>
+	       					<field name="share_short_name"/>
+	       					<field name="share_unit_price"/>
+	       					<field name="effective_date"/>
+	       					<field name="total_amount_line"/>
 	       				</group>
-	       			</sheet>
-	       		</form>
-	       	</field>
-	    </record>
+       				</group>
+       			</sheet>
+       		</form>
+       	</field>
+    </record>
 
-		<record id="share_line_tree" model="ir.ui.view">
-            <field name="name">share.line.tree</field>
-            <field name="model">share.line</field>
-            <field name="arch" type="xml">
-                <tree>
-	                <field name="partner_id"/>
-	                <field name="share_product_id"/>
-	                <field name="share_number"/>
-          			<field name="share_short_name"/>
-          			<field name="share_unit_price"/>
-          			<field name="effective_date"/>
-          			<field name="total_amount_line"/>
-                </tree>
-            </field>
-        </record>
+	<record id="share_line_tree" model="ir.ui.view">
+        <field name="name">share.line.tree</field>
+        <field name="model">share.line</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="partner_id"/>
+                <field name="share_product_id"/>
+                <field name="share_number"/>
+      			<field name="share_short_name"/>
+      			<field name="share_unit_price"/>
+      			<field name="effective_date"/>
+      			<field name="total_amount_line"/>
+            </tree>
+        </field>
+    </record>
 
-        <record id="view_share_line_filter" model="ir.ui.view">
-            <field name="name">Share Line Search</field>
-            <field name="model">share.line</field>
-            <field name="arch" type="xml">
-                <search string="Search Share Line">
-                   <field name="partner_id"/>
-                   <field name="effective_date"/>
-                   <separator/>
-                   <group name="group_by" string="Group By">
-                       <filter string="Cooperator" context="{'group_by' : 'partner_id'}" />
-                       <filter string="Effective date" context="{'group_by': 'effective_date'}"/>
-                   </group>
-               </search>
-            </field>
-        </record>
+    <record id="view_share_line_filter" model="ir.ui.view">
+        <field name="name">Share Line Search</field>
+        <field name="model">share.line</field>
+        <field name="arch" type="xml">
+            <search string="Search Share Line">
+               <field name="partner_id"/>
+               <field name="effective_date"/>
+               <separator/>
+               <group name="group_by" string="Group By">
+                   <filter name="cooperator" string="Cooperator" context="{'group_by' : 'partner_id'}" />
+                   <filter name="effective_date" string="Effective date" context="{'group_by': 'effective_date'}"/>
+               </group>
+           </search>
+        </field>
+    </record>
 
-		<record id="share_line_action" model="ir.actions.act_window">
-            <field name="name">Share Lines</field>
-            <field name="res_model">share.line</field>
-            <field name="view_type">form</field>
-        </record>
+	<record id="share_line_action" model="ir.actions.act_window">
+        <field name="name">Share Lines</field>
+        <field name="res_model">share.line</field>
+        <field name="view_type">form</field>
+    </record>
 
-		<menuitem action="share_line_action" name="Share lines" id="menu_easy_my_coop_share_line"  parent="menu_easy_my_coop_main_subscription" sequence="20" groups="group_energiris_super_manager"/>
-	</data>
-</openerp>
\ No newline at end of file
+	<menuitem action="share_line_action" name="Share lines" id="menu_easy_my_coop_share_line"  parent="menu_easy_my_coop_main_subscription" sequence="20" groups="group_energiris_super_manager"/>
+</odoo>
\ No newline at end of file
diff --git a/easy_my_coop/view/subscription_template.xml b/easy_my_coop/view/subscription_template.xml
index 25d7081..ea67a19 100644
--- a/easy_my_coop/view/subscription_template.xml
+++ b/easy_my_coop/view/subscription_template.xml
@@ -1,554 +1,551 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Coop">
- 	<xpath expr="." position="inside">
-		<script type="text/javascript" src="/easy_my_coop/static/src/js/easy_my_coop.js"></script>
-		<script type="text/javascript" src="/easy_my_coop/static/src/js/jquery.inputmask.bundle.js"></script>
-	</xpath>
-</template>
-
-<template id="company_operational_offices" inherit_id="website.company_description" name="Company Description">
-    <address itemscope="itemscope" position="inside">
-	    <div class="fa fa-building-o" t-field="res_company.company_registry"/><br/>
-	    <div class="fa fa-bank" t-field="res_company.partner_id.bank_ids[0].sanitized_acc_number"/>
-    </address>
-</template>
-
-<template id="cooperator_thanks" name="Cooperator contact us" page="True">
-    <t t-call="website.layout">
-      <div id="wrap">
-        <div class="oe_structure"/>
-        <div class="container">
-            <h1>Thanks!</h1>
-            <div class="row">
-                <div class="col-md-8">
-                    <div class="alert alert-success">
-                        Your subscription has been successfully registered.
-                        <button type="button" class="close" data-dismiss="alert">&amp;times;</button>
-                    </div>
-                    <p>
-                        We will get back to you shortly.
-                    </p>
-                    <ul class="list-unstyled">
-                        <li><i class="fa fa-phone"></i> : <span t-field="res_company.phone"/></li>
-                        <li><i class="fa fa-envelope"></i> : <span t-field="res_company.email"/></li>
-                    </ul>
-                </div>
-                <div class="col-md-4">
-                    <t t-call="website.company_description"/>
-                </div>
-            </div>
-        </div>
-        <div class="oe_structure"/>
-      </div>
-    </t>
-</template>
-		
-
-<template id="easy_my_coop.becomecooperator" name="Become Cooperator" page="True">
-	 <t t-call="website.layout">
-      <div id="wrap">
-        <div class="oe_structure"/>
-        <div class="container oe_easymy_coop">
-            <h2 class="energie">Become Cooperator</h2><br/>
-            <div class="row">
-                <div class="col-md-8">
-					<form action="/subscription/subscribe_share" method="post" class="form-horizontal mt32" enctype="multipart/form-data">                    
-					   <p style="color:red;"><t t-esc="error_msg"/></p>
-			           <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-			           					           
-			           <div t-attf-class="form-group">
-			              <a class='btn btn-primary' t-if="not logged" t-attf-href="/web/login?redirect=#{ request.httprequest.url }">You have already an account?</a>
-			              <br/>
-			           </div>
-					           
-			           <div t-attf-class="form-group" style="display: none;">
-							<label>
-								<input type="checkbox" t-att-checked="logged" name="logged"/>
-								Logged
-							</label>
-						</div>
-						
-			           <div t-attf-class="form-group">
-							<label>
-								<input type="checkbox" t-att-value="already_cooperator" name="already_cooperator" />
-								Already cooperator?
-							</label>
-						</div>
-			           
-			           <div name="email_from_container" t-attf-class="form-group #{error and 'email_from' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="email">Email</label>
-			                <div class="col-md-7 col-sm-8 bottom-line" style="padding-bottom:20px">
-			                    <input type="email" class="form-control mandatory-field" name="email" required="True" t-attf-value="#{email or ''}" placeholder="didier.bourdon@bees-coop.be"/>
-			                </div>
-			            </div>
-
-			            <div t-attf-class="form-group #{error and 'firstname' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="name">First Name</label>
-			                <div class="col-md-7 col-sm-8" style="padding-top:5px">
-			                    <input type="text" class="form-control mandatory-field" name="firstname" required="True" t-attf-value="#{firstname or ''}" placeholder="Didier"/>
-			                </div>
-			            </div>							
-			            
- 			            <div t-attf-class="form-group #{error and 'lastname' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="name">Last Name</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="lastname" required="True" t-attf-value="#{lastname or ''}" placeholder="Bourdon"/>
-			                </div>
-			            </div>							
-						
-						<div t-attf-class="form-group #{error and 'gender' in error and 'has-error' or ''}">
-			               <label class="col-md-3 col-sm-4 control-label" for="company_type">Gender</label>
-		                   <select name="gender" class="col-md-7 col-sm-8 form-control" required="True" style="width:54%;margin-left:15px">
-		                       <option value=""></option>
-		                       <t t-foreach="genders or []" t-as="type">
-		                           <option t-att-value="type[0]" t-att-selected="type[0] == gender"><t t-esc="type[1]"/></option>
-		                       </t>
-		                   </select>
-		           		</div>
-						
-						<div t-attf-class="form-group #{error and 'birthdate' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="birthdate">Birthdate</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" data-inputmask="'alias': 'date'" class="form-control mandatory-field" name="birthdate" required="True" t-attf-value="#{birthdate or ''}" placeholder="05/03/1978"/>
-			                </div>
-			            </div>
-						
-						<div t-attf-class="form-group #{error and 'no_registre' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="no_registre">National Register Number</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="no_registre" t-attf-value="#{no_registre or ''}" placeholder="78230226321"/>
-			                </div>
-			            </div>
-			            
-			            <div t-attf-class="form-group #{error and 'iban' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="iban">Bank Account Number</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="iban" required="True" t-attf-value="#{iban or ''}" placeholder="BE48523080767127"/>
-			                </div>
-			            </div>
-	                    
-	                    <div t-attf-class="form-group #{error and 'lang' in error and 'has-error' or ''}" >
-	                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="lang">Language</label>
-	                      <select name="lang" class="col-md-7 col-sm-8 form-control " style="width:30%;margin-left:15px">
-	                          <option value="2">Language...</option>
-	                          <t t-foreach="langs or []" t-as="langue">
-	                              <option t-att-value="langue.code" t-att-selected="langue.code == lang"><t t-esc="langue.name"/></option>
-	                          </t>
-	                      </select>
-						  <br/>	                      
-						  <div class="bottom-line" style="margin-left:25%;margin-top:35px;width:59%"></div>	                      
+<odoo>
+	<template id="assets_frontend" inherit_id="website.assets_frontend" name="Coop">
+	 	<!--<xpath expr="." position="inside">
+			<script type="text/javascript" src="/easy_my_coop/static/src/js/easy_my_coop.js"></script>
+			<script type="text/javascript" src="/easy_my_coop/static/src/js/jquery.inputmask.bundle.js"></script>
+		</xpath>-->
+	</template>
+	
+	<template id="company_operational_offices" inherit_id="website.company_description" name="Company Description">
+	    <address itemscope="itemscope" position="inside">
+		    <div class="fa fa-building-o" t-field="res_company.company_registry"/><br/>
+		    <div class="fa fa-bank" t-field="res_company.partner_id.bank_ids[0].sanitized_acc_number"/>
+	    </address>
+	</template>
+	
+	<template id="cooperator_thanks" name="Cooperator contact us" page="True">
+	    <t t-call="website.layout">
+	      <div id="wrap">
+	        <div class="oe_structure"/>
+	        <div class="container">
+	            <h1>Thanks!</h1>
+	            <div class="row">
+	                <div class="col-md-8">
+	                    <div class="alert alert-success">
+	                        Your subscription has been successfully registered.
+	                        <button type="button" class="close" data-dismiss="alert">&amp;times;</button>
 	                    </div>
-
- 			            <div t-attf-class="form-group #{error and 'address' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="address">Address</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="address" required="True" t-attf-value="#{address or ''}" placeholder="rue Van Hove, 19"/>
-			                </div>
-			            </div>							
-	                    	                    			            	
- 			            <div t-attf-class="form-group #{error and 'zip_code' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="zip_code">City</label>
-			                <div class="col-md-7 col-sm-8">
-								<table>			
+	                    <p>
+	                        We will get back to you shortly.
+	                    </p>
+	                    <ul class="list-unstyled">
+	                        <li><i class="fa fa-phone"></i> : <span t-field="res_company.phone"/></li>
+	                        <li><i class="fa fa-envelope"></i> : <span t-field="res_company.email"/></li>
+	                    </ul>
+	                </div>
+	                <div class="col-md-4">
+	                    <t t-call="website.company_description"/>
+	                </div>
+	            </div>
+	        </div>
+	        <div class="oe_structure"/>
+	      </div>
+	    </t>
+	</template>
+			
+	<template id="easy_my_coop.becomecooperator" name="Become Cooperator" page="True">
+		 <t t-call="website.layout">
+	      <div id="wrap">
+	        <div class="oe_structure"/>
+	        <div class="container oe_easymy_coop">
+	            <h2 class="energie">Become Cooperator</h2><br/>
+	            <div class="row">
+	                <div class="col-md-8">
+						<form action="/subscription/subscribe_share" method="post" class="form-horizontal mt32" enctype="multipart/form-data">                    
+						   <p style="color:red;"><t t-esc="error_msg"/></p>
+				           <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+				           					           
+				           <div t-attf-class="form-group">
+				              <a class='btn btn-primary' t-if="not logged" t-attf-href="/web/login?redirect=#{ request.httprequest.url }">You have already an account?</a>
+				              <br/>
+				           </div>
+						           
+				           <div t-attf-class="form-group" style="display: none;">
+								<label>
+									<input type="checkbox" t-att-checked="logged" name="logged"/>
+									Logged
+								</label>
+							</div>
+							
+				           <div t-attf-class="form-group">
+								<label>
+									<input type="checkbox" t-att-value="already_cooperator" name="already_cooperator" />
+									Already cooperator?
+								</label>
+							</div>
+				           
+				           <div name="email_from_container" t-attf-class="form-group #{error and 'email_from' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="email">Email</label>
+				                <div class="col-md-7 col-sm-8 bottom-line" style="padding-bottom:20px">
+				                    <input type="email" class="form-control mandatory-field" name="email" required="True" t-attf-value="#{email or ''}" placeholder="didier.bourdon@bees-coop.be"/>
+				                </div>
+				            </div>
+	
+				            <div t-attf-class="form-group #{error and 'firstname' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="name">First Name</label>
+				                <div class="col-md-7 col-sm-8" style="padding-top:5px">
+				                    <input type="text" class="form-control mandatory-field" name="firstname" required="True" t-attf-value="#{firstname or ''}" placeholder="Didier"/>
+				                </div>
+				            </div>							
+				            
+	 			            <div t-attf-class="form-group #{error and 'lastname' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="name">Last Name</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="lastname" required="True" t-attf-value="#{lastname or ''}" placeholder="Bourdon"/>
+				                </div>
+				            </div>							
+							
+							<div t-attf-class="form-group #{error and 'gender' in error and 'has-error' or ''}">
+				               <label class="col-md-3 col-sm-4 control-label" for="company_type">Gender</label>
+			                   <select name="gender" class="col-md-7 col-sm-8 form-control" required="True" style="width:54%;margin-left:15px">
+			                       <option value=""></option>
+			                       <t t-foreach="genders or []" t-as="type">
+			                           <option t-att-value="type[0]" t-att-selected="type[0] == gender"><t t-esc="type[1]"/></option>
+			                       </t>
+			                   </select>
+			           		</div>
+							
+							<div t-attf-class="form-group #{error and 'birthdate' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="birthdate">Birthdate</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" data-inputmask="'alias': 'date'" class="form-control mandatory-field" name="birthdate" required="True" t-attf-value="#{birthdate or ''}" placeholder="05/03/1978"/>
+				                </div>
+				            </div>
+							
+							<div t-attf-class="form-group #{error and 'no_registre' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="no_registre">National Register Number</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="no_registre" t-attf-value="#{no_registre or ''}" placeholder="78230226321"/>
+				                </div>
+				            </div>
+				            
+				            <div t-attf-class="form-group #{error and 'iban' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="iban">Bank Account Number</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="iban" required="True" t-attf-value="#{iban or ''}" placeholder="BE48523080767127"/>
+				                </div>
+				            </div>
+		                    
+		                    <div t-attf-class="form-group #{error and 'lang' in error and 'has-error' or ''}" >
+		                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="lang">Language</label>
+		                      <select name="lang" class="col-md-7 col-sm-8 form-control " style="width:30%;margin-left:15px">
+		                          <option value="2">Language...</option>
+		                          <t t-foreach="langs or []" t-as="langue">
+		                              <option t-att-value="langue.code" t-att-selected="langue.code == lang"><t t-esc="langue.name"/></option>
+		                          </t>
+		                      </select>
+							  <br/>	                      
+							  <div class="bottom-line" style="margin-left:25%;margin-top:35px;width:59%"></div>	                      
+		                    </div>
+	
+	 			            <div t-attf-class="form-group #{error and 'address' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="address">Address</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="address" required="True" t-attf-value="#{address or ''}" placeholder="rue Van Hove, 19"/>
+				                </div>
+				            </div>							
+		                    	                    			            	
+	 			            <div t-attf-class="form-group #{error and 'zip_code' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="zip_code">City</label>
+				                <div class="col-md-7 col-sm-8">
+									<table>			
+										<tr>
+											<td width="20%">
+												<input type="text" class="form-control mandatory-field" name="zip_code" required="True" t-attf-value="#{zip_code or ''}" placeholder="1030"/>
+											</td>
+											<td width="3%"></td>
+											<td>
+												<input type="text" class="form-control mandatory-field" name="city" required="True" t-attf-value="#{city or ''}" placeholder="Bruxelles"/>
+											</td>										
+										</tr>   
+									</table>           	
+				                </div>
+				            </div>							
+	
+		                    <div t-attf-class="form-group #{error and 'country_id' in error and 'has-error' or ''}">
+		                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="country_id">Country</label>
+		                      <select name="country_id" class="col-md-7 col-sm-8 form-control " style="width:54%;margin-left:15px">
+		                          <option value="">Country...</option>
+		                          <t t-foreach="countries or []" t-as="country">
+		                              <option t-att-value="country.id" t-att-selected="country.id == int(country_id)"><t t-esc="country.name"/></option>
+		                          </t>
+		                      </select>
+		                    </div>
+	
+		                    <div t-attf-class="form-group #{error and 'phone' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="phone">Phone</label>
+				                <div class="col-md-7 col-sm-8 bottom-line" style="padding-bottom:20px">
+				                    <input type="text" class="form-control" name="phone" required="True" t-attf-value="#{phone or ''}" placeholder="e.g. (+32).81.81.37.00"/>
+				                </div>
+				            </div>							
+							
+							<div t-attf-class="form-group #{error and 'share_product_id' in error and 'has-error' or ''}">
+		                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="share_product_id">Parts type</label>
+		                      <select id="share_product_id" name="share_product_id" class="col-md-7 col-sm-8 form-control " style="width:54%;margin-left:15px">
+		                          <t t-foreach="products or []" t-as="product">
+		                              <option t-att-value="product.id" t-att-selected="product.id == int(share_product_id)"><t t-esc="product.short_name"/></option>
+		                          </t>
+		                      </select>
+		                    </div>
+	
+			                <div name="share_div" class="form-group">
+								<table style="width:80%">			
 									<tr>
-										<td width="20%">
-											<input type="text" class="form-control mandatory-field" name="zip_code" required="True" t-attf-value="#{zip_code or ''}" placeholder="1030"/>
+										<td width="30%">
+				                			<label style="text-align:right; width:100%;padding-right:30px">Parts number</label>										
+										</td>									
+										<td width="15%">
+										    <div class="css_quantity input-group oe_website_spinner">
+										        <span class="input-group-addon" style="margin-left:0px">
+										            <a t-attf-href="#" class="mb8 js_add_cart_json">
+										                <i class="fa fa-minus"></i>
+										            </a>
+										        </span>
+										        <input type="text" class="js_quantity form-control" data-min="1" name="ordered_parts" t-attf-value="#{ordered_parts or 1}"/>
+										        <span class="input-group-addon">
+										            <a t-attf-href="#" class="mb8 float_left js_add_cart_json">
+										                <i class="fa fa-plus"></i>
+										            </a>
+										        </span>
+										    </div>
 										</td>
-										<td width="3%"></td>
-										<td>
-											<input type="text" class="form-control mandatory-field" name="city" required="True" t-attf-value="#{city or ''}" placeholder="Bruxelles"/>
-										</td>										
+										<td width="5%"> x </td>
+										<td id="share_price" width="5%">25</td>
+										<td width="7%" style="text-align:left;margin-right:20px"><span t-esc="company.currency_id.symbol"/></td>
+										<td width="4%">= </td>
+										<td width="20%">
+						                    <div style="margin-top:12px" t-attf-class="form-group #{error and 'total_parts' in error and 'has-error' or ''}">
+								                <div>
+								                    <input type="text" class="form-control total" name="total_parts" value="25" data-max="5000"
+														   t-att-readonly="'readonly'" 						                    
+								                    />
+								                </div>
+								            </div>							
+										</td>																																												
 									</tr>   
 								</table>           	
 			                </div>
-			            </div>							
-
-	                    <div t-attf-class="form-group #{error and 'country_id' in error and 'has-error' or ''}">
-	                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="country_id">Country</label>
-	                      <select name="country_id" class="col-md-7 col-sm-8 form-control " style="width:54%;margin-left:15px">
-	                          <option value="">Country...</option>
-	                          <t t-foreach="countries or []" t-as="country">
-	                              <option t-att-value="country.id" t-att-selected="country.id == int(country_id)"><t t-esc="country.name"/></option>
-	                          </t>
-	                      </select>
-	                    </div>
-
-	                    <div t-attf-class="form-group #{error and 'phone' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="phone">Phone</label>
-			                <div class="col-md-7 col-sm-8 bottom-line" style="padding-bottom:20px">
-			                    <input type="text" class="form-control" name="phone" required="True" t-attf-value="#{phone or ''}" placeholder="e.g. (+32).81.81.37.00"/>
-			                </div>
-			            </div>							
-						
-						<div t-attf-class="form-group #{error and 'share_product_id' in error and 'has-error' or ''}">
-	                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="share_product_id">Parts type</label>
-	                      <select id="share_product_id" name="share_product_id" class="col-md-7 col-sm-8 form-control " style="width:54%;margin-left:15px">
-	                          <t t-foreach="products or []" t-as="product">
-	                              <option t-att-value="product.id" t-att-selected="product.id == int(share_product_id)"><t t-esc="product.short_name"/></option>
-	                          </t>
-	                      </select>
-	                    </div>
-
-		                <div name="share_div" class="form-group">
-							<table style="width:80%">			
+	
+			                <div t-if="res_company.allow_id_card_upload" t-attf-class="form-group #{error and 'file' in error and 'has-error' or ''}">
+		                      	<label class="col-md-3 col-sm-4 control-label" style="width:25%" for="file">Idendity card scan</label>
+	                        	<div class="col-md-7 col-sm-8">
+	                        		<input type="file" class="form-control" name="Resume" t-attf-value="#{file or ''}" style="width:50%"/>
+	                        	</div>
+	                        </div>
+	
+			            	<div class="bottom-line" style="margin-left:178px;margin-top:0px;width:61%"></div>							                
+			                		            			            	                    
+	 						<br/>
+	
+							<table style="margin-left:195px">
 								<tr>
-									<td width="30%">
-			                			<label style="text-align:right; width:100%;padding-right:30px">Parts number</label>										
-									</td>									
-									<td width="15%">
-									    <div class="css_quantity input-group oe_website_spinner">
-									        <span class="input-group-addon" style="margin-left:0px">
-									            <a t-attf-href="#" class="mb8 js_add_cart_json">
-									                <i class="fa fa-minus"></i>
-									            </a>
-									        </span>
-									        <input type="text" class="js_quantity form-control" data-min="1" name="ordered_parts" t-attf-value="#{ordered_parts or 1}"/>
-									        <span class="input-group-addon">
-									            <a t-attf-href="#" class="mb8 float_left js_add_cart_json">
-									                <i class="fa fa-plus"></i>
-									            </a>
-									        </span>
-									    </div>
+									<td width="80%">
+										<div class="g-recaptcha" t-att-data-sitekey="website.recaptcha_site_key" data-theme="green"/><br/>			
 									</td>
-									<td width="5%"> x </td>
-									<td id="share_price" width="5%">25</td>
-									<td width="7%" style="text-align:left;margin-right:20px"><span t-esc="company.currency_id.symbol"/></td>
-									<td width="4%">= </td>
-									<td width="20%">
-					                    <div style="margin-top:12px" t-attf-class="form-group #{error and 'total_parts' in error and 'has-error' or ''}">
-							                <div>
-							                    <input type="text" class="form-control total" name="total_parts" value="25" data-max="5000"
-													   t-att-readonly="'readonly'" 						                    
-							                    />
+									<td>
+				 						<div class="form-group">
+							                <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
+							                    <button class="btn btn-primary btn-lg">Send</button>
 							                </div>
-							            </div>							
-									</td>																																												
-								</tr>   
-							</table>           	
-		                </div>
-
-		                <div t-if="res_company.allow_id_card_upload" t-attf-class="form-group #{error and 'file' in error and 'has-error' or ''}">
-	                      	<label class="col-md-3 col-sm-4 control-label" style="width:25%" for="file">Idendity card scan</label>
-                        	<div class="col-md-7 col-sm-8">
-                        		<input type="file" class="form-control" name="Resume" t-attf-value="#{file or ''}" style="width:50%"/>
-                        	</div>
-                        </div>
-
-		            	<div class="bottom-line" style="margin-left:178px;margin-top:0px;width:61%"></div>							                
-		                		            			            	                    
- 						<br/>
-
-						<table style="margin-left:195px">
-							<tr>
-								<td width="80%">
-									<div class="g-recaptcha" t-att-data-sitekey="website.recaptcha_site_key" data-theme="green"/><br/>			
-								</td>
-								<td>
-			 						<div class="form-group">
-						                <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
-						                    <button class="btn btn-primary btn-lg">Send</button>
-						                </div>
-						            </div>
-								</td>								
-							</tr> 							
-						</table>			            
-						
-			            <br/>			            
-					</form>
-                </div>
-            </div>
-        </div>
-        <div class="oe_structure"/>
-      </div>
-    </t>
-</template>
-
-<template id="easy_my_coop.becomecompanycooperator" name="Become Cooperator" page="True">
-	 <t t-call="website.layout">
-      <div id="wrap">
-        <div class="oe_structure"/>
-        <div class="container oe_easymy_coop">
-            <h2 class="energie">Become Cooperator</h2><br/>
-            <div class="row">
-                <div class="col-md-8">
-					<form action="/subscription/subscribe_share" method="post" class="form-horizontal mt32" enctype="multipart/form-data">                    
-					   <p style="color:red;"><t t-esc="error_msg"/></p>
-			           <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-					   
-					    <div t-attf-class="form-group"  style="display: none;">
-							<label>
-								<input type="checkbox" t-att-checked="logged" name="logged"/>
-								Logged
-							</label>
-							<label>
-								<input type="checkbox" t-att-value="is_company" checked="checked" name="is_company" />
-								Is a company?
-							</label>
-						</div>
-
-					    <div t-attf-class="form-group">
-							<label>
-								Company Info
-							</label>
-						</div>
-						
-						<div t-attf-class="form-group #{error and 'company_register_number' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="company_register_number">Company Register Number</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="company_register_number" required="True" t-attf-value="#{company_register_number or ''}" placeholder="0647980091"/>
-			                </div>
-			            </div>
-			            
-						<div t-attf-class="form-group #{error and 'company_name' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="company_name">Company name</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="company_name" required="True" t-attf-value="#{company_name or ''}" placeholder="La super coopérative"/>
-			                </div>
-			            </div>
-			            
-						<div t-attf-class="form-group #{error and 'company_type' in error and 'has-error' or ''}">
-			               <label class="col-md-3 col-sm-4 control-label" for="company_type">Company type</label>
-		                   <select name="company_type" class="col-md-7 col-sm-8 form-control" required="True" style="width:54%;margin-left:15px">
-		                       <option value=""></option>
-		                       <t t-foreach="company_types or []" t-as="type">
-		                           <option t-att-value="type[0]" t-att-selected="type[0] == company_type"><t t-esc="type[1]"/></option>
-		                       </t>
-		                   </select>
-		           		</div>
-		           		
-		           		<div t-attf-class="form-group #{error and 'company_email' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="company_email">Company email</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="company_email" required="True" t-attf-value="#{company_email or ''}" placeholder="administration@beescoop.be"/>
-			                </div>
-			            </div>
-			            
-			            <div t-attf-class="form-group #{error and 'iban' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="iban">Bank Account Number</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="iban"  required="True" t-attf-value="#{iban or ''}" placeholder="BE48523080767127"/>
-			                </div>
-			            </div>
-			            
-			            <br/>
-			            <div t-attf-class="form-group">
-							<label>
-								Main Address
-							</label>
-						</div>
-						
-						<div t-attf-class="form-group #{error and 'address' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="address">Address</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="address" required="True" t-attf-value="#{address or ''}" placeholder="rue Van Hove, 19"/>
-			                </div>
-			            </div>							
-	                    	                    			            	
- 			            <div t-attf-class="form-group #{error and 'zip_code' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="zip_code">City</label>
-			                <div class="col-md-7 col-sm-8">
-								<table>			
+							            </div>
+									</td>								
+								</tr> 							
+							</table>			            
+							
+				            <br/>			            
+						</form>
+	                </div>
+	            </div>
+	        </div>
+	        <div class="oe_structure"/>
+	      </div>
+	    </t>
+	</template>
+	
+	<template id="easy_my_coop.becomecompanycooperator" name="Become Cooperator" page="True">
+		 <t t-call="website.layout">
+	      <div id="wrap">
+	        <div class="oe_structure"/>
+	        <div class="container oe_easymy_coop">
+	            <h2 class="energie">Become Cooperator</h2><br/>
+	            <div class="row">
+	                <div class="col-md-8">
+						<form action="/subscription/subscribe_share" method="post" class="form-horizontal mt32" enctype="multipart/form-data">                    
+						   <p style="color:red;"><t t-esc="error_msg"/></p>
+				           <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+						   
+						    <div t-attf-class="form-group"  style="display: none;">
+								<label>
+									<input type="checkbox" t-att-checked="logged" name="logged"/>
+									Logged
+								</label>
+								<label>
+									<input type="checkbox" t-att-value="is_company" checked="checked" name="is_company" />
+									Is a company?
+								</label>
+							</div>
+	
+						    <div t-attf-class="form-group">
+								<label>
+									Company Info
+								</label>
+							</div>
+							
+							<div t-attf-class="form-group #{error and 'company_register_number' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="company_register_number">Company Register Number</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="company_register_number" required="True" t-attf-value="#{company_register_number or ''}" placeholder="0647980091"/>
+				                </div>
+				            </div>
+				            
+							<div t-attf-class="form-group #{error and 'company_name' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="company_name">Company name</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="company_name" required="True" t-attf-value="#{company_name or ''}" placeholder="La super coopérative"/>
+				                </div>
+				            </div>
+				            
+							<div t-attf-class="form-group #{error and 'company_type' in error and 'has-error' or ''}">
+				               <label class="col-md-3 col-sm-4 control-label" for="company_type">Company type</label>
+			                   <select name="company_type" class="col-md-7 col-sm-8 form-control" required="True" style="width:54%;margin-left:15px">
+			                       <option value=""></option>
+			                       <t t-foreach="company_types or []" t-as="type">
+			                           <option t-att-value="type[0]" t-att-selected="type[0] == company_type"><t t-esc="type[1]"/></option>
+			                       </t>
+			                   </select>
+			           		</div>
+			           		
+			           		<div t-attf-class="form-group #{error and 'company_email' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="company_email">Company email</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="company_email" required="True" t-attf-value="#{company_email or ''}" placeholder="administration@beescoop.be"/>
+				                </div>
+				            </div>
+				            
+				            <div t-attf-class="form-group #{error and 'iban' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="iban">Bank Account Number</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="iban"  required="True" t-attf-value="#{iban or ''}" placeholder="BE48523080767127"/>
+				                </div>
+				            </div>
+				            
+				            <br/>
+				            <div t-attf-class="form-group">
+								<label>
+									Main Address
+								</label>
+							</div>
+							
+							<div t-attf-class="form-group #{error and 'address' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="address">Address</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="address" required="True" t-attf-value="#{address or ''}" placeholder="rue Van Hove, 19"/>
+				                </div>
+				            </div>							
+		                    	                    			            	
+	 			            <div t-attf-class="form-group #{error and 'zip_code' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="zip_code">City</label>
+				                <div class="col-md-7 col-sm-8">
+									<table>			
+										<tr>
+											<td width="20%">
+												<input type="text" class="form-control mandatory-field" name="zip_code" required="True" t-attf-value="#{zip_code or ''}" placeholder="1030"/>
+											</td>
+											<td width="3%"></td>
+											<td>
+												<input type="text" class="form-control mandatory-field" name="city" required="True" t-attf-value="#{city or ''}" placeholder="Bruxelles"/>
+											</td>										
+										</tr>   
+									</table>           	
+				                </div>
+				            </div>							
+	
+		                    <div t-attf-class="form-group #{error and 'country_id' in error and 'has-error' or ''}">
+		                    	
+		                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="country_id">Country</label>
+		                      <select name="country_id" class="col-md-7 col-sm-8 form-control" style="width:54%;margin-left:15px">
+		                          <option value="">Country...</option>
+		                          <t t-foreach="countries or []" t-as="country">
+		                              <option t-att-value="country.id" t-att-selected="country.id == int(country_id)"><t t-esc="country.name"/></option>
+		                          </t>
+		                      </select>
+		                    </div>
+		                    <br/>
+				            <div t-attf-class="form-group">
+								<label>
+									Contact Person
+								</label>
+							</div>
+				            
+				            <div t-attf-class="form-group #{error and 'firstname' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="firstname">First Name</label>
+				                <div class="col-md-7 col-sm-8" style="padding-top:5px">
+				                    <input type="text" class="form-control mandatory-field" name="firstname" required="True" t-attf-value="#{firstname or ''}" placeholder="Didier"/>
+				                </div>
+				            </div>							
+				            
+	 			            <div t-attf-class="form-group #{error and 'lastname' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="lastname">Last Name</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="lastname" required="True" t-attf-value="#{lastname or ''}" placeholder="Bourdon"/>
+				                </div>
+				            </div>							
+							
+							<div t-attf-class="form-group #{error and 'gender' in error and 'has-error' or ''}">
+				               <label class="col-md-3 col-sm-4 control-label" for="gender">Gender</label>
+			                   <select name="gender" class="col-md-7 col-sm-8 form-control" required="True" style="width:54%;margin-left:15px">
+			                       <option value=""></option>
+			                       <t t-foreach="genders or []" t-as="type">
+			                           <option t-att-value="type[0]" t-att-selected="type[0] == gender"><t t-esc="type[1]"/></option>
+			                       </t>
+			                   </select>
+			           		</div>
+			           		
+				            <div name="email_from_container" t-attf-class="form-group #{error and 'email_from' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="email">Email</label>
+				                <div class="col-md-7 col-sm-8 bottom-line" style="padding-bottom:20px">
+				                    <input type="email" class="form-control mandatory-field" name="email" required="True" t-attf-value="#{email or ''}" placeholder="didier.bourdon@bees-coop.be"/>
+				                </div>
+				            </div>
+				            
+		                    <div t-attf-class="form-group #{error and 'phone' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="phone">Phone</label>
+				                <div class="col-md-7 col-sm-8 bottom-line" style="padding-bottom:20px">
+				                    <input type="text" class="form-control" name="phone" required="True" t-attf-value="#{phone or ''}" placeholder="e.g. (+32).81.81.37.00"/>
+				                </div>
+				            </div>
+				            	
+				            <div t-attf-class="form-group #{error and 'contact_person_function' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="contact_person_function">Function</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="contact_person_function" required="True" t-attf-value="#{contact_person_function or ''}"/>
+				                </div>
+				            </div>	
+				            
+							<div t-attf-class="form-group #{error and 'no_registre' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="no_registre">National Register Number</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" class="form-control mandatory-field" name="no_registre" required="True" t-attf-value="#{no_registre or ''}" placeholder="78230226321"/>
+				                </div>
+				            </div>
+				            
+							<div t-attf-class="form-group #{error and 'birthday' in error and 'has-error' or ''}">
+				                <label class="col-md-3 col-sm-4 control-label" for="birthdate">Birthdate</label>
+				                <div class="col-md-7 col-sm-8">
+				                    <input type="text" data-inputmask="'alias': 'date'" class="form-control mandatory-field" name="birthdate" required="True" t-attf-value="#{birthdate or ''}" placeholder="05/03/1978"/>
+				                </div>
+				            </div>
+							
+		                    <div t-attf-class="form-group #{error and 'lang' in error and 'has-error' or ''}" >
+		                    	
+		                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="lang">Language</label>
+		                      <select name="lang" class="col-md-7 col-sm-8 form-control " style="width:30%;margin-left:15px">
+		                          <option value="2">Language...</option>
+		                          <t t-foreach="langs or []" t-as="langue">
+		                              <option t-att-value="langue.code" t-att-selected="langue.code == lang"><t t-esc="langue.name"/></option>
+		                          </t>
+		                      </select>
+							  <br/>	                      
+							  <div class="bottom-line" style="margin-left:25%;margin-top:35px;width:59%"></div>	                      
+		                    </div>
+							
+							<div t-attf-class="form-group #{error and 'product_id' in error and 'has-error' or ''}">
+		                    	
+		                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="share_product_id">Parts type</label>
+		                      <select id="share_product_id" name="share_product_id" class="col-md-7 col-sm-8 form-control " style="width:54%;margin-left:15px">
+		                          <t t-foreach="products or []" t-as="product">
+		                              <option t-att-value="product.id" t-att-selected="product.id == int(share_product_id)"><t t-esc="product.short_name"/></option>
+		                          </t>
+		                      </select>
+		                    </div>
+			                <div class="form-group">
+								<table style="width:80%">			
 									<tr>
-										<td width="20%">
-											<input type="text" class="form-control mandatory-field" name="zip_code" required="True" t-attf-value="#{zip_code or ''}" placeholder="1030"/>
+										<td width="30%">
+				                			<label style="text-align:right; width:100%;padding-right:30px">Parts number</label>										
+										</td>									
+										<td width="15%">
+										    <div class="css_quantity input-group oe_website_spinner">
+										        <span class="input-group-addon" style="margin-left:0px">
+										            <a t-attf-href="#" class="mb8 js_add_cart_json">
+										                <i class="fa fa-minus"></i>
+										            </a>
+										        </span>
+										        <input type="text" class="js_quantity form-control" data-min="1" name="ordered_parts" t-attf-value="#{ordered_parts or 1}"/>
+										        <span class="input-group-addon">
+										            <a t-attf-href="#" class="mb8 float_left js_add_cart_json">
+										                <i class="fa fa-plus"></i>
+										            </a>
+										        </span>
+										    </div>
 										</td>
-										<td width="3%"></td>
-										<td>
-											<input type="text" class="form-control mandatory-field" name="city" required="True" t-attf-value="#{city or ''}" placeholder="Bruxelles"/>
-										</td>										
+										<td width="5%">x </td>
+										<td id="share_price" width="7%">25</td>
+										<td width="3%"> €</td>
+										<td width="5%">= </td>
+										<td width="20%">
+						                    <div style="margin-top:12px" t-attf-class="form-group #{error and 'total_parts' in error and 'has-error' or ''}">
+								                <div>
+								                    <input type="text" class="form-control total" name="total_parts" value="25" data-max="5000"
+														   t-att-readonly="'readonly'" 						                    
+								                    />
+								                </div>
+								            </div>							
+										</td>																																												
 									</tr>   
 								</table>           	
 			                </div>
-			            </div>							
-
-	                    <div t-attf-class="form-group #{error and 'country_id' in error and 'has-error' or ''}">
-	                    	
-	                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="country_id">Country</label>
-	                      <select name="country_id" class="col-md-7 col-sm-8 form-control" style="width:54%;margin-left:15px">
-	                          <option value="">Country...</option>
-	                          <t t-foreach="countries or []" t-as="country">
-	                              <option t-att-value="country.id" t-att-selected="country.id == int(country_id)"><t t-esc="country.name"/></option>
-	                          </t>
-	                      </select>
-	                    </div>
-	                    <br/>
-			            <div t-attf-class="form-group">
-							<label>
-								Contact Person
-							</label>
-						</div>
-			            
-			            <div t-attf-class="form-group #{error and 'firstname' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="firstname">First Name</label>
-			                <div class="col-md-7 col-sm-8" style="padding-top:5px">
-			                    <input type="text" class="form-control mandatory-field" name="firstname" required="True" t-attf-value="#{firstname or ''}" placeholder="Didier"/>
-			                </div>
-			            </div>							
-			            
- 			            <div t-attf-class="form-group #{error and 'lastname' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="lastname">Last Name</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="lastname" required="True" t-attf-value="#{lastname or ''}" placeholder="Bourdon"/>
-			                </div>
-			            </div>							
-						
-						<div t-attf-class="form-group #{error and 'gender' in error and 'has-error' or ''}">
-			               <label class="col-md-3 col-sm-4 control-label" for="gender">Gender</label>
-		                   <select name="gender" class="col-md-7 col-sm-8 form-control" required="True" style="width:54%;margin-left:15px">
-		                       <option value=""></option>
-		                       <t t-foreach="genders or []" t-as="type">
-		                           <option t-att-value="type[0]" t-att-selected="type[0] == gender"><t t-esc="type[1]"/></option>
-		                       </t>
-		                   </select>
-		           		</div>
-		           		
-			            <div name="email_from_container" t-attf-class="form-group #{error and 'email_from' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="email">Email</label>
-			                <div class="col-md-7 col-sm-8 bottom-line" style="padding-bottom:20px">
-			                    <input type="email" class="form-control mandatory-field" name="email" required="True" t-attf-value="#{email or ''}" placeholder="didier.bourdon@bees-coop.be"/>
-			                </div>
-			            </div>
-			            
-	                    <div t-attf-class="form-group #{error and 'phone' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="phone">Phone</label>
-			                <div class="col-md-7 col-sm-8 bottom-line" style="padding-bottom:20px">
-			                    <input type="text" class="form-control" name="phone" required="True" t-attf-value="#{phone or ''}" placeholder="e.g. (+32).81.81.37.00"/>
-			                </div>
-			            </div>
-			            	
-			            <div t-attf-class="form-group #{error and 'contact_person_function' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="contact_person_function">Function</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="contact_person_function" required="True" t-attf-value="#{contact_person_function or ''}"/>
-			                </div>
-			            </div>	
-			            
-						<div t-attf-class="form-group #{error and 'no_registre' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="no_registre">National Register Number</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" class="form-control mandatory-field" name="no_registre" required="True" t-attf-value="#{no_registre or ''}" placeholder="78230226321"/>
-			                </div>
-			            </div>
-			            
-						<div t-attf-class="form-group #{error and 'birthday' in error and 'has-error' or ''}">
-			                <label class="col-md-3 col-sm-4 control-label" for="birthdate">Birthdate</label>
-			                <div class="col-md-7 col-sm-8">
-			                    <input type="text" data-inputmask="'alias': 'date'" class="form-control mandatory-field" name="birthdate" required="True" t-attf-value="#{birthdate or ''}" placeholder="05/03/1978"/>
-			                </div>
-			            </div>
-						
-	                    <div t-attf-class="form-group #{error and 'lang' in error and 'has-error' or ''}" >
-	                    	
-	                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="lang">Language</label>
-	                      <select name="lang" class="col-md-7 col-sm-8 form-control " style="width:30%;margin-left:15px">
-	                          <option value="2">Language...</option>
-	                          <t t-foreach="langs or []" t-as="langue">
-	                              <option t-att-value="langue.code" t-att-selected="langue.code == lang"><t t-esc="langue.name"/></option>
-	                          </t>
-	                      </select>
-						  <br/>	                      
-						  <div class="bottom-line" style="margin-left:25%;margin-top:35px;width:59%"></div>	                      
-	                    </div>
-						
-						<div t-attf-class="form-group #{error and 'product_id' in error and 'has-error' or ''}">
-	                    	
-	                      <label class="col-md-3 col-sm-4 control-label" style="width:25%" for="share_product_id">Parts type</label>
-	                      <select id="share_product_id" name="share_product_id" class="col-md-7 col-sm-8 form-control " style="width:54%;margin-left:15px">
-	                          <t t-foreach="products or []" t-as="product">
-	                              <option t-att-value="product.id" t-att-selected="product.id == int(share_product_id)"><t t-esc="product.short_name"/></option>
-	                          </t>
-	                      </select>
-	                    </div>
-		                <div class="form-group">
-							<table style="width:80%">			
+			            	<div class="bottom-line" style="margin-left:178px;margin-top:0px;width:61%"></div>							                
+			                		            			            	                    
+	 						<br/>
+	
+							<table style="margin-left:195px">
 								<tr>
-									<td width="30%">
-			                			<label style="text-align:right; width:100%;padding-right:30px">Parts number</label>										
-									</td>									
-									<td width="15%">
-									    <div class="css_quantity input-group oe_website_spinner">
-									        <span class="input-group-addon" style="margin-left:0px">
-									            <a t-attf-href="#" class="mb8 js_add_cart_json">
-									                <i class="fa fa-minus"></i>
-									            </a>
-									        </span>
-									        <input type="text" class="js_quantity form-control" data-min="1" name="ordered_parts" t-attf-value="#{ordered_parts or 1}"/>
-									        <span class="input-group-addon">
-									            <a t-attf-href="#" class="mb8 float_left js_add_cart_json">
-									                <i class="fa fa-plus"></i>
-									            </a>
-									        </span>
-									    </div>
+									<td width="80%">
+										<div class="g-recaptcha" t-att-data-sitekey="website.recaptcha_site_key" data-theme="green"/><br/>			
 									</td>
-									<td width="5%">x </td>
-									<td id="share_price" width="7%">25</td>
-									<td width="3%"> €</td>
-									<td width="5%">= </td>
-									<td width="20%">
-					                    <div style="margin-top:12px" t-attf-class="form-group #{error and 'total_parts' in error and 'has-error' or ''}">
-							                <div>
-							                    <input type="text" class="form-control total" name="total_parts" value="25" data-max="5000"
-													   t-att-readonly="'readonly'" 						                    
-							                    />
+									<td>
+				 						<div class="form-group">
+							                <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
+							                    <button class="btn btn-primary btn-lg">Send</button>
 							                </div>
-							            </div>							
-									</td>																																												
-								</tr>   
-							</table>           	
-		                </div>
-		            	<div class="bottom-line" style="margin-left:178px;margin-top:0px;width:61%"></div>							                
-		                		            			            	                    
- 						<br/>
-
-						<table style="margin-left:195px">
-							<tr>
-								<td width="80%">
-									<div class="g-recaptcha" t-att-data-sitekey="website.recaptcha_site_key" data-theme="green"/><br/>			
-								</td>
-								<td>
-			 						<div class="form-group">
-						                <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
-						                    <button class="btn btn-primary btn-lg">Send</button>
-						                </div>
-						            </div>
-								</td>								
-							</tr> 							
-						</table>			            
-						
-			            <br/>			            
-					</form>
-                </div>
-            </div>
-        </div>
-        <div class="oe_structure"/>
-      </div>
-    </t>
-</template>
-
-<record id="menu_becomecooperator" model="website.menu">
-    <field name="name">Become cooperator</field>
-    <field name="url">/page/become_cooperator</field>
-    <field name="parent_id" ref="website.main_menu"/>
-    <field name="sequence" type="int">65</field>
-</record>
-
-<template id="footer_coop_email_contact" inherit_id="website.footer_default" customize_show="True" name="Coop email contact">
-	<xpath expr="//span[@t-field='res_company.email']" position="replace">
-		<span t-field="res_company.coop_email_contact"></span>
-	</xpath>
-</template>
-
-<template id="company_description_coop_email_contact" inherit_id="website.company_description" name="Company Description Email Contact">
-	<xpath expr="//div[@t-field='res_company.partner_id']" position="replace">
-		<div t-field="res_company.partner_id" t-field-options='{
-                "widget": "contact",
-                "fields": ["name", "address", "phone", "mobile", "fax"]}'/>
-        <ul class="list-unstyled">
-        	<li t-ignore="true"><i class="fa fa-envelope"></i><span t-field="res_company.coop_email_contact"></span></li>
-        </ul>
-	</xpath>
-</template>
-</data>
-</openerp>
+							            </div>
+									</td>								
+								</tr> 							
+							</table>			            
+							
+				            <br/>			            
+						</form>
+	                </div>
+	            </div>
+	        </div>
+	        <div class="oe_structure"/>
+	      </div>
+	    </t>
+	</template>
+	
+	<record id="menu_becomecooperator" model="website.menu">
+	    <field name="name">Become cooperator</field>
+	    <field name="url">/page/become_cooperator</field>
+	    <field name="parent_id" ref="website.main_menu"/>
+	    <field name="sequence" type="int">65</field>
+	</record>
+	
+	<template id="footer_coop_email_contact" inherit_id="website.footer_default" customize_show="True" name="Coop email contact">
+		<xpath expr="//span[@t-field='res_company.email']" position="replace">
+			<span t-field="res_company.coop_email_contact"></span>
+		</xpath>
+	</template>
+	
+	<template id="company_description_coop_email_contact" inherit_id="website.company_description" name="Company Description Email Contact">
+		<xpath expr="//div[@t-field='res_company.partner_id']" position="replace">
+			<div t-field="res_company.partner_id" t-field-options='{
+	                "widget": "contact",
+	                "fields": ["name", "address", "phone", "mobile", "fax"]}'/>
+	        <ul class="list-unstyled">
+	        	<li t-ignore="true"><i class="fa fa-envelope"></i><span t-field="res_company.coop_email_contact"></span></li>
+	        </ul>
+		</xpath>
+	</template>
+</odoo>
diff --git a/easy_my_coop/wizard/__init__.py b/easy_my_coop/wizard/__init__.py
index 14f2e54..5e200e3 100644
--- a/easy_my_coop/wizard/__init__.py
+++ b/easy_my_coop/wizard/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from . import create_subscription_from_partner
 from . import update_partner_info
 from . import validate_subscription_request
diff --git a/easy_my_coop/wizard/account_invoice_refund.py b/easy_my_coop/wizard/account_invoice_refund.py
index 8e26a7f..097d764 100644
--- a/easy_my_coop/wizard/account_invoice_refund.py
+++ b/easy_my_coop/wizard/account_invoice_refund.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-from openerp import api, models
+from odoo import api, models
 
 
 class AccountInvoiceRefund(models.TransientModel):
diff --git a/easy_my_coop/wizard/create_subscription_from_partner.py b/easy_my_coop/wizard/create_subscription_from_partner.py
index 0d0f5eb..f0b9a34 100644
--- a/easy_my_coop/wizard/create_subscription_from_partner.py
+++ b/easy_my_coop/wizard/create_subscription_from_partner.py
@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
-from openerp import api, fields, models, _
-import openerp.addons.decimal_precision as dp
-from openerp.exceptions import UserError
+from odoo import api, fields, models, _
+import odoo.addons.decimal_precision as dp
+from odoo.exceptions import UserError
 
 
 class PartnerCreateSubscription(models.TransientModel):
diff --git a/easy_my_coop/wizard/update_partner_info.py b/easy_my_coop/wizard/update_partner_info.py
index 100125f..d4ba799 100644
--- a/easy_my_coop/wizard/update_partner_info.py
+++ b/easy_my_coop/wizard/update_partner_info.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-
-from openerp import api, fields, models, _
-from openerp.exceptions import UserError
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
 
 
 class PartnerUpdateInfo(models.TransientModel):
diff --git a/easy_my_coop/wizard/update_share_line.py b/easy_my_coop/wizard/update_share_line.py
index e46cab6..f86acab 100644
--- a/easy_my_coop/wizard/update_share_line.py
+++ b/easy_my_coop/wizard/update_share_line.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-
-from openerp import api, fields, models, _
-from openerp.exceptions import UserError
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
 
 
 class ShareLineUpdateInfo(models.TransientModel):
diff --git a/easy_my_coop/wizard/validate_subscription_request.py b/easy_my_coop/wizard/validate_subscription_request.py
index 212ca0e..dac3af6 100644
--- a/easy_my_coop/wizard/validate_subscription_request.py
+++ b/easy_my_coop/wizard/validate_subscription_request.py
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-from openerp import api, models
+from odoo import api, models
 
 
 class ValidateSubscriptionRequest(models.TransientModel):
diff --git a/easy_my_coop/wizard/validate_subscription_request.xml b/easy_my_coop/wizard/validate_subscription_request.xml
index 37deeb6..2b1354d 100644
--- a/easy_my_coop/wizard/validate_subscription_request.xml
+++ b/easy_my_coop/wizard/validate_subscription_request.xml
@@ -1,39 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_validate_subscription_request" model="ir.ui.view">
-            <field name="name">Validate subscription request</field>
-            <field name="model">validate.subscription.request</field>
-            <field name="arch" type="xml">
-                <form string="Validate the subscription request">
-                    <p class="oe_grey">
-                        Validate the subscription request.
-                    </p>
-                    <footer>
-                        <button name="validate" string="Validate" type="object" class="btn-primary"/>
-                        <button string="Cancel" class="btn-default" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
+<odoo>
+    <record id="view_validate_subscription_request" model="ir.ui.view">
+        <field name="name">Validate subscription request</field>
+        <field name="model">validate.subscription.request</field>
+        <field name="arch" type="xml">
+            <form string="Validate the subscription request">
+                <p class="oe_grey">
+                    Validate the subscription request.
+                </p>
+                <footer>
+                    <button name="validate" string="Validate" type="object" class="btn-primary"/>
+                    <button string="Cancel" class="btn-default" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
 
-        <record id="action_validate_subscription_request" model="ir.actions.act_window">
-            <field name="name">Validate subscription request</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">validate.subscription.request</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="groups_id" eval="[(4,ref('easy_my_coop.group_energiris_manager'))]"/>
-        </record>
-		
-		<record model="ir.values" id="validate_subscription_request">
-            <field name="model_id" ref="easy_my_coop.model_subscription_request" />
-            <field name="name">Validate subscription Request</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_validate_subscription_request'))" />
-            <field name="key">action</field>
-            <field name="model">subscription.request</field>
-        </record>
-    </data>
-</openerp>
+    <record id="action_validate_subscription_request" model="ir.actions.act_window">
+        <field name="name">Validate subscription request</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">validate.subscription.request</field>
+        <field name="src_model">subscription.request</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="key2">client_action_multi</field>
+        <field name="target">new</field>
+        <field name="groups_id" eval="[(4,ref('easy_my_coop.group_energiris_manager'))]"/>
+    </record>
+</odoo>
diff --git a/theme_light/__manifest__.py b/theme_light/__manifest__.py
new file mode 100644
index 0000000..070f9f5
--- /dev/null
+++ b/theme_light/__manifest__.py
@@ -0,0 +1,21 @@
+# Copyright 2015-Coop IT Easy SCRLfs (<http://www.coopiteasy.be>)
+# - Houssine BAKKALI - <houssine@coopiteasy.be>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+{
+    'name': 'Theme light',
+    'description': 'extract of the theme zen',
+    'category': 'Website',
+    'version': '1.0',
+    'author': 'Benjamin Dugardin',
+    'author': 'Houssine BAKKALI',
+    'website': "www.coopiteasy.be",
+    'depends': ['base',
+                'web',
+                'website_theme_install'
+                ],
+    'data': [
+        'views/layout_template.xml',
+        'report/header_report_G002.xml',
+    ],
+    'application': True,
+}
diff --git a/theme_light/__openerp__.py b/theme_light/__openerp__.py
deleted file mode 100644
index 76d5489..0000000
--- a/theme_light/__openerp__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# -*- coding: utf-8 -*-
-##############################################################################
-#    Copyright (C) 2013-2015 Benjamin Dugardin
-#    Copyright (C) 2013-2017 Open Architects Consulting SPRL.
-#    Copyright (C) 2018- Coop IT Easy SCRLfs.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-{
-    'name': 'Theme light',
-    'description': 'extract of the theme zen',
-    'category': 'Website',
-    'version': '1.0',
-    'author': 'Benjamin Dugardin',
-    'author': 'Houssine BAKKALI',
-    'website': "www.coopiteasy.be",
-    'depends': ['base', 'web'],
-    'data': [
-        'views/layout_template.xml',
-        'report/header_report_G002.xml',
-    ],
-    'application': True,
-}
diff --git a/theme_light/report/header_report_G002.xml b/theme_light/report/header_report_G002.xml
index b35a0d8..c307cb0 100644
--- a/theme_light/report/header_report_G002.xml
+++ b/theme_light/report/header_report_G002.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
-		
-<template id="theme_light.invoice_header_G002">
- 
-	<table style="width: 100%;font-size:10px">
+<odoo>
+	<template id="theme_light.invoice_header_G002">
+		<table style="width: 100%;font-size:10px">
           <tr height="30px">      
             <td style="width:20%;padding-right:15px" rowspan="4">
             	<img t-if="o.company_id.logo" t-att-src="'data:image/png;base64,%s' % o.company_id.logo" style="max-height: 100px;"/>
@@ -63,12 +59,12 @@
 		  	<td></td>
 		  	<td></td>
 		  </tr>
-     </table>
-</template>
+		</table>
+	</template>
 
-<template id="theme_light.invoice_header_P002">
+	<template id="theme_light.invoice_header_P002">
  
-	<table style="width: 100%;font-size:10px">
+		<table style="width: 100%;font-size:10px">
           <tr height="30px">      
             <td style="width:20%;padding-right:15px" rowspan="4">
             	<img t-if="o.company_id.logo" t-att-src="'data:image/png;base64,%s' % o.company_id.logo" style="max-height: 100px;"/>
@@ -126,13 +122,11 @@
 		  	<td></td>
 		  	<td></td>
 		  </tr>
-     </table>
-</template>
-	
+		</table>
+	</template>
 	
-	
-<template id="theme_light.list_header_G002">
-	<table style="width: 100%;font-size:10px">
+	<template id="theme_light.list_header_G002">
+		<table style="width: 100%;font-size:10px">
           <tr height="30px">      
             <td style="width:20%;padding-right:15px" rowspan="4">
             	<img t-if="res_company.logo" t-att-src="'data:image/png;base64,%s' % res_company.logo" style="max-height: 100px;"/>
@@ -190,8 +184,6 @@
 		  	<td></td>
 		  	<td></td>
 		  </tr>
-     </table>
-</template>		
-
-</data>
-</openerp>
+		</table>
+	</template>		
+</odoo>
diff --git a/theme_light/views/layout_template.xml b/theme_light/views/layout_template.xml
index 4c73f27..fbe61d7 100644
--- a/theme_light/views/layout_template.xml
+++ b/theme_light/views/layout_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
 <data>
 
 <!--  ****************** POUR IMPRESSION FACTURE **************** --> 
@@ -20,8 +20,6 @@
             <t t-call="theme_light.style"/>
         </style>
     </xpath>
-    <!-- Remove conflicting style -->
-    <xpath expr="//head/link[@href='/web/static/src/css/full.css']" position="replace"></xpath>
 </template>
 
 <!-- CSS -->	
@@ -207,5 +205,5 @@
     <t t-call="theme_light.report_footer_002" />
 </template>
 </data>
-</openerp>
+</odoo>
 
diff --git a/website_recaptcha_reloaded/__openerp__.py b/website_recaptcha_reloaded/__openerp__.py
index ae12f42..41e716b 100644
--- a/website_recaptcha_reloaded/__openerp__.py
+++ b/website_recaptcha_reloaded/__openerp__.py
@@ -18,27 +18,28 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{'name': 'Website reCAPTCHA Reloaded',
- 'version': '1.0',
- 'category': 'Website',
- 'depends': ['website'],
- 'author': 'Tech Receptives',
- 'license': 'AGPL-3',
- 'website': 'https://www.techreceptives.com',
- 'description': """
-Odoo Website reCAPTCHA Reloaded
-================================
-This modules allows you to integrate Google reCAPTCHA v2.0 to your website forms.
-You can configure your Google reCAPTCHA site and public keys
-in "Settings" -> "Website Settings"
+{
+    'name': 'Website reCAPTCHA Reloaded',
+    'version': '1.0',
+    'category': 'Website',
+    'depends': ['website'],
+    'author': 'Tech Receptives',
+    'license': 'AGPL-3',
+    'website': 'https://www.techreceptives.com',
+    'description': """
+    Odoo Website reCAPTCHA Reloaded
+    ================================
+    This modules allows you to integrate Google reCAPTCHA v2.0 to your website
+    forms. You can configure your Google reCAPTCHA site and public keys
+    in "Settings" -> "Website Settings"
 
-You will need to install various website_<module>_recaptcha modules 
-to use it in your various pages.
-""",
- 'data': [
-          'views/website_view.xml',
-          'views/res_config.xml',
- ],
- 'installable': True,
- 'auto_install': False
+    You will need to install various website_<module>_recaptcha modules
+    to use it in your various pages.
+    """,
+    'data': [
+              'views/website_view.xml',
+              'views/res_config.xml',
+     ],
+    'installable': False,
+    'auto_install': False
 }