X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fhr_timesheet_sheet%2Fhr_timesheet_sheet_view.xml;h=10ea6624d059d360c16f94d3848c890c76f131bc;hb=3e62ee3fa621893ff961a765cebfde4540f06b58;hp=f686daf575e0fab09e9400676aef2b7b1e880d47;hpb=222abd4e03a566ce43e07c5130cb4c470f7e7513;p=odoo%2Fodoo.git

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f686daf..10ea662 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -1,25 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
-            <field name="name">hr.timesheet.sheet.tree</field>
-            <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Timesheets"
-                    colors="blue:state == 'draft';grey:state == 'done'">
-                    <field name="user_id"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                    <field name="name"/>
-                    <field name="department_id"/>
-                    <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
-                    <field name="total_timesheet"/>
-                    <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
+
        <record id="hr_timesheet_sheet_graph" model="ir.ui.view">
          <field name="name">hr.timesheet.sheet.graph</field>
          <field name="model">hr_timesheet_sheet.sheet</field>
@@ -39,13 +21,26 @@
             <field name="arch" type="xml">
                 <form string="Timesheet by Accounts">
                     <field name="sheet_id" select="1"/>
-                    <field name="name" select="1"/>
+                    <field name="name" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="total" sum="Total"/>
                     <field name="invoice_rate"/>
                 </form>
             </field>
         </record>
-
+        <record id="hr_timesheet_account_filter" model="ir.ui.view">
+            <field name="name">hr.timesheet.account.filter</field>
+            <field name="model">hr_timesheet_sheet.sheet.account</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Account">
+                    <group col="10" colspan="4">
+                        <field name="sheet_id" />
+                        <field name="name" groups="analytic.group_analytic_accounting"/>
+                        <field name="invoice_rate"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="hr_timesheet_account_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.account.tree</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>
@@ -53,103 +48,76 @@
             <field name="arch" type="xml">
                 <tree string="Timesheet by Accounts">
                     <field name="sheet_id"/>
-                    <field name="name"/>
+                    <field name="name" groups="analytic.group_analytic_accounting"/>
                     <field name="total" sum="Total"/>
                     <field name="invoice_rate"/>
                 </tree>
             </field>
         </record>
-<!--
-        <record id="hr_timesheet_day_form" model="ir.ui.view">
-            <field name="name">hr.timesheet.day.form</field>
-            <field name="model">hr_timesheet_sheet.sheet.day</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Timesheet by Days">
-                    <field name="sheet_id" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="total_timesheet"/>
-                    <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
-                    <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
-                </form>
-            </field>
-        </record>
 
-        <record id="hr_timesheet_day_tree" model="ir.ui.view">
-            <field name="name">hr.timesheet.day.tree</field>
-            <field name="model">hr_timesheet_sheet.sheet.day</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Timesheet by Days">
-                    <field name="sheet_id"/>
-                    <field name="name"/>
-                    <field name="total_timesheet" sum="Total Timesheet"/>
-                    <field name="total_attendance" sum="Total Attendance" groups="hr_attendance.group_hr_attendance"/>
-                    <field name="total_difference" sum="Total Difference" groups="hr_attendance.group_hr_attendance"/>
-                </tree>
-            </field>
-        </record>
--->
         <record id="hr_timesheet_sheet_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.form</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                    <field name="company_id" select="1" groups="base.group_multi_company"/>
-                    <field name="department_id" groups="base.group_extended"/>
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="department_id" groups="base.group_extended"/>
+                        <newline/>
+                        <field name="employee_id"/>
+                        <field name="user_id" invisible="1"/>
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Daily View">
                             <group col="6" colspan="4">
-                                <button name="button_dummy" string="Go to:" type="object" icon="gtk-redo"/>
+                                <button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
                                 <field name="date_current" nolabel="1"/>
                                 <label string=""/>
-                                <button icon="gtk-media-previous" name="date_previous" string="" type="object"/>
-                                <button name="date_today" string="Today" type="object" icon="gtk-home"/>
-                                <button icon="gtk-media-next" name="date_next" string="" type="object"/>
+                                <button icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
+                                <button name="date_today" string="Today" type="object" icon="terp-go-today"/>
+                                <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
                             </group>
 
-                            <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="hr_attendance.group_hr_attendance">
+                            <field colspan="3" context="{'name':date_current,'user_id':user_id}" height="100" name="attendances_ids" nolabel="1">
                                 <tree string="Attendances" editable="bottom">
                                     <field name="name"/>
                                     <field name="action"/>
                                     <field invisible="1" name="employee_id"/>
                                 </tree>
                             </field>
-                            <group col="1" colspan="1" groups="hr_attendance.group_hr_attendance">
-                                <button name="sign_in" string="Sign In" type="object" icon="gtk-go-back"/>
-                                <button name="sign_out" string="Sign Out" type="object" icon="gtk-go-forward"/>
+                            <group col="1" colspan="1">
+                                <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
+                                <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
                             </group>
-
-                            <field name="state_attendance" groups="hr_attendance.group_hr_attendance"/>
-                            <field name="total_attendance_day" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
-                            <field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
+                            <field name="state_attendance"/>
+                            <field name="total_attendance_day" widget="float_time"/>
+                            <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet">
                                     <field invisible="1" name="date"/>
                                     <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                                     <field name="name"/>
-                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
                                     <field name="to_invoice"/>
                                     <field invisible="1" name="journal_id"/>
-                                    <field invisible="1" name="product_id"/>
-                                    <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-                                    <field name="amount"/>
-                                    <field name="general_account_id"/>
+                                    <field invisible="1" name="product_id" domain="[('type','=','service')]" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
+                                    <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
+                                    <field invisible="1" name="amount"/>
+                                    <field invisible="1" name="general_account_id"/>
                                     <field invisible="1" name="user_id" required="1"/>
                                 </tree>
                                 <form string="Timesheet">
                                     <field name="date"/>
                                     <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                                     <field name="name"/>
-                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
                                     <field name="to_invoice"/>
-                                    <field invisible="1" name="journal_id"/>
-                                    <field invisible="1" name="product_id"/>
-                                    <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                                    <field name="journal_id"/>
+                                    <field name="product_id" domain="[('type','=','service')]" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
+                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
                                     <field name="amount"/>
                                     <field name="general_account_id"/>
                                     <field name="user_id" required="1"/>
@@ -162,9 +130,9 @@
                             <field colspan="4" name="period_ids" nolabel="1">
                                 <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
-                                    <field name="total_attendance" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
+                                    <field name="total_attendance" widget="float_time"/>
                                     <field name="total_timesheet" widget="float_time"/>
-                                    <field name="total_difference" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
+                                    <field name="total_difference" widget="float_time"/>
                                 </tree>
                             </field>
                             <group colspan="4" col="6">
@@ -174,12 +142,12 @@
                             </group>
                         </page>
                     </notebook>
-                    <field name="state"/>
-                    <group col="4" colspan="2">
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-execute"/>
-                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
-                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-stop"/>
-                        <button name="done" states="confirm" string="Accept" type="workflow" icon="gtk-apply"/>
+                    <group col="6" colspan="4">
+                        <field name="state"/>
+                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-check"/>
+                        <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
+                        <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
                     </group>
                 </form>
             </field>
@@ -193,9 +161,9 @@
                 <search string="Search Timesheet">
                     <group col="10" colspan="4">
                         <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
-                        <filter icon="terp-gtk-go-back-rtl" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
+                        <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
-                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="employee_id" select="1"/>
                         <field name="date_from"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+"
@@ -205,7 +173,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Employees" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     </group>
                 </search>
@@ -218,21 +186,13 @@
             <field name="res_model">hr_timesheet_sheet.sheet</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_my_timesheet':1, 'search_default_user_id':uid }</field>
+            <field name="context">{'search_default_my_timesheet':1, }</field>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
+            <field name="help">Check your timesheets for a specific period. You can also encode time spent on a project (i.e. an analytic account) thus generating costs in the analytic account concerned.</field>
         </record>
 
-        <!--Time Tracking menu in project Management-->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
-          <menuitem
-             id="base.menu_project_management_time_tracking"
-             name="Time Tracking"
-             parent="base.menu_main_pm" sequence="3"/>
-         <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
-             groups="hr.group_hr_manager" sequence="5"/>
-        <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
-            groups="hr.group_hr_manager"/>
+             sequence="2" groups="base.group_hr_user,base.group_hr_manager"/>
 
         <!--
             Company inheritancy
@@ -318,33 +278,61 @@
             </field>
         </record>
 
-        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_day" name="Timesheet by Account" res_model="hr_timesheet_sheet.sheet.account" src_model="hr_timesheet_sheet.sheet"/>
-<!--         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/>  -->
+        <act_window
+        context="{'search_default_sheet_id': [active_id], 'default_sheet_id': active_id}"
+        id="act_hr_timesheet_sheet_sheet_by_day"
+        name="Timesheet by Account"
+        res_model="hr_timesheet_sheet.sheet.account"
+        src_model="hr_timesheet_sheet.sheet"/>
 
+        <act_window
+        context="{'search_default_sheet_id': [active_id], 'default_sheet_id': active_id}"
+        id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet"
+        name="Timesheet Lines"
+        res_model="hr.analytic.timesheet"
+        src_model="hr_timesheet_sheet.sheet"/>
 
-        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet" name="Timesheet Lines" res_model="hr.analytic.timesheet" src_model="hr_timesheet_sheet.sheet"/>
 
-        <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_attendance" name="Attendances" res_model="hr.attendance" src_model="hr_timesheet_sheet.sheet"/>
+        <act_window
+        context="{'search_default_sheet_id': [active_id], 'default_sheet_id': active_id}"
+        id="act_hr_timesheet_sheet_sheet_2_hr_attendance"
+        name="Attendances"
+        res_model="hr.attendance"
+        src_model="hr_timesheet_sheet.sheet"/>
 
         <record id="hr_timesheet_sheet_tree_simplified" model="ir.ui.view">
-            <field name="name">hr.timesheet.sheet.tree.simplified</field>
+            <field name="name">hr.timesheet.sheet.tree</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">tree</field>
-            <field eval="20" name="priority"/>
+            <field eval="10" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Timesheets">
+                <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('done')" string="Timesheets">
+                    <field name="employee_id"/>
                     <field name="date_from"/>
-                    <field name="user_id"/>
-                    <field name="name"/>
+                    <field name="date_to"/>
+                    <field name="department_id"/>
                     <field name="total_attendance"/>
                     <field name="total_timesheet"/>
+                    <field name="total_difference"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
-
-	<!-- Timesheet Button on Employee Form -->
-	<act_window domain="[('user_id', '=', user_id)]" id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
+        <record id="view_hr_timesheet_sheet_graph" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.sheet.graph</field>
+            <field name="model">hr_timesheet_sheet.sheet</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Available Attendance" type="bar">
+                    <field name="name"/>
+                    <field name="total_attendance" operator="+"/>
+                </graph>
+            </field>
+        </record>
+  <!-- Timesheet Button on Employee Form -->
+  <act_window
+           context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
+           id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
 
     </data>
 </openerp>