[IMP/MERGE]:lp:~openerp-dev/openobject-addons/trunk-crm-topbar-tpa

bzr revid: apa@tinyerp.com-20120426085517-tw95rxsx43ljgkxw

diff --cc addons/crm/crm_lead_view.xml
index a867777,7add941..d915c73
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -53,12 -53,12 +53,12 @@@
          <field name="arch" type="xml">
              <form string="Leads Form" layout="manual">
                  <div class="oe_form_topbar">
-                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
                      <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                     <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
                      <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
--                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
                      <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
 -                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                     <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
++                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
++                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
                      <div class="oe_right">
                          <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                      </div>