[MERGE]: Merged with trunk-addons.

bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q

9 files changed, 215 insertions, 235 deletions

diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index cb5bdbc392b..88b567c2b5e 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -23,10 +23,10 @@
 {
     'name': 'Subscription and recurring operations',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': """Module allows to create new documents and add subscription on that document.""",
     'author': 'OpenERP SA',
-    'depends': ['base'],
+    'depends': ['base_tools'],
     'init_xml': [],
     'update_xml': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'],
     'demo_xml': ['subscription_demo.xml',],
diff --git a/addons/subscription/i18n/de.po b/addons/subscription/i18n/de.po
index 23f839330aa..f057eac5626 100644
--- a/addons/subscription/i18n/de.po
+++ b/addons/subscription/i18n/de.po
@@ -7,14 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-11-08 08:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-11-18 16:13+0000\n"
+"PO-Revision-Date: 2010-12-01 07:32+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-09 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-02 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -24,26 +25,17 @@ msgid "Source Document"
 msgstr "Quelle Dokument"
 
 #. module: subscription
-#: help:subscription.document,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the "
-"subscription document without removing it."
-msgstr ""
-
-#. module: subscription
 #: field:subscription.document,model:0
 msgid "Object"
 msgstr "Objekt"
 
 #. module: subscription
-#: code:addons/subscription/subscription.py:0
-#, python-format
+#: constraint:ir.model:0
 msgid ""
-"Please provide another source document.\n"
-"This one does not exist !"
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Bitte stellen Sie ein anderes Quelldokument bereit\n"
-"Dieses existiert nicht !"
+"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+"beinhalten"
 
 #. module: subscription
 #: constraint:ir.actions.act_window:0
@@ -61,16 +53,6 @@ msgid "Search Subscription"
 msgstr "Suche Abonnement"
 
 #. module: subscription
-#: code:addons/subscription/subscription.py:0
-#, python-format
-msgid ""
-"You cannot modify the Object linked to the Document Type!\n"
-"Create another Document instead !"
-msgstr ""
-"Das Objekt das mit dem Dokumnet verbunden ist, kann nicht verändert werden \n"
-"Erzeuge ein anderes Dokument!"
-
-#. module: subscription
 #: field:subscription.subscription,date_init:0
 msgid "First Date"
 msgstr "Start am"
@@ -107,14 +89,6 @@ msgid "Error ! You can not create recursive Menu."
 msgstr "Fehler! Sie können keine rekursiven Menüeinträge erstellen."
 
 #. module: subscription
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
-#. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Weeks"
 msgstr "Wochen"
@@ -125,6 +99,11 @@ msgid "Today"
 msgstr "Heute"
 
 #. module: subscription
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#. module: subscription
 #: code:addons/subscription/subscription.py:0
 #, python-format
 msgid "Error !"
@@ -191,6 +170,14 @@ msgid "Number of documents"
 msgstr "Anzahl Dokumente"
 
 #. module: subscription
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr ""
+"Bei Aktivierung können Sie die Abonnements verbergen, ohne sie zu löschen."
+
+#. module: subscription
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Fehlerhafter xml Code für diese Ansicht!"
@@ -207,6 +194,16 @@ msgid "Name"
 msgstr "Bezeichnung"
 
 #. module: subscription
+#: code:addons/subscription/subscription.py:0
+#, python-format
+msgid ""
+"You cannot modify the Object linked to the Document Type!\n"
+"Create another Document instead !"
+msgstr ""
+"Das Objekt das mit dem Dokumnet verbunden ist, kann nicht verändert werden \n"
+"Erzeuge ein anderes Dokument!"
+
+#. module: subscription
 #: field:subscription.document,field_ids:0
 msgid "Fields"
 msgstr "Felder"
@@ -239,6 +236,7 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the "
 "subscription without removing it."
 msgstr ""
+"Bei Aktivierung können Sie die Abonnements verbergen, ohne sie zu löschen."
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
@@ -279,6 +277,11 @@ msgid "Description or Summary of Subscription"
 msgstr "Beschreibung oder Zusammenfassung des Abonements"
 
 #. module: subscription
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 #: view:subscription.document:0
 #: field:subscription.document.fields,document_id:0
@@ -314,7 +317,7 @@ msgstr "Abonnements und wiederkehrende Vorgänge"
 #: help:subscription.subscription,doc_source:0
 msgid ""
 "User can choose the source document on which he wants to create documents"
-msgstr ""
+msgstr "Benutzer können das Ursprungsdokument für die Erstellung auswählen"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_document_form
@@ -346,6 +349,16 @@ msgid "Invoice"
 msgstr "Rechnung"
 
 #. module: subscription
+#: code:addons/subscription/subscription.py:0
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr ""
+"Bitte stellen Sie ein anderes Quelldokument bereit\n"
+"Dieses existiert nicht !"
+
+#. module: subscription
 #: field:subscription.document.fields,value:0
 msgid "Default Value"
 msgstr "Standard Wert"
@@ -356,6 +369,11 @@ msgstr "Standard Wert"
 msgid "Documents created"
 msgstr "Dokumente erstellt"
 
+#. module: subscription
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
 #~ msgid "Status"
 #~ msgstr "Status"
 
diff --git a/addons/subscription/i18n/fr.po b/addons/subscription/i18n/fr.po
index f058d3267e8..4621a19e2fc 100644
--- a/addons/subscription/i18n/fr.po
+++ b/addons/subscription/i18n/fr.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-30 13:51+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-04 09:27+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-05 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -23,49 +24,19 @@ msgid "Source Document"
 msgstr "Document Source"
 
 #. module: subscription
-#: help:subscription.document,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the "
-"subscription document without removing it."
-msgstr ""
-
-#. module: subscription
 #: field:subscription.document,model:0
 msgid "Object"
 msgstr "Objet"
 
 #. module: subscription
-#: code:addons/subscription/subscription.py:0
-#, python-format
-msgid ""
-"Please provide another source document.\n"
-"This one does not exist !"
-msgstr ""
-"Veuillez ajouter un autre document source.\n"
-"Celui ci n'existe pas !"
-
-#. module: subscription
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom du Modèle non valide dans la définition de l'action"
-
-#. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
-msgstr ""
+msgstr "Cette semaine"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
-
-#. module: subscription
-#: code:addons/subscription/subscription.py:0
-#, python-format
-msgid ""
-"You cannot modify the Object linked to the Document Type!\n"
-"Create another Document instead !"
-msgstr ""
+msgstr "Rechercher dans les abonnements"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -81,7 +52,7 @@ msgstr "Champ"
 #: view:subscription.subscription:0
 #: field:subscription.subscription,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
@@ -99,19 +70,6 @@ msgid "Current Date"
 msgstr "Date du jour"
 
 #. module: subscription
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: subscription
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
-
-#. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Weeks"
 msgstr "Semaines"
@@ -119,13 +77,13 @@ msgstr "Semaines"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Today"
-msgstr ""
+msgstr "Aujourd'hui"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erreur !"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
@@ -190,9 +148,13 @@ msgid "Number of documents"
 msgstr "Nombres de documents"
 
 #. module: subscription
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr ""
+"Si ce champ est paramétré à Faux, cela vous permettra de masquer "
+"l'abonnement sans pour autant le supprimer."
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
@@ -206,6 +168,16 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: subscription
+#: code:addons/subscription/subscription.py:0
+#, python-format
+msgid ""
+"You cannot modify the Object linked to the Document Type!\n"
+"Create another Document instead !"
+msgstr ""
+"Vous ne pouvez pas modifier l'objet lié au type de document!\n"
+"Veuillez créer un autre document !"
+
+#. module: subscription
 #: field:subscription.document,field_ids:0
 msgid "Fields"
 msgstr "Champs"
@@ -233,13 +205,6 @@ msgid "Active"
 msgstr "Actif"
 
 #. module: subscription
-#: help:subscription.subscription,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the "
-"subscription without removing it."
-msgstr ""
-
-#. module: subscription
 #: field:subscription.subscription,cron_id:0
 msgid "Cron Job"
 msgstr "Planificateur de tâche"
@@ -259,13 +224,13 @@ msgstr "Partenaire"
 #. module: subscription
 #: help:subscription.subscription,cron_id:0
 msgid "Scheduler which runs on subscription"
-msgstr ""
+msgstr "Calcul système qui traite les abonnements"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.config_recuuring_event
 #: model:ir.ui.menu,name:subscription.next_id_45
 msgid "Recurring Events"
-msgstr ""
+msgstr "Événements récurrents"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -275,7 +240,7 @@ msgstr "Données de l'Abonnement"
 #. module: subscription
 #: help:subscription.subscription,note:0
 msgid "Description or Summary of Subscription"
-msgstr ""
+msgstr "Description ou résumé de l'abonnement"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
@@ -285,9 +250,18 @@ msgid "Subscription Document"
 msgstr "Contrat d'abonnement"
 
 #. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr ""
+
+#. module: subscription
 #: help:subscription.document.fields,value:0
 msgid "Default value is considered for field when new document is generated."
 msgstr ""
+"La valeur par défaut est utilisée pour ce champ lors de la création d'un "
+"nouveau document."
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
@@ -297,7 +271,7 @@ msgstr "Faux"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -307,13 +281,15 @@ msgstr "Processus"
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
 msgid "Subscription and recurring operations"
-msgstr "Inscription et opérations récurrentes"
+msgstr "Abonnement et opérations récurrentes"
 
 #. module: subscription
 #: help:subscription.subscription,doc_source:0
 msgid ""
 "User can choose the source document on which he wants to create documents"
 msgstr ""
+"L'utilisateur peut choisir le document d'origine d'après lequel il créera "
+"les documents."
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_document_form
@@ -345,6 +321,16 @@ msgid "Invoice"
 msgstr "Facture"
 
 #. module: subscription
+#: code:addons/subscription/subscription.py:0
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr ""
+"Veuillez ajouter un autre document source.\n"
+"Celui ci n'existe pas !"
+
+#. module: subscription
 #: field:subscription.document.fields,value:0
 msgid "Default Value"
 msgstr "Valeur par défaut"
@@ -355,6 +341,12 @@ msgstr "Valeur par défaut"
 msgid "Documents created"
 msgstr "Document crée"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+#~ "spéciaux !"
+
 #~ msgid "Status"
 #~ msgstr "État"
 
@@ -364,6 +356,9 @@ msgstr "Document crée"
 #~ msgid "Configuration"
 #~ msgstr "Configuration"
 
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valide pour l'architecture de la vue"
+
 #~ msgid "Subscription document"
 #~ msgstr "Contrat d'abonnement"
 
@@ -372,3 +367,6 @@ msgstr "Document crée"
 
 #~ msgid "Tools"
 #~ msgstr "Outils"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom du Modèle non valide dans la définition de l'action"
diff --git a/addons/subscription/i18n/pt.po b/addons/subscription/i18n/pt.po
index 4b43b8647ae..cfc85968965 100644
--- a/addons/subscription/i18n/pt.po
+++ b/addons/subscription/i18n/pt.po
@@ -6,28 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-30 10:11+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-03 07:39+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-04 05:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
 #: field:subscription.subscription.history,document_id:0
 msgid "Source Document"
-msgstr "Documento fonte"
-
-#. module: subscription
-#: help:subscription.document,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the "
-"subscription document without removing it."
-msgstr ""
+msgstr "Documento de Origem"
 
 #. module: subscription
 #: field:subscription.document,model:0
@@ -35,40 +28,19 @@ msgid "Object"
 msgstr "Objecto"
 
 #. module: subscription
-#: code:addons/subscription/subscription.py:0
-#, python-format
-msgid ""
-"Please provide another source document.\n"
-"This one does not exist !"
-msgstr ""
-
-#. module: subscription
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da acção"
-
-#. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
-msgstr ""
+msgstr "Esta semana"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
-
-#. module: subscription
-#: code:addons/subscription/subscription.py:0
-#, python-format
-msgid ""
-"You cannot modify the Object linked to the Document Type!\n"
-"Create another Document instead !"
-msgstr ""
+msgstr "Procurar subscrição"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
 msgid "First Date"
-msgstr "1ª data"
+msgstr "Primeira Data"
 
 #. module: subscription
 #: field:subscription.document.fields,field:0
@@ -79,7 +51,7 @@ msgstr "Campo"
 #: view:subscription.subscription:0
 #: field:subscription.subscription,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
@@ -94,19 +66,7 @@ msgstr "Rascunho"
 #. module: subscription
 #: selection:subscription.document.fields,value:0
 msgid "Current Date"
-msgstr "Data actual"
-
-#. module: subscription
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: subscription
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+msgstr "Data Actual"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
@@ -116,13 +76,13 @@ msgstr "Semanas"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Today"
-msgstr ""
+msgstr "Hoje"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erro!"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
@@ -144,19 +104,21 @@ msgstr "Parar"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Set to Draft"
-msgstr "Definido como rascunho"
+msgstr "Definir para Rascunho"
 
 #. module: subscription
 #: model:ir.module.module,description:subscription.module_meta_information
 msgid ""
 "Module allows to create new documents and add subscription on that document."
 msgstr ""
+"O Modulo permite criar novos documentos e adicionar subscrições nesse "
+"documento."
 
 #. module: subscription
 #: view:subscription.subscription:0
 #: selection:subscription.subscription,state:0
 msgid "Running"
-msgstr "Em execução"
+msgstr "Em Progresso"
 
 #. module: subscription
 #: view:subscription.subscription.history:0
@@ -172,7 +134,7 @@ msgstr "Utilizador"
 #. module: subscription
 #: field:subscription.subscription,interval_type:0
 msgid "Interval Unit"
-msgstr "Unidade do intervalo"
+msgstr "Unidade de Intervalo"
 
 #. module: subscription
 #: field:subscription.subscription.history,date:0
@@ -185,9 +147,11 @@ msgid "Number of documents"
 msgstr "Número de documentos"
 
 #. module: subscription
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
+#: help:subscription.document,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it."
+msgstr ""
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
@@ -201,6 +165,16 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: subscription
+#: code:addons/subscription/subscription.py:0
+#, python-format
+msgid ""
+"You cannot modify the Object linked to the Document Type!\n"
+"Create another Document instead !"
+msgstr ""
+"Não pode modificat o Objeto ligado ao Tipo de Documento!\n"
+"Crie, antes, um outro Documento!"
+
+#. module: subscription
 #: field:subscription.document,field_ids:0
 msgid "Fields"
 msgstr "Campos"
@@ -228,16 +202,9 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: subscription
-#: help:subscription.subscription,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the "
-"subscription without removing it."
-msgstr ""
-
-#. module: subscription
 #: field:subscription.subscription,cron_id:0
 msgid "Cron Job"
-msgstr "Cron job"
+msgstr "Trabalho a ser executado"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription
@@ -260,12 +227,12 @@ msgstr ""
 #: model:ir.ui.menu,name:subscription.config_recuuring_event
 #: model:ir.ui.menu,name:subscription.next_id_45
 msgid "Recurring Events"
-msgstr ""
+msgstr "Eventos recorrentes"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Subsription Data"
-msgstr "Data de subscrição"
+msgstr "Data de Subscrição"
 
 #. module: subscription
 #: help:subscription.subscription,note:0
@@ -280,6 +247,13 @@ msgid "Subscription Document"
 msgstr "Documento de Subscrição"
 
 #. module: subscription
+#: help:subscription.subscription,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription without removing it."
+msgstr ""
+
+#. module: subscription
 #: help:subscription.document.fields,value:0
 msgid "Default value is considered for field when new document is generated."
 msgstr ""
@@ -292,7 +266,7 @@ msgstr "Falso"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -302,7 +276,7 @@ msgstr "Processo"
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
 msgid "Subscription and recurring operations"
-msgstr ""
+msgstr "Subscrição e operações recurrentes"
 
 #. module: subscription
 #: help:subscription.subscription,doc_source:0
@@ -314,19 +288,19 @@ msgstr ""
 #: model:ir.actions.act_window,name:subscription.action_document_form
 #: model:ir.ui.menu,name:subscription.menu_action_document_form
 msgid "Document Types"
-msgstr "Tipos de documentos"
+msgstr "Tipos de Documentos"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:0
 #, python-format
 msgid "Wrong Source Document !"
-msgstr "Fonte do documento errado!"
+msgstr "Origem do Documento Errada !"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document_fields
 #: view:subscription.document.fields:0
 msgid "Subscription Document Fields"
-msgstr "Campos de subscrições do documento"
+msgstr "Campos de Subscrição de Documento"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -340,6 +314,16 @@ msgid "Invoice"
 msgstr "Factura"
 
 #. module: subscription
+#: code:addons/subscription/subscription.py:0
+#, python-format
+msgid ""
+"Please provide another source document.\n"
+"This one does not exist !"
+msgstr ""
+"Por Favor forneça outro documento de origem.\n"
+"Este não existe !"
+
+#. module: subscription
 #: field:subscription.document.fields,value:0
 msgid "Default Value"
 msgstr "Valor por defeito"
@@ -348,22 +332,34 @@ msgstr "Valor por defeito"
 #: view:subscription.subscription:0
 #: field:subscription.subscription,doc_lines:0
 msgid "Documents created"
-msgstr "Documentos criados"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Subscription document fields"
-#~ msgstr "Campo do documento de subscrição"
+msgstr "Documentos criado"
 
 #~ msgid "Configuration"
 #~ msgstr "Configuração"
 
-#~ msgid "Subscription document"
-#~ msgstr "Documento de subscrição"
-
-#~ msgid "All Subscriptions"
-#~ msgstr "Todas as subscrições"
-
 #~ msgid "Tools"
 #~ msgstr "Ferramentas"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da acção."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
+#~ "especial !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML Inválido para a Arquitectura de Vista !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "O ID do certificado do módulo tem de ser único!"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Erro! Não pode criar menus recursivos."
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "O nome do módulo deve ser único!"
diff --git a/addons/subscription/i18n/subscription.pot b/addons/subscription/i18n/subscription.pot
index a013fbd0d69..c3f7a24341c 100644
--- a/addons/subscription/i18n/subscription.pot
+++ b/addons/subscription/i18n/subscription.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13:17+0000\n"
-"PO-Revision-Date: 2010-11-18 16:13:17+0000\n"
+"POT-Creation-Date: 2010-12-03 15:44:37+0000\n"
+"PO-Revision-Date: 2010-12-03 15:44:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -27,16 +27,6 @@ msgid "Object"
 msgstr ""
 
 #. module: subscription
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: subscription
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
 msgstr ""
@@ -78,11 +68,6 @@ msgid "Current Date"
 msgstr ""
 
 #. module: subscription
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Weeks"
 msgstr ""
@@ -93,11 +78,6 @@ msgid "Today"
 msgstr ""
 
 #. module: subscription
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr ""
-
-#. module: subscription
 #: code:addons/subscription/subscription.py:0
 #, python-format
 msgid "Error !"
@@ -168,11 +148,6 @@ msgid "If the active field is set to False, it will allow you to hide the subscr
 msgstr ""
 
 #. module: subscription
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: subscription
 #: selection:subscription.subscription.history,document_id:0
 msgid "Sale Order"
 msgstr ""
@@ -218,11 +193,6 @@ msgid "Active"
 msgstr ""
 
 #. module: subscription
-#: help:subscription.subscription,active:0
-msgid "If the active field is set to true, it will allow you to hide the subscription without removing it."
-msgstr ""
-
-#. module: subscription
 #: field:subscription.subscription,cron_id:0
 msgid "Cron Job"
 msgstr ""
@@ -261,11 +231,6 @@ msgid "Description or Summary of Subscription"
 msgstr ""
 
 #. module: subscription
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr ""
-
-#. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 #: view:subscription.document:0
 #: field:subscription.document.fields,document_id:0
@@ -273,6 +238,11 @@ msgid "Subscription Document"
 msgstr ""
 
 #. module: subscription
+#: help:subscription.subscription,active:0
+msgid "If the active field is set to False, it will allow you to hide the subscription without removing it."
+msgstr ""
+
+#. module: subscription
 #: help:subscription.document.fields,value:0
 msgid "Default value is considered for field when new document is generated."
 msgstr ""
@@ -349,8 +319,3 @@ msgstr ""
 msgid "Documents created"
 msgstr ""
 
-#. module: subscription
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
-
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index 0014f38182b..70c648380d5 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -8,6 +8,6 @@
    	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
-
+   	
 </data>
 </openerp>
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index c015f599e7d..255c6ccf8c1 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -67,7 +67,7 @@ class subscription_subscription(osv.osv):
     _description = "Subscription"
     _columns = {
         'name': fields.char('Name', size=60, required=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the subscription without removing it."),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the subscription without removing it."),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'notes': fields.text('Notes'),
         'user_id': fields.many2one('res.users', 'User', required=True),
diff --git a/addons/subscription/subscription_demo.xml b/addons/subscription/subscription_demo.xml
index bb8d61ef4b0..6f26cfde14d 100644
--- a/addons/subscription/subscription_demo.xml
+++ b/addons/subscription/subscription_demo.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_tool_user'))]" name="groups_id"/>
+        </record>
+    
         <record id="subscription_document_partner0" model="subscription.document">
             <field eval="1" name="active"/>
             <field name="model" ref="base.model_res_partner"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 37841919b1b..b3c39962190 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
 
         <!--