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

merge lp:~openerp-dev/openobject-addons/trunk-clean-search-hr_payroll-tpa

Browse Source 
bzr revid: jam@tinyerp.com-20120723125159-j592c12covz4u8ht
This commit is contained in:
Jigar Amin - OpenERP
2012-07-23 18:21:59 +05:30
parent f0773390cc 9c72f19e40
commit 59fa66eb81
2 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll/hr_payroll_view.xml
+14 -39
View File
@@ -61,10 +61,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Payroll Structures">
<group col="8" colspan="4">
<field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
</group>
<newline/>
<field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
</search>
</field>
</record>
@@ -179,19 +176,13 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Payslip Lines">
<group col="8" colspan="4">
<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>
<newline/>
<field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
<field name="slip_id"/>
<field name="amount_select"/>
<group col="8" colspan="4" expand="0" string="Group By...">
<filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/>
<filter string="Contribution Register" name="register_id" icon="terp-folder-yellow" context="{'group_by':'register_id'}"/>
<separator orientation="vertical"/>
<filter string="Amount Type" name="amount_select" icon="terp-stock_symbol-selection" context="{'group_by':'amount_select'}"/>
<separator orientation="vertical"/>
<filter string="Employees" name="employee_id" icon="terp-personal" context="{'group_by':'employee_id'}"/>
</group>
</search>
@@ -367,25 +358,16 @@
<field name="type">search</field>
<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="employee_id"/>
<field name="payslip_run_id"/>
</group>
<newline/>
<field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
<field name="date_from"/>
<field name="employee_id"/>
<field name="payslip_run_id"/>
<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"/>
<group expand="0" string="Group By...">
<filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
<separator orientation="vertical"/>
<filter string="PaySlip Batch" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
<separator orientation="vertical"/>
<filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
</group>
</search>
@@ -526,8 +508,7 @@
<field name="arch" type="xml">
<search string="Contribution Registers">
<field name="name" string="Contribution Registers"/>
<separator orientation="vertical"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="company_id" groups="base.group_multi_company"/>
</search>
</field>
</record>
@@ -655,13 +636,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Salary Rule">
<group col="8">
<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>
<newline/>
<field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
<field name="category_id"/>
<field name="condition_range_min"/>
<group col="8" colspan="4" expand="0" string="Group By...">
<filter string="Category" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/>
</group>
@@ -698,10 +675,8 @@
<field name="arch" type="xml">
<search string="Search Payslip Batches">
<field name="name" string="Payslip Batches"/>
<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 name="done_filter" icon="terp-camera_test" string="Done" domain="[('state','=','close')]" help="Done Payslip Batches"/>
</search>
addons/hr_payroll_account/hr_payroll_account_view.xml
+1 -2
View File
@@ -62,8 +62,7 @@
<field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
<field name="arch" type="xml">
<filter name='done_filter' position="after">
<separator orientation="vertical"/>
<field name="journal_id" widget="selection"/>
<field name="journal_id"/>
</filter>
</field>
</record>