Merge lp:~openerp-dev/openobject-server/trunk-kanban-column-vme-2 into lp:openobject-server

[Vidhin Mehta (OpenERP)]

[lp:~openerp-dev/openobject-server/trunk-kanban-column-vme-2]

4994. By Vidhin Mehta (OpenERP) on 2013-11-19

[MERGE]Trunk.

4995. By Vidhin Mehta (OpenERP) on 2013-11-25

[IMP]change key.

Unmerged revisions

4995. By Vidhin Mehta (OpenERP) on 2013-11-25

[IMP]change key.

4994. By Vidhin Mehta (OpenERP) on 2013-11-19

[MERGE]Trunk.

4993. By Vidhin Mehta (OpenERP) on 2013-11-13

[IMP]Options stage_management and stage_group_by added to call wizard from webclient in kanban view.

=== modified file 'openerp/addons/base/rng/view.rng'
--- openerp/addons/base/rng/view.rng	2013-01-30 16:03:06 +0000
+++ openerp/addons/base/rng/view.rng	2013-11-25 12:49:16 +0000
@@ -230,6 +230,9 @@
             <rng:optional><rng:attribute name="delete" /></rng:optional>
             <rng:optional><rng:attribute name="edit" /></rng:optional>
             <rng:optional><rng:attribute name="quick_create" /></rng:optional>
+            
+            <rng:optional><rng:attribute name="stage_management" /></rng:optional>
+            <rng:optional><rng:attribute name="stage_options" /></rng:optional>
             <rng:zeroOrMore>
                 <rng:ref name="field"/>
             </rng:zeroOrMore>