From 5387e0cd960327ff808182422a7a8e25324cba33 Mon Sep 17 00:00:00 2001
From: EliseDup <Elise@mac-1o0-339.local>
Date: Fri, 3 Jun 2016 15:53:22 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20d'un=20wizard=20pour=20cr=C3=A9er=20un?=
 =?UTF-8?q?=20nouvel=20enfant=20directement=20chez=20le=20travailleur.=20C?=
 =?UTF-8?q?orrection=20de=20qq=20mots=20qui=20=C3=A9taient=20encore=20en?=
 =?UTF-8?q?=20fran=C3=A7ais?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beesdoo_base/__openerp__.py               |   1 +
 beesdoo_base/models/partner.py            |  15 ++-
 beesdoo_base/views/partner.xml            | 137 ++++++++++++----------
 beesdoo_base/wizard/__init__.py           |   2 +-
 beesdoo_base/wizard/member_card.py        |   2 +-
 beesdoo_base/wizard/partner.py            |  22 ++++
 beesdoo_base/wizard/views/member_card.xml |   6 +-
 beesdoo_base/wizard/views/partner.xml     |  22 ++++
 8 files changed, 138 insertions(+), 69 deletions(-)
 create mode 100644 beesdoo_base/wizard/partner.py
 create mode 100644 beesdoo_base/wizard/views/partner.xml

diff --git a/beesdoo_base/__openerp__.py b/beesdoo_base/__openerp__.py
index 6101c91..c070008 100644
--- a/beesdoo_base/__openerp__.py
+++ b/beesdoo_base/__openerp__.py
@@ -22,5 +22,6 @@
         'security/ir.model.access.csv',
         'views/partner.xml',
         'wizard/views/member_card.xml',
+        'wizard/views/partner.xml'
     ],
 }
diff --git a/beesdoo_base/models/partner.py b/beesdoo_base/models/partner.py
index baf19b1..5b22307 100644
--- a/beesdoo_base/models/partner.py
+++ b/beesdoo_base/models/partner.py
@@ -44,7 +44,7 @@ class Partner(models.Model):
     def write(self, values):
         if values.get('parent_eater_id') and self.parent_eater_id:
             raise ValidationError(_('You try to assign a eater to a worker but this easer is alread assign to %s please remove it before') % self.parent_eater_id.name)
-        #replace many2many command when writing on child_eater_ids to just remove the link
+        # replace many2many command when writing on child_eater_ids to just remove the link
         if 'child_eater_ids' in values:
             for command in values['child_eater_ids']:
                 if command[0] == 2:
@@ -74,4 +74,15 @@ class Partner(models.Model):
         cr.execute("UPDATE res_partner set last_name = name where last_name IS NULL")
         return res
 
-
+    @api.multi
+    def _new_eater(self, name, surname, email):
+        partner_data = {
+                        'name' : name,
+                        'surname' : surname,
+                        'is_customer' : True,
+                        'eater' : 'eater',
+                        'parent_eater_id' : self.id,
+                        'email' : email
+                        }
+        self.env['res.partner'].create(partner_data)
+    
diff --git a/beesdoo_base/views/partner.xml b/beesdoo_base/views/partner.xml
index 0a01e83..9aa98d2 100644
--- a/beesdoo_base/views/partner.xml
+++ b/beesdoo_base/views/partner.xml
@@ -1,72 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record model="ir.actions.act_window" id="action_membercard_wizard">
-        <field name="name">New Member Card</field>
-        <field name="res_model">membercard.new.wizard</field>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
+	<record model="ir.actions.act_window" id="action_membercard_wizard">
+		<field name="name">New Member Card</field>
+		<field name="res_model">membercard.new.wizard</field>
+		<field name="view_mode">form</field>
+		<field name="target">new</field>
+	</record>
+
+	<record model="ir.actions.act_window" id="action_eater_wizard">
+		<field name="name">New Eater</field>
+		<field name="res_model">eater.new.wizard</field>
+		<field name="view_mode">form</field>
+		<field name="target">new</field>
+	</record>
 
-    <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': [('customer', '=', False)]}" />
-                <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="Printing" />
-                    <group>
-                      <field name="member_card_to_be_printed" />
-                      <field name="last_printed" />
-                    </group>
-                    <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="create_date" />
-                            <field name="end_date" />
-                            <field name="responsible_id" />
-                            <field name="comment" />
-                            <field name="valid" />
-                        </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>
+	<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': [('customer', '=', False)]}" />
+				<field name="parent_eater_id" attrs="{'invisible' : [('eater', '!=', 'eater')]}" />
+			</field>
+			<xpath expr="//notebook" position="inside">
+				<page string="Member Card"
+					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="Eaters" />
+					<field name="child_eater_ids" widget="many2many_tags" />
+					<group>
+						<button string="New Eater" name="%(action_eater_wizard)d"
+							type="action" />
+					</group>
+					<separator string="Cards" />
+					<field string="Cards" name="member_card_ids">
+						<tree editable="bottom">
+							<field name="barcode" />
+							<field name="create_date" />
+							<field name="end_date" />
+							<field name="responsible_id" />
+							<field name="comment" />
+							<field name="valid" />
+						</tree>
+					</field>
+					<group>
+						<button string="New Card" 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>
 
 	<!-- S022 : By default a supplier should be a company -->
 	<record id="base.action_partner_supplier_form" model="ir.actions.act_window">
 		<field name="context">{ 'search_default_supplier': 1,
-		                        'default_customer': 0,
-		                        'default_supplier': 1,
-		                        'default_is_company' : True,
-		                        'default_company_type' : 'company', }
+			'default_customer':
+			0,
+			'default_supplier': 1,
+			'default_is_company' : True,
+			'default_company_type' : 'company', }
 		</field>
 	</record>
 </odoo>
diff --git a/beesdoo_base/wizard/__init__.py b/beesdoo_base/wizard/__init__.py
index e3dd1fd..ed4a740 100644
--- a/beesdoo_base/wizard/__init__.py
+++ b/beesdoo_base/wizard/__init__.py
@@ -1,2 +1,2 @@
-import member_card
+import member_card, partner
 
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/partner.py b/beesdoo_base/wizard/partner.py
new file mode 100644
index 0000000..317ebd6
--- /dev/null
+++ b/beesdoo_base/wizard/partner.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from openerp import models, fields, api
+
+class NewEaterWizard(models.TransientModel):
+    """
+        A transient model for the creation of a eater related to a worker.
+    """
+    _name = 'eater.new.wizard'
+
+    def _get_default_partner(self):
+        return self.env.context['active_id']
+
+    first_name = fields.Char('First Name', required=True)
+    last_name = fields.Char('Last Name', required=True)
+    email = fields.Char('Email')
+    
+    partner_id = fields.Many2one('res.partner', default=_get_default_partner)
+    
+    @api.one
+    def create_new_eater(self):
+        client = self.partner_id.sudo()
+        client._new_eater(self.first_name, self.last_name, self.email)
diff --git a/beesdoo_base/wizard/views/member_card.xml b/beesdoo_base/wizard/views/member_card.xml
index b52ce87..4a17f00 100644
--- a/beesdoo_base/wizard/views/member_card.xml
+++ b/beesdoo_base/wizard/views/member_card.xml
@@ -10,12 +10,12 @@
                     <field name="force_barcode" />
                 </group>
                 <separator string="Reason" />
-                <field name="new_comment" string="Raison" editable="True" />
+                <field name="new_comment" string="Reason" 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_base/wizard/views/partner.xml b/beesdoo_base/wizard/views/partner.xml
new file mode 100644
index 0000000..bae9c33
--- /dev/null
+++ b/beesdoo_base/wizard/views/partner.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+	<!-- New eater generation wizard -->
+	<record id="Eater Wizard" model="ir.ui.view">
+		<field name="name">New Eater Wizard</field>
+		<field name="model">eater.new.wizard</field>
+		<field name="arch" type="xml">
+			<form string="Create a new eater">
+				<group>
+					<field name="first_name" />
+					<field name="last_name" />
+					<field name="email" />
+				</group>
+				<footer>
+					<button type="object" name="create_new_eater" string="Create"
+						class="oe_highlight" />
+					<button special="cancel" string="Cancel" />
+				</footer>
+			</form>
+		</field>
+	</record>
+</odoo>
\ No newline at end of file