From: mra (Open ERP) <mra@tinyerp.com>
Date: Wed, 12 May 2010 08:03:15 +0000 (+0530)
Subject: [MERGE] hr_recurtiment: merge psi branch (lp:~openerp-commiter/openobject-addons... 
X-Git-Tag: 6.0.0-rc1-addons~905
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=ed311920d27681b47745727ac082b83974c2232c;p=odoo%2Fodoo.git

[MERGE] hr_recurtiment: merge psi branch (lp:~openerp-commiter/openobject-addons/trunk-mod3-local)

bzr revid: mra@tinyerp.com-20100512080315-boy1az4jprsmbxpk
---

ed311920d27681b47745727ac082b83974c2232c
diff --cc addons/hr_recruitment/report/hr_recruitment_report.py
index f59ea41,7ae32b2..c7b8164
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@@ -18,7 -18,7 +18,6 @@@
  #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
  ##############################################################################
--
  import tools
  from osv import fields,osv
  from hr_recruitment import hr_recruitment
@@@ -90,3 -91,4 +90,4 @@@ class hr_recruitment_report(osv.osv)
          """)
  hr_recruitment_report()
  
 -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
++# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --cc addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
index 9e6fb2e,4627751..e9b68de
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@@ -19,7 -19,7 +19,6 @@@
  #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
  ##############################################################################
--
  from osv import osv, fields
  from tools.translate import _
  
@@@ -74,7 -75,7 +73,7 @@@ class hr_recruitment_partner_create(osv
          if data['close']:
              case_obj.case_close(cr, uid, context['active_ids'])
  
--        value = {
++        return {
              'domain': "[]",
              'view_type': 'form',
              'view_mode': 'form,tree',
@@@ -83,8 -84,8 +82,7 @@@
              'view_id': False,
              'type': 'ir.actions.act_window',
              'search_view_id': res['res_id']
--        }
--        return value
++                }
  
  hr_recruitment_partner_create()
  
diff --cc addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index 27c0a2c,27c0a2c..0517d7d
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@@ -19,7 -19,7 +19,6 @@@
  #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
  ##############################################################################
--
  import time
  
  from osv import osv, fields
@@@ -99,17 -99,17 +98,16 @@@ class job2phonecall(osv.osv_memory)
              job_case_obj.case_cancel(cr, uid, [job.id])
              phonecall_case_obj.case_open(cr, uid, [new_phonecall_id])
  
--        value = {
++        return {
              'name': _('Phone Call'),
              'view_type': 'form',
              'view_mode': 'tree,form',
              'res_model': 'crm.phonecall',
              'res_id' : new_phonecall_id,
--            'views': [(id3,'form'),(id2,'tree'),(False,'calendar'),(False,'graph')],
++            'views': [(id3,'form'), (id2,'tree'), (False,'calendar'), (False,'graph')],
              'type': 'ir.actions.act_window',
              'search_view_id': res['res_id']
          }
--        return value
  
  job2phonecall()