merge

bzr revid: nel@tinyerp.com-20100329090045-ap3csvw3itc5h9vc

diff --cc addons/hr_holidays/hr_holidays_view.xml
index 0000000,36b7f5c..aa1fdd5
mode 000000,100644..100644
--- /dev/null
--- 2/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@@ -1,0 -1,300 +1,307 @@@
+ <?xml version="1.0" ?>
+ <openerp>
+     <data>
+         <record id="view_hr_holidays_filter" model="ir.ui.view">
+             <field name="name">hr.holidays.filter</field>
+             <field name="model">hr.holidays</field>
+             <field name="type">search</field>
+             <field name="arch" type="xml">
+                 <search string="Search Leave">
+                        <group col='8' colspan='4'>
+                            <filter icon="terp-hr" domain="[('state','=','draft')]" string="To Confirm"/>
+                            <filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/>
+                            <separator orientation="vertical"/>
+                           <field name="name" select='1'/>
+                           <field name="state" select="1">
+                               <filter icon="terp-hr" domain="[('state','=','refuse')]" help="Refused Holidays"/>
+                               <filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
+                           </field>
+                           <field name="user_id" select="1" widget="selection">
+                               <filter icon="gtk-execute" help="My Leaves" domain="[('user_id','=',uid)]" />
+                           </field>
+                           <field name="department_id" select="1" widget="selection">
+                                       <filter icon="gtk-execute" domain="[('department_id','=',context.get('department_id',False))]"
+                                                               help="My Departments Leaves"/>
+                           </field>
+                       </group>
++                      <newline/>
++                    <group expand="1" string="Group By..." colspan="2" col="2">
++                        <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
++                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
++                        <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/>
++                    </group>
++
+                  </search>
+             </field>
+         </record>
+ 
+ 
+ 
+         <!-- Holidays: Leave Request -->
+         <record model="ir.ui.view" id="edit_holiday_new">
+             <field name="name">Leave Request</field>
+             <field name="model">hr.holidays</field>
+             <field name="type">form</field>
+             <field name="priority">1</field>
+             <field name="arch" type="xml">
+                 <form string="Leave Request">
+                     <field name="name" select="1"/>
+                     <field name="holiday_status_id" select="1" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
+                     <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" required="1"/>
+                     <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" required="1"/>
+                     <notebook colspan="4">
+                         <page string="General">
+                             <field name="employee_id" select="1" required="1"/>
+                             <field name="number_of_days_temp"/>
+                             <field name="manager_id"/>
+                             <field name="department_id"/>
+                             <field name="notes" colspan="4"/>
+                             <newline/>
+                             <field name="state" select="1" colspan="2"/>
+                             <group colspan="2">
+                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                 <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                                 <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
+                                 <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
+                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                             </group>
+                         </page>
+                     </notebook>
+                 </form>
+             </field>
+         </record>
+ 
+         <!-- Holidays: Allocation Request -->
+         <record model="ir.ui.view" id="allocation_leave_new">
+             <field name="name">Allocation Request</field>
+             <field name="model">hr.holidays</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+                 <form string="Allocation Request">
+                     <field name="name" select="1"/>
+                     <field name="holiday_status_id" select="1" />
+                     <field name="employee_id" select="1" required="1"/>
+                     <field name="department_id"/>
+                     <field name="number_of_days_temp"/>
+                     <notebook colspan="4">
+                         <page string="General">
+                             <field name="manager_id"/>
+                             <field name="notes" colspan="4"/>
+                             <newline/>
+                             <field name="state" select="1" colspan="2"/>
+                             <group colspan="2">
+                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                 <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                                 <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
+                                 <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
+                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                             </group>
+                         </page>
+                     </notebook>
+                 </form>
+             </field>
+         </record>
+ 
+         <!-- Holidays: Leaves Management -->
+         <record model="ir.ui.view" id="allocation_company_new">
+             <field name="name">Leaves Management</field>
+             <field name="model">hr.holidays</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+                 <form string="Leaves Management">
+                     <field name="name" select="1"/>
+                     <field name="holiday_status_id" select="1"/>
+                     <field name="employee_id" select="1" />
+                     <!--<field name="department_id"/>-->
+                     <field name="type"/>
+                     <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                     <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                     <field name="number_of_days_temp"/>
+                     <notebook colspan="4">
+                         <page string="General">
+                             <field name="manager_id"/>
+                             <field name="notes" colspan="4"/>
+                             <newline/>
+                             <field name="state" select="1" colspan="2"/>
+                             <group colspan="2">
+                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                 <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
+                                 <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
+                                 <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel"/>
+                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                             </group>
+                         </page>
+                     </notebook>
+                 </form>
+             </field>
+         </record>
+ 
+         <record model="ir.ui.view" id="view_holiday">
+             <field name="name">hr.holidays.tree</field>
+             <field name="model">hr.holidays</field>
+             <field name="type">tree</field>
+             <field name="arch" type="xml">
+                 <tree string="Leaves">
+                     <field name="name"/>
+                     <field name="employee_id"/>
+                     <field name="department_id"/>
+                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
+                     <field name="date_from"/>
+                     <field name="date_to"/>
+                     <field name="holiday_status_id"/>
+                     <field name="state"/>
+                     <field name="type"/>
+                 </tree>
+             </field>
+         </record>
+ 
+         <!-- My leave dashboard -->
+ <!--        <record model="ir.ui.view" id="view_my_leave_board_form">
+             <field name="name">hr.holidays.per.user.form</field>
+             <field name="model">hr.holidays.per.user</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+                 <form string="My Leaves" >
+                       <field name="employee_id"/>
+                       <field name="user_id"/>
+                     <field name="holiday_status"/>
+                     <field name="max_leaves"/>
+                     <field name="leaves_taken" />
+                     <field name="remaining_leaves"/>
+                     <field name="notes" colspan="4"/>
+                 </form>
+             </field>
+         </record>
+ -->
+         <menuitem
+             name="Holidays Management"
+             parent="hr.menu_hr_root"
+             id="menu_open_ask_holidays"/>
+ 
+         <record model="ir.actions.act_window" id="open_ask_holidays">
+             <field name="name">Leave Request(s)</field>
+             <field name="res_model">hr.holidays</field>
+             <field name="view_type">form</field>
+             <field name="view_id" ref="edit_holiday_new"/>
+             <field name="domain">[('type','=','remove')]</field>
+             <field name="search_view_id" ref="view_hr_holidays_filter"/>
+         </record>
+ 
+      <record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
+         <field name="sequence" eval="1"/>
+         <field name="view_mode">tree</field>
+         <field name="view_id" ref="view_holiday"/>
+         <field name="act_window_id" ref="open_ask_holidays"/>
+     </record>
+ 
+     <record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
+         <field name="sequence" eval="2"/>
+         <field name="view_mode">form</field>
+         <field name="view_id" ref="edit_holiday_new"/>
+         <field name="act_window_id" ref="open_ask_holidays"/>
+     </record>
+ 
+ 
+        <menuitem
+           name="Leave Requests"
+             parent="menu_open_ask_holidays"
+             id="menu_open_ask_holidays_new"
+             action="open_ask_holidays"/>
+ 
+         <record model="ir.actions.act_window" id="open_allocation_holidays">
+               <field name="name">Allocation Request(s)</field>
+             <field name="res_model">hr.holidays</field>
+             <field name="view_type">form</field>
+             <field name="context">{'type':'add'}</field>
+             <field name="domain">[('type','=','add')]</field>
+             <field name="view_id" ref="allocation_leave_new" />
+         </record>
+ 
+       <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
+         <field name="sequence" eval="1"/>
+         <field name="view_mode">tree</field>
+         <field name="view_id" ref="view_holiday"/>
+         <field name="act_window_id" ref="open_allocation_holidays"/>
+     </record>
+ 
+     <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_form">
+         <field name="sequence" eval="2"/>
+         <field name="view_mode">form</field>
+         <field name="view_id" ref="allocation_leave_new"/>
+         <field name="act_window_id" ref="open_allocation_holidays"/>
+     </record>
+ 
+ 
+      <menuitem
+           name="Allocation Requests"
+             parent="menu_open_ask_holidays"
+             id="menu_open_allocation_holidays"
+             action="open_allocation_holidays"/>
+ 
+         <record model="ir.actions.act_window" id="open_company_allocation">
+             <field name="res_model">hr.holidays</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">tree,form</field>
+             <field name="view_id" ref="allocation_company_new" />
+             <field name="context">{'allocation_type':'company'}</field>
+         </record>
+ 
+         <menuitem
+             name="Leaves Management"
+             parent="menu_open_ask_holidays"
+             id="menu_open_company_allocation"
+             action="open_company_allocation"
+             groups="hr.group_hr_manager"
+             sequence="40"/>
+ 
+         <!-- holidays status -->
+         <record model="ir.ui.view" id="edit_holiday_status_form">
+             <field name="name">hr.holidays.status.form</field>
+             <field name="model">hr.holidays.status</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+                 <form string="Leave Type">
+                     <field colspan="4" name="name" select="1"/>
+                     <field name="limit" select="2"/>
+                     <field name="active" select="2"/>
+                     <field name="categ_id"  select="1" widget="selection"/>
+                     <field name="color_name" select="2"/>
+                 </form>
+             </field>
+         </record>
+         <record model="ir.ui.view" id="view_holiday_status_tree">
+             <field name="name">hr.holidays.status.tree</field>
+             <field name="model">hr.holidays.status</field>
+             <field name="type">tree</field>
+             <field name="arch" type="xml">
+                 <tree string="Leave Type">
+                     <field name="name"/>
+                     <field name="remaining_leaves"/>
+                     <field name="limit" />
+                 </tree>
+             </field>
+         </record>
+         <record id="open_view_holiday_status" model="ir.actions.act_window">
+             <field name="name">Leaves Type</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="res_model">hr.holidays.status</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">tree,form</field>
+         </record>
+ 
+         <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
+         <menuitem name="Leaves Statuses"
+             action="open_view_holiday_status"
+             id="menu_open_view_holiday_status"
+             parent="hr.menu_open_view_attendance_reason_config"/>
+ 
+     <!--  Shortcuts -->
 -        <act_window name="My Holiday Requests"
++        <act_window name="Holidays"
+             domain="[('employee_id', '=', active_id), ('type','=','remove')]"
+             res_model="hr.holidays"
+             src_model="hr.employee"
+             view_id ="eval('edit_holiday_new')"
+             id="act_hr_employee_holiday_request"/>
+ 
+     </data>
+ </openerp>