Merge lp:~juan-munoz-clearcorp/openerp-ccorp-addons/project_rename_feature into lp:openerp-ccorp-addons/6.1

[Juan Felipe Muñoz Ramos]

=== renamed directory 'TODO-6.1/project_project_name_shortcut' => 'project_project_name_shortcut'
=== modified file 'project_project_name_shortcut/project_name_shortcut.py'
--- TODO-6.1/project_project_name_shortcut/project_name_shortcut.py	2011-09-26 15:36:52 +0000
+++ project_project_name_shortcut/project_name_shortcut.py	2012-04-20 17:00:22 +0000
@@ -33,41 +33,49 @@
 #    
 ##############################################################################
 from osv import osv, fields
-from tools import debug
+#from tools import #debug
 
 
 class project_name_shortcut(osv.osv):
-	_name = 'project.project'
-	_inherit = 'project.project'
-	
-	def name_get(self, cr, uid, ids, context=None):
-		if not ids:
-			return []
-		res = []
-		for project in self.browse(cr, uid, ids, context=context):
-			data = []
-			proj = project.parent_id
-			while proj:
-				data.insert(0,(proj.shortcut or proj.name))
-				proj = proj.parent_id
-			
-			data.append(project.name)
-			data = ' / '.join(data)
-			res.append((project.id, data))
-		return res
-	
-	def _shortcut_name(self, cr, uid, ids,field_name,arg, context=None):
-		res ={}
-		debug(ids)
-		for m in self.browse(cr,uid,ids,context=context):
-			res = self.name_get(cr, uid, ids)
-			return dict(res)
-			
-		return res
-		
-	_columns = {
-		'shortcut_name': fields.function(_shortcut_name, method=True, string='Project Name', type='char', size=350),
-	}
+    _name = 'project.project'
+    _inherit = 'project.project'
+    
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        res = []
+        for project in self.browse(cr, uid, ids, context=context):
+            data = []
+            proj = project.parent_id
+            while proj :
+                if proj.code != '' and proj.code != False:
+                    data.insert(0,(proj.name))
+                    proj = proj.parent_id
+                    continue
+                else:
+                    data.insert(0,(proj.name))
+                    proj = proj.parent_id
+                
+                
+            
+            data.append(project.name)
+            data = ' / '.join(data)
+            res.append((project.id, data))
+        return res
+
+    def _shortcut_name(self, cr, uid, ids,field_name,arg, context=None):
+        res ={}
+        #debug(ids)
+        for m in self.browse(cr,uid,ids,context=context):
+            res = self.name_get(cr, uid, ids)
+            return dict(res)
+
+        return res
+        
+    _columns = {
+        'shortcut_name': fields.function(_shortcut_name, method=True, string='Project Name', type='char', size=350),
+        'shortcut': fields.char('shortcut',size=16),
+    }
 project_name_shortcut()