[IMP]hr_* : improve search code in xml

bzr revid: cha@tinyerp.com-20120613124157-z5zpn42aao3w3cf2
This commit is contained in:
Ajay Chauhan (OpenERP) 2012-06-13 18:11:57 +05:30
parent 0b188a31cc
commit 6db119b7d8
17 changed files with 124 additions and 117 deletions

View File

@ -41,7 +41,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Departments"> <search string="Departments">
<field name="name"/> <field name="name" string="Departments" filter_domain="[('name','ilike',self)]"/>
<separator orientation="vertical"/>
<field name="manager_id" /> <field name="manager_id" />
</search> </search>
</field> </field>

View File

@ -108,20 +108,20 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Employees"> <search string="Employees">
<field name="name"/> <field name="name" string="Employees" filter_domain="[('name','ilike',self)]"/>
<field name="department_id" widget="selection"> <separator orientation="vertical"/>
</field> <field name="department_id" widget="selection"/>
<field name="job_id" widget="selection"/> <field name="job_id" widget="selection"/>
<field name="category_ids"/> <field name="category_ids"/>
<field name="parent_id"/> <field name="parent_id"/>
<newline /> <newline />
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/> <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
<filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/> <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
<separator orientation="vertical" /> <separator orientation="vertical"/>
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
</group> </group>
</search> </search>
</field> </field>
@ -404,6 +404,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Jobs"> <search string="Jobs">
<field name="name" string="Jobs" filter_domain="[('name','ilike',self)]"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test" <filter icon="terp-camera_test"
domain="[('state','=','open')]" domain="[('state','=','open')]"
string="In Position" string="In Position"
@ -411,14 +413,12 @@
<filter icon="terp-personal+" domain="[('state','=','recruit')]" string="In Recruitment" <filter icon="terp-personal+" domain="[('state','=','recruit')]" string="In Recruitment"
help="In Recruitment"/> help="In Recruitment"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name"/> <field name="department_id" widget="selection"/>
<field name="department_id" widget="selection">
</field>
<newline /> <newline />
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
</group> </group>
</search> </search>
</field> </field>

View File

@ -52,12 +52,12 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Hr Attendance Search"> <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"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
<filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" /> <filter icon="terp-go-today" string="Today" name="today" domain="[('name','&gt;=',current_date),('name','&lt;=',current_date)]" />
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="employee_id"/> <field name="employee_id"/>
<field name="name"/>
<field name="action"/> <field name="action"/>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">

View File

@ -39,23 +39,25 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Contract"> <search string="Search Contract">
<group> <group>
<filter string="Current" icon="terp-check" name="current" domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/> <field name="name" string="Contracts" filter_domain="[('name','ilike',self)]"/>
<filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/> <separator orientation="vertical"/>
<separator orientation="vertical"/> <field name="date_start"/>
<field name="name"/> <field name="date_end"/>
<field name="employee_id"/> <separator orientation="vertical"/>
<field name="working_hours"/> <filter string="Current" icon="terp-check" name="current" domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/>
<field name="date_start"/> <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>
<field name="date_end"/> <separator orientation="vertical"/>
<field name="employee_id"/>
<field name="working_hours"/>
</group> </group>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/> <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
<filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/> <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/> <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
</group> </group>
</search> </search>
</field> </field>
@ -162,7 +164,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Contract Type"> <search string="Search Contract Type">
<group> <group>
<field name="name"/> <field name="name" string="Contract Type" filter_domain="[('name','ilike',self)]"/>
</group> </group>
</search> </search>
</field> </field>

View File

@ -9,7 +9,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Appraisal Plan"> <search string="Appraisal Plan">
<group> <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"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group> </group>
<newline/> <newline/>
@ -227,27 +228,27 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Appraisal"> <search string="Search Appraisal">
<group> <group>
<filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/> <field name="date"/>
<filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/> <separator orientation="vertical"/>
<separator orientation="vertical"/> <filter icon="terp-check" string="Pending" domain="[('state','=','wait')]" help="Appraisal that are in Plan In Progress state"/>
<filter icon="terp-gnome-cpu-frequency-applet+" string="Late" <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Appraisal that are in waiting appreciation state"/>
help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" /> <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
<filter icon="terp-go-month" name="next_month" string=" Month+1" help="Appraisal that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
domain="[('date','&lt;=', (datetime.date.today() + relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() + relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d')),('state','=','draft')]" <filter icon="terp-go-month" name="next_month" string=" Month+1"
help="Appraisal during next month"/> domain="[('date','&lt;=', (datetime.date.today() + relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() + relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d')),('state','=','draft')]"
<separator orientation="vertical"/> help="Appraisal during next month"/>
<field name="employee_id" /> <separator orientation="vertical"/>
<field name="plan_id" widget="selection" /> <field name="employee_id" />
<field name="date"/> <field name="plan_id" widget="selection" />
</group> </group>
<newline/> <newline/>
<group expand='0' string='Group by...'> <group expand='0' string='Group by...'>
<filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" /> <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" /> <filter string='Plan' icon="terp-stock_align_left_24" domain="[]" context="{'group_by' : 'plan_id'}" />
<filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" /> <filter string='Status' icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by' : 'state'}" />
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" /> <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
</group> </group>
</search> </search>
</field> </field>
@ -326,7 +327,6 @@
<search string="Search Appraisal"> <search string="Search Appraisal">
<group> <group>
<filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/> <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','&lt;',current_date)]"/> <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="user_to_review_id"/> <field name="user_to_review_id"/>

View File

@ -135,6 +135,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Expense"> <search string="Expense">
<group> <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-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
<filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"
help="Confirmed Expense"/> help="Confirmed Expense"/>
@ -142,12 +146,8 @@
help="Expenses to Invoice"/> help="Expenses to Invoice"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="employee_id"/> <field name="employee_id"/>
<field name="date"/> <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"/>
<field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}"> <field name="user_id" string="User"/>
</field>
<field name="name"/>
<field name="user_id" string="User">
</field>
</group> </group>
<newline /> <newline />
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">

View File

@ -57,7 +57,6 @@
help = "Confirm Expenses"/> help = "Confirm Expenses"/>
<filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]" <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
help = "Approved Expenses"/> help = "Approved Expenses"/>
<separator orientation="vertical"/>
<filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]" <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
help = "Invoiced Expenses"/> help = "Invoiced Expenses"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>

View File

@ -8,14 +8,14 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Leave"> <search string="Search Leave">
<group> <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"/> <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> </group>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
@ -349,7 +349,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Leave Type"> <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"/> <field name="categ_id" widget="selection"/>
</search> </search>
</field> </field>
@ -415,7 +416,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Leave Type"> <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"/> <field name="categ_id" widget="selection"/>
</search> </search>
</field> </field>

View File

@ -93,8 +93,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Payroll Structures"> <search string="Payroll Structures">
<group col="8" colspan="4"> <group col="8" colspan="4">
<field name="name"/> <field name="name" string="Payroll Structures" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
<field name="code"/>
</group> </group>
<newline/> <newline/>
</search> </search>
@ -212,8 +211,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Payslip Lines"> <search string="Search Payslip Lines">
<group col="8" colspan="4"> <group col="8" colspan="4">
<field name="name"/> <field name="name" string="Payslip Lines" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
<field name="code"/> <separator orientation="vertical"/>
<field name="slip_id"/> <field name="slip_id"/>
<field name="amount_select"/> <field name="amount_select"/>
</group> </group>
@ -383,13 +382,14 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Payslips"> <search string="Search Payslips">
<group> <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-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
<filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/> <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="number"/>
<field name="employee_id"/> <field name="employee_id"/>
<field name="name"/>
<field name="date_from"/>
<field name="payslip_run_id"/> <field name="payslip_run_id"/>
</group> </group>
<newline/> <newline/>
@ -464,8 +464,7 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Salary Rule Categories"> <search string="Salary Rule Categories">
<field name="name"/> <field name="name" string="Salary Rule Categories" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
<field name="code"/>
</search> </search>
</field> </field>
</record> </record>
@ -518,7 +517,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Contribution Registers"> <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"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
</search> </search>
</field> </field>
@ -648,8 +648,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Salary Rule"> <search string="Search Salary Rule">
<group col="8"> <group col="8">
<field name="name"/> <field name="name" string="Salary Rules" filter_domain="['|'('name','ilike',self),('code','ilike',self)]"/>
<field name="code"/> <separator orientation="vertical"/>
<field name="category_id"/> <field name="category_id"/>
<field name="condition_range_min"/> <field name="condition_range_min"/>
</group> </group>
@ -689,12 +689,13 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Payslip Batches"> <search string="Search Payslip Batches">
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Payslip Batches"/> <field name="name" string="Payslip Batches" filter_domain="[('name','ilike',self)]"/>
<filter icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name"/>
<field name="date_start"/> <field name="date_start"/>
<field name="date_end"/> <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> </search>
</field> </field>
</record> </record>

View File

@ -60,10 +60,10 @@
<field name="type">search</field> <field name="type">search</field>
<field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/> <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="date_end" position="after"> <filter icon="terp-camera_test" string="Done" position="after">
<newline/> <separator orientation="vertical"/>
<field name="journal_id" widget="selection"/> <field name="journal_id" widget="selection"/>
</field> </filter>
</field> </field>
</record> </record>

View File

@ -178,6 +178,8 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Jobs"> <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" <filter icon="terp-document-new" string="New"
domain="[('state','=','draft')]" domain="[('state','=','draft')]"
help="All Initial Jobs" help="All Initial Jobs"
@ -190,17 +192,14 @@
domain="[('state','=','pending')]" domain="[('state','=','pending')]"
help="Pending Jobs" help="Pending Jobs"
/> />
<separator orientation="vertical"/> <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
<filter icon="terp-gtk-jump-to-ltr" string="Next Actions" <filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
context="{'invisible_next_action':False, 'invisible_next_date':False}" context="{'invisible_next_action':False, 'invisible_next_date':False}"
domain="[('date_action','&lt;&gt;',False)]" domain="[('date_action','&lt;&gt;',False)]"
help="Filter and view on next actions and date"/> help="Filter and view on next actions and date"/>
<separator orientation="vertical"/> <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="job_id" widget="selection"/>
<field name="user_id"> <field name="user_id"/>
<filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
</field>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>

View File

@ -65,15 +65,14 @@
icon="terp-camera_test" icon="terp-camera_test"
domain="[('state','=','done')]" domain="[('state','=','done')]"
help = "Hired employees"/> help = "Hired employees"/>
<separator orientation="vertical"/> <filter icon="terp-personal"
<field name="job_id"/>
<field name="department_id" widget="selection"/>
<field name="user_id" string="Responsible">
<filter icon="terp-personal"
string="My Recruitment" string="My Recruitment"
help="My Recruitment" help="My Recruitment"
domain="[('user_id','=',uid)]"/> 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> </group>
<newline/> <newline/>
<group expand="0" string="Extended Filters..."> <group expand="0" string="Extended Filters...">
@ -102,9 +101,7 @@
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/> <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"/> <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
</group> </group>
</search>
</search>
</field> </field>
</record> </record>

View File

@ -60,9 +60,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet"> <search string="Timesheet">
<group> <group>
<field name="date"/>
<separator orientation="vertical"/>
<field name="user_id"/> <field name="user_id"/>
<field name="account_id"/> <field name="account_id"/>
<field name="date"/>
</group> </group>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">

View File

@ -150,7 +150,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Type of invoicing"> <search string="Type of invoicing">
<group> <group>
<field name="name"/> <field name="name" string="Type of invoicing" filter_domain="[('name','ilike',self)]"/>
</group> </group>
</search> </search>
</field> </field>

View File

@ -47,12 +47,12 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet by user"> <search string="Timesheet by user">
<group> <group>
<field name="user_id" widget="selection"> <filter icon="terp-personal"
<filter icon="terp-personal"
string="Non Assigned timesheets to users" string="Non Assigned timesheets to users"
help="Non Assigned timesheets to users" help="Non Assigned timesheets to users"
domain="[('user_id','=',False)]"/> 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="account_id" groups="analytic.group_analytic_accounting"/>
<field name="product_id"/> <field name="product_id"/>
</group> </group>
@ -150,9 +150,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet by user"> <search string="Timesheet by user">
<group> <group>
<field name="name"/> <field name="name" string="Timesheet by users" filter_domain="[('name','ilike',self)]"/>
<field name="month"/> <separator orientation="vertical"/>
<field name="user_id"/> <field name="user_id"/>
<field name="month"/>
</group> </group>
</search> </search>
</field> </field>
@ -282,10 +283,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Daily timesheet by account"> <search string="Daily timesheet by account">
<group> <group>
<field name="name"/> <field name="name" string="Timesheet by account" filter_domain="[('name','ilike',self)]"/>
<field name="month"/> <separator orientation="vertical"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/> <field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="user_id"/> <field name="user_id"/>
<field name="month"/>
</group> </group>
</search> </search>
</field> </field>
@ -350,10 +352,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Timesheet by account"> <search string="Timesheet by account">
<group> <group>
<field name="name"/> <field name="name" string="Timesheet by account" filter_domain="[('name','ilike',self)]"/>
<field name="month"/> <separator orientation="vertical"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/> <field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="user_id"/> <field name="user_id"/>
<field name="month"/>
</group> </group>
</search> </search>
</field> </field>

View File

@ -114,10 +114,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Analytic Lines to Invoice"> <search string="Analytic Lines to Invoice">
<group> <group>
<field name="name"/> <field name="name" string="Analytic Lines" filter_domain="[('name','ilike',self)]"/>
<field name="month"/> <separator orientation="vertical"/>
<field name="product_id"/> <field name="product_id"/>
<field name="account_id" groups="analytic.group_analytic_accounting"/> <field name="account_id" groups="analytic.group_analytic_accounting"/>
<field name="month"/>
</group> </group>
</search> </search>
</field> </field>

View File

@ -167,11 +167,12 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Timesheet"> <search string="Search Timesheet">
<group> <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-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"/> <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="employee_id"/> <field name="employee_id"/>
<field name="date_from"/>
<field name="department_id" widget="selection"/> <field name="department_id" widget="selection"/>
</group> </group>
<newline/> <newline/>
@ -238,7 +239,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="date" position="after"> <field name="user_id" position="before">
<field name="sheet_id"/> <field name="sheet_id"/>
</field> </field>
</field> </field>
@ -254,7 +255,7 @@
<field name="type">search</field> <field name="type">search</field>
<field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" /> <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="action" position="after"> <field name="employee_id" position="after">
<field name="sheet_id"/> <field name="sheet_id"/>
</field> </field>
</field> </field>