From 101e933d28150aaf0940810d90e6dcde2d07d3a3 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Fri, 2 Apr 2010 14:32:27 +0530
Subject: [PATCH 1/3] [IMP] workflow :- add domain in workflow field.

bzr revid: ysa@tinyerp.co.in-20100402090227-6yqr461xps4jz97b
---
 bin/addons/base/ir/workflow/workflow.py       | 1 +
 bin/addons/base/ir/workflow/workflow_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py
index 2a551e9549f..f32f0d842f7 100644
--- a/bin/addons/base/ir/workflow/workflow.py
+++ b/bin/addons/base/ir/workflow/workflow.py
@@ -151,6 +151,7 @@ class wkf_transition(osv.osv):
         'condition': fields.char('Condition', required=True, size=128),
         'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade'),
         'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade'),
+        'workflow_id': fields.related('act_from', 'wkf_id', type='many2one', relation='workflow', string='Workflow'),
     }
     _defaults = {
         'condition': lambda *a: 'True',
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 04457f21338..c72d2f55ea3 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -35,8 +35,8 @@
 				    <field name="kind"/>
 				  </node>
 				  <arrow object="workflow.transition" source="act_from" destination="act_to" signal="signal">
-				    <field name="act_from"/>
-				    <field name="act_to"/>
+				    <field name="act_from" domain="[('wkf_id','=', workflow_id)]"/>
+				    <field name="act_to" domain="[('wkf_id','=', workflow_id)]"/>
 				    <field name="signal"/>
 				  </arrow>
 				</diagram>

From 4e056d7540fb0f2aec47617304ca77bd20c534e5 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Fri, 2 Apr 2010 17:58:57 +0530
Subject: [PATCH 2/3] [IMP] diagram :- improve code.

bzr revid: ysa@tinyerp.co.in-20100402122857-dpbc2b8nhgrzvtyq
---
 bin/addons/base/ir/workflow/workflow.py       | 1 -
 bin/addons/base/ir/workflow/workflow_view.xml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py
index f32f0d842f7..2a551e9549f 100644
--- a/bin/addons/base/ir/workflow/workflow.py
+++ b/bin/addons/base/ir/workflow/workflow.py
@@ -151,7 +151,6 @@ class wkf_transition(osv.osv):
         'condition': fields.char('Condition', required=True, size=128),
         'act_from': fields.many2one('workflow.activity', 'Source Activity', required=True, select=True, ondelete='cascade'),
         'act_to': fields.many2one('workflow.activity', 'Destination Activity', required=True, select=True, ondelete='cascade'),
-        'workflow_id': fields.related('act_from', 'wkf_id', type='many2one', relation='workflow', string='Workflow'),
     }
     _defaults = {
         'condition': lambda *a: 'True',
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index c72d2f55ea3..04457f21338 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -35,8 +35,8 @@
 				    <field name="kind"/>
 				  </node>
 				  <arrow object="workflow.transition" source="act_from" destination="act_to" signal="signal">
-				    <field name="act_from" domain="[('wkf_id','=', workflow_id)]"/>
-				    <field name="act_to" domain="[('wkf_id','=', workflow_id)]"/>
+				    <field name="act_from"/>
+				    <field name="act_to"/>
 				    <field name="signal"/>
 				  </arrow>
 				</diagram>

From 848bb74da6e23c865d644904034d8b98dc1a6e11 Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Thu, 8 Apr 2010 16:12:05 +0530
Subject: [PATCH 3/3] Improved rng grammer for default attribute in filters

bzr revid: hda@tinyerp.com-20100408104205-zr8psx28wvw1e3eb
---
 bin/addons/base/res/partner/partner_view.xml | 4 ++--
 bin/addons/base/rng/view.rng                 | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 8c374acb80b..7f0c599db87 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -347,8 +347,7 @@
                         <filter string="My Partners" icon="terp-partner" domain="[('parent_id','!=',False)]"/>
                         <separator orientation="vertical"/>
                         <filter string="Customers" icon="terp-partner" domain="[('customer','=',1)]" help="Customer Partners"/>
-                        <filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners"
-                            default="context.get('default_supplier',False)"/>
+                        <filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners" name='supplier'/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="address" select="1"/>
@@ -365,6 +364,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
+            <field name="context">{"search_default_supplier":supplier}</field>
             <field name="search_view_id" ref="view_res_partner_filter"/>
         </record>
         <record id="action_partner_form_view1" model="ir.actions.act_window.view">
diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 09b1080e7cf..9ee1f1b213d 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -552,7 +552,6 @@
             <rng:optional><rng:attribute name="context"/></rng:optional>
             <rng:optional><rng:attribute name="help"/></rng:optional>
             <rng:optional><rng:attribute name="domain"/></rng:optional>
-            <rng:optional><rng:attribute name="default"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="form" />