Merge lp:~openerp-dev/openobject-addons/7.0-opw-579669-port-nep into lp:openobject-addons

[Nehal Panchal (OpenERP)]

Hello,

While creating an attachment by OpenERP, directory specified with resource model should be considered.

Steps to reproduce:
1. Create a directory with resource model for example:Invoice, type:Folders per resource, and Resource Model:account.invoice.
2. When you print Invoice report, attachment will be created with Document directory which is wrong.

This fixes the issue.

Thanks

[lp:~openerp-dev/openobject-addons/7.0-opw-579669-port-nep]

8232. By Nehal Panchal (OpenERP) on 2012-12-07

[FIX] document:Fixed the issue while creating an attachment by OpenERP,directory specified with resource model should be considered

Unmerged revisions

8232. By Nehal Panchal (OpenERP) on 2012-12-07

[FIX] document:Fixed the issue while creating an attachment by OpenERP,directory specified with resource model should be considered

=== modified file 'document/document.py'
--- document/document.py	2012-11-29 22:26:45 +0000
+++ document/document.py	2012-12-07 12:45:30 +0000
@@ -243,12 +243,16 @@
         if context is None:
             context = {}
         vals['parent_id'] = context.get('parent_id', False) or vals.get('parent_id', False)
+        if not vals.get('res_model', False) and context.get('default_res_model', False):
+            vals['res_model'] = context.get('default_res_model', False)        
         if not vals['parent_id']:
-            vals['parent_id'] = self.pool.get('document.directory')._get_root_directory(cr,uid, context)
+            parent_id = self.pool.get('document.directory').search(cr, uid, [('ressource_type_id','=',vals['res_model'])])
+            if parent_id and parent_id[0]:
+                vals['parent_id'] = parent_id[0]
+            else:
+                vals['parent_id'] = self.pool.get('document.directory')._get_root_directory(cr,uid, context)
         if not vals.get('res_id', False) and context.get('default_res_id', False):
             vals['res_id'] = context.get('default_res_id', False)
-        if not vals.get('res_model', False) and context.get('default_res_model', False):
-            vals['res_model'] = context.get('default_res_model', False)
         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, \