From 2081a339d4507f7977d7b5774e33cbfa98cb807f Mon Sep 17 00:00:00 2001
From: EliseDup <Elise@mac-1o0-339.local>
Date: Wed, 8 Jun 2016 10:28:37 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Traduction=20vers=20l'anglais=20des=20terme?=
 =?UTF-8?q?s=20en=20fran=C3=A7ais=20dans=20le=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beesdoo_base/models/partner.py            |  4 ++--
 beesdoo_base/views/partner.xml            | 10 +++++-----
 beesdoo_base/wizard/member_card.py        |  2 +-
 beesdoo_base/wizard/views/member_card.xml |  4 ++--
 beesdoo_product/views/beesdoo_product.xml |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py
index baf19b1..58b77b8 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 127a866..ad59c1c 100644
--- a/beesdoo_base/views/partner.xml
+++ b/beesdoo_base/views/partner.xml
@@ -25,17 +25,17 @@
                 <field name="parent_eater_id" attrs="{'invisible' : [('eater', '!=', 'eater')]}" />
             </field>
             <xpath expr="//notebook" position="inside">
-                <page string="Carte de Membre"
+                <page string="Member Cards"
                     attrs="{'invisible': ['|', ('customer', '=', False), ('eater', '!=', 'worker_eater')]}">
                     <separator string="Printing" />
                     <group>
                       <field name="member_card_to_be_printed" />
                       <field name="last_printed" />
                     </group>
-                    <separator string="Mangeurs" />
+                    <separator string="Eaters" />
                     <field name="child_eater_ids" widget="many2many_tags" />
-                    <separator string="Cartes" />
-                    <field string="Cartes" name="member_card_ids">
+                    <separator string="Cards" />
+                    <field string="Cards" name="member_card_ids">
                         <tree editable="bottom">
                             <field name="barcode" />
                             <field name="create_date" />
@@ -46,7 +46,7 @@
                         </tree>
                     </field>
                     <group>
-                        <button string="Nouvelle Carte" name="%(action_membercard_wizard)d"
+                        <button string="New Card" name="%(action_membercard_wizard)d"
                             type="action" />
                     </group>
                 </page>
diff --git a/beesdoo_base/wizard/member_card.py b/beesdoo_base/wizard/member_card.py
index 47d010f..5f6a2af 100644
--- a/beesdoo_base/wizard/member_card.py
+++ b/beesdoo_base/wizard/member_card.py
@@ -12,7 +12,7 @@ class NewMemberCardWizard(models.TransientModel):
     def _get_default_partner(self):
         return self.env.context['active_id']
 
-    new_comment = fields.Text('Reason', required=True)
+    new_comment = fields.Char('Reason', required=True)
     partner_id = fields.Many2one('res.partner', default=_get_default_partner)
     force_barcode = fields.Char('Force Barcode', groups="beesdoo_base.group_force_barcode")
 
diff --git a/beesdoo_base/wizard/views/member_card.xml b/beesdoo_base/wizard/views/member_card.xml
index b52ce87..e57ecdd 100644
--- a/beesdoo_base/wizard/views/member_card.xml
+++ b/beesdoo_base/wizard/views/member_card.xml
@@ -13,9 +13,9 @@
                 <field name="new_comment" string="Raison" editable="True" />
                 <field name="partner_id" invisible="1" />
                 <footer>
-                    <button type="object" name="create_new_card" string="Créer"
+                    <button type="object" name="create_new_card" string="Create"
                         class="oe_highlight" />
-                    <button special="cancel" string="Annuler" />
+                    <button special="cancel" string="Cancel" />
                 </footer>
             </form>
         </field>
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 @@
             	<attribute name="invisible">1</attribute>
             </field>
 			<xpath expr="//group[@name='inventory']/.." position="after">
-                 <page string="Étiquette">
+                 <page string="Label">
                  	<group>
                  		<group name="label">
 	                        <field name="total_with_vat"/>

From 428b5a87e862d422af23bd418dc92bf7ac082b2d Mon Sep 17 00:00:00 2001
From: Thibault Francois <francois.th@gmail.com>
Date: Tue, 19 Jul 2016 23:29:07 +0200
Subject: [PATCH 2/2] [ADD] add info in readme

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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
+```