summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVir (Open ERP) <vir@tinyerp.com>2010-09-11 16:26:45 +0530
committerVir (Open ERP) <vir@tinyerp.com>2010-09-11 16:26:45 +0530
commit2dd129f4ffbfc4dd46ca40d6b95cd1ae4c1ba529 (patch)
tree4c4410442f9a801d048dbab6d613a949ff38f580
parent8882b118d3571bae4e3ea39b15e83d98e27d7fc7 (diff)
[ADD] hr_payroll : demo data added for the properties, hr_recruitment:when hired,stage changes
bzr revid: vir@tinyerp.com-20100911105645-b5unjsfm1d81mxkd
-rw-r--r--addons/hr_payroll/hr_payroll_demo.xml107
-rw-r--r--addons/hr_recruitment/hr_recruitment.py3
2 files changed, 110 insertions, 0 deletions
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 9c2ce90cd7a..b0c843e0c95 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -92,5 +92,112 @@
<field name="name">Salary Slip of Bonamy for June-2010</field>
</record>
+ <record id="ir_property_salaryaccount0" model="ir.property">
+ <field name="name">salary_account</field>
+ <field name="res_id">hr.employee,1</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_salary_account"/>
+ <field name="value_reference">account.account,27</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_employeeaccount0" model="ir.property">
+ <field name="name">employee_account</field>
+ <field name="res_id">hr.employee,1</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_employee_account"/>
+ <field name="value_reference">account.account,22</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_propertybankaccount0" model="ir.property">
+ <field name="name">property_bank_account</field>
+ <field name="res_id">hr.employee,1</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_property_bank_account"/>
+ <field name="value_reference">account.account,11</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_salaryaccount2" model="ir.property">
+ <field name="name">salary_account</field>
+ <field name="res_id">hr.employee,2</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_salary_account"/>
+ <field name="value_reference">account.account,27</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_employeeaccount2" model="ir.property">
+ <field name="name">employee_account</field>
+ <field name="res_id">hr.employee,2</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_employee_account"/>
+ <field name="value_reference">account.account,22</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_propertybankaccount2" model="ir.property">
+ <field name="name">property_bank_account</field>
+ <field name="res_id">hr.employee,2</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_property_bank_account"/>
+ <field name="value_reference">account.account,11</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_salaryaccount3" model="ir.property">
+ <field name="name">salary_account</field>
+ <field name="res_id">hr.employee,3</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_salary_account"/>
+ <field name="value_reference">account.account,27</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_employeeaccount3" model="ir.property">
+ <field name="name">employee_account</field>
+ <field name="res_id">hr.employee,3</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_employee_account"/>
+ <field name="value_reference">account.account,22</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_propertybankaccount3" model="ir.property">
+ <field name="name">property_bank_account</field>
+ <field name="res_id">hr.employee,3</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_property_bank_account"/>
+ <field name="value_reference">account.account,11</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_salaryaccount4" model="ir.property">
+ <field name="name">salary_account</field>
+ <field name="res_id">hr.employee,10</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_salary_account"/>
+ <field name="value_reference">account.account,27</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_employeeaccount4" model="ir.property">
+ <field name="name">employee_account</field>
+ <field name="res_id">hr.employee,10</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_employee_account"/>
+ <field name="value_reference">account.account,22</field>
+ <field name="type">many2one</field>
+ </record>
+
+ <record id="ir_property_propertybankaccount4" model="ir.property">
+ <field name="name">property_bank_account</field>
+ <field name="res_id">hr.employee,10</field>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="fields_id" ref="hr_payroll.field_hr_employee_property_bank_account"/>
+ <field name="value_reference">account.account,11</field>
+ <field name="type">many2one</field>
+ </record>
</data>
</openerp>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 24914327926..55e9fc09b13 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -429,6 +429,9 @@ class hr_applicant(crm.crm_case, osv.osv):
message = _('Applicant ') + " '" + name + "' "+ _("is Hired.")
self.log(cr, uid, id, message)
+ stage_id = self.pool.get('hr.recruitment.stage').search(cr, uid, [('name','=','Contract Signed')])
+ self.write(cr, uid, ids,{'stage_id':stage_id[0]})
+
applicant = self.browse(cr, uid, ids)[0]
if applicant['job_id'] :
emp_id = employee_obj.create(cr,uid,{'name':applicant['name'],'job_id':applicant['job_id']['id']})