[MERGE] hr_*: make some improvements and Merge cha branch
bzr revid: psi@tinyerp.com-20120615125750-7yanak6d4282nk4u
This commit is contained in:
commit
2663cbca6e
|
@ -41,7 +41,8 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Departments">
|
||||
<field name="name"/>
|
||||
<field name="name" string="Department" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="manager_id" />
|
||||
</search>
|
||||
</field>
|
||||
|
|
|
@ -107,12 +107,12 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Employees">
|
||||
<field name="name"/>
|
||||
<field name="department_id" widget="selection">
|
||||
</field>
|
||||
<field name="name" string="Employees" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="department_id" widget="selection"/>
|
||||
<field name="job_id" widget="selection"/>
|
||||
<field name="category_ids"/>
|
||||
<field name="parent_id"/>
|
||||
<field name="category_ids"/>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By...">
|
||||
<filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
|
||||
|
@ -409,6 +409,8 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Jobs">
|
||||
<field name="name" string="Job" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-camera_test"
|
||||
domain="[('state','=','open')]"
|
||||
string="In Position"
|
||||
|
@ -416,9 +418,7 @@
|
|||
<filter icon="terp-personal+" domain="[('state','=','recruit')]" string="In Recruitment"
|
||||
help="In Recruitment"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name"/>
|
||||
<field name="department_id" widget="selection">
|
||||
</field>
|
||||
<field name="department_id" widget="selection"/>
|
||||
<newline />
|
||||
<group expand="0" string="Group By...">
|
||||
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
|
||||
|
|
|
@ -52,12 +52,12 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Hr Attendance Search">
|
||||
<filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
|
||||
<field name="name" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-go-today" string="Today" name="today" domain="[('name','>=',current_date),('name','<=',current_date)]" />
|
||||
<filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
|
||||
<separator orientation="vertical"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="name"/>
|
||||
<field name="action"/>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By...">
|
||||
|
|
|
@ -39,14 +39,13 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Contract">
|
||||
<group>
|
||||
<filter string="Current" icon="terp-check" name="current" domain="['|',('date_end','>=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
|
||||
<filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','<', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
|
||||
<field name="name" string="Contracts" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="working_hours"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="working_hours"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By...">
|
||||
|
@ -162,7 +161,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Contract Type">
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="name" string="Contract Type" filter_domain="[('name','ilike',self)]"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
|
|
|
@ -9,7 +9,8 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Appraisal Plan">
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="name" string="Appraisal Plans" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<newline/>
|
||||
|
@ -227,18 +228,13 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Appraisal">
|
||||
<group>
|
||||
<field name="date"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
|
||||
<filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
|
||||
help="Appraisal that overpassed the deadline" domain="[('date','<=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
|
||||
<filter icon="terp-go-month" name="next_month" string=" Month+1"
|
||||
domain="[('date','<=', (datetime.date.today() + relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() + relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d')),('state','=','draft')]"
|
||||
help="Appraisal during next month"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="employee_id" />
|
||||
<field name="plan_id" widget="selection" />
|
||||
<field name="date"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand='0' string='Group by...'>
|
||||
|
@ -325,10 +321,9 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Appraisal">
|
||||
<group>
|
||||
<field name="date_deadline"/>
|
||||
<filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','<',current_date)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="user_to_review_id"/>
|
||||
<field name="user_id" string="Interviewer"/>
|
||||
</group>
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<tree string="Expenses" colors="blue:state=='draft'">
|
||||
<field name="employee_id"/>
|
||||
<field name="department_id" invisible="1"/>
|
||||
<field name="date"/>
|
||||
<field name="user_id" invisible="1"/>
|
||||
<field name="name"/>
|
||||
|
@ -135,19 +136,17 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Expense">
|
||||
<group>
|
||||
<field name="name" string="Expenses" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="date"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
|
||||
<filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"
|
||||
help="Confirmed Expense"/>
|
||||
<filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay"
|
||||
help="Expenses to Invoice"/>
|
||||
<filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
|
||||
<filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="date"/>
|
||||
<field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
|
||||
</field>
|
||||
<field name="name"/>
|
||||
<field name="user_id" string="User">
|
||||
</field>
|
||||
<field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/>
|
||||
<field name="user_id" string="User"/>
|
||||
</group>
|
||||
<newline />
|
||||
<group expand="0" string="Group By...">
|
||||
|
|
|
@ -57,7 +57,6 @@
|
|||
help = "Confirm Expenses"/>
|
||||
<filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
|
||||
help = "Approved Expenses"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
|
||||
help = "Invoiced Expenses"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Leave">
|
||||
<group>
|
||||
<field name="employee_id">
|
||||
<filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
|
||||
</field>
|
||||
<field name="department_id" widget="selection">
|
||||
<filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
|
||||
</field>
|
||||
<field name="holiday_status_id" widget="selection"/>
|
||||
<field name="date_from"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
|
||||
<filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="department_id" widget="selection"/>
|
||||
<field name="holiday_status_id" widget="selection"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By...">
|
||||
|
@ -349,7 +349,8 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Leave Type">
|
||||
<field name="name"/>
|
||||
<field name="name" string="Leave Types" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="categ_id" widget="selection"/>
|
||||
</search>
|
||||
</field>
|
||||
|
@ -415,7 +416,8 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Leave Type">
|
||||
<field name="name"/>
|
||||
<field name="name" string="Leave Types" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="categ_id" widget="selection"/>
|
||||
</search>
|
||||
</field>
|
||||
|
|
|
@ -93,8 +93,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Payroll Structures">
|
||||
<group col="8" colspan="4">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
|
||||
</group>
|
||||
<newline/>
|
||||
</search>
|
||||
|
@ -212,8 +211,8 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Payslip Lines">
|
||||
<group col="8" colspan="4">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="slip_id"/>
|
||||
<field name="amount_select"/>
|
||||
</group>
|
||||
|
@ -383,13 +382,14 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Payslips">
|
||||
<group>
|
||||
<field name="name" string="Payslips" filter_domain="['|'('name','ilike',self),('number','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="date_from"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
|
||||
<filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="number"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="name"/>
|
||||
<field name="date_from"/>
|
||||
<field name="payslip_run_id"/>
|
||||
</group>
|
||||
<newline/>
|
||||
|
@ -464,8 +464,7 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Salary Rule Categories">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="name" string="Salary Rule Categories" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -518,7 +517,8 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Contribution Registers">
|
||||
<field name="name"/>
|
||||
<field name="name" string="Contribution Registers" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
</search>
|
||||
</field>
|
||||
|
@ -648,8 +648,8 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Salary Rule">
|
||||
<group col="8">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="name" string="Salary Rules" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="category_id"/>
|
||||
<field name="condition_range_min"/>
|
||||
</group>
|
||||
|
@ -689,12 +689,13 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Payslip Batches">
|
||||
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
|
||||
<filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
|
||||
<field name="name" string="Payslip Batches" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/>
|
||||
<filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -60,10 +60,10 @@
|
|||
<field name="type">search</field>
|
||||
<field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="date_end" position="after">
|
||||
<newline/>
|
||||
<filter icon="terp-camera_test" string="Done" position="after">
|
||||
<separator orientation="vertical"/>
|
||||
<field name="journal_id" widget="selection"/>
|
||||
</field>
|
||||
</filter>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
@ -178,29 +178,25 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Jobs">
|
||||
<field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-document-new" string="New"
|
||||
domain="[('state','=','draft')]"
|
||||
help="All Initial Jobs"
|
||||
/>
|
||||
help="All Initial Jobs"/>
|
||||
<filter icon="terp-camera_test" string="In Progress"
|
||||
domain="[('state','=','open')]"
|
||||
help="Open Jobs"
|
||||
/>
|
||||
help="Open Jobs"/>
|
||||
<filter icon="terp-gtk-media-pause" string="Pending"
|
||||
domain="[('state','=','pending')]"
|
||||
help="Pending Jobs"
|
||||
/>
|
||||
<separator orientation="vertical"/>
|
||||
help="Pending Jobs"/>
|
||||
<filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
|
||||
<filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
|
||||
context="{'invisible_next_action':False, 'invisible_next_date':False}"
|
||||
domain="[('date_action','<>',False)]"
|
||||
help="Filter and view on next actions and date"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
|
||||
<field name="job_id" widget="selection"/>
|
||||
<field name="user_id">
|
||||
<filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
|
||||
</field>
|
||||
<field name="user_id"/>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By...">
|
||||
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
|
||||
|
|
|
@ -65,15 +65,14 @@
|
|||
icon="terp-camera_test"
|
||||
domain="[('state','=','done')]"
|
||||
help = "Hired employees"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="job_id"/>
|
||||
<field name="department_id" widget="selection"/>
|
||||
<field name="user_id" string="Responsible">
|
||||
<filter icon="terp-personal"
|
||||
string="My Recruitment"
|
||||
help="My Recruitment"
|
||||
domain="[('user_id','=',uid)]"/>
|
||||
</field>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="job_id"/>
|
||||
<field name="department_id" widget="selection"/>
|
||||
<field name="user_id" string="Responsible"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="0" string="Extended Filters...">
|
||||
|
@ -102,8 +101,6 @@
|
|||
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
|
||||
<filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
|
||||
</group>
|
||||
|
||||
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -60,9 +60,10 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Timesheet">
|
||||
<group>
|
||||
<field name="date"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="user_id"/>
|
||||
<field name="account_id"/>
|
||||
<field name="date"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By...">
|
||||
|
|
|
@ -150,7 +150,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Type of invoicing">
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="name" string="Type of invoicing" filter_domain="[('name','ilike',self)]"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
|
|
|
@ -47,12 +47,12 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Timesheet by user">
|
||||
<group>
|
||||
<field name="user_id" widget="selection">
|
||||
<filter icon="terp-personal"
|
||||
string="Non Assigned timesheets to users"
|
||||
help="Non Assigned timesheets to users"
|
||||
domain="[('user_id','=',False)]"/>
|
||||
</field>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="user_id" widget="selection"/>
|
||||
<field name="account_id" groups="analytic.group_analytic_accounting"/>
|
||||
<field name="product_id"/>
|
||||
</group>
|
||||
|
@ -150,9 +150,10 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Timesheet by user">
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="month"/>
|
||||
<field name="name" string="Timesheet by users" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="user_id"/>
|
||||
<field name="month"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
|
@ -282,10 +283,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Daily timesheet by account">
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="month"/>
|
||||
<field name="name" string="Timesheet by account" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="account_id" groups="analytic.group_analytic_accounting"/>
|
||||
<field name="user_id"/>
|
||||
<field name="month"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
|
@ -350,10 +352,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Timesheet by account">
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="month"/>
|
||||
<field name="name" string="Timesheet by account" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="account_id" groups="analytic.group_analytic_accounting"/>
|
||||
<field name="user_id"/>
|
||||
<field name="month"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
|
|
|
@ -114,10 +114,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Analytic Lines to Invoice">
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="month"/>
|
||||
<field name="name" string="Analytic Lines" filter_domain="[('name','ilike',self)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="product_id"/>
|
||||
<field name="account_id" groups="analytic.group_analytic_accounting"/>
|
||||
<field name="month"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
|
|
|
@ -167,11 +167,12 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Timesheet">
|
||||
<group>
|
||||
<field name="date_from"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
|
||||
<filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="date_from"/>
|
||||
<field name="department_id" widget="selection"/>
|
||||
</group>
|
||||
<newline/>
|
||||
|
@ -238,7 +239,7 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="date" position="after">
|
||||
<field name="user_id" position="before">
|
||||
<field name="sheet_id"/>
|
||||
</field>
|
||||
</field>
|
||||
|
@ -254,7 +255,7 @@
|
|||
<field name="type">search</field>
|
||||
<field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="action" position="after">
|
||||
<field name="employee_id" position="after">
|
||||
<field name="sheet_id"/>
|
||||
</field>
|
||||
</field>
|
||||
|
|
|
@ -67,7 +67,6 @@
|
|||
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
|
||||
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
|
||||
</group>
|
||||
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue