clearcorp team mailing list archive

[Ronald Rubi <ronald.rubi@xxxxxxxxxxxxxxx>]

Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-ccorp-addons/6.1-rent into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-rent/+merge/130412

[FIX] Fix view building in module rent
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-rent/+merge/130412
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.

=== modified file 'rent/rent.py'
--- rent/rent.py	2012-10-12 16:53:23 +0000
+++ rent/rent.py	2012-10-18 18:40:28 +0000
@@ -174,7 +174,7 @@
         for obj_floor in self.browse(cr,uid,ids):
             if obj_floor.floor_area == 0:
                 raise osv.except_osv('Wrong value!', 'The area for the floor has to bee greater than 0')
-            if vals and vals['floor_number']:
+            if vals and 'floor_number' in vals:
                 obj_build = obj_floor.floor_building_id
                 for obj_f in obj_build.building_floors_ids:
                     if obj_f.floor_number.upper() == vals['floor_number'].upper() and obj_f.id  != obj_floor.id:

=== modified file 'rent/rent_view.xml'
--- rent/rent_view.xml	2012-08-07 21:04:22 +0000
+++ rent/rent_view.xml	2012-10-18 18:40:28 +0000
@@ -258,21 +258,7 @@
                     </group>
                     <notebook>
                         <page string = "Floors">
-                            <field name = "building_floors_ids" mode = "form,tree" nolabel = "1">
-                                <form string = "Floor Details">
-                                    <group col = "4" colspan = "2">
-                                        <separator string = "General Information" col = "4" colspan = "4"/>
-                                        <field name = "floor_number"/>
-                                        <field name = "floor_area"/>
-                                        <field name = "floor_value"/>
-                                    </group>
-                                    <group col = "4" colspan = "2">
-                                        <separator string = "Design Information" col = "4" colspan = "4"/>
-                                        <field name = "floor_thickness"/>
-                                        <field name = "floor_durability"/>
-                                        <field name = "floor_acabado"/>
-                                    </group>
-                                </form>
+                            <field name = "building_floors_ids" widget="many2many" mode = "tree" nolabel = "1">
                                 <tree string="Floor Details">
                                     <field name="floor_number"/>
                                     <field name="floor_value"/>