From 48f50f9944f72128119d48bea12670899919bcee Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 20 Jul 2012 18:50:03 +0530
Subject: [PATCH 1/2] Adding a rng for label in digram view

bzr revid: dhr@tinyerp.com-20120720132003-kq0ikv9b6ewkasxx
---
 openerp/addons/base/rng/view.rng | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index c583040495b..8f7b2647237 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -184,6 +184,9 @@
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:ref name="node"/>
             <rng:ref name="arrow"/>
+            <rng:oneOrMore>
+                <rng:optional><rng:ref name="label"/></rng:optional>
+            </rng:oneOrMore>
         </rng:element>
     </rng:define>
 

From 246b47602002424c6ec45ed854251e99846d75b9 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 13 Aug 2012 14:45:19 +0530
Subject: [PATCH 2/2] Workflow editor label.

bzr revid: tta@openerp.com-20120813091519-lcxiemc2wojfx2d6
---
 openerp/addons/base/ir/workflow/workflow_view.xml |  3 ++-
 openerp/addons/base/rng/view.rng                  | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index c20eeaed085..084d66f720f 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -41,7 +41,7 @@
       <field name="model">workflow</field>
       <field name="type">diagram</field>
       <field name="arch" type="xml">
-        <diagram string="Workflow Editor">
+        <diagram string="Workflow Editor">          
           <node object="workflow.activity" shape="rectangle:subflow_id!=False" bgcolor="gray:flow_start==True;grey:flow_stop==True">
             <field name="name"/>
             <field name="kind"/>
@@ -55,6 +55,7 @@
             <field name="act_to"/>
             <field name="signal"/>
           </arrow>
+          <label string="When customizing a workflow, be sure you do not modify an existing node or arrow, but rather add new nodes or arrows. If you absolutly need to modify a node or arrow, you can only change fields that are empty or set to the default value. If you don't do that, your customization will be overwrited at the next update or upgrade to a future version of OpenERP."/>
         </diagram>
       </field>
     </record>
diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index 8f7b2647237..0d6527e5972 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -181,12 +181,12 @@
 
     <rng:define name="diagram">
         <rng:element name="diagram">
-            <rng:optional><rng:attribute name="string"/></rng:optional>
+            <rng:optional><rng:attribute name="string"/></rng:optional>                                    
             <rng:ref name="node"/>
-            <rng:ref name="arrow"/>
-            <rng:oneOrMore>
-                <rng:optional><rng:ref name="label"/></rng:optional>
-            </rng:oneOrMore>
+            <rng:ref name="arrow"/>            
+            <rng:zeroOrMore>
+                <rng:ref name="label"/>
+            </rng:zeroOrMore>
         </rng:element>
     </rng:define>