diff --git a/addons/claim_from_delivery/__init__.py b/addons/claim_from_delivery/__init__.py
index b10828031a8..801c814fdf9 100644
--- a/addons/claim_from_delivery/__init__.py
+++ b/addons/claim_from_delivery/__init__.py
@@ -18,5 +18,6 @@
 #
 ##############################################################################
 import claim_delivery
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 86d357834ff..c530a5605fb 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Claim from delivery",
     "version" : "1.0",
     "author" : "Tiny",
-    "category" : "Enterprise Specific Modules/Food Industries",
+    "category" : "Generic Modules/Inventory Control",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
     "demo_xml" : [],
@@ -31,5 +31,6 @@
     "active": False,
     "installable": True
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/claim_from_delivery/claim_delivery.py b/addons/claim_from_delivery/claim_delivery.py
index 4e81a0a3067..67e6f0baae2 100644
--- a/addons/claim_from_delivery/claim_delivery.py
+++ b/addons/claim_from_delivery/claim_delivery.py
@@ -24,6 +24,10 @@ from osv import fields, osv
 class stock_picking(osv.osv):
     _inherit = "stock.picking"
     _columns = {
-        'partner_id': fields.related('address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
+        'partner_id': fields.related('address_id', 'partner_id', type='many2one', relation="res.partner", string="Partner"), 
         }
+
 stock_picking()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index 7fb68cc6348..d2fe510460d 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -14,19 +14,11 @@
             </field>
         </record>
 
-    <act_window
-      id="action_claim_from_delivery"
-            name="Claim"
-            domain="[]"
-            target="current"
-            view_mode="form"
-            res_model="crm.claim"
-            src_model="stock.picking"/>
-
-
-        <record id="action_claim_from_delivery" model="ir.actions.act_window">
-          <field name="context">{'default_partner_address_id': address_id, 'default_partner_id': partner_id}</field>
-        </record>
+        <act_window id="action_claim_from_delivery" name="Claim"
+            domain="[]" target="current"
+            context="{'default_partner_address_id': address_id, 'default_partner_id': partner_id}"
+            view_mode="form" res_model="crm.claim"
+            src_model="stock.picking" />
 
 	</data>
 </openerp>