pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] hr_timesheet_sheet: View improve (Ref: PSI)

Browse Source 
bzr revid: mra@tinyerp.com-20100528114857-9fbov2scutngzhdo
This commit is contained in:
mra (Open ERP)
2010-05-28 17:18:57 +05:30
parent 7f43ff66e4
commit 850bb48ef4
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr/hr_view.xml
+23 -19
View File
@@ -1,14 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
<menuitem id="menu_hr_human_resources" sequence="2" name="Human Resources" parent="menu_hr_root"/>
<menuitem
id="menu_hr_root"
icon="terp-hr"
name="Human Resources"
sequence="6"/>
<menuitem
id="menu_hr_configuration"
name="Configuration"
parent="hr.menu_hr_root"
sequence="50" />
<menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_configuration" name="Employees" sequence="1"/>
<menuitem
id="menu_view_employee_category_configuration_form"
parent="hr.menu_hr_configuration"
name="Employees"
sequence="1"/>
<!--
==========
@@ -36,6 +43,19 @@
</group>
<notebook colspan="6">
<page string="Personal Information">
<group col="2" colspan="2">
<separator colspan="2" string="Social IDs"/>
<field name="ssnid"/>
<field name="sinid" groups="base.group_extended"/>
<field name="otherid" groups="base.group_extended"/>
</group>
<group col="2" colspan="2">
<separator string="Status" colspan="2"/>
<field name="gender"/>
<field name="marital" widget="selection"/>
<field name="country_id"/>
<field name="birthday"/>
</group>
<group col="2" colspan="2">
<separator string="Contact Information" colspan="2"/>
<field name="address_home_id" colspan="2"/>
@@ -45,14 +65,6 @@
<field name="work_email" widget="email" />
<field name="work_location"/>
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Social IDs"/>
<field name="ssnid"/>
<field name="sinid" groups="base.group_extended"/>
<field name="otherid" groups="base.group_extended"/>
</group>
<group col="2" colspan="2">
<separator string="Position" colspan="2"/>
<field name="job_id" widget="selection"/>
@@ -62,14 +74,6 @@
<field name="parent_id" />
<field name="coach_id" />-->
</group>
<group col="2" colspan="2">
<separator string="Status" colspan="2"/>
<field name="gender"/>
<field name="marital" widget="selection"/>
<field name="country_id"/>
<field name="birthday"/>
</group>
</page>
<page string="Notes">
<field colspan="4" nolabel="1" name="notes"/>
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
-1
View File
@@ -454,7 +454,6 @@
<field name="arch" type="xml">
<search string="Search Timesheet Lines">
<group col='15' colspan='4'>
<separator orientation="vertical"/>
<filter icon="terp-project" string="Current" default="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection"/>
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+1 -2
View File
@@ -101,7 +101,7 @@
<field name="date_from"/>
<field name="date_to"/>
<field name="company_id" select="1" groups="base.group_multi_company"/>
<field name="department_id"/>
<field name="department_id" groups="base.group_extended"/>
<notebook colspan="4">
<page string="Daily View">
<group col="6" colspan="4">
@@ -192,7 +192,6 @@
<field name="arch" type="xml">
<search string="Search Timesheet">
<group col="10" colspan="4">
<separator orientation="vertical"/>
<filter icon="terp-crm" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
<filter icon="terp-crm" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
<separator orientation="vertical"/>