merge

bzr revid: fp@tinyerp.com-20111111142018-16azu4012vzo028h

diff --combined addons/hr/hr_view.xml
index 84d0b61,c7c34cb..8b16022
--- 1/addons/hr/hr_view.xml
--- 2/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@@ -247,12 -247,9 +247,12 @@@
              <field name="arch" type="xml">
                  <tree string="Employees">
                      <field name="name"/>
 -                    <field name="ssnid"/>
 -                    <field name="user_id"/>
 -                    <field name="address_id"/>
 +                    <field name="work_phone"/>
 +                    <field name="work_email"/>
 +                    <field name="company_id" groups="base.group_multi_company"/>
 +                    <field name="department_id"/>
 +                    <field name="job_id"/>
 +                    <field name="coach_id" invisible="1" />
                  </tree>
              </field>
          </record>
@@@ -290,8 -287,6 +290,8 @@@
                  <form string="Employee Category">
                      <field name="name" />
                      <field name="parent_id" />
 +                    <separator string="Employees" colspan="4" />
 +                    <field name="employee_ids" colspan="4" nolabel="1" />
                  </form>
              </field>
          </record>
@@@ -385,7 -380,7 +385,7 @@@
                          </page>
                      </notebook>
                      <group col="6" colspan="4">
-                         <field name="state"/>
 -                        <field name="state" widget="statusbar" statusbar_visible="open,recruit,old" statusbar_colors='{"open":"blue","old":"grey"}'/>
++                        <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                          <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
                          <button name="job_open" string="In Position" states="old,recruit" type="object" icon="terp-camera_test"/>
                          <button name="job_old" string="Mark as Old" states="open,recruit" type="object" icon="gtk-cancel"/>