# HG changeset patch
# User Sandrine Ribeau <sandrine.ribeau@logilab.fr>
# Date 1239733814 25200
# Node ID 8c126c74647cb15ae1bda9ace1e5cb57eaa66727
# Parent  31e4c8d30e5d7b2afde819dc233e4d90440aa304# Parent  01210bb805dc3461c7b82df1321369c0598c1d7d
merge

diff -r 31e4c8d30e5d -r 8c126c74647c i18n/en.po
--- a/i18n/en.po	Mon Apr 13 10:10:18 2009 -0700
+++ b/i18n/en.po	Tue Apr 14 11:30:14 2009 -0700
@@ -646,6 +646,12 @@
 msgid "actions_delete_description"
 msgstr ""
 
+msgid "actions_download_as_owl"
+msgstr ""
+
+msgid "actions_download_as_owl_description"
+msgstr ""
+
 msgid "actions_edit"
 msgstr "modify"
 
@@ -1586,6 +1592,9 @@
 msgid "download icon"
 msgstr ""
 
+msgid "download schema as owl"
+msgstr ""
+
 msgid "edit bookmarks"
 msgstr ""
 
@@ -2036,6 +2045,11 @@
 msgid "link a transition to one or more entity type"
 msgstr ""
 
+msgid ""
+"link a transition to one or more rql expression allowing to go through this "
+"transition"
+msgstr ""
+
 msgid "link to each item in"
 msgstr ""
 
@@ -2276,6 +2290,9 @@
 msgid "pkey"
 msgstr "key"
 
+msgid "planned_delivery"
+msgstr "planned delivery"
+
 msgid "please correct errors below"
 msgstr ""
 
diff -r 31e4c8d30e5d -r 8c126c74647c i18n/es.po
--- a/i18n/es.po	Mon Apr 13 10:10:18 2009 -0700
+++ b/i18n/es.po	Tue Apr 14 11:30:14 2009 -0700
@@ -667,6 +667,12 @@
 msgid "actions_delete_description"
 msgstr ""
 
+msgid "actions_download_as_owl"
+msgstr ""
+
+msgid "actions_download_as_owl_description"
+msgstr ""
+
 msgid "actions_edit"
 msgstr "modificar"
 
@@ -1658,6 +1664,9 @@
 msgid "download icon"
 msgstr "ícono de descarga"
 
+msgid "download schema as owl"
+msgstr ""
+
 msgid "edit bookmarks"
 msgstr "editar los atajos"
 
@@ -2129,6 +2138,11 @@
 msgid "link a transition to one or more entity type"
 msgstr "lie une transition ‡ un ou plusieurs types d'entitÈs"
 
+msgid ""
+"link a transition to one or more rql expression allowing to go through this "
+"transition"
+msgstr ""
+
 msgid "link to each item in"
 msgstr "lier vers chaque ÈlÈment dans"
 
@@ -2372,6 +2386,9 @@
 msgid "pkey"
 msgstr "clÈ"
 
+msgid "planned_delivery"
+msgstr ""
+
 msgid "please correct errors below"
 msgstr "veuillez corriger les erreurs ci-dessous"
 
diff -r 31e4c8d30e5d -r 8c126c74647c i18n/fr.po
--- a/i18n/fr.po	Mon Apr 13 10:10:18 2009 -0700
+++ b/i18n/fr.po	Tue Apr 14 11:30:14 2009 -0700
@@ -669,6 +669,12 @@
 msgid "actions_delete_description"
 msgstr ""
 
+msgid "actions_download_as_owl"
+msgstr ""
+
+msgid "actions_download_as_owl_description"
+msgstr ""
+
 msgid "actions_edit"
 msgstr "modifier"
 
@@ -1658,6 +1664,9 @@
 msgid "download icon"
 msgstr "icône de téléchargement"
 
+msgid "download schema as owl"
+msgstr ""
+
 msgid "edit bookmarks"
 msgstr "éditer les signets"
 
@@ -2130,6 +2139,11 @@
 msgid "link a transition to one or more entity type"
 msgstr "lie une transition à un ou plusieurs types d'entités"
 
+msgid ""
+"link a transition to one or more rql expression allowing to go through this "
+"transition"
+msgstr ""
+
 msgid "link to each item in"
 msgstr "lier vers chaque élément dans"
 
@@ -2373,6 +2387,9 @@
 msgid "pkey"
 msgstr "clé"
 
+msgid "planned_delivery"
+msgstr "livraison prévue"
+
 msgid "please correct errors below"
 msgstr "veuillez corriger les erreurs ci-dessous"
 
diff -r 31e4c8d30e5d -r 8c126c74647c web/views/iprogress.py
--- a/web/views/iprogress.py	Mon Apr 13 10:10:18 2009 -0700
+++ b/web/views/iprogress.py	Tue Apr 14 11:30:14 2009 -0700
@@ -40,7 +40,7 @@
     accepts_interfaces = (IMileStone,)
 
     # default columns of the table
-    columns = (_('project'), _('milestone'), _('state'), _('eta_date'),
+    columns = (_('project'), _('milestone'), _('state'), _('eta_date'), _('planned_delivery'),
                _('cost'), _('progress'), _('todo_by'))
 
 
@@ -133,6 +133,12 @@
             else:
                 formated_date = u'%s %s' % (_('expected:'), eta_date)
         return formated_date
+
+    def build_planned_delivery_cell(self, entity):
+        """``initial_prevision_date`` column cell renderer"""
+        if entity.finished():
+            return self.format_date(entity.completion_date())
+        return self.format_date(entity.initial_prevision_date())
     
     def build_todo_by_cell(self, entity):
         """``todo_by`` column cell renderer"""