From 3d4a905161b7bbea32e63827623fc2197e040a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 2 Jan 2012 18:52:27 +0100
Subject: [PATCH] Improve rec_name of carrier

review206004
---
 CHANGELOG   | 2 ++
 carrier.py  | 9 +++++++++
 carrier.xml | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c8289282c1..30080e18a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Improve rec_name of carrier
+
 Version 2.2.0 - 2011-10-24
 * Bug fixes (see mercurial logs for details)
 
diff --git a/carrier.py b/carrier.py
index 8bdd87772d..12743153d9 100644
--- a/carrier.py
+++ b/carrier.py
@@ -24,6 +24,15 @@ class Carrier(ModelSQL, ModelView):
     def default_carrier_cost_method(self):
         return 'product'
 
+    def get_rec_name(self, ids, name):
+        if not ids:
+            return {}
+        names = {}
+        for carrier in self.browse(ids):
+            names[carrier.id] = '%s - %s' % (carrier.party.rec_name,
+                carrier.carrier_product.rec_name)
+        return names
+
     def copy(self, ids, default=None):
         party_obj = Pool().get('party.party')
 
diff --git a/carrier.xml b/carrier.xml
index 3c99ac8d0a..007dcdad2d 100644
--- a/carrier.xml
+++ b/carrier.xml
@@ -75,6 +75,11 @@ this repository contains the full copyright notices and license terms. -->
                         position="replace_attributes">
                         <tree string="Carriers"/>
                     </xpath>
+                    <xpath expr="/tree/field[@name='name']"
+                        position="after">
+                        <field name="carrier_product"/>
+                        <field name="carrier_cost_method"/>
+                    </xpath>
                 </data>
                 ]]>
             </field>