Ajay Chauhan(OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-search-imp-hr-cha into
lp:~openerp-dev/openobject-addons/trunk-review_all_search.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-search-imp-hr-cha/+merge/110064
Hello,
here i have updated code for 'search' in view xml.
i followed this steps:
1) char field at top
2) date field
3) filter tag
4) m2o fields
Thanks,
Ajay Chauhan
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-search-imp-hr-cha/+merge/110064
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-commiter/openobject-addons/trunk-search-imp-hr-cha into
lp:~openerp-dev/openobject-addons/trunk-review_all_search.
=== modified file 'hr/hr_department_view.xml'
--- hr/hr_department_view.xml 2012-06-09 14:39:04 +0000
+++ hr/hr_department_view.xml 2012-06-13 12:56:22 +0000
@@ -41,7 +41,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Departments">
- <field name="name"/>
+ <field name="name" string="Departments" filter_domain="[('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
<field name="manager_id" />
</search>
</field>
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2012-06-13 09:48:49 +0000
+++ hr/hr_view.xml 2012-06-13 12:56:22 +0000
@@ -107,20 +107,20 @@
<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"/>
<newline />
<group expand="0" string="Group By...">
- <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
- <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
- <separator orientation="vertical" />
- <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="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+ <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
+ <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
+ <separator orientation="vertical"/>
+ <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="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
</group>
</search>
</field>
@@ -409,6 +409,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Jobs">
+ <field name="name" string="Jobs" filter_domain="[('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
<filter icon="terp-camera_test"
domain="[('state','=','open')]"
string="In Position"
@@ -416,14 +418,12 @@
<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'}"/>
- <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="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="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
</group>
</search>
</field>
=== modified file 'hr_attendance/hr_attendance_view.xml'
--- hr_attendance/hr_attendance_view.xml 2012-06-09 14:39:04 +0000
+++ hr_attendance/hr_attendance_view.xml 2012-06-13 12:56:22 +0000
@@ -52,12 +52,12 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Hr Attendance Search">
+ <field name="name"/>
+ <separator orientation="vertical"/>
<filter icon="terp-stock_align_left_24" string="My Attendance" domain="[('employee_id.user_id.id', '=', uid)]" />
- <separator orientation="vertical"/>
<filter icon="terp-go-today" string="Today" name="today" domain="[('name','>=',current_date),('name','<=',current_date)]" />
<separator orientation="vertical"/>
<field name="employee_id"/>
- <field name="name"/>
<field name="action"/>
<newline/>
<group expand="0" string="Group By...">
=== modified file 'hr_contract/hr_contract_view.xml'
--- hr_contract/hr_contract_view.xml 2012-06-07 17:30:07 +0000
+++ hr_contract/hr_contract_view.xml 2012-06-13 12:56:22 +0000
@@ -39,23 +39,25 @@
<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"/>
- <separator orientation="vertical"/>
- <field name="name"/>
- <field name="employee_id"/>
- <field name="working_hours"/>
- <field name="date_start"/>
- <field name="date_end"/>
+ <field name="name" string="Contracts" filter_domain="[('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
+ <field name="date_start"/>
+ <field name="date_end"/>
+ <separator orientation="vertical"/>
+ <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"/>
+ <separator orientation="vertical"/>
+ <field name="employee_id"/>
+ <field name="working_hours"/>
</group>
<newline/>
<group expand="0" string="Group By...">
- <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
- <separator orientation="vertical"/>
- <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'}"/>
- <separator orientation="vertical"/>
- <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+ <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+ <separator orientation="vertical"/>
+ <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'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
</group>
</search>
</field>
@@ -162,7 +164,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>
=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml 2012-06-11 12:42:11 +0000
+++ hr_evaluation/hr_evaluation_view.xml 2012-06-13 12:56:22 +0000
@@ -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,27 +228,27 @@
<field name="arch" type="xml">
<search string="Search Appraisal">
<group>
- <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"/>
+ <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"/>
+ <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" />
</group>
<newline/>
<group expand='0' string='Group by...'>
- <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
- <separator orientation="vertical"/>
- <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'}" />
- <separator orientation="vertical"/>
- <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
+ <filter string='Employee' icon="terp-personal" domain="[]" context="{'group_by' : 'employee_id'}" />
+ <separator orientation="vertical"/>
+ <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'}" />
+ <separator orientation="vertical"/>
+ <filter string='Date' icon="terp-go-month" domain="[]" context="{'group_by' : 'date'}" />
</group>
</search>
</field>
@@ -326,7 +327,6 @@
<search string="Search Appraisal">
<group>
<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"/>
=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml 2012-06-11 12:42:11 +0000
+++ hr_expense/hr_expense_view.xml 2012-06-13 12:56:22 +0000
@@ -135,6 +135,10 @@
<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"/>
@@ -142,12 +146,8 @@
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...">
=== modified file 'hr_expense/report/hr_expense_report_view.xml'
--- hr_expense/report/hr_expense_report_view.xml 2012-05-28 06:22:05 +0000
+++ hr_expense/report/hr_expense_report_view.xml 2012-06-13 12:56:22 +0000
@@ -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"/>
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-06-13 09:48:49 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-06-13 12:56:22 +0000
@@ -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="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"/>
- <field name="date_from"/>
</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>
=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml 2012-06-12 06:53:29 +0000
+++ hr_payroll/hr_payroll_view.xml 2012-06-13 12:56:22 +0000
@@ -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">
+ <field name="name" string="Payslip Batches" filter_domain="[('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
+ <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"/>
- <separator orientation="vertical"/>
- <field name="name"/>
- <field name="date_start"/>
- <field name="date_end"/>
</search>
</field>
</record>
=== modified file 'hr_payroll_account/hr_payroll_account_view.xml'
--- hr_payroll_account/hr_payroll_account_view.xml 2012-06-08 11:27:08 +0000
+++ hr_payroll_account/hr_payroll_account_view.xml 2012-06-13 12:56:22 +0000
@@ -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>
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml 2012-06-11 12:42:11 +0000
+++ hr_recruitment/hr_recruitment_view.xml 2012-06-13 12:56:22 +0000
@@ -178,6 +178,8 @@
<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"
@@ -190,17 +192,14 @@
domain="[('state','=','pending')]"
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"
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'}"/>
=== modified file 'hr_recruitment/report/hr_recruitment_report_view.xml'
--- hr_recruitment/report/hr_recruitment_report_view.xml 2012-06-01 12:39:00 +0000
+++ hr_recruitment/report/hr_recruitment_report_view.xml 2012-06-13 12:56:22 +0000
@@ -65,15 +65,14 @@
icon="terp-camera_test"
domain="[('state','=','done')]"
help = "Hired employees"/>
+ <filter icon="terp-personal"
+ string="My Recruitment"
+ help="My Recruitment"
+ domain="[('user_id','=',uid)]"/>
<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>
+ <field name="user_id" string="Responsible"/>
</group>
<newline/>
<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="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
</group>
-
-
- </search>
+ </search>
</field>
</record>
=== modified file 'hr_timesheet/hr_timesheet_view.xml'
--- hr_timesheet/hr_timesheet_view.xml 2012-06-11 12:42:11 +0000
+++ hr_timesheet/hr_timesheet_view.xml 2012-06-13 12:56:22 +0000
@@ -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...">
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-06-09 14:39:04 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml 2012-06-13 12:56:22 +0000
@@ -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>
=== modified file 'hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml'
--- hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml 2012-05-22 07:24:16 +0000
+++ hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml 2012-06-13 12:56:22 +0000
@@ -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"
+ <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="name" string="Timesheet by users" filter_domain="[('name','ilike',self)]"/>
+ <separator orientation="vertical"/>
+ <field name="user_id"/>
<field name="month"/>
- <field name="user_id"/>
</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>
=== modified file 'hr_timesheet_invoice/report/report_analytic_view.xml'
--- hr_timesheet_invoice/report/report_analytic_view.xml 2012-05-22 07:24:16 +0000
+++ hr_timesheet_invoice/report/report_analytic_view.xml 2012-06-13 12:56:22 +0000
@@ -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>
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-06-11 12:42:11 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-06-13 12:56:22 +0000
@@ -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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
