[MERGE]: Merge with lp:openobject-addons

[odoo/odoo.git] / addons / hr_payroll_account / hr_payroll_account_demo.xml

diff --git a/addons/hr_payroll_account/hr_payroll_account_demo.xml b/addons/hr_payroll_account/hr_payroll_account_demo.xml
index 1483015..6372dab 100644 (file)
--- a/addons/hr_payroll_account/hr_payroll_account_demo.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_demo.xml
@@ -2,19 +2,19 @@
 <openerp>
     <data>
 
-        <record id="hr_payroll.hr_payslip_line_houserantallowance1" model="hr.salary.rule">
+        <record id="hr_payroll.hr_salary_rule_houserentallowance1" model="hr.salary.rule">
             <field name="account_debit" ref="account.a_salary_expense"/>
         </record>
 
-        <record id="hr_payroll.hr_payslip_line_convanceallowance1" model="hr.salary.rule">
+        <record id="hr_payroll.hr_salary_rule_convanceallowance1" model="hr.salary.rule">
             <field name="account_debit" ref="account.a_salary_expense"/>
         </record>
 
-        <record id="hr_payroll.hr_payslip_line_professionaltax1" model="hr.salary.rule">
+        <record id="hr_payroll.hr_salary_rule_professionaltax1" model="hr.salary.rule">
             <field name="account_debit" ref="account.a_salary_expense"/>
         </record>
 
-        <record id="hr_payroll.hr_payslip_line_providentfund1" model="hr.salary.rule">
+        <record id="hr_payroll.hr_salary_rule_providentfund1" model="hr.salary.rule">
             <field name="account_debit" ref="account.a_salary_expense"/>
         </record>
         
@@ -37,10 +37,6 @@
         <record id="hr_payroll.hr_rule_net" model="hr.salary.rule">
             <field name="account_debit" ref="account.a_salary_expense"/>
         </record>
-        
-        <record id="hr_payroll.hr_payslip_line_houserantallowance1" model="hr.salary.rule">
-            <field name="account_debit" ref="account.a_salary_expense"/>
-        </record>
 
         <!-- Payslip -->
        <!-- <record id="hr_payroll.hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
@@ -50,7 +46,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 +74,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,35 +92,15 @@
             <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 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>
 
-        <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>
 </openerp>