← Back to branch summary

~jah256/openerp/openerp-redmine-connector

« back to all changes in this revision

Viewing changes to project.py

  • Committer: Richard Lewis
  • Date: 2013-06-13 15:29:56 UTC
  • Revision ID: richard.lewis@credativ.co.uk-20130613152956-94ennedyfxpkz2wv
[WIP] Added user mapping
A few bits of code tidying

Show diffs side-by-side

added added

removed removed

Lines of Context:
project.py
50
50
                                                            parent_data=parent_data, previous_lines=previous_lines, defaults=defaults, context=context)
51
51
 
52
52
        if mapped_vals.get('project_id', False):
53
 
            data_pool = self.pool.get('ir.model.data')
54
 
            ids = data_pool.search(cr, uid, [('external_referential_id','=',external_referential_id),
55
 
                                             ('model','=','project.project'),
56
 
                                             ('name','=','project_project/%s' % (mapped_vals['project_id'],))],
57
 
                                   context=context)
58
 
            project_ids = [r['res_id'] for r in data_pool.read(cr, uid, ids, ['res_id'], context=context)]
59
 
            if project_ids:
60
 
                mapped_vals['project_id'] = project_ids[-1]
61
 
            else:
62
 
                mapped_vals['project_id'] = False
63
 
 
64
 
        import pdb; pdb.set_trace()
 
53
            mapped_vals['project_id'] = self.get_oe_project(cr, uid, external_referential_id, mapped_vals['project_id'], context=context)
 
54
            if not mapped_vals['project_id']:
 
55
                mapped_vals.pop('project_id')
 
56
 
 
57
        if mapped_vals.get('user_id', False):
 
58
            mapped_vals['user_id'] = self.get_oe_user(cr, uid, mapped_vals['user_id'], context=context)
 
59
            if not mapped_vals['user_id']:
 
60
                mapped_vals.pop('user_id')
 
61
 
65
62
        return mapped_vals
66
63
 
67
64
task()
82
79
                                                                    parent_data=parent_data, previous_lines=previous_lines, defaults=defaults, context=context)
83
80
 
84
81
        if mapped_vals.get('task_id', False):
85
 
            data_pool = self.pool.get('ir.model.data')
86
 
            ids = data_pool.search(cr, uid, [('external_referential_id','=',external_referential_id),
87
 
                                             ('model','=','project.task'),
88
 
                                             ('name','=','project_task/%s' % (mapped_vals['task_id'],))],
89
 
                                   context=context)
90
 
            task_ids = [r['res_id'] for r in data_pool.read(cr, uid, ids, ['res_id'], context=context)]
91
 
            if task_ids:
92
 
                mapped_vals['task_id'] = task_ids[-1]
93
 
            else:
94
 
                mapped_vals['task_id'] = False
95
 
 
96
 
        import pdb; pdb.set_trace()
 
82
            mapped_vals['task_id'] = self.get_oe_task(cr, uid, external_referential_id, mapped_vals['task_id'], context=context)
 
83
            if not mapped_vals['task_id']:
 
84
                mapped_vals.pop('task_id')
 
85
 
 
86
        if mapped_vals.get('user_id', False):
 
87
            mapped_vals['user_id'] = self.get_oe_user(cr, uid, mapped_vals['user_id'], context=context)
 
88
            if not mapped_vals['user_id']:
 
89
                mapped_vals.pop('user_id')
 
90
 
97
91
        return mapped_vals
98
92
 
99
93
project_work()