From a6c3e9256d7255a68d29510cb8df4e85bda99820 Mon Sep 17 00:00:00 2001
From: EliseDup <Elise@wifi-secure1-933.sri.ucl.ac.be>
Date: Tue, 8 Mar 2016 15:11:27 +0100
Subject: [PATCH 1/5] S003 : add member card and member card wizard

---
 beesdoo_base/models/__init__.py   |  2 +-
 beesdoo_base/models/membercard.py | 46 +++++++++++++++++++++++++++++++
 beesdoo_base/models/partner.py    | 16 -----------
 3 files changed, 47 insertions(+), 17 deletions(-)
 create mode 100644 beesdoo_base/models/membercard.py

diff --git a/beesdoo_base/models/__init__.py b/beesdoo_base/models/__init__.py
index 751e194..f95b336 100644
--- a/beesdoo_base/models/__init__.py
+++ b/beesdoo_base/models/__init__.py
@@ -1 +1 @@
-import partner
\ No newline at end of file
+import partner, membercard
\ No newline at end of file
diff --git a/beesdoo_base/models/membercard.py b/beesdoo_base/models/membercard.py
new file mode 100644
index 0000000..e5c0217
--- /dev/null
+++ b/beesdoo_base/models/membercard.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+from openerp import models, fields, api
+from random import randint
+
+class MemberCard(models.Model):
+    
+    def _get_current_user(self):
+        return self.env.uid
+    
+    def _get_current_client(self):
+        # TODO : this does not work
+        return self.env['res.partner'].search([('id', '=',self.env.context['active_id'])])
+    
+    def _compute_bar_code(self):
+        rule = self.env['barcode.rule'].search([('name', '=', 'Customer Barcodes')])[0]
+        nomenclature = self.env['barcode.nomenclature']
+        size = 13-len(rule.pattern)
+        ean = rule.pattern + str(randint(10**(size-1), 10**size-1))
+        code = ean[0:12] + str(nomenclature.ean_checksum(ean))
+        nomenclature.check_encoding(code,'ean13')
+        return code
+    
+    _name = 'member.card'
+    _order = 'activation_date desc'
+    
+    valid = fields.Boolean(default=True, string="Active")
+    barcode = fields.Char('Barcode', oldname='ean13', default=_compute_bar_code)
+    partner_id = fields.Many2one('res.partner') #, default=_get_current_client)
+    responsible_id = fields.Many2one('res.users', default=_get_current_user)
+    activation_date = fields.Date(default=fields.Date.today, readonly=True)
+    end_date = fields.Date(readonly=True)
+    comment = fields.Char("Raison", required=True)
+    
+# A transient model for the creation of a new card. The user can only define the raison why 
+# a new card is needed and the eater/worker that is concerned.
+class BeesMemberCardWizard(models.TransientModel):
+    _name = 'beesmembercard.wizard'
+   
+    new_comment = fields.Char('Raison', required=True)
+    
+    @api.multi
+    def create_new_card(self):
+        client = self.env['res.partner'].search([('id', '=',self.env.context['active_id'])])
+        client._deactivate_active_cards()
+        client._new_card(self.new_comment)
+
diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py
index 79393fd..0ab56e2 100644
--- a/beesdoo_base/models/partner.py
+++ b/beesdoo_base/models/partner.py
@@ -49,19 +49,3 @@ class Partner(models.Model):
                 if command[0] == 2:
                     command[0] = 3
         return super(Partner, self).write(values)
-
-class MemberCard(models.Model):
-
-    def _get_current_user(self):
-        return self.env.user
-
-    _name = 'member.card'
-    _order = 'activation_date desc'
-
-    active = fields.Boolean(default=True)
-    barcode = fields.Char('Barcode', oldname='ean13')
-    partner_id = fields.Many2one('res.partner')
-    responsible_id = fields.Many2one('res.users', default=_get_current_user)
-    activation_date = fields.Date(default=fields.Date.today, readonly=True)
-    end_date = fields.Date()
-    comment = fields.Char("Reason")

From 54106a4c460159f14468329804fe80daf46322f6 Mon Sep 17 00:00:00 2001
From: EliseDup <Elise@wifi-secure1-933.sri.ucl.ac.be>
Date: Tue, 8 Mar 2016 15:15:22 +0100
Subject: [PATCH 2/5] S003 : create a wizard to add a new card

---
 beesdoo_base/models/membercard.py |   4 +-
 beesdoo_base/views/partner.xml    | 108 +++++++++++++++++++-----------
 2 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/beesdoo_base/models/membercard.py b/beesdoo_base/models/membercard.py
index e5c0217..1415b46 100644
--- a/beesdoo_base/models/membercard.py
+++ b/beesdoo_base/models/membercard.py
@@ -33,8 +33,8 @@ class MemberCard(models.Model):
     
 # A transient model for the creation of a new card. The user can only define the raison why 
 # a new card is needed and the eater/worker that is concerned.
-class BeesMemberCardWizard(models.TransientModel):
-    _name = 'beesmembercard.wizard'
+class MemberCardWizard(models.TransientModel):
+    _name = 'membercard.wizard'
    
     new_comment = fields.Char('Raison', required=True)
     
diff --git a/beesdoo_base/views/partner.xml b/beesdoo_base/views/partner.xml
index ff211a2..60d8b98 100644
--- a/beesdoo_base/views/partner.xml
+++ b/beesdoo_base/views/partner.xml
@@ -1,43 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record model="ir.ui.view" id="beesdoo_partner_form_view">
-        <field name="name">beesdoo.partner.form.view</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id"  ref="point_of_sale.view_partner_property_form" />
-        <field name="arch" type="xml" >
-            <field name="name" position="replace">
-                <field name="name" class="oe_read_only" />
-                <field name="first_name" placeholder="First Name"  class="oe_edit_only" attrs="{'invisible' : [('company_type', '=', 'company')]}"/>
-                <field name="last_name" placeholder="Last Name"  class="oe_edit_only" default_focus="1"/>
-            </field>
-            <field name="website" position="after">
-                <field name="eater" attrs="{'invisible': [('company_type', '=', 'company')]}"/>
-                <field name="parent_eater_id" attrs="{'invisible' : [('eater', '!=', 'eater')]}" />
-            </field>
-            <xpath expr="//notebook" position="inside">
-                <page string="Carte de Membre"
-                    attrs="{'invisible': ['|', ('customer', '=', False), ('eater', '!=', 'worker_eater')]}">
-                    <separator string="Mangeurs" />
-                    <field name="child_eater_ids" widget="many2many_tags" />
-                    <separator string="Cartes" />
-                    <field string="Cartes" name="member_card_ids">
-                        <tree editable="bottom">
-                            <field name="barcode" />
-                            <field name="activation_date" />
-                            <field name="end_date" />
-                            <field name="responsible_id" />
-                            <field name="comment" />
-                        </tree>
-                    </field>
-                </page>
-            </xpath>
-            <field name="barcode" position="attributes">
-                <attribute name="attrs">{'invisible' : [('eater', '!=', 'worker_eater')]}</attribute>
-            </field>
-            <field name="barcode" position="after">
-                <field name="parent_barcode" attrs="{'invisible' : [('eater', '!=', 'eater')]}" />
-            </field>
-        </field>
-    </record>
+	<record id="MemberCard Wizard" model="ir.ui.view">
+		<field name="name">New MemberCard Wizard</field>
+		<field name="model">membercard.wizard</field>
+		<field name="arch" type="xml">
+			<form>
+				<group>
+					<field name="new_comment" string="Raison" editable="True" />
+				</group>
+				<footer>
+					<button type="object" name="create_new_card" string="Créer"
+						class="oe_highlight" />
+					<button special="cancel" string="Annuler" />
+				</footer>
+			</form>
+		</field>
+	</record>
+
+	<act_window id="action_membercard_wizard"
+		name="Créer une nouvelle carte de membre - Désactiver l'ancienne"
+		src_model="member.card" res_model="membercard.wizard" view_mode="form"
+		target="new" multi="True" />
+
+	<record model="ir.ui.view" id="beesdoo_partner_form_view">
+		<field name="name">beesdoo.partner.form.view</field>
+		<field name="model">res.partner</field>
+		<field name="inherit_id" ref="point_of_sale.view_partner_property_form" />
+		<field name="arch" type="xml">
+			<field name="name" position="replace">
+				<field name="name" class="oe_read_only" />
+				<field name="first_name" placeholder="First Name" class="oe_edit_only"
+					attrs="{'invisible' : [('company_type', '=', 'company')]}" />
+				<field name="last_name" placeholder="Last Name" class="oe_edit_only"
+					default_focus="1" />
+			</field>
+			<field name="website" position="after">
+				<field name="eater"
+					attrs="{'invisible': [('company_type', '=', 'company')]}" />
+				<field name="parent_eater_id" attrs="{'invisible' : [('eater', '!=', 'eater')]}" />
+			</field>
+			<xpath expr="//notebook" position="inside">
+				<page string="Carte de Membre"
+					attrs="{'invisible': ['|', ('customer', '=', False), ('eater', '!=', 'worker_eater')]}">
+					<separator string="Mangeurs" />
+					<field name="child_eater_ids" widget="many2many_tags" />
+					<separator string="Cartes" />
+					<field string="Cartes" name="member_card_ids">
+						<tree editable="bottom">
+							<field name="barcode" />
+							<field name="activation_date" />
+							<field name="end_date" />
+							<field name="responsible_id" />
+							<field name="comment" />
+						</tree>
+					</field>
+					<group>
+						<button string="Nouvelle Carte" name="%(action_membercard_wizard)d"
+							type="action" />
+					</group>
+				</page>
+			</xpath>
+			<field name="barcode" position="attributes">
+				<attribute name="attrs">{'invisible' : [('eater', '!=',
+					'worker_eater')]}</attribute>
+			</field>
+			<field name="barcode" position="after">
+				<field name="parent_barcode" attrs="{'invisible' : [('eater', '!=', 'eater')]}" />
+			</field>
+		</field>
+	</record>
 </odoo>
\ No newline at end of file

From 2be812b3df629bb245264ad6f2fd3b5220447d95 Mon Sep 17 00:00:00 2001
From: EliseDup <Elise@wifi-secure1-933.sri.ucl.ac.be>
Date: Tue, 8 Mar 2016 15:20:09 +0100
Subject: [PATCH 3/5] SOO3 : last change ( now we have a wizard to create a new
 card, deactivate the others and update the bar code )

---
 beesdoo_base/models/partner.py | 16 +++++++++++++++-
 beesdoo_base/views/partner.xml |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py
index 0ab56e2..da9ba86 100644
--- a/beesdoo_base/models/partner.py
+++ b/beesdoo_base/models/partner.py
@@ -31,7 +31,9 @@ class Partner(models.Model):
         if self.eater == 'eater':
             self.parent_barcode = self.parent_eater_id.barcode
         elif self.member_card_ids:
-            self.barcode = self.member_card_ids[0].barcode
+            for c in self.member_card_ids:
+                if c.valid:
+                    self.barcode = c.barcode
 
     @api.one
     @api.constrains('child_eater_ids', 'parent_eater_id')
@@ -49,3 +51,15 @@ class Partner(models.Model):
                 if command[0] == 2:
                     command[0] = 3
         return super(Partner, self).write(values)
+    
+    @api.multi
+    def _deactivate_active_cards(self):
+        if len(self.member_card_ids) > 0:
+            for c in self.member_card_ids:
+                if c.valid:
+                    c.valid = False
+                    c.end_date = fields.Date.today()      
+    @api.multi            
+    def _new_card(self, txt):
+        self.env['member.card'].create({'partner_id' : self.env.context['active_id'],'comment' : txt})
+
diff --git a/beesdoo_base/views/partner.xml b/beesdoo_base/views/partner.xml
index 60d8b98..82d9491 100644
--- a/beesdoo_base/views/partner.xml
+++ b/beesdoo_base/views/partner.xml
@@ -53,6 +53,7 @@
 							<field name="end_date" />
 							<field name="responsible_id" />
 							<field name="comment" />
+							<field name="valid" />
 						</tree>
 					</field>
 					<group>

From adf403450d2504c5ad8dfae32bb7fb67aaaa52d5 Mon Sep 17 00:00:00 2001
From: EliseDup <Elise@wifi-secure1-933.sri.ucl.ac.be>
Date: Tue, 8 Mar 2016 15:51:19 +0100
Subject: [PATCH 4/5] SOO3 : use uuid to generate unique barcode

---
 beesdoo_base/models/membercard.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/beesdoo_base/models/membercard.py b/beesdoo_base/models/membercard.py
index 1415b46..49ecd45 100644
--- a/beesdoo_base/models/membercard.py
+++ b/beesdoo_base/models/membercard.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from openerp import models, fields, api
 from random import randint
+import uuid
 
 class MemberCard(models.Model):
     
@@ -15,7 +16,7 @@ class MemberCard(models.Model):
         rule = self.env['barcode.rule'].search([('name', '=', 'Customer Barcodes')])[0]
         nomenclature = self.env['barcode.nomenclature']
         size = 13-len(rule.pattern)
-        ean = rule.pattern + str(randint(10**(size-1), 10**size-1))
+        ean = rule.pattern + str(uuid.uuid4().fields[-1])[:size] #str(randint(10**(size-1), 10**size-1))
         code = ean[0:12] + str(nomenclature.ean_checksum(ean))
         nomenclature.check_encoding(code,'ean13')
         return code

From 24c637f37fab5c1085a9e9e43179dbd9e97f9af4 Mon Sep 17 00:00:00 2001
From: EliseDup <Elise@wifi-secure1-933.sri.ucl.ac.be>
Date: Tue, 8 Mar 2016 16:01:47 +0100
Subject: [PATCH 5/5] =?UTF-8?q?S003=20et=20S010=20:=20noms=20en=20fran?=
 =?UTF-8?q?=C3=A7ais=20dans=20l'interface=20graphique?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beesdoo_base/models/membercard.py | 8 ++++----
 beesdoo_base/models/partner.py    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/beesdoo_base/models/membercard.py b/beesdoo_base/models/membercard.py
index 49ecd45..3a6c60d 100644
--- a/beesdoo_base/models/membercard.py
+++ b/beesdoo_base/models/membercard.py
@@ -25,11 +25,11 @@ class MemberCard(models.Model):
     _order = 'activation_date desc'
     
     valid = fields.Boolean(default=True, string="Active")
-    barcode = fields.Char('Barcode', oldname='ean13', default=_compute_bar_code)
+    barcode = fields.Char("Code barre", oldname='ean13', default=_compute_bar_code)
     partner_id = fields.Many2one('res.partner') #, default=_get_current_client)
-    responsible_id = fields.Many2one('res.users', default=_get_current_user)
-    activation_date = fields.Date(default=fields.Date.today, readonly=True)
-    end_date = fields.Date(readonly=True)
+    responsible_id = fields.Many2one('res.users', default=_get_current_user, string="Responsable")
+    activation_date = fields.Date(default=fields.Date.today, readonly=True, string="Date de création")
+    end_date = fields.Date(readonly=True, string="Date d'expiration")
     comment = fields.Char("Raison", required=True)
     
 # A transient model for the creation of a new card. The user can only define the raison why 
diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py
index da9ba86..6be5e08 100644
--- a/beesdoo_base/models/partner.py
+++ b/beesdoo_base/models/partner.py
@@ -10,15 +10,15 @@ class Partner(models.Model):
     first_name = fields.Char('First Name')
     last_name = fields.Char('Last Name', required=True)
 
-    eater = fields.Selection([('eater', 'Eater'), ('worker_eater', 'Worker and Eater')], string="Eater/Worker")
+    eater = fields.Selection([('eater', 'Mangeur'), ('worker_eater', 'Mangeur et Travailleur')], string="Mangeur/Travailleur")
 
     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)
+    parent_eater_id = fields.Many2one("res.partner", string="Parent Travailleur", 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='Code Barre', store=True)
+    parent_barcode = fields.Char(compute="_get_bar_code", string='Code Barre du Parent', store=True)
     member_card_ids = fields.One2many('member.card', 'partner_id')
 
     @api.onchange('first_name', 'last_name')