odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] hr_payroll_account: changed domain and ir.property to make account type=payable 

lp bug: https://launchpad.net/bugs/761456 fixed

bzr revid: mtr@mtr-20110421113925-r6j0cxhdxrcaqqyg
This commit is contained in:
Michael Telahun Makonnen, mtr(OpenERP) 2011-04-21 17:09:25 +05:30 committed by mtr
parent 60ad4cdfe6
commit faf4bec06c
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_payroll_account/hr_payroll_account.py
View File

@ -80,7 +80,7 @@ class hr_employee(osv.osv):
relation='account.account',
string="Employee Account",
method=True,
domain="[('type', '=', 'other')]",
domain="[('type', '=', 'payable')]",
view_load=True,
help="Employee Payable Account"),
'analytic_account':fields.property(

19
addons/hr_payroll_account/hr_payroll_account_demo.xml
View File

@ -50,7 +50,7 @@
<!-- Assigned Default Account in Different Demo Employees -->
<record id="hr.employee" model="hr.employee">
<!-- <record id="hr.employee" model="hr.employee">
<field name="property_bank_account" ref="account.bnk"/>
<field name="salary_account" ref="account.a_salary_expense"/>
<field name="employee_account" ref="account.a_expense"/>
@ -78,7 +78,7 @@
<field name="property_bank_account" ref="account.bnk"/>
<field name="salary_account" ref="account.a_salary_expense"/>
<field name="employee_account" ref="account.a_expense"/>
</record>
</record>-->
<record id="bnk" model="account.account">
<field name="code">X110041</field>
@ -96,12 +96,13 @@
<field name="user_type" ref="account.account_type_expense"/>
</record>
<record id="a_expense" model="account.account">
<field name="code">X21102</field>
<field name="name">Expenses</field>
<field ref="account.ovr" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account.account_type_expense"/>
<record id="a_creditors" model="account.account">
<field name="code">X11111</field>
<field name="name">Employee Payable Account</field>
<field ref="account.cli" name="parent_id"/>
<field name="type">payable</field>
<field eval="True" name="reconcile"/>
<field name="user_type" ref="account.account_type_payable"/>
</record>
<!-- Properties -->
@ -122,7 +123,7 @@
<record forcecreate="True" id="employee_account" model="ir.property">
<field name="name">employee_account</field>
<field name="fields_id" search="[('model','=','hr.employee'),('name','=','employee_account')]"/>
<field eval="'account.account,'+str(a_expense)" name="value"/>
<field eval="'account.account,'+str(a_creditors)" name="value"/>
<field name="company_id" ref="base.main_company"/>
</record>