[MERGE] merged vba's branch lp:~openerp-dev/openobject-addons/trunk-hr-recruitment-vba

bzr revid: bde@tinyerp.com-20121109130450-ijxbfo1y1vmbchnr

diff --cc addons/hr_recruitment/hr_recruitment_view.xml
index 03561da,e17ebc1..43e608f
--- 1/addons/hr_recruitment/hr_recruitment_view.xml
--- 2/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@@ -145,7 -147,8 +147,8 @@@
                          <field name="user_id"/>
                          <label for="title_action"/>
                          <div>
-                             <field name="date_action"/> -
+                             <field name="date_action"/>
 -                            <span  class="oe_edit_only"> - </span>
++                            <span class="oe_edit_only"> - </span>
                              <field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/>
                          </div>
                          <field name="priority"/>
@@@ -166,12 -169,14 +169,14 @@@
                      <group string="Contract">
                          <label for="salary_expected"/>
                          <div>
-                             <field name="salary_expected" class="oe_inline"/>,
+                             <field name="salary_expected" class="oe_inline"/>
 -                            <span class="oe_inline " attrs="{'invisible':[('salary_expected_extra','=',False)]}">, </span>
++                            <span class="oe_inline" attrs="{'invisible':[('salary_expected_extra','=',False)]}">, </span>
                              <field name="salary_expected_extra" class="oe_inline" placeholder="Extra advantages..."/>
                          </div>
                          <label for="salary_proposed"/>
                          <div>
-                             <field name="salary_proposed" class="oe_inline"/>,
+                             <field name="salary_proposed" class="oe_inline"/>
 -                            <span class="oe_inline " attrs="{'invisible':[('salary_proposed_extra','=',False)]}">, </span>
++                            <span class="oe_inline" attrs="{'invisible':[('salary_proposed_extra','=',False)]}">, </span>
                              <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
                          </div>
                      </group>