[IMP] marketing_campaign : Improvements in views,workflow

bzr revid: vir@tinyerp.com-20100811062050-0qmfcp8497mt4yu0

addons/marketing_campaign/marketing_campaign_view.xml

@@ -145,9 +145,10 @@
                 <separator string="Status" colspan="4"/>
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" select="2" nolabel="1"/>
-                    <button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
+                    <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
                     <button name="state_done_set" string="Close" states="running" icon="gtk-ok"/>
                     <button name="state_cancel_set" string="Cancel" states="running" icon="gtk-cancel"/>
+                    <button name="state_draft_set" string="Set To Draft" states="cancelled" icon="gtk-convert"/>
                 </group>
             </form>
         </field>
@@ -257,21 +258,33 @@
 
                 <group colspan="4" col="2" expand="1">
                     <separator string="Transitions" colspan="2"/>
-                    <field name="from_ids" nolabel="1" mode="tree" default_get="{'default_activity_to_id': active_id}">
+                    <field name="from_ids" nolabel="1" mode="tree,form" default_get="{'default_activity_to_id': active_id}">
                         <tree string="Incoming Transitions" editable="bottom">
                             <field name="activity_from_id"/>
                             <field name='trigger'/>
                             <field name="interval_nbr"/>
                             <field name="interval_type"/>
                         </tree>
+                        <form string="Incoming Transitions">
+                            <field name="activity_from_id"/>
+                            <field name='trigger'/>
+                            <field name="interval_nbr"/>
+                            <field name="interval_type"/>
+                        </form>
                     </field>
-                    <field name="to_ids" nolabel="1" mode="tree" default_get="{'default_activity_from_id': active_id}">
+                    <field name="to_ids" nolabel="1" mode="tree,form" default_get="{'default_activity_from_id': active_id}">
                         <tree string="Outgoing Transitions" editable="bottom">
                             <field name="activity_to_id"/>
                             <field name='trigger'/>
                             <field name="interval_nbr"/>
                             <field name="interval_type"/>
                         </tree>
+                        <form string="Outgoing Transitions">
+                            <field name="activity_to_id"/>
+                            <field name='trigger'/>
+                            <field name="interval_nbr"/>
+                            <field name="interval_type"/>
+                        </form>
                      </field>
                 </group>
             </form>

addons/marketing_campaign/marketing_campaign_workflow.xml

@@ -71,6 +71,8 @@
             <field name="wkf_id" ref="wkf_marketing_campaign_segment"/>
             <field name="flow_start">True</field>
             <field name="name">draft</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state': 'draft'})</field>
         </record>
 
         <record id="act_marketing_campaign_segment_running" model="workflow.activity">
@@ -90,7 +92,6 @@
         <record id="act_marketing_campaign_segment_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_marketing_campaign_segment"/>
             <field name="name">cancel</field>
-            <field name="flow_stop">True</field>
             <field name="kind">function</field>
             <field name="action">state_cancel_set()</field>
         </record>
@@ -113,5 +114,11 @@
             <field name="act_to" ref="act_marketing_campaign_segment_cancel"/>
             <field name="signal">state_cancel_set</field>
         </record>
+
+        <record id="trans_campaign_segment_set_to_draft" model="workflow.transition">
+            <field name="act_from" ref="act_marketing_campaign_segment_cancel"/>
+            <field name="act_to" ref="act_marketing_campaign_segment_draft"/>
+            <field name="signal">state_draft_set</field>
+        </record>
     </data>
 </openerp>