[MERGE]

bzr revid: hmo@tinyerp.com-20120720054606-24wztgdyl2ztq5b3

diff --cc addons/hr_holidays/hr_holidays.py
index 139ccb0,ef272e4..be63a4b
--- 1/addons/hr_holidays/hr_holidays.py
--- 2/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@@ -265,9 -267,9 +265,9 @@@ class hr_holidays(osv.osv)
                  meeting_obj = self.pool.get('crm.meeting')
                  meeting_vals = {
                      'name': record.name,
-                     'categ_id': record.holiday_status_id.categ_id.id,
+                     'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
                      'duration': record.number_of_days_temp * 8,
 -                    'description': record.notes,
 +                    'description': record.name,
                      'user_id': record.user_id.id,
                      'date': record.date_from,
                      'end_date': record.date_to,

diff --cc addons/hr_holidays/hr_holidays_view.xml
index f1025fa,161ca47..1258451
--- 1/addons/hr_holidays/hr_holidays_view.xml
--- 2/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@@ -140,12 -142,13 +140,12 @@@
                                  </group>
                              </group>
                              <newline/>
 -                            <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
 -                        </page>
 -                    </notebook>
 +                            <field name="name" nolabel="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" placeholder="Add a reason..."/>
 +                    </group>
                  </sheet>
-                 <footer>
+                 <div class="oe_chatter">
                      <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                 </footer>
+                 </div>
                  </form>
              </field>
          </record>
@@@ -176,16 -177,25 +176,16 @@@
                              <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
                              <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                          </group>
 -                        <group>
 -                            <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
 -                            <field name="number_of_days_temp"/>
 -                        </group>
                      </group>
 -                    <notebook>
 -                        <page string="General">
 -                            <group col="4">
 -                                <field name="double_validation" invisible="1"/>
 -                                <field name="manager_id"/>
 -                                <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
 -                            </group>
 -                            <field name="notes" placeholder="Add a reason..."/>
 -                        </page>
 -                    </notebook>
 +                    <group>
 +                        <field name="double_validation" invisible="1"/>
 +                        <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
 +                    </group>
 +                    <field name="name" placeholder="Add a reason..."/>
                  </sheet>
-                 <footer>
+                 <div class="oe_chatter">
                      <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                 </footer>
+                 </div>
                  </form>
              </field>
          </record>