merge

bzr revid: nel@tinyerp.com-20090925135248-2qpx68od31g4rvqs

addons/document/document.py

@@ -651,10 +651,11 @@ class document_file(osv.osv):
     def create(self, cr, uid, vals, context={}):
         vals['title']=vals['name']
         vals['parent_id'] = context.get('parent_id',False) or vals.get('parent_id',False)
-        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 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)
+        vals['res_model'] = "report.document.user"
         if vals.get('res_id', False) and vals.get('res_model',False):
             obj_model=self.pool.get(vals['res_model'])
             result = obj_model.read(cr, uid, [vals['res_id']], context=context)
@@ -693,7 +694,8 @@ class document_file(osv.osv):
         try:
             res = content_index(base64.decodestring(datas), vals['datas_fname'], vals.get('content_type', None))
             super(document_file,self).write(cr, uid, [result], {
-                'index_content': res,
+                'index_content' : res,
+                'res_id' : result
             })
             cr.commit()
         except:

addons/sale/sale.py

@@ -374,7 +374,7 @@ class sale_order(osv.osv):
             'account_id': a,
             'partner_id': order.partner_id.id,
             'address_invoice_id': order.partner_invoice_id.id,
-            'address_contact_id': order.partner_invoice_id.id,
+            'address_contact_id': order.partner_order_id.id,
             'invoice_line': [(6, 0, lines)],
             'currency_id': order.pricelist_id.currency_id.id,
             'comment': order.note,