From c842650ff486e33b5392c627cf295de9f6964dfe Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Wed, 22 Sep 2010 12:47:45 +0530
Subject: [PATCH] [IMP] auction: Undo the changes in field name. Title
 corrected.

bzr revid: uco@tinyerp.com-20100922071745-59hzyzfkprrq665w
---
 addons/auction/auction.py             | 3 +--
 addons/auction/auction_demo.xml       | 6 ++----
 addons/auction/auction_view.xml       | 6 ++----
 addons/auction/board_auction_view.xml | 2 +-
 addons/auction/report/artists.xml     | 3 +--
 addons/auction/test/auction.yml       | 3 +--
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 4fb99a2efbf..1a61355f382 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -37,8 +37,7 @@ class auction_artists(osv.osv):
     _columns = {
         'name': fields.char('Artist/Author Name', size=64, required=True),
         'pseudo': fields.char('Pseudo', size=64),
-        'birth_date':fields.date('Birth date'),
-        'death_date':fields.date('Death date'),
+        'birth_death_dates':fields.char('Lifespan', size=64),
         'biography': fields.text('Biography'),
     }
 auction_artists()
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 94ee1ec98a2..a26e5355cde 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -144,14 +144,12 @@
 
     <record model="auction.artists" id="auction_art_1">
         <field name="name">Philippe Lavilier</field>
-        <field name="birth_date">1345-08-10</field>
-        <field name="death_date">1450-10-21</field>
+        <field name="birth_death_dates">1345-1450</field>
     </record>
 
     <record model="auction.artists" id="auction_art_2">
         <field name="name">POREAU OSWALD</field>
-        <field name="birth_date">1877-03-12</field>
-        <field name="death_date">1955-09-11</field>
+        <field name="birth_death_dates">1877-1955</field>
     </record>
 
         <!-- demo data for the account tax code-->
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 1ec39f8c0f0..d149fc89f1c 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -15,8 +15,7 @@
         <field name="arch" type="xml">
             <tree string="Artists">
 	            <field name="name"/>
-	            <field name="birth_date"/>
-	            <field name="death_date"/>
+	            <field name="birth_death_dates"/>
             </tree>
         </field>
     </record>
@@ -31,8 +30,7 @@
 	                <field name="name" colspan="4" string="Name"/>
 	                <newline/>
 	                <field name="pseudo"/>
-	                <field name="birth_date"/>
-	                <field name="death_date"/>
+	                <field name="birth_death_dates"/>
                 </group>
                 <separator string="Biography" colspan="4"/>
                 <field name="biography" nolabel="1" colspan="4"/>
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index 8865550949e..56ed41e2ca5 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -111,7 +111,7 @@
             sequence="1"
             id="menu_board_auction_open"  icon="terp-graph" parent="menu_board_auction"/>
         
-        <menuitem name="Auction Management" id="auction.auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system" action="open_board_auction"/>
+        <menuitem name="Auction" id="auction.auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system" action="open_board_auction"/>
 
     </data>
 </openerp>
diff --git a/addons/auction/report/artists.xml b/addons/auction/report/artists.xml
index 360930f9f0c..0c63f338051 100644
--- a/addons/auction/report/artists.xml
+++ b/addons/auction/report/artists.xml
@@ -3,8 +3,7 @@
 <artists>
 	<artist type="fields" name="name,id">
 		<name type="field" name="name"></name>
-		<birth_date type="field" name="birth_date"></birth_date>
-		<death_date type="field" name="death_date"></death_date>
+		<birth_death_dates type="field" name="birth_death_dates"></birth_death_dates>
 		<biography type="field" name="biography"></biography>
 	</artist>
 </artists>
diff --git a/addons/auction/test/auction.yml b/addons/auction/test/auction.yml
index 8ef1e72ede3..6d07f5fc0a5 100644
--- a/addons/auction/test/auction.yml
+++ b/addons/auction/test/auction.yml
@@ -21,8 +21,7 @@
   I create a new artist for an object. 
 - 
   !record {model: auction.artists, id: auction_artists_vincentvangogh0}:
-    birth_date: "1853-03-30"
-    death_date: "1890-07-29"
+    birth_death_dates: 1853-1900
     name: Vincent van Gogh
  
 -