diff --git a/README.md b/README.md
index e9c019b..d28b816 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
# Obeesdoo
-
+Specific module for the Beescoop
# Migrate barcode
+
```sql
insert into member_card (active, barcode, partner_id, responsible_id, activation_date) select 't', barcode, id, 1, '2016-01-01' from res_partner where barcode is not null;
update res_partner set eater = 'worker_eater' where barcode is not null;
-```
\ No newline at end of file
+```
diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py
index 5b22307..cd5ed25 100644
--- a/beesdoo_base/models/partner.py
+++ b/beesdoo_base/models/partner.py
@@ -13,8 +13,8 @@ class Partner(models.Model):
child_eater_ids = fields.One2many("res.partner", "parent_eater_id", domain=[('customer', '=', True),
('eater', '=', 'eater')])
parent_eater_id = fields.Many2one("res.partner", string="Parent Worker", readonly=True)
- barcode = fields.Char(compute="_get_bar_code", string='Bar Code', store=True)
- parent_barcode = fields.Char(compute="_get_bar_code", string='Parent Bar Code', store=True)
+ barcode = fields.Char(compute="_get_bar_code", string='Barcode', store=True)
+ parent_barcode = fields.Char(compute="_get_bar_code", string='Parent Barcode', store=True)
member_card_ids = fields.One2many('member.card', 'partner_id')
member_card_to_be_printed = fields.Boolean('Print BEES card?')
diff --git a/beesdoo_base/views/partner.xml b/beesdoo_base/views/partner.xml
index 9aa98d2..4ef4a26 100644
--- a/beesdoo_base/views/partner.xml
+++ b/beesdoo_base/views/partner.xml
@@ -14,6 +14,7 @@
new
+<<<<<<< HEAD
beesdoo.partner.form.view
res.partner
@@ -71,6 +72,60 @@
+=======
+
+ beesdoo.partner.form.view
+ res.partner
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {'invisible' : [('eater', '!=', 'worker_eater')]}
+
+
+
+
+
+
+>>>>>>> 428b5a87e862d422af23bd418dc92bf7ac082b2d
diff --git a/beesdoo_product/views/beesdoo_product.xml b/beesdoo_product/views/beesdoo_product.xml
index bbf2199..5b7871e 100644
--- a/beesdoo_product/views/beesdoo_product.xml
+++ b/beesdoo_product/views/beesdoo_product.xml
@@ -23,7 +23,7 @@
1
-
+