[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20101224045033-kwao734lfwb4ojd6

diff --git a/addons/hr_payroll_account/hr_payroll_demo.xml b/addons/hr_payroll_account/hr_payroll_demo.xml
index c1d31e0..2875c2c 100644 (file)
--- a/addons/hr_payroll_account/hr_payroll_demo.xml
+++ b/addons/hr_payroll_account/hr_payroll_demo.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
         <record id="hr_payroll.hr_payslip_line_houserantallowance1" model="hr.payslip.line">
             <field name="account_id" ref="account.a_salary_expense"/>
         </record>
-        
+
         <record id="hr_payroll.hr_payslip_line_convanceallowance1" model="hr.payslip.line">
             <field name="account_id" ref="account.a_salary_expense"/>
         </record>
@@ -26,7 +26,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"/>
@@ -37,7 +37,7 @@
             <field name="salary_account" ref="account.a_salary_expense"/>
             <field name="employee_account" ref="account.a_expense"/>
         </record>
-        
+
         <record id="hr.employee2" model="hr.employee">
             <field name="property_bank_account" ref="account.bnk"/>
             <field name="salary_account" ref="account.a_salary_expense"/>
@@ -54,6 +54,52 @@
             <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 id="bnk" model="account.account">
+            <field name="code">X110041</field>
+            <field name="name">Bank Current Account</field>
+            <field ref="account.cas" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.account_type_asset"/>
+        </record>
+
+        <record id="a_salary_expense" model="account.account">
+            <field name="code">X21122</field>
+            <field name="name">Salary Expenses</field>
+            <field ref="account.ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <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>
+
+        <!-- Properties -->
+        <record forcecreate="True" id="property_bank_account" model="ir.property">
+            <field name="name">property_bank_account</field>
+            <field name="fields_id" search="[('model','=','hr.employee'),('name','=','property_bank_account')]"/>
+            <field eval="'account.account,'+str(bnk)" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
+        <record forcecreate="True" id="salary_account" model="ir.property">
+            <field name="name">salary_account</field>
+            <field name="fields_id" search="[('model','=','hr.employee'),('name','=','salary_account')]"/>
+            <field eval="'account.account,'+str(a_salary_expense)" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
+        <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 name="company_id" ref="base.main_company"/>
         </record>
 
     </data>