Merge lp:~ovnicraft/openobject-addons/7.0-bug-1095339 into lp:openobject-addons/7.0

[Cristian Salamea]

Fix bug for 7.0 #1095339

Unmerged revisions

8601. By Cristian Salamea on 2013-01-24

[FIX] fix directory per resource

=== modified file 'document/document.py'
--- document/document.py	2012-12-24 14:00:02 +0000
+++ document/document.py	2013-01-24 16:27:33 +0000
@@ -113,7 +113,12 @@
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        vals['parent_id'] = context.get('parent_id', False) or vals.get('parent_id', False)
+        if vals.get('parent_id', False) or context.get('parent_id', False):
+            vals['parent_id'] = context.get('parent_id', False) or vals.get('parent_id', False)
+        elif vals.get('res_model', False):
+            resource_id = self.pool.get('ir.model').search(cr, uid, [('model','=', vals.get('res_model', False))], context=context)[0]
+            directory_ids = self.pool.get('document.directory').search(cr, uid, [('ressource_type_id','=', resource_id)], context=context)
+            vals['parent_id'] = directory_ids[0] if directory_ids else False
         # take partner from uid
         if vals.get('res_id', False) and vals.get('res_model', False) and not vals.get('partner_id', False):
             vals['partner_id'] = self.__get_partner_id(cr, uid, vals['res_model'], vals['res_id'], context)