← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~echeverrifm/oemedical/7.0-Improve_oemedical-patient into lp:oemedical

 

Federico Manuel Echeverri Choux -  (  Vauxoo  ) has proposed merging lp:~echeverrifm/oemedical/7.0-Improve_oemedical-patient into lp:oemedical.

Requested reviews:
  Nhomar - Vauxoo (nhomar)

For more details, see:
https://code.launchpad.net/~echeverrifm/oemedical/7.0-Improve_oemedical-patient/+merge/194988

Remove fields [ first_name, lastname and second_lastname ]
-- 
https://code.launchpad.net/~echeverrifm/oemedical/7.0-Improve_oemedical-patient/+merge/194988
Your team OEmedical Commiter is subscribed to branch lp:oemedical.
=== modified file 'oemedical/oemedical_patient/oemedical_patient.py'
--- oemedical/oemedical_patient/oemedical_patient.py	2013-09-09 22:55:15 +0000
+++ oemedical/oemedical_patient/oemedical_patient.py	2013-11-13 06:38:08 +0000
@@ -31,20 +31,6 @@
         'res.partner': 'partner_id',
     }
 
-    def onchange_name(self, cr, uid, ids, first_name, lastname, slastname, context=None):
-        if first_name == False:
-            first_name = ''
-        if lastname == False:
-            lastname = ''
-        if slastname == False:
-            slastname = ''
-
-        res = {}
-        res = {'value': { 
-                        'name' : first_name + ' ' + lastname + ' ' + slastname
-                         } }
-        return res
-
     def _get_age(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         age = ''
@@ -78,9 +64,6 @@
         'partner_id': fields.many2one(
             'res.partner', 'Related Partner', required=True,
             ondelete='cascade', help='Partner-related data of the patient'),
-        'first_name': fields.char(size=256, string='Name', required=True),
-        'lastname': fields.char(size=256, string='Lastname', required=True),    
-        'slastname': fields.char(size=256, string='Second Lastname',),
         'family': fields.many2one('oemedical.family', string='Family', help='Family Code'),
         'photo': fields.binary(string='Picture'),
         'sex': fields.selection([('m', 'Male'), ('f', 'Female'), ], string='Sex', required=True),

=== modified file 'oemedical/oemedical_patient/oemedical_patient_view.xml'
--- oemedical/oemedical_patient/oemedical_patient_view.xml	2013-09-22 21:37:07 +0000
+++ oemedical/oemedical_patient/oemedical_patient_view.xml	2013-11-13 06:38:08 +0000
@@ -28,10 +28,8 @@
                             <field name="photo" widget='image' class="oe_left oe_avatar"/> 
                             <div> 
                                  <h1> 
-		                            <field name="first_name" placeholder="First Name" style="width: 20%%" on_change="onchange_name(first_name, lastname, slastname, context)"  /> 
-		                            <field name="lastname" placeholder="Last Name" style="width: 20%%" on_change="onchange_name(first_name, lastname, slastname, context)" /> 
-		                            <field name="slastname" placeholder="S Last Name" style="width: 20%%" on_change="onchange_name(first_name, lastname, slastname, context)" /> 
-	                            </h1> 
+	                              <field name="name" placeholder="Name" style="width: 80%%"  /> 
+                                 </h1> 
                             </div> 
      						<div> 
      							<label for="sex" class="oe_edit_only"/> 
@@ -41,9 +39,6 @@
      							<label for="identification_code"/> 
      							<field name="identification_code" style="width: 17%%" attrs="{'readonly': True }"/> 
      						</div> 
-     						<div> 
-     							<field name="name" invisible="1"/> 
-     						</div> 
                             <div>
      							<label for="dob"/> 
      							<field name="dob" style="width: 30%%"/> 


Follow ups