[MERGE] from trunk

bzr revid: fva@openerp.com-20120903125328-l5tpda3gkw7a6pxz
2012-09-03 14:53:28 +02:00
parent 6040787bb0 d961735db0
commit 3c89853a7d
2 changed files with 1 additions and 5 deletions
@@ -10,10 +10,6 @@
    date_to: !eval time.strftime('%Y-%m-11 19:00:00')
    employee_id: hr.employee_fp
    type: remove
-
-  I confirmed the holiday request by clicking on "Confirm" button.
-
-  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_employee1_cl}
 -
  I find a small mistake on my leave request to I click on "Refuse" button to correct a mistake.
 -
@@ -218,7 +218,7 @@
            <field name="name">project.project.kanban</field>
            <field name="model">project.project</field>
            <field name="arch" type="xml">
-                <kanban>
+                <kanban version="7.0" class="oe_background_grey">
                    <field name="effective_hours"/>
                    <field name="planned_hours"/>
                    <field name="name"/>