merges

bzr revid: nch@tinyerp.com-20081104054645-pqtvoho3hiyjb2yf

5 files changed, 279 insertions, 214 deletions

diff --git a/addons/process/__init__.py b/addons/process/__init__.py
index 092ca748429..0d315663f98 100644
--- a/addons/process/__init__.py
+++ b/addons/process/__init__.py
@@ -1,29 +1,22 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#                    Fabien Pinckaers <fp@tiny.Be>
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py
index ca48fada8a6..5fc719ddc5d 100644
--- a/addons/process/__terp__.py
+++ b/addons/process/__terp__.py
@@ -1,4 +1,24 @@
 # -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 {
     "name" : "Enterprise Process",
     "version" : "1.0",
diff --git a/addons/process/i18n/fr_FR.po b/addons/process/i18n/fr_FR.po
index efb2294f76e..d1fe70d6378 100644
--- a/addons/process/i18n/fr_FR.po
+++ b/addons/process/i18n/fr_FR.po
@@ -1,232 +1,290 @@
-# French translation for openobject-addons
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+# Translation of OpenERP Server.
+# This file containt the translation of the following modules:
+#	* process
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-09-05 13:34+0000\n"
-"PO-Revision-Date: 2008-10-13 14:46+0000\n"
-"Last-Translator: Olivier Laurent <Unknown>\n"
-"Language-Team: French <fr@li.org>\n"
+"Project-Id-Version: OpenERP Server 4.3.99\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2008-11-02 20:23:25+0000\n"
+"PO-Revision-Date: 2008-11-02 20:23:25+0000\n"
+"Last-Translator: <>\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: 2008-10-13 14:56+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
 
-#. module: processus
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#. module: process
+#: view:process.process:0
+#: view:process.node:0
+msgid "Process Node"
 msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
 
-#. module: processus
-#: model:ir.ui.menu,name:processus.menu_processus
-msgid "Enterprise Processus"
-msgstr "Processus d'entreprise"
+#. module: process
+#: 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: process
+#: view:process.process:0
+#: view:process.node:0
+#: view:process.transition:0
+msgid "Roles from Workflow"
+msgstr ""
 
-#. module: processus
-#: field:processus.node,menu_id:0
+#. module: process
+#: field:process.node,menu_id:0
 msgid "Related Menu"
-msgstr "Menu Relatif"
+msgstr ""
 
-#. module: processus
-#: field:processus.transition,action_ids:0
+#. module: process
+#: field:process.transition,action_ids:0
+#: view:process.process:0
+#: view:process.node:0
 msgid "Buttons"
-msgstr "Boutons"
+msgstr ""
 
-#. module: processus
-#: selection:processus.node,kind:0
+#. module: process
+#: selection:process.node,kind:0
 msgid "State"
-msgstr "État"
+msgstr ""
 
-#. module: processus
-#: field:processus.transition,node_to_id:0
-msgid "Destination Node"
-msgstr "Noeud de Destination"
+#. module: process
+#: view:process.process:0
+#: view:process.node:0
+#: view:process.transition:0
+msgid "Details"
+msgstr ""
 
-#. module: processus
-#: field:processus.node,flow_start:0
-msgid "Starting Flow"
-msgstr "Flux de Départ"
+#. module: process
+#: field:process.node,help_url:0
+msgid "Help URL"
+msgstr ""
 
-#. module: processus
-#: field:processus.processus,node_ids:0
-#: view:processus.processus:0
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_node_form
+#: model:ir.model,name:process.model_process_node
+#: model:ir.ui.menu,name:process.menu_process_node_form
+#: view:process.process:0
+#: view:process.node:0
+msgid "Process Nodes"
+msgstr ""
+
+#. module: process
+#: field:process.process,node_ids:0
+#: view:process.process:0
 msgid "Nodes"
-msgstr "Nœuds"
+msgstr ""
 
-#. module: processus
-#: field:processus.transition.action,state:0
-msgid "Type"
-msgstr "Type"
+#. module: process
+#: field:process.node,condition_ids:0
+#: view:process.process:0
+#: view:process.node:0
+msgid "Conditions"
+msgstr ""
 
-#. module: processus
-#: selection:processus.transition.action,state:0
+#. module: process
+#: field:process.condition,node_id:0
+msgid "Node"
+msgstr ""
+
+#. module: process
+#: selection:process.transition.action,state:0
 msgid "Workflow Trigger"
-msgstr "Déclenchement du Flux d'Entreprise"
+msgstr ""
 
-#. module: processus
-#: field:processus.transition,note:0
-#: view:processus.node:0
-#: view:processus.transition:0
+#. module: process
+#: field:process.transition,note:0
 msgid "Description"
-msgstr "Description"
+msgstr ""
+
+#. module: process
+#: model:ir.model,name:process.model_process_transition_action
+msgid "Process Transitions Actions"
+msgstr ""
 
-#. module: processus
-#: field:processus.node,model_id:0
+#. module: process
+#: field:process.condition,model_id:0
+#: field:process.node,model_id:0
 msgid "Object"
-msgstr "Objet"
+msgstr ""
 
-#. module: processus
-#: field:processus.transition,transition_ids:0
-msgid "Workflow Transitions"
-msgstr "Transitions du Flux de Travail"
+#. module: process
+#: field:process.transition,source_node_id:0
+msgid "Source Node"
+msgstr ""
 
-#. module: processus
-#: field:processus.node,kind:0
-msgid "Kind of Node"
-msgstr "Type de Noeud"
+#. module: process
+#: field:process.transition,transition_ids:0
+msgid "Workflow Transitions"
+msgstr ""
 
-#. module: processus
-#: field:processus.transition.action,action:0
-msgid "Action ID"
-msgstr "ID de l'Action"
+#. module: process
+#: field:process.process,active:0
+msgid "Active"
+msgstr ""
 
-#. module: processus
-#: field:processus.node,model_states:0
+#. module: process
+#: field:process.node,model_states:0
 msgid "States Expression"
 msgstr ""
 
-#. module: processus
-#: view:processus.node:0
-msgid "Outgoing Transitions"
-msgstr "Transitions sortantes"
+#. module: process
+#: model:ir.model,name:process.model_process_condition
+#: view:process.process:0
+#: view:process.node:0
+msgid "Condition"
+msgstr ""
 
-#. module: processus
-#: selection:processus.transition.action,state:0
+#. module: process
+#: selection:process.transition.action,state:0
 msgid "Dummy"
-msgstr "Factice"
+msgstr ""
 
-#. module: processus
+#. module: process
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
-#. module: processus
-#: field:processus.node,transition_in:0
+#. module: process
+#: field:process.condition,name:0
+#: field:process.node,name:0
+#: field:process.process,name:0
+#: field:process.transition.action,name:0
+#: field:process.transition,name:0
+msgid "Name"
+msgstr ""
+
+#. module: process
+#: field:process.transition,role_ids:0
+msgid "Roles"
+msgstr ""
+
+#. module: process
+#: field:process.node,transition_in:0
 msgid "Starting Transitions"
-msgstr "Transitions de Départ"
+msgstr ""
 
-#. module: processus
-#: field:processus.node,note:0
-#: field:processus.processus,note:0
+#. module: process
+#: field:process.node,note:0
+#: field:process.process,note:0
+#: view:process.transition:0
 msgid "Notes"
-msgstr "Notes"
+msgstr ""
 
-#. module: processus
-#: field:processus.transition.action,transition_id:0
+#. module: process
+#: field:process.transition.action,transition_id:0
+#: view:process.process:0
+#: view:process.node:0
 msgid "Transition"
-msgstr "Transition"
+msgstr ""
 
-#. module: processus
-#: selection:processus.node,kind:0
+#. module: process
+#: view:process.process:0
+#: view:process.node:0
+#: view:process.transition:0
+msgid "Roles Required"
+msgstr ""
+
+#. module: process
+#: selection:process.node,kind:0
+#: field:process.node,subflow_id:0
 msgid "Subflow"
-msgstr "Sous-flux"
-
-#. module: processus
-#: model:ir.actions.act_window,name:processus.action_processus_node_form
-#: model:ir.ui.menu,name:processus.menu_partner_address_form
-#: view:processus.node:0
-msgid "Processus Node"
-msgstr "Noeud de Processus"
-
-#. module: processus
-#: model:ir.actions.report.xml,name:processus.report_processus
-msgid "Print Processus"
-msgstr "Imprimer Processus"
-
-#. module: processus
-#: selection:processus.transition.action,state:0
+msgstr ""
+
+#. module: process
+#: view:process.process:0
+#: view:process.node:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: process
+#: field:process.transition.action,action:0
+msgid "Action ID"
+msgstr ""
+
+#. module: process
+#: selection:process.transition.action,state:0
 msgid "Action"
-msgstr "Action"
+msgstr ""
 
-#. module: processus
-#: selection:processus.node,kind:0
-msgid "Router"
+#. module: process
+#: field:process.node,flow_start:0
+msgid "Starting Flow"
 msgstr ""
 
-#. module: processus
-#: view:processus.node:0
-msgid "Node Description"
-msgstr "Description du Noeud"
+#. module: process
+#: field:process.condition,model_states:0
+msgid "Expression"
+msgstr ""
 
-#. module: processus
-#: field:processus.transition.action,name:0
-#: field:processus.transition,name:0
-#: view:processus.node:0
-#: view:processus.transition:0
-msgid "Transitions"
-msgstr "Transitions"
+#. module: process
+#: field:process.transition.action,state:0
+msgid "Type"
+msgstr ""
+
+#. module: process
+#: view:process.transition:0
+msgid "Process Transition"
+msgstr ""
 
-#. module: processus
-#: field:processus.node,transition_out:0
+#. module: process
+#: field:process.node,transition_out:0
 msgid "Ending Transitions"
-msgstr "Transitions finales"
-
-#. module: processus
-#: model:ir.model,name:processus.model_processus_processus
-#: field:processus.node,name:0
-#: field:processus.node,processus_id:0
-#: field:processus.processus,name:0
-#: model:ir.ui.menu,name:processus.menu_processus_form
-#: view:processus.processus:0
-msgid "Processus"
-msgstr "Processus"
-
-#. module: processus
-#: view:processus.transition:0
+msgstr ""
+
+#. module: process
+#: model:ir.actions.act_window,name:process.action_process_transition_form
+#: model:ir.model,name:process.model_process_transition
+#: model:ir.ui.menu,name:process.menu_process_transition_form
+msgid "Process Transitions"
+msgstr ""
+
+#. module: process
+#: model:ir.ui.menu,name:process.menu_process
+msgid "Enterprise Process"
+msgstr ""
+
+#. module: process
+#: view:process.process:0
+#: view:process.node:0
+#: view:process.transition:0
 msgid "Actions"
-msgstr "Actions"
+msgstr ""
 
-#. module: processus
-#: field:processus.transition,node_from_id:0
-msgid "Origin Node"
-msgstr "Noeud d'Origine"
+#. module: process
+#: model:ir.model,name:process.model_process_process
+#: field:process.node,process_id:0
+#: model:ir.ui.menu,name:process.menu_process_form
+#: view:process.process:0
+msgid "Process"
+msgstr ""
 
-#. module: processus
-#: model:ir.model,name:processus.model_processus_transition_action
-msgid "Processus Transitions Actions"
-msgstr "Actions des Transitions du Processus"
+#. module: process
+#: field:process.transition,target_node_id:0
+msgid "Target Node"
+msgstr ""
 
-#. module: processus
-#: view:processus.node:0
-msgid "Extra Information"
-msgstr "Information supplémentaire"
-
-#. module: processus
-#: model:ir.actions.act_window,name:processus.action_transition_open
-#: model:ir.model,name:processus.model_processus_transition
-#: model:ir.ui.menu,name:processus.menu_action_transition_open
-msgid "Processus Transitions"
-msgstr "Transitions du Processus"
-
-#. module: processus
-#: model:ir.model,name:processus.model_processus_node
-msgid "Processus Nodes"
-msgstr "Noeuds de Processus"
-
-#. module: processus
-#: selection:processus.transition.action,state:0
+#. module: process
+#: field:process.node,kind:0
+msgid "Kind of Node"
+msgstr ""
+
+#. module: process
+#: view:process.process:0
+#: view:process.node:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: process
+#: view:process.process:0
+#: view:process.node:0
+msgid "Transitions"
+msgstr ""
+
+#. module: process
+#: selection:process.transition.action,state:0
 msgid "Object Method"
-msgstr "Méthode de l'objet"
+msgstr ""
 
-#. module: processus
-#: field:processus.processus,active:0
-msgid "Active"
-msgstr "Actif"
diff --git a/addons/process/process.py b/addons/process/process.py
index e4eff890061..ff6e6378d83 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -1,28 +1,22 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2005-TODAY TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index cee536def7d..3f294ef0302 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -39,7 +39,7 @@
                                     <field name="kind" select="1"/>
                                     <field name="help_url" widget="url"/>
                                     <field name="model_states"/>
-                                    <field name="subflow_id" domain="[('name', '!=', parent.name)]"/>
+                                    <field name="subflow_id" domain="[('name', '!=', parent.name)]" attrs="{'readonly':[('kind','=','state')]}"/>
                                 </group>
                                 <notebook colspan="4">
                                     <page string="Outgoing Transitions">
@@ -169,7 +169,7 @@
                     <field name="kind" select="1"/>
                     <field name="help_url" widget="url"/>
                     <field name="model_states"/>
-                    <field name="subflow_id"/>
+                    <field name="subflow_id" attrs="{'readonly':[('kind','=','state')]}"/>
                 </group>
                 <notebook colspan="4">
                     <page string="Outgoing Transitions">