Merge lp:~openerp-dev/openobject-server/6.1-opw-579669-nep into lp:openobject-server/6.1

[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.
2. When you print Invoice report, attachment will be created with Document directory which is wrong.

This fixes the issue.

Thanks

[Naresh(OpenERP) (nch-openerp)]

Hello,

I think this is not the right place to fix this.
The issue should be fixed from class document_file's create defined in document.py as this inherits ir_attachment

Secondly the main root of the problem is that in create we already check for the directory context and vals dict if we didn't find any we use the default one i.e the root directory. In your case the ir_attachment create is triggered from the report engine which will never set this field in context nor in vals which in turn pop's up this bug.

So as a solution make changes in the create overridden in document.py something like
if document not in context nor in vals:
     if type in vals and type == folder per resource
             search the directory based on the resource and use.

Note: its just a snippet

Thanks,
Naresh

review: Needs Fixing

[Naresh(OpenERP) (nch-openerp)]

needs to be fixed from addons

Unmerged revisions

4282. By Nehal Panchal (OpenERP) on 2012-09-28

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

=== modified file 'openerp/addons/base/ir/ir_attachment.py'
--- openerp/addons/base/ir/ir_attachment.py	2012-08-21 14:16:05 +0000
+++ openerp/addons/base/ir/ir_attachment.py	2012-09-28 11:45:28 +0000
@@ -122,6 +122,10 @@
         return super(ir_attachment, self).unlink(cr, uid, ids, context)
 
     def create(self, cr, uid, values, context=None):
+        if 'parent_id' in values and context.get('active_model'):
+            parent_ids_updated = self.pool.get('document.directory').search(cr, uid, [('ressource_type_id','=',context.get('active_model'))])
+            if parent_ids_updated:
+                values.update(parent_id=parent_ids_updated[0])        
         self.check(cr, uid, [], mode='create', context=context, values=values)
         return super(ir_attachment, self).create(cr, uid, values, context)