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 @@ Philippe Lavilier - 1345-08-10 - 1450-10-21 + 1345-1450 POREAU OSWALD - 1877-03-12 - 1955-09-11 + 1877-1955 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 @@ - - + @@ -31,8 +30,7 @@ - - + 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"/> - + 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 @@ - - + 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 -