diff --git a/__unported__/product_warranty/__init__.py b/product_warranty/__init__.py
similarity index 100%
rename from __unported__/product_warranty/__init__.py
rename to product_warranty/__init__.py
diff --git a/__unported__/product_warranty/__openerp__.py b/product_warranty/__openerp__.py
similarity index 100%
rename from __unported__/product_warranty/__openerp__.py
rename to product_warranty/__openerp__.py
diff --git a/__unported__/product_warranty/i18n/es.po b/product_warranty/i18n/es.po
similarity index 100%
rename from __unported__/product_warranty/i18n/es.po
rename to product_warranty/i18n/es.po
diff --git a/__unported__/product_warranty/i18n/fr.po b/product_warranty/i18n/fr.po
similarity index 100%
rename from __unported__/product_warranty/i18n/fr.po
rename to product_warranty/i18n/fr.po
diff --git a/__unported__/product_warranty/i18n/product_warranty.pot b/product_warranty/i18n/product_warranty.pot
similarity index 99%
rename from __unported__/product_warranty/i18n/product_warranty.pot
rename to product_warranty/i18n/product_warranty.pot
index 997603b6..fe6295d5 100644
--- a/__unported__/product_warranty/i18n/product_warranty.pot
+++ b/product_warranty/i18n/product_warranty.pot
@@ -129,4 +129,3 @@ msgstr ""
 #: field:return.instruction,instructions:0
 msgid "Instructions"
 msgstr ""
-
diff --git a/__unported__/product_warranty/images/product_warranty.png b/product_warranty/images/product_warranty.png
similarity index 100%
rename from __unported__/product_warranty/images/product_warranty.png
rename to product_warranty/images/product_warranty.png
diff --git a/__unported__/product_warranty/product_warranty.py b/product_warranty/product_warranty.py
similarity index 99%
rename from __unported__/product_warranty/product_warranty.py
rename to product_warranty/product_warranty.py
index a6026423..c34cb4e9 100644
--- a/__unported__/product_warranty/product_warranty.py
+++ b/product_warranty/product_warranty.py
@@ -50,7 +50,7 @@ class product_supplierinfo(orm.Model):
         """ Get selected lines to add to exchange """
         instr_obj = self.pool.get('return.instruction')
         instruction_ids = instr_obj.search(cr, uid,
-                                           [('is_default', '=', 'FALSE')],
+                                           [('is_default', '=', True)],
                                            context=context)
         if instruction_ids:
             return instruction_ids[0]
diff --git a/__unported__/product_warranty/product_warranty_view.xml b/product_warranty/product_warranty_view.xml
similarity index 95%
rename from __unported__/product_warranty/product_warranty_view.xml
rename to product_warranty/product_warranty_view.xml
index a3c9150b..5160ed2b 100644
--- a/__unported__/product_warranty/product_warranty_view.xml
+++ b/product_warranty/product_warranty_view.xml
@@ -35,15 +35,17 @@
                 </tree>
             </field>
         </record>
-        
+
         <!-- supplier info form view -->
         <record model="ir.ui.view" id="product_return_instructions_form_view">
             <field name="name">product.return.instructions.form</field>
             <field name="model">return.instruction</field>
             <field name="arch" type="xml">
                 <form string="Return instructions">
-                    <field name="name"/>
-                    <field name="is_default"/>
+                    <group col='4'>
+                        <field name="name"/>
+                        <field name="is_default"/>
+                    </group>
                     <separator string="Instructions" colspan="4"/>
                     <field name="instructions" nolabel="1" colspan="4"/>
                 </form>
@@ -57,11 +59,11 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="product_return_instructions_tree_view"/>
         </record>
-        
+
         <menuitem action="product_return_instructions_action"
             groups="base.group_no_one"
             id="menu_product_return_instructions_action"
-            parent="product.prod_config_main" sequence="3"/>        
+            parent="product.prod_config_main" sequence="3"/>
 <!-- supplier info -->
         <!-- supplier info tree view -->
         <record model="ir.ui.view" id="product_supplierinfo_warranty_tree_view">
@@ -78,7 +80,7 @@
                 </field>
             </field>
         </record>
-        
+
         <!-- supplier info form view -->
         <record model="ir.ui.view" id="product_supplierinfo_warranty_form_view">
             <field name="name">product.supplierinfo.warranty.form</field>
diff --git a/__unported__/product_warranty/res_company.py b/product_warranty/res_company.py
similarity index 100%
rename from __unported__/product_warranty/res_company.py
rename to product_warranty/res_company.py
diff --git a/__unported__/product_warranty/res_company_view.xml b/product_warranty/res_company_view.xml
similarity index 96%
rename from __unported__/product_warranty/res_company_view.xml
rename to product_warranty/res_company_view.xml
index 492be670..34bdf2ee 100644
--- a/__unported__/product_warranty/res_company_view.xml
+++ b/product_warranty/res_company_view.xml
@@ -13,7 +13,7 @@
                     <field name="company_registry" position="after">
                         <separator string="Crm product return address" colspan="4"/>
                         <field name="crm_return_address_id"/>
-                    </field> 
+                    </field>
                 </data>
             </field>
         </record>
diff --git a/__unported__/product_warranty/security/ir.model.access.csv b/product_warranty/security/ir.model.access.csv
similarity index 100%
rename from __unported__/product_warranty/security/ir.model.access.csv
rename to product_warranty/security/ir.model.access.csv