[MERGE] lp:openobject-addons

bzr revid: kjo@tinyerp.com-20120702091329-mur9imoo2v6tb4hc

diff --cc addons/hr_evaluation/report/hr_evaluation_report_view.xml
Simple merge

diff --cc addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
Simple merge

diff --cc addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index ae7de4c,f72ccd1..0dccf03
--- 1/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
--- 2/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@@ -2,7 -2,43 +2,7 @@@
  <openerp>
      <data>
  
-               <!-- Print My Timesheet -->
 -        <!-- Print Employee Timesheet -->
 -        <record id="view_hr_timesheet_employee" model="ir.ui.view">
 -            <field name="name">hr.analytical.timesheet.employee.form</field>
 -            <field name="model">hr.analytical.timesheet.employee</field>
 -            <field name="type">form</field>
 -            <field name="arch" type="xml">
 -                <form string="Monthly Employee Timesheet" version="7.0">
 -                    <header>
 -                        <button string="Print" name="print_report" type="object" class="oe_highlight"/>
 -                        or
 -                        <button string="Cancel" class="oe_link" special="cancel" />
 -                    </header>
 -                    <group colspan="4">
 -                        <field name="month"/>
 -                        <field name="year"/>
 -                        <field name="employee_id" colspan="3"/>
 -                    </group>
 -                </form>
 -            </field>
 -        </record>
 -
 -        <record id="action_hr_timesheet_employee" model="ir.actions.act_window">
 -            <field name="name">Employee Timesheet</field>
 -            <field name="res_model">hr.analytical.timesheet.employee</field>
 -            <field name="view_type">form</field>
 -            <field name="view_mode">tree,form</field>
 -           <field name="view_id" ref="view_hr_timesheet_employee"/>
 -           <field name="target">new</field>
 -        </record>
 -
 -        <menuitem action="action_hr_timesheet_employee"
 -            id="menu_hr_timesheet_employee"
 -            parent="menu_hr_reporting_timesheet"
 -            sequence="2" icon="STOCK_PRINT"/>
 -
 -
 -      <!-- Print My Timesheet -->
++          <!-- Print My Timesheet -->
        <record id="view_hr_timesheet_my" model="ir.ui.view">
              <field name="name">hr.analytical.timesheet.my.form</field>
              <field name="model">hr.analytical.timesheet.employee</field>

diff --cc addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
Simple merge

diff --cc addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
Simple merge

diff --cc addons/project/report/project_report.py
Simple merge