[MERGE] Merg menu changes

bzr revid: sbh@tinyerp.com-20120530063110-6iqbobajqubjrqpx

diff --cc addons/hr_evaluation/hr_evaluation_view.xml
index 07f4d17,dafb2e6..2489e93
--- 1/addons/hr_evaluation/hr_evaluation_view.xml
--- 2/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@@ -162,7 -162,7 +162,8 @@@
                      <button name="button_draft" string="Reset to Draft" states="cancel" type="object"/>
                      <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
                      <div class="oe_right">
 -                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,wait,done" statusbar_colors='{"progress":"blue"}'/>
 +                        <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
++
                      </div>
                      <div class="oe_clear"/>
                  </div>