From 548e308a7ac6f1f5ff43b5014c89436e743612a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Beau?= <sebastien.beau@akretion.com>
Date: Thu, 11 Jul 2013 01:09:07 +0200
Subject: [PATCH] [IMP] file_email: fix default value, add company on email
 server, add sql constraint for uniqueness

---
 __openerp__.py         |  1 +
 fetchmail.py           |  9 +++++++++
 fetchmail_view.xml     |  4 ++++
 file_document.py       | 17 ++++++++++++++---
 file_document_view.xml | 21 +++++++++++++++++++++
 5 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 file_document_view.xml

diff --git a/__openerp__.py b/__openerp__.py
index 8dcc25e3..125a27aa 100644
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -36,6 +36,7 @@
     'init_xml': [],
     'update_xml': [
         "fetchmail_view.xml",
+        "file_document_view.xml",
         ],
     'demo_xml': [],
     'installable': True,
diff --git a/fetchmail.py b/fetchmail.py
index d8fcdfe3..9710338b 100644
--- a/fetchmail.py
+++ b/fetchmail.py
@@ -35,14 +35,23 @@ class fetchmail_server(orm.Model):
     _columns = {
         'file_type': fields.selection(_get_file_type, 'File Type',
                 help='The file type will show some special option'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),#Why this field do not exist by default?
     }
 
+    _defaults = {
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'fetchmail.server', context=c),
+    }
+
+
     def get_context_for_server(self, cr, uid, server_id, context=None):
         if context is None:
             ctx = {}
         else:
             ctx = context.copy()
         ctx['default_file_document_vals'] = {}
+        server = self.browse(cr, uid, server_id, context=context)
+        ctx['default_company_id'] = server.company_id.id
+        ctx['default_fetchmail_server_id'] = server_id
         return ctx
 
     def fetch_mail(self, cr, uid, ids, context=None):
diff --git a/fetchmail_view.xml b/fetchmail_view.xml
index e9eaf732..e83d2d74 100644
--- a/fetchmail_view.xml
+++ b/fetchmail_view.xml
@@ -8,6 +8,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="fetchmail.view_email_server_form"/>
             <field name="arch" type="xml">
+
+                <field name="date" position="after">
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                </field>
                 <field name="object_id" position="after">
                     <field name="file_type"/> <!-- TODO attrs="{'invisible': [('object_id','!=', 'file.document')]}"/>-->
                 </field>
diff --git a/file_document.py b/file_document.py
index ab59be0d..af5277c8 100644
--- a/file_document.py
+++ b/file_document.py
@@ -26,6 +26,15 @@ from openerp.osv import fields, orm
 class file_document(orm.Model):
     _inherit = "file.document"
 
+    _columns = {
+        'fetchmail_server_id': fields.many2one('fetchmail.server', 'Email Server'),
+    }
+
+    _sql_constraints = [
+        ('fecthmail_server_ext_id_uniq', 'unique(fetchmail_server_id, ext_id)',
+            'The combination of Email Server and External id must be unique !'),
+    ]
+
     def _prepare_data_for_file_document(self, cr, uid, msg, context=None):
         """Method to prepare the data for creating a file document.
         :param msg: a dictionnary with the email data
@@ -41,9 +50,11 @@ class file_document(orm.Model):
         res = self._prepare_data_for_file_document(cr, uid, msg, context=context)
         if res:
             for vals in res:
-                if context.get('default_file_document_vals'):
-                    vals.update(context['default_file_document_vals'])
+                default = context.get('default_file_document_vals')
+                if default:
+                    for key in default:
+                        if not key in vals:
+                            vals[key] = default[key]
                 created_ids.append(self.create(cr, uid, vals, context=context))
-                print "create message", vals['date']
             return created_ids
         return None
diff --git a/file_document_view.xml b/file_document_view.xml
new file mode 100644
index 00000000..1529e47d
--- /dev/null
+++ b/file_document_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- SEARCH -->
+        <record id="file_document_view_search" model="ir.ui.view">
+            <field name="name">file.document.search</field>
+            <field name="model">file.document</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="file_document.file_document_view_search"/>
+            <field name="arch" type="xml">
+                <field name="ext_id" position="after">
+                    <field name="fetchmail_server_id"/>
+                </field>
+            </field>
+        </record>
+
+
+    </data>
+</openerp>
+