Merge lp:~vauxoo/xmind-openerp/7.0-xo-dev-julio into lp:xmind-openerp

[Julio Serna-http://www.vauxoo.com]

modifica función para re calcular el wbs_code cuando se termina de crear los proyectos, se asigna secuencia a los proyectos con recorrido postorder

[Moisés López - http://www.vauxoo.com (moylop260)]

Tiene conflicto

review: Disapprove

[lp:~vauxoo/xmind-openerp/7.0-xo-dev-julio]

66. By Julio Serna-http://www.vauxoo.com on 2013-05-22

[FIX] resolved conflicts

[Julio Serna-http://www.vauxoo.com (hearthebreaker)]

se resolvió conflictos

review: Needs Resubmitting

[Moisés López - http://www.vauxoo.com (moylop260)]

Aprobado, lo puedes mergear. Por favor.

=== modified file 'xmind/__openerp__.py'
--- xmind/__openerp__.py	2013-03-26 05:50:01 +0000
+++ xmind/__openerp__.py	2013-05-22 04:59:28 +0000
@@ -29,7 +29,8 @@
                  'document',
                  'document_page',
                  'user_story',
-                 'project'],
+                 'project',
+                 'project_wbs'],
     "author" : "Vauxoo",
     "description" : """
 Import an xmind file to openerp:

=== modified file 'xmind/wizard/xmind.py'
--- xmind/wizard/xmind.py	2013-05-16 04:11:00 +0000
+++ xmind/wizard/xmind.py	2013-05-22 04:59:28 +0000
@@ -60,17 +60,16 @@
                                   [('xmind_id', '=',
                                   node.get_correlation_id())])
 
-    def create_project(self, cr, uid, node, wbs, parent_id=False, context=None):
+    def create_project(self, cr, uid, node, wbs, parent_id=False, wbs_sequence=1, context=None):
         project_obj = self.pool.get('project.project')
         analytic_id = parent_id and project_obj.browse(cr, uid,
         [parent_id], context=context)[0].analytic_account_id.id or parent_id
-
         project_dict = {'name': node.get_title(),
                         'parent_id': analytic_id,
                         'description': node.get_note() and node.get_note() or False,
                         'xmind_id': node.get_correlation_id(),
+                        'priority': wbs_sequence,
                         'privacy_visibility':'employees',
-                        'priority':1,
 			}
         _logger.info("Working with %s" % (project_dict))
         created_projects = []
@@ -90,7 +89,8 @@
         for ch in subtopics:
             created_projects.append(created_id)
             wbs += 1
-            self.create_project(cr, uid, ch, wbs, created_id)
+            wbs_sequence += 1
+            self.create_project(cr, uid, ch, wbs, created_id, wbs_sequence)
             wbs -= 1
         return created_projects
 
@@ -137,6 +137,17 @@
             if project_main:
                 c = self.create_project(cr, uid, project_main, 0)
                 self.get_all_levels(cr, uid, ids, context=context)
+                
+                project_main_ids = project_obj.search(cr, uid,
+                        [('xmind_id', '=', project_main.get_correlation_id()),
+                        ('parent_id','=',False)])
+                                    
+                project_ids = project_obj._get_wbs_code(cr, uid,
+                                project_main_ids, context=context)
+                                
+                project_obj._get_current_wbs(cr, uid, project_ids, 'wbs_code',
+                                args=None, context=context)
+                                
             #creating attachment
             if wz_brw:
                 self.create_attachment(cr, uid, wz_brw.xmind, 
@@ -144,4 +155,5 @@
                             'xmind_name': project_main.get_title(),
                             'xmind_id': project_main.get_correlation_id(),
                             'res_model': 'project.project'})
+                            
         return True