From 1a1e3463023947db05d6c0e9b371e161253d4cbf Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 4 Mar 2010 10:44:58 +0100
Subject: [PATCH 001/248] [IMP] yaml test: init

bzr revid: jth@openerp.com-20100304094458-oru0mdc523veqsbp
---
 bin/addons/__init__.py |   2 +
 bin/netsvc.py          |  12 +-
 bin/tools/__init__.py  |   1 +
 bin/tools/yaml_test.py | 406 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 418 insertions(+), 3 deletions(-)
 create mode 100644 bin/tools/yaml_test.py

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 2910b9fe7c1..ebf0c2fcd05 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -644,6 +644,8 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
                             new_query = ' '.join(query.split())
                             if new_query:
                                 cr.execute(new_query)
+                    elif ext == '.yaml':
+                        tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
                     else:
                         tools.convert_xml_import(cr, m, fp, idref, mode=mode, **kwargs)
                     fp.close()
diff --git a/bin/netsvc.py b/bin/netsvc.py
index d8548db5d6a..eae53826a74 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -127,6 +127,7 @@ class ExportService(object):
 LOG_NOTSET = 'notset'
 LOG_DEBUG_RPC = 'debug_rpc'
 LOG_DEBUG = 'debug'
+LOG_TEST = 'test'
 LOG_INFO = 'info'
 LOG_WARNING = 'warn'
 LOG_ERROR = 'error'
@@ -135,6 +136,9 @@ LOG_CRITICAL = 'critical'
 logging.DEBUG_RPC = logging.DEBUG - 2
 logging.addLevelName(logging.DEBUG_RPC, 'DEBUG_RPC')
 
+logging.TEST = logging.INFO - 5
+logging.addLevelName(logging.TEST, 'TEST')
+
 def init_logger():
     import os
     from tools.translate import resetlocale
@@ -195,6 +199,7 @@ def init_logger():
             'DEBUG_RPC': ('blue', 'white'),
             'DEBUG': ('blue', 'default'),
             'INFO': ('green', 'default'),
+            'TEST': ('white', 'blue'),
             'WARNING': ('yellow', 'default'),
             'ERROR': ('red', 'default'),
             'CRITICAL': ('white', 'red'),
@@ -220,9 +225,10 @@ class Logger(object):
 
         log = logging.getLogger(tools.ustr(name))
 
-        if level == LOG_DEBUG_RPC and not hasattr(log, level):
-            fct = lambda msg, *args, **kwargs: log.log(logging.DEBUG_RPC, msg, *args, **kwargs)
-            setattr(log, LOG_DEBUG_RPC, fct)
+        if level in [LOG_DEBUG_RPC, LOG_TEST] and not hasattr(log, level):
+            fct = lambda msg, *args, **kwargs: log.log(getattr(logging, level.upper()), msg, *args, **kwargs)
+            setattr(log, level, fct)
+
 
         level_method = getattr(log, level)
 
diff --git a/bin/tools/__init__.py b/bin/tools/__init__.py
index 9b7bb84a57f..78c77edf394 100644
--- a/bin/tools/__init__.py
+++ b/bin/tools/__init__.py
@@ -24,6 +24,7 @@ import win32
 from config import *
 from misc import *
 from convert import *
+from yaml_test import *
 from translate import *
 from graph import graph
 from amount_to_text import *
diff --git a/bin/tools/yaml_test.py b/bin/tools/yaml_test.py
new file mode 100644
index 00000000000..52ce059a5fd
--- /dev/null
+++ b/bin/tools/yaml_test.py
@@ -0,0 +1,406 @@
+# -*- encoding: utf-8 -*-
+import types
+import yaml
+import time # used to eval time.strftime expressions
+import logging
+
+import pooler
+import netsvc
+
+from config import config
+
+logger_channel = 'tests'
+
+class YamlImportException(Exception):
+    pass
+
+class YamlImportAbortion(Exception):
+    pass
+
+class YamlTag(object):
+    """Superclass for constructors of custom tags defined in yaml file."""
+
+    def __init__(self, **kwargs):
+        self.__dict__.update(kwargs)
+    def __getitem__(self, key):
+        return getattr(self, key)
+    def __getattr__(self, attr):
+        return None
+    def __repr__(self):
+        return "<%s %s>" % (self.__class__.__name__, sorted(self.__dict__.items()))
+
+class Assert(YamlTag):
+    def __init__(self, model, id, severity=netsvc.LOG_ERROR, string="NONAME", **kwargs):
+        self.model = model
+        self.id = id
+        self.severity = severity
+        self.string = string
+        super(Assert, self).__init__(**kwargs)
+    
+class Record(YamlTag):
+    def __init__(self, model, id, **kwargs):
+        self.model = model
+        self.id = id
+        super(Record, self).__init__(**kwargs)
+    
+class Python(YamlTag):
+    def __init__(self, model, severity=netsvc.LOG_ERROR, name="NONAME", **kwargs):
+        self.model= model
+        self.severity = severity
+        self.name = name
+        super(Python, self).__init__(**kwargs)
+
+class Workflow(YamlTag):
+    def __init__(self, model, action, **kwargs):
+        self.model = model
+        self.action = action
+        super(Workflow, self).__init__(**kwargs)
+
+class Context(YamlTag):
+    def __init__(self, **kwargs):
+        super(Context, self).__init__(**kwargs)
+
+class Eval(YamlTag):
+    def __init__(self, expression):
+        self.expression = expression
+        super(Eval, self).__init__()
+    
+class Ref(YamlTag):
+    def __init__(self, xmlid):
+        self.xmlid = xmlid
+        super(Ref, self).__init__()
+
+def assert_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Assert(**kwargs)
+
+def record_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Record(**kwargs)
+
+def python_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Python(**kwargs)
+
+def workflow_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Workflow(**kwargs)
+
+def context_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Context(**kwargs)
+
+def eval_constructor(loader, node):
+    expression = loader.construct_scalar(node)
+    return Eval(expression)
+    
+def ref_constructor(loader, node):
+    xmlid = loader.construct_scalar(node)
+    return Ref(xmlid)
+        
+yaml.add_constructor(u"!assert", assert_constructor)
+yaml.add_constructor(u"!record", record_constructor)
+yaml.add_constructor(u"!python", python_constructor)
+yaml.add_constructor(u"!workflow", workflow_constructor)
+yaml.add_constructor(u"!context", context_constructor)
+yaml.add_constructor(u"!eval", eval_constructor)
+yaml.add_constructor(u"!ref", ref_constructor)
+
+def _is_yaml_mapping(node, tag_constructor):
+    value = isinstance(node, types.DictionaryType) \
+        and len(node.keys()) == 1 \
+        and isinstance(node.keys()[0], tag_constructor)
+    return value
+
+def is_comment(node):
+    return isinstance(node, types.StringTypes)
+
+def is_assert(node):
+    return _is_yaml_mapping(node, Assert)
+
+def is_record(node):
+    return _is_yaml_mapping(node, Record)
+
+def is_python(node):
+    return _is_yaml_mapping(node, Python)
+
+def is_workflow(node):
+    return isinstance(node, Workflow) \
+        or _is_yaml_mapping(node, Workflow)
+
+def is_context(node):
+    return isinstance(node, Context)
+
+def is_eval(node):
+    return isinstance(node, Eval)
+    
+def is_ref(node):
+    return isinstance(node, Ref)
+
+
+class TestReport(object):
+    def __init__(self):
+        self._report = {}
+
+    def record(self, success, severity):
+        """Records the result of an assertion for the failed/success count.
+           Returns success."""
+
+        if severity in self._report:
+            self._report[severity][success] += 1
+        else:
+            self._report[severity] = {success: 1, not success: 0}
+        return success
+
+    def __str__(self):
+        res = []
+        res.append('\nAssertions report:\nLevel\tsuccess\tfailed')
+        success = failure = 0
+        for severity in self._report:
+            res.append("%s\t%s\t%s" % (severity, self._report[severity][True], self._report[severity][False]))
+            success += self._report[severity][True]
+            failure += self._report[severity][False]
+        res.append("total\t%s\t%s" % (success, failure))
+        res.append("end of report (%s assertion(s) checked)" % success + failure)
+        return "\n".join(res)
+
+
+class YamlInterpreter(object):
+    def __init__(self, cr, module, id_map, mode, filename, noupdate=False):
+        self.cr = cr
+        self.module = module
+        self.id_map = id_map
+        self.mode = mode
+        self.filename = filename
+        self.assert_report = TestReport()
+        self.noupdate = noupdate
+        self.logger = netsvc.Logger()
+        self.pool = pooler.get_pool(cr.dbname)
+        self.uid = 1
+        self.context = {}
+
+    def _ref(self):
+        return lambda xml_id: self.get_id(xml_id)
+
+    def get_model(self, model_name):
+        model = self.pool.get(model_name)
+        assert model, "The model %s does not exist." % (model_name,)
+        return model
+    
+    def validate_xml_id(self, xml_id):
+        id = xml_id
+        if '.' in xml_id:
+            module, id = xml_id.split('.', 1)
+            assert '.' not in id, "The ID reference '%s' must contains maximum one dot.\n" \
+                                  "It is used to refer to other modules ID, in the form: module.record_id" \
+                                  % (xml_id,)
+            if module != self.module:
+                module_count = self.pool.get('ir.module.module').search_count(self.cr, self.uid, \
+                        ['&', ('name', '=', module), ('state', 'in', ['installed'])])
+                assert module_count == 1, """The ID "%s" refers to an uninstalled module""" % (xml_id,)
+        if len(id) > 64: # TODO where does 64 come from (DB is 128)? should be a constant or loaded form DB
+            self.logger.notifyChannel(logger_channel, netsvc.LOG_ERROR, 'id: %s is to long (max: 64)' % (id,))
+
+    def get_id(self, xml_id):
+        if isinstance(xml_id, types.IntType):
+            id = xml_id
+        elif xml_id in self.id_map:
+            id = self.id_map[xml_id]
+        else:
+            if '.' in xml_id:
+                module, xml_id = xml_id.split('.', 1)
+            else:
+                module = self.module
+            ir_id = self.pool.get('ir.model.data')._get_id(self.cr, self.uid, module, xml_id)
+            obj = self.pool.get('ir.model.data').read(self.cr, self.uid, ir_id, ['res_id'])
+            id = int(obj['res_id'])
+            self.id_map[xml_id] = id
+        return id
+    
+    def process_comment(self, node):
+        return node
+
+    def _log_assert_failure(self, severity, msg, *args):
+        self.assert_report.record(False, severity)
+        self.logger.notifyChannel(logger_channel, severity, msg % (args))
+        if getattr(logging, severity.upper()) >= config['assert_exit_level']:
+            raise YamlImportAbortion('Severe assertion failure (%s), aborting.' % (severity,))
+        return
+
+    def _get_assertion_id(self, assertion):
+        if assertion.id:
+            ids = [self.get_id(assertion.id)]
+        elif assertion.search:
+            q = eval(assertion.search, {'ref': self._ref})
+            ids = self.pool.get(assertion.model).search(self.cr, self.uid, q, context=assertion.context)
+        if not ids:
+            raise YamlImportException('Nothing to assert: you must give either an id or a search criteria.')
+        return ids
+
+    def process_assert(self, node):
+        assertion, expressions = node.items()[0]
+
+        model = self.get_model(assertion.model)
+        ids = self._get_assertion_id(assertion)
+        if assertion.count and len(ids) != assertion.count:
+            msg = 'assertion "%s" failed!\n'   \
+                  ' Incorrect search count:\n' \
+                  ' expected count: %d\n'      \
+                  ' obtained count: %d\n'
+            args = (assertion.string, assertion.count, len(ids))
+            self._log_assert_failure(assertion.severity, msg, *args)
+        else:
+            test_context = {'ref': self._ref, '_ref': self._ref} # added '_ref' so that record['ref'] is possible
+            for id in ids:
+                record = model.browse(self.cr, self.uid, id, assertion.context)
+                for test in expressions.get('test', ''):
+                    success = eval(test, test_context, record)
+                    if not success:
+                        msg = 'Assertion "%s" FAILED\ntest: %s\n'
+                        args = (assertion.string, test)
+                        self._log_assert_failure(assertion.severity, msg, *args)
+                        return
+            else: # all tests were successful for this assertion tag (no break)
+                self.assert_report.record(True, assertion.severity)
+
+    def process_record(self, node):
+        record, fields = node.items()[0]
+
+        self.validate_xml_id(record.id)
+        model = self.get_model(record.model)
+        record_dict = self._create_record(model, fields)
+        id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
+                self.module, record_dict, record.id, mode=self.mode)
+        self.id_map[record.id] = int(id)
+        if config.get('import_partial', False):
+            self.cr.commit()
+    
+    def _create_record(self, model, fields):
+        record_dict = {}
+        for field_name, expression in fields.items():
+            field_value = self._eval_field(model, field_name, expression)
+            record_dict[field_name] = field_value
+        return record_dict        
+    
+    def _eval_field(self, model, field_name, expression):
+        column = model._columns[field_name]
+        if column._type == "many2one":
+            value = self.get_id(expression)
+        elif column._type == "one2many":
+            other_model = self.get_model(column._obj)
+            value = [(0, 0, self._create_record(other_model, fields)) for fields in expression]
+        elif column._type == "many2many":
+            ids = [self.get_id(xml_id) for xml_id in expression]
+            value= [(6, 0, ids)]
+        else: # scalar field
+            if isinstance(expression, Eval):
+                value = eval(expression.expression)
+            else:
+                value = expression
+            # raise YamlImportException('Unsupported column "%s" or value %s:%s' % (field_name, type(expression), expression))
+        return value
+    
+    def process_context(self, node):
+        self.context = node.__dict__
+        if 'uid' in node.__dict__:
+            self.uid = self.get_id(node.__dict__['uid'])
+    
+    def process_python(self, node):
+        def log(msg):
+            self.logger.notifyChannel(logger_channel, netsvc.LOG_TEST, msg)
+        python, statements = node.items()[0]
+        model = self.get_model(python.model)
+        statements = statements.replace("\r\n", "\n").replace("\n", ";")
+        code_context = {'self': model, 'cr': self.cr, 'uid': self.uid, 'log': log, 'context': self.context}
+        try:
+            code = compile(statements, self.filename, 'exec')
+            eval(code, code_context)
+        except Exception, e:
+            raise YamlImportException(e)
+        # TODO log success/failure
+    
+    def process_workflow(self, node):
+        workflow, values = node.items()[0]
+        model = self.get_model(workflow.model)
+        if workflow.ref:
+            id = self.get_id(workflow.ref)
+        else:
+            if not values:
+                raise YamlImportException('You must define a child node if you do not give a ref.')
+            if not len(values) == 1:
+                raise YamlImportException('Only one child node is accepted (%d given).' % len(values))
+            value = values[0]
+            if not 'model' in value and not 'eval' in value:
+                raise YamlImportException('You must provide a model and an expression to evaluate for the workflow.')
+            value_model = self.get_model(value['model'])
+            local_context = {'ref': self._ref, '_ref': self._ref}
+            local_context['obj'] = lambda x: value_model.browse(self.cr, self.uid, x, context=self.context)
+            local_context.update(self.id_map)
+            id = eval(value['eval'], local_context)
+        
+        if workflow.uid is not None:
+            uid = workflow.uid
+        else:
+            uid = self.uid
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, model, id, workflow.action, self.cr)
+    
+    def process(self, yaml_string):
+        """Processes a Yaml string. Custom tags are interpreted by 'process_' instance methods."""
+        
+        is_preceded_by_comment = False
+        for node in yaml.load(yaml_string):
+            is_preceded_by_comment = self._log(node, is_preceded_by_comment)
+            try:
+                self._process_node(node)
+            except YamlImportException, e:
+                self.logger.notifyChannel(logger_channel, netsvc.LOG_ERROR, e)
+            except YamlImportAbortion, e:
+                self.logger.notifyChannel(logger_channel, netsvc.LOG_ERROR, e)
+                return
+    
+    def _process_node(self, node):
+        if is_comment(node):
+            self.process_comment(node)
+        elif is_assert(node):
+            self.process_assert(node)
+        elif is_record(node):
+            self.process_record(node)
+        elif is_python(node):
+            self.process_python(node)
+        elif is_context(node):
+            self.process_context(node)
+        elif is_workflow(node):
+            if isinstance(node, types.DictionaryType):
+                self.process_workflow(node)
+            else:
+                self.process_workflow({node: []})
+        else:
+            raise YamlImportException("Can not process YAML block: %s" % node)
+    
+    def _log(self, node, is_preceded_by_comment):
+        if is_comment(node):
+            is_preceded_by_comment = True
+            self.logger.notifyChannel(logger_channel, netsvc.LOG_TEST, node)
+        elif not is_preceded_by_comment:
+            if isinstance(node, types.DictionaryType):
+                k, v = node.items()[0]
+                msg = "Creating %s\n with %s" % (k, v)
+                self.logger.notifyChannel(logger_channel, netsvc.LOG_TEST, msg)
+            else:
+                self.logger.notifyChannel(logger_channel, netsvc.LOG_TEST, node)
+        else:
+            is_preceded_by_comment = False
+        return is_preceded_by_comment
+
+def yaml_import(cr, module, yamlfile, idref=None, mode='init', noupdate=False, report=None):
+    if idref is None:
+        idref = {}
+    yaml_string = yamlfile.read()
+    yaml_interpreter = YamlInterpreter(cr, module, idref, mode, filename=yamlfile.name, noupdate=noupdate)
+    yaml_interpreter.process(yaml_string)
+
+# keeps convention of convert.py
+convert_yaml_import = yaml_import
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From b8b60d44363c0062e0588178dc02d641baacb5e3 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 4 Mar 2010 11:03:55 +0100
Subject: [PATCH 002/248] [FIX] YAML files have '.yml' extension, not '.yaml'

bzr revid: jth@openerp.com-20100304100355-0je51f1c0261b25u
---
 bin/addons/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index ebf0c2fcd05..8137a7fecbb 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -644,7 +644,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
                             new_query = ' '.join(query.split())
                             if new_query:
                                 cr.execute(new_query)
-                    elif ext == '.yaml':
+                    elif ext == '.yml':
                         tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
                     else:
                         tools.convert_xml_import(cr, m, fp, idref, mode=mode, **kwargs)

From b8ebcf689bb31ca3cbefbd954c9d742c0a59c4e0 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 4 Mar 2010 16:41:59 +0100
Subject: [PATCH 003/248] [IMP] Record python block success in assertion
 report.

bzr revid: jth@openerp.com-20100304154159-m1i6zuqsvg08s1vi
---
 bin/tools/yaml_test.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/tools/yaml_test.py b/bin/tools/yaml_test.py
index 52ce059a5fd..b91e457791e 100644
--- a/bin/tools/yaml_test.py
+++ b/bin/tools/yaml_test.py
@@ -315,9 +315,15 @@ class YamlInterpreter(object):
         try:
             code = compile(statements, self.filename, 'exec')
             eval(code, code_context)
+        except AssertionError, e:
+            msg = 'Assertion "%s" FAILED in Python code.'
+            args = (python.name,)
+            self._log_assert_failure(python.severity, msg, *args)
+            return
         except Exception, e:
-            raise YamlImportException(e)
-        # TODO log success/failure
+            raise YamlImportAbortion(e)
+        else:
+            self.assert_report.record(True, python.severity)
     
     def process_workflow(self, node):
         workflow, values = node.items()[0]

From af48a29843cabc84880e3fdbd35dd7360a0d8ff1 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Fri, 5 Mar 2010 10:12:18 +0100
Subject: [PATCH 004/248] [IMP] Added more syntax.

bzr revid: jth@openerp.com-20100305091218-2t25717pfnw6iie8
---
 bin/tools/yaml_test.py | 284 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 279 insertions(+), 5 deletions(-)

diff --git a/bin/tools/yaml_test.py b/bin/tools/yaml_test.py
index b91e457791e..5cee9b92d5e 100644
--- a/bin/tools/yaml_test.py
+++ b/bin/tools/yaml_test.py
@@ -50,16 +50,45 @@ class Python(YamlTag):
         self.name = name
         super(Python, self).__init__(**kwargs)
 
+class Menuitem(YamlTag):
+    def __init__(self, id, name, **kwargs):
+        self.id = id
+        self.name = name
+        super(Menuitem, self).__init__(**kwargs)
+
 class Workflow(YamlTag):
     def __init__(self, model, action, **kwargs):
         self.model = model
         self.action = action
         super(Workflow, self).__init__(**kwargs)
 
+class ActWindow(YamlTag):
+    def __init__(self, model, action, **kwargs):
+        self.model = model
+        self.action = action
+        super(Workflow, self).__init__(**kwargs)
+
+class Function(YamlTag):
+    def __init__(self, model, name, **kwargs):
+        self.model = model
+        self.name = name
+        super(Function, self).__init__(**kwargs)
+
+class Delete(YamlTag):
+    def __init__(self, model, id, search, **kwargs):
+        self.model = model
+        self.id = id
+        self.search = search
+        super(Delete, self).__init__(**kwargs)
+
 class Context(YamlTag):
     def __init__(self, **kwargs):
         super(Context, self).__init__(**kwargs)
 
+class Url(YamlTag):
+    def __init__(self, **kwargs):
+        super(Url, self).__init__(**kwargs)
+
 class Eval(YamlTag):
     def __init__(self, expression):
         self.expression = expression
@@ -82,14 +111,34 @@ def python_constructor(loader, node):
     kwargs = loader.construct_mapping(node)
     return Python(**kwargs)
 
+def menuitem_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Menuitem(**kwargs)
+
 def workflow_constructor(loader, node):
     kwargs = loader.construct_mapping(node)
     return Workflow(**kwargs)
 
+def act_window_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return ActWindow(**kwargs)
+
+def function_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Function(**kwargs)
+
+def delete_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Delete(**kwargs)
+
 def context_constructor(loader, node):
     kwargs = loader.construct_mapping(node)
     return Context(**kwargs)
 
+def url_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Url(**kwargs)
+
 def eval_constructor(loader, node):
     expression = loader.construct_scalar(node)
     return Eval(expression)
@@ -101,8 +150,13 @@ def ref_constructor(loader, node):
 yaml.add_constructor(u"!assert", assert_constructor)
 yaml.add_constructor(u"!record", record_constructor)
 yaml.add_constructor(u"!python", python_constructor)
+yaml.add_constructor(u"!menuitem", menuitem_constructor)
 yaml.add_constructor(u"!workflow", workflow_constructor)
+yaml.add_constructor(u"!act_window", act_window_constructor)
+yaml.add_constructor(u"!function", function_constructor)
 yaml.add_constructor(u"!context", context_constructor)
+yaml.add_constructor(u"!delete", delete_constructor)
+yaml.add_constructor(u"!url", url_constructor)
 yaml.add_constructor(u"!eval", eval_constructor)
 yaml.add_constructor(u"!ref", ref_constructor)
 
@@ -124,13 +178,29 @@ def is_record(node):
 def is_python(node):
     return _is_yaml_mapping(node, Python)
 
+def is_menuitem(node):
+    return isinstance(node, Menuitem) \
+        or _is_yaml_mapping(node, Menuitem)
+
+def is_function(node):
+    return isinstance(node, Function) \
+        or _is_yaml_mapping(node, Function)
+
 def is_workflow(node):
-    return isinstance(node, Workflow) \
-        or _is_yaml_mapping(node, Workflow)
+    return isinstance(node, Workflow)
+
+def is_act_window(node):
+    return isinstance(node, ActWindow)
+
+def is_delete(node):
+    return isinstance(node, Delete)
 
 def is_context(node):
     return isinstance(node, Context)
 
+def is_url(node):
+    return isinstance(node, Url)
+
 def is_eval(node):
     return isinstance(node, Eval)
     
@@ -154,7 +224,7 @@ class TestReport(object):
 
     def __str__(self):
         res = []
-        res.append('\nAssertions report:\nLevel\tsuccess\tfailed')
+        res.append('\nAssertions report:\nLevel\tsuccess\tfailure')
         success = failure = 0
         for severity in self._report:
             res.append("%s\t%s\t%s" % (severity, self._report[severity][True], self._report[severity][False]))
@@ -217,6 +287,12 @@ class YamlInterpreter(object):
             self.id_map[xml_id] = id
         return id
     
+    def get_context(self, node, locals_dict):
+        context = self.context.copy()
+        if node.context:
+            context.update(eval(node.context, locals_dict))
+        return context
+    
     def process_comment(self, node):
         return node
 
@@ -336,8 +412,8 @@ class YamlInterpreter(object):
             if not len(values) == 1:
                 raise YamlImportException('Only one child node is accepted (%d given).' % len(values))
             value = values[0]
-            if not 'model' in value and not 'eval' in value:
-                raise YamlImportException('You must provide a model and an expression to evaluate for the workflow.')
+            if not 'model' in value and (not 'eval' in value or not 'search' in value):
+                raise YamlImportException('You must provide a "model" and an "eval" or "search" to evaluate.')
             value_model = self.get_model(value['model'])
             local_context = {'ref': self._ref, '_ref': self._ref}
             local_context['obj'] = lambda x: value_model.browse(self.cr, self.uid, x, context=self.context)
@@ -350,7 +426,192 @@ class YamlInterpreter(object):
             uid = self.uid
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, model, id, workflow.action, self.cr)
+        
+    def process_function(self, node):
+        if self.mode != 'init':
+            return
+        function, values = node.items()[0]
+        local_context = {'ref': self._ref, '_ref': self._ref}
+        context = self.get_context(node, local_context)
+        args = []
+        if function.eval:
+            args = eval(function.eval, local_context)
+        for value in values:
+            if not 'model' in value and (not 'eval' in value or not 'search' in value):
+                raise YamlImportException('You must provide a "model" and an "eval" or "search" to evaluate.')
+            value_model = self.get_model(value['model'])
+            local_context = {'ref': self._ref, '_ref': self._ref}
+            local_context['obj'] = lambda x: value_model.browse(self.cr, self.uid, x, context=context)
+            local_context.update(self.id_map)
+            id = eval(value['eval'], local_context)
+            if id != None:
+                args.append(id)
+        model = self.get_model(function.model)
+        method = function.name
+        getattr(model, method)(self.cr, self.uid, *args)
     
+    def _set_group_values(self, node, values):
+        if node.groups:
+            group_names = node.groups.split(',')
+            groups_value = []
+            for group in group_names:
+                if group.startswith('-'):
+                    group_id = self.get_id(group[1:])
+                    groups_value.append((3, group_id))
+                else:
+                    group_id = self.get_id(group)
+                    groups_value.append((4, group_id))
+            values['groups_id'] = groups_value
+
+    def process_menuitem(self, node):
+        self.validate_xml_id(node.id)
+
+        if not node.parent:
+            parent_id = False
+            self.cr.execute('select id from ir_ui_menu where parent_id is null and name=%s', (node.name,))
+            res = self.cr.fetchone()
+            values = {'parent_id': parent_id, 'name': node.name}
+        else:
+            parent_id = self.get_id(node.parent)
+            values = {'parent_id': parent_id}
+            if node.name:
+                values['name'] = node.name
+            try:
+                res = [ self.get_id(node.id) ]
+            except: # which exception ?
+                res = None
+
+        if node.action:
+            action_type = node.type or 'act_window'
+            icons = {
+                "act_window": 'STOCK_NEW',
+                "report.xml": 'STOCK_PASTE',
+                "wizard": 'STOCK_EXECUTE',
+                "url": 'STOCK_JUMP_TO',
+            }
+            values['icon'] = icons.get(action_type, 'STOCK_NEW')
+            if action_type == 'act_window':
+                action_id = self.get_id(node.action)
+                self.cr.execute('select view_type,view_mode,name,view_id,target from ir_act_window where id=%s', (action_id,))
+                ir_act_window_result = self.cr.fetchone()
+                assert ir_act_window_result, "No window action defined for this id %s !\n" \
+                        "Verify that this is a window action or add a type argument." % (node.action,)
+                action_type, action_mode, action_name, view_id, target = ir_act_window_result
+                if view_id:
+                    self.cr.execute('SELECT type FROM ir_ui_view WHERE id=%s', (view_id,))
+                    # TODO guess why action_mode is ir_act_window.view_mode above and ir_ui_view.type here
+                    action_mode = self.cr.fetchone()
+                self.cr.execute('SELECT view_mode FROM ir_act_window_view WHERE act_window_id=%s ORDER BY sequence LIMIT 1', (action_id,))
+                if self.cr.rowcount:
+                    action_mode = self.cr.fetchone()
+                if action_type == 'tree':
+                    values['icon'] = 'STOCK_INDENT'
+                elif action_mode and action_mode.startswith('tree'):
+                    values['icon'] = 'STOCK_JUSTIFY_FILL'
+                elif action_mode and action_mode.startswith('graph'):
+                    values['icon'] = 'terp-graph'
+                elif action_mode and action_mode.startswith('calendar'):
+                    values['icon'] = 'terp-calendar'
+                if target == 'new':
+                    values['icon'] = 'STOCK_EXECUTE'
+                if not values.get('name', False):
+                    values['name'] = action_name
+            elif action_type == 'wizard':
+                action_id = self.get_id(node.action)
+                self.cr.execute('select name from ir_act_wizard where id=%s', (action_id,))
+                ir_act_wizard_result = self.cr.fetchone()
+                if (not values.get('name', False)) and ir_act_wizard_result:
+                    values['name'] = ir_act_wizard_result[0]
+            else:
+                raise YamlImportException("Unsupported type '%s' in menuitem tag." % action_type)
+        if node.sequence:
+            values['sequence'] = node.sequence
+        if node.icon:
+            values['icon'] = node.icon
+
+        self._set_group_values(node, values)
+        
+        pid = self.pool.get('ir.model.data')._update(self.cr, self.uid, \
+                'ir.ui.menu', self.module, values, node.id, mode=self.mode, \
+                res_id=res and res[0] or False)
+
+        if node.id and parent_id:
+            self.id_map[node.id] = int(parent_id)
+
+        if node.action and pid:
+            action_type = node.type or 'act_window'
+            action_id = self.get_id(node.action)
+            action = "ir.actions.%s,%d" % (action_type, action_id)
+            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', \
+                    'tree_but_open', 'Menuitem', [('ir.ui.menu', int(parent_id))], action, True, True, xml_id=node.id)
+
+    def process_act_window(self, node):
+        self.validate_xml_id(node.id)
+        view_id = False
+        if node.view:
+            view_id = self.get_id(node.view)
+        context = eval(node.context, {'ref': self._ref, '_ref': self._ref})
+
+        values = {
+            'name': node.name,
+            'type': type or 'ir.actions.act_window',
+            'view_id': view_id,
+            'domain': node.domain,
+            'context': context,
+            'res_model': node.res_model,
+            'src_model': node.src_model,
+            'view_type': node.view_type or 'form',
+            'view_mode': node.view_mode or 'tree,form',
+            'usage': node.usage,
+            'limit': node.limit,
+            'auto_refresh': node.auto_refresh,
+        }
+
+        self._set_group_values(node, values)
+
+        if node.target:
+            values['target'] = node.target
+        id = self.pool.get('ir.model.data')._update(self.cr, self.uid, \
+                'ir.actions.act_window', self.module, values, node.id, mode=self.mode)
+        self.id_map[node.id] = int(id)
+
+        if node.src_model:
+            keyword = 'client_action_relate'
+            value = 'ir.actions.act_window,%s' % id
+            replace = node.replace or True
+            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', \
+                    keyword, node.id, [node.src_model], value, replace=replace, isobject=True, xml_id=node.id)
+        # TODO add remove ir.model.data
+
+    def process_delete(self, node):
+        ids = []
+        if len(node.search):
+            ids = self.pool.get(node.model).search(self.cr, self.uid, eval(node.search))
+        if len(node.id):
+            try:
+                ids.append(self.get_id(node.id))
+            except:
+                pass
+        if len(ids):
+            self.pool.get(node.model).unlink(self.cr, self.uid, ids)
+            self.pool.get('ir.model.data')._unlink(self.cr, self.uid, node.model, ids, direct=True)
+    
+    def process_url(self, node):
+        self.validate_xml_id(node.id)
+
+        res = {'name': node.name, 'url': node.url, 'target': node.target}
+
+        id = self.pool.get('ir.model.data')._update(self.cr, self.uid, \
+                "ir.actions.url", self.module, res, node.id, mode=self.mode)
+        self.id_map[node.id] = int(id)
+        # ir_set
+        if (not node.menu or eval(node.menu)) and id:
+            keyword = node.keyword or 'client_action_multi'
+            value = 'ir.actions.url,%s' % id
+            replace = node.replace or True
+            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, \
+                    'action', keyword, node.url, ["ir.actions.url"], value, replace=replace, isobject=True, xml_id=node.id)
+
     def process(self, yaml_string):
         """Processes a Yaml string. Custom tags are interpreted by 'process_' instance methods."""
         
@@ -374,13 +635,26 @@ class YamlInterpreter(object):
             self.process_record(node)
         elif is_python(node):
             self.process_python(node)
+        elif is_menuitem(node):
+            self.process_menuitem(node)
+        elif is_delete(node):
+            self.process_delete(node)
+        elif is_url(node):
+            self.process_url(node)
         elif is_context(node):
             self.process_context(node)
+        elif is_act_window(node):
+            self.process_act_window(node)
         elif is_workflow(node):
             if isinstance(node, types.DictionaryType):
                 self.process_workflow(node)
             else:
                 self.process_workflow({node: []})
+        elif is_function(node):
+            if isinstance(node, types.DictionaryType):
+                self.process_function(node)
+            else:
+                self.process_function({node: []})
         else:
             raise YamlImportException("Can not process YAML block: %s" % node)
     

From 2b3611cb376cd49c57243e74387b0facedd4f537 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Fri, 5 Mar 2010 10:37:22 +0100
Subject: [PATCH 005/248] [IMP] Added ir_set. [FIX] ActWindow __init__

bzr revid: jth@openerp.com-20100305093722-t1ndcr0v8preofkw
---
 bin/tools/yaml_test.py | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/bin/tools/yaml_test.py b/bin/tools/yaml_test.py
index 5cee9b92d5e..442370ab5dc 100644
--- a/bin/tools/yaml_test.py
+++ b/bin/tools/yaml_test.py
@@ -66,7 +66,7 @@ class ActWindow(YamlTag):
     def __init__(self, model, action, **kwargs):
         self.model = model
         self.action = action
-        super(Workflow, self).__init__(**kwargs)
+        super(ActWindow, self).__init__(**kwargs)
 
 class Function(YamlTag):
     def __init__(self, model, name, **kwargs):
@@ -94,10 +94,9 @@ class Eval(YamlTag):
         self.expression = expression
         super(Eval, self).__init__()
     
-class Ref(YamlTag):
-    def __init__(self, xmlid):
-        self.xmlid = xmlid
-        super(Ref, self).__init__()
+class IrSet(YamlTag):
+    def __init__(self):
+        super(IrSet, self).__init__()
 
 def assert_constructor(loader, node):
     kwargs = loader.construct_mapping(node)
@@ -143,9 +142,9 @@ def eval_constructor(loader, node):
     expression = loader.construct_scalar(node)
     return Eval(expression)
     
-def ref_constructor(loader, node):
-    xmlid = loader.construct_scalar(node)
-    return Ref(xmlid)
+def ir_set_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return IrSet(**kwargs)
         
 yaml.add_constructor(u"!assert", assert_constructor)
 yaml.add_constructor(u"!record", record_constructor)
@@ -158,7 +157,7 @@ yaml.add_constructor(u"!context", context_constructor)
 yaml.add_constructor(u"!delete", delete_constructor)
 yaml.add_constructor(u"!url", url_constructor)
 yaml.add_constructor(u"!eval", eval_constructor)
-yaml.add_constructor(u"!ref", ref_constructor)
+yaml.add_constructor(u"!ir_set", ir_set_constructor)
 
 def _is_yaml_mapping(node, tag_constructor):
     value = isinstance(node, types.DictionaryType) \
@@ -204,8 +203,8 @@ def is_url(node):
 def is_eval(node):
     return isinstance(node, Eval)
     
-def is_ref(node):
-    return isinstance(node, Ref)
+def is_ir_set(node):
+    return _is_yaml_mapping(node, IrSet)
 
 
 class TestReport(object):
@@ -611,6 +610,21 @@ class YamlInterpreter(object):
             replace = node.replace or True
             self.pool.get('ir.model.data').ir_set(self.cr, self.uid, \
                     'action', keyword, node.url, ["ir.actions.url"], value, replace=replace, isobject=True, xml_id=node.id)
+    
+    def process_ir_set(self, node):
+        if not self.mode == 'init':
+            return False
+        _, fields = node.items()[0]
+        res = {}
+        for fieldname, expression in fields.items():
+            if isinstance(expression, Eval):
+                value = eval(expression.expression, {'ref': self._ref, '_ref': self._ref})
+            else:
+                value = expression
+            res[fieldname] = value
+        self.pool.get('ir.model.data').ir_set(self.cr, self.uid, res['key'], res['key2'], \
+                res['name'], res['models'], res['value'], replace=res.get('replace',True), \
+                isobject=res.get('isobject', False), meta=res.get('meta',None))
 
     def process(self, yaml_string):
         """Processes a Yaml string. Custom tags are interpreted by 'process_' instance methods."""
@@ -643,6 +657,8 @@ class YamlInterpreter(object):
             self.process_url(node)
         elif is_context(node):
             self.process_context(node)
+        elif is_ir_set(node):
+            self.process_ir_set(node)
         elif is_act_window(node):
             self.process_act_window(node)
         elif is_workflow(node):

From 88635654ce8aa65af2e0d311178c356dd8e2cd42 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Fri, 5 Mar 2010 11:05:37 +0100
Subject: [PATCH 006/248] [FIX] fixed missing isnoupdate and get_context

bzr revid: jth@openerp.com-20100305100537-fnf2dkkylpylrwhq
---
 bin/tools/yaml_test.py | 46 +++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/bin/tools/yaml_test.py b/bin/tools/yaml_test.py
index 442370ab5dc..d284824e1c1 100644
--- a/bin/tools/yaml_test.py
+++ b/bin/tools/yaml_test.py
@@ -291,6 +291,9 @@ class YamlInterpreter(object):
         if node.context:
             context.update(eval(node.context, locals_dict))
         return context
+
+    def isnoupdate(self, node):
+        return self.noupdate or node.noupdate or False
     
     def process_comment(self, node):
         return node
@@ -315,6 +318,8 @@ class YamlInterpreter(object):
     def process_assert(self, node):
         assertion, expressions = node.items()[0]
 
+        if self.isnoupdate(assertion) and self.mode != 'init':
+            return
         model = self.get_model(assertion.model)
         ids = self._get_assertion_id(assertion)
         if assertion.count and len(ids) != assertion.count:
@@ -325,11 +330,12 @@ class YamlInterpreter(object):
             args = (assertion.string, assertion.count, len(ids))
             self._log_assert_failure(assertion.severity, msg, *args)
         else:
-            test_context = {'ref': self._ref, '_ref': self._ref} # added '_ref' so that record['ref'] is possible
+            local_context = {'ref': self._ref, '_ref': self._ref} # added '_ref' so that record['ref'] is possible
+            context = self.get_context(assertion, local_context)
             for id in ids:
-                record = model.browse(self.cr, self.uid, id, assertion.context)
+                record = model.browse(self.cr, self.uid, id, context)
                 for test in expressions.get('test', ''):
-                    success = eval(test, test_context, record)
+                    success = eval(test, local_context, record)
                     if not success:
                         msg = 'Assertion "%s" FAILED\ntest: %s\n'
                         args = (assertion.string, test)
@@ -342,13 +348,14 @@ class YamlInterpreter(object):
         record, fields = node.items()[0]
 
         self.validate_xml_id(record.id)
-        model = self.get_model(record.model)
-        record_dict = self._create_record(model, fields)
-        id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
-                self.module, record_dict, record.id, mode=self.mode)
-        self.id_map[record.id] = int(id)
-        if config.get('import_partial', False):
-            self.cr.commit()
+        if self.isnoupdate(record) and self.mode != 'init':
+            model = self.get_model(record.model)
+            record_dict = self._create_record(model, fields)
+            id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
+                    self.module, record_dict, record.id, noupdate=self.isnoupdate(node), mode=self.mode)
+            self.id_map[record.id] = int(id)
+            if config.get('import_partial', False):
+                self.cr.commit()
     
     def _create_record(self, model, fields):
         record_dict = {}
@@ -402,6 +409,8 @@ class YamlInterpreter(object):
     
     def process_workflow(self, node):
         workflow, values = node.items()[0]
+        if self.isnoupdate(workflow) and self.mode != 'init':
+            return
         model = self.get_model(workflow.model)
         if workflow.ref:
             id = self.get_id(workflow.ref)
@@ -427,11 +436,11 @@ class YamlInterpreter(object):
         wf_service.trg_validate(uid, model, id, workflow.action, self.cr)
         
     def process_function(self, node):
-        if self.mode != 'init':
-            return
         function, values = node.items()[0]
+        if self.isnoupdate(function) and self.mode != 'init':
+            return
         local_context = {'ref': self._ref, '_ref': self._ref}
-        context = self.get_context(node, local_context)
+        context = self.get_context(function, local_context)
         args = []
         if function.eval:
             args = eval(function.eval, local_context)
@@ -532,7 +541,7 @@ class YamlInterpreter(object):
         
         pid = self.pool.get('ir.model.data')._update(self.cr, self.uid, \
                 'ir.ui.menu', self.module, values, node.id, mode=self.mode, \
-                res_id=res and res[0] or False)
+                noupdate=self.isnoupdate(node), res_id=res and res[0] or False)
 
         if node.id and parent_id:
             self.id_map[node.id] = int(parent_id)
@@ -578,8 +587,8 @@ class YamlInterpreter(object):
             keyword = 'client_action_relate'
             value = 'ir.actions.act_window,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', \
-                    keyword, node.id, [node.src_model], value, replace=replace, isobject=True, xml_id=node.id)
+            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', keyword, \
+                    node.id, [node.src_model], value, replace=replace, noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
         # TODO add remove ir.model.data
 
     def process_delete(self, node):
@@ -608,8 +617,9 @@ class YamlInterpreter(object):
             keyword = node.keyword or 'client_action_multi'
             value = 'ir.actions.url,%s' % id
             replace = node.replace or True
-            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, \
-                    'action', keyword, node.url, ["ir.actions.url"], value, replace=replace, isobject=True, xml_id=node.id)
+            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', \
+                    keyword, node.url, ["ir.actions.url"], value, replace=replace, \
+                    noupdate=self.isnoupdate(node), isobject=True, xml_id=node.id)
     
     def process_ir_set(self, node):
         if not self.mode == 'init':

From c51be2604d770f2feaf9bbfbe7834c3168551dc7 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Fri, 5 Mar 2010 11:42:04 +0100
Subject: [PATCH 007/248] [IMP] Added report tag.

bzr revid: jth@openerp.com-20100305104204-yg9ees4miw0hunjs
---
 bin/tools/yaml_test.py | 50 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/bin/tools/yaml_test.py b/bin/tools/yaml_test.py
index d284824e1c1..65bf16475c3 100644
--- a/bin/tools/yaml_test.py
+++ b/bin/tools/yaml_test.py
@@ -6,6 +6,7 @@ import logging
 
 import pooler
 import netsvc
+import misc
 
 from config import config
 
@@ -74,6 +75,13 @@ class Function(YamlTag):
         self.name = name
         super(Function, self).__init__(**kwargs)
 
+class Report(YamlTag):
+    def __init__(self, model, name, string, **kwargs):
+        self.model = model
+        self.name = name
+        self.string = string
+        super(Function, self).__init__(**kwargs)
+
 class Delete(YamlTag):
     def __init__(self, model, id, search, **kwargs):
         self.model = model
@@ -126,6 +134,10 @@ def function_constructor(loader, node):
     kwargs = loader.construct_mapping(node)
     return Function(**kwargs)
 
+def report_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Report(**kwargs)
+
 def delete_constructor(loader, node):
     kwargs = loader.construct_mapping(node)
     return Delete(**kwargs)
@@ -153,6 +165,7 @@ yaml.add_constructor(u"!menuitem", menuitem_constructor)
 yaml.add_constructor(u"!workflow", workflow_constructor)
 yaml.add_constructor(u"!act_window", act_window_constructor)
 yaml.add_constructor(u"!function", function_constructor)
+yaml.add_constructor(u"!report", report_constructor)
 yaml.add_constructor(u"!context", context_constructor)
 yaml.add_constructor(u"!delete", delete_constructor)
 yaml.add_constructor(u"!url", url_constructor)
@@ -185,6 +198,9 @@ def is_function(node):
     return isinstance(node, Function) \
         or _is_yaml_mapping(node, Function)
 
+def is_report(node):
+    return isinstance(node, Report)
+
 def is_workflow(node):
     return isinstance(node, Workflow)
 
@@ -636,6 +652,38 @@ class YamlInterpreter(object):
                 res['name'], res['models'], res['value'], replace=res.get('replace',True), \
                 isobject=res.get('isobject', False), meta=res.get('meta',None))
 
+    def process_report(self, node):
+        values = {}
+        for dest, f in (('name','string'), ('model','model'), ('report_name','name')):
+            values[dest] = getattr(node, f)
+            assert values[dest], "Attribute %s of report is empty !" % (f,)
+        for field,dest in (('rml','report_rml'),('xml','report_xml'),('xsl','report_xsl'),('attachment','attachment'),('attachment_use','attachment_use')):
+            if getattr(node, field):
+                values[dest] = getattr(node, field)
+        if node.auto:
+            values['auto'] = eval(node.auto)
+        if node.sxw:
+            sxw_content = misc.file_open(node.sxw).read()
+            values['report_sxw_content'] = sxw_content
+        if node.header:
+            values['header'] = eval(node.header)
+        values['multi'] = node.multi and eval(node.multi)
+        xml_id = node.id
+        self.validate_xml_id(xml_id)
+
+        self._set_group_values(node, values)
+
+        id = self.pool.get('ir.model.data')._update(self.cr, self.uid, "ir.actions.report.xml", \
+                self.module, values, xml_id, noupdate=self.isnoupdate(node), mode=self.mode)
+        self.id_map[xml_id] = int(id)
+
+        if not node.menu or eval(node.menu):
+            keyword = node.keyword or 'client_print_multi'
+            value = 'ir.actions.report.xml,%s' % id
+            replace = node.replace or True
+            self.pool.get('ir.model.data').ir_set(self.cr, self.uid, 'action', \
+                    keyword, values['name'], [values['model']], value, replace=replace, isobject=True, xml_id=xml_id)
+
     def process(self, yaml_string):
         """Processes a Yaml string. Custom tags are interpreted by 'process_' instance methods."""
         
@@ -671,6 +719,8 @@ class YamlInterpreter(object):
             self.process_ir_set(node)
         elif is_act_window(node):
             self.process_act_window(node)
+        elif is_report(node):
+            self.process_report(node)
         elif is_workflow(node):
             if isinstance(node, types.DictionaryType):
                 self.process_workflow(node)

From 83d7ae2d21b8255ec8d4844b06ba1e56ae2fbda3 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Fri, 5 Mar 2010 12:01:28 +0100
Subject: [PATCH 008/248] [FIX] fixde Report __init__

bzr revid: jth@openerp.com-20100305110128-689067jl31nxy547
---
 bin/tools/yaml_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/yaml_test.py b/bin/tools/yaml_test.py
index 65bf16475c3..b495989991a 100644
--- a/bin/tools/yaml_test.py
+++ b/bin/tools/yaml_test.py
@@ -80,7 +80,7 @@ class Report(YamlTag):
         self.model = model
         self.name = name
         self.string = string
-        super(Function, self).__init__(**kwargs)
+        super(Report, self).__init__(**kwargs)
 
 class Delete(YamlTag):
     def __init__(self, model, id, search, **kwargs):

From 13096f9058afd91562afe21d85259a171eaee482 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 15 Mar 2010 16:22:27 +0530
Subject: [PATCH 009/248] [IMP] survey :- improve codeing

bzr revid: ysa@tinyerp.co.in-20100315105227-2bbiri6v06wqao8a
---
 addons/document/std_index.py |   4 +-
 addons/survey/survey.py      | 307 +++++++++++++++++++++++++----------
 2 files changed, 222 insertions(+), 89 deletions(-)

diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index b54ff396480..2d1fd2d7460 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -55,7 +55,7 @@ class PptIndex(indexer):
         return [ 'application/ms-word']
     
     def _getExtensions(self):
-        return ['.ppt','.pptx']
+        return ['.ppt']
 
     def _doIndexFile(self,fname):
         fp = Popen(['ppthtml', fname], shell=False, stdout=PIPE).stdout
@@ -68,7 +68,7 @@ class DocIndex(indexer):
         return [ 'application/ms-word']
     
     def _getExtensions(self):
-        return ['.doc','.docx']
+        return ['.doc']
 
     def _doIndexFile(self,fname):
         fp = Popen(['antiword', fname], shell=False, stdout=PIPE).stdout
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 101e1c563d3..555db5439ba 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -132,7 +132,7 @@ class survey_page(osv.osv):
 
     def default_get(self, cr, uid, fields, context={}):
         data = super(survey_page, self).default_get(cr, uid, fields, context)
-        if context.has_key('line_order') and context['line_order']:
+        if context.get('line_order',False):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
                 data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
         if context.has_key('survey_id'):
@@ -143,7 +143,7 @@ class survey_page(osv.osv):
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',0) })
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -177,6 +177,7 @@ class survey_question(osv.osv):
         for id in ids1:
             val[id] = 0
         return val
+
     _columns = {
         'page_id' : fields.many2one('survey.page', 'Survey Page', ondelete='cascade', required=1),
         'question' :  fields.char('Question', size=128, required=1),
@@ -274,18 +275,23 @@ class survey_question(osv.osv):
         val['is_comment_require'] = False
         val['is_validation_require'] = False
         val['comment_column'] = False
+
         if type in ['multiple_textboxes_diff_type']:
             val['in_visible_answer_type'] = False
             return {'value': val}
+
         if type in ['rating_scale']:
             val.update({'in_visible_rating_weight':False,'in_visible_menu_choice':True})
             return {'value': val}
+
         elif type in ['matrix_of_drop_down_menus']:
             val.update({'in_visible_rating_weight':True,'in_visible_menu_choice':False})
             return {'value': val}
+
         elif type in ['single_textbox']:
             val.update({'in_visible_rating_weight':True,'in_visible_menu_choice':True})
             return {'value': val}
+
         else:
             val.update({'in_visible_rating_weight':True,'in_visible_menu_choice':True,'in_visible_answer_type':True})
             return {'value': val}
@@ -300,28 +306,34 @@ class survey_question(osv.osv):
                         col_len += 1
                     else:
                         col_len -= 1
+
             if vals.has_key('type'):
                 que_type = vals['type']
             else:
                 que_type = question['type']
+
             if que_type in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale']:
                 if not col_len:
                     raise osv.except_osv(_('Error !'),_("You must enter one or more column heading."))
             ans_len = len(question['answer_choice_ids'])
+
             if vals.has_key('answer_choice_ids'):
                 for ans in vals['answer_choice_ids']:
                     if type(ans[2]) == type({}):
                         ans_len += 1
                     else:
                         ans_len -= 1
+
             if que_type not in ['descriptive_text', 'single_textbox', 'comment','table']:
                 if not ans_len:
                     raise osv.except_osv(_('Error !'),_("You must enter one or more Answer."))
             req_type = ""
+
             if vals.has_key('required_type'):
                 req_type = vals['required_type']
             else:
                 req_type = question['required_type']
+
             if que_type in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time']:
                 if req_type in ['at least', 'at most', 'exactly']:
                     if vals.has_key('req_ans'):
@@ -330,6 +342,7 @@ class survey_question(osv.osv):
                     else:
                         if not question['req_ans'] or  question['req_ans'] > ans_len:
                             raise osv.except_osv(_('Error !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+
                 if req_type == 'a range':
                     minimum_ans = 0
                     maximum_ans = 0
@@ -351,12 +364,14 @@ class survey_question(osv.osv):
                             raise osv.except_osv(_('Error !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
                     if maximum_ans <= minimum_ans:
                         raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
+
             if question['type'] ==  'matrix_of_drop_down_menus' and vals.has_key('column_heading_ids'):
                 for col in vals['column_heading_ids']:
                     if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
                         raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading"))
                     elif not col[2] or not col[2].has_key('menu_choice') or col[2]['menu_choice'].strip() == '':
                         raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
+
         return super(survey_question, self).write(cr, uid, ids, vals, context=context)
 
     def create(self, cr, uid, vals, context):
@@ -365,13 +380,16 @@ class survey_question(osv.osv):
         if vals.has_key('answer_choice_ids') and  not len(vals['answer_choice_ids']):
             if vals.has_key('type') and vals['type'] not in ['descriptive_text', 'single_textbox', 'comment','table']:
                 raise osv.except_osv(_('Error !'),_("You must enter one or more answer."))
+
         if vals.has_key('column_heading_ids') and  not len(vals['column_heading_ids']):
             if vals.has_key('type') and vals['type'] in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale']:
                 raise osv.except_osv(_('Error !'),_("You must enter one or more column heading."))
+
         if vals['type'] in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time']:
             if vals.has_key('is_require_answer') and vals.has_key('required_type') and vals['required_type'] in ['at least', 'at most', 'exactly']:
                 if vals.has_key('answer_choice_ids') and vals['req_ans'] > len(vals['answer_choice_ids']) or not vals['req_ans']:
                     raise osv.except_osv(_('Error !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
+
             if vals.has_key('is_require_answer') and vals.has_key('required_type') and vals['required_type'] == 'a range':
                 minimum_ans = vals['minimum_req_ans']
                 maximum_ans = vals['maximum_req_ans']
@@ -381,12 +399,14 @@ class survey_question(osv.osv):
                     raise osv.except_osv(_('Error !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
                 if maximum_ans <= minimum_ans:
                     raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
+
         if vals['type'] ==  'matrix_of_drop_down_menus':
             for col in vals['column_heading_ids']:
                 if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
                     raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading"))
                 elif not col[2] or not col[2].has_key('menu_choice') or col[2]['menu_choice'].strip() == '':
                     raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
+
         res = super(survey_question, self).create(cr, uid, vals, context)
         return res
 
@@ -394,7 +414,7 @@ class survey_question(osv.osv):
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',False) })
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -407,12 +427,12 @@ class survey_question(osv.osv):
 
     def default_get(self, cr, uid, fields, context={}):
         data = super(survey_question, self).default_get(cr, uid, fields, context)
-        if context.has_key('line_order') and context['line_order']:
-
+        if context.get('line_order',False):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
                 data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
+
         if context.has_key('page_id'):
-            data['page_id']= context['page_id']
+            data['page_id']= context.get('page_id',False)
         return data
 
 survey_question()
@@ -475,7 +495,7 @@ class survey_answer(osv.osv):
 
     def _get_in_visible_answer_type(self,cr, uid, context={}):
         if context.get('in_visible_answer_type',False):
-            return context['in_visible_answer_type']
+            return context.get('in_visible_answer_type',False)
         return False
 
     _columns = {
@@ -496,7 +516,7 @@ class survey_answer(osv.osv):
 
     def default_get(self, cr, uid, fields, context={}):
         data = super(survey_answer, self).default_get(cr, uid, fields, context)
-        if context.has_key('line_order') and context['line_order']:
+        if context.get('line_order',False):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
                 data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
         return data
@@ -591,14 +611,14 @@ class survey_name_wiz(osv.osv_memory):
             context = {}
         data = super(survey_name_wiz, self).default_get(cr, uid, fields, context)
         if context.has_key('survey_id'):
-            data['survey_id'] = context['survey_id']
+            data['survey_id'] = context.get('survey_id',False)
         return data
 
     def _get_survey(self, cr, uid, context=None):
         surv_obj = self.pool.get("survey")
         result = []
         if context.has_key('survey_id'):
-            for sur in surv_obj.browse(cr, uid, [context['survey_id']]):
+            for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
                 result.append((sur.id, sur.title))
             return result
         group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / Manager')])
@@ -629,21 +649,26 @@ class survey_name_wiz(osv.osv_memory):
     }
 
     def action_next(self, cr, uid, ids, context=None):
+        survey_obj = self.pool.get('survey')
+        search_obj = self.pool.get('ir.ui.view')
+
         sur_id = self.read(cr, uid, ids, [])[0]
         survey_id = sur_id['survey_id']
         context.update({'survey_id' : survey_id, 'sur_name_id' : sur_id['id']})
         cr.execute('select count(id) from survey_history where user_id=%s\
                     and survey_id=%s' % (uid,survey_id))
+
         res = cr.fetchone()[0]
-        user_limit = self.pool.get('survey').read(cr, uid, survey_id, ['response_user'])['response_user']
+        user_limit = survey_obj.read(cr, uid, survey_id, ['response_user'])['response_user']
         if user_limit and res >= user_limit:
             raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
-        survey_obj = self.pool.get('survey')
+        
         sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id'])
         if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']:
             raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
-        search_obj = self.pool.get('ir.ui.view')
+
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+
         return {
             'view_type': 'form',
             "view_mode": 'form',
@@ -669,41 +694,55 @@ class survey_question_wiz(osv.osv_memory):
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
         result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
         surv_name_wiz = self.pool.get('survey.name.wiz')
+        survey_obj = self.pool.get('survey')
+        page_obj = self.pool.get('survey.page')
+        que_obj = self.pool.get('survey.question')
+        ans_obj = self.pool.get('survey.answer')
+        sur_response_obj = self.pool.get('survey.response')
+        que_col_head = self.pool.get('survey.question.column.heading')
+        user_obj = self.pool.get('res.users')
+
         if view_type in ['form']:
             wiz_id = 0
             if not context.has_key('sur_name_id'):
-                wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context['survey_id'],'page_no' :-1,'page':'next','transfer' :1,'response':0})
+                res_data = {
+                        'survey_id' : context.get('survey_id', False),
+                        'page_no' :-1,
+                        'page':'next',
+                        'transfer' :1,
+                        'response':0
+                }
+                wiz_id = surv_name_wiz.create(cr, uid, res_data)
                 sur_name_rec = surv_name_wiz.read(cr, uid, wiz_id, [])
                 context.update({'sur_name_id' :wiz_id})
             else:
-                sur_name_rec = surv_name_wiz.read(cr, uid, context['sur_name_id'])
-            if context.has_key('active_id'): context.pop('active_id')
-            survey_id = context['survey_id']
-            survey_obj = self.pool.get('survey')
-            sur_rec = survey_obj.read(cr, uid, survey_id, [])
-            page_obj = self.pool.get('survey.page')
-            que_obj = self.pool.get('survey.question')
-            ans_obj = self.pool.get('survey.answer')
+                sur_name_rec = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
 
-            sur_response_obj = self.pool.get('survey.response')
-            que_col_head = self.pool.get('survey.question.column.heading')
+            if context.has_key('active_id'):
+                context.pop('active_id')
+
+            survey_id = context.get('survey_id', False)
+            sur_rec = survey_obj.read(cr, uid, survey_id, [])
             p_id = sur_rec['page_ids']
             total_pages = len(p_id)
             pre_button = False
             readonly = 0
-            if context.has_key('response_id') and context['response_id'] and int(context['response_id'][0]) > 0:
+
+            if context.has_key('response_id') and context.get('response_id', False) and int(context['response_id'][0]) > 0:
                 readonly = 1
+
             if not sur_name_rec['page_no'] + 1 :
-                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':{}})
-            sur_name_read = surv_name_wiz.read(cr, uid, context['sur_name_id'])
+                surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':{}})
+
+            sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
             page_number = int(sur_name_rec['page_no'])
             if sur_name_read['transfer'] or not sur_name_rec['page_no'] + 1:
-                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':False})
+                surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'transfer':False})
                 flag = False
                 fields = {}
-                if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == - 1 :
-                    if len(p_id) > sur_name_rec['page_no'] + 1 :
-                        if ((context.has_key('active') and not context['active']) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1:
+                if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == -1:
+                    if total_pages > sur_name_rec['page_no'] + 1:
+                        if ((context.has_key('active') and not context.get('active', False)) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1:
                             if sur_rec['state'] != "open" :
                                 raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
                             cr.execute('select count(id) from survey_history where user_id=%s\
@@ -715,8 +754,9 @@ class survey_question_wiz(osv.osv_memory):
 
                         if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey'] and not sur_name_rec['page_no'] + 1:
                             survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
+
                         p_id = p_id[sur_name_rec['page_no'] + 1]
-                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'page_no' : sur_name_rec['page_no'] + 1})
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec['page_no'] + 1})
                         flag = True
                         page_number += 1
                     if sur_name_rec['page_no'] > - 1:
@@ -724,46 +764,49 @@ class survey_question_wiz(osv.osv_memory):
                 else:
                     if sur_name_rec['page_no'] != 0:
                         p_id = p_id[sur_name_rec['page_no'] - 1]
-                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'page_no' : sur_name_rec['page_no'] - 1})
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec['page_no'] - 1})
                         flag = True
                         page_number -= 1
+
                     if sur_name_rec['page_no'] > 1:
                         pre_button = True
                 if flag:
                     pag_rec = page_obj.read(cr, uid, p_id)
                     xml_form = etree.Element('form', {'string': _(tools.ustr(pag_rec['title']))})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-                    if context.has_key('response_id') and context['response_id']  and int(context['response_id'][0]) > 0:
+                    if context.has_key('response_id') and context.get('response_id', False)  and int(context.get('response_id',0)[0]) > 0:
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '40', 'colspan': '4'})
                         record = sur_response_obj.browse(cr, uid, context['response_id'][context['response_no']])
                         etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr('Answer Of :- ' + record.user_id.name + ',  Date :- ' + record.date_create.split('.')[0]  )), 'align':"0.0"})
-                        etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(" Response :- " + str(context['response_no'] + 1) +"/" + str(len(context['response_id'])) )), 'align':"0.0"})
-                        if context['response_no'] > 0:
+                        etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(" Response :- " + str(context.get('response_no',0) + 1) +"/" + str(len(context.get('response_id',0))) )), 'align':"0.0"})
+                        if context.get('response_no',0) > 0:
                             etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_forward_previous",'string': tools.ustr("Previous Answer"),'type':"object"})
-                        if context['response_no'] + 1 == len(context['response_id']) and context['response_no'] != 0:
-                            etree.SubElement(xml_group, 'button', {'colspan':"1",'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
-                        elif context['response_no'] + 1 < len(context['response_id']):
+                        if context.get('response_no',0) + 1 < len(context.get('response_id',0)):
                             etree.SubElement(xml_group, 'button', {'colspan':"1",'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
+
                     if wiz_id:
                         fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}}
                         etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0)})
+
                     if pag_rec['note']:
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                         for que_test in pag_rec['note'].split('\n'):
                             etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
                     que_ids = pag_rec['question_ids']
                     qu_no = 0
+
                     for que in que_ids:
                         qu_no += 1
                         que_rec = que_obj.read(cr, uid, que)
                         descriptive_text = ""
                         separator_string = tools.ustr(qu_no) + "." + tools.ustr(que_rec['question'])
-                        if ((context.has_key('active') and not context['active']) or not context.has_key('active')) and que_rec['is_require_answer']:
+                        if ((context.has_key('active') and not context.get('active',False)) or not context.has_key('active')) and que_rec['is_require_answer']:
                             star = '*'
                         else:
                             star = ''
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '4'})
-                        if context.has_key('active') and context['active'] and context.has_key('edit'):
+
+                        if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
                             xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
                             etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
                             xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
@@ -773,8 +816,10 @@ class survey_question_wiz(osv.osv_memory):
                         else:
                             xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '4'})
+
                         ans_ids = ans_obj.read(cr, uid, que_rec['answer_choice_ids'], [])
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
+
                         if que_rec['type'] == 'multiple_choice_only_one_ans':
                             selection = []
                             for ans in ans_ids:
@@ -782,11 +827,13 @@ class survey_question_wiz(osv.osv_memory):
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
                             etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_selection"})
                             fields[tools.ustr(que) + "_selection"] = {'type':'selection', 'selection' :selection, 'string':"Answer"}
+
                         elif que_rec['type'] == 'multiple_choice_multiple_ans':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
                                 etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
                                 fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'boolean', 'string':ans['answer']}
+
                         elif que_rec['type'] in ['matrix_of_choices_only_one_ans', 'rating_scale']:
                             if que_rec['comment_column']:
                                 col = "4"
@@ -805,6 +852,7 @@ class survey_question_wiz(osv.osv_memory):
                                 if que_rec['comment_column']:
                                    fields[tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id']) + "_field"] = {'type':'char', 'size' : 255, 'string':tools.ustr(que_rec['column_name']), 'views':{}}
                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id'])+ "_field"})
+
                         elif que_rec['type'] == 'matrix_of_choices_only_multi_ans':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
@@ -815,6 +863,7 @@ class survey_question_wiz(osv.osv_memory):
                                 for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
                                     etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']), 'nolabel':"1"})
                                     fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'boolean', 'string': col['title']}
+
                         elif que_rec['type'] == 'matrix_of_drop_down_menus':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
@@ -829,6 +878,7 @@ class survey_question_wiz(osv.osv_memory):
                                             if item and not item.strip() == '': selection.append((item ,item))
                                     etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']),'nolabel':'1'})
                                     fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'selection', 'string': col['title'], 'selection':selection}
+
                         elif que_rec['type'] == 'multiple_textboxes':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             type = "char"
@@ -845,30 +895,37 @@ class survey_question_wiz(osv.osv_memory):
                                     fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
                                 else:
                                     fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type': str(type), 'string':ans['answer']}
+
                         elif que_rec['type'] == 'numerical_textboxes':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
                                 etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"})
                                 fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"] = {'type':'integer', 'string':ans['answer']}
+
                         elif que_rec['type'] == 'date':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
                                 etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
                                 fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'date', 'string':ans['answer']}
+
                         elif que_rec['type'] == 'date_and_time':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
                                 etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
                                 fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'datetime', 'string':ans['answer']}
+
                         elif que_rec['type'] == 'descriptive_text':
                             for que_test in que_rec['descriptive_text'].split('\n'):
                                 etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
+
                         elif que_rec['type'] == 'single_textbox':
                             etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_single", 'nolabel':"1" ,'colspan':"4"})
                             fields[tools.ustr(que) + "_single"] = {'type':'char', 'size' : 255, 'string':"single_textbox", 'views':{}}
+
                         elif que_rec['type'] == 'comment':
                             etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_comment", 'nolabel':"1" ,'colspan':"4"})
                             fields[tools.ustr(que) + "_comment"] = {'type':'text', 'string':"Comment/Eassy Box", 'views':{}}
+
                         elif que_rec['type'] == 'table':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids'])), 'colspan': '4'})
                             for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
@@ -877,6 +934,7 @@ class survey_question_wiz(osv.osv_memory):
                                 for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
                                     etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row), 'nolabel':"1"})
                                     fields[tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row)] = {'type':'char','size':255,'views':{}}
+
                         elif que_rec['type'] == 'multiple_textboxes_diff_type':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
@@ -895,6 +953,7 @@ class survey_question_wiz(osv.osv_memory):
                                             for item in ans['menu_choice'].split('\n'):
                                                 if item and not item.strip() == '': selection.append((item ,item))
                                         fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'selection', 'selection' : selection, 'string':ans['answer']}
+
                         if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale'] and que_rec['is_comment_require']:
                             if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans'] and que_rec['comment_field_type'] in ['char','text'] and que_rec['make_comment_field']:
                                 etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_otherfield", 'colspan':"4"})
@@ -914,27 +973,30 @@ class survey_question_wiz(osv.osv_memory):
                                     etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec['comment_label'])),'colspan':"4"})
                                     etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
                                     fields[tools.ustr(que) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
+
                     etree.SubElement(xml_form, 'separator', {'colspan': '4'})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '6', 'colspan': '4'})
                     etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
                     fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
                     etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
                     etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
+
                     if pre_button:
                         etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
                     but_string = "Next"
                     if int(page_number) + 1 == total_pages:
                         but_string = "Done"
 
-                    if context.has_key('active') and context['active'] and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context['response_no'] + 1 == len(context['response_id']):
+                    if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
                         etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
-                    elif context.has_key('active') and context['active'] and int(page_number) + 1 == total_pages and context.has_key('response_id'):
+                    elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
                         etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
-                    elif context.has_key('active') and context['active'] and int(page_number) + 1 == total_pages:
+                    elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
                         etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context)})
                     else:
                         etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context)})
-                    if context.has_key('active') and context['active'] and context.has_key('edit'):
+
+                    if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
                         etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
                         context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer']})
                         xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
@@ -942,6 +1004,7 @@ class survey_question_wiz(osv.osv_memory):
                         etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
                         etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
                         etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
+
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)
                     result['fields'] = fields
@@ -949,10 +1012,10 @@ class survey_question_wiz(osv.osv_memory):
                 else:
                     survey_obj.write(cr, uid, survey_id, {'tot_comp_survey' : sur_rec['tot_comp_survey'] + 1})
                     sur_response_obj.write(cr, uid, [sur_name_read['response']], {'state' : 'done'})
+
                     if sur_rec['send_response']:
-                        user_obj = self.pool.get('res.users')
                         survey_data = survey_obj.browse(cr, uid, int(survey_id))
-                        response_id = surv_name_wiz.read(cr,uid,context['sur_name_id'])['response']
+                        response_id = surv_name_wiz.read(cr,uid,context.get('sur_name_id',False))['response']
                         context.update({'response_id':response_id})
                         report = self.create_report(cr, uid, [int(survey_id)], 'report.survey.browse.response', survey_data.title,context)
                         attachments = []
@@ -963,15 +1026,18 @@ class survey_question_wiz(osv.osv_memory):
                             file_data += line
                             if not line:
                                 break
+
                         attachments.append((survey_data.title + ".pdf",file_data))
                         file.close()
                         os.remove(tools.config['addons_path'] + '/survey/report/' + survey_data.title + ".pdf")
                         user_email = False
                         resp_email = False
+
                         if user_obj.browse(cr, uid, uid).address_id.id:
                             cr.execute("select email from res_partner_address where id =%d" % user_obj.browse(cr, uid, uid).address_id.id)
                             user_email = cr.fetchone()[0]
                         resp_id = survey_data.responsible_id.address_id
+
                         if resp_id:
                             cr.execute("select email from res_partner_address where id =%d" % resp_id.id)
                             resp_email = cr.fetchone()[0]
@@ -1000,23 +1066,28 @@ class survey_question_wiz(osv.osv_memory):
             fp = open(ret_file_name, 'wb+');
             fp.write(result);
             fp.close();
+
         except Exception,e:
             print 'Exception in create report:',e
             return (False, str(e))
+
         return (True, ret_file_name)
 
     def default_get(self, cr, uid, fields_list, context=None):
         value = {}
         for field in fields_list:
             if field.split('_')[0] == 'progress':
-                tot_page_id = self.pool.get('survey').browse(cr, uid, context['survey_id'])
+                tot_page_id = self.pool.get('survey').browse(cr, uid, context.get('survey_id',False))
                 tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids))
                 value[field] = tot_per
         response_obj = self.pool.get('survey.response')
-        if context.has_key('response_id') and context['response_id'] and int(context['response_id'][0]) > 0:
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        
+        if context.has_key('response_id') and context.get('response_id') and int(context['response_id'][0]) > 0:
             data = super(survey_question_wiz, self).default_get(cr, uid, fields_list, context)
             response_ans = response_obj.browse(cr, uid, context['response_id'][context['response_no']])
             fields_list.sort()
+
             for que in response_ans.question_ids:
                 for field in fields_list:
                     if field.split('_')[0] != "progress" and field.split('_')[0] == str(que.question_id.id):
@@ -1024,20 +1095,26 @@ class survey_question_wiz(osv.osv_memory):
                             for ans in que.response_answer_ids:
                                 if str(field.split('_')[2]) == str(ans.answer_id.id):
                                     value[field] = ans.comment_field
+
                         if que.response_table_ids and len(field.split('_')) == 4 and field.split('_')[1] == "table":
                             for ans in que.response_table_ids:
                                 if str(field.split('_')[2]) == str(ans.column_id.id) and str(field.split('_')[3]) ==  str(ans.name):
                                     value[field] = ans.value
+
                         if que.comment and (field.split('_')[1] == "comment" or field.split('_')[1] == "other"):
                             value[field] = str(que.comment)
+
                         elif que.single_text and field.split('_')[1] == "single":
                             value[field] = str(que.single_text)
+
                         elif que.response_answer_ids and len(field.split('_')) == 3 and field.split('_')[1] == "selection":
                             for ans in que.response_answer_ids:
                                 if str(field.split('_')[2]) == str( ans.answer_id.id):
                                     value[field] = str(ans.column_id.id)
+
                         elif que.response_answer_ids and len(field.split('_')) == 2 and field.split('_')[1] == "selection":
                             value[field] = str(que.response_answer_ids[0].answer_id.id)
+
                         elif que.response_answer_ids and len(field.split('_')) == 3 and field.split('_')[2] != "multi" and field.split('_')[2] != "numeric":
                             for ans in que.response_answer_ids:
                                 if str(field.split('_')[1]) == str( ans.answer_id.id) and str(field.split('_')[2]) == str(ans.column_id.id):
@@ -1045,61 +1122,72 @@ class survey_question_wiz(osv.osv_memory):
                                         value[field] = ans.value_choice
                                     else:
                                         value[field] = True
+
                         else:
                             for ans in que.response_answer_ids:
                                 if str(field.split('_')[1]) == str( ans.answer_id.id):
                                     value[field] = ans.answer
+
         else:
             if not context.has_key('sur_name_id'):
                 return value
-            if context.has_key('active') and context['active']:
+            if context.has_key('active') and context.get('active',False):
                 return value
-            surv_name_wiz = self.pool.get('survey.name.wiz')
-            sur_name_read = surv_name_wiz.read(cr, uid, context['sur_name_id'])
+            
+            sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
             ans_list = []
             for key,val in sur_name_read['store_ans'].items():
                 for field in fields_list:
                     if field in list(val):
                         value[field] = val[field]
+
         return value
 
     def create(self, cr, uid, vals, context=None):
-        if context.has_key('active') and context['active']:
+        if context.has_key('active') and context.get('active',False):
             return True
+
         for key,val in vals.items():
             if key.split('_')[0] == "progress":
                 vals.pop(key)
             if not context.has_key('sur_name_id') and key.split('_')[0] == "wizardid":
                 context.update({'sur_name_id': int(key.split('_')[1])})
                 vals.pop(key)
+
         click_state = True
         click_update = []
         surv_name_wiz = self.pool.get('survey.name.wiz')
         surv_all_resp_obj = self.pool.get('survey.response')
         surv_tbl_column_obj = self.pool.get('survey.tbl.column.heading')
-        sur_name_read = surv_name_wiz.read(cr, uid, context['sur_name_id'], [])
+        survey_obj = self.pool.get('survey')
+        resp_obj = self.pool.get('survey.response.line')
+        res_ans_obj = self.pool.get('survey.response.answer')
+        que_obj = self.pool.get('survey.question')
+        sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False), [])
         response_id =  0
+
         if not sur_name_read['response']:
             response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context['survey_id']})
-            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' : tools.ustr(response_id)})
+            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'response' : tools.ustr(response_id)})
         else:
             response_id = int(sur_name_read['response'])
+
         if response_id not in surv_all_resp_obj.search(cr, uid, []):
-            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context['survey_id']})
-            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'response' : tools.ustr(response_id)})
+            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context.get('survey_id',False)})
+            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'response' : tools.ustr(response_id)})
+
         #click first time on next button then increemnet on total start suvey
         if not sur_name_read['store_ans']:
             his_id = self.pool.get('survey.history').create(cr, uid, {'user_id': uid, \
                                               'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': sur_name_read['survey_id']})
-            survey_obj = self.pool.get('survey')
             sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
             survey_obj.write(cr, uid, sur_name_read['survey_id'],  {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
             if context.has_key('cur_id'):
-                if context.has_key('request') and context['request']:
-                    self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
-                    self.pool.get(context['object']).survey_req_done(cr, uid, [int(context['cur_id'])], context)
+                if context.has_key('request') and context.get('request',False):
+                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
+                    self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
                 else:
-                    self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
+                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
 
         for key,val in sur_name_read['store_ans'].items():
             for field in vals:
@@ -1107,9 +1195,7 @@ class survey_question_wiz(osv.osv_memory):
                     click_state = False
                     click_update.append(key)
                     break
-        resp_obj = self.pool.get('survey.response.line')
-        res_ans_obj = self.pool.get('survey.response.answer')
-        que_obj = self.pool.get('survey.question')
+
         if click_state:
             que_li = []
             resp_id_list = []
@@ -1118,11 +1204,16 @@ class survey_question_wiz(osv.osv_memory):
                 if que_id not in que_li:
                     que_li.append(que_id)
                     que_rec = que_obj.read(cr, uid, [int(que_id)], [])[0]
-                    resp_id = resp_obj.create(cr, uid, {'question_id':que_id, 'date_create':datetime.datetime.now(), \
-                         'state':'done','response_id' : response_id })
+                    res_data =  {
+                        'question_id':que_id, 
+                        'date_create':datetime.datetime.now(),
+                        'state':'done',
+                        'response_id' : response_id
+                    }
+                    resp_id = resp_obj.create(cr, uid, res_data)
                     resp_id_list.append(resp_id)
                     sur_name_read['store_ans'].update({resp_id:{'question_id':que_id}})
-                    surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                    surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
                     select_count = 0
                     numeric_sum = 0
                     selected_value = []
@@ -1130,17 +1221,20 @@ class survey_question_wiz(osv.osv_memory):
                     comment_field = False
                     comment_value = False
                     response_list = []
+
                     for key1, val1 in vals.items():
                         if val1 and key1.split('_')[1] == "table" and key1.split('_')[0] == que_id:
                             surv_tbl_column_obj.create(cr, uid, {'response_table_id' : resp_id,'column_id':key1.split('_')[2], 'name':key1.split('_')[3], 'value' : val1})
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
+
                         elif val1 and key1.split('_')[1] == "otherfield" and key1.split('_')[0] == que_id:
                             comment_field = True
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
-                            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
                             continue
+
                         elif val1 and key1.split('_')[1] == "selection" and key1.split('_')[0] == que_id:
                             if len(key1.split('_')) > 2:
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'column_id' : val1})
@@ -1150,6 +1244,7 @@ class survey_question_wiz(osv.osv_memory):
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':val1})
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
+
                         elif key1.split('_')[1] == "other" and key1.split('_')[0] == que_id:
                             if not val1:
                                 comment_value = True
@@ -1183,12 +1278,15 @@ class survey_question_wiz(osv.osv_memory):
                                     for res in resp_id_list:
                                         sur_name_read['store_ans'].pop(res)
                                     raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
+
                                 resp_obj.write(cr, uid, resp_id, {'comment':val1})
                                 sur_name_read['store_ans'][resp_id].update({key1:val1})
+
                         elif val1 and key1.split('_')[1] == "comment" and key1.split('_')[0] == que_id:
                             resp_obj.write(cr, uid, resp_id, {'comment':val1})
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
+
                         elif val1 and key1.split('_')[0] == que_id and (key1.split('_')[1] == "single"  or (len(key1.split('_')) > 2 and key1.split('_')[2] == 'multi')):
                             error = False
                             if que_rec['is_validation_require'] and que_rec['validation_type'] == 'must_be_specific_length':
@@ -1219,12 +1317,15 @@ class survey_question_wiz(osv.osv_memory):
                                 for res in resp_id_list:
                                     sur_name_read['store_ans'].pop(res)
                                 raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
+
                             if key1.split('_')[1] == "single" :
                                 resp_obj.write(cr, uid, resp_id, {'single_text':val1})
                             else:
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : val1})
+
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
+
                         elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) > 2 and key1.split('_')[2] == 'numeric':
                             if not val1=="0":
                                 try:
@@ -1244,33 +1345,41 @@ class survey_question_wiz(osv.osv_memory):
                             else:
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'column_id' : key1.split('_')[2]})
                                 sur_name_read['store_ans'][resp_id].update({key1:True})
+
                             matrix_list.append(key1.split('_')[0] + '_' + key1.split('_')[1])
                             select_count += 1
+
                         elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 2:
                             ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'answer' : val1})
                             sur_name_read['store_ans'][resp_id].update({key1:val1})
                             select_count += 1
-                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+
                     for key,val in vals.items():
                         if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == que_id:
                             for res_id in response_list:
                                 if key.split('_')[2] in res_id.split('_')[1]:
                                     a = res_ans_obj.write(cr, uid, [res_id.split('_')[0]], {'comment_field':val})
                                     sur_name_read['store_ans'][resp_id].update({key:val})
+
                     if comment_field and comment_value:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
+
                     if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
+
                     if not select_count:
                         resp_obj.write(cr, uid, resp_id, {'state':'skip'})
+
                     if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
+
                     if que_rec['type'] in ['multiple_textboxes_diff_type', 'multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
                         if matrix_list:
                             if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
@@ -1281,6 +1390,7 @@ class survey_question_wiz(osv.osv_memory):
                                 for res in resp_id_list:
                                     sur_name_read['store_ans'].pop(res)
                                 raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
                         elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
                             (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
                             (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
@@ -1289,10 +1399,12 @@ class survey_question_wiz(osv.osv_memory):
                             for res in resp_id_list:
                                 sur_name_read['store_ans'].pop(res)
                             raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
                     if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
         else:
             resp_id_list = []
             for update in click_update:
@@ -1301,7 +1413,7 @@ class survey_question_wiz(osv.osv_memory):
                 surv_tbl_column_obj.unlink(cr, uid,surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', update)]))
                 resp_id_list.append(update)
                 sur_name_read['store_ans'].update({update:{'question_id':sur_name_read['store_ans'][update]['question_id']}})
-                surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
                 select_count = 0
                 numeric_sum = 0
                 selected_value = []
@@ -1309,6 +1421,7 @@ class survey_question_wiz(osv.osv_memory):
                 comment_field = False
                 comment_value = False
                 response_list = []
+
                 for key, val in vals.items():
                     ans_id_len = key.split('_')
                     if ans_id_len[0] == sur_name_read['store_ans'][update]['question_id']:
@@ -1316,12 +1429,14 @@ class survey_question_wiz(osv.osv_memory):
                             surv_tbl_column_obj.create(cr, uid, {'response_table_id' : update,'column_id':key.split('_')[2], 'name':key.split('_')[3], 'value' : val})
                             sur_name_read['store_ans'][update].update({key:val})
                             resp_obj.write(cr, uid, update, {'state': 'done'})
+
                         elif val and key.split('_')[1] == "otherfield" :
                             comment_field = True
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
-                            surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
                             continue
+
                         elif val and key.split('_')[1] == "selection":
                             if len(key.split('_')) > 2:
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':key.split('_')[-1], 'column_id' : val})
@@ -1332,6 +1447,7 @@ class survey_question_wiz(osv.osv_memory):
                             resp_obj.write(cr, uid, update, {'state': 'done'})
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
+
                         elif key.split('_')[1] == "other":
                             if not val:
                                 comment_value = True
@@ -1364,10 +1480,12 @@ class survey_question_wiz(osv.osv_memory):
                                     raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
                                 resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
                                 sur_name_read['store_ans'][update].update({key:val})
+
                         elif val and key.split('_')[1] == "comment":
                             resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
+
                         elif val and (key.split('_')[1] == "single"  or (len(key.split('_')) > 2 and key.split('_')[2] == 'multi')):
                             error = False
                             if que_rec['is_validation_require'] and que_rec['validation_type'] == 'must_be_specific_length':
@@ -1403,6 +1521,7 @@ class survey_question_wiz(osv.osv_memory):
                                 ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : val})
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
+
                         elif val and len(key.split('_')) > 2 and key.split('_')[2] == 'numeric':
                             if not val=="0":
                                 try:
@@ -1424,26 +1543,33 @@ class survey_question_wiz(osv.osv_memory):
                                 sur_name_read['store_ans'][update].update({key:True})
                             matrix_list.append(key.split('_')[0] + '_' + key.split('_')[1])
                             select_count += 1
+
                         elif val and len(key.split('_')) == 2:
                             resp_obj.write(cr, uid, update, {'state': 'done'})
                             ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[-1], 'answer' : val})
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
-                        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'store_ans':sur_name_read['store_ans']})
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+
                 for key,val in vals.items():
                     if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == sur_name_read['store_ans'][update]['question_id']:
                         for res_id in response_list:
                             if key.split('_')[2] in res_id.split('_')[1]:
                                 a = res_ans_obj.write(cr, uid, [res_id.split('_')[0]], {'comment_field':val})
                                 sur_name_read['store_ans'][update].update({key:val})
+
                 if comment_field and comment_value:
                     raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
+
                 if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
                     raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
+
                 if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
                     raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
+
                 if not select_count:
                     resp_obj.write(cr, uid, update, {'state': 'skip'})
+
                 if que_rec['type'] in ['multiple_textboxes_diff_type','multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
                     if matrix_list:
                         if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
@@ -1452,14 +1578,17 @@ class survey_question_wiz(osv.osv_memory):
                         (que_rec['required_type'] == 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'a range' and (len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):
                             raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
                     elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
                         (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'exactly' and select_count != que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):
                             raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
                 if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
                     raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
         return True
 
     def action_new_question(self,cr, uid, ids, context):
@@ -1503,7 +1632,7 @@ class survey_question_wiz(osv.osv_memory):
                 'res_model': 'survey.page',
                 'type': 'ir.actions.act_window',
                 'target': 'new',
-                'res_id' : int(context['page_id']),
+                'res_id' : int(context.get('page_id',0)),
                 'view_id': view_id,
                 'context': context
                 }
@@ -1512,10 +1641,11 @@ class survey_question_wiz(osv.osv_memory):
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
-        self.pool.get('survey.page').unlink(cr, uid, [context['page_id']])
+
+        self.pool.get('survey.page').unlink(cr, uid, [context.get('page_id',False)])
         search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',False) })
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -1537,7 +1667,7 @@ class survey_question_wiz(osv.osv_memory):
                 'res_model': 'survey.question',
                 'type': 'ir.actions.act_window',
                 'target': 'new',
-                'res_id' : int(context['question_id']),
+                'res_id' : int(context.get('question_id',0)),
                 'view_id': view_id,
                 'context': context
                 }
@@ -1546,11 +1676,12 @@ class survey_question_wiz(osv.osv_memory):
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
+
         que_obj = self.pool.get('survey.question')
-        que_obj.unlink(cr, uid, [context['question_id']])
+        que_obj.unlink(cr, uid, [context.get('question_id',False)])
         search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page_no' : context['page_number'] })
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',0) })
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -1565,9 +1696,10 @@ class survey_question_wiz(osv.osv_memory):
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context['survey_id'],'page_no' :-1,'page':'next','transfer' :1,'response':0})
-        context.update({'sur_name_id' :wiz_id, 'response_no' : context['response_no'] - 1})
-        if context['response_no'] + 1 > len(context['response_id']):
+        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
+        context.update({'sur_name_id' :wiz_id, 'response_no' : context.get('response_no',0) - 1})
+
+        if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
             return {}
         return {
                 'view_type': 'form',
@@ -1583,9 +1715,10 @@ class survey_question_wiz(osv.osv_memory):
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context['survey_id'],'page_no' :-1,'page':'next','transfer' :1,'response':0})
-        context.update({'sur_name_id' :wiz_id, 'response_no' : context['response_no'] + 1})
-        if context['response_no'] + 1 > len(context['response_id']):
+        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
+        context.update({'sur_name_id' :wiz_id, 'response_no' : context.get('response_no',0) + 1})
+
+        if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
             return {}
         return {
                 'view_type': 'form',
@@ -1601,7 +1734,7 @@ class survey_question_wiz(osv.osv_memory):
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page':'next'})
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'next'})
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -1616,7 +1749,7 @@ class survey_question_wiz(osv.osv_memory):
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':True, 'page':'previous'})
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'previous'})
         return {
                 'view_type': 'form',
                 "view_mode": 'form',

From 9721577f4aaf7316544d952cc4b46e1c44a1e95b Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 15 Mar 2010 16:49:53 +0530
Subject: [PATCH 010/248] [IMP] survey :- improve codeing in all report

bzr revid: ysa@tinyerp.co.in-20100315111953-ylieyt9xmjm8g336
---
 .../survey/report/survey_analysis_report.py   | 122 ++++++++-------
 .../survey/report/survey_browse_response.py   |  63 ++++++--
 addons/survey/report/survey_form.py           | 140 ++++++++++--------
 3 files changed, 198 insertions(+), 127 deletions(-)

diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index 44d42610e6f..a3a54bf4950 100755
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -106,31 +106,31 @@ class survey_analysis(report_rml):
             
         for survey in surv_obj.browse(cr, uid, ids):
             rml += """<blockTable colWidths="280.0,100.0,120.0" style="Table_heading">
-                          <tr>
-                            <td>
-                              <para style="terp_tblheader_General_Centre">Survey Title </para>
-                            </td>
-                            <td>
-                              <para style="terp_tblheader_General_Centre">Total Started Survey </para>
-                            </td>
-                            <td>
-                              <para style="terp_tblheader_General_Centre">Total Completed Survey </para>
-                            </td>
-                          </tr>
-                          </blockTable>
-                          <blockTable colWidths="280.0,100.0,120.0" style="Table_head_2">
-                          <tr>
-                            <td>
-                              <para style="terp_default_Centre_8">""" + to_xml(tools.ustr(survey.title)) + """</para>
-                            </td>
-                            <td>
-                              <para style="terp_default_Centre_8">""" + str(survey.tot_start_survey) + """</para>
-                            </td>
-                            <td>
-                              <para style="terp_default_Centre_8">""" + str(survey.tot_comp_survey) + """</para>
-                            </td>
-                          </tr>
-                        </blockTable>"""
+                      <tr>
+                        <td>
+                          <para style="terp_tblheader_General_Centre">Survey Title </para>
+                        </td>
+                        <td>
+                          <para style="terp_tblheader_General_Centre">Total Started Survey </para>
+                        </td>
+                        <td>
+                          <para style="terp_tblheader_General_Centre">Total Completed Survey </para>
+                        </td>
+                      </tr>
+                      </blockTable>
+                      <blockTable colWidths="280.0,100.0,120.0" style="Table_head_2">
+                      <tr>
+                        <td>
+                          <para style="terp_default_Centre_8">""" + to_xml(tools.ustr(survey.title)) + """</para>
+                        </td>
+                        <td>
+                          <para style="terp_default_Centre_8">""" + str(survey.tot_start_survey) + """</para>
+                        </td>
+                        <td>
+                          <para style="terp_default_Centre_8">""" + str(survey.tot_comp_survey) + """</para>
+                        </td>
+                      </tr>
+                    </blockTable>"""
             for page in survey.page_ids:
                 rml += """ <blockTable colWidths="500" style="Table4">
 #                              <tr>
@@ -144,24 +144,27 @@ class survey_analysis(report_rml):
                               </tr>
                              </blockTable>"""
                     cols_widhts = []
+
                     if que.type in ['matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans']:
                         cols_widhts.append(200)
                         for col in range(0, len(que.column_heading_ids) + 1):
                             cols_widhts.append(float(300 / (len(que.column_heading_ids) + 1)))
                         colWidths = ",".join(map(tools.ustr, cols_widhts))
                         matrix_ans = [(0,'')]
+
                         for col in que.column_heading_ids:
                             if col.title not in matrix_ans:
                                 matrix_ans.append((col.id,col.title))
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
+                        rml += """<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
                         for mat_col in range(0, len(matrix_ans)):
                             rml+="""<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
-                        rml+="""<td><para style="response-bold">Response Count</para></td>
+                        rml += """<td><para style="response-bold">Response Count</para></td>
                                 </tr>"""
                         last_col = cols_widhts[-1]
+
                         for ans in que.answer_choice_ids:
-                            rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
-                            cr.execute("select count(id) from survey_response_answer sra where sra.answer_id = %d"%(ans.id))
+                            rml += """<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                            cr.execute("select count(id) from survey_response_answer sra where sra.answer_id = %d" % ans.id)
                             tot_res = cr.fetchone()[0]
                             cr.execute("select count(id) ,sra.column_id from survey_response_answer sra where sra.answer_id = %d group by sra.column_id" % ans.id)
                             calc_res = cr.dictfetchall()
@@ -177,25 +180,27 @@ class survey_analysis(report_rml):
                                     rml += """<td color="#FFF435"><para style="answer_bold">""" + tools.ustr(percantage) +"% (" + tools.ustr(cal_count) + """)</para></td>"""
                                 else:
                                     rml += """<td color="#FFF435"><para style="answer">""" + tools.ustr(percantage) +"% (" + tools.ustr(cal_count) + """)</para></td>"""
-                            rml+="""<td><para style="answer_right">""" + tools.ustr(tot_res) + """</para></td>
+                            rml += """<td><para style="answer_right">""" + tools.ustr(tot_res) + """</para></td>
                                 </tr>"""
-                        rml+="""</blockTable>"""
+                        rml += """</blockTable>"""
+
                         if que.is_comment_require:
                             cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
                             tot_res = cr.fetchone()[0]
-                            rml+="""<blockTable colWidths=" """+ str(500 - last_col) +"," + str(last_col) + """ " style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
+                            rml += """<blockTable colWidths=" """+ str(500 - last_col) +"," + str(last_col) + """ " style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
                                     <td><para style="answer">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
 
                     elif que.type in['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'multiple_textboxes','date_and_time','date','multiple_textboxes_diff_type']:
-                        rml +="""<blockTable colWidths="240.0,210,50.0" style="Table1">"""
+                        rml += """<blockTable colWidths="240.0,210,50.0" style="Table1">"""
                         rml += """ <tr>
                              <td> <para style="Standard"> </para></td>
                              <td> <para style="terp_default_Center_heading">Response Percentage</para></td>
                              <td> <para style="response-bold">Response Count</para></td>
                          </tr>"""
+
                         for ans in que.answer_choice_ids:
                             progress = ans.average * 7 / 100
-                            rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
+                            rml += """<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
                                     <td>
                                     <illustration>
                                     <stroke color="lightslategray"/>
@@ -204,13 +209,14 @@ class survey_analysis(report_rml):
                             if progress:
                                 rml += """<fill color="lightsteelblue"/>
                                        <rect x="0.2cm" y="-0.35cm"  width='""" + tools.ustr(str(float(progress)) +'cm') + """' height="0.3cm" fill="yes" stroke="no"  round="0.1cm"/>"""
-                            rml +="""
+                            rml += """
                                 <fill color="black"/>
                                 <setFont name="Helvetica" size="9"/>
                                 <drawString x="3.2cm" y="-0.30cm">"""  + tools.ustr(ans.average) + """%</drawString></illustration>
                                     </td>
                                     <td><para style="answer_right">""" + tools.ustr(ans.response) + """</para></td></tr>"""
-                        rml+="""</blockTable>"""
+                        rml += """</blockTable>"""
+
                         if que.is_comment_require:
 #                            if que.make_comment_field:
 #                                cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
@@ -224,12 +230,12 @@ class survey_analysis(report_rml):
 #                            else:
                             cr.execute("select count(id) from survey_response_line where question_id = %d and comment != ''"% que.id)
                             tot_res = cr.fetchone()[0]
-                            rml+="""<blockTable colWidths="450.0,50.0" style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
+                            rml += """<blockTable colWidths="450.0,50.0" style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
                                     <td><para style="answer_right">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
 
                     elif que.type in['single_textbox']:
                         cr.execute("select count(id) from survey_response_line where question_id = %d and single_text!=''" % que.id)
-                        rml +="""<blockTable colWidths="400.0,100.0" style="Table1">
+                        rml += """<blockTable colWidths="400.0,100.0" style="Table1">
                              <tr>
                                  <td> <para style="Standard"> </para></td>
                                  <td> <para style="response-bold">Response Count</para></td>
@@ -237,9 +243,10 @@ class survey_analysis(report_rml):
                             <tr><td><para style="answer"></para></td>
                                 <td><para style="answer_right">""" + tools.ustr(cr.fetchone()[0]) + """ </para></td></tr>
                             </blockTable>"""
+
                     elif que.type in['comment']:
                         cr.execute("select count(id) from survey_response_line where question_id = %d and comment !=''" % que.id)
-                        rml +="""<blockTable colWidths="400.0,100.0" style="Table1">
+                        rml += """<blockTable colWidths="400.0,100.0" style="Table1">
                              <tr>
                                  <td> <para style="Standard"> </para></td>
                                  <td> <para style="response-bold">Response Count</para></td>
@@ -247,23 +254,26 @@ class survey_analysis(report_rml):
                             <tr><td><para style="answer"></para></td>
                                 <td><para style="answer_right">""" + tools.ustr(cr.fetchone()[0]) + """ </para></td></tr>
                             </blockTable>"""
+
                     elif que.type in['rating_scale']:
                         cols_widhts.append(200)
                         for col in range(0,len(que.column_heading_ids) + 2):
                             cols_widhts.append(float(300 / (len(que.column_heading_ids) + 2)))
                         colWidths = ",".join(map(tools.ustr, cols_widhts))
                         matrix_ans = [(0,'')]
+
                         for col in que.column_heading_ids:
                             if col.title not in matrix_ans:
                                 matrix_ans.append((col.id,col.title))
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
+                        rml += """<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
                         for mat_col in range(0,len(matrix_ans)):
-                            rml+="""<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
-                        rml+="""<td><para style="response-bold">Rating Average</para></td>
+                            rml += """<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
+                        rml += """<td><para style="response-bold">Rating Average</para></td>
                                 <td><para style="response-bold">Response Count</para></td>
                                 </tr>"""
+
                         for ans in que.answer_choice_ids:
-                            rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                            rml += """<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
                             res_count = 0
                             rating_weight_sum = 0
                             for mat_col in range(1, len(matrix_ans)):
@@ -275,11 +285,13 @@ class survey_analysis(report_rml):
                                         sqc.question_id = sr.question_id  and sra.answer_id = %d and sqc.title ='%s'\
                                         group by sra.answer_id,sqc.rating_weight" % (ans.id,matrix_ans[mat_col][1]))
                                 col_weight =  cr.fetchone()
+
                                 if not col_weight:
                                     col_weight= (0,0)
                                 elif not col_weight[1]:
                                     col_weight = (col_weight[0],0)
                                 res_count = col_weight[0]
+
                                 if tot_res and res_count:
                                     rating_weight_sum += int(col_weight[1]) * tot_res
                                     tot_per = round((float(tot_res) * 100) / int(res_count), 2)
@@ -290,12 +302,14 @@ class survey_analysis(report_rml):
                                     rml += """<td><para style="answer_bold">""" + tools.ustr(tot_per) + "%(" + tools.ustr(tot_res) + """)</para></td>"""
                                 else:
                                     rml += """<td><para style="answer">""" + tools.ustr(tot_per)+"%(" + tools.ustr(tot_res) + """)</para></td>"""
+
                             percantage = 0.00
                             if res_count:
                                 percantage = round((float(rating_weight_sum)/res_count), 2)
-                            rml+="""<td><para style="answer_right">""" + tools.ustr(percantage) + """</para></td>
+                            rml += """<td><para style="answer_right">""" + tools.ustr(percantage) + """</para></td>
                                 <td><para style="answer_right">""" + tools.ustr(res_count) + """</para></td></tr>"""
-                        rml+="""</blockTable>"""
+                        rml += """</blockTable>"""
+
                     elif que.type in['matrix_of_drop_down_menus']:
                         for column in que.column_heading_ids:
                             rml += """<blockTable colWidths="500" style="Table1"><tr>
@@ -306,8 +320,9 @@ class survey_analysis(report_rml):
                             for col in range(0, len(menu_choices) + 1):
                                 cols_widhts.append(float(300 / (len(menu_choices) + 1)))
                             colWidths = ",".join(map(tools.ustr, cols_widhts))
-                            rml +="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>
+                            rml += """<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>
                                 <td><para style="response"></para></td>"""
+
                             for menu in menu_choices:
                                 rml += """<td><para style="response">""" + to_xml(tools.ustr(menu)) + """</para></td>"""
                             rml += """<td><para style="response-bold">Response Count</para></td></tr>"""
@@ -317,8 +332,9 @@ class survey_analysis(report_rml):
                             cr.execute("select count(sra.id),sra.value_choice, sra.answer_id, sra.column_id from survey_response_answer sra \
                                  where sra.column_id='%s'  group by sra.value_choice ,sra.answer_id, sra.column_id" % (column.id))
                             calc_percantage = cr.dictfetchall()
+
                             for ans in que.answer_choice_ids:
-                                rml+="""<tr><td><para style="answer_right">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
+                                rml += """<tr><td><para style="answer_right">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
                                 for mat_col in range(0, len(menu_choices)):
                                     calc = 0
                                     response = 0
@@ -328,19 +344,22 @@ class survey_analysis(report_rml):
                                         if ans.id == per['answer_id'] and menu_choices[mat_col] == per['value_choice']:
                                             calc = per['count']
                                     percantage = 0.00
+
                                     if calc and response:
                                         percantage = round((float(calc)* 100) / response,2)
                                     if calc:
-                                        rml+="""<td><para style="answer_bold">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
+                                        rml += """<td><para style="answer_bold">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
                                     else:
-                                        rml+="""<td><para style="answer">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
+                                        rml += """<td><para style="answer">""" +tools.ustr(percantage)+"% (" +  tools.ustr(calc) + """)</para></td>"""
+
                                 response = 0
                                 for res in res_count:
                                     if res['answer_id'] == ans.id: response = res['count']
                                 rml += """<td><para style="answer_right">""" + tools.ustr(response) + """</para></td></tr>"""
                             rml += """</blockTable>"""
+
                     elif que.type in['numerical_textboxes']:
-                        rml +="""<blockTable colWidths="240.0,20,100.0,70,70.0" style="Table1">
+                        rml += """<blockTable colWidths="240.0,20,100.0,70,70.0" style="Table1">
                              <tr>
                              <td> <para style="Standard"> </para></td>
                              <td> <para style="Standard"> </para></td>
@@ -355,6 +374,7 @@ class survey_analysis(report_rml):
                             for  tot in tot_res:
                                 total += int(tot['answer'])
                             per = 0.00
+
                             if len(tot_res):
                                 per = round((float(total) / len(tot_res)),2)
                             rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
@@ -377,10 +397,12 @@ class survey_analysis(report_rml):
                         </tr>
                         </blockTable>"""
             rml += """<pageBreak/>"""
+
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
         pdf = create_doc(rml, title=self.title)
+
         return (pdf, report_type)
 
 survey_analysis('report.survey.analysis', 'survey','','')
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index ee58e9536be..25c9a32ce2b 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -31,19 +31,21 @@ class survey_browse_response(report_rml):
         _divide_columns_for_matrix = 0.7
         _display_ans_in_rows = 5
         _pageSize = ('29.7cm','21.1cm')
-        if datas.has_key('form') and datas['form']['orientation']=='vertical':
-            if datas['form']['paper_size']=='letter':
+
+        if datas.has_key('form') and datas['form'].get('orientation','') == 'vertical':
+            if datas['form'].get('paper_size','') == 'letter':
                 _pageSize = ('21.6cm','27.9cm')
-            elif datas['form']['paper_size']=='legal':
+            elif datas['form'].get('paper_size','') == 'legal':
                 _pageSize = ('21.6cm','35.6cm')
-            elif datas['form']['paper_size']=='a4':
+            elif datas['form'].get('paper_size','') == 'a4':
                 _pageSize = ('21.1cm','29.7cm')
-        elif datas.has_key('form') and datas['form']['orientation']=='horizontal':
-            if datas['form']['paper_size']=='letter':
+
+        elif datas.has_key('form') and datas['form'].get('orientation',False) == 'horizontal':
+            if datas['form'].get('paper_size','') == 'letter':
                 _pageSize = ('27.9cm','21.6cm')
-            elif datas['form']['paper_size']=='legal':
+            elif datas['form'].get('paper_size','') == 'legal':
                 _pageSize = ('35.6cm','21.6cm')
-            elif datas['form']['paper_size']=='a4':
+            elif datas['form'].get('paper_size') == 'a4':
                 _pageSize = ('29.7cm','21.1cm')
 
         _frame_width = tools.ustr(_pageSize[0])
@@ -190,9 +192,11 @@ class survey_browse_response(report_rml):
             response_id = [int(context['response_id'][0])]
         else:
             response_id = surv_resp_obj.search(cr, uid, [('survey_id', 'in', ids)])
+
         surv_resp_line_obj = pooler.get_pool(cr.dbname).get('survey.response.line')
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
         surv_ans_obj = pooler.get_pool(cr.dbname).get('survey.answer')
+
         for response in surv_resp_obj.browse(cr, uid, response_id):
             for survey in surv_obj.browse(cr, uid, [response.survey_id.id]):
                 tbl_width = float(_tbl_widths.replace('cm', ''))
@@ -206,6 +210,7 @@ class survey_browse_response(report_rml):
                             <td><para style="terp_tblheader_General_right_simple">""" + to_xml(response.user_id.login) + """</para></td>
                           </tr>
                         </blockTable><para style="P2"></para>"""
+
                 status = "Not Finished"
                 if response.state == "done": status = "Finished"
                 colwidth =  str(tbl_width - 7) + "cm,"
@@ -216,10 +221,12 @@ class survey_browse_response(report_rml):
                             <td><para style="descriptive_text_heading">Status :- """ + to_xml(tools.ustr(status)) + """</para><para style="P2"><font></font></para></td>
                             </tr>
                         </blockTable>"""
+
                 if survey.note:
                     rml += """<blockTable colWidths='""" + _tbl_widths + """' style="note_table">
                             <tr><td><para style="response">""" + to_xml(tools.ustr(survey.note or '')) + """</para><para style="P2"><font></font></para></td></tr>
                         </blockTable>"""
+
                 for page in survey.page_ids:
                     rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="page_tbl">
                                   <tr><td><para style="page">Page :- """ + to_xml(tools.ustr(page.title or '')) + """</para></td></tr>
@@ -229,16 +236,19 @@ class survey_browse_response(report_rml):
                                  <blockTable colWidths='""" + str(_tbl_widths) + """' style="note_table">
                                       <tr><td><para style="response">""" + to_xml(tools.ustr(page.note or '')) + """</para></td></tr>
                                  </blockTable>"""
+
                     for que in page.question_ids:
                         rml += """<para style="P2"></para>
                                 <blockTable colWidths='""" + str(_tbl_widths) + """' style="Table5">
                                   <tr><td><para style="question">""" + to_xml(to_xml(que.question)) + """</para></td></tr>
                                 </blockTable>"""
+
                         answer = surv_resp_line_obj.browse(cr ,uid, surv_resp_line_obj.search(cr, uid, [('question_id', '=', que.id),('response_id', '=', response.id)]))
                         if que.type in ['descriptive_text']:
                             rml +="""<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                          <tr><td> <para style="response">""" + to_xml(tools.ustr(que.descriptive_text)) + """</para></td> </tr>
                                     </blockTable>"""
+
                         elif que.type in ['table']:
                             if len(answer) and answer[0].state == "done":
                                 col_heading = pooler.get_pool(cr.dbname).get('survey.tbl.column.heading')
@@ -250,18 +260,20 @@ class survey_browse_response(report_rml):
                                 colWidths = colWidths + 'cm'
                                 matrix_ans = []
                                 rml +="""<para style="P2"></para><blockTable colWidths=" """ + str(colWidths) + """ " style="Table41"><tr>"""
+
                                 for col in que.column_heading_ids:
                                     if col.title not in matrix_ans:
                                         matrix_ans.append(col.title)
                                         rml += """<td> <para style="terp_tblheader_Details">""" + to_xml(tools.ustr(col.title)) +"""</para></td>"""
                                 rml += """</tr></blockTable>"""
                                 i = 0
+
                                 for row in range(0, que.no_of_rows):
-                                    if i%2!=0:
-                                        style='tbl_white'
+                                    if i%2 != 0:
+                                        style = 'tbl_white'
                                     else:
-                                        style='tbl_gainsboro'
-                                    i+=1
+                                        style = 'tbl_gainsboro'
+                                    i +=1 
                                     rml += """<blockTable colWidths=" """ + str(colWidths) + """ " style='"""+style+"""'><tr>"""
                                     table_data = col_heading.browse(cr, uid, col_heading.search(cr, uid, [('response_table_id', '=', answer[0].id), ('name', '=', row)]))
                                     for column in matrix_ans:
@@ -274,16 +286,19 @@ class survey_browse_response(report_rml):
                                         else:
                                             rml += """<td><para style="terp_default_9"><font color ="white"> </font></para></td>"""
                                     rml += """</tr></blockTable>"""
+
                             else:
                                 rml +="""<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                              <tr><td> <para style="response">No Response</para></td> </tr>
                                         </blockTable>"""
+
                         elif que.type in ['multiple_choice_only_one_ans','multiple_choice_multiple_ans']:
                             if len(answer) and answer[0].state == "done":
                                 ans_list = []
                                 for ans in answer[0].response_answer_ids:
                                     ans_list.append(to_xml(tools.ustr(ans.answer_id.answer)))
                                 answer_choice=[]
+
                                 for ans in que['answer_choice_ids']:
                                     answer_choice.append(to_xml(tools.ustr((ans.answer))))
 
@@ -297,6 +312,7 @@ class survey_browse_response(report_rml):
                                            lst.append('')
                                     if not lst:
                                        del divide_list[divide_list.index(lst):]
+
                                 for divide in divide_list:
                                     a = _divide_columns_for_matrix * len(divide)
                                     b = float(_tbl_widths.replace('cm', '')) - float(a)
@@ -307,6 +323,7 @@ class survey_browse_response(report_rml):
                                     colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                                     colWidths = colWidths +'cm'
                                     rml += """<blockTable colWidths=" """ + colWidths + """ " style="simple_table"><tr>"""
+
                                     for div in range(0, len(divide)):
                                        if divide[div] != '':
                                            if que.type == 'multiple_choice_multiple_ans':
@@ -340,6 +357,7 @@ class survey_browse_response(report_rml):
                                        else:
                                            rml += """<td></td><td></td>"""
                                     rml += """</tr></blockTable>"""
+
                                 if que.is_comment_require and answer[0].comment:
                                     rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table"><tr>
                                                 <td><para style="answer">""" + to_xml(tools.ustr(answer[0].comment)) + """</para></td></tr></blockTable>"""
@@ -347,6 +365,7 @@ class survey_browse_response(report_rml):
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                              <tr><td> <para style="response">No Response</para></td> </tr>
                                           </blockTable>"""
+
                         elif que.type in ['multiple_textboxes_diff_type','multiple_textboxes','date','date_and_time','numerical_textboxes','multiple_textboxes_diff_type']:
                             if len(answer) and answer[0].state == "done":
                                 cols_widhts = []
@@ -355,6 +374,7 @@ class survey_browse_response(report_rml):
                                 colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                                 colWidths = tools.ustr(colWidths) + 'cm'
                                 answer_list = {}
+
                                 for ans in answer[0].response_answer_ids:
                                     answer_list[ans.answer_id.answer] = ans.answer
                                 for que_ans in que['answer_choice_ids']:
@@ -372,6 +392,7 @@ class survey_browse_response(report_rml):
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                          <tr>  <td> <para style="response">No Response</para></td> </tr>
                                         </blockTable>"""
+
                         elif que.type in ['single_textbox']:
                             if len(answer) and answer[0].state == "done":
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
@@ -381,6 +402,7 @@ class survey_browse_response(report_rml):
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                          <tr>  <td> <para style="response">No Response</para></td> </tr>
                                         </blockTable>"""
+
                         elif que.type in ['comment']:
                             if len(answer) and answer[0].state == "done":
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
@@ -390,6 +412,7 @@ class survey_browse_response(report_rml):
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                          <tr>  <td> <para style="response">No Response</para></td> </tr>
                                         </blockTable>"""
+
                         elif que.type in ['matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans', 'rating_scale', 'matrix_of_drop_down_menus']:
                             if len(answer) and answer[0].state == "done":
                                 if que.type  in ['matrix_of_choices_only_one_ans', 'rating_scale'] and que.comment_column:
@@ -401,6 +424,7 @@ class survey_browse_response(report_rml):
                                         cols_widhts.append(float((float(_tbl_widths.replace('cm','')) / float(2.0)) / len(que.column_heading_ids)))
                                 else:
                                     cols_widhts.append(float(_tbl_widths.replace('cm','')))
+
                                 tmp = 0.0
                                 sum =  0.0
                                 i = 0
@@ -415,6 +439,7 @@ class survey_browse_response(report_rml):
                                 colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                                 colWidths = colWidths + 'cm'
                                 matrix_ans = [(0, ''),]
+
                                 for col in que.column_heading_ids:
                                     if col.title not in matrix_ans:
                                         matrix_ans.append((col.id, col.title))
@@ -422,11 +447,13 @@ class survey_browse_response(report_rml):
                                 if que.type in ['matrix_of_choices_only_one_ans', 'rating_scale'] and que.comment_column:
                                     matrix_ans.append(que.column_name)
                                 rml += """<blockTable colWidths=" """ + colWidths + """ " style="simple_table"><tr>"""
+
                                 for mat_col in range(0, len(matrix_ans)):
-                                    rml+="""<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
-                                rml +="""</tr>"""
-                                rml+="""</blockTable>"""
-                                i=0
+                                    rml += """<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
+                                rml += """</tr>"""
+                                rml += """</blockTable>"""
+                                i = 0
+
                                 for ans in que.answer_choice_ids:
                                     if i%2 != 0:
                                         style = 'ans_tbl_white'
@@ -474,6 +501,7 @@ class survey_browse_response(report_rml):
                                             comment_value = ''
                                         rml += """<td><para style="response">""" + to_xml(tools.ustr(comment_value)) + """</para></td>"""
                                     rml += """</tr></blockTable>"""
+
                                 if que.is_comment_require:
                                     rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table"><tr>
                                             <td><para style="answer">""" + to_xml(tools.ustr(answer[0].comment or '')) + """</para></td></tr></blockTable>"""
@@ -481,16 +509,19 @@ class survey_browse_response(report_rml):
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
                                          <tr><td> <para style="response">No Response</para></td> </tr>
                                         </blockTable>"""
+
                 if datas.has_key('form') and not datas['form']['without_pagebreak']:
                     rml += """<pageBreak/>"""
                 elif not datas.has_key('form'):
                     rml += """<pageBreak/>"""
                 else:
                     rml += """<para style="P2"><font></font></para>"""
+
         rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
         pdf = create_doc(rml, title=self.title)
+
         return (pdf, report_type)
 
 survey_browse_response('report.survey.browse.response', 'survey','','')
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index ff1e0bc8424..2c1de9cc71d 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -30,39 +30,41 @@ class survey_form(report_rml):
         _divide_columns_for_matrix = 0.7
         _display_ans_in_rows = 5
         _pageSize = ('29.7cm','21.1cm')
-        if datas.has_key('form') and datas['form']['orientation']=='vertical':
-            if datas['form']['paper_size']=='letter':
+        if datas.has_key('form') and datas['form'].get('orientation','') == 'vertical':
+            if datas['form'].get('paper_size','') == 'letter':
                 _pageSize = ('21.6cm','27.9cm')
-            elif datas['form']['paper_size']=='legal':
+            elif datas['form'].get('paper_size','') == 'legal':
                 _pageSize = ('21.6cm','35.6cm')
-            elif datas['form']['paper_size']=='a4':
+            elif datas['form'].get('paper_size','') == 'a4':
                 _pageSize = ('21.1cm','29.7cm')
-        elif datas.has_key('form') and datas['form']['orientation']=='horizontal':
-            if datas['form']['paper_size']=='letter':
+        elif datas.has_key('form') and datas['form'].get('orientation','') == 'horizontal':
+            if datas['form'].get('paper_size','') == 'letter':
                 _pageSize = ('27.9cm','21.6cm')
-            elif datas['form']['paper_size']=='legal':
+            elif datas['form'].get('paper_size','') == 'legal':
                 _pageSize = ('35.6cm','21.6cm')
-            elif datas['form']['paper_size']=='a4':
+            elif datas['form'].get('paper_size','') == 'a4':
                 _pageSize = ('29.7cm','21.1cm')
 
         _frame_width = tools.ustr(_pageSize[0])
         _frame_height = tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.90))+'cm'
         _tbl_widths = tools.ustr(float(_pageSize[0].replace('cm','')) - float(2.10))+'cm'
+
         rml="""<document filename="Survey Form.pdf">
             <template pageSize="("""+_pageSize[0]+""","""+_pageSize[1]+""")" title='Survey Form.pdf' author="Martin Simon" allowSplitting="20" >
                 <pageTemplate id="first">
                     <frame id="first" x1="0.0cm" y1="1.0cm" width='"""+_frame_width+"""' height='"""+_frame_height+"""'/>
                     <pageGraphics>
                         <lineMode width="1.0"/>
-                        <lines>1.0cm """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+"""</lines>
-                        <lines>1.0cm """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" 1.0cm 1.00cm</lines>
-                        <lines>"""+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" 1.00cm</lines>
-                        <lines>1.0cm 1.00cm """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" 1.00cm</lines>"""
+                        <lines>1.0cm """ + tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00)) + 'cm' + """ """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00)) + 'cm' + """</lines>
+                        <lines>1.0cm """ + tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00)) +'cm'+ """ 1.0cm 1.00cm</lines>
+                        <lines>""" + tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm' + """ """ + tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.00))+'cm'+""" """+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00)) + 'cm' + """ 1.00cm</lines>
+                        <lines>1.0cm 1.00cm """ + tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+""" 1.00cm</lines>"""
+
         if datas.has_key('form') and datas['form']['page_number']:
             rml +="""
                     <fill color="gray"/>
                     <setFont name="Helvetica" size="10"/>
-                    <drawRightString x='"""+tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00))+'cm'+"""' y="0.6cm">Page : <pageNumber/> </drawRightString>"""
+                    <drawRightString x='""" + tools.ustr(float(_pageSize[0].replace('cm','')) - float(1.00)) + 'cm' + """' y="0.6cm">Page : <pageNumber/> </drawRightString>"""
         rml +="""</pageGraphics>
                 </pageTemplate>
             </template>
@@ -158,9 +160,10 @@ class survey_form(report_rml):
                     <blockTable colWidths='"""+_tbl_widths+"""' style="note_table">
                         <tr><td><para style="descriptive_text">""" + to_xml(tools.ustr(survey.note)) + """</para><para style="P2"><font></font></para></td></tr>
                     </blockTable>"""
+
             seq = 0
             for page in survey.page_ids:
-                seq+=1
+                seq += 1
                 rml += """
                 <blockTable colWidths='"""+_tbl_widths+"""' style="page_tbl">
                     <tr><td><para style="page">"""+ tools.ustr(seq) + """. """ + to_xml(tools.ustr(page.title)) + """</para></td></tr>
@@ -169,9 +172,10 @@ class survey_form(report_rml):
                     rml += """<para style="P2"></para><blockTable colWidths='"""+_tbl_widths+"""' style="note_table">
                                 <tr><td><para style="descriptive_text">""" + to_xml(tools.ustr(page.note or '')) + """</para></td></tr>
                             </blockTable>"""
+
                 for que in page.question_ids:
-                    cols_widhts=[]
-                    rml +="""
+                    cols_widhts = []
+                    rml += """
                     <para style="P2"><font></font></para>
                     <blockTable colWidths='"""+_tbl_widths+"""' style="question_tbl">
                         <tr><td><para style="question">"""  + to_xml(tools.ustr(que.question)) + """</para></td></tr>
@@ -180,8 +184,8 @@ class survey_form(report_rml):
                     if que.type in ['descriptive_text']:
                         cols_widhts.append(float(_tbl_widths.replace('cm','')))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
-                        colWidths = colWidths+'cm'
-                        rml+="""
+                        colWidths = colWidths + 'cm'
+                        rml += """
                         <blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
                             <tr>
                                 <td>
@@ -189,8 +193,9 @@ class survey_form(report_rml):
                                 </td>
                             </tr>
                         </blockTable>"""
+
                     elif que.type in ['multiple_choice_multiple_ans','multiple_choice_only_one_ans']:
-                        answer=[]
+                        answer = []
                         for ans in que.answer_choice_ids:
                             answer.append(to_xml(tools.ustr((ans.answer))))
 
@@ -207,18 +212,19 @@ class survey_form(report_rml):
                         for divide in divide_list:
                             a = _divide_columns_for_matrix*len(divide)
                             b = float(_tbl_widths.replace('cm','')) - float(a)
-                            cols_widhts=[]
+                            cols_widhts = []
+
                             for div in range(0,len(divide)):
                                 cols_widhts.append(float(a/len(divide)))
                                 cols_widhts.append(float(b/len(divide)))
                             colWidths = "cm,".join(map(tools.ustr, cols_widhts))
-                            colWidths = colWidths+'cm'
+                            colWidths = colWidths +'cm'
                             rml+="""<blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
                                         <tr>"""
                             for div in range(0,len(divide)):
-                               if divide[div]!='':
+                               if divide[div] != '':
                                    if que.type == 'multiple_choice_multiple_ans':
-                                           rml+="""
+                                           rml += """
                                            <td>
                                                <illustration>
                                                    <rect x="0.1cm" y="-0.4cm" width="0.5 cm" height="0.5cm" fill="no" stroke="yes"/>
@@ -226,7 +232,7 @@ class survey_form(report_rml):
                                            </td>
                                            <td><para style="answer">""" + divide[div] + """</para></td>"""
                                    else:
-                                       rml+="""
+                                       rml += """
                                        <td>
                                            <illustration>
                                                <circle x="0.3cm" y="-0.18cm" radius="0.23 cm" fill="no" stroke="yes"/>
@@ -234,11 +240,12 @@ class survey_form(report_rml):
                                        </td>
                                        <td><para style="answer">""" + divide[div] + """</para></td>"""
                                else:
-                                   rml+="""
+                                   rml += """
                                    <td></td>
                                    <td></td>"""
-                            rml+="""
+                            rml += """
                             </tr></blockTable>"""
+
                     elif que.type in ['matrix_of_choices_only_one_ans','rating_scale','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus']:
                         if len(que.column_heading_ids):
                             cols_widhts.append(float(_tbl_widths.replace('cm',''))/float(2.0))
@@ -246,42 +253,45 @@ class survey_form(report_rml):
                                 cols_widhts.append(float((float(_tbl_widths.replace('cm',''))/float(2.0))/len(que.column_heading_ids)))
                         else:
                             cols_widhts.append(float(_tbl_widths.replace('cm','')))
-                        tmp=0.0
+
+                        tmp = 0.0
                         sum = 0.0
                         i = 0
                         if que.comment_column:
                             for col in cols_widhts:
-                                if i==0:
+                                if i == 0:
                                     cols_widhts[i] = cols_widhts[i]/2.0
                                     tmp = cols_widhts[i]
                                 sum += col
-                                i+=1
+                                i += 1
                             cols_widhts.append(round(tmp,2))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                         colWidths = colWidths+'cm'
                         matrix_ans = ['',]
+
                         for col in que.column_heading_ids:
                             if col.title not in matrix_ans:
                                 matrix_ans.append(col.title)
                         if que.comment_column:
                             matrix_ans.append(to_xml(tools.ustr(que.column_name)))
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
-                            <tr>"""
+                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="ans_tbl"><tr>"""
+
                         for mat_col in matrix_ans:
-                            rml+="""<td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
-                        rml+="""</tr></blockTable>"""
-                        i=0
+                            rml += """<td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
+                        rml += """</tr></blockTable>"""
+                        i = 0
                         for ans in que.answer_choice_ids:
-                            if i%2!=0:
+                            if i%2 != 0:
                                 style='ans_tbl_white'
                             else:
                                 style='ans_tbl_gainsboro'
-                            i+=1
-                            rml+="""
+                            i += 1
+                            rml += """
                             <blockTable colWidths=" """ + colWidths + """ " style='"""+style+"""'>
                             <tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
                             rec_width = float((sum-tmp)*10+100)
                             value = ""
+
                             if que.type in ['matrix_of_drop_down_menus']:
                                 value = """ <fill color="white"/>
                                     <rect x="-0.1cm" y="-0.45cm" width='""" + tools.ustr(cols_widhts[-1] - 0.5) +"cm" + """' height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/>"""
@@ -292,22 +302,23 @@ class survey_form(report_rml):
                                 value = """ <fill color="white"/>
                                     <rect x="0.1cm" y="-0.4cm" width="0.5 cm" height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/>"""
                             for mat_col in range(1,len(matrix_ans)):
-                                if matrix_ans[mat_col]==que.column_name:
-                                    if mat_col==1:
-                                        rml+="""
+                                if matrix_ans[mat_col] == que.column_name:
+                                    if mat_col == 1:
+                                        rml += """
                                             <td><para style="answer_left">""" + to_xml(tools.ustr(que.column_name)) + """</para></td>"""
                                     else:
-                                      rml+="""<td></td>"""
+                                      rml += """<td></td>"""
                                 else:
-                                    rml+="""<td><illustration>""" + value + """</illustration></td>"""
-                            rml+= """</tr></blockTable>"""
-                    elif que.type in ['multiple_textboxes','numerical_textboxes', 'date_and_time','date','multiple_textboxes_diff_type']:
+                                    rml += """<td><illustration>""" + value + """</illustration></td>"""
+                            rml += """</tr></blockTable>"""
+
+                    elif que.type in ['multiple_textboxes', 'numerical_textboxes', 'date_and_time','date','multiple_textboxes_diff_type']:
                         cols_widhts.append(float(_tbl_widths.replace('cm',''))/2)
                         cols_widhts.append(float(_tbl_widths.replace('cm',''))/2)
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                         colWidths = tools.ustr(colWidths) + 'cm'
                         for ans in que.answer_choice_ids:
-                            rml +="""<para style="P1"></para>
+                            rml += """<para style="P1"></para>
                             <blockTable colWidths=" """+ colWidths + """ " style="ans_tbl">
                                 <tr>
                                 <td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
@@ -318,10 +329,11 @@ class survey_form(report_rml):
                                     </td>
                                 </tr>
                             </blockTable>"""
+
                     elif que.type in ['comment']:
                         cols_widhts.append(float(_tbl_widths.replace('cm','')))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
-                        rml+="""<blockTable colWidths=" """ + colWidths + """cm " style="ans_tbl">
+                        rml += """<blockTable colWidths=" """ + colWidths + """cm " style="ans_tbl">
                             <tr>
                                 <td><para style="comment"><font color="white"> </font></para>
                                     <illustration>
@@ -330,10 +342,11 @@ class survey_form(report_rml):
                                 </td>
                             </tr>
                         </blockTable>"""
+
                     elif que.type in ['single_textbox']:
                         cols_widhts.append(float(_tbl_widths.replace('cm','')))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
-                        rml+="""<para style="P2"><font color="white"> </font></para>
+                        rml += """<para style="P2"><font color="white"> </font></para>
                         <blockTable colWidths=" """ + colWidths + """cm " style="ans_tbl">
                             <tr>
                                 <td>
@@ -343,39 +356,44 @@ class survey_form(report_rml):
                                 </td>
                             </tr>
                         </blockTable>"""
+
                     elif que.type in ['table']:
                         tbl_width = float(_tbl_widths.replace('cm',''))
                         for i in range(0,len(que.column_heading_ids)):
                             cols_widhts.append(tbl_width/float(len(que.column_heading_ids)))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                         colWidths = colWidths+'cm'
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="tbl"><tr>"""
+                        rml += """<blockTable colWidths=" """ + colWidths + """ " style="tbl"><tr>"""
                         for col in que.column_heading_ids:
                             rml+="""<td><para style="terp_tblheader_Details">""" + to_xml(tools.ustr(col.title)) + """</para></td>"""
-                        rml+="""</tr></blockTable>"""
-                        i=0
+                        rml += """</tr></blockTable>"""
+                        i = 0
                         for r in range(0,que.no_of_rows):
-                            if i%2!=0:
-                                style='tbl_white'
+                            if i%2 != 0:
+                                style = 'tbl_white'
                             else:
-                                style='tbl_gainsboro'
-                            i+=1
-                            rml+="""<blockTable colWidths=" """ + colWidths + """ " style='"""+style+"""'><tr>"""
+                                style = 'tbl_gainsboro'
+                            i += 1
+                            rml += """<blockTable colWidths=" """  + colWidths + """ " style='"""+style+"""'><tr>"""
                             for c in que.column_heading_ids:
-                               rml+="""
+                               rml += """
                                 <td><para style="terp_default_9"><font color="white"> </font></para></td>"""
-                            rml+="""</tr></blockTable>"""
+                            rml += """</tr></blockTable>"""
+
             if datas.has_key('form') and not datas['form']['without_pagebreak']:
-                rml+="""<pageBreak/>"""
+                rml += """<pageBreak/>"""
             elif not datas.has_key('form'):
-                rml+="""<pageBreak/>"""
+                rml += """<pageBreak/>"""
             else:
-                rml+="""<para style="P2"><font></font></para>"""
-        rml+="""</story></document>"""
+                rml += """<para style="P2"><font></font></para>"""
+
+        rml += """</story></document>"""
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
         pdf = create_doc(rml, title=self.title)
+
         return (pdf, report_type)
+
 survey_form('report.survey.form', 'survey','','')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 649a9e785c8449860024eeec187d329d96fa7170 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 15 Mar 2010 19:10:23 +0530
Subject: [PATCH 011/248] [IMP]: wiki: Apply Act window on the wiki osv memory
 wizard,removed unused imports

bzr revid: ksa@tinyerp.co.in-20100315134023-01bkf9rtaxq6aweb
---
 addons/wiki/wiki_view.xml                     |  40 -----
 addons/wiki/wizard/__init__.py                |   1 +
 addons/wiki/wizard/show_diff.py               |   7 +-
 addons/wiki/wizard/wiki_create_menu.py        |  12 +-
 addons/wiki/wizard/wiki_make_index.py         |  11 +-
 addons/wiki/wizard/wiki_make_index_view.xml   |   6 +
 addons/wiki/wizard/wiki_wiki_help_open.py     |  13 +-
 .../wiki/wizard/wiki_wiki_help_open_view.xml  |   7 +-
 addons/wiki/wizard/wiki_wiki_page_open.py     |  13 +-
 .../wiki/wizard/wiki_wiki_page_open_view.xml  |   7 +-
 addons/wiki/wizard/wizard_view.xml            |  13 +-
 addons/wiki/wizard/wizard_wiki.py             | 142 ------------------
 addons/wiki/wizard/wizard_wiki.xml            | 105 -------------
 13 files changed, 49 insertions(+), 328 deletions(-)
 delete mode 100644 addons/wiki/wizard/wizard_wiki.py
 delete mode 100644 addons/wiki/wizard/wizard_wiki.xml

diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index e6feae5eeba..ec738a5a91f 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -6,18 +6,6 @@
         <menuitem name="Wiki" id="menu_wiki_configuration" parent="base.menu_document_configuration" sequence="2"/>
         <menuitem id="base.menu_document2" name="Collaborative Content" parent="base.menu_document"/>
 
-         <wizard
-            id="wizard_group_menu_create"
-            string="Create Menu"
-            menu="True"
-            name="wiki.create.menu"/>
-
-        <wizard
-            id="wizard_open_page"
-            string="Open Page"
-            menu="True"
-            name="wiki.wiki.page.open"/>
-
         <record model="ir.ui.view" id="wiki_group_tree">
             <field name="name">wiki.groups.tree</field>
             <field name="model">wiki.groups</field>
@@ -54,11 +42,6 @@
 			 	    	string="Create Menu"
 			 	     	type="action"
 			 	     	icon="gtk-justify-fill" />
-			 	     <button
-			 	    	name="%(wiki.action_view_wiki_wiki_page_open)d"
-			 	    	string="Open Wiki Page"
-			 	     	type="action"/>
-
                 </form>
             </field>
         </record>
@@ -142,14 +125,6 @@
                         <field name="tags" select="1" groups="base.group_extended"/>
                         <field name="summary" colspan="4" select="2" groups="base.group_extended"/>
                     </group>
-                     <button
-			 	    	name="%(wiki.action_view_wiki_wiki_help_open)d"
-			 	    	string="Basic Wiki Editing"
-			 	     	type="action"/>
-			 	     <button
-			 	    	name="%(wiki.action_view_wiki_make_index)d"
-			 	    	string="Create Index"
-			 	     	type="action"/>
                 </form>
             </field>
         </record>
@@ -247,12 +222,6 @@
             res_model="wiki.wiki"
             src_model="wiki.groups"/>
 
-         <wizard
-            id="wizard_open_page"
-            string="Open Wiki Pages"
-            name="wiki.wiki.page.open"
-            model="wiki.groups"/>
-
         <record id="ir_open_wiki_pages" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">wiki.groups</field>
@@ -260,14 +229,5 @@
             <field eval="'ir.actions.wizard,%d'%wizard_open_page" name="value"/>
             <field eval="True" name="object"/>
         </record>
-
-        <!--record id="ir_open_account_account" model="ir.values">
-            <field eval="'tree_but_open'" name="key2"/>
-            <field eval="'wiki.groups'" name="model"/>
-            <field name="name">Search a Page</field>
-           <field eval="'ir.actions.act_window,%d'%act_wiki_group_open" name="value"/>
-            <field eval="True" name="object">
-        </record-->
-
     </data>
 </openerp>
diff --git a/addons/wiki/wizard/__init__.py b/addons/wiki/wizard/__init__.py
index 13caf0b9216..739966e5557 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/wiki/wizard/__init__.py
@@ -23,5 +23,6 @@ import wiki_wiki_page_open
 import wiki_create_menu
 import wiki_wiki_help_open
 import wiki_make_index
+import show_diff
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/show_diff.py b/addons/wiki/wizard/show_diff.py
index 376ed9885e4..d77130f2aed 100644
--- a/addons/wiki/wizard/show_diff.py
+++ b/addons/wiki/wizard/show_diff.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,16 +15,15 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 from osv import fields,osv
-from tools.translate import _
 
 class showdiff(osv.osv_memory):
     _name = 'wizard.wiki.history.show_diff'
-    
+
     def _get_diff(self, cr, uid, ctx):
         history = self.pool.get('wiki.wiki.history')
         ids = ctx.get('active_ids')
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index 352e9e78a4c..b9b2d5563c4 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -20,11 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from osv import fields, osv
-from service import web_services
-import pooler
-import time
-import wizard
 
 class wiki_create_menu(osv.osv_memory):
     _name = "wiki.create.menu"
@@ -36,7 +31,12 @@ class wiki_create_menu(osv.osv_memory):
     }
 
     def wiki_menu_create(self, cr, uid, ids, context):
-        """ Create Menu On the base of Group id and Action id """
+        """ Create Menu On the base of Group id and Action id
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of create menu’s IDs
+
+        """
 
         for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
             for menu in self.pool.get('wiki.create.menu').browse(cr, uid, ids):
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py
index 56980c5288e..78964743a8b 100644
--- a/addons/wiki/wizard/wiki_make_index.py
+++ b/addons/wiki/wizard/wiki_make_index.py
@@ -20,10 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-import time
-import wizard
-import pooler
 
 class wiki_make_index(osv.osv_memory):
     _name = "wiki.make.index"
@@ -32,7 +28,12 @@ class wiki_make_index(osv.osv_memory):
     }
 
     def wiki_do_index(self, cr, uid, ids, context):
-        """ Makes Index according to page hierarchy"""
+        """ Makes Index according to page hierarchy
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of wiki index’s IDs
+
+        """
         for index_obj in self.browse(cr,uid,ids):
             wiki_pool = self.pool.get('wiki.wiki')
             cr.execute("Select id, section from wiki_wiki where id = ANY(%s) \
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index fcba8909f5f..1138afc908a 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -24,7 +24,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
     	</record>
 
+		<act_window id="action_view_wiki_make_index_values"
+    		key2="client_action_multi" name="Create Index"
+    		res_model="wiki.make.index" src_model="wiki.wiki"
+    		view_mode="form" target="new" view_type="form" />
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_wiki_help_open.py b/addons/wiki/wizard/wiki_wiki_help_open.py
index 933aa54f7cd..934d5fdccb7 100644
--- a/addons/wiki/wizard/wiki_wiki_help_open.py
+++ b/addons/wiki/wizard/wiki_wiki_help_open.py
@@ -21,18 +21,19 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-import time
-import wizard
-import pooler
 
 class wiki_wiki_help_open(osv.osv_memory):
     _name = "wiki.wiki.help.open"
     _description = "Basic Wiki Editing"
     _columns = {
     }
-    def _open_wiki_page(self, cr, uid, ids, context):
-        """ Opens Wiki Page for Editing"""
+    def open_wiki_page(self, cr, uid, ids, context):
+        """ Opens Wiki Page for Editing
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of wiki page’s IDs
+
+        """
         pages = self.pool.get('wiki.wiki').search(cr, uid, [('name','=','Basic Wiki Editing')])
 
         value = {
diff --git a/addons/wiki/wizard/wiki_wiki_help_open_view.xml b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
index 2f525443900..76e96664f3d 100644
--- a/addons/wiki/wizard/wiki_wiki_help_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
@@ -9,7 +9,7 @@
               <form string="Open Help">
              	 <separator string="" colspan="6" />
               	 <label string="" colspan="2" />
-                 <button name="_open_wiki_page" string="Basic Wiki Editing" type="object"/>
+                 <button name="open_wiki_page" string="Basic Wiki Editing" type="object"/>
              </form>
             </field>
 		</record>
@@ -22,5 +22,10 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
+
+        <act_window id="action_view_wiki_wiki_help_open_vals"
+    		key2="client_action_multi" name="Basic Wiki Editing"
+    		res_model="wiki.wiki.help.open" src_model="wiki.wiki"
+    		view_mode="form" target="new" view_type="form" />
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 4102e6486dd..37b31a10ead 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -20,10 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-import time
-import wizard
-import pooler
 
 class wiki_wiki_page_open(osv.osv_memory):
     _name = "wiki.wiki.page.open"
@@ -31,8 +27,13 @@ class wiki_wiki_page_open(osv.osv_memory):
     _columns = {
 
     }
-    def _open_wiki_page(self, cr, uid, ids, context):
-        """ Opens Wiki Page of Group"""
+    def open_wiki_page(self, cr, uid, ids, context):
+        """ Opens Wiki Page of Group
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of open wiki page’s IDs
+        @return : dictionay of open wiki window on give group id
+        """
         for group in self.pool.get('wiki.groups').browse(cr, uid,ids):
 
          for openpage in self.pool.get('wiki.wiki.page.open').browse(cr, uid,ids):
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 7e21f868d6e..6df047882a4 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -9,7 +9,7 @@
               <form string="Open Page">
              	<separator string="" colspan="6" />
               	<label string="" colspan="2" />
-               	<button name="_open_wiki_page" string="Open Wiki Page" type="object"/>
+               	<button name="open_wiki_page" string="Open Wiki Page" type="object"/>
              </form>
             </field>
 		</record>
@@ -22,5 +22,10 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
     	</record>
+
+    	<act_window id="action_view_wiki_wiki_page_open_vals"
+    		key2="client_action_multi" name="Open Wiki Page"
+    		res_model="wiki.wiki.page.open" src_model="wiki.groups"
+    		view_mode="form" target="new" view_type="form" />
     </data>
 </openerp>
diff --git a/addons/wiki/wizard/wizard_view.xml b/addons/wiki/wizard/wizard_view.xml
index ce639714daf..2374d22e2dc 100644
--- a/addons/wiki/wizard/wizard_view.xml
+++ b/addons/wiki/wizard/wizard_view.xml
@@ -12,7 +12,7 @@
                 </form>
             </field>
         </record>
-        <act_window
+       <act_window
             id="act_view_diff"
             name="Differences"
             res_model="wizard.wiki.history.show_diff"
@@ -20,16 +20,5 @@
             target="new"
             view_mode="form"
         />
-        <wizard
-            id="wizard_make_index"
-            string="Create Index"
-            name="wiki.make.index"
-            model="wiki.wiki"/>
-        <wizard
-            id="wizard_open_help"
-            string="Basic Wiki Editing"
-            name="wiki.wiki.help.open"
-            model="wiki.wiki"/>
-
     </data>
 </openerp>
diff --git a/addons/wiki/wizard/wizard_wiki.py b/addons/wiki/wizard/wizard_wiki.py
deleted file mode 100644
index 9113b0a1b72..00000000000
--- a/addons/wiki/wizard/wizard_wiki.py
+++ /dev/null
@@ -1,142 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-from service import web_services
-import time
-import wizard
-import pooler
-
-
-class wizard_create_menu(osv.osv_memory):
-    _name = "wiki.wizard.create.menu"
-    _description="Wiki.Wizard Create Menu"
-    _columns={
-        'menu_name':fields.char('Menu Name', size=256, select=True, required=True), 
-        'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True), 
-        'page': fields.many2one('wiki.wiki', 'Group Home Page'), 
-    }
-
-    def wiki_menu_create(self, cr, uid, ids, context):
-        group = self.pool.get('wiki.groups').browse(cr, uid, ids)[0]
-        menu = self.pool.get('wiki.wizard.create.menu').browse(cr, uid, ids)[0]
-        action_id = self.pool.get('').search(cr, uid, [('wiz_name', '=', 'wiki.wiki.page.open')])
-
-        menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
-        'name':menu.menu_name, 
-        'parent_id':menu.menu_parent_id.id, 
-        'icon': 'STOCK_DIALOG_QUESTION', 
-        'action': 'ir.actions.wizard,'+str(action_id[0])
-        }, context)
-
-        home = menu.page.id
-        group_id = menu.id
-        res = {
-        'home':home, 
-    }
-        self.pool.get('wiki.groups').write(cr, uid, ids, res)
-        self.pool.get('wiki.groups.link').create(cr, uid, {'group_id':group_id, 'action_id':menu_id})
-
-        return {}
-
-
-wizard_create_menu()
-
-class wiz_open_help(osv.osv_memory):
-    _name = "wiki.wiz.open.help"
-    _description="Wiki Open Help"
-    _columns={
-        'name':fields.char('Basic Wiki Editing', size=256, select=True, required=False), 
-
-    }
-    def _open_wiki_page(self, cr, uid, ids, context):
-        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
-
-        value = {
-            'view_id': False, 
-            'res_id': pages[0], 
-        }
-
-        return value
-
-wiz_open_help()
-
-class wiz_open_page(osv.osv_memory):
-    _name = "wiki.wiz.open.page"
-    _description="wiz open page"
-    _columns={
-        'name':fields.char('Wiki Page', size=256, select=True, required=False), 
-
-    }
-    def _open_wiki_page(self, cr, uid, ids, context):
-        group = self.pool.get('wiki.groups').browse(cr, uid, ids)[0]
-        openpage = self.pool.get('wiki.wiz.open.page').browse(cr, uid, ids)[0]
-
-        value = {
-            'context': "{'group_id':%d, 'section':%s}" % (group.id, group.section), 
-            'domain': "[('group_id','=',%d)]" % (group.id), 
-            'type': 'ir.actions.act_window', 
-        }
-        if group.method == 'page':
-            value['res_id'] = group.home.id
-        elif group.method == 'list':
-            value['view_type'] = 'form'
-            value['view_mode'] = 'tree,form'
-        elif group.method == 'tree':
-            view_id = pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
-            value['view_id'] = view_id
-            value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
-            value['view_type'] = 'tree'
-
-        return value
-wiz_open_page()
-
-class showdiff(osv.osv_memory):
-    _name = 'wizard.wiki.history.show_diff'
-
-    def _get_diff(self, cr, uid, ctx):
-        history = self.pool.get('wiki.wiki.history')
-        ids = ctx.get('active_ids')
-        diff = ""
-        if len(ids) == 2:
-            if ids[0] > ids[1]:
-                diff = history.getDiff(cr, uid, ids[1], ids[0])
-            else:
-                diff = history.getDiff(cr, uid, ids[0], ids[1])
-
-        elif len(ids) == 1:
-            old = history.browse(cr, uid, ids[0])
-            nids = history.search(cr, uid, [('wiki_id', '=', old.wiki_id.id)])
-            nids.sort()
-            diff = history.getDiff(cr, uid, ids[0], nids[-1])
-        else:
-            raise osv.except_osv(_('Warning'), _('You need to select minimum 1 or maximum 2 history revision!'))
-        return diff
-
-    _columns = {
-        'diff': fields.text('Diff'), 
-    }
-    _defaults = {
-        'diff': _get_diff
-    }
-
-showdiff()
-
diff --git a/addons/wiki/wizard/wizard_wiki.xml b/addons/wiki/wizard/wizard_wiki.xml
deleted file mode 100644
index 8125836d8bf..00000000000
--- a/addons/wiki/wizard/wizard_wiki.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-    <!--  correct indentation -->
-
-    	<record id="view_wizard_create_menu" model="ir.ui.view">
-            <field name="name">Create Menu</field>
-            <field name="model">wiki.wizard.create.menu</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Create Menu">
-             		<separator string="Menu Information" colspan="4" />
-                	<field name="menu_name" />
-                	<field name="menu_parent_id" />
-                	<field name="page" colspan="4" />
-	                	<separator string="" colspan="4" />
-    	              	<label string="" colspan="2" />
-        	        		<button special="cancel" string="Cancel" />
-            	    		<button name="wiki_menu_create" string="Create Menu" type="object"/>
-             </form>
-            </field>
-		</record>
-
-		<record id="wizard_group_menu_create" model="ir.actions.act_window">
-            <field name="name">Create Menu</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wiki.wizard.create.menu</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <!-- ==========================open help =========================-->
-
-        <record id="view_wiz_open_help" model="ir.ui.view">
-            <field name="name">Open Help</field>
-            <field name="model">wiki.wiz.open.help</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Open Help">
-                	<field name="name" />
-                 	<separator string="" colspan="6" />
-                  	<label string="" colspan="2" />
-             </form>
-            </field>
-		</record>
-
-		<record id="wizard_open_help" model="ir.actions.act_window">
-            <field name="name">Open Help</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wiki.wiki</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="target">new</field>
-        </record>
-        <!-- ==========================Open Page =========================-->
-
-		<record id="view_wiz_open_page" model="ir.ui.view">
-            <field name="name">Open Page</field>
-            <field name="model">wiki.wiz.open.page</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-              <form string="Open Page">
-                	<field name="name" />
-                 	<separator string="" colspan="6" />
-                  	<label string="" colspan="2" />
-             </form>
-            </field>
-		</record>
-
-		<record id="wizard_open_page" model="ir.actions.act_window">
-            <field name="name">Open Page</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wiki.wiki</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="target">new</field>
-    	</record>
-	
-	
-	<record id="view_wiki_history_diff" model="ir.ui.view">
-            <field name="name">Differences</field>
-            <field name="model">wizard.wiki.history.show_diff</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="History Differance">
-                    <separator string="Wiki Differance" colspan="4"/>
-                    <field name="diff" widget="text_html" nolabel="1" colspan="4"/>
-                </form>
-            </field>
-        </record>
-
-        <act_window
-            id="act_view_diff" 
-            name="Differences" 
-            res_model="wizard.wiki.history.show_diff" 
-            src_model="wiki.wiki.history"
-            target="new"
-            view_mode="form"
-        />
-	
-	
-	</data>
-</openerp>
\ No newline at end of file

From 4a10272ddb097d4fe913a72d9a8390bcd58c3537 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 15 Mar 2010 19:12:21 +0530
Subject: [PATCH 012/248] [IMP]: olap: Apply Act window on the olap module and
 doc string,removed unused imports

bzr revid: ksa@tinyerp.co.in-20100315134221-w4a7g22dhdb4lefq
---
 addons/olap/wizard/__init__.py               |  1 -
 addons/olap/wizard/olap_load_column.py       | 15 ++++++++++-----
 addons/olap/wizard/olap_load_column_view.xml | 17 ++++++-----------
 addons/olap/wizard/olap_query_logs_clear.py  | 13 +++++++++----
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/addons/olap/wizard/__init__.py b/addons/olap/wizard/__init__.py
index 94763698ad2..e7871702628 100755
--- a/addons/olap/wizard/__init__.py
+++ b/addons/olap/wizard/__init__.py
@@ -29,6 +29,5 @@ import wizard_query_builder
 import wizard_load_data
 import wizard_load_configured_table
 import wizard_test_connection
-#import wizard_application_configure
 import olap_query_logs_clear
 import olap_load_column
\ No newline at end of file
diff --git a/addons/olap/wizard/olap_load_column.py b/addons/olap/wizard/olap_load_column.py
index e60f0f2bfa6..97dc635d3fc 100755
--- a/addons/olap/wizard/olap_load_column.py
+++ b/addons/olap/wizard/olap_load_column.py
@@ -24,11 +24,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+
 from osv import fields, osv
-from service import web_services
-import pooler
-import time
-import wizard
 
 class olap_load_column(osv.osv_memory):
     """ Load Database Column """
@@ -36,7 +33,15 @@ class olap_load_column(osv.osv_memory):
     _description = "Olap Load Column"
 
     def get_table_data(self, cr, uid, ids, context={}):
-        ids_cols=self.pool.get('olap.database.columns').search(cr, uid,\
+        """
+        This function load column
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user\'s ID for security checks,
+        @param ids: List of load column,
+        @return : dictionary of database columns window on give id
+
+        """
+        ids_cols = self.pool.get('olap.database.columns').search(cr, uid,\
                              ([('table_id','=',context['active_id'])]),context={})
         model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
                         [('model','=','ir.ui.view'),\
diff --git a/addons/olap/wizard/olap_load_column_view.xml b/addons/olap/wizard/olap_load_column_view.xml
index 48fd23362de..ef76ec555c6 100644
--- a/addons/olap/wizard/olap_load_column_view.xml
+++ b/addons/olap/wizard/olap_load_column_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="">
-              	<separator string="                    " colspan="4"/> 
+              	<separator string="                        " colspan="4"/>
             	<button name="get_table_data" string="Open" type="object"/>
 			</form>
             </field>
@@ -23,15 +23,10 @@
             <field name="target">new</field>
     	</record>
 
-		<record model="ir.values" id="lap_load_column">
-            <field name="model_id" ref="olap.model_olap_database_columns" />
-            <field name="object" eval="1" />
-            <field name="name">Open Columns</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_olap_load_column'))" />
-            <field name="key">action</field>
-            <field name="model">olap.database.columns</field>
-        </record>
-        
+        <act_window id="action_olap_load_column_values"
+    		key2="client_action_multi" name="Open Columns"
+    		res_model="olap.load.column" src_model="olap.database.columns"
+    		view_mode="form" target="new" view_type="form" />
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/olap/wizard/olap_query_logs_clear.py b/addons/olap/wizard/olap_query_logs_clear.py
index 63f35a382ea..8d271315874 100755
--- a/addons/olap/wizard/olap_query_logs_clear.py
+++ b/addons/olap/wizard/olap_query_logs_clear.py
@@ -24,11 +24,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+
 from osv import fields, osv
-from service import web_services
-import pooler
-import time
-import wizard
 
 class olap_query_logs_clear(osv.osv_memory):
     """ Clear the Logs for Given User  """
@@ -47,6 +44,13 @@ class olap_query_logs_clear(osv.osv_memory):
             }
 
     def clear_logs(self,cr,uid,part,context={}):
+        """
+        This function load column
+        @param cr: the current row, from the database cursor,
+        @param uid: the current users ID for security checks,
+        @param ids: List of load column,
+        @return: dictionary of query logs clear message window
+        """
         ids = self.pool.get('olap.query.logs').search(cr,uid,[('user_id','=',uid)])
         self.pool.get('olap.query.logs').unlink(cr, uid,ids,context)
         data_obj = self.pool.get('ir.model.data')
@@ -66,6 +70,7 @@ class olap_query_logs_clear(osv.osv_memory):
 olap_query_logs_clear()
 
 class olap_query_logs_clear_msg(osv.osv_memory):
+    """   Display clear log message    """
     _name = "olap.query.logs.clear.msg"
     _description = "Olap Query Logs Clear Message"
     _columns = {

From 4107db2dbe423effc8feb513fda0e5e518c7f88c Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 15 Mar 2010 19:23:05 +0530
Subject: [PATCH 013/248] [IMP]: board: Converted wizards to osv_memory wizards

bzr revid: atp@tinyerp.co.in-20100315135305-ifo07chq160w6weg
---
 addons/board/__terp__.py                      |  2 +-
 addons/board/board_view.xml                   |  4 +-
 addons/board/wizard/__init__.py               |  2 +-
 addons/board/wizard/board_menu_create.py      | 74 ++++++++++++++++
 .../board/wizard/board_menu_create_view.xml   | 34 ++++++++
 addons/board/wizard/board_wizard.py           | 86 -------------------
 6 files changed, 112 insertions(+), 90 deletions(-)
 create mode 100644 addons/board/wizard/board_menu_create.py
 create mode 100644 addons/board/wizard/board_menu_create_view.xml
 delete mode 100644 addons/board/wizard/board_wizard.py

diff --git a/addons/board/__terp__.py b/addons/board/__terp__.py
index 07c595c1fc9..8476be95f4e 100644
--- a/addons/board/__terp__.py
+++ b/addons/board/__terp__.py
@@ -27,7 +27,7 @@
     'description': """Base module for all dashboards.""",
     'author': 'Tiny',
     'depends': ['base'],
-    'update_xml': ['security/ir.model.access.csv', 'board_view.xml'],
+    'update_xml': ['security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 4b55e43c4dd..981a5521818 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -34,7 +34,7 @@
             <field name="view_mode">form,tree</field>
         </record>
 
-        <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu" />
+        <!-- <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu" /> -->
 
         <record id="view_board_tree" model="ir.ui.view">
             <field name="name">board.board.tree</field>
@@ -54,7 +54,7 @@
             <field name="arch" type="xml">
                 <form string="Dashboard">
                     <field name="name" select="1"/>
-                    <button colspan="2" name="%(wizard_board_create_menu)d" string="Create Menu" type="action" icon="gtk-justify-fill"/>
+                    <button colspan="2" name="%(action_board_menu_create)d" string="Create Menu" type="action" icon="gtk-justify-fill"/>
                     <field colspan="4" name="line_ids">
                         <tree string="Dashboard View">
                             <field name="name"/>
diff --git a/addons/board/wizard/__init__.py b/addons/board/wizard/__init__.py
index e6cc92cbfb1..a22e1d05e43 100644
--- a/addons/board/wizard/__init__.py
+++ b/addons/board/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import board_wizard
+import board_menu_create
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
new file mode 100644
index 00000000000..5c5dc800ba1
--- /dev/null
+++ b/addons/board/wizard/board_menu_create.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class board_menu_create(osv.osv_memory):
+    """
+    Create Menu
+    """
+    def check_views(self, cr, uid, context):
+        board = self.pool.get('board.board').browse(cr, uid, context['active_id'])
+        if not board.line_ids:
+            raise osv.except_osv(_('User Error!'), _('Please Insert Dashboard View(s) !'))    
+        return False
+    
+    def board_menu_create(self, cr, uid, ids, context):
+        """
+        Create Menu.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Board Menu Create's IDs
+        @return : Dictionary {}.
+        """
+        board = self.pool.get('board.board').browse(cr, uid, context['active_id'])
+        action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
+            'name': board.name,
+            'view_type':'form',
+            'view_mode':'form',
+            'res_model': 'board.board',
+            'view_id': board.view_id.id,
+            })
+        for data in self.read(cr, uid, ids):
+            self.pool.get('ir.ui.menu').create(cr, uid, {
+                'name': data['menu_name'],
+                'parent_id': data['menu_parent_id'],
+                'icon': 'STOCK_SELECT_COLOR',
+                'action': 'ir.actions.act_window,'+str(action_id)
+                }, context)
+        
+        return {}
+    
+    _name = "board.menu.create"
+    _description = "Menu Create"
+    _columns = {
+             'menu_name':fields.char('Menu Name', size=64, required=True),
+             'menu_parent_id':fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
+          }
+    _defaults = {
+            'menu_name':check_views,
+          }
+
+board_menu_create()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
new file mode 100644
index 00000000000..e33e6d1cd52
--- /dev/null
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_board_menu_create" model="ir.ui.view">
+            <field name="name">board.menu.create.form</field>
+            <field name="model">board.menu.create</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Menu For Dashboard">
+                	<group colspan="4" >
+                		 <separator string="Menu Information" colspan="4"/>
+              			 <field name="menu_name"/>
+              			 <field name="menu_parent_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-save" string="Create Menu" name="board_menu_create" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_board_menu_create" model="ir.actions.act_window">
+            <field name="name">Create Board Menu</field>
+            <field name="res_model">board.menu.create</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_board_menu_create"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/board/wizard/board_wizard.py b/addons/board/wizard/board_wizard.py
deleted file mode 100644
index 9fae1c2ea7c..00000000000
--- a/addons/board/wizard/board_wizard.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-
-import time
-import wizard
-import osv
-import pooler
-from tools.translate import _
-
-section_form = '''<?xml version="1.0"?>
-<form string="Create Menu For Dashboard">
-    <separator string="Menu Information" colspan="4"/>
-    <field name="menu_name"/>
-    <field name="menu_parent_id"/>
-</form>'''
-
-section_fields = {
-    'menu_name': {'string':'Menu Name', 'type':'char', 'required':True, 'size':64},
-    'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
-}
-
-def check_views(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    board = pool.get('board.board').browse(cr, uid, data['id'])
-    if not board.line_ids:
-        raise wizard.except_wizard(_('User Error!'),_('Please Insert Dashboard View(s) !'))    
-    return data['form']
-
-def board_menu_create(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    board = pool.get('board.board').browse(cr, uid, data['id'])
-
-    action_id = pool.get('ir.actions.act_window').create(cr, uid, {
-        'name': board.name,
-        'view_type':'form',
-        'view_mode':'form',
-        'res_model': 'board.board',
-        'view_id': board.view_id.id,
-    })
-    pool.get('ir.ui.menu').create(cr, uid, {
-        'name': data['form']['menu_name'],
-        'parent_id': data['form']['menu_parent_id'],
-        'icon': 'STOCK_SELECT_COLOR',
-        'action': 'ir.actions.act_window,'+str(action_id)
-    }, context)
-        
-    return {}
-
-class wizard_section_menu_create(wizard.interface):
-    states = {
-        'init': {
-            'actions': [check_views], 
-            'result': {'type':'form', 'arch':section_form, 'fields':section_fields, 'state':[('end','Cancel'),('create_menu','Create Menu')]}
-        },
-        'create_menu': {
-            'actions': [board_menu_create], 
-            'result': {
-                'type':'state', 
-                'state':'end'
-            }
-        }
-    }
-wizard_section_menu_create('board.board.menu.create')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 3856cba709e9a9d3e77a014e6779d0e005ebc854 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 15 Mar 2010 19:23:41 +0530
Subject: [PATCH 014/248] [IMP]: delivery: Converted wizards to osv_memory
 wizards

bzr revid: atp@tinyerp.co.in-20100315135341-rp86g0cna380b2ef
---
 addons/delivery/__terp__.py                   |   1 +
 addons/delivery/delivery_wizard.xml           |   2 +-
 addons/delivery/wizard/delivery_sale_order.py | 123 ++++++++----------
 .../wizard/delivery_sale_order_view.xml       |  38 ++++++
 4 files changed, 97 insertions(+), 67 deletions(-)
 create mode 100644 addons/delivery/wizard/delivery_sale_order_view.xml

diff --git a/addons/delivery/__terp__.py b/addons/delivery/__terp__.py
index 5897cdb2f99..fcceebe1560 100644
--- a/addons/delivery/__terp__.py
+++ b/addons/delivery/__terp__.py
@@ -30,6 +30,7 @@
     'init_xml': ['delivery_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
+        'wizard/delivery_sale_order_view.xml',
         'delivery_view.xml',
         'delivery_wizard.xml',
         'partner_view.xml'
diff --git a/addons/delivery/delivery_wizard.xml b/addons/delivery/delivery_wizard.xml
index b497e6144d9..69f20aa6498 100644
--- a/addons/delivery/delivery_wizard.xml
+++ b/addons/delivery/delivery_wizard.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         
-        <wizard id="wizard_deliver_line_add" keyword="client_action_multi" model="sale.order" name="delivery.sale.order" string="Delivery Costs"/>
+        <!--  <wizard id="wizard_deliver_line_add" keyword="client_action_multi" model="sale.order" name="delivery.sale.order" string="Delivery Costs"/>-->
         
     </data>
 </openerp>
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index c7870e43d85..d483d642a6d 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -19,78 +19,69 @@
 #
 ##############################################################################
 
-import time
-import wizard
-import ir
-import pooler
+from osv import fields, osv
 from tools.translate import _
+import time
 
-from tools.misc import UpdateableStr
+class delivery_sale_order(osv.osv_memory):
+    """
+    Sale order Delivery.
+    """
+    def _delivery_default(self, cr, uid, context):
+        """
+        Get Default value for carrier_id field.
+        """
+        order_obj = self.pool.get('sale.order')
+        order = order_obj.browse(cr, uid, context['active_ids'])[0]
+        if not order.state in ('draft'):
+            raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
+        carrier_id = order.partner_id.property_delivery_carrier.id
+        return carrier_id
 
-delivery_form = UpdateableStr()
+    def delivery_set(self, cr, uid, ids, context):
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of delivery set order’s IDs
+        @return: dictionary {}.
+        """
+        for data in self.read(cr, uid, ids):
+            order_obj = self.pool.get('sale.order')
+            line_obj = self.pool.get('sale.order.line')
+            order_objs = order_obj.browse(cr, uid, context['active_ids'], context)
 
-delivery_fields = {
-    'carrier_id' : {'string':'Delivery Method', 'type':'many2one', 'relation': 'delivery.carrier','required':True}
-}
+            for order in order_objs:
+                grid_id = self.pool.get('delivery.carrier').grid_get(cr, uid, [data['carrier_id']], order.partner_shipping_id.id)
+                if not grid_id:
+                    raise osv.except_osv(_('No grid avaible !'), _('No grid matching for this carrier !'))
+                grid_obj = self.pool.get('delivery.grid')
+                grid = grid_obj.browse(cr, uid, [grid_id])[0]
 
-def _delivery_default(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('sale.order')
-    order = order_obj.browse(cr, uid, data['ids'])[0]
-    delivery_form.string="""<?xml version="1.0"?>
-    <form string="Create deliveries">
-        <separator colspan="4" string="Delivery Method" />
-        <field name="carrier_id" context="{'order_id': %d}"/>
-    </form>
-    """ % (data['id'],)
+                taxes = grid.carrier_id.product_id.taxes_id
+                fpos = order.fiscal_position or False
+                taxes_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
+                line_obj.create(cr, uid, {
+                    'order_id': order.id,
+                    'name': grid.carrier_id.name,
+                    'product_uom_qty': 1,
+                    'product_uom': grid.carrier_id.product_id.uom_id.id,
+                    'product_id': grid.carrier_id.product_id.id,
+                    'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
+                    'tax_id': [(6,0,taxes_ids)],
+                    'type': 'make_to_stock'
+                    })
+            return {}
 
-
-    if not order.state in ('draft'):
-        raise wizard.except_wizard(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
-
-
-    carrier_id = order.partner_id.property_delivery_carrier.id
-    return {'carrier_id': carrier_id}
-
-def _delivery_set(self, cr, uid, data, context):
-    order_obj = pooler.get_pool(cr.dbname).get('sale.order')
-    line_obj = pooler.get_pool(cr.dbname).get('sale.order.line')
-    order_objs = order_obj.browse(cr, uid, data['ids'], context)
-
-    for order in order_objs:
-        grid_id = pooler.get_pool(cr.dbname).get('delivery.carrier').grid_get(cr, uid, [data['form']['carrier_id']],order.partner_shipping_id.id)
-        if not grid_id:
-            raise wizard.except_wizard(_('No grid avaible !'), _('No grid matching for this carrier !'))
-        grid_obj=pooler.get_pool(cr.dbname).get('delivery.grid')
-        grid = grid_obj.browse(cr, uid, [grid_id])[0]
-
-        taxes = grid.carrier_id.product_id.taxes_id
-        fpos = order.fiscal_position or False
-        taxes_ids = pooler.get_pool(cr.dbname).get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-        line_obj.create(cr, uid, {
-            'order_id': order.id,
-            'name': grid.carrier_id.name,
-            'product_uom_qty': 1,
-            'product_uom': grid.carrier_id.product_id.uom_id.id,
-            'product_id': grid.carrier_id.product_id.id,
-            'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
-            'tax_id': [(6,0,taxes_ids)],
-            'type': 'make_to_stock'
-        })
-
-    return {}
-
-class make_delivery(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [_delivery_default],
-            'result' : {'type' : 'form', 'arch' : delivery_form, 'fields' : delivery_fields, 'state' : [('end', 'Cancel', 'gtk-cancel'),('delivery', 'Add Delivery Costs', 'gtk-ok') ]}
-        },
-        'delivery' : {
-            'actions' : [_delivery_set],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
-    }
-make_delivery("delivery.sale.order")
+    _name = "delivery.sale.order"
+    _description = "Delivery sale order"
+    _columns = {
+                'carrier_id':fields.many2one('delivery.carrier', 'Delivery Method', required=True, ondelete='cascade'),
+                }
+    _defaults = {
+           'carrier_id':_delivery_default
+        }
+    
+delivery_sale_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/delivery/wizard/delivery_sale_order_view.xml b/addons/delivery/wizard/delivery_sale_order_view.xml
new file mode 100644
index 00000000000..9e3ab13a329
--- /dev/null
+++ b/addons/delivery/wizard/delivery_sale_order_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_delivery_sale_order" model="ir.ui.view">
+            <field name="name">delivery.sale.order.form</field>
+            <field name="model">delivery.sale.order</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create deliveries">
+                	<group colspan="4" >
+                		 <separator colspan="4" string="Delivery Method" />
+              			 <field name="carrier_id" />
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-ok" name="delivery_set" string="Add Delivery" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_delivery_sale_order" model="ir.actions.act_window">
+            <field name="name">Delivery Costs</field>
+            <field name="res_model">delivery.sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_delivery_sale_order"/> 
+           <field name="target">new</field>
+        </record>
+              
+        <act_window id="action_delivery_sale_order_values"
+    		key2="client_action_multi" name="Delivery Costs"
+    		res_model="delivery.sale.order" src_model="sale.order"
+    		view_mode="form" target="new" view_type="form" />
+        
+    </data>
+</openerp>

From 9be5ddd600be7e666028a9c473fe4a4eca597c87 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 16 Mar 2010 11:05:16 +0530
Subject: [PATCH 015/248] [IMP]: idea: Converted wizards to osv_memory wizards

bzr revid: atp@tinyerp.co.in-20100316053516-tpdi2y903jsrst7w
---
 addons/idea/__terp__.py                    |  2 +-
 addons/idea/idea_view.xml                  |  2 +-
 addons/idea/idea_wizard.xml                | 14 -----
 addons/idea/wizard/__init__.py             |  2 +-
 addons/idea/wizard/idea_post_vote.py       | 54 +++++++++++++++++++
 addons/idea/wizard/idea_post_vote_view.xml | 49 +++++++++++++++++
 addons/idea/wizard/idea_vote.py            | 63 ----------------------
 7 files changed, 106 insertions(+), 80 deletions(-)
 delete mode 100644 addons/idea/idea_wizard.xml
 create mode 100644 addons/idea/wizard/idea_post_vote.py
 create mode 100644 addons/idea/wizard/idea_post_vote_view.xml
 delete mode 100644 addons/idea/wizard/idea_vote.py

diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py
index c56d89e669a..f373506e3f1 100644
--- a/addons/idea/__terp__.py
+++ b/addons/idea/__terp__.py
@@ -30,7 +30,7 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
-        'idea_wizard.xml',
+        'wizard/idea_post_vote_view.xml',
         'idea_view.xml',
         'idea_workflow.xml',
         'security/idea_security.xml',
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index f80e7156f04..9ccc56464d0 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -166,7 +166,7 @@
             <field name="vote_avg" />
             <field name="count_comments" />
             <field name="count_votes" />
-            <button name="%(wizard_idea_post_vote)d" icon="gtk-execute" type="action" states="draft,open" string="Vote"/>
+            <button name="%(action_idea_post_vote)d" icon="gtk-execute" type="action" states="draft,open" string="Vote"/>
         </tree>
         </field>
     </record>
diff --git a/addons/idea/idea_wizard.xml b/addons/idea/idea_wizard.xml
deleted file mode 100644
index 206be1dfcaf..00000000000
--- a/addons/idea/idea_wizard.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <wizard
-            id="wizard_idea_post_vote"
-            model="idea.idea"
-            name="idea.post.vote"
-			menu="True"
-            string="Vote"/>
-
-       
-    </data>
-</openerp>
diff --git a/addons/idea/wizard/__init__.py b/addons/idea/wizard/__init__.py
index 2db6aa6982c..2e6f6d42096 100644
--- a/addons/idea/wizard/__init__.py
+++ b/addons/idea/wizard/__init__.py
@@ -18,5 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import idea_vote
+import idea_post_vote
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
new file mode 100644
index 00000000000..901f2c0a28d
--- /dev/null
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+from osv import fields, osv
+
+class idea_post_vote(osv.osv_memory):
+    
+    _name = "idea.post.vote"
+    _description = "Post vote"
+    _columns = {
+                'vote': fields.selection([('-1', 'Not Voted'), 
+                                          ('0', 'Very Bad'), 
+                                          ('25', 'Bad'), 
+                                          ('50', 'Normal'), 
+                                          ('75', 'Good'), 
+                                          ('100', 'Very Good') ], 'Post Vote', required=True)
+                }
+    
+    def do_vote(self, cr, uid, ids, context):
+        """
+        Create idea vote.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Idea Post vote’s IDs.
+        @return: Dictionary {}
+        """
+        vote_obj = self.pool.get('idea.vote')
+        for data in self.read(cr, uid, ids):
+            score = str(data['vote'])
+            dic = {'idea_id': context['active_id'], 'user_id': uid, 'score': score }
+            vote = vote_obj.create(cr, uid, dic)
+            return {}
+
+idea_post_vote()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/idea/wizard/idea_post_vote_view.xml b/addons/idea/wizard/idea_post_vote_view.xml
new file mode 100644
index 00000000000..7316340723c
--- /dev/null
+++ b/addons/idea/wizard/idea_post_vote_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_idea_post_vote" model="ir.ui.view">
+            <field name="name">idea.post.vote.form</field>
+            <field name="model">idea.post.vote</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Tasks">
+                	<group colspan="4" >
+                		 <field name="vote"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-ok" name="do_vote" string="Post Vote" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_idea_post_vote" model="ir.actions.act_window">
+            <field name="name">Vote</field>
+            <field name="res_model">idea.post.vote</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_idea_post_vote"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+     <!--    <record id="action_idea_post_vote_values" model="ir.values">
+            <field name="model_id" ref="idea.model_idea_idea" />
+            <field name="object" eval="1" />
+            <field name="name">vote</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_idea_post_vote'))"/>
+            <field name="key">action</field> 
+            <field name="model">idea.idea</field>
+        </record> -->
+        
+        <act_window id="action_idea_post_vote_values"
+    		key2="client_action_multi" name="vote"
+    		res_model="idea.post.vote" src_model="idea.idea"
+    		view_mode="form" target="new" view_type="form" />
+        
+        
+    </data>
+</openerp>
diff --git a/addons/idea/wizard/idea_vote.py b/addons/idea/wizard/idea_vote.py
deleted file mode 100644
index c040aa45be5..00000000000
--- a/addons/idea/wizard/idea_vote.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import ir
-from mx.DateTime import now
-import pooler
-import netsvc
-
-vote_form = """<?xml version="1.0" ?>
-<form string="Create Tasks">
-    <field name="vote"/>
-</form>"""
-
-vote_fields = {
-      'vote': {'string': 'Post Vote', 'type': 'selection',
-        'selection': [('-1','Not Voted'),('0','Very Bad'),('25', 'Bad'),('50','Normal'),('75','Good'),('100','Very Good') ]},
-}
-
-
-
-class idea_vote(wizard.interface):
-    def _do_vote(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        vote_obj = pool.get('idea.vote')
-        score=str(data['form']['vote'])
-        dic={'idea_id' : data['id'], 'user_id' : uid, 'score' : score }
-        vote=vote_obj.create(cr,uid,dic)
-        return True
-
-    states = {
-        'init':{
-            'actions': [],
-            'result': {'type':'form', 'arch':vote_form, 'fields':vote_fields, 'state':[('end', 'Cancel'), ('post', 'Post Vote')] },
-        },
-        'post':{
-            'actions': [],
-            'result': {'type':'action', 'action': _do_vote, 'state':'end'},
-        },
-    }
-idea_vote('idea.post.vote')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 6cb8124ee10e87edd3566e29a7e6c4cf3f49b328 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 16 Mar 2010 11:05:49 +0530
Subject: [PATCH 016/248] [IMP]: lunch: Converted wizards to osv_memory wizards

bzr revid: atp@tinyerp.co.in-20100316053549-vn01oispwwqc9xpg
---
 addons/lunch/__terp__.py                      |  6 +-
 addons/lunch/lunch_wizard.xml                 | 25 ------
 addons/lunch/wizard/__init__.py               |  7 +-
 addons/lunch/wizard/lunch_cashbox_clean.py    | 54 +++++++++++++
 .../lunch/wizard/lunch_cashbox_clean_view.xml | 38 ++++++++++
 .../{cancel.py => lunch_order_cancel.py}      | 47 +++++-------
 .../lunch/wizard/lunch_order_cancel_view.xml  | 38 ++++++++++
 .../{confirm.py => lunch_order_confirm.py}    | 59 ++++++--------
 .../lunch/wizard/lunch_order_confirm_view.xml | 40 ++++++++++
 addons/lunch/wizard/reset_box.py              | 76 -------------------
 10 files changed, 220 insertions(+), 170 deletions(-)
 delete mode 100644 addons/lunch/lunch_wizard.xml
 create mode 100644 addons/lunch/wizard/lunch_cashbox_clean.py
 create mode 100644 addons/lunch/wizard/lunch_cashbox_clean_view.xml
 rename addons/lunch/wizard/{cancel.py => lunch_order_cancel.py} (58%)
 create mode 100644 addons/lunch/wizard/lunch_order_cancel_view.xml
 rename addons/lunch/wizard/{confirm.py => lunch_order_confirm.py} (50%)
 create mode 100644 addons/lunch/wizard/lunch_order_confirm_view.xml
 delete mode 100644 addons/lunch/wizard/reset_box.py

diff --git a/addons/lunch/__terp__.py b/addons/lunch/__terp__.py
index bc7dfcbfef7..b4fe451aac1 100644
--- a/addons/lunch/__terp__.py
+++ b/addons/lunch/__terp__.py
@@ -27,8 +27,10 @@
     "category" : "Generic Modules/Others",
     "init_xml": [],
     "update_xml": [
-        'security/ir.model.access.csv', 
-        'lunch_wizard.xml', 
+        'security/ir.model.access.csv',
+        'wizard/lunch_order_cancel_view.xml',
+        'wizard/lunch_order_confirm_view.xml',
+        'wizard/lunch_cashbox_clean_view.xml', 
         'lunch_view.xml', 
         'lunch_report.xml',
         #'process/lunch_process.xml'
diff --git a/addons/lunch/lunch_wizard.xml b/addons/lunch/lunch_wizard.xml
deleted file mode 100644
index 0820ae7d80c..00000000000
--- a/addons/lunch/lunch_wizard.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-        <wizard 
-            string="Confirm Order"
-            model="lunch.order"
-            name="lunch.order.confirm"
-            keyword="client_action_multi"
-            id="lunch_order_confirm"/>
-
-        <wizard
-            string="Cancel Order"
-            model="lunch.order"
-            name="lunch.order.cancel"
-            keyword="client_action_multi"
-            id="wizard_id_cancel"/>
-
-        <wizard
-            string="Set CashBox to Zero"
-            model="lunch.cashbox"
-            name="lunch.cashbox.clean"
-            keyword="client_action_multi"
-            id="wizard_clean_cashbox"/>
-    </data>
-</openerp>
diff --git a/addons/lunch/wizard/__init__.py b/addons/lunch/wizard/__init__.py
index e290a2e933c..543ebdbf8dc 100644
--- a/addons/lunch/wizard/__init__.py
+++ b/addons/lunch/wizard/__init__.py
@@ -18,9 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-
-import confirm
-import cancel
-import reset_box
+import lunch_order_confirm
+import lunch_order_cancel
+import lunch_cashbox_clean
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/wizard/lunch_cashbox_clean.py b/addons/lunch/wizard/lunch_cashbox_clean.py
new file mode 100644
index 00000000000..f70e31e0507
--- /dev/null
+++ b/addons/lunch/wizard/lunch_cashbox_clean.py
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+from osv import fields, osv
+
+class lunch_cashbox_clean(osv.osv_memory):
+    
+     _name = "lunch.cashbox.clean"
+     _description = "clean cashbox"
+    
+     def set_to_zero(self, cr, uid, ids, context):
+         """
+         clean Cashbox. set active fields False.
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List  Lunch cashbox Clean’s IDs
+         @return:Dictionary {}.
+         """
+         cashmove_ref = self.pool.get('lunch.cashmove')
+         cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove where active = 't' and box in (%s) group by user_cashmove, box" % ','.join(map(str, context['active_ids'])))
+         res = cr.fetchall()
+         cr.execute("update lunch_cashmove set active = 'f' where active= 't' and box in (%s)" % ','.join(map(str, context['active_ids'])))
+##    to_unactive= {}.fromkeys([r[0] for r in cr.fetchall]).keys()
+##    print to_unactive
+##    cashmove_ref.write(cr,uid,to_unactive,{'active':False})            
+         for (user_id, box_id, amount) in res:
+            cashmove_ref.createcr, uid, {'name': 'Summary for user' + str(user_id), 
+                        'amount': amount, 
+                        'user_cashmove': user_id, 
+                        'box': box_id, 
+                        'active': True, 
+                        })
+         return {}
+
+lunch_cashbox_clean()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
new file mode 100644
index 00000000000..6e151dc0484
--- /dev/null
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_lunch_cashbox_clean" model="ir.ui.view">
+            <field name="name">lunch.cashbox.clean.form</field>
+            <field name="model">lunch.cashbox.clean</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Reset cashbox">
+                	<group colspan="4" >
+                		 <label string="Are you sure you want to reset this cashbox ?"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="No"/>
+                    	<button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_lunch_cashbox_clean" model="ir.actions.act_window">
+            <field name="name">Set CashBox to Zero</field>
+            <field name="res_model">lunch.cashbox.clean</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_lunch_cashbox_clean"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+        <act_window id="action_lunch_cashbox_clean_values"
+    		key2="client_action_multi" name="Set CashBox to Zero"
+    		res_model="lunch.cashbox.clean" src_model="lunch.cashbox"
+    		view_mode="form" target="new" view_type="form" />
+        
+    </data>
+</openerp>
diff --git a/addons/lunch/wizard/cancel.py b/addons/lunch/wizard/lunch_order_cancel.py
similarity index 58%
rename from addons/lunch/wizard/cancel.py
rename to addons/lunch/wizard/lunch_order_cancel.py
index 1acc1535a90..91f25aa421a 100644
--- a/addons/lunch/wizard/cancel.py
+++ b/addons/lunch/wizard/lunch_order_cancel.py
@@ -18,36 +18,25 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
+from osv import fields, osv
 
-import wizard
-import netsvc
-import ir
-import pooler
-
-cancel_form = """<?xml version="1.0"?>
-<form string="Cancel Order">
-    <label string="Are you sure you want to cancel this order ?"/>
-</form>"""
-
-
-cancel_fields = {
-}
-
-def _cancel(self,cr,uid,data,context):
-    return pooler.get_pool(cr.dbname).get('lunch.order').lunch_order_cancel(cr,uid,data['ids'],context)
-
-class order_cancel(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':cancel_form, 'fields':cancel_fields, 'state':[('end','No'),('cancel','Yes')]}
-        },
-        'cancel': {
-            'actions': [_cancel],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-order_cancel('lunch.order.cancel')
+class lunch_order_cancel(osv.osv_memory):
+    """
+    Cancel Lunch Order
+    """
+    _name = "lunch.order.cancel"
+    _description = "Cancel Order"
+    
+    def cancel(self, cr, uid, ids, context):
+        """
+        Cancel cashmove entry from cashmoves and update state to draft.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List  Lunch Order Cancel’s IDs
+        """
+        return self.pool.get('lunch.order').lunch_order_cancel(cr, uid, context['active_ids'], context)
+        
+lunch_order_cancel()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
new file mode 100644
index 00000000000..c69d321b938
--- /dev/null
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_lunch_order_cancel" model="ir.ui.view">
+            <field name="name">lunch.order.cancel.form</field>
+            <field name="model">lunch.order.cancel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Cancel Order">
+                	<group colspan="4" >
+                		 <label string="Are you sure you want to cancel this order ?"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="No"/>
+                    	<button  icon="gtk-ok" name="cancel" string="Yes" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_lunch_order_cancel" model="ir.actions.act_window">
+            <field name="name">Cancel Order</field>
+            <field name="res_model">lunch.order.cancel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_lunch_order_cancel"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+        
+        <act_window id="action_lunch_order_cancel_values"
+    		key2="client_action_multi" name="Cancel Order"
+    		res_model="lunch.order.cancel" src_model="lunch.order"
+    		view_mode="form" target="new" view_type="form" />
+        
+    </data>
+</openerp>
diff --git a/addons/lunch/wizard/confirm.py b/addons/lunch/wizard/lunch_order_confirm.py
similarity index 50%
rename from addons/lunch/wizard/confirm.py
rename to addons/lunch/wizard/lunch_order_confirm.py
index 64891098349..9b7476f40e3 100644
--- a/addons/lunch/wizard/confirm.py
+++ b/addons/lunch/wizard/lunch_order_confirm.py
@@ -19,42 +19,33 @@
 #
 ##############################################################################
 
-import wizard
-import netsvc
-import ir
-import pooler
+from osv import fields, osv
 
-confirm_order_form = """<?xml version="1.0"?>
-<form title="Confirm">
-    <separator string="Orders Confirmation" colspan="4"/>
-    <field name="confirm_cashbox"/>
-    <newline/>
-</form>
-"""
-
-confirm_order_fields = {
-    'confirm_cashbox': {'string':'Name of box', 'type':'many2one', 'required':True, 'relation':'lunch.cashbox' },
-}
-
-def _confirm(self,cr,uid,data,context):
-    pool= pooler.get_pool(cr.dbname)
-    order_ref = pool.get('lunch.order')
-    order_ref.confirm(cr,uid,data['ids'],data['form']['confirm_cashbox'],context)
-    return {}
-
-class order_confirm(wizard.interface):
-    states = {
-        'init': {
-            'action':[],
-            'result':{'type' : 'form', 'arch' : confirm_order_form, 'fields' : confirm_order_fields, 'state' : [('end', 'Cancel'),('go', 'Confirm Order') ]},
-        },
-        'go' : {
-            'actions' : [_confirm],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
-    }
-order_confirm('lunch.order.confirm')
+class lunch_order_confirm(osv.osv_memory):
+    """
+    Confirm Lunch Order
+    """
+    _name = "lunch.order.confirm"
+    _description = "confirm Order"
+    _columns = {
+                'confirm_cashbox':fields.many2one('lunch.cashbox', 'Name of box', required=True), 
+                }
+    
+    def confirm(self, cr, uid, ids, context):
+        """
+        confirm Lunch Order.Create cashmoves in launch cashmoves when state is 
+                        confirm in lunch order.
+        @param cr: the current row, from the database cursor, 
+        @param uid: the current user’s ID for security checks, 
+        @param ids: List  Lunch Order confirm’s IDs
+        @return: Dictionary {}.                
+        """
+        order_ref = self.pool.get('lunch.order')
+        for data in self.read(cr, uid, ids):
+            order_ref.confirm(cr, uid, context['active_ids'], data['confirm_cashbox'], context)
+            return {}
 
+lunch_order_confirm()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
new file mode 100644
index 00000000000..89ddd8f6153
--- /dev/null
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_lunch_order_confirm" model="ir.ui.view">
+            <field name="name">lunch.order.confirm.form</field>
+            <field name="model">lunch.order.confirm</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm">
+                	<group colspan="4" >
+                		 <separator string="Orders Confirmation" colspan="4"/>
+                		 <field name="confirm_cashbox"/>
+                		 <newline/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_lunch_order_confirm" model="ir.actions.act_window">
+            <field name="name">Confirm Order</field>
+            <field name="res_model">lunch.order.confirm</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_lunch_order_confirm"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+        <act_window id="action_lunch_order_confirm_values"
+    		key2="client_action_multi" name="Confirm Order"
+    		res_model="lunch.order.confirm" src_model="lunch.order"
+    		view_mode="form" target="new" view_type="form" />
+        
+    </data>
+</openerp>
diff --git a/addons/lunch/wizard/reset_box.py b/addons/lunch/wizard/reset_box.py
deleted file mode 100644
index 83999fc3ba0..00000000000
--- a/addons/lunch/wizard/reset_box.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import ir
-import pooler
-
-set_to_zero_form = """<?xml version="1.0"?>
-<form string="Reset cashbox">
-    <label string="Are you sure you want to reset this cashbox ?"/>
-</form>"""
-
-
-
-confirm_setting_zero_fields = {}
-
-def _set_to_zero(self,cr,uid,data,context):
-    pool= pooler.get_pool(cr.dbname)
-    cashmove_ref = pool.get('lunch.cashmove')
-    cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove where active= 't' and box in (%s) group by user_cashmove, box"%','.join(map(str,data['ids'])))
-    res= cr.fetchall()
-    cr.execute("update lunch_cashmove set active = 'f' where active= 't' and box in (%s)"%','.join(map(str,data['ids'])))
-##    to_unactive= {}.fromkeys([r[0] for r in cr.fetchall]).keys()
-##    print to_unactive
-##    cashmove_ref.write(cr,uid,to_unactive,{'active':False})            
-##    
-    for (user_id,box_id,amount) in res:
-        cashmove_ref.create(cr,uid,{'name': 'Summary for user'+ str(user_id),
-                        'amount': amount,
-                        'user_cashmove': user_id,
-                        'box': box_id,
-                        'active': True,
-                        })
-    return {}
-
-
-class cashbox_set_to_zero(wizard.interface):
-
-    states = {
-            
-        'init': {
-                        'action':[],
-                        'result':{'type' : 'form',
-                          'arch' : set_to_zero_form,
-              'fields' : confirm_setting_zero_fields,
-                          'state' : [('end', 'Cancel'),('zero', 'Set to Zero') ]},
-    
-        },
-        'zero' : {
-            'actions' : [_set_to_zero],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
-    }
-    
-cashbox_set_to_zero('lunch.cashbox.clean')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 1d34e6b644e249f5dcdc5115672bc0a5d5328bdd Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 16 Mar 2010 11:57:42 +0530
Subject: [PATCH 017/248] [IMP]:lunch: Added missing bracket in cashbox clean

bzr revid: atp@tinyerp.co.in-20100316062742-xmv2rfsiq27mtzam
---
 addons/lunch/wizard/lunch_cashbox_clean.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/lunch/wizard/lunch_cashbox_clean.py b/addons/lunch/wizard/lunch_cashbox_clean.py
index f70e31e0507..5656ca92dbe 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean.py
+++ b/addons/lunch/wizard/lunch_cashbox_clean.py
@@ -41,7 +41,7 @@ class lunch_cashbox_clean(osv.osv_memory):
 ##    print to_unactive
 ##    cashmove_ref.write(cr,uid,to_unactive,{'active':False})            
          for (user_id, box_id, amount) in res:
-            cashmove_ref.createcr, uid, {'name': 'Summary for user' + str(user_id), 
+            cashmove_ref.create(cr, uid, {'name': 'Summary for user' + str(user_id), 
                         'amount': amount, 
                         'user_cashmove': user_id, 
                         'box': box_id, 

From f530cd9f35db7df8dd000f16ab927b39c20d2384 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Tue, 16 Mar 2010 14:23:40 +0530
Subject: [PATCH 018/248] [IMP] document :- add 'realstore' storage type

bzr revid: ysa@tinyerp.co.in-20100316085340-uggcnnlhpsterwko
---
 addons/document/document_directory.py | 18 +++++++++-
 addons/document/document_storage.py   | 52 +++++++++++++++++++++++++--
 addons/document/nodes.py              | 28 ++++++++++++++-
 3 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 17c3dfb66d9..1557941e7c6 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -65,9 +65,10 @@ class document_directory(osv.osv):
         objid=self.pool.get('ir.model.data')
         try:
             mid = objid._get_id(cr, uid, 'document', 'dir_root')
-            return False # TODO: check why not display root dir 
             if not mid:
                 return False
+            root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
+            return root_id
         except Exception, e:
             import netsvc
             logger = netsvc.Logger()
@@ -111,6 +112,21 @@ class document_directory(osv.osv):
             res.append((d.id, s))
         return res
 
+    def get_full_path(self, cr, uid, dir_id, context=None):
+        """ Return the full path to this directory, in a list, root first
+        """
+        def _parent(dir_id, path):
+            parent=self.browse(cr,uid,dir_id)
+            if parent.parent_id and not parent.ressource_parent_type_id:
+                _parent(parent.parent_id.id,path)
+                path.append(parent.name)
+            else:
+                path.append(parent.name)
+                return path
+        path = []
+        _parent(dir_id, path)
+        return path
+
     def ol_get_resource_path(self,cr,uid,dir_id,res_model,res_id):
         # this method will be used in process module
         # to be need test and Improvement if resource dir has parent resource (link resource)
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index 2b50e7a27c9..0fd85e0be6d 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -154,7 +154,6 @@ class document_storage(osv.osv):
                     netsvc.Logger().notifyChannel('document', netsvc.LOG_WARNING, "ir.attachment #%d does not have a filename, but is at filestore, fix it!" % ira.id)
                 return None
             fpath = os.path.join(boo.path, ira.store_fname)
-            print "Trying to read \"%s\".." % fpath
             return file(fpath, 'rb').read()
         elif boo.type == 'db':
             # TODO: we need a better api for large files
@@ -164,8 +163,19 @@ class document_storage(osv.osv):
                 out = ''
             return out
         elif boo.type == 'realstore':
-            # fpath = os.path.join(boo.path,
-            return None
+            if not ira.store_fname:
+                # On a migrated db, some files may have the wrong storage type
+                # try to fix their directory.
+                if ira.file_size:
+                    netsvc.Logger().notifyChannel('document',netsvc.LOG_WARNING,"ir.attachment #%d does not have a filename, trying the name." %ira.id)
+                sfname = ira.name
+            fpath = os.path.join(boo.path,ira.store_fname or ira.name)
+            if os.path.exists(fpath):
+                return file(fpath,'rb').read()
+            elif not ira.store_fname:
+                return None
+            else:
+                raise IOError("File not found: %s" % fpath)
         else:
             raise TypeError("No %s storage" % boo.type)
 
@@ -219,6 +229,36 @@ class document_storage(osv.osv):
             out = base64.encodestring(data)
             cr.execute('UPDATE ir_attachment SET db_datas = %s WHERE id = %s',
                 (out, file_node.file_id))
+        elif boo.type == 'realstore':
+            try:
+                file_node.fix_ppath(cr, ira)
+                npath = file_node.full_path() or []
+                # npath may contain empty elements, for root directory etc.
+                for i, n in enumerate(npath):
+                    if n == None:
+                        del npath[i]
+                for n in npath:
+                    for ch in ('*', '|', "\\", '/', ':', '"', '<', '>', '?', '..'):
+                        if ch in n:
+                            raise ValueError("Invalid char %s in path %s" %(ch, n))
+                dpath = [boo.path,]
+                dpath += npath[:-1]
+                path = os.path.join(*dpath)
+                if not os.path.isdir(path):
+                    os.makedirs(path)
+                fname = os.path.join(path, npath[-1])
+                fp = file(fname,'wb')
+                fp.write(data)
+                fp.close()
+                logger.notifyChannel('document',netsvc.LOG_DEBUG,"Saved data to %s" % fname)
+                filesize = len(data) # os.stat(fname).st_size
+                store_fname = os.path.join(*npath)
+                # TODO Here, an old file would be left hanging.
+            except Exception,e :
+                import traceback
+                traceback.print_exc()
+                netsvc.Logger().notifyChannel('document',netsvc.LOG_WARNING,"Couldn't save data: %s" % e)
+                raise except_orm(_('Error!'), str(e))
         else:
             raise TypeError("No %s storage" % boo.type)
 
@@ -262,6 +302,12 @@ class document_storage(osv.osv):
             return (storage_bo.id, 'file', os.path.join(path, fname))
         elif storage_bo.type == 'db':
             return None
+        elif storage_bo.type == 'realstore':
+            fname = fil_bo.store_fname
+            if not fname:
+                return None
+            path = storage_bo.path
+            return ( storage_bo.id, 'file', os.path.join(path,fname))
         else:
             raise TypeError("No %s storage" % boo.type)
 
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 13bd1784562..543610a0d22 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -599,7 +599,33 @@ class node_file(node_class):
             self.storage_id = fil.parent_id.storage_id.id
         else:
             self.storage_id = None                       
-            
+
+    def fix_ppath(self, cr, fbro):
+        """Sometimes we may init this w/o path, parent.
+        This function fills the missing path from the file browse object
+        
+        Note: this may be an expensive operation, do on demand. However,
+        once caching is in, we might want to do that at init time and keep
+        this object anyway
+        """
+        if self.path or self.parent:
+            return
+        assert fbro
+        uid = self.context.uid
+        
+        dirpath = []
+        if fbro.parent_id:
+            dirobj = self.context._dirobj.pool.get('document.directory')
+            dirpath = dirobj.get_full_path(cr, uid, fbro.parent_id.id, context=self.context.context)
+        if fbro.datas_fname:
+            dirpath.append(fbro.datas_fname)
+        else:
+            dirpath.append(fbro.name)
+        
+        if len(dirpath)>1:
+            self.path = dirpath
+        else:
+            self.path = dirpath[0]   
     
     def get_data(self, cr, fil_obj = None):
         """ Retrieve the data for some file. 

From c4d9dda495912b75f3500501487297866644651a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 16 Mar 2010 15:16:34 +0530
Subject: [PATCH 019/248] [IMP]: crm: Improvement + Quality improvement in lead
 to partner wizard

bzr revid: rpa@tinyerp.com-20100316094634-1mygrhv8st9i1az0
---
 addons/crm/__terp__.py                        |   3 +-
 addons/crm/crm_lead_wizard.xml                |  21 --
 addons/crm/wizard/__init__.py                 |   3 +-
 addons/crm/wizard/crm_lead_to_partner.py      | 194 ++++++++++++
 .../crm/wizard/crm_lead_to_partner_view.xml   |  51 +++
 addons/crm/wizard/crm_lead_wizard.py          | 297 ------------------
 addons/crm/wizard/lead_to_partner.py          | 138 --------
 addons/crm/wizard/lead_to_partner_view.xml    |  67 ----
 8 files changed, 247 insertions(+), 527 deletions(-)
 delete mode 100644 addons/crm/crm_lead_wizard.xml
 create mode 100644 addons/crm/wizard/crm_lead_to_partner.py
 create mode 100644 addons/crm/wizard/crm_lead_to_partner_view.xml
 delete mode 100644 addons/crm/wizard/crm_lead_wizard.py
 delete mode 100644 addons/crm/wizard/lead_to_partner.py
 delete mode 100644 addons/crm/wizard/lead_to_partner_view.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 96cdfa0b8f3..4f558962e5d 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -62,7 +62,7 @@ between mails and Open ERP.""",
 
     'update_xml': [
         'wizard/crm_phonecall2phonecall.xml',
-        'wizard/lead_to_partner_view.xml',
+        'wizard/crm_lead_to_partner_view.xml',
         'wizard/phonecall2meeting.xml',
         'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
@@ -74,7 +74,6 @@ between mails and Open ERP.""",
         'crm_view.xml',
          
         'crm_action_rule_view.xml', 
-        #'crm_lead_wizard.xml', 
         'crm_lead_view.xml', 
         'crm_lead_menu.xml', 
         'crm_meeting_view.xml', 
diff --git a/addons/crm/crm_lead_wizard.xml b/addons/crm/crm_lead_wizard.xml
deleted file mode 100644
index 6ce8750ac08..00000000000
--- a/addons/crm/crm_lead_wizard.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <wizard
-            id="wizard_crm_lead_partner_create"
-            keyword="client_action_multi"
-            model="crm.lead"
-            name="crm.lead.partner_create"
-            multi="True"
-            string="Create Partner"/>
-
-        <wizard
-            id="wizard_crm_lead_opportunity_set"
-            keyword="client_action_multi"
-            model="crm.lead"
-            name="crm.lead.opportunity_set"
-            multi="True"
-            string="Convert To Opportunity"/>
-    </data>
-</openerp>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 4155dfa69ea..99c7f089e08 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import crm_opportunity_wizard
-import crm_lead_wizard
 import crm_phonecall_wizard
 
 import wizard_crm_send_email
@@ -28,7 +27,7 @@ import wizard_crm_new_send_email
 import wizard_history_event
 
 
-import lead_to_partner
+import crm_lead_to_partner
 import lead2opportunity
 import crm_phonecall2phonecall
 import phonecall2partner
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
new file mode 100644
index 00000000000..ee8df99941c
--- /dev/null
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -0,0 +1,194 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_lead2partner(osv.osv_memory):
+    """ Converts lead to partner """
+
+    _name = 'crm.lead2partner'
+    _description = 'Lead to Partner'
+
+    _columns = {
+        'action': fields.selection([('exist', 'Link to an existing partner'), \
+                                    ('create', 'Create a new partner')], \
+                                    'Action', required=True), 
+        'partner_id': fields.many2one('res.partner', 'Partner')
+        }
+
+    def _select_partner(self, cr, uid, context=None):
+        """
+        This function Searches for Partner from selected lead.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Board Lead to Partner's IDs
+
+        @return : Partner id if any for selected lead.
+        """
+        if not context:
+            context = {}
+
+        lead_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('active_ids', False)
+        value={}
+        for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
+            if lead.partner_id:
+                 raise osv.except_osv(_('Warning !'), 
+                    _('A partner is already defined on this lead.'))
+
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
+            if not partner_ids and lead.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        return partner_id
+
+    _defaults = {
+        'action': lambda *a:'exist', 
+        'partner_id': _select_partner
+        }
+
+    def open_create_partner(self, cr, uid, ids, context=None):
+        """
+        This function Opens form of create partner.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Board Lead to Partner's IDs
+
+        @return : Dictionary value for next form.
+        """
+        if not context:
+            context = {}
+
+        view_obj = self.pool.get('ir.ui.view')
+        view_id = view_obj.search(cr, uid, [('model', '=', 'crm.lead2partner'), \
+                                     ('name', '=', 'crm.lead2partner.view')])
+        return {
+            'view_mode': 'form', 
+            'view_type': 'form', 
+            'view_id': view_id or False, 
+            'res_model': 'crm.lead2partner', 
+            'context': context, 
+            'type': 'ir.actions.act_window', 
+            'target': 'new', 
+            }
+
+
+    def _create_partner(self, cr, uid, ids, context=None):
+        """
+        This function Creates partner based on action.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Board Lead to Partner's IDs
+
+        @return : Dictionary {}.
+        """
+        if not context:
+            context = {}
+
+        lead_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        partner_ids = []
+        partner_id = False
+        contact_id = False
+        rec_ids = context and context.get('active_ids', False)
+        
+        for data in self.browse(cr, uid, ids):
+            for lead in lead_obj.browse(cr, uid, rec_ids):
+                if data.action == 'create':
+                    partner_id = partner_obj.create(cr, uid, {
+                        'name': lead.partner_name or lead.name, 
+                        'user_id': lead.user_id.id, 
+                        'comment': lead.description, 
+                    })
+                    contact_id = contact_obj.create(cr, uid, {
+                        'partner_id': partner_id, 
+                        'name': lead.name, 
+                        'phone': lead.phone, 
+                        'mobile': lead.mobile, 
+                        'email': lead.email_from, 
+                        'fax': lead.fax, 
+                        'title': lead.title, 
+                        'function': lead.function and lead.function.id or False, 
+                        'street': lead.street, 
+                        'street2': lead.street2, 
+                        'zip': lead.zip, 
+                        'city': lead.city, 
+                        'country_id': lead.country_id and lead.country_id.id or False, 
+                        'state_id': lead.state_id and lead.state_id.id or False, 
+                    })
+    
+                else:
+                    if data.partner_id:
+                        partner_id = data.partner_id.id
+                        contact_id = partner_obj.address_get(cr, uid, [partner_id])['default']
+
+                partner_ids.append(partner_id)
+
+                vals = {}
+                if partner_id:
+                    vals.update({'partner_id': partner_id})
+                if contact_id:
+                    vals.update({'partner_address_id': contact_id})
+                lead_obj.write(cr, uid, [lead.id], vals)
+        return partner_ids
+
+    def make_partner(self, cr, uid, ids, context):
+        """
+        This function Makes partner based on action.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Board Lead to Partner's IDs
+
+        @return : Dictionary value for created Partner form.
+        """
+
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        value = {
+            'domain': "[]", 
+            'view_type': 'form', 
+            'view_mode': 'form,tree', 
+            'res_model': 'res.partner', 
+            'res_id': partner_ids and int(partner_ids[0]) or False, 
+            'view_id': False, 
+            'context': context, 
+            'type': 'ir.actions.act_window', 
+            'search_view_id': res['res_id']
+        }
+        return value
+
+crm_lead2partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
new file mode 100644
index 00000000000..a2e8b4a1a23
--- /dev/null
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -0,0 +1,51 @@
+<openerp>
+  	<data>
+
+		<!-- Lead to partner confirmation form -->
+
+  		<record id="view_crm_lead2partner_create" model="ir.ui.view">
+	      <field name="name">crm.lead2partner.view.create</field>
+	      <field name="model">crm.lead2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner?">
+	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+
+	   <!-- Lead to Partner form view -->
+
+	   <record id="view_crm_lead2partner" model="ir.ui.view">
+	      <field name="name">crm.lead2partner.view</field>
+	      <field name="model">crm.lead2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+		        </group>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+
+	   <!-- Lead to Partner wizard -->
+
+	   <act_window id="action_crm_lead2partner"
+    		key2="client_action_multi" name="Create a Partner"
+    		res_model="crm.lead2partner" src_model="crm.lead"
+    		view_id="view_crm_lead2partner_create"
+    		view_mode="form" target="new" view_type="form" />
+
+ 	</data>
+</openerp>
diff --git a/addons/crm/wizard/crm_lead_wizard.py b/addons/crm/wizard/crm_lead_wizard.py
deleted file mode 100644
index ccbcabbcf28..00000000000
--- a/addons/crm/wizard/crm_lead_wizard.py
+++ /dev/null
@@ -1,297 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-from tools.translate import _
-
-class partner_create(wizard.interface):
-
-    case_form = """<?xml version="1.0"?>
-    <form string="Create a Partner">
-        <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        <label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        <!--field name="close"/-->
-    </form>"""
-
-    case_fields = {
-        'close': {'type':'boolean', 'string':'Close Lead'}
-    }
-
-    partner_form = """<?xml version="1.0"?>
-    <form string="Create a Partner">
-        <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        <label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        <newline />
-        <field name="action"/>
-        <group attrs="{'invisible':[('action','!=','exist')]}">
-            <field name="partner_id"/>
-        </group>
-    </form>"""
-
-    partner_fields = {
-        'action': {'type':'selection',
-                'selection':[('exist','Link to an existing partner'),('create','Create a new partner')],
-                'string':'Action', 'required':True, 'default': lambda *a:'exist'},
-        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
-    }
-    
-    def _selectPartner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        partner_obj = pool.get('res.partner')
-        contact_obj = pool.get('res.partner.address')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.partner_id:
-                raise wizard.except_wizard(_('Warning !'),
-                    _('A partner is already defined on this lead.'))
-           
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])            
-            if not partner_ids and case.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-
-            partner_id = partner_ids and partner_ids[0] or False
-        vals = {'partner_id': partner_id}
-        if not partner_id:
-            vals['action'] = 'create'            
-        return vals
-
-    def _create_partner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)        
-        case_obj = pool.get('crm.lead')
-        partner_obj = pool.get('res.partner')
-        contact_obj = pool.get('res.partner.address')
-        partner_ids = []
-        partner_id = False
-        contact_id = False
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if data['form']['action'] == 'create':
-                partner_id = partner_obj.create(cr, uid, {
-                    'name': case.partner_name or case.name,
-                    'user_id': case.user_id.id,
-                    'comment': case.description,
-                })
-                contact_id = contact_obj.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'name': case.name,
-                    'phone': case.phone,
-                    'mobile': case.mobile,
-                    'email': case.email_from,
-                    'fax': case.fax,
-                    'title': case.title,
-                    'function': case.function and case.function.id or False,
-                    'street': case.street,
-                    'street2': case.street2,
-                    'zip': case.zip,
-                    'city': case.city,
-                    'country_id': case.country_id and case.country_id.id or False,
-                    'state_id': case.state_id and case.state_id.id or False,
-                })
-
-            else:
-                if data['form']['partner_id']:
-                    partner = partner_obj.browse(cr,uid,data['form']['partner_id'])
-                    partner_id = partner.id
-                    contact_id = partner.address and partner.address[0].id
-
-            partner_ids.append(partner_id)
-            vals = {}
-            if partner_id:
-                vals.update({'partner_id': partner_id})
-            if contact_id:
-                vals.update({'partner_address_id': contact_id})
-            case_obj.write(cr, uid, [case.id], vals)   
-        return partner_ids
-
-    def _make_partner(self, cr, uid, data, context): 
-        pool = pooler.get_pool(cr.dbname)             
-        partner_ids = self._create_partner(cr, uid, data, context)
-        mod_obj = pool.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'domain': "[]",
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'res.partner',
-            'res_id': partner_ids and int(partner_ids[0]) or False,
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-
-    states = {
-        'init': {
-            'actions': [_selectPartner],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('create_partner', 'Create Partner', 'gtk-go-forward')]}
-        },
-        'create_partner': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': partner_form, 'fields': partner_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('create', 'Continue', 'gtk-go-forward')]}
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _make_partner, 'state': 'end'}
-        }
-    }
-
-partner_create('crm.lead.partner_create')
-
-
-class lead2opportunity(partner_create):
-
-    case_form = """<?xml version="1.0"?>
-    <form string="Convert To Opportunity">
-        <field name="name"/>
-        <field name="partner_id"/>
-        <newline/>
-        <field name="planned_revenue"/>
-        <field name="probability"/>
-    </form>"""
-
-    case_fields = {
-        'name': {'type':'char', 'size':64, 'string':'Opportunity Summary', 'required':True},
-        'planned_revenue': {'type':'float', 'digits':(16,2), 'string': 'Expected Revenue'},
-        'probability': {'type':'float', 'digits':(16,2), 'string': 'Success Probability'},
-        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
-    }
-    
-    def _check_state(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.state != 'open':
-                raise wizard.except_wizard(_('Warning !'),
-                    _('Lead should be in \'Open\' state before converting to Opportunity.'))
-        return {}
-
-    def _selectopportunity(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        case = case_obj.browse(cr, uid, data['id'])
-        return {'name': case.name, 'partner_id':case.partner_id and case.partner_id.id or False}
-
-    def _selectChoice(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if not case.partner_id:
-                return 'create_partner'
-        return 'opportunity'
-
-    def _makeOrder(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        res = data_obj.read(cr, uid, result, ['res_id'])
-        
-
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-        lead_case_obj = pool.get('crm.lead')
-        opportunity_case_obj = pool.get('crm.opportunity')        
-        for lead in lead_case_obj.browse(cr, uid, data['ids']):
-            new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
-                'name': data['form']['name'],
-                'planned_revenue': data['form']['planned_revenue'],
-                'probability': data['form']['probability'],
-                'partner_id': data['form']['partner_id'],
-                'section_id':lead.section_id.id,
-                'description':lead.description,
-                'date_deadline': lead.date_deadline,
-                'partner_address_id':lead.partner_address_id.id, 
-                'priority': lead.priority,
-                'phone': lead.phone,                
-                'email_from': lead.email_from
-            })       
-            
-            new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
-            
-            vals = {
-                'partner_id': data['form']['partner_id'],                
-                }
-            if not lead.opportunity_id:
-                vals.update({'opportunity_id' : new_opportunity.id})
-
-            lead_case_obj.write(cr, uid, [lead.id], vals)
-            lead_case_obj.case_close(cr, uid, [lead.id])
-            opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
-        
-        value = {            
-            'name': _('Opportunity'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.opportunity',
-            'res_id': int(new_opportunity_id),
-            'view_id': False,
-            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-
-    def _makePartner(self, cr, uid, data, context):
-        partner_ids = self._create_partner(cr, uid, data, context)
-        return {}
-
-    states = {
-        'init': {
-            'actions': [_check_state],
-            'result': {'type':'choice','next_state':_selectChoice}
-        },
-        'create_partner': {
-            'actions': [partner_create._selectPartner],
-            'result': {'type': 'form', 'arch': partner_create.partner_form, 'fields': partner_create.partner_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('opportunity', 'Skip', 'gtk-goto-last'), ('create', 'Continue', 'gtk-go-forward')]}
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makePartner, 'state':'opportunity' }
-        },
-        'opportunity': {
-            'actions': [_selectopportunity],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('confirm', 'Create Opportunity', 'gtk-go-forward')]}
-        },
-        'confirm': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeOrder, 'state': 'end'}
-        }
-    }
-
-lead2opportunity('crm.lead.opportunity_set')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/lead_to_partner.py b/addons/crm/wizard/lead_to_partner.py
deleted file mode 100644
index a7ba5848f05..00000000000
--- a/addons/crm/wizard/lead_to_partner.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import osv, fields
-from tools.translate import _
-
-class crm_lead2partner(osv.osv_memory):
-    _name = 'crm.lead2partner'
-    _description = 'Lead to Partner'
-    
-    _columns = {
-        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
-        'partner_id': fields.many2one('res.partner','Partner'), 
-    }
-    _defaults = {
-        'action': lambda *a:'exist',
-    }
-    
-    def create_partner(self, cr, uid, ids, context):
-        view_obj = self.pool.get('ir.ui.view')
-        view_id = view_obj.search(cr,uid,[('model','=','crm.lead2partner'),('name','=','crm.lead2partner.view')])
-        return {
-            'view_mode': 'form',
-            'view_type': 'form',
-            'view_id': view_id or False,
-            'res_model': 'crm.lead2partner',
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-        
-    def selectPartner(self, cr, uid, ids, context):
-        case_obj = self.pool.get('crm.lead')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        rec_ids = context and context.get('record_ids',False)
-        value={}
-        for case in case_obj.browse(cr, uid, rec_ids):
-            if case.partner_id:
-                 raise osv.except_osv(_('Warning !'),
-                    _('A partner is already defined on this lead.'))
-           
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])            
-            if not partner_ids and case.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-
-            partner_id = partner_ids and partner_ids[0] or False
-        if not partner_id:
-            value = self._make_partner(cr, uid, ids, context)           
-        return value 
-
-    def _create_partner(self, cr, uid, ids, context):
-        case_obj = self.pool.get('crm.lead')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        datas = self.browse(cr, uid, ids)[0]
-        partner_ids = []
-        partner_id = False
-        contact_id = False
-        rec_ids = context and context.get('record_ids',False)
-        for case in case_obj.browse(cr, uid, rec_ids):
-            if datas.action == 'create':
-                partner_id = partner_obj.create(cr, uid, {
-                    'name': case.partner_name or case.name,
-                    'user_id': case.user_id.id,
-                    'comment': case.description,
-                })
-                contact_id = contact_obj.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'name': case.name,
-                    'phone': case.phone,
-                    'mobile': case.mobile,
-                    'email': case.email_from,
-                    'fax': case.fax,
-                    'title': case.title,
-                    'function': case.function and case.function.id or False,
-                    'street': case.street,
-                    'street2': case.street2,
-                    'zip': case.zip,
-                    'city': case.city,
-                    'country_id': case.country_id and case.country_id.id or False,
-                    'state_id': case.state_id and case.state_id.id or False,
-                })
-
-            else:
-                if datas.partner_id:
-                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
-                    partner_id = partner.id
-                    contact_id = partner.address and partner.address[0].id
-
-            partner_ids.append(partner_id)
-            vals = {}
-            if partner_id:
-                vals.update({'partner_id': partner_id})
-            if contact_id:
-                vals.update({'partner_address_id': contact_id})
-            case_obj.write(cr, uid, [case.id], vals)   
-        return partner_ids
-
-    def _make_partner(self, cr, uid, ids, context): 
-        partner_ids = self._create_partner(cr, uid, ids, context)
-        mod_obj = self.pool.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'domain': "[]",
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'res.partner',
-            'res_id': partner_ids and int(partner_ids[0]) or False,
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-    
-crm_lead2partner()
-
diff --git a/addons/crm/wizard/lead_to_partner_view.xml b/addons/crm/wizard/lead_to_partner_view.xml
deleted file mode 100644
index b11b90bb534..00000000000
--- a/addons/crm/wizard/lead_to_partner_view.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<openerp>
-  	<data>
-  		<record id="view_crm_lead2partner_create" model="ir.ui.view">
-	      <field name="name">crm.lead2partner.view.create</field>
-	      <field name="model">crm.lead2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
-	   <record id="action_crm_lead2partner_create" model="ir.actions.act_window">
-	      <field name="name">Create a Partner</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.lead2partner</field>
-	      <field name="view_id" ref="view_crm_lead2partner_create"/>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	      <field name="context">{'record_ids' : active_ids}</field>
-	   </record>
-	   
-	   <record model="ir.values" id="values_crm_lead2partner_create">
-            <field name="model_id" ref="crm.model_crm_lead" />
-            <field name="object" eval="1" />
-            <field name="name">Create Partner</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_lead2partner_create'))" />
-            <field name="key">action</field>
-            <field name="model">crm.lead</field>
-        </record>
-	   
-	   <record id="view_crm_lead2partner" model="ir.ui.view">
-	      <field name="name">crm.lead2partner.view</field>
-	      <field name="model">crm.lead2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<field name="action"/>
-	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id"/>
-		        </group>
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
-	   <record id="action_crm_lead2partner" model="ir.actions.act_window">
-	      <field name="name">Create a Partner</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.lead2partner</field>
-	      <field name="view_id" ref="view_crm_lead2partner"/>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	      <field name="context">{'record_ids' : active_ids}</field>
-	   </record>
- 	</data>
-</openerp>

From 0106856a58d2eaa454d246ab8b7c75ae9e8adb14 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 16 Mar 2010 15:29:44 +0530
Subject: [PATCH 020/248] [IMP]: base_calendar: Minor improvement for event
 invitation ref

bzr revid: rpa@tinyerp.com-20100316095944-zlljs1l43st2hsqy
---
 addons/base_calendar/base_calendar_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d6430ca98a2..bcc30fe0a81 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -82,7 +82,7 @@
                                 <field name="event_date" />
                                 <field name="event_end_date" />
                                 <field name="language"/>
-                                <field name="ref" colspan="4"/>
+                                <field name="ref" colspan="4" readonly="1"/>
                             </group>
             			</page>
             			<page string="Delegation Info">

From 5445d3557e3d56a3e44e87934d983e71863de943 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 16 Mar 2010 16:05:26 +0530
Subject: [PATCH 021/248] [IMP]: crm: Improvement in lead to partner wizard

bzr revid: rpa@tinyerp.com-20100316103526-6api2tdk9p6v8dl2
---
 addons/crm/wizard/crm_lead_to_partner.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index ee8df99941c..ec59e483bc9 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -41,7 +41,8 @@ class crm_lead2partner(osv.osv_memory):
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of Board Lead to Partner's IDs
+        @param fields: List of fields for default value 
+        @param context: A standard dictionary for contextual values 
 
         @return : Partner id if any for selected lead.
         """
@@ -51,7 +52,7 @@ class crm_lead2partner(osv.osv_memory):
         lead_obj = self.pool.get('crm.lead')
         partner_obj = self.pool.get('res.partner')
         contact_obj = self.pool.get('res.partner.address')
-        rec_ids = context and context.get('active_ids', False)
+        rec_ids = context and context.get('active_ids', [])
         value={}
         for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
             if lead.partner_id:
@@ -79,7 +80,8 @@ class crm_lead2partner(osv.osv_memory):
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of Board Lead to Partner's IDs
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
 
         @return : Dictionary value for next form.
         """
@@ -106,7 +108,8 @@ class crm_lead2partner(osv.osv_memory):
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of Board Lead to Partner's IDs
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
 
         @return : Dictionary {}.
         """
@@ -119,7 +122,7 @@ class crm_lead2partner(osv.osv_memory):
         partner_ids = []
         partner_id = False
         contact_id = False
-        rec_ids = context and context.get('active_ids', False)
+        rec_ids = context and context.get('active_ids', [])
         
         for data in self.browse(cr, uid, ids):
             for lead in lead_obj.browse(cr, uid, rec_ids):
@@ -161,21 +164,25 @@ class crm_lead2partner(osv.osv_memory):
                 lead_obj.write(cr, uid, [lead.id], vals)
         return partner_ids
 
-    def make_partner(self, cr, uid, ids, context):
+    def make_partner(self, cr, uid, ids, context=None):
         """
         This function Makes partner based on action.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of Board Lead to Partner's IDs
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
 
         @return : Dictionary value for created Partner form.
         """
+        if not context:
+            context = {}
 
         partner_ids = self._create_partner(cr, uid, ids, context)
         mod_obj = self.pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
         res = mod_obj.read(cr, uid, result, ['res_id'])
+
         value = {
             'domain': "[]", 
             'view_type': 'form', 

From 96929a5705dfdd298b6e0502e1993b14350fd864 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 16 Mar 2010 16:33:51 +0530
Subject: [PATCH 022/248] [IMP]: crm: Improvement in lead to Opportunity wizard
 + Quality improvement

bzr revid: rpa@tinyerp.com-20100316110351-0qnwxoj7dj27xao9
---
 addons/crm/__terp__.py                        |   4 +-
 addons/crm/wizard/__init__.py                 |   2 +-
 addons/crm/wizard/crm_lead_to_opportunity.py  | 144 ++++++++++++++++++
 ...y.xml => crm_lead_to_opportunity_view.xml} |  24 +--
 addons/crm/wizard/lead2opportunity.py         | 117 --------------
 5 files changed, 160 insertions(+), 131 deletions(-)
 create mode 100644 addons/crm/wizard/crm_lead_to_opportunity.py
 rename addons/crm/wizard/{lead2opportunity.xml => crm_lead_to_opportunity_view.xml} (93%)
 delete mode 100644 addons/crm/wizard/lead2opportunity.py

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 4f558962e5d..90ba7e597bb 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -61,15 +61,15 @@ between mails and Open ERP.""",
     ], 
 
     'update_xml': [
-        'wizard/crm_phonecall2phonecall.xml',
         'wizard/crm_lead_to_partner_view.xml',
+        'wizard/crm_lead_to_opportunity_view.xml',
+        'wizard/crm_phonecall2phonecall.xml',
         'wizard/phonecall2meeting.xml',
         'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'wizard/opportunity2partner_view.xml',
         'wizard/opportunity2meeting.xml',
         'wizard/opportunity2phonecall.xml',
-        'wizard/lead2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 99c7f089e08..b3761eaf4b3 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -28,7 +28,7 @@ import wizard_history_event
 
 
 import crm_lead_to_partner
-import lead2opportunity
+import crm_lead_to_opportunity
 import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
new file mode 100644
index 00000000000..3604c025d0a
--- /dev/null
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_lead2opportunity(osv.osv_memory):
+    _name = 'crm.lead2opportunity'
+    _description = 'Lead To Opportunity'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Lead To Opportunity form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        """
+        return {'type': 'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        """
+        This converts lead to opportunity and opens Opportunity view
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Opportunity IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Opportunity form
+        """
+        value = {}
+        record_ids = context and context.get('active_ids', []) or []
+        if record_ids:
+            lead_obj = self.pool.get('crm.lead')
+            opp_obj = self. pool.get('crm.opportunity')
+            data_obj = self.pool.get('ir.model.data')
+
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        for this in self.browse(cr, uid, ids, context=context):
+            for case in lead_obj.browse(cr, uid, record_ids, context=context):
+                new_opportunity_id = opp_obj.create(cr, uid, {
+                        'name': this.name, 
+                        'planned_revenue': this.planned_revenue, 
+                        'probability': this.probability, 
+                        'partner_id': case.partner_id and case.partner_id.id or False , 
+                        'section_id': case.section_id and case.section_id.id or False, 
+                        'description': case.description or False, 
+                        'date_deadline': case.date_deadline or False, 
+                        'partner_address_id': case.partner_address_id and \
+                                        case.partner_address_id.id or False , 
+                        'priority': case.priority, 
+                        'phone': case.phone, 
+                        'email_from': case.email_from
+                    })
+
+                new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
+                vals = {
+                        'partner_id': this.partner_id and this.partner_id.id or False, 
+                        }
+                if not case.opportunity_id:
+                        vals.update({'opportunity_id' : new_opportunity.id})
+
+                lead_obj.write(cr, uid, [case.id], vals)
+                lead_obj.case_close(cr, uid, [case.id])
+                opp_obj.case_open(cr, uid, [new_opportunity_id])
+
+            value = {
+                    'name': _('Opportunity'), 
+                    'view_type': 'form', 
+                    'view_mode': 'form,tree', 
+                    'res_model': 'crm.opportunity', 
+                    'res_id': int(new_opportunity_id), 
+                    'view_id': False, 
+                    'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')], 
+                    'type': 'ir.actions.act_window', 
+                    'search_view_id': res['res_id']
+                    }
+        return value
+
+    _columns = {
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1), 
+        'probability': fields.float('Success Probability'), 
+        'planned_revenue': fields.float('Expected Revenue'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        lead_obj = self.pool.get('crm.lead')
+        res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
+
+        for lead in lead_obj.browse(cr, uid, context.get('active_ids', [])):
+            if lead.state in ['done', 'cancel']:
+                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
+Leads Could not convert into Opportunity"))
+            if lead.state != 'open':
+                raise osv.except_osv(_('Warning !'), _('Lead should be in \
+\'Open\' state before converting to Opportunity.'))
+
+            res['name'] = lead.partner_name
+            res['partner_id'] = lead.partner_id and lead.partner_id.id or False
+        return res
+
+crm_lead2opportunity()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/lead2opportunity.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
similarity index 93%
rename from addons/crm/wizard/lead2opportunity.xml
rename to addons/crm/wizard/crm_lead_to_opportunity_view.xml
index c50723de25e..a3372b4fb8a 100644
--- a/addons/crm/wizard/lead2opportunity.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,17 +1,8 @@
 <openerp>
   	<data>
+		
+		<!-- Lead to Opportunity view -->
 
-	    
-	   <record id="action_crm_lead2opportunity" model="ir.actions.act_window">
-	      <field name="name">Create Opportunity</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.lead2opportunity</field>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	      <field name="context">{'record_id' : active_ids}</field>
-	   </record>
-	    
   		<record id="view_crm_lead2opportunity_create" model="ir.ui.view">
 	      <field name="name">crm.lead2opportunity.create</field>
 	      <field name="model">crm.lead2opportunity</field>
@@ -31,6 +22,17 @@
 	      </field>
 	   </record>
 	   
+	   <!-- Lead to Opportunity action -->
 	   
+	   <record id="action_crm_lead2opportunity" model="ir.actions.act_window">
+	      <field name="name">Create Opportunity</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.lead2opportunity</field>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_id' : active_ids}</field>
+	   </record>
+
  	</data>
 </openerp>
diff --git a/addons/crm/wizard/lead2opportunity.py b/addons/crm/wizard/lead2opportunity.py
deleted file mode 100644
index ff630419f29..00000000000
--- a/addons/crm/wizard/lead2opportunity.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# -*- encoding: utf-8 -*-
-############################################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-############################################################################################
-
-from osv import osv, fields
-import netsvc
-import time
-import tools
-import mx.DateTime
-from tools import config
-from tools.translate import _
-import tools
-
-class crm_lead2opportunity(osv.osv_memory):
-    _name = 'crm.lead2opportunity'
-    _description = 'Lead To Opportunity'
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {'type':'ir.actions.act_window_close'}
-
-    def action_apply(self, cr, uid, ids, context=None):
-        
-        this = self.browse(cr, uid, ids[0], context=context)
-        value={}
-        record_id = context and context.get('record_id', False) or False
-        if record_id:
-            for case in self.pool.get('crm.lead').browse(cr, uid, record_id, context=context):
-                 if case.state in ['done', 'cancel']:       
-                            raise osv.except_osv(_("Warning"),
-                                                 _("Closed/Cancelled Phone Call Could not convert into Opportunity"))
-                 else:
-                    data_obj = self.pool.get('ir.model.data')
-                    result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-                    res = data_obj.read(cr, uid, result, ['res_id'])
-                    
-            
-                    id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-                    id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-                    if id2:
-                        id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-                    if id3:
-                        id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-            
-                    lead_case_obj = self.pool.get('crm.lead')
-                    opportunity_case_obj =self. pool.get('crm.opportunity')        
-                    new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
-                            'name': this.name,
-                            'planned_revenue': this.planned_revenue,
-                            'probability': this.probability,
-                            'partner_id': case.partner_id and case.partner_id.id or False ,
-                            'section_id':case.section_id and case.section_id.id or False,
-                            'description':case.description or False,
-                            'date_deadline': case.date_deadline or False,
-                            'partner_address_id':case.partner_address_id and case.partner_address_id.id or False ,
-                            'priority': case.priority,
-                            'phone': case.phone,                
-                            'email_from': case.email_from
-                        })       
-                        
-                    new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
-                    vals = {
-                            'partner_id': this.partner_id and this.partner_id.id or False,                
-                            }
-                    if not case.opportunity_id:
-                            vals.update({'opportunity_id' : new_opportunity.id})
-            
-                    lead_case_obj.write(cr, uid, [case.id], vals)
-                    lead_case_obj.case_close(cr, uid, [case.id])
-                    opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
-                    
-            value = {            
-                        'name': _('Opportunity'),
-                        'view_type': 'form',
-                        'view_mode': 'form,tree',
-                        'res_model': 'crm.opportunity',
-                        'res_id': int(new_opportunity_id),
-                        'view_id': False,
-                        'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-                        'type': 'ir.actions.act_window',
-                        'search_view_id': res['res_id'] 
-                    }
-        return value
-    _columns = {
-        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
-        'probability': fields.float('Success Probability'),
-        'planned_revenue': fields.float('Expected Revenue'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-    }
-    def default_get(self, cr, uid, fields, context=None):
-        record_id = context and context.get('record_id', False) or False
-        res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
-        if record_id:
-            for lead in self.pool.get('crm.lead').browse(cr, uid, record_id, context=context):
-                res['name']= lead.partner_name
-                res['partner_id']=lead.partner_id and lead.partner_id.id or False
-        return res
-    
-crm_lead2opportunity()
\ No newline at end of file

From eba05bd705919624a15e9ec7fdfd9884803f8557 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 16 Mar 2010 17:15:31 +0530
Subject: [PATCH 023/248] [IMP]: crm: Improvement in Opportunity schedule
 meeting wizard + Quality improvement

bzr revid: rpa@tinyerp.com-20100316114531-ff8405ri69ciesvb
---
 addons/crm/__terp__.py                        |  2 +-
 addons/crm/wizard/__init__.py                 |  6 +-
 .../crm/wizard/crm_opportunity_to_meeting.py  | 98 +++++++++++++++++++
 ...ml => crm_opportunity_to_meeting_view.xml} | 18 +++-
 addons/crm/wizard/opportunity2meeting.py      | 77 ---------------
 5 files changed, 118 insertions(+), 83 deletions(-)
 create mode 100644 addons/crm/wizard/crm_opportunity_to_meeting.py
 rename addons/crm/wizard/{opportunity2meeting.xml => crm_opportunity_to_meeting_view.xml} (60%)
 delete mode 100644 addons/crm/wizard/opportunity2meeting.py

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 90ba7e597bb..683d608b5c4 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -68,7 +68,7 @@ between mails and Open ERP.""",
         'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'wizard/opportunity2partner_view.xml',
-        'wizard/opportunity2meeting.xml',
+        'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/opportunity2phonecall.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index b3761eaf4b3..986b674911d 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import crm_opportunity_wizard
 import crm_phonecall_wizard
 
 import wizard_crm_send_email
@@ -29,12 +28,15 @@ import wizard_history_event
 
 import crm_lead_to_partner
 import crm_lead_to_opportunity
+
+import crm_opportunity_to_meeting
+
 import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
 import phonecall_to_opportunity
 import opportunity2partner
-import opportunity2meeting
+
 import opportunity2phonecall
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting.py b/addons/crm/wizard/crm_opportunity_to_meeting.py
new file mode 100644
index 00000000000..23b8b135833
--- /dev/null
+++ b/addons/crm/wizard/crm_opportunity_to_meeting.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from tools.translate import _
+
+class crm_opportunity2meeting(osv.osv_memory):
+    _name = 'crm.opportunity2meeting'
+    _description = 'Opportunity To Meeting'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Opportunity to Meeting form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Opportunity to Meeting IDs
+        @param context: A standard dictionary for contextual values
+
+        """
+        return {'type': 'ir.actions.act_window_close'}
+
+    def action_makeMeeting(self, cr, uid, ids, context=None):
+        """
+        This opens Meeting's calendar view to schedule meeting on current Opportunity
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Opportunity to Meeting IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Meeting view
+        """
+        value = {}
+        record_ids = context and context.get('active_ids', []) or []
+        if record_ids:
+            opp_obj = self.pool.get('crm.opportunity')
+            data_obj = self.pool.get('ir.model.data')
+
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            if id1:
+                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        for this in self.browse(cr, uid, ids, context=context):
+            for opp in opp_obj.browse(cr, uid, record_ids, context=context):
+                context = {
+                            'default_opportunity_id': opp.id, 
+                            'default_partner_id': opp.partner_id and opp.partner_id.id or False, 
+                            'default_section_id': opp.section_id and opp.section_id.id or False, 
+                            'default_email_from': opp.email_from, 
+                            'default_state': 'open', 
+                            'default_name': opp.name
+                        }
+                        
+                value = {
+                    'name': _('Meetings'), 
+                    'domain' : "[('user_id','=',%s)]" % (uid), 
+                    'context': context, 
+                    'view_type': 'form', 
+                    'view_mode': 'calendar,form,tree', 
+                    'res_model': 'crm.meeting', 
+                    'view_id': False, 
+                    'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')], 
+                    'type': 'ir.actions.act_window', 
+                    'search_view_id': res['res_id']
+                    }
+
+        return value
+
+crm_opportunity2meeting()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/opportunity2meeting.xml b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
similarity index 60%
rename from addons/crm/wizard/opportunity2meeting.xml
rename to addons/crm/wizard/crm_opportunity_to_meeting_view.xml
index a8851c53d2c..99229aa738d 100644
--- a/addons/crm/wizard/opportunity2meeting.xml
+++ b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
@@ -1,17 +1,28 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
+	    <!-- Opportunity to meeting view -->
+
         <record model="ir.ui.view" id="opportunity2meeting_view">
             <field name="name">crm.opportunity2meeting.form</field>
             <field name="model">crm.opportunity2meeting</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Convert To Meeting ">
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                <form string="Convert To Meeting">
+                	<label string="Are you sure to schedule a meeting for this Opportunity?" colspan="4"/>
+                	<newline/>
+                	<separator colspan="4" string=""/>
+                	<button name="action_cancel" string="_Cancel"
+                		icon="gtk-cancel" special="cancel" />
+                	<button name="action_makeMeeting" type="object"
+                		string="_Schedule" icon="gtk-go-forward" />
                 </form>
             </field>
         </record>
+		
+		<!-- Opportunity to meeting action -->
+
         <record model="ir.actions.act_window" id="opportunity2meeting_act">
             <field name="name">Convert To Meeting</field>
             <field name="res_model">crm.opportunity2meeting</field>
@@ -21,5 +32,6 @@
             <field name="target">new</field>
          	<field name="context">{'record_id' : active_id}</field>
         </record>
+
     </data>
 </openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/opportunity2meeting.py b/addons/crm/wizard/opportunity2meeting.py
deleted file mode 100644
index 324b694ac0c..00000000000
--- a/addons/crm/wizard/opportunity2meeting.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- encoding: utf-8 -*-
-############################################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-############################################################################################
-
-from osv import osv, fields
-import netsvc
-import time
-import tools
-import mx.DateTime
-from tools import config
-from tools.translate import _
-import tools
-
-class crm_opportunity2meeting(osv.osv_memory):
-    _name = 'crm.opportunity2meeting'
-    _description = 'Opportunity To Meeting'
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {'type':'ir.actions.act_window_close'}
-
-    def action_makeMeeting(self, cr, uid, ids, context=None):
-        this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('record_id', False) or False
-        if record_id:
-            opportunity_case_obj = self.pool.get('crm.opportunity')                
-            data_obj = self.pool.get('ir.model.data')
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            id = data_obj.read(cr, uid, result, ['res_id'])
-            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            if id1:
-                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-            opportunity = opportunity_case_obj.browse(cr, uid, record_id, context=context)
-            partner_id = opportunity.partner_id and opportunity.partner_id.id or False
-            name = opportunity.name
-            email = opportunity.email_from
-            section_id = opportunity.section_id and opportunity.section_id.id or False        
-            return {            
-                'name': _('Meetings'),
-                'domain' : "[('user_id','=',%s)]"%(uid),  
-                'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},
-                'view_type': 'form',
-                'view_mode': 'calendar,form,tree',
-                'res_model': 'crm.meeting',
-                'view_id': False,
-                'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': id['res_id']
-                }
-        else:
-            return {}
-                
-crm_opportunity2meeting()
\ No newline at end of file

From d8bdf800c242558284b4413d25320ef56961283b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 16 Mar 2010 17:50:41 +0530
Subject: [PATCH 024/248] [REM]: crm: Removed opportunity to Partner wizard

bzr revid: rpa@tinyerp.com-20100316122041-bf1rqhhkd5ujs17s
---
 addons/crm/__terp__.py                        |   1 -
 addons/crm/crm_opportunity_view.xml           |   5 -
 addons/crm/wizard/__init__.py                 |   1 -
 .../crm/wizard/crm_lead_to_partner_view.xml   |   4 +-
 addons/crm/wizard/opportunity2partner.py      | 133 ------------------
 .../crm/wizard/opportunity2partner_view.xml   |  67 ---------
 6 files changed, 2 insertions(+), 209 deletions(-)
 delete mode 100644 addons/crm/wizard/opportunity2partner.py
 delete mode 100644 addons/crm/wizard/opportunity2partner_view.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 683d608b5c4..1f91f6af4c5 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -67,7 +67,6 @@ between mails and Open ERP.""",
         'wizard/phonecall2meeting.xml',
         'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
-        'wizard/opportunity2partner_view.xml',
         'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/opportunity2phonecall.xml',
         'crm_wizard.xml', 
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index f1faf00ad5d..55f3d2f3dc1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -75,11 +75,6 @@
                     <group col="3" colspan="2">
                         <separator colspan="3" string="Contacts"/>
                         <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
-						<button string="Create a Partner"
-                        icon="terp-crm"
-                        name="%(action_crm_opportunity2partner)d"
-                        type="action"
-                        attrs="{'invisible':[('partner_id','!=',False)]}" />
                         <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
                         <field name="email_from" string="Email"/>
                         <field name="phone"/>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 986b674911d..5bcdfe32d03 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -35,7 +35,6 @@ import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
 import phonecall_to_opportunity
-import opportunity2partner
 
 import opportunity2phonecall
 
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index a2e8b4a1a23..78898dd25da 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -12,8 +12,8 @@
 	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
         		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
 	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      			<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+	      			<button name="open_create_partner" string="Create _Partner" type="object" icon="gtk-ok"/>
 	      		</group>
 	      	</form>
 	      </field>
diff --git a/addons/crm/wizard/opportunity2partner.py b/addons/crm/wizard/opportunity2partner.py
deleted file mode 100644
index 308898f71ad..00000000000
--- a/addons/crm/wizard/opportunity2partner.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from mx.DateTime import now
-
-from osv import osv, fields
-import netsvc
-import ir
-import pooler
-from tools.translate import _
-
-class crm_opportunity2partner(osv.osv_memory):
-    _name = 'crm.opportunity2partner'
-    _description = 'Phone Call to Partner'
-    
-    _columns = {
-        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
-        'partner_id': fields.many2one('res.partner','Partner'), 
-    }
-    _defaults = {
-        'action': lambda *a:'exist',
-    }
-    
-    def create_partner(self, cr, uid, ids, context):
-        view_obj = self.pool.get('ir.ui.view')
-        view_id = view_obj.search(cr,uid,[('model','=','crm.opportunity2partner'),('name','=','crm.opportunity2partner.view')])
-        return {
-            'view_mode': 'form',
-            'view_type': 'form',
-            'view_id': view_id or False,
-            'res_model': 'crm.opportunity2partner',
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-        
-    def selectPartner(self, cr, uid, ids, context):
-        case_obj = self.pool.get('crm.opportunity')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        rec_ids = context and context.get('record_ids',False)
-        value={}
-        for case in case_obj.browse(cr, uid, rec_ids):
-            if case.partner_id:
-                raise osv.except_osv(_('Warning !'),
-                    _('A partner is already defined on this lead.'))
-           
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.name)])            
-            if not partner_ids and case.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-
-            partner_id = partner_ids and partner_ids[0] or False
-        if not partner_id:
-            value = self._make_partner(cr, uid, ids, context)           
-        return value 
-
-    def _create_partner(self, cr, uid, ids, context):
-        case_obj = self.pool.get('crm.opportunity')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        datas = self.browse(cr, uid, ids)[0]
-        partner_ids = []
-        partner_id = False
-        contact_id = False
-        rec_ids = context and context.get('record_ids',False)
-        for case in case_obj.browse(cr, uid, rec_ids):
-            if datas.action == 'create':
-                partner_id = partner_obj.create(cr, uid, {
-                    'name':  case.name,
-                    'user_id': case.user_id.id,
-                    'comment': case.description,
-                })
-                contact_id = contact_obj.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'name': case.name,
-                    'phone': case.phone,
-                    'email': case.email_from
-                })
-
-            else:
-                if datas.partner_id:
-                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
-                    partner_id = partner.id
-                    contact_id = partner.address and partner.address[0].id
-
-            partner_ids.append(partner_id)
-            vals = {}
-            if partner_id:
-                vals.update({'partner_id': partner_id})
-            if contact_id:
-                vals.update({'partner_address_id': contact_id})
-            case_obj.write(cr, uid, [case.id], vals)   
-        return partner_ids
-
-    def _make_partner(self, cr, uid, ids, context): 
-        partner_ids = self._create_partner(cr, uid, ids, context)
-        mod_obj = self.pool.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'domain': "[]",
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'res.partner',
-            'res_id': partner_ids and int(partner_ids[0]) or False,
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-    
-crm_opportunity2partner()
-
diff --git a/addons/crm/wizard/opportunity2partner_view.xml b/addons/crm/wizard/opportunity2partner_view.xml
deleted file mode 100644
index 8a3e6780b59..00000000000
--- a/addons/crm/wizard/opportunity2partner_view.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<openerp>
-  	<data>
-  		<record id="view_crm_opportunity2partner_create" model="ir.ui.view">
-	      <field name="name">crm.opportunity2partner.view.create</field>
-	      <field name="model">crm.opportunity2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
-	   <record id="action_crm_opportunity2partner_create" model="ir.actions.act_window">
-	      <field name="name">Create a Partner</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.opportunity2partner</field>
-	      <field name="view_id" ref="view_crm_opportunity2partner_create"/>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	      <field name="context">{'record_ids' : active_ids}</field>
-	   </record>
-	   
-	   <record model="ir.values" id="values_crm_phonecall2partner_create">
-            <field name="model_id" ref="crm.model_crm_opportunity" />
-            <field name="object" eval="1" />
-            <field name="name">Create Partner</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_opportunity2partner_create'))" />
-            <field name="key">action</field>
-            <field name="model">crm.opportunity</field>
-        </record>
-	   
-	   <record id="view_crm_opportunity2partner" model="ir.ui.view">
-	      <field name="name">crm.opportunity2partner.view</field>
-	      <field name="model">crm.opportunity2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<field name="action"/>
-	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id"/>
-		        </group>
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
-	   <record id="action_crm_opportunity2partner" model="ir.actions.act_window">
-	      <field name="name">Create a Partner</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.opportunity2partner</field>
-	      <field name="view_id" ref="view_crm_opportunity2partner"/>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	      <field name="context">{'record_ids' : active_ids}</field>
-	   </record>
- 	</data>
-</openerp>

From b509b2d0867f0283e7876c6ee636f7e18f48f11e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 16 Mar 2010 18:32:36 +0530
Subject: [PATCH 025/248] [IMP]: crm: Improvement in Opportunity to Phonecall
 wizard + Quality improvement

bzr revid: rpa@tinyerp.com-20100316130236-104ao8dh3zt1yspv
---
 addons/crm/__terp__.py                        |   3 +-
 addons/crm/crm_opportunity_wizard.xml         |  24 +---
 addons/crm/wizard/__init__.py                 |   3 +-
 .../wizard/crm_lead_to_opportunity_view.xml   |   1 -
 .../wizard/crm_opportunity_to_phonecall.py    | 131 ++++++++++++++++++
 ... => crm_opportunity_to_phonecall_view.xml} |  17 ++-
 addons/crm/wizard/opportunity2phonecall.py    | 104 --------------
 7 files changed, 147 insertions(+), 136 deletions(-)
 create mode 100644 addons/crm/wizard/crm_opportunity_to_phonecall.py
 rename addons/crm/wizard/{opportunity2phonecall.xml => crm_opportunity_to_phonecall_view.xml} (74%)
 delete mode 100644 addons/crm/wizard/opportunity2phonecall.py

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 1f91f6af4c5..bf14aab0eb6 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -68,7 +68,7 @@ between mails and Open ERP.""",
         'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'wizard/crm_opportunity_to_meeting_view.xml',
-        'wizard/opportunity2phonecall.xml',
+        'wizard/crm_opportunity_to_phonecall_view.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
@@ -80,7 +80,6 @@ between mails and Open ERP.""",
         #'crm_phonecall_wizard.xml', 
         'crm_phonecall_view.xml', 
         'crm_phonecall_menu.xml',         
-        #'crm_opportunity_wizard.xml', 
         'crm_opportunity_view.xml', 
         'crm_opportunity_menu.xml', 
         'crm_fund_view.xml', 
diff --git a/addons/crm/crm_opportunity_wizard.xml b/addons/crm/crm_opportunity_wizard.xml
index 5ba7ed0601f..24ee8257911 100644
--- a/addons/crm/crm_opportunity_wizard.xml
+++ b/addons/crm/crm_opportunity_wizard.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>        
-        <wizard
-            id="wizard_crm_opportunity_reschedule_phone_call"
-            keyword="client_action_multi"
-            model="crm.opportunity"
-            name="crm.opportunity.reschedule_phone_call"
-            multi="True"
-            string="Schedule Phone Call" />
-
        <wizard
           id="wizard_partner_create_opportunity"
             keyword="client_action_multi"
@@ -16,20 +8,6 @@
             name="crm.case.opportunity.partner_opportunity"
             menu="False"
             string="Create Opportunity"/>
-	  
-	  <wizard
-            id="wizard_crm_opportunity_meeting_set"
-            keyword="client_action_multi"
-            model="crm.opportunity"
-			name="crm.opportunity.meeting_set"
-			menu="False"
-            string="Schedule Meeting"/>	
-	
-	   <wizard
-          id="wizard_partner_create_opportunity1"
-            keyword="client_action_relate"
-            model="res.partner"
-            name="crm.case.opportunity.partner_opportunity"
-            string="Create Opportunity"/>
+
     </data>
 </openerp>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 5bcdfe32d03..b477600af07 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -25,18 +25,17 @@ import wizard_crm_send_email
 import wizard_crm_new_send_email
 import wizard_history_event
 
-
 import crm_lead_to_partner
 import crm_lead_to_opportunity
 
 import crm_opportunity_to_meeting
+import crm_opportunity_to_phonecall
 
 import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
 import phonecall_to_opportunity
 
-import opportunity2phonecall
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index a3372b4fb8a..ac559c070a9 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -31,7 +31,6 @@
 	      <field name="view_type">form</field>
 	      <field name="view_mode">form</field>
 	      <field name="target">new</field>
-	      <field name="context">{'record_id' : active_ids}</field>
 	   </record>
 
  	</data>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
new file mode 100644
index 00000000000..359ae594320
--- /dev/null
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_opportunity2phonecall(osv.osv_memory):
+    _name = 'crm.opportunity2phonecall'
+    _description = 'Opportunity to Phonecall'
+
+    _columns = {
+        'name' : fields.char('Call summary', size=64, required=True, select=1), 
+        'user_id' : fields.many2one('res.users', "Assign To"), 
+        'date': fields.datetime('Date' , required=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+
+        opp_obj = self.pool.get('crm.opportunity')
+        record_ids = context and context.get('active_ids', []) or []
+        res = {}
+        for opp in opp_obj.browse(cr, uid, record_ids, context=context):
+            res['name'] = opp.name
+            res['user_id'] = opp.user_id and opp.user_id.id or False
+            res['section_id'] = opp.section_id and opp.section_id.id or False
+        return res
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Opportunity to Phonecall form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Opportunity to Phonecall's IDs
+        @param context: A standard dictionary for contextual values
+        """
+        return {'type': 'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        """
+        This converts Opportunity to Phonecall and opens Phonecall view
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Opportunity to Phonecall IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Opportunity form
+        """
+        value = {}
+        record_ids = context and context.get('active_ids', []) or []
+
+        phonecall_obj = self.pool.get('crm.phonecall')
+        opp_obj = self.pool.get('crm.opportunity')
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+
+        # Select the view
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        for this in self.browse(cr, uid, ids, context=context):
+            for opp in opp_obj.browse(cr, uid, record_ids, context=context):
+                new_case = phonecall_obj.create(cr, uid, {
+                        'name' : opp.name, 
+                        'case_id' : opp.id , 
+                        'user_id' : this.user_id and this.user_id.id or False, 
+                        'categ_id' : opp.categ_id and opp.categ_id.id or False, 
+                        'description' : opp.description or False, 
+                        'date' : this.date, 
+                        'section_id' : opp.section_id and opp.section_id.id or False, 
+                        'partner_id': opp.partner_id and opp.partner_id.id or False, 
+                        'partner_address_id': opp.partner_address_id and opp.partner_address_id.id or False, 
+                        'partner_phone' : opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False), 
+                        'partner_mobile' : opp.partner_address_id and opp.partner_address_id.mobile or False, 
+                        'priority': opp.priority, 
+                        'opp_id': opp.id
+                }, context=context)
+
+                phonecall_obj.case_open(cr, uid, [new_case])
+
+            value = {
+                'name': _('Phone Call'), 
+                'view_type': 'form', 
+                'view_mode': 'tree,form', 
+                'res_model': 'crm.phonecall', 
+                'res_id' : new_case, 
+                'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar'), (False, 'graph')], 
+                'type': 'ir.actions.act_window', 
+                'search_view_id': res['res_id']
+            }
+        return value
+
+crm_opportunity2phonecall()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/opportunity2phonecall.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
similarity index 74%
rename from addons/crm/wizard/opportunity2phonecall.xml
rename to addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 905f761e08a..ae07471e07c 100644
--- a/addons/crm/wizard/opportunity2phonecall.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+    	
+    	<!-- Opportunity to Phonecall view -->
+    	
         <record model="ir.ui.view" id="opportunity2phonecall_view">
             <field name="name">crm.opportunity2phonecall.form</field>
             <field name="model">crm.opportunity2phonecall</field>
@@ -14,14 +17,19 @@
 						<field name="user_id" />
 						<field name="section_id"/>
 						<label string ="" colspan="2"/>
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_apply" type="object" string="Schedule Other Call" icon="gtk-ok" />
-                    </group>
+						<button name="action_cancel" string="_Cancel"
+							icon="gtk-cancel" special="cancel" />
+						<button name="action_apply" type="object"
+							string="_Schedule Call" icon="gtk-ok" />
+					</group>
                 </form>
             </field>
         </record>
+		
+		<!-- Opportunity to Phonecall action -->
+		
  		<record model="ir.actions.act_window" id="opportunity2phonecall_act">
-            <field name="name">Schedule Other Call</field>
+            <field name="name">Schedule Call</field>
             <field name="res_model">crm.opportunity2phonecall</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -29,5 +37,6 @@
             <field name="target">new</field>
          	<field name="context">{'record_id' : active_id}</field>
         </record>
+        
     </data>
 </openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/opportunity2phonecall.py b/addons/crm/wizard/opportunity2phonecall.py
deleted file mode 100644
index 587a7f2dfa2..00000000000
--- a/addons/crm/wizard/opportunity2phonecall.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from mx.DateTime import now
-
-from osv import osv, fields
-import netsvc
-import ir
-import pooler
-from tools.translate import _
-
-class crm_opportunity2phonecall(osv.osv_memory):
-    _name = 'crm.opportunity2phonecall'
-    _description = 'Opportunity to Phonecall'
-    _columns = {
-        'name' : fields.char('Call summary', size=64, required=True, select=1),
-        'user_id' : fields.many2one('res.users',"Assign To"),
-        'date': fields.datetime('Date' ,required=True),
-        'section_id':fields.many2one('crm.case.section','Sales Team'),
-
-    }
-    def default_get(self, cr, uid, fields, context=None):
-        record_id = context and context.get('record_id', False) or False
-        res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
-        if record_id:
-            opportunity = self.pool.get('crm.opportunity').browse(cr, uid, record_id, context=context)
-            res['name']=opportunity.name
-            res['user_id']=opportunity.user_id and opportunity.user_id.id or False
-            res['section_id']=opportunity.section_id and opportunity.section_id.id or False 
-        return res
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {'type':'ir.actions.act_window_close'}
-
-    def action_apply(self, cr, uid, ids, context=None):
-        this = self.browse(cr, uid, ids[0], context=context)
-        mod_obj =self.pool.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        phonecall_case_obj = self.pool.get('crm.phonecall')
-        opportunity_case_obj = self.pool.get('crm.opportunity') 
-        # Select the view
-        record_id = context and context.get('record_id', False) or False
-        data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-        opportunites = opportunity_case_obj.browse(cr, uid, [record_id])
-        for opportunity in opportunites:            
-            new_case = phonecall_case_obj.create(cr, uid, {
-                    'name' : opportunity.name,
-                    'case_id' : opportunity.id ,
-                    'user_id' : this.user_id and this.user_id.id or False,
-                    'categ_id' : opportunity.categ_id and opportunity.categ_id.id or False,
-                    'description' : opportunity.description or False,
-                    'date' : this.date,
-                    'section_id' : opportunity.section_id and opportunity.section_id.id or False,
-                    'partner_id': opportunity.partner_id and opportunity.partner_id.id or False,
-                    'partner_address_id':opportunity.partner_address_id and opportunity.partner_address_id.id or False,
-                    'partner_phone' : opportunity.phone or (opportunity.partner_address_id and opportunity.partner_address_id.phone or False),
-                    'partner_mobile' : opportunity.partner_address_id and opportunity.partner_address_id.mobile or False,
-                    'priority': opportunity.priority,
-                    'opportunity_id':opportunity.id
-            }, context=context)
-            vals = {}
-
-            phonecall_case_obj.case_open(cr, uid, [new_case])        
-            
-        value = {            
-            'name': _('Phone Call'),
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'crm.phonecall',
-            'res_id' : new_case,
-            'views': [(id3,'form'),(id2,'tree'),(False,'calendar'),(False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id']
-        }
-        return value
-        
-    
-crm_opportunity2phonecall()   
\ No newline at end of file

From 18b5cdb61c65f23c715039599c0fae24308283d8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 16 Mar 2010 18:54:12 +0530
Subject: [PATCH 026/248] [IMP]: crm: Added osv wizard objects in access csv

bzr revid: rpa@tinyerp.com-20100316132412-5zlim4qhhmnozyab
---
 addons/crm/security/ir.model.access.csv | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index c3888951d4c..a5a82bf62db 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -32,4 +32,11 @@
 "access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
 "access_crm_opportunity_report_user","crm.opportunity.report","model_crm_opportunity_report","crm.group_crm_user",1,0,0,0
 "access_report_crm_case_service_dashboard","report.crm.case.service.dashboard","model_report_crm_case_service_dashboard","crm.group_crm_user",1,0,0,0
-
+"access_crm_lead2partner","crm.lead2partner","model_crm_lead2partner","crm.group_crm_user",1,0,0,0
+"access_crm_lead2opportunity","crm.lead2opportunity","model_crm_lead2opportunity","crm.group_crm_user",1,0,0,0
+"access_crm_opportunity2meeting","crm.opportunity2meeting","model_crm_opportunity2meeting","crm.group_crm_user",1,0,0,0
+"access_crm_opportunity2phonecall","crm.opportunity2phonecall","model_crm_opportunity2phonecall","crm.group_crm_user",1,0,0,0
+"access_crm_phonecall2phonecall","crm.phonecall2phonecall","model_crm_phonecall2phonecall","crm.group_crm_user",1,0,0,0
+"access_crm_phonecall2partner","crm.phonecall2partner","model_crm_phonecall2partner","crm.group_crm_user",1,0,0,0
+"access_crm_phonecall2meeting","crm.phonecall2meeting","model_crm_phonecall2meeting","crm.group_crm_user",1,0,0,0
+"access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,0,0,0

From 7c5449a692442562fde55e2749b4f2911839a8b2 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 16 Mar 2010 19:31:43 +0530
Subject: [PATCH 027/248] [IMP]: wiki: code optimization and apply doc string

bzr revid: ksa@tinyerp.co.in-20100316140143-vzcfcealogprk210
---
 addons/wiki/wiki.py                           | 11 +++-
 addons/wiki/wiki_view.xml                     | 51 +++++++++++--------
 addons/wiki/wizard/wiki_create_menu.py        | 11 ++--
 addons/wiki/wizard/wiki_create_menu_view.xml  |  3 ++
 addons/wiki/wizard/wiki_make_index.py         |  4 +-
 addons/wiki/wizard/wiki_make_index_view.xml   |  3 ++
 addons/wiki/wizard/wiki_wiki_help_open.py     |  2 +
 .../wiki/wizard/wiki_wiki_help_open_view.xml  |  3 ++
 addons/wiki/wizard/wiki_wiki_page_open.py     |  4 +-
 .../wiki/wizard/wiki_wiki_page_open_view.xml  |  3 ++
 10 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index db6fcadac92..70511d3e56f 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -36,6 +36,7 @@ class Wiki(osv.osv):
 Wiki()
 
 class WikiGroup(osv.osv):
+    """ Wiki Groups """
     _name = "wiki.groups"
     _description="Wiki Groups"
     _order = 'name'
@@ -54,7 +55,9 @@ class WikiGroup(osv.osv):
     }
 WikiGroup()
 
+
 class GroupLink(osv.osv):
+    """ Apply Group Link """
     _name = "wiki.groups.link"
     _description="Wiki Groups Links"
     _rec_name = 'action_id'
@@ -64,6 +67,7 @@ class GroupLink(osv.osv):
     }
 GroupLink()
 
+
 class Wiki(osv.osv):
     _inherit="wiki.wiki"
     _description="Wiki Page"
@@ -86,7 +90,7 @@ class Wiki(osv.osv):
         'parent_id':fields.many2one('wiki.wiki', 'Parent Page'),
         'child_ids':fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
     }
-    
+
     def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
         if (not group_id) or content:
             return {}
@@ -141,7 +145,9 @@ class Wiki(osv.osv):
 
 Wiki()
 
+
 class History(osv.osv):
+    """ Wiki History """
     _name="wiki.wiki.history"
     _description="Wiki History"
     _rec_name="date_time"
@@ -157,6 +163,7 @@ class History(osv.osv):
     _defaults = {
         'write_uid': lambda obj,cr,uid,context: uid,
     }
+
     def getDiff(self, cr, uid, v1, v2, context={}):
         import difflib
         history_pool = self.pool.get('wiki.wiki.history')
@@ -166,5 +173,7 @@ class History(osv.osv):
         line2 = text2.splitlines(1)
         diff = difflib.HtmlDiff()
         return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
+
 History()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index ec738a5a91f..07f89257dbd 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,12 +1,22 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4"/>
-        <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
-        <menuitem name="Wiki" id="menu_wiki_configuration" parent="base.menu_document_configuration" sequence="2"/>
-        <menuitem id="base.menu_document2" name="Collaborative Content" parent="base.menu_document"/>
+       <menuitem name="Knowledge Management" icon="terp-stock"
+       	id="base.menu_document" sequence="4" />
 
-        <record model="ir.ui.view" id="wiki_group_tree">
+       <menuitem name="Configuration"
+       	id="base.menu_document_configuration"
+       	parent="base.menu_document" sequence="50" />
+
+       <menuitem name="Wiki" id="menu_wiki_configuration"
+       	parent="base.menu_document_configuration" sequence="2" />
+
+       <menuitem id="base.menu_document2" name="Collaborative Content"
+       	parent="base.menu_document" />
+
+<!--  Wiki Groups  -->
+
+       <record model="ir.ui.view" id="wiki_group_tree">
             <field name="name">wiki.groups.tree</field>
             <field name="model">wiki.groups</field>
             <field name="type">tree</field>
@@ -26,8 +36,8 @@
                         <field name="name" select="1"/>
                         <field name="create_date" readonly="2"/>
                         <field name="method" select="1"/>
-                        <field name="home" select="1"  attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}"/>
-                        <!--field name="section"/-->
+                        <field name="home" select="1"
+                        	attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
                     </group>
                     <notebook colspan="4">
                     <page string="Notes">
@@ -52,10 +62,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-     <!--   <menuitem
-            parent="menu_document_configuration"
-            id="menu_action_wiki_groups"
-            action="action_wiki_groups"/>-->
+
       <menuitem name="Wiki Groups"
             parent="menu_wiki_configuration"
             id="menu_action_wiki_groups"
@@ -66,10 +73,8 @@
             <field name="res_model">wiki.groups</field>
             <field name="view_type">tree</field>
         </record>
-       <!-- <menuitem
-            parent="menu_document"
-            id="menu_action_wiki_groups_browse"
-            action="action_wiki_groups_browse"/>-->
+
+<!-- wiki  -->
 
         <record id="view_wiki_tree_childs" model="ir.ui.view">
             <field name="name">wiki.wiki.tree.childs</field>
@@ -147,6 +152,8 @@
             </field>
         </record>
 
+<!-- search page for wiki -->
+
         <record model="ir.actions.act_window" id="action_wiki">
             <field name="name">Search Pages</field>
             <field name="res_model">wiki.wiki</field>
@@ -156,9 +163,13 @@
             <field name="context">{'section':'1'}</field>
             <field name="search_view_id" ref="view_wiki_filter"/>
         </record>
-        <menuitem parent="base.menu_document2" id="menu_action_wiki_wiki" name="Wiki Pages" action="action_wiki"/>
 
-        <!--  Pages Waiting Review -->
+        <menuitem parent="base.menu_document2"
+        	id="menu_action_wiki_wiki" name="Wiki Pages"
+        	action="action_wiki" />
+
+<!--  Pages Waiting Review -->
+
         <record model="ir.actions.act_window" id="action_wiki_review">
             <field name="name">Pages Waiting Review</field>
             <field name="res_model">wiki.wiki</field>
@@ -170,6 +181,8 @@
             <field name="filter" eval="True"/>
         </record>
 
+<!-- History  -->
+
         <record model="ir.ui.view" id="view_wiki_history_tree">
             <field name="name">wiki.wiki.history.tree</field>
             <field name="model">wiki.wiki.history</field>
@@ -205,10 +218,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-       <!-- <menuitem
-            parent="menu_document_configuration"
-            id="menu_action_history"
-            action="action_history"/>-->
 
         <act_window domain="[('wiki_id', '=', active_id)]"
             id="act_wiki_wiki_history"
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index b9b2d5563c4..822e3a2aaf5 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -22,6 +22,7 @@
 from osv import fields, osv
 
 class wiki_create_menu(osv.osv_memory):
+    """ Create Menu """
     _name = "wiki.create.menu"
     _description = "Wizard Create Menu"
     _columns = {
@@ -37,12 +38,10 @@ class wiki_create_menu(osv.osv_memory):
         @param ids: List of create menu’s IDs
 
         """
-
+        mod_obj = self.pool.get('ir.model.data')
+        action_id = mod_obj._get_id(cr, uid, 'wiki', 'action_view_wiki_wiki_page_open')
         for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
-            for menu in self.pool.get('wiki.create.menu').browse(cr, uid, ids):
-
-                mod_obj = self.pool.get('ir.model.data')
-                action_id = mod_obj._get_id(cr, uid, 'wiki', 'action_view_wiki_wiki_page_open')
+            for menu in self.browse(cr, uid, ids):
                 menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
                 'name':menu.menu_name,
                 'parent_id':menu.menu_parent_id.id,
@@ -58,7 +57,7 @@ class wiki_create_menu(osv.osv_memory):
                 self.pool.get('wiki.groups.link').create(cr, uid,
                                     {'group_id': group_id, 'action_id':menu_id})
 
-                return {}
+        return {}
 
 wiki_create_menu()
 
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index 7acd1e2a70d..20b666be906 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+<!-- Create Menu  -->
+
 		<record id="view_wiki_create_menu" model="ir.ui.view">
             <field name="name">Create Menu</field>
             <field name="model">wiki.create.menu</field>
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py
index 78964743a8b..ea180597c3d 100644
--- a/addons/wiki/wizard/wiki_make_index.py
+++ b/addons/wiki/wizard/wiki_make_index.py
@@ -22,6 +22,7 @@
 from osv import fields, osv
 
 class wiki_make_index(osv.osv_memory):
+    """ Create Index For Selected Page """
     _name = "wiki.make.index"
     _description = "Create Index"
     _columns = {
@@ -34,10 +35,11 @@ class wiki_make_index(osv.osv_memory):
         @param ids: List of wiki index’s IDs
 
         """
+        data = context and context.get('active_ids', []) or []
         for index_obj in self.browse(cr,uid,ids):
             wiki_pool = self.pool.get('wiki.wiki')
             cr.execute("Select id, section from wiki_wiki where id = ANY(%s) \
-                            order by section " ,(context['active_ids'],))
+                            order by section " ,(data,))
             lst0 = cr.fetchall()
             lst = []
             s_ids = {}
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 1138afc908a..183a61183ef 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+<!-- Create Index  -->
+
     	<record id="view_wiki_make_index" model="ir.ui.view">
             <field name="name">Create Index</field>
             <field name="model">wiki.make.index</field>
diff --git a/addons/wiki/wizard/wiki_wiki_help_open.py b/addons/wiki/wizard/wiki_wiki_help_open.py
index 934d5fdccb7..37f3a3a6eb0 100644
--- a/addons/wiki/wizard/wiki_wiki_help_open.py
+++ b/addons/wiki/wizard/wiki_wiki_help_open.py
@@ -23,10 +23,12 @@
 from osv import fields, osv
 
 class wiki_wiki_help_open(osv.osv_memory):
+    """ Basic Wiki Editing """
     _name = "wiki.wiki.help.open"
     _description = "Basic Wiki Editing"
     _columns = {
     }
+
     def open_wiki_page(self, cr, uid, ids, context):
         """ Opens Wiki Page for Editing
         @param cr: the current row, from the database cursor,
diff --git a/addons/wiki/wizard/wiki_wiki_help_open_view.xml b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
index 76e96664f3d..79007eb68d0 100644
--- a/addons/wiki/wizard/wiki_wiki_help_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+<!-- Editing Page  -->
+
     	<record id="view_wiki_wiki_help_open" model="ir.ui.view">
             <field name="name">Basic Wiki Editing</field>
             <field name="model">wiki.wiki.help.open</field>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 37b31a10ead..2b9675009ce 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -22,11 +22,13 @@
 from osv import fields, osv
 
 class wiki_wiki_page_open(osv.osv_memory):
+    """ wizard Open Page """
     _name = "wiki.wiki.page.open"
     _description = "wiz open page"
     _columns = {
 
     }
+
     def open_wiki_page(self, cr, uid, ids, context):
         """ Opens Wiki Page of Group
         @param cr: the current row, from the database cursor,
@@ -36,8 +38,6 @@ class wiki_wiki_page_open(osv.osv_memory):
         """
         for group in self.pool.get('wiki.groups').browse(cr, uid,ids):
 
-         for openpage in self.pool.get('wiki.wiki.page.open').browse(cr, uid,ids):
-
             value = {
                 'domain': "[('group_id','=',%d)]" % (group.id),
                 'name': 'Wiki Page',
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 6df047882a4..b0f3da5899a 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+<!-- Open Page  -->
+
     	<record id="view_wiki_wiki_page_open" model="ir.ui.view">
             <field name="name">Open Page</field>
             <field name="model">wiki.wiki.page.open</field>

From 0a46449d0a6b5b3fb6d3e9d3e9270d97b976c7a1 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 16 Mar 2010 19:32:07 +0530
Subject: [PATCH 028/248] [IMP]: idea: code optimization and apply doc string

bzr revid: ksa@tinyerp.co.in-20100316140207-32167zmiorb79959
---
 addons/idea/idea.py                        | 68 +++++++++++++---------
 addons/idea/idea_view.xml                  | 37 +++++++++---
 addons/idea/wizard/idea_post_vote.py       | 25 ++++----
 addons/idea/wizard/idea_post_vote_view.xml | 23 +++-----
 4 files changed, 92 insertions(+), 61 deletions(-)

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index d487c1875e7..270fdc87605 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -21,10 +21,12 @@
 
 from osv import osv, fields
 
-VoteValues = [('-1','Not Voted'),('0','Very Bad'),('25', 'Bad'),('50','Normal'),('75','Good'),('100','Very Good') ]
+VoteValues = [('-1', 'Not Voted'), ('0', 'Very Bad'), ('25', 'Bad'), \
+              ('50', 'Normal'), ('75', 'Good'), ('100', 'Very Good') ]
 DefaultVoteValue = '50'
 
 class idea_category(osv.osv):
+    """ Category of Idea """
     _name = "idea.category"
     _description = "Category for an idea"
     _columns = {
@@ -37,17 +39,20 @@ class idea_category(osv.osv):
         ('name', 'unique(parent_id,name)', 'The name of the category must be unique' )
     ]
     _order = 'parent_id,name asc'
+
 idea_category()
 
+
 class idea_idea(osv.osv):
     _name = 'idea.idea'
     _rec_name = 'title'
 
     def _vote_avg_compute(self, cr, uid, ids, name, arg, context = None):
-        if not len(ids):
+        """ compute average for voting """
+        if not ids:
             return {}
 
-        sql = """SELECT i.id, avg(v.score::integer) 
+        sql = """SELECT i.id, avg(v.score::integer)
                    FROM idea_idea i LEFT OUTER JOIN idea_vote v ON i.id = v.idea_id
                     WHERE i.id = ANY(%s)
                     GROUP BY i.id
@@ -57,10 +62,11 @@ class idea_idea(osv.osv):
         return dict(cr.fetchall())
 
     def _vote_count(self,cr,uid,ids,name,arg,context=None):
-        if not len(ids):
+        """ count number of vote """
+        if not ids:
             return {}
 
-        sql = """SELECT i.id, COUNT(1) 
+        sql = """SELECT i.id, COUNT(1)
                    FROM idea_idea i LEFT OUTER JOIN idea_vote v ON i.id = v.idea_id
                     WHERE i.id = ANY(%s)
                     GROUP BY i.id
@@ -70,10 +76,11 @@ class idea_idea(osv.osv):
         return dict(cr.fetchall())
 
     def _comment_count(self,cr,uid,ids,name,arg,context=None):
-        if not len(ids):
+        """ count number of comment """
+        if not ids:
             return {}
 
-        sql = """SELECT i.id, COUNT(1) 
+        sql = """SELECT i.id, COUNT(1)
                    FROM idea_idea i LEFT OUTER JOIN idea_comment c ON i.id = c.idea_id
                     WHERE i.id = ANY(%s)
                     GROUP BY i.id
@@ -88,7 +95,8 @@ class idea_idea(osv.osv):
             res[id] = '-1'
         vote_obj = self.pool.get('idea.vote')
         votes_ids = vote_obj.search(cr, uid, [('idea_id', 'in', ids), ('user_id', '=', uid)])
-        for vote in vote_obj.browse(cr, uid, votes_ids, context):
+        vote_obj_id = vote_obj.browse(cr, uid, votes_ids, context)
+        for vote in vote_obj_id:
             res[vote.idea_id.id] = vote.score
         return res
 
@@ -98,12 +106,12 @@ class idea_idea(osv.osv):
         textual_value = str(field_value)
         if vote:
             if int(field_value)>=0:
-                vote_obj.write(cr,uid, vote, { 'score' : textual_value })
+                vote_obj.write(cr,uid,vote,{'score': textual_value })
             else:
-                vote_obj.unlink(cr,uid, vote)
+                vote_obj.unlink(cr,uid,vote)
         else:
             if int(field_value)>=0:
-                vote_obj.create(cr,uid, { 'idea_id' : id, 'user_id' : uid, 'score' : textual_value })
+                vote_obj.create(cr,uid, {'idea_id': id,'user_id': uid,'score': textual_value })
 
 
     _columns = {
@@ -111,14 +119,14 @@ class idea_idea(osv.osv):
         'title': fields.char('Idea Summary', size=64, required=True),
         'description': fields.text('Description', required=True, help='Content of the idea'),
         'comment_ids': fields.one2many('idea.comment', 'idea_id', 'Comments'),
-        'create_date' : fields.datetime( 'Creation date', readonly=True),
-        'vote_ids' : fields.one2many('idea.vote', 'idea_id', 'Vote'),
-        'my_vote' : fields.function(_vote_read, fnct_inv = _vote_save, string="My Vote", method=True, type="selection", selection=VoteValues),
-        'vote_avg' : fields.function(_vote_avg_compute, method=True, string="Average Score", type="float"),
-        'count_votes' : fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
+        'create_date': fields.datetime( 'Creation date', readonly=True),
+        'vote_ids': fields.one2many('idea.vote', 'idea_id', 'Vote'),
+        'my_vote': fields.function(_vote_read, fnct_inv = _vote_save, string="My Vote", method=True, type="selection", selection=VoteValues),
+        'vote_avg': fields.function(_vote_avg_compute, method=True, string="Average Score", type="float"),
+        'count_votes': fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
         'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
         'category_id': fields.many2one('idea.category', 'Category', required=True ),
-        'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'State', readonly=True, 
+        'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'State', readonly=True,
                                   help='When the Idea is created the state is \'Draft\'.\n It is opened by the user, the state is \'Opened\'.\
                                     \nIf the idea is accepted, the state is \'Accepted\'.'),
         'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True),
@@ -132,31 +140,33 @@ class idea_idea(osv.osv):
     _order = 'id desc'
 
     def idea_cancel(self, cr, uid, ids):
-        self.write(cr, uid, ids, { 'state' : 'cancel' })
+        self.write(cr, uid, ids, { 'state': 'cancel' })
         return True
 
     def idea_open(self, cr, uid, ids):
-        self.write(cr, uid, ids, { 'state' : 'open' })
+        self.write(cr, uid, ids, { 'state': 'open' })
         return True
 
     def idea_close(self, cr, uid, ids):
-        self.write(cr, uid, ids, { 'state' : 'close' })
+        self.write(cr, uid, ids, { 'state': 'close' })
         return True
 
     def idea_draft(self, cr, uid, ids):
-        self.write(cr, uid, ids, { 'state' : 'draft' })
+        self.write(cr, uid, ids, { 'state': 'draft' })
         return True
 idea_idea()
 
+
 class idea_comment(osv.osv):
+    """ Apply Idea for Comment """
     _name = 'idea.comment'
     _description = 'Comments'
     _rec_name = 'content'
     _columns = {
         'idea_id': fields.many2one('idea.idea', 'Idea', required=True, ondelete='cascade' ),
         'user_id': fields.many2one('res.users', 'User', required=True ),
-        'content': fields.text( 'Comment', required=True ),
-        'create_date' : fields.datetime( 'Creation date', readonly=True),
+        'content': fields.text('Comment', required=True ),
+        'create_date' : fields.datetime('Creation date', readonly=True),
     }
     _defaults = {
         'user_id': lambda self, cr, uid, context: uid
@@ -164,8 +174,11 @@ class idea_comment(osv.osv):
     _order = 'id desc'
 idea_comment()
 
+
 class idea_vote(osv.osv):
+    """ Apply Idea for Vote """
     _name = 'idea.vote'
+    _description = 'Vote for Idea'
     _rec_name = 'score'
     _columns = {
         'user_id': fields.many2one( 'res.users', 'User'),
@@ -173,22 +186,24 @@ class idea_vote(osv.osv):
         'score': fields.selection( VoteValues, 'Score', required=True)
     }
     _defaults = {
-        #'user_id': lambda self, cr, uid, context: uid,
         'score': lambda *a: DefaultVoteValue,
     }
 idea_vote()
 
+
 class idea_vote_stat(osv.osv):
+    """ Idea votes Statistics """
     _name = 'idea.vote.stat'
     _description = 'Idea Votes Statistics'
     _auto = False
     _rec_name = 'idea_id'
     _columns = {
         'idea_id': fields.many2one('idea.idea', 'Idea', readonly=True),
-        'score': fields.selection( VoteValues, 'Score', readonly=True),
+        'score': fields.selection(VoteValues, 'Score', readonly=True),
         'nbr': fields.integer('Number of Votes', readonly=True),
     }
-    def init(self, cr):
+
+    def init(self,cr):
         """
         initialize the sql view for the stats
 
@@ -207,6 +222,7 @@ class idea_vote_stat(osv.osv):
                 GROUP BY
                     i.id, v.score, i.id )
         """)
+
 idea_vote_stat()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 9ccc56464d0..88c196b2e43 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
+<!-- Idea Category  -->
+
     <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
@@ -34,9 +37,11 @@
     </record>
     <menuitem name="Configuration" parent="base.menu_tools"
          id="base.menu_lunch_survey_root" sequence="6"/>
-<!--    <menuitem name="Configuration" parent="menu_tools" id="menu_config"/>-->
+
     <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas"/>
-    <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category"/>
+
+    <menuitem name="Categories" parent="menu_ideas"
+    	id="menu_idea_category" action="action_idea_category" />
 
     <record model="ir.actions.act_window" id="action_idea_category_tree">
         <field name="name">Ideas by Categories</field>
@@ -44,12 +49,15 @@
         <field name="view_type">tree</field>
         <field name="domain">[('parent_id','=',False)]</field>
     </record>
+
     <menuitem name="Ideas" parent="base.menu_tools" id="menu_ideas1" sequence="4"/>
+
     <menuitem
         name="Ideas by Categories" parent="menu_ideas1"
         id="menu_idea_category_tree"
         action="action_idea_category_tree"/>
 
+<!-- Oepn Ideas  -->
 
     <record model="ir.actions.act_window" id="action_idea_idea_categ_open">
         <field name="name">Open Ideas</field>
@@ -66,6 +74,8 @@
         <field name="object" eval="True" />
     </record>
 
+<!-- Idea statistics -->
+
     <record model="ir.ui.view" id="view_idea_stat_form">
         <field name="name">idea.stat.form</field>
         <field name="model">idea.stat</field>
@@ -79,6 +89,8 @@
         </field>
     </record>
 
+<!-- Idea Vote  -->
+
     <record model="ir.ui.view" id="view_idea_vote_tree">
         <field name="name">idea.vote.tree</field>
         <field name="model">idea.vote</field>
@@ -104,6 +116,8 @@
         </field>
     </record>
 
+<!-- New Idea  -->
+
     <record model="ir.ui.view" id="view_idea_idea_form">
         <field name="name">idea.idea.form</field>
         <field name="model">idea.idea</field>
@@ -115,7 +129,6 @@
                     <field name="title" select="1" />
                     <field name="category_id" select="1"/>
                     <field name="user_id" select="1"/>
-                    <!--<field name="my_vote"/>-->
                     <field name="vote_avg" />
                     <field name="description" colspan="4" select="2" widget="text_wiki"/>
                     <field name="state" select="2"/>
@@ -171,6 +184,8 @@
         </field>
     </record>
 
+<!-- Search Idea  -->
+
     <record model="ir.ui.view" id="view_idea_idea_search">
         <field name="name">idea.idea.search</field>
         <field name="model">idea.idea</field>
@@ -180,8 +195,10 @@
 	        	<group col="10" colspan="4">
 		        	<filter icon="gtk-execute" string="My" domain="[('user_id','=',uid)]" help="My Ideas"/>
 		        	<separator orientation="vertical"/>
-		        	<filter icon="gtk-execute" string="Draft" domain="[('state','=','draft')]" help="Draft Ideas"/>
-		        	<filter icon="gtk-execute" string="Open" domain="[('state','=','open')]" help="Open Ideas"/>
+		        	<filter icon="gtk-execute" string="Draft"
+		        		domain="[('state','=','draft')]" help="Draft Ideas" />
+		        	<filter icon="gtk-execute" string="Open"
+		        		domain="[('state','=','open')]" help="Open Ideas" />
 		        	<separator orientation="vertical"/>
 		            <field name="title" select="1"/>
 		            <field name="category_id" select="1"/>
@@ -191,6 +208,8 @@
         </field>
     </record>
 
+<!-- Comments on Idea  -->
+
     <record model="ir.ui.view" id="view_idea_comment_tree">
         <field name="name">idea.comment.tree</field>
         <field name="model">idea.comment</field>
@@ -265,17 +284,19 @@
         <field name="view_mode">graph,tree</field>
     </record>
 	<menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
-<!--    <menuitem name="Reporting" parent="menu_ideas1" id="menu_reporting"/>-->
+
 	<menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting"/>
-    <menuitem name="Vote Statistics" parent="menu_idea_reporting" id="menu_idea_vote_stat" action="action_idea_vote_stat"/>
 
+	<menuitem name="Vote Statistics" parent="menu_idea_reporting"
+		id="menu_idea_vote_stat" action="action_idea_vote_stat" />
 
-    <record model="ir.actions.act_window" id="action_idea_vote">
+	<record model="ir.actions.act_window" id="action_idea_vote">
         <field name="name">Idea's vote</field>
         <field name="res_model">idea.vote</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
+
     <menuitem name="All Votes" parent="menu_ideas" id="menu_idea_vote" action="action_idea_vote"/>
 
     </data>
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index 901f2c0a28d..858f85f214a 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,24 +15,24 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 from osv import fields, osv
 
 class idea_post_vote(osv.osv_memory):
-    
+
     _name = "idea.post.vote"
     _description = "Post vote"
     _columns = {
-                'vote': fields.selection([('-1', 'Not Voted'), 
-                                          ('0', 'Very Bad'), 
-                                          ('25', 'Bad'), 
-                                          ('50', 'Normal'), 
-                                          ('75', 'Good'), 
+                'vote': fields.selection([('-1', 'Not Voted'),
+                                          ('0', 'Very Bad'),
+                                          ('25', 'Bad'),
+                                          ('50', 'Normal'),
+                                          ('75', 'Good'),
                                           ('100', 'Very Good') ], 'Post Vote', required=True)
                 }
-    
+
     def do_vote(self, cr, uid, ids, context):
         """
         Create idea vote.
@@ -41,10 +41,11 @@ class idea_post_vote(osv.osv_memory):
         @param ids: List of Idea Post vote’s IDs.
         @return: Dictionary {}
         """
+        data = context and context.get('active_id', False) or False
         vote_obj = self.pool.get('idea.vote')
-        for data in self.read(cr, uid, ids):
-            score = str(data['vote'])
-            dic = {'idea_id': context['active_id'], 'user_id': uid, 'score': score }
+        for dovote_obj in self.read(cr, uid, ids):
+            score = str(dovote_obj['vote'])
+            dic = {'idea_id': data, 'user_id': uid, 'score': score }
             vote = vote_obj.create(cr, uid, dic)
             return {}
 
diff --git a/addons/idea/wizard/idea_post_vote_view.xml b/addons/idea/wizard/idea_post_vote_view.xml
index 7316340723c..fecefacba1f 100644
--- a/addons/idea/wizard/idea_post_vote_view.xml
+++ b/addons/idea/wizard/idea_post_vote_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+<!-- Post Idea for vote   -->
+
   		<record id="view_idea_post_vote" model="ir.ui.view">
             <field name="name">idea.post.vote.form</field>
             <field name="model">idea.post.vote</field>
@@ -18,32 +21,22 @@
                </form>
             </field>
   		</record>
-  		
+
         <record id="action_idea_post_vote" model="ir.actions.act_window">
             <field name="name">Vote</field>
             <field name="res_model">idea.post.vote</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_idea_post_vote"/> 
+           <field name="view_id" ref="view_idea_post_vote"/>
            <field name="target">new</field>
            <field name="context">{'record_id':active_id}</field>
         </record>
-              
-     <!--    <record id="action_idea_post_vote_values" model="ir.values">
-            <field name="model_id" ref="idea.model_idea_idea" />
-            <field name="object" eval="1" />
-            <field name="name">vote</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_idea_post_vote'))"/>
-            <field name="key">action</field> 
-            <field name="model">idea.idea</field>
-        </record> -->
-        
+
         <act_window id="action_idea_post_vote_values"
     		key2="client_action_multi" name="vote"
     		res_model="idea.post.vote" src_model="idea.idea"
     		view_mode="form" target="new" view_type="form" />
-        
-        
+
+
     </data>
 </openerp>

From 5b77ed421c72f23b21c926844e726915909386f9 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 16 Mar 2010 19:32:30 +0530
Subject: [PATCH 029/248] [IMP]: olap: code optimization and apply doc string

bzr revid: ksa@tinyerp.co.in-20100316140230-fl6bloz1sieipnbp
---
 addons/olap/data/olap_cube_view.xml           | 133 ++---
 addons/olap/data/olap_view.xml                |  21 +-
 addons/olap/olap.py                           | 519 ++++++++----------
 addons/olap/wizard/olap_load_column.py        |   6 +-
 addons/olap/wizard/olap_load_column_view.xml  |   5 +-
 addons/olap/wizard/olap_query_logs_clear.py   |   3 +-
 .../wizard/olap_query_logs_clear_view.xml     |   9 +-
 7 files changed, 301 insertions(+), 395 deletions(-)

diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
index 4fa62e32185..05be10fd8a5 100644
--- a/addons/olap/data/olap_cube_view.xml
+++ b/addons/olap/data/olap_cube_view.xml
@@ -2,11 +2,8 @@
 <openerp>
 <data>
 
-<!--
+<!-- Wizard view for the load data -->
 
-Wizard view for the load data
-
--->
         <record id="bi_load_db_form" model="ir.ui.view">
             <field name="name">bi.load.db.form</field>
             <field name="model">bi.load.db.wizard</field>
@@ -37,9 +34,8 @@ Wizard view for the load data
         </record>
 
 
-<!--
-Wizard For Olap Warehouse
- -->
+<!-- Wizard For Olap Warehouse -->
+
         <record id="view_warehouse_bi" model="ir.ui.view">
             <field name="name">Olap Warehouse</field>
             <field name="model">olap.warehouse.wizard</field>
@@ -69,10 +65,8 @@ Wizard For Olap Warehouse
         sequence="51"
         parent="base.next_id_50"
         />
-<!--
 
-Wizard View for the parameters wizard
--->
+<!-- Wizard View for the parameters wizard -->
 
         <record id="view_config_bi" model="ir.ui.view">
             <field name="name">Parameters Configuration</field>
@@ -116,11 +110,7 @@ Wizard View for the parameters wizard
         </record>
 
 
-<!--
-
-Wizard view for the Auto Configuring the data
-
--->
+<!-- Wizard view for the Auto Configuring the data -->
 
         <record id="bi_auto_configure_form" model="ir.ui.view">
             <field name="name">bi.auto.configure.form</field>
@@ -176,20 +166,25 @@ Wizard view for the Auto Configuring the data
               <field name="loaded" colspan="3"/>
               <button name="%(act_bi_load_db_wizard)d" string="Reload Structure" type="action" states="done"/>
               <field name="configure" colspan="3"/>
-              <button name="%(bi_load_configuration_table)d" string="ReConfigure Structure" type="action" states="done"/>
-<!--              <button string="Configure Manually" name="dbconfigure" states="dbload" target="new"/>-->
+              <button name="%(bi_load_configuration_table)d"
+              	string="ReConfigure Structure" type="action"
+              	states="done" />
               <field name="ready" select="2" colspan="3"/>
               <field name="note" colspan="4"/>
               <field name="state" select="2" colspan="2" />
               <group colspan="2">
                 <button string="Connect to Database" name="dbconnect" states="none"/>
-                <button string="Load Database Structure" name="%(act_bi_load_db_wizard)d" type="action" states="dbconnect" target="new" />
+                <button string="Load Database Structure"
+                	name="%(act_bi_load_db_wizard)d" type="action"
+                	states="dbconnect" target="new" />
                 <button string="Configure Manually" name="dbconfigure"  states="dbload"/>
                 <button string="Mark as Configured" name="dbready" states="dbconfigure"/>
               </group>
               <separator string="Auto Application Configuration" colspan="4"/>
               <field name="app_detect" nolabel="1" colspan="3"/>
-              <button string="Configure Automatically " name="%(act_bi_auto_configure)d" type="action" states="dbload" target="new"/>
+              <button string="Configure Automatically "
+              	name="%(act_bi_auto_configure)d" type="action"
+              	states="dbload" target="new" />
             </form>
         </field>
     </record>
@@ -228,13 +223,16 @@ Wizard view for the Auto Configuring the data
                         <field name="field_id"/>
                     </tree>
                 </field>
-                <field name="available_table_ids" colspan="4" nolabel="1" readonly="0" domain="[('available_table_ids','in',available_table_ids)]" context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
-                    <tree string="Database Tables">
-                        <field name="related_to" string="Joined Table"/>
-                        <field name="name"/>
-                        <field name="table_id" />
-                        <field name="primary_key" />
-                    </tree>
+                <field name="available_table_ids" colspan="4"
+                	nolabel="1" readonly="0"
+                	domain="[('available_table_ids','in',available_table_ids)]"
+                	context="{'flag':True,'master_dim':context.get('d_id',False),'master_schema':context.get('parent_schema_id',False),'link_col':column_link_id}">
+                	<tree string="Database Tables">
+                		<field name="related_to" string="Joined Table" />
+                		<field name="name" />
+                		<field name="table_id" />
+                		<field name="primary_key" />
+                	</tree>
                 </field>
             </form>
         </field>
@@ -276,11 +274,6 @@ Wizard view for the Auto Configuring the data
                 <field name="schema_id" select="1" attrs="{'readonly':[('schema_id','!=','')]}"/>
                 <field name="query_log" select="2"/>
                 <field name="table_id"  colspan="4" context="{'parent_schema_id':schema_id}"/>
-
-                <!--<separator colspan="4" string="Dimensions"/>
-                <field name="dimension_ids" colspan="4" nolabel="1"/>
-                <separator colspan="4" string="Measures"/>
-                <field name="measure_ids" colspan="4" nolabel="1"/>-->
             </form>
         </field>
     </record>
@@ -319,19 +312,6 @@ Wizard view for the Auto Configuring the data
             <form string="Olap dimension">
                 <field name="name" select="1"/>
                 <field name="cube_id" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
-<!--                <field name="cube_id" on_change="onchange_cube_id(cube_id)" select="1" attrs="{'readonly':[('cube_id','!=','')]}"/>
-                <field name="foreign_key_table" select="2"/>
-                <field name="foreign_key" select="2"/>
-                <separator colspan="4" string="Select In These Tables For Foreign Keys"/>
-                <field name="available_foreign_table_ids" nolabel="1" colspan="4" readonly="0">
-                    <tree string="Database Tables">
-                        <button string="Mark as Foreign Table" name="mark_foreign" context="{'parent_id':parent.id,'parent_name':parent.name,'parent_cube':parent.cube_id,'reload':1}" type="object"/>
-                        <field name="table_id" />
-                        <field name="name" string="Link Column"/>
-                   </tree>
-                </field>
-                <separator colspan="4" string="Hierarchies"/>
-                <field name="hierarchy_ids" colspan="4" nolabel="1"/>-->
             </form>
         </field>
     </record>
@@ -418,12 +398,13 @@ Wizard view for the Auto Configuring the data
         <field name="arch" type="xml">
             <form string="Olap level">
                 <field name="name" select="1" colspan="4"/>
-                <field name="column_name" select="1" on_change="onchange_column_name(column_name)" context="{'filter_cols_hier':hierarchy_id}"/>
+                <field name="column_name" select="1"
+                	on_change="onchange_column_name(column_name)"
+                	context="{'filter_cols_hier':hierarchy_id}" />
                 <field name="column_id_name" select="1"/>
                 <field name="type" select="1"/>
                 <field name="table_name" select="1"/>
                 <field name="sequence"/>
-                <!-- <field name="hierarchy_id" select="1"/>-->
                 <field name="hierarchy_id" select="1" attrs="{'readonly':[('hierarchy_id','!=','')]}"/>
             </form>
        </field>
@@ -466,21 +447,6 @@ Wizard view for the Auto Configuring the data
                 <field name="value_column_id_name" invisible="True"/>
                 <field name="table_name" invisible="True"/>
                 <field name="measure_type"/>
-
-<!--                <notebook colspan="4">
-                        <page string="Fact Table Column" >
-                            <newline/>
-                            <field name="value_column" select="1" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
-                            <field name="agregator" select="2"/>
-                            <field name="formatstring" select="2"/>
-                        </page>
-                        <page string="SQL Expression" attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
-                             <field name="value_sql" colspan="4" select="2"/>
-                             <field name="datatype" select="2"/>
-                        </page>
-                    </notebook>
--->
-
                 <group colspan="4" attrs="{'invisible':[('measure_type','!=','fact_column')]}">
                     <newline/>
                     <field name="value_column" select="1" attrs="{'required':[('measure_type','=','fact_column')]}" on_change="onchange_measure_name(value_column)" context="{'filter_cols_cube':cube_id}"/>
@@ -489,7 +455,8 @@ Wizard view for the Auto Configuring the data
                 </group>
                 <group colspan="4"  attrs="{'invisible':[('measure_type','!=','sql_expr')]}">
                     <newline/>
-                    <field name="value_sql" colspan="4" select="2" attrs="{'required':[('measure_type','=','sql_expr')]}"/>
+                    <field name="value_sql" colspan="4" select="2"
+                    	attrs="{'required':[('measure_type','=','sql_expr')]}" />
                     <field name="datatype" select="2"/>
                 </group>
             </form>
@@ -569,11 +536,7 @@ Wizard view for the Auto Configuring the data
         action="action_olap_saved_query_form"
         id="menu_action_olap_saved_query_form"/>
 
-<!--
-
-All Logs
-
--->
+<!-- All Logs -->
 
     <record model="ir.ui.view" id="view_olap_query_logs_tree">
         <field name="name">olap.query.logs</field>
@@ -608,22 +571,14 @@ All Logs
         <field name="res_model">olap.query.logs</field>
         <field name="view_type">form</field>
     </record>
+
     <menuitem
         name="All Logs"
         action="action_olap_query_logs_form"
         id="menu_action_olap_query_logs_form"
         parent="menu_bi_conf_tools"/>
 
-
-
-
-
-
-<!--
-All Logs / My logs
-
- -->
-
+<!-- All Logs / My logs -->
 
     <record model="ir.ui.view" id="view_olap_query_logs_my_tree">
         <field name="name">olap.query.logs</field>
@@ -649,6 +604,9 @@ All Logs / My logs
             </tree>
         </field>
     </record>
+
+<!-- Query Logs  -->
+
     <record model="ir.ui.view" id="view_olap_query_logs_my_form">
         <field name="name">olap.query.logs.form</field>
         <field name="model">olap.query.logs</field>
@@ -656,8 +614,6 @@ All Logs / My logs
         <field name="arch" type="xml">
             <form string="My Logs">
                 <field name="user_id" select="1" readonly="True"/>
-                <!--  domain="[('uid','=',uid)]"
-                /> -->
                 <field name="query" select="1" readonly="True"/>
                 <field name="time" select="2" readonly="True"/>
                 <field name="result_size" select="2" readonly="True"/>
@@ -666,8 +622,8 @@ All Logs / My logs
             </form>
         </field>
 
-
     </record>
+
     <record model="ir.actions.act_window" id="action_olap_query_logs_my_form">
         <field name="name">My Logs</field>
         <field name="res_model">olap.query.logs</field>
@@ -675,27 +631,12 @@ All Logs / My logs
         <field name="view_mode">tree,form,mdx</field>
         <field name="domain">[('user_id','=',uid)]</field>
     </record>
+
     <menuitem
         name="My Logs"
         action="action_olap_query_logs_my_form"
         id="menu_action_olap_query_logs_my_form"
         parent="menu_action_olap_query_logs_form"/>
 
-
-<!--
-
-Clear All Logs
-
- -->
-
-
-
-
-<!--
-
-Clear My logs
-
- -->
-
 </data>
 </openerp>
diff --git a/addons/olap/data/olap_view.xml b/addons/olap/data/olap_view.xml
index 35aac4a20c0..cfd326cbce3 100755
--- a/addons/olap/data/olap_view.xml
+++ b/addons/olap/data/olap_view.xml
@@ -2,22 +2,19 @@
 <openerp>
 <data>
 
-
-<!--    <menuitem-->
-<!--        name="Businesss Intelligence"-->
-<!--        id="menu_bi"-->
-<!--        icon="terp-account" parent="base.next_id_50"/>-->
-
     <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
+
     <menuitem
             id="base.next_id_50"
             name="Configuration"
             parent="base.reporting_menu"
             groups="base.group_system"
             sequence="3"/>
+
     <menuitem
         name="Custom Reports" id="base.menu_custom_reports"
         parent="base.reporting_menu" sequence="1"/>
+
     <menuitem
         name="Businesss Intelligence Configuration"
         id="menu_bi_configuration"
@@ -49,18 +46,24 @@
 
 	<menuitem name="Clear Logs" action="action_view_olap_query_logs_clear" icon="STOCK_EXECUTE"
          id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
-         
+
     <record model="ir.actions.url" id="menu_url_cube_browser">
             <field name="name">name_menu_url_cube_browser</field>
             <field name="url">http://localhost:8080/browser</field>
     </record>
-    <menuitem name="Cube Browser" id="menu_browser_url" type="url" action="menu_url_cube_browser" parent="base.menu_custom_reports" sequence="1"/>
+
+    <menuitem name="Cube Browser" id="menu_browser_url" type="url"
+    	action="menu_url_cube_browser" parent="base.menu_custom_reports"
+    	sequence="1" />
 
     <record model="ir.actions.url" id="menu_url_cube_designer">
             <field name="name">name_menu_url_cube_designer</field>
             <field name="url">http://localhost:8080/designer</field>
     </record>
-    <menuitem name="Cube Designer" sequence="60" action="menu_url_cube_designer" type="url" id="menu_designer_url" parent="base.next_id_50"/>
+
+    <menuitem name="Cube Designer" sequence="60"
+    	action="menu_url_cube_designer" type="url" id="menu_designer_url"
+    	parent="base.next_id_50" />
 
 </data>
 </openerp>
diff --git a/addons/olap/olap.py b/addons/olap/olap.py
index 349d204086f..08effb18ffd 100644
--- a/addons/olap/olap.py
+++ b/addons/olap/olap.py
@@ -18,7 +18,6 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -36,14 +35,15 @@ from osv import fields,osv
 import netsvc
 import cube
 from cube import levels
+import MySQLdb
+import cx_Oracle
 
 
 class olap_fact_database(osv.osv):
+    """ Olap Fact Database """
     _name = "olap.fact.database"
     _description = "Olap Fact Database"
 
-
-
     def _connection_get(self,cr,uid,ids,field_name,arg,context = {}):
         """
             Return a connection string url needed by SQL Alchemy. Exemple:
@@ -109,7 +109,9 @@ class olap_fact_database(osv.osv):
     }
 olap_fact_database()
 
+
 class olap_schema(osv.osv ):
+    """ Olap Schema """
     _name = "olap.schema"
     _description = "Olap Schema"
 
@@ -119,12 +121,12 @@ class olap_schema(osv.osv ):
         """
         res = {}
 
+        app_objs = self.pool.get('olap.application')
+        app_ids = app_objs.search(cr,uid,[] )
+        app_res = app_objs.browse(cr,uid,app_ids)
         for obj in self.browse(cr,uid,ids,context):
             if obj.database_id.type == 'postgres':
                 e = sqlalchemy.create_engine(obj.database_id.connection_url)
-                app_objs = self.pool.get('olap.application')
-                app_ids = app_objs.search(cr,uid,[] )
-                app_res = app_objs.browse(cr,uid,app_ids)
                 for app_obj in app_res:
                     try:
                         result = e.execute(app_obj.query)
@@ -155,7 +157,8 @@ class olap_schema(osv.osv ):
             ('dbready','Schema is ready to use'),
             ('done','We Can Start building Cube'),
             ],'Schema State',readonly = True),
-        'app_detect': fields.function(_app_detect,method = True,type = 'char',string = 'Connection URL',size = 128),
+        'app_detect': fields.function(_app_detect, method = True, type = 'char',\
+                                       string = 'Connection URL', size = 128),
 
     }
     _defaults = {
@@ -180,7 +183,6 @@ class olap_schema(osv.osv ):
 
             elif type == 'mysql':
                 try:
-                    import MySQLdb
                     host = schema.database_id.db_host or ''
                     port = schema.database_id.db_port or ''
                     db = schema.database_id.db_name or ''
@@ -192,7 +194,6 @@ class olap_schema(osv.osv ):
 
             elif type == 'oracle':
                 try:
-                    import cx_Oracle
                     host = schema.database_id.db_host or ''
                     port = schema.database_id.db_port or ''
                     db = schema.database_id.db_name or ''
@@ -203,7 +204,7 @@ class olap_schema(osv.osv ):
                     raise osv.except_osv('Error (cx_Oracle) : ',e)
 
             for id in ids:
-                self.write(cr,uid,id,{'state':'dbconnect'})
+                self.write(cr,uid,id,{'state': 'dbconnect'})
         except Exception,e:
 
             raise osv.except_osv('BI Error !',e)
@@ -274,8 +275,6 @@ class olap_schema(osv.osv ):
         if not len(ids):
             raise 'Schema not found !'
         schema = self.browse(cr,uid,ids[0],context)
-#        warehouse = cube.warehouse()
-#        find_table = warehouse.match_table(cr, uid, request, context)
         print 'Parsing MDX...'
         print '\t',request
         mdx_parser = cube.mdx_parser()
@@ -291,35 +290,20 @@ class olap_schema(osv.osv ):
         currency = res_comp[0].currency_id.name
         print " Default Currency",currency
         data = mdx.run(currency)
-#        qry_obj = self.pool.get('olap.query.logs')
-#        qry_id = qry_obj.search(cr, uid, [('query','=', request)])
-#        
-#        flag = True
-#        if qry_id:
-#            qry = qry_obj.browse(cr, uid, qry_id)[0]
-#            
-#            if qry.count >=3 and qry.table_name!='':
-#                data = warehouse.run(currency, qry)
-#                flag = False
-#                qry.count = qry.count +1
-#                qry_obj.write(cr, uid, qry_id, {'count': qry.count})
-#            else:
-#                data = mdx.run(currency)
-#        else:
-#            data = mdx.run(currency)
+
         print 'Running Done...'
         print 'Formatting Output...'
-#        if cubex.query_log and flag:
         if cubex.query_log:
             log = context.get('log')
             if log:
                 connection = schema.database_id.connection_url
-#                warehouse.log(cr,uid,cubex,request,data,connection,context)
                 mdx.log(cr,uid,cubex,request,context)
         return cube.mdx_output(data)
 olap_schema()
 
+
 class olap_database_tables(osv.osv):
+    """ Database Tables """
     _name = "olap.database.tables"
     _description = "Olap Database Tables"
     _columns = {
@@ -345,7 +329,8 @@ class olap_database_tables(osv.osv):
 
     def show_col_view(self,cr,uid,ids,context = {}):
         ids_cols = self.pool.get('olap.database.columns').search(cr,uid,([('table_id','=',ids[0])]))
-        id = self.pool.get('ir.ui.view').search(cr,uid,([('name','=','olap.database.columns.tree')]),context = {})[0]
+        id = self.pool.get('ir.ui.view').search(cr,uid,\
+                ([('name','=','olap.database.columns.tree')]),context = {})[0]
         return {
             'domain': "[('id','in', [" + ','.join(map(str,ids_cols)) + "])]",
             'name': 'Database Columns',
@@ -371,7 +356,9 @@ class olap_database_tables(osv.osv):
 
 olap_database_tables()
 
+
 class olap_database_columns(osv.osv):
+    """ Database Columns """
     _name = "olap.database.columns"
     _description = "Olap Database Columns"
     datatypes = {
@@ -391,6 +378,7 @@ class olap_database_columns(osv.osv):
         'time': 'TimeStamp without Time Zone',
     'number':'NUMBER',
     }
+
     def _datatypes_get(self,*args,**argv):
         return self.datatypes.items()
     _columns = {
@@ -408,6 +396,7 @@ class olap_database_columns(osv.osv):
         'active': lambda * args: True,
         'primary_key': lambda * args: False,
     }
+
     def name_get(self,cr,uid,ids,context = {}):
         result = []
         for t in self.browse(cr,uid,ids,context):
@@ -433,8 +422,10 @@ class olap_database_columns(osv.osv):
                 for lines in  dim_obj.cube_id.table_id.line_ids:
                     make_ids.append(lines.field_id.related_to.id)
                     make_ids.append(lines.field_id.table_id.id)
-                args = [('table_id','in',make_ids),('related_to','<>',False),('hide','<>',True),('active','<>',False)]
-                return super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+                args = [('table_id','in',make_ids),('related_to','<>',False),\
+                        ('hide','<>',True),('active','<>',False)]
+                return super(olap_database_columns,self).search(cr,uid,args,\
+                            offset,limit,order,context = context,count = count)
 
         if args and context and context.has_key('flag') and context['flag']:
             ids = args[0][2][0][2]
@@ -446,19 +437,25 @@ class olap_database_columns(osv.osv):
                     make_ids.append(lines.related_to.id)
                 link_id = col_pool.browse(cr,uid,int(context['link_col']))
                 make_ids.append(link_id.table_id.id)
-                args = ['|',('table_id','in',make_ids),('related_to','in',make_ids),('primary_key','<>',True),('hide','<>',True),('active','<>',False)]
-                ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+                args = ['|',('table_id','in',make_ids),('related_to','in',make_ids),\
+                        ('primary_key','<>',True),('hide','<>',True),('active','<>',False)]
+                ids = super(olap_database_columns,self).search(cr,uid,args,\
+                        offset,limit,order,context = context,count = count)
                 return ids
             elif context and context.has_key('master_dim') and context['master_dim']:
                 make_ids = []
                 col_obj = col_pool.browse(cr,uid,int(context['link_col']))
-                args = ['|',('table_id','=',col_obj.related_to.id),('related_to','=',col_obj.table_id.id),('hide','<>',True),('active','<>',False)]
-                return  super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+                args = ['|',('table_id','=',col_obj.related_to.id),\
+                    ('related_to','=',col_obj.table_id.id),('hide','<>',True),('active','<>',False)]
+                return  super(olap_database_columns,self).search(cr,uid,args,\
+                            offset,limit,order,context = context,count = count)
             else:
                 col = col_pool.browse(cr,uid,int(context['link_col']))
                 base_table = col.table_id
-                args = ['|',('table_id','=',base_table.id),('related_to','=',base_table.id),('hide','<>',True),('active','<>',False)]
-                return super(olap_database_columns,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+                args = ['|',('table_id','=',base_table.id),\
+                    ('related_to','=',base_table.id),('hide','<>',True),('active','<>',False)]
+                return super(olap_database_columns,self).search(cr,uid,args,\
+                            offset,limit,order,context = context,count = count)
 
 
         if context and context.has_key('filter_cols_cube'):
@@ -469,7 +466,10 @@ class olap_database_columns(osv.osv):
                 make_ids.append(lines.table_id.id)
             if make_ids:
                 make_ids.append(cube_obj.table_id.line_ids[len(cube_obj.table_id.line_ids) - 1].field_id.related_to.id)
-                args = [('table_id','in',make_ids),('related_to','=',False),('primary_key','<>',True),('type','not in',['date','timestamp','timestampz','time']),('hide','<>',True),('active','<>',False)]
+                args = [('table_id','in',make_ids),('related_to','=',False),\
+                    ('primary_key','<>',True),\
+                    ('type','not in',['date','timestamp','timestampz','time']),\
+                    ('hide','<>',True),('active','<>',False)]
                 ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,
                     order,context = context,count = count)
                 return ids
@@ -503,7 +503,8 @@ class olap_database_columns(osv.osv):
                 table_ids = []
                 for line in lines:
                     table_ids.append(line.table_id.id)
-                args = [('table_id','in',table_ids),('related_to','<>',False),('hide','<>',True),('active','<>',False)]
+                args = [('table_id','in',table_ids),('related_to','<>',False),\
+                        ('hide','<>',True),('active','<>',False)]
             elif context and context.has_key('master_schema') and context['master_schema']:
                     args = [('primary_key','=','True')]
         return super(olap_database_columns,self).search(cr,uid,args,offset,limit,
@@ -536,7 +537,8 @@ class olap_database_columns(osv.osv):
             }
             id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context)
         else:
-            parent_id = self.pool.get('olap.cube.table').create(cr,uid,{'name':col_data['table_id'][1]},context)
+            parent_id = self.pool.get('olap.cube.table').create(cr,uid,\
+                                    {'name':col_data['table_id'][1]},context)
             ctx_list = [('client','web'),('app','bi'),('id',parent_id)]
         return ctx_list
 
@@ -558,12 +560,12 @@ class olap_database_columns(osv.osv):
             id = self.pool.get('olap.hierarchy').write(cr,uid,context['hier_parent_id'],val,context)
         else:
             if context['parent_name']: val['name'] = context['parent_name']
-            if context['parent_dimension'] :val['dimension_id'] = context['parent_dimension']
-            if context['hier_parent_table'] : val['table_id'] = context['hier_parent_table']
-            if context['parent_field_name'] : val['field_name'] = context['parent_field_name']
-            if context['parent_level'] : val['level_ids'] = conext['parent_level']
+            if context['parent_dimension']:val['dimension_id'] = context['parent_dimension']
+            if context['hier_parent_table']: val['table_id'] = context['hier_parent_table']
+            if context['parent_field_name']: val['field_name'] = context['parent_field_name']
+            if context['parent_level']: val['level_ids'] = conext['parent_level']
             if context['parent_member_all']: val['member_all'] = context['parent_member_all']
-            if context['parent_member_default'] : val['member_default'] = context['parent_member_default']
+            if context['parent_member_default']: val['member_default'] = context['parent_member_default']
             if context['parent_type']: val['type'] = context['parent_type']
             val['primary_key_table'] = col_data['table_id'][1]
             id = self.pool.get('olap.hierarchy').create(cr,uid,val,context)
@@ -572,12 +574,16 @@ class olap_database_columns(osv.osv):
 
 olap_database_columns()
 
+
 class olap_cube_table(osv.osv):
+    """ Cube Table """
     _name = "olap.cube.table"
     _description = "Olap cube table"
 
     def write(self,cr,uid,ids,vals,context = None):
-        if vals and vals.get('available_table_ids',0) and context and (context.has_key('master_dim') or context.has_key('d_id') or context.has_key('parent_schema_id')):
+        if vals and vals.get('available_table_ids',0) and context and \
+            (context.has_key('master_dim') or context.has_key('d_id') or \
+             context.has_key('parent_schema_id')):
             new_fields = vals['available_table_ids'][0][2]
             final = []
             for data in self.browse(cr,uid,ids):
@@ -626,7 +632,9 @@ class olap_cube_table(osv.osv):
 
     def create(self,cr,uid,vals,context = None):
         cube_table_id = super(olap_cube_table,self).create(cr,uid,vals,context)
-        if vals and vals.get('available_table_ids',0) and context and (context.has_key('d_id') or context.has_key('parent_schema_id') or context.has_key('master_dim') or context.has_key('d_id')):
+        if vals and vals.get('available_table_ids',0) and context and \
+            (context.has_key('d_id') or context.has_key('parent_schema_id') or \
+              context.has_key('master_dim') or context.has_key('d_id')):
             lines_ids = vals['available_table_ids'][0][2]
             cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,lines_ids)
             val = {}
@@ -642,9 +650,10 @@ class olap_cube_table(osv.osv):
         if context and context.has_key('parent_schema_id'):
             args = [('schema_id','=',context['parent_schema_id'])]
         if context and context.has_key('d_id'):
-            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(['d_id']))
             args = [('schema_id','=',dim_obj.cube_id.schema_id.id)]
-        return super(olap_cube_table,self).search(cr,uid,args,offset,limit,order,context = context,count = count)
+        return super(olap_cube_table,self).search(cr,uid,args,offset,limit,\
+                                        order,context = context,count = count)
 
     def _available_table_get(self,cr,uid,ids,name,arg,context = None):
         result = {}
@@ -675,10 +684,14 @@ class olap_cube_table(osv.osv):
     def _get_id(self,cr,uid,ids,context = {}):
         if context and context.has_key('d_id'):
             dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
-            table_id = self.pool.get('olap.database.tables').search(cr,uid,[('table_db_name','in',[dim_obj.cube_id.table_id.name]),('fact_database_id','=',dim_obj.cube_id.schema_id.database_id.id)])
-            col_ids = self.pool.get('olap.database.columns').search(cr,uid,[('table_id','in',table_id),('hide','<>',True),('related_to','<>',False)])
+            table_id = self.pool.get('olap.database.tables').search(cr,uid,\
+                        [('table_db_name','in',[dim_obj.cube_id.table_id.name]),\
+                        ('fact_database_id','=',dim_obj.cube_id.schema_id.database_id.id)])
+            col_ids = self.pool.get('olap.database.columns').search(cr,uid,\
+                        [('table_id','in',table_id),('hide','<>',True),('related_to','<>',False)])
         else:
-            col_ids = self.pool.get('olap.database.columns').search(cr,uid,[('primary_key','=',True),('hide','<>',True)])
+            col_ids = self.pool.get('olap.database.columns').search(cr,uid,\
+                                [('primary_key','=',True),('hide','<>',True)])
         return col_ids
 
     def _def_set(self,cr,uid,context = {}):
@@ -704,7 +717,9 @@ class olap_cube_table(osv.osv):
         return {}
 olap_cube_table()
 
+
 class olap_cube_table_line(osv.osv):
+    """ Cube Table Line """
     _name = "olap.cube.table.line"
     _description = "Olap cube table"
     _rec_name = 'table_id'
@@ -718,7 +733,9 @@ class olap_cube_table_line(osv.osv):
         pass
 olap_cube_table_line()
 
+
 class olap_cube(osv.osv):
+    """ Olap Cube """
     _name = "olap.cube"
     _description = "Olap cube"
 
@@ -733,28 +750,30 @@ class olap_cube(osv.osv):
         'schema_id': fields.many2one('olap.schema','Schema',readonly = True),
         'dimension_ids': fields.one2many('olap.dimension','cube_id','Dimensions'),
         'measure_ids': fields.one2many('olap.measure','cube_id','Measures'),
-        'query_log': fields.boolean('Query Logging', help = "Enabling  this will log all the queries in the browser"),
+        'query_log': fields.boolean('Query Logging', help = "Enabling this will \
+                        log all the queries in the browser"),
         'query_ids': fields.one2many('olap.query.logs','cube_id','Queries'),
     }
     _defaults = {
-                 'schema_id':_set_schema
+                 'schema_id': _set_schema
                  }
 olap_cube()
 
+
 class olap_query_logs(osv.osv):
+    """ Query Logs """
     _name = "olap.query.logs"
     _description = "Olap query logs"
     _columns = {
-        'user_id' : fields.many2one('res.users','Tiny ERP User'),
-        'query':fields.text('Query',required = True),
-        'time':fields.datetime('Time',required = True),
-        'result_size':fields.integer('Result Size',readonly = True),
+        'user_id': fields.many2one('res.users','Tiny ERP User'),
+        'query': fields.text('Query',required = True),
+        'time': fields.datetime('Time',required = True),
+        'result_size': fields.integer('Result Size',readonly = True),
         'cube_id': fields.many2one('olap.cube','Cube',required = True),
         'count': fields.integer('Count', readonly=True),
         'schema_id': fields.many2one('olap.schema','Schema',readonly = True),
-#        'table_name': fields.char('Table Name', size=164, readonly = True),
     }
-    
+
     _defaults = {
                  'count':lambda * args: 0
                  }
@@ -762,6 +781,7 @@ olap_query_logs()
 
 
 class olap_dimension(osv.osv):
+    """ Olap Dimension """
     _name = "olap.dimension"
     _description = "Olap dimension"
 
@@ -776,12 +796,14 @@ class olap_dimension(osv.osv):
         'hierarchy_ids': fields.one2many('olap.hierarchy','dimension_id','Hierarchies'),
     }
     _defaults = {
-                 'cube_id':_set_cube,
+                 'cube_id': _set_cube,
     }
 
 olap_dimension()
 
+
 class olap_hierarchy(osv.osv):
+    """ Olap Hierarchy """
     _name = "olap.hierarchy"
     _description = "Olap hierarchy"
     _order = "sequence, id"
@@ -814,18 +836,21 @@ class olap_hierarchy(osv.osv):
         'sequence': fields.integer('Sequence',required = True),
         'dimension_id': fields.many2one('olap.dimension','Dimension',required = True),
         'level_ids': fields.one2many('olap.level','hierarchy_id','Levels'),
-        'table_id': fields.many2one('olap.cube.table','Fact table(s)',required = True , help ="Table(s) to make hierarchy on the cube."),
+        'table_id': fields.many2one('olap.cube.table','Fact table(s)',\
+                    required = True , help ="Table(s) to make hierarchy on the cube."),
     }
     _defaults = {
         'sequence': lambda * args: 1,
         'primary_key': lambda * args: 'id',
-        'dimension_id':_set_dimension,
-        'name':_set_name
+        'dimension_id': _set_dimension,
+        'name': _set_name
     }
 
 olap_hierarchy()
 
+
 class olap_level(osv.osv):
+    """ Olap Level """
     _name = "olap.level"
     _description = "Olap level"
     _order = "sequence, id"
@@ -867,7 +892,9 @@ class olap_level(osv.osv):
         'column_name':fields.many2one('olap.database.columns','Columns Name',required = True),
         'column_id_name': fields.char('Column ID',size = 64,required = True),
         'type': fields.selection(selection = _type_get,string = 'Level class',size = 64,required = True),
-        'table_name': fields.char('Table name',size = 64,required = True,help = "The name of the table on which the column is defined. If False, take the table from the hierarchy."),
+        'table_name': fields.char('Table name',size = 64,required = True,\
+                help = "The name of the table on which the column is defined.\
+                         If False, take the table from the hierarchy."),
         'sequence': fields.integer('Sequence',required = True),
         'hierarchy_id': fields.many2one('olap.hierarchy','Hierarchy',required = True),
     }
@@ -876,14 +903,15 @@ class olap_level(osv.osv):
         'column_id_name': lambda * args: 'name',
         'sequence':lambda * args: '1',
         'type':lambda * args:'normal',
-        'hierarchy_id':_set_hierarchy,
-        'name':_set_name
+        'hierarchy_id': _set_hierarchy,
+        'name': _set_name
     }
 
 olap_level()
 
 
 class olap_measure(osv.osv):
+    """ Olap Measure """
     _name = "olap.measure"
     _description = "Olap measure"
 
@@ -908,76 +936,82 @@ class olap_measure(osv.osv):
         'value_column': fields.many2one('olap.database.columns','Fact Table Column'),
         'value_column_id_name': fields.char('Column ID',size = 64),
         'table_name': fields.char('Table name',size = 64,help = "The name of the table on which the column is defined. If False, take the table from the cube."),
-        'measure_type':fields.selection([('fact_column','Fact Table Column'),('sql_expr','SQL Expression')],'Measure Type',required = True,help = "Select between auto column or sql expression for the measures"),
+        'measure_type': fields.selection([('fact_column','Fact Table Column'),('sql_expr','SQL Expression')],'Measure Type',required = True,help = "Select between auto column or sql expression for the measures"),
         'value_sql': fields.char('SQL Expression',size = 200,help = "You can provide valid sql expression. Make sure it have function with fully qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"),
         'agregator': fields.selection([('sum','Sum'),('count','count'),('avg','Average')],'Agregator',required = True),
         'datatype': fields.selection([('int','Integer'),('float','Float')],'Datatype',required = True),
         'formatstring': fields.selection([
-                                           ('none','None (0000.00)'),
-                                           ('cr_prefix','Prefix Default Currency (EUR 0000.00)'),
-                                           ('cr_postfix','Postfix Default Currency(0000.00 EUR)'),
-                                           ('cr_prefix_comma','Prefix Default Currency with comma seperator (EUR 0,000.00)'),
-                                           ('cr_postfix_comma','Postfix Default Currency with comma seperator (0,000.00 EUR)'),
-                                           ('comma_sep', 'Comma Seperator (0,000)')
-                                           ],
-                                           'Format string',required = True, help=" Let you specify how the measure to be displayed in cube browser"),
+                                ('none','None (0000.00)'),
+                                ('cr_prefix','Prefix Default Currency (EUR 0000.00)'),
+                                ('cr_postfix','Postfix Default Currency(0000.00 EUR)'),
+                                ('cr_prefix_comma','Prefix Default Currency with comma seperator (EUR 0,000.00)'),
+                                ('cr_postfix_comma','Postfix Default Currency with comma seperator (0,000.00 EUR)'),
+                                ('comma_sep', 'Comma Seperator (0,000)')
+                                ],'Format string',required = True, help=" Let you specify how the measure to be displayed in cube browser"),
     }
     _defaults = {
         'agregator': lambda * args: 'sum',
         'datatype': lambda * args: 'float',
         'formatstring': lambda * args: 'none',
-        'cube_id':_set_cube,
+        'cube_id': _set_cube,
         'measure_type':lambda * args:'fact_column',
     }
 olap_measure()
 
+
 class olap_application(osv.osv):
+    """ Olap Application """
     _name = "olap.application"
     _description = "Olap application"
     _columns = {
         'name': fields.char('Application name',size = 64,required = True),
-        'query':fields.text('Application Query'),
-        'table_ids':fields.one2many('olap.application.table','application_id','Tables'),
+        'query': fields.text('Application Query'),
+        'table_ids': fields.one2many('olap.application.table','application_id','Tables'),
         'field_ids': fields.one2many('olap.application.field','application_id','Fields'),
     }
 olap_application()
 
 
 class olap_application_table(osv.osv):
+    """ Application Table """
     _name = "olap.application.table"
     _description = "Olap application table"
     _columns = {
         'name': fields.char('Application table name',size = 64,required = True),
         'table_name': fields.char('Table name',size = 64,required = True),
         'is_hidden': fields.boolean('Hidden'),
-        'application_id':  fields.many2one('olap.application','Application Id',required = True),
+        'application_id': fields.many2one('olap.application','Application Id',required = True),
     }
 olap_application_table()
 
+
 class olap_application_field(osv.osv):
+    """ Application Field """
     _name = "olap.application.field"
     _description = "Olap application field"
     _columns = {
         'name': fields.char('Application field name',size = 64,required = True),
-        'table_name':  fields.char('Application table name',size = 64),
+        'table_name': fields.char('Application table name',size = 64),
         'field_name':fields.char('Field name',size = 64),
         'is_hidden': fields.boolean('Hidden'),
-        'application_id':  fields.many2one('olap.application','Application Id',required = True),
+        'application_id': fields.many2one('olap.application','Application Id',required = True),
     }
 olap_application_field()
 
+
 class olap_saved_query(osv.osv):
+    """ Olap Saved Query """
     _name = "olap.saved.query"
     _decription = "Olap Saved Query"
-#   _rec_name = 'user_id'
+
     _columns = {
                 'name': fields.text('Query Name',size = 64),
-                'user_id' : fields.many2one('res.users','User'),
+                'user_id': fields.many2one('res.users','User'),
                 'query': fields.text('Query',required = True),
                 'cube_id': fields.many2one('olap.cube','Cube',required = True),
                 'mdx_id': fields.char('Module', size=64),
                 'schema_id': fields.many2one('olap.schema','Schema',required = True),
-                'time':fields.datetime('Time',required = True),
+                'time': fields.datetime('Time',required = True),
                 'axis_keys': fields.text('Axis Keys'),
                 }
 olap_saved_query()
@@ -1004,123 +1038,21 @@ class bi_load_db_wizard(osv.osv_memory):
     }
 
     _defaults = {
-        'fact_table':_get_fact_table,
-        'db_name':_get_db_name,
+        'fact_table': _get_fact_table,
+        'db_name': _get_db_name,
     }
 
     def action_load(self,cr,uid,ids,context = None):
+        data = context and context.get('active_id', False) or False
         if context and context.has_key('active_id'):
-            lines = self.pool.get('olap.schema').browse(cr,uid,context['active_id'])
+            lines = self.pool.get('olap.schema').browse(cr,uid,data)
             pool = pooler.get_pool(cr.dbname)
-#            lines=pool.get('olap.schema').browse(cr, uid, part['id'],context)
             id_db = lines.database_id.id
             type = lines.database_id.type
             db_name = lines.database_id.db_name
             tobj = pool.get('olap.database.tables')
             tcol = pool.get('olap.database.columns')
             if type == 'postgres':
-#                host = lines.database_id.db_host and "host=%s" % lines.database_id.db_host or ''
-#                port = lines.database_id.db_port and "port=%s" % lines.database_id.db_port or ''
-#                name = lines.database_id.db_name and "dbname=%s" % lines.database_id.db_name or ''
-#                user = lines.database_id.db_login and "user=%s" % lines.database_id.db_login or ''
-#                password = lines.database_id.db_password and "password=%s" % lines.database_id.db_password or ''
-#                tdb = psycopg2.connect('%s %s %s %s %s' % (host, port, name, user, password))
-#                cr_db = tdb.cursor()
-#                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d', (id_db,))
-#                tables = dict(cr.fetchall())
-#                # Format for storing the tables
-#                # tables['table_db_name']=id
-#                tables_id = map(lambda x: str(tables[x]),tables)
-#                cols={}
-#                if tables_id:
-#                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
-#                else:
-#                    cr.execute('select column_db_name,id,table_id from olap_database_columns')
-#              
-#                for data in cr.fetchall():
-#                    cols[str(data[1])]=(data[0],int(data[2]))
-#                # Format of storing the cols 
-#                # cols['id']=(col_db_name,table_id)    
-#                print 'Creating / Updating Tables...' 
-#                cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
-#                for table in cr_db.fetchall():
-#                    val = {
-#                        'fact_database_id':id_db,
-#                        'table_db_name':table[0]
-#                    }
-#                   
-#                    if table[0] in tables.keys():
-#                        table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
-#                    else:
-#                        val['name']=table[0]
-#                        tables[val['name']] = tobj.create(cr,uid,val, context)    
-#                print 'Creating / Updating Columns...' 
-#                cr_db.execute("""SELECT
-#                        table_name, column_name, udt_name
-#                    from
-#                        INFORMATION_SCHEMA.columns
-#                    WHERE table_schema = 'public'""")
-#                
-#                for col in cr_db.fetchall():
-#                    val={
-#                        'table_id': tables[col[0]],
-#                        'column_db_name': col[1],
-#                        'type': col[2],
-#                    }
-#                    
-#                    id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
-#                    if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
-#                        col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
-#                    else:
-#                        val['name']=col[1]
-#                        id_made = tcol.create(cr,uid,val, context)
-#                        cols[str(id_made)] = (val['name'],int(val['table_id']))
-#                print 'Creating / Updating Constraints...' 
-#                cr_db.execute("""select 
-#                        table_name,column_name 
-#                    from 
-#                        INFORMATION_schema.key_column_usage
-#                    where 
-#                        constraint_name in (
-#                                    select constraint_name from INFORMATION_SCHEMA .table_constraints
-#                                    where 
-#                                        constraint_type = 'PRIMARY KEY')""")
-#                print "Updating the Primary Key Constraint" 
-#                for constraint in cr_db.fetchall():
-#                    val={
-#                        'primary_key':True
-#                    }
-#                    
-#                    id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and(constraint[1]==cols[x][0])),cols)
-#                    col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
-#                print "Updating the Foreign key constraint" 
-#                cr_db.execute("""select 
-#                            constraint_name,table_name 
-#                    from 
-#                        INFORMATION_schema.constraint_column_usage 
-#                    where
-#                        constraint_name in (
-#                                    select constraint_name from INFORMATION_SCHEMA.table_constraints 
-#                                    where 
-#                                        constraint_type = 'FOREIGN KEY')""")
-#                for_key=dict(cr_db.fetchall())
-#                
-#                cr_db.execute("""select 
-#                             table_name,column_name,constraint_name 
-#                         from 
-#                             INFORMATION_schema.key_column_usage
-#                         where 
-#                             constraint_name in (
-#                                         select constraint_name from INFORMATION_SCHEMA.table_constraints 
-#                                         where 
-#                                             constraint_type = 'FOREIGN KEY')""") 
-
-#                for constraint in cr_db.fetchall():
-#                    val={
-#                        'related_to':tables[for_key[constraint[2]]]
-#                    }
-#                    id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
-#                    col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
 
                 host = lines.database_id.db_host and "host=%s" % lines.database_id.db_host or ''
                 port = lines.database_id.db_port and "port=%s" % lines.database_id.db_port or ''
@@ -1129,15 +1061,13 @@ class bi_load_db_wizard(osv.osv_memory):
                 password = lines.database_id.db_password and "password=%s" % lines.database_id.db_password or ''
                 tdb = psycopg2.connect('%s %s %s %s %s' % (host,port,name,user,password))
                 cr_db = tdb.cursor()
-                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d',(id_db,))
+                cr.execute('select table_db_name,id from olap_database_tables \
+                            where fact_database_id=%d',(id_db,))
                 tables = dict(cr.fetchall())
-                # Format for storing the tables
-                # tables['table_db_name']=id
                 tables_id = map(lambda x: str(tables[x]),tables)
-                # Format of storing the cols 
-                # cols['id']=(col_db_name,table_id)    
                 print 'Creating / Updating Tables...'
-                cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
+                cr_db.execute("select table_name, table_catalog from \
+                        INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
                 for table in cr_db.fetchall():
                     val = {
                         'fact_database_id':id_db,
@@ -1152,10 +1082,14 @@ class bi_load_db_wizard(osv.osv_memory):
                 print 'Creating / Updating Columns ....'
                 cols = {}
                 if tables_id:
-                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
+                    cr.execute('select column_db_name,id,table_id from \
+                            olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
                 else:
-#                    cr.execute('select column_db_name,id,table_id from olap_database_columns ')
-                    cr.execute("select olap_database_columns.column_db_name, olap_database_columns.id, olap_database_columns.table_id from olap_database_columns join olap_database_tables on olap_database_columns.table_id = olap_database_tables.id where olap_database_tables.fact_database_id=%d",(id_db,))
+                    cr.execute("select olap_database_columns.column_db_name,\
+                         olap_database_columns.id, olap_database_columns.table_id \
+                        from olap_database_columns join olap_database_tables \
+                        on olap_database_columns.table_id = olap_database_tables.id \
+                        where olap_database_tables.fact_database_id=%d",(id_db,))
                 table_col = {}
                 cols_name = {}
                 for x in tables:
@@ -1189,14 +1123,14 @@ class bi_load_db_wizard(osv.osv_memory):
                         cols[str(id_made)] = (val['name'],int(val['table_id']))
 
                 print 'Creating / Updating Constraints...'
-                cr_db.execute("""select 
-                        table_name,column_name 
-                    from 
+                cr_db.execute("""select
+                        table_name,column_name
+                    from
                         INFORMATION_schema.key_column_usage
-                    where 
+                    where
                         constraint_name in (
                                     select constraint_name from INFORMATION_SCHEMA .table_constraints
-                                    where 
+                                    where
                                         constraint_type = 'PRIMARY KEY')""")
 
                 print "Updating the Primary Key Constraint"
@@ -1209,25 +1143,25 @@ class bi_load_db_wizard(osv.osv_memory):
                     col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
 
                 print "Updating the Foreign key constraint"
-                cr_db.execute("""select 
-                            constraint_name,table_name 
-                    from 
-                        INFORMATION_schema.constraint_column_usage 
+                cr_db.execute("""select
+                            constraint_name,table_name
+                    from
+                        INFORMATION_schema.constraint_column_usage
                     where
                         constraint_name in (
-                                    select constraint_name from INFORMATION_SCHEMA.table_constraints 
-                                    where 
+                                    select constraint_name from INFORMATION_SCHEMA.table_constraints
+                                    where
                                         constraint_type = 'FOREIGN KEY')""")
                 for_key = dict(cr_db.fetchall())
 
-                cr_db.execute("""select 
-                             table_name,column_name,constraint_name 
-                         from 
+                cr_db.execute("""select
+                             table_name,column_name,constraint_name
+                         from
                              INFORMATION_schema.key_column_usage
-                         where 
+                         where
                              constraint_name in (
-                                         select constraint_name from INFORMATION_SCHEMA.table_constraints 
-                                         where 
+                                         select constraint_name from INFORMATION_SCHEMA.table_constraints
+                                         where
                                              constraint_type = 'FOREIGN KEY')""")
 
                 for constraint in cr_db.fetchall():
@@ -1253,18 +1187,21 @@ class bi_load_db_wizard(osv.osv_memory):
                     raise osv.except_osv('MySQLdb Packages Not Installed.',e)
 
                 cr_db = tdb.cursor()
-                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d',(id_db,))
+                cr.execute('select table_db_name,id from olap_database_tables \
+                                 where fact_database_id=%d',(id_db,))
                 tables = dict(cr.fetchall())
                 tables_id = map(lambda x: str(tables[x]),tables)
                 cols = {}
                 if tables_id:
-                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
+                    cr.execute('select column_db_name,id,table_id from \
+                        olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
                 else:
                     cr.execute('select column_db_name,id,table_id from olap_database_columns')
 
                 for data in cr.fetchall():
                     cols[str(data[1])] = (data[0],int(data[2]))
-                cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables where table_schema =%s",(db_name))
+                cr_db.execute("select table_name, table_catalog from \
+                    INFORMATION_SCHEMA.tables where table_schema =%s",(db_name))
 
                 for table in cr_db.fetchall():
                     val = {
@@ -1300,17 +1237,16 @@ class bi_load_db_wizard(osv.osv_memory):
                         id_made = tcol.create(cr,uid,val,context)
                         cols[str(id_made)] = (val['name'],int(val['table_id']))
 
-                cr_db.execute("""select 
+                cr_db.execute("""select
                         REFERENCED_COLUMN_NAME,REFERENCED_TABLE_NAME,COLUMN_NAME,TABLE_NAME
-                    from 
+                    from
                         INFORMATION_schema.key_column_usage
-                    where table_schema= %s and 
+                    where table_schema= %s and
                         constraint_name in (
                                     select constraint_name from INFORMATION_SCHEMA .table_constraints
-                                    where 
+                                    where
                                         constraint_type in('PRIMARY KEY','FOREIGN KEY'))
                                     """,(db_name))
-        #            lines=pool.get('olap.schema').browse(cr, uid, part['id'],context)
                 for constraint in cr_db.fetchall():
 
                     if constraint[0]:
@@ -1322,7 +1258,8 @@ class bi_load_db_wizard(osv.osv_memory):
                         val = {
                              'primary_key':True
                              }
-                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[3]])and(constraint[2] == cols[x][0])),cols)
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[3]])and \
+                                                (constraint[2] == cols[x][0])),cols)
                     col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
 
             elif type == 'oracle':
@@ -1339,12 +1276,14 @@ class bi_load_db_wizard(osv.osv_memory):
                             raise osv.except_osv('cx_Oracle Packages Not Installed.',e)
 
                 cr_db = tdb.cursor()
-                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d',(id_db,))
+                cr.execute('select table_db_name,id from olap_database_tables \
+                                    where fact_database_id=%d',(id_db,))
                 tables = dict(cr.fetchall())
                 tables_id = map(lambda x: str(tables[x]),tables)
                 cols = {}
                 if tables_id:
-                    cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
+                    cr.execute('select column_db_name,id,table_id from \
+                            olap_database_columns where table_id in (' + ','.join(tables_id) + ')')
                 else:
                     cr.execute('select column_db_name,id,table_id from olap_database_columns')
 
@@ -1369,7 +1308,7 @@ class bi_load_db_wizard(osv.osv_memory):
                 cr_db.execute("""SELECT
                         table_name, column_name, data_type
                     from
-                        all_tab_columns 
+                        all_tab_columns
                     WHERE owner = %s""",(user))
                 temp = cr_db.fetchall()
                 for col in temp:
@@ -1395,14 +1334,14 @@ class bi_load_db_wizard(osv.osv_memory):
                         id_made = tcol.create(cr,uid,val,context)
                         cols[str(id_made)] = (val['name'],int(val['table_id']))
 
-                cr_db.execute("""select 
+                cr_db.execute("""select
                         table_name,column_name,constraint_name
-                    from 
+                    from
                         all_cons_columns
                     where
                         constraint_name in (
                                     select constraint_name from all_constraints
-                                    where 
+                                    where
                                         constraint_type = 'P' and owner= %s)
                                     """,(user))
                 temp = cr_db.fetchall()
@@ -1413,26 +1352,27 @@ class bi_load_db_wizard(osv.osv_memory):
                     }
                     pk_table[constraint[2]] = constraint[0]
 
-                    id_to_write = filter(lambda x : (int(cols[x][1]) == int(tables[constraint[0]])and(constraint[1] == cols[x][0])),cols)
+                    id_to_write = filter(lambda x : (int(cols[x][1]) == int(tables[constraint[0]])\
+                                            and(constraint[1] == cols[x][0])),cols)
                     col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
 
-                cr_db.execute("""select 
+                cr_db.execute("""select
                                 constraint_name,r_constraint_name from all_constraints
-                                    where 
+                                    where
                                         constraint_type = 'R'  and owner = %s
                                     """,(user))
                 constraints_map = {}
                 for data in cr_db.fetchall():
                     constraints_map[data[0]] = data[1]
 
-                cr_db.execute("""select 
+                cr_db.execute("""select
                         table_name,column_name,constraint_name
-                    from 
+                    from
                         all_cons_columns
                     where
                         constraint_name in (
                                     select constraint_name from all_constraints
-                                    where 
+                                    where
                                         constraint_type = 'R' and owner = %s)
                                     """,(user))
 
@@ -1444,45 +1384,35 @@ class bi_load_db_wizard(osv.osv_memory):
                     val = {
                         'related_to' : tables[req_table]
                     }
-                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and (constraint[1] == cols[x][0])),cols)
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])\
+                                                and (constraint[1] == cols[x][0])),cols)
                     col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
 
+            data = context and context.get('active_id', False) or False
             temp = pooler.get_pool(cr.dbname).get('olap.fact.database').write(cr,uid,[id_db],{'loaded':True})
             wf_service = netsvc.LocalService('workflow')
-            wf_service.trg_validate(uid,'olap.schema',context['active_id'],'dbload',cr)
-            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_schema_form')])
-            resource_id = self.pool.get('ir.model.data').read(cr,uid,model_data_ids,fields = ['res_id'])[0]['res_id']
+            wf_service.trg_validate(uid,'olap.schema',data,'dbload',cr)
+            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
+                                [('model','=','ir.ui.view'),('name','=','view_olap_schema_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr,uid,\
+                                    model_data_ids,fields = ['res_id'])[0]['res_id']
 
             return {'type':'ir.actions.act_window_close' }
-#            return{
-#           'domain': [],
-#           'name': 'view_olap_schema_form',
-#           'view_type': 'form',
-#           'view_mode': 'form,tree',
-#           'res_id': context['active_id'],
-#           'res_model': 'olap.schema',
-#           'view': [(resource_id,'form')],
-#           'type': 'ir.actions.act_window_close'
-#            }
-#
 
     def action_cancel(self,cr,uid,ids,context = None):
 
         return {'type':'ir.actions.act_window_close' }
 
 bi_load_db_wizard()
-
-
-
 # Wizard for the Automatic Application Configuration
 # Replacement for the Load Wizard according to the new structure
 class bi_auto_configure_wizard(osv.osv_memory):
     _name = 'bi.auto.configure.wizard'
 
-
-    def _get_name(self,cr,uid,ctx):
-        if ctx and ctx.has_key('active_id'):
-            schema_obj = self.pool.get('olap.schema').browse(cr,uid,ctx['active_id'])
+    def _get_name(self,cr,uid,context):
+        data = context and context.get('active_id', False) or False
+        if context and context.has_key('active_id'):
+            schema_obj = self.pool.get('olap.schema').browse(cr,uid,data)
             return schema_obj.name
         return False
 
@@ -1499,8 +1429,8 @@ class bi_auto_configure_wizard(osv.osv_memory):
         vals = {}
         apptabnew_vals = {}
         appfieldnew_vals = {}
-
-        ids = pooler.get_pool(cr.dbname).get('olap.schema').browse(cr,uid,context['active_id'])
+        data = context and context.get('active_id', False) or False
+        ids = pooler.get_pool(cr.dbname).get('olap.schema').browse(cr,uid,data)
 
         if ids.app_detect == "Unknown Application":
             raise wizard.except_wizard('Warning','The Application is Unknown, we can not configure it automatically.')
@@ -1532,13 +1462,17 @@ class bi_auto_configure_wizard(osv.osv_memory):
                 appcol_name.append(apcol.name)
 
             dbtab_obj = pooler.get_pool(cr.dbname).get('olap.database.tables')
-#            id_tables=dbtab_obj.search(cr,uid,[('fact_database_id','=',ids.database_id.id),('table_db_name','not in',['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel'])])
             id_tables = dbtab_obj.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
             tables_main = dbtab_obj.read(cr,uid,id_tables,context = {'wizard':True})
             for tables in tables_main:
-                end_user_name = {'name':(" ").join(map(lambda x:x.capitalize(),tables['table_db_name'].split("_")))}
+                end_user_name = {'name':(" ").join(map(lambda x:x.capitalize(),\
+                                                tables['table_db_name'].split("_")))}
                 table_new = dbtab_obj.write(cr,uid,tables['id'],end_user_name)
-                if not(tables['table_db_name'].startswith('ir') or tables['table_db_name'].startswith('wkf') or tables['table_db_name'].startswith('res_groups') or tables['table_db_name'].startswith('res_role')) and tables['table_db_name'] not in ['inherit','user_rule_group_rel','group_rule_group_rel']:
+                if not(tables['table_db_name'].startswith('ir') or \
+                       tables['table_db_name'].startswith('wkf') or \
+                       tables['table_db_name'].startswith('res_groups') or \
+                       tables['table_db_name'].startswith('res_role')) and \
+                       tables['table_db_name'] not in ['inherit','user_rule_group_rel','group_rule_group_rel']:
                     vals = {}
 
                     if len(apptab_ids) == 0 and (tables['table_db_name'] not in apptab_name):
@@ -1551,17 +1485,21 @@ class bi_auto_configure_wizard(osv.osv_memory):
                     else:
                         if map_apptab_name_id.has_key(tables['table_db_name']):
                             app_table = map_apptab_name_id[tables['table_db_name']]
-                            if ((app_table['table_name'] == tables['table_db_name']) and not (app_table['table_name'] == tables['name'])):
-                                vals['name'] = (" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
+                            if ((app_table['table_name'] == tables['table_db_name']) \
+                                and not (app_table['table_name'] == tables['name'])):
+                                vals['name'] = (" ").join(map(lambda x:x.capitalize(),\
+                                                            tables['name'].split("_")))
                                 vals['is_hidden'] = tables['hide']
                                 tables_obj_new = apptab_objs.write(cr,uid,app_table['id'],vals)
                         else:
                             vals['table_name'] = tables['table_db_name']
-                            vals['name'] = (" ").join(map(lambda x:x.capitalize(),tables['table_db_name'].split("_")))
+                            vals['name'] = (" ").join(map(lambda x:x.capitalize(),\
+                                                        tables['table_db_name'].split("_")))
                             vals['is_hidden'] = tables['hide']
                             vals['application_id'] = app_id
                             apptab_new_obj = apptab_objs.create(cr,uid,vals)
-            id_columns = pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr,uid,[('table_id','in',id_tables)])
+            id_columns = pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr,uid,\
+                                                            [('table_id','in',id_tables)])
             columns = pooler.get_pool(cr.dbname).get('olap.database.columns').read(cr,uid,id_columns,[])
             for columns in columns:
                 vals = {}
@@ -1573,7 +1511,8 @@ class bi_auto_configure_wizard(osv.osv_memory):
                     vals['application_id'] = x_app['id']
                     appfield_new_obj = appfield_objs.create(cr,uid,vals)
                 else:
-                    filter_column = filter(lambda x: columns['column_db_name'] == x['field_name'] and columns['table_id'][1] == x['table_name'],appfield_data_res)
+                    filter_column = filter(lambda x: columns['column_db_name'] == x['field_name'] \
+                                    and columns['table_id'][1] == x['table_name'],appfield_data_res)
                     if map_apptab_name_id.has_key(columns['table_id'][1]) and filter_column:
                         table_id_write = map_apptab_name_id[columns['table_id'][1]]
                         vals['name'] = (" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
@@ -1594,7 +1533,12 @@ class bi_auto_configure_wizard(osv.osv_memory):
             make_id = []
             for table in tables:
                 vals = {}
-                if (table['table_db_name'].startswith('ir') or table['table_db_name'].startswith('wkf')) or (table['table_db_name'].startswith('res_groups')) or (table['table_db_name'] in ['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel']):
+                if (table['table_db_name'].startswith('ir') or \
+                        table['table_db_name'].startswith('wkf')) or \
+                        (table['table_db_name'].startswith('res_groups')) or \
+                        (table['table_db_name'] in \
+                         ['inherit','res_roles','user_rule_group_rel',\
+                          'res_roles_users_rel','group_rule_group_rel']):
                     vals['hide'] = True
                     vals['active'] = False
                     make_id.append(table['id'])
@@ -1609,11 +1553,13 @@ class bi_auto_configure_wizard(osv.osv_memory):
                 vals['active'] = False
                 database_columns.write(cr,uid,col['id'],vals)
 
-
+            data = context and context.get('active_id', False) or False
             wf_service = netsvc.LocalService('workflow')
-            wf_service.trg_validate(uid,'olap.schema',context['active_id'],'dbconfigure',cr)
-            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_schema_form')])
-            resource_id = self.pool.get('ir.model.data').read(cr,uid,model_data_ids,fields = ['res_id'])[0]['res_id']
+            wf_service.trg_validate(uid,'olap.schema',data,'dbconfigure',cr)
+            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
+                        [('model','=','ir.ui.view'),('name','=','view_olap_schema_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr,uid,\
+                                model_data_ids,fields = ['res_id'])[0]['res_id']
 
             return {'type':'ir.actions.act_window_close' }
 
@@ -1625,9 +1571,10 @@ bi_auto_configure_wizard()
 
 
 class olap_warehouse_wizard(osv.osv_memory):
+    """ Warehouse """
     _name = "olap.warehouse.wizard"
     _description = "Olap Warehouse"
-    
+
     def _get_queries(self, cr, uid, context = {}):
         query_obj = self.pool.get('olap.query.logs')
         qry_ids = query_obj.search(cr, uid, [('user_id','=',uid),('count','>=',3)])
@@ -1643,15 +1590,18 @@ class olap_warehouse_wizard(osv.osv_memory):
             return ''
     def action_ok(self, cr, uid, ids, context = {}):
         return {'type':'ir.actions.act_window_close' }
-    
+
     _columns = {
-                'query': fields.text('Query', readonly=True),
+                'query':fields.text('Query',readonly=True),
                 }
     _defaults = {
         'query': _get_queries,
         }
 olap_warehouse_wizard()
+
+
 class olap_parameters_config_wizard(osv.osv_memory):
+    """ Apply Parameters for configuration """
     _name = "olap.parameters.config.wizard"
     _description = "Olap Server Parameters"
 
@@ -1661,7 +1611,9 @@ class olap_parameters_config_wizard(osv.osv_memory):
         aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
         aid = objid.browse(cr,uid,aid,context = context).res_id
         aid = self.pool.get('ir.actions.url').browse(cr,uid,aid,context = context)
-        s_p = Literal("http://").suppress() + Word(alphanums + "_" + ".") + Literal(":").suppress() + Word(nums) + Literal("/").suppress() + Word(alphanums + "_" + " ").suppress()
+        s_p = Literal("http://").suppress() + Word(alphanums + "_" + ".") +\
+                 Literal(":").suppress() + Word(nums) + Literal("/").suppress()\
+                  + Word(alphanums + "_" + " ").suppress()
         return s_p.parseString(aid.url)[0]
 
     def _get_port(self,cr,uid,context = None):
@@ -1670,7 +1622,9 @@ class olap_parameters_config_wizard(osv.osv_memory):
         aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
         aid = objid.browse(cr,uid,aid,context = context).res_id
         aid = self.pool.get('ir.actions.url').browse(cr,uid,aid,context = context)
-        s_p = Literal("http://").suppress() + Word(alphanums + "_" + ".") + Literal(":").suppress() + Word(nums) + Literal("/").suppress() + Word(alphanums + "_" + " ").suppress()
+        s_p = Literal("http://").suppress() + Word(alphanums + "_" + ".") + \
+              Literal(":").suppress() + Word(nums) + Literal("/").suppress() + \
+               Word(alphanums + "_" + " ").suppress()
         return s_p.parseString(aid.url)[1]
 
     _columns = {
@@ -1713,6 +1667,7 @@ class olap_parameters_config_wizard(osv.osv_memory):
                 'type': 'ir.actions.act_window',
                 'target':'new',
         }
+
 olap_parameters_config_wizard()
 
 # vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/olap_load_column.py b/addons/olap/wizard/olap_load_column.py
index 97dc635d3fc..6fe594f60c8 100755
--- a/addons/olap/wizard/olap_load_column.py
+++ b/addons/olap/wizard/olap_load_column.py
@@ -28,7 +28,6 @@
 from osv import fields, osv
 
 class olap_load_column(osv.osv_memory):
-    """ Load Database Column """
     _name = "olap.load.column"
     _description = "Olap Load Column"
 
@@ -38,11 +37,12 @@ class olap_load_column(osv.osv_memory):
         @param cr: the current row, from the database cursor,
         @param uid: the current user\'s ID for security checks,
         @param ids: List of load column,
-        @return : dictionary of database columns window on give id
+        @return: dictionary of database columns window on give id
 
         """
+        data = context and context.get('active_id', False) or False
         ids_cols = self.pool.get('olap.database.columns').search(cr, uid,\
-                             ([('table_id','=',context['active_id'])]),context={})
+                             ([('table_id','=',data)]),context={})
         model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
                         [('model','=','ir.ui.view'),\
                     ('name','=','view_olap_database_columns_form')],context={})
diff --git a/addons/olap/wizard/olap_load_column_view.xml b/addons/olap/wizard/olap_load_column_view.xml
index ef76ec555c6..21053274e54 100644
--- a/addons/olap/wizard/olap_load_column_view.xml
+++ b/addons/olap/wizard/olap_load_column_view.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+<!-- Open Column  -->
+
     	<record id="view_olap_load_column" model="ir.ui.view">
-            <field name="name">Create Logs</field>
+            <field name="name">Open Columns</field>
             <field name="model">olap.load.column</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
diff --git a/addons/olap/wizard/olap_query_logs_clear.py b/addons/olap/wizard/olap_query_logs_clear.py
index 8d271315874..95623ac11d3 100755
--- a/addons/olap/wizard/olap_query_logs_clear.py
+++ b/addons/olap/wizard/olap_query_logs_clear.py
@@ -28,7 +28,6 @@
 from osv import fields, osv
 
 class olap_query_logs_clear(osv.osv_memory):
-    """ Clear the Logs for Given User  """
     _name = "olap.query.logs.clear"
     _description = "Olap Query Logs Clear"
     _columns = {
@@ -69,6 +68,7 @@ class olap_query_logs_clear(osv.osv_memory):
 
 olap_query_logs_clear()
 
+
 class olap_query_logs_clear_msg(osv.osv_memory):
     """   Display clear log message    """
     _name = "olap.query.logs.clear.msg"
@@ -77,4 +77,5 @@ class olap_query_logs_clear_msg(osv.osv_memory):
 
             }
 olap_query_logs_clear_msg()
+
 # vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/olap_query_logs_clear_view.xml b/addons/olap/wizard/olap_query_logs_clear_view.xml
index 08d93c9410b..a780988c2b9 100644
--- a/addons/olap/wizard/olap_query_logs_clear_view.xml
+++ b/addons/olap/wizard/olap_query_logs_clear_view.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+<!-- Create Logs  -->
+
     	<record id="view_olap_query_logs_clear" model="ir.ui.view">
-            <field name="name">Create Logs</field>
+            <field name="name">Clear Logs</field>
             <field name="model">olap.query.logs.clear</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -19,7 +22,7 @@
 		</record>
 
 		<record id="action_view_olap_query_logs_clear" model="ir.actions.act_window">
-            <field name="name">Create Logs </field>
+            <field name="name">Clear Logs </field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">olap.query.logs.clear</field>
             <field name="view_type">form</field>
@@ -28,7 +31,7 @@
     	</record>
 
 		<record id="view_olap_query_logs_clear_msg" model="ir.ui.view">
-            <field name="name">Create Logs Message</field>
+            <field name="name">Clear Logs Message</field>
             <field name="model">olap.query.logs.clear.msg</field>
             <field name="type">form</field>
             <field name="arch" type="xml">

From 81840a006cd6b7a80c6ca6c43efbc8fe536faa0e Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 16 Mar 2010 19:33:02 +0530
Subject: [PATCH 030/248] [IMP]: lunch: code optimization and apply doc string

bzr revid: ksa@tinyerp.co.in-20100316140302-sbjh3mot08dwdd0z
---
 addons/lunch/lunch.py                         | 48 +++++++----
 addons/lunch/lunch_view.xml                   | 82 ++++++++++++-------
 addons/lunch/wizard/lunch_cashbox_clean.py    | 30 +++----
 .../lunch/wizard/lunch_cashbox_clean_view.xml | 11 ++-
 addons/lunch/wizard/lunch_order_cancel.py     | 11 +--
 .../lunch/wizard/lunch_order_cancel_view.xml  | 11 ++-
 addons/lunch/wizard/lunch_order_confirm.py    | 21 ++---
 .../lunch/wizard/lunch_order_confirm_view.xml | 11 ++-
 8 files changed, 137 insertions(+), 88 deletions(-)

diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 7eb6d858a3e..ba6f816169d 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,24 +23,28 @@ from osv import osv, fields
 import time
 
 class lunch_category(osv.osv):
+    """ Lunch category """
     _name = 'lunch.category'
     _description = "Category"
 
     _columns = {
         'name': fields.char('Name', required=True, size=50),
     }
-
     _order = 'name'
 
 lunch_category()
 
+
 class lunch_product(osv.osv):
+    """ Lunch Product """
     _name = 'lunch.product'
+    _description = "Lunch Product"
 
     def _category_name_get(self, cr, uid, context={}):
+        """ Get category name """
         obj = self.pool.get('lunch.category')
         cat_ids= obj.search(cr,uid,[])
-        res = obj.read(cr,uid,cat_ids,['name', 'category'])
+        res = obj.read(cr, uid, cat_ids, ['name', 'category'])
         return [(str(r['id']), r['name']) for r in res]+ [('0','')]
 
     _columns = {
@@ -57,36 +61,40 @@ class lunch_product(osv.osv):
 
 lunch_product()
 
+
 class lunch_cashbox(osv.osv):
+    """ cashbox for Lunch """
     _name='lunch.cashbox'
+    _description = "Cashbox for Lunch "
+
 
     def amount_available(self, cr, uid, ids, field_name, arg, context):
         cr.execute("SELECT box,sum(amount) from lunch_cashmove where active = 't' group by box")
         r = dict(cr.fetchall())
-        for i in ids :
+        for i in ids:
             r.setdefault(i,0)
         return r
 
     _columns={
-        'manager':fields.many2one('res.users','Manager'),
-        'name':fields.char('Name',size=30,required=True, unique = True),
+        'manager': fields.many2one('res.users','Manager'),
+        'name': fields.char('Name',size=30,required=True, unique = True),
         'sum_remain': fields.function(amount_available, method=True, string='Remained Total'),
         }
 
 lunch_cashbox()
 
 
-
-
 class lunch_cashmove(osv.osv):
+    """ Move cah """
     _name= 'lunch.cashmove'
+    _description = "Move cash"
 
     _columns={
         'name': fields.char('Name',size=128),
         'user_cashmove': fields.many2one('res.users','User Name', required=True),
         'amount': fields.float('Amount', digits=(16,2)),
-        'box':fields.many2one('lunch.cashbox','Box Name',size=30,required=True),
-        'active':fields.boolean('Active'),
+        'box': fields.many2one('lunch.cashbox','Box Name',size=30,required=True),
+        'active': fields.boolean('Active'),
         'create_date': fields.datetime('Created date', readonly=True),
         }
 
@@ -97,9 +105,10 @@ class lunch_cashmove(osv.osv):
 lunch_cashmove()
 
 
-
 class lunch_order(osv.osv):
+    """ Apply lunch order """
     _name='lunch.order'
+    _description = "Lunch Order"
     _rec_name= "user_id"
 
     def _price_get(self, cr, uid, ids, name, args, context=None):
@@ -109,15 +118,15 @@ class lunch_order(osv.osv):
         return res
 
     _columns={
-        'user_id': fields.many2one('res.users','User Name', required=True,
+        'user_id': fields.many2one('res.users','User Name', required=True, \
             readonly=True, states={'draft':[('readonly',False)]}),
-        'product':fields.many2one('lunch.product','Product', required=True,
+        'product': fields.many2one('lunch.product','Product', required=True, \
             readonly=True, states={'draft':[('readonly',False)]}, change_default=True),
         'date': fields.date('Date',readonly=True,states={'draft':[('readonly',False)]}),
-        'cashmove':fields.many2one('lunch.cashmove', 'CashMove' , readonly=True  ),
-        'descript':fields.char('Description Order', readonly=True, size=50,
+        'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True  ),
+        'descript': fields.char('Description Order', readonly=True, size=50,\
             states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft','Draft'), ('confirmed','Confirmed'),],
+        'state': fields.selection([('draft','Draft'), ('confirmed','Confirmed'),],\
             'State', readonly=True, select=True),
         'price': fields.function(_price_get, method=True, string="Price"),
     }
@@ -147,7 +156,7 @@ class lunch_order(osv.osv):
         for order in orders:
             if not order.cashmove:
                 continue
-            self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id])
+        self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id])
         self.write(cr,uid,ids,{'state':'draft'})
         return {}
 
@@ -159,7 +168,9 @@ class lunch_order(osv.osv):
 
 lunch_order()
 
+
 class report_lunch_amount(osv.osv):
+    """ Lunch Amount Report """
     _name='report.lunch.amount'
     _description = "Amount available by user and box"
     _auto = False
@@ -187,5 +198,6 @@ class report_lunch_amount(osv.osv):
                 )""")
 
 report_lunch_amount()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 449c0400905..87fff3cb273 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -2,21 +2,25 @@
 <openerp>
     <data>
           <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
-        <!--<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
-        <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
-        <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
-        <menuitem name="Lunch Orders" parent="menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
-        <menuitem name="Configuration" parent="menu_tools" id="menu_lunch_category_root" sequence="5"/>
-       <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>-->
+          <menuitem name="Lunch Order" parent="base.menu_tools"
+          	id="menu_lunch" sequence="1" />
 
-        <menuitem name="Lunch Order" parent="base.menu_tools" id="menu_lunch" sequence="1"/>
-        <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
-        <menuitem name="Lunch Orders" parent="base.menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
-        <menuitem name="Configuration" parent="base.menu_tools" id="base.menu_lunch_survey_root" sequence="6"/>
+          <menuitem name="Reporting" parent="base.menu_tools"
+          	id="base.menu_lunch_reporting" sequence="5" />
 
+          <menuitem name="Lunch Orders"
+          	parent="base.menu_lunch_reporting"
+          	id="menu_lunch_reporting_order" sequence="1" />
 
-       <menuitem name="Lunch" parent="base.menu_lunch_survey_root" id="menu_lunch_category_root_configuration" sequence="1"/>
-        <record model="ir.ui.view" id="view_lunch_order_form">
+          <menuitem name="Configuration" parent="base.menu_tools"
+          	id="base.menu_lunch_survey_root" sequence="6" />
+
+          <menuitem name="Lunch" parent="base.menu_lunch_survey_root"
+          	id="menu_lunch_category_root_configuration" sequence="1" />
+
+<!-- Lunch order  -->
+
+          <record model="ir.ui.view" id="view_lunch_order_form">
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
@@ -58,15 +62,10 @@
                 <field name="res_model">lunch.order</field>
                 <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Lunch Order" parent="menu_lunch" id="menu_lunch_order_form" action="action_lunch_order_form"/>
+        <menuitem name="Lunch Order" parent="menu_lunch"
+        	id="menu_lunch_order_form" action="action_lunch_order_form" />
 
-<!--        <record model="ir.actions.act_window" id="action_lunch_order_day_form">-->
-<!--                <field name="name"> Order of the day</field>-->
-<!--                <field name="res_model">lunch.order</field>-->
-<!--                <field name="domain">[('date','=',time.strftime('%Y-%m-%d'))]</field>-->
-<!---->
-<!--        </record>-->
-<!--        <menuitem name="Order of the day" parent="menu_lunch_order_form" id="menu_lunch_order_day_form" action="action_lunch_order_day_form"/>-->
+<!--  Cash Box  -->
 
         <record model="ir.ui.view" id="view_lunch_cashbox_form">
             <field name="name">CashBox</field>
@@ -96,7 +95,13 @@
                 <field name="name"> CashBox </field>
                 <field name="res_model">lunch.cashbox</field>
         </record>
-        <menuitem name="CashBox" parent="menu_lunch_category_root_configuration" id="menu_lunch_cashbox_form" action="action_lunch_cashbox_form"/>
+
+        <menuitem name="CashBox"
+        	parent="menu_lunch_category_root_configuration"
+        	id="menu_lunch_cashbox_form"
+        	action="action_lunch_cashbox_form" />
+
+<!-- Cash Move  -->
 
         <record model="ir.ui.view" id="view_lunch_cashmove_form">
             <field name="name">CashMove</field>
@@ -133,7 +138,11 @@
                 <field name="res_model">lunch.cashmove</field>
         </record>
 
-        <menuitem name="Cash Moves" parent="menu_lunch" id="menu_lunch_cashmove_form" action="action_lunch_cashmove_form"/>
+        <menuitem name="Cash Moves" parent="menu_lunch"
+        	id="menu_lunch_cashmove_form"
+        	action="action_lunch_cashmove_form" />
+
+<!-- Lunch Category  -->
 
         <record model="ir.ui.view" id="view_lunch_category_form">
             <field name="name"> Category of product </field>
@@ -157,12 +166,13 @@
             </field>
         </record>
 
-
         <record model="ir.actions.act_window" id="action_lunch_category_form">
             <field name="name"> Category of product </field>
             <field name="res_model">lunch.category</field>
         </record>
 
+<!-- Lunch Product  -->
+
         <record model="ir.ui.view" id="view_lunch_product_form">
             <field name="name">Products</field>
             <field name="type">form</field>
@@ -178,7 +188,6 @@
             </field>
         </record>
 
-
         <record model="ir.ui.view" id="view_lunch_product_tree">
             <field name="name">Products</field>
             <field name="model">lunch.product</field>
@@ -198,10 +207,21 @@
             <field name="res_model">lunch.product</field>
         </record>
 
-        <menuitem name="Tools/Lunch/Configuration/Products" id="menu_lunch_product_form" action="action_lunch_product_form"  sequence="1"/>
-        <menuitem name="Products" parent="menu_lunch_category_root_configuration" id="menu_lunch_product_form" action="action_lunch_product_form"  sequence="2"/>
-        <menuitem name="Category of product" parent="menu_lunch_category_root_configuration" id="menu_lunch_category_form" action="action_lunch_category_form" sequence="1"/>
+        <menuitem name="Tools/Lunch/Configuration/Products"
+        	id="menu_lunch_product_form" action="action_lunch_product_form"
+        	sequence="1" />
 
+        <menuitem name="Products"
+        	parent="menu_lunch_category_root_configuration"
+        	id="menu_lunch_product_form" action="action_lunch_product_form"
+        	sequence="2" />
+
+        <menuitem name="Category of product"
+        	parent="menu_lunch_category_root_configuration"
+        	id="menu_lunch_category_form"
+        	action="action_lunch_category_form" sequence="1" />
+
+<!-- Lunch Amount  -->
 
         <record model="ir.ui.view" id="view_report_lunch_amount_tree">
             <field name="name">Lunch amount</field>
@@ -229,14 +249,18 @@
             </field>
         </record>
 
-
         <record model="ir.actions.act_window" id="action_report_lunch_amount_tree">
             <field name="name">Lunch amount</field>
             <field name="res_model">report.lunch.amount</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Cash Position by User" parent="menu_lunch_reporting_order" action="action_report_lunch_amount_tree" id="menu_lunch_report_amount_tree"/>
+
+        <menuitem name="Cash Position by User"
+        	parent="menu_lunch_reporting_order"
+        	action="action_report_lunch_amount_tree"
+        	id="menu_lunch_report_amount_tree" />
+
     </data>
 </openerp>
 
diff --git a/addons/lunch/wizard/lunch_cashbox_clean.py b/addons/lunch/wizard/lunch_cashbox_clean.py
index 5656ca92dbe..b1a96556460 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean.py
+++ b/addons/lunch/wizard/lunch_cashbox_clean.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,16 +15,16 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 from osv import fields, osv
 
 class lunch_cashbox_clean(osv.osv_memory):
-    
+
      _name = "lunch.cashbox.clean"
      _description = "clean cashbox"
-    
+
      def set_to_zero(self, cr, uid, ids, context):
          """
          clean Cashbox. set active fields False.
@@ -33,22 +33,24 @@ class lunch_cashbox_clean(osv.osv_memory):
          @param ids: List  Lunch cashbox Clean’s IDs
          @return:Dictionary {}.
          """
+         data = context and context.get('active_ids', []) or []
          cashmove_ref = self.pool.get('lunch.cashmove')
-         cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove where active = 't' and box in (%s) group by user_cashmove, box" % ','.join(map(str, context['active_ids'])))
+         cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove \
+                 where active = 't' and box in (%s) group by user_cashmove, \
+                     box" % ','.join(map(str, data)))
          res = cr.fetchall()
-         cr.execute("update lunch_cashmove set active = 'f' where active= 't' and box in (%s)" % ','.join(map(str, context['active_ids'])))
-##    to_unactive= {}.fromkeys([r[0] for r in cr.fetchall]).keys()
-##    print to_unactive
-##    cashmove_ref.write(cr,uid,to_unactive,{'active':False})            
+         cr.execute("update lunch_cashmove set active = 'f' where active= 't' \
+             and box in (%s)" % ','.join(map(str, data)))
          for (user_id, box_id, amount) in res:
-            cashmove_ref.create(cr, uid, {'name': 'Summary for user' + str(user_id), 
-                        'amount': amount, 
-                        'user_cashmove': user_id, 
-                        'box': box_id, 
-                        'active': True, 
+            cashmove_ref.create(cr, uid, {'name': 'Summary for user' + str(user_id),
+                        'amount': amount,
+                        'user_cashmove': user_id,
+                        'box': box_id,
+                        'active': True,
                         })
          return {}
 
 lunch_cashbox_clean()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 6e151dc0484..20fb2416ade 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+<!-- Lunch cashbox  -->
+
   		<record id="view_lunch_cashbox_clean" model="ir.ui.view">
             <field name="name">lunch.cashbox.clean.form</field>
             <field name="model">lunch.cashbox.clean</field>
@@ -18,21 +21,21 @@
                </form>
             </field>
   		</record>
-  		
+
         <record id="action_lunch_cashbox_clean" model="ir.actions.act_window">
             <field name="name">Set CashBox to Zero</field>
             <field name="res_model">lunch.cashbox.clean</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_lunch_cashbox_clean"/> 
+           <field name="view_id" ref="view_lunch_cashbox_clean"/>
            <field name="target">new</field>
            <field name="context">{'record_id':active_id}</field>
         </record>
-              
+
         <act_window id="action_lunch_cashbox_clean_values"
     		key2="client_action_multi" name="Set CashBox to Zero"
     		res_model="lunch.cashbox.clean" src_model="lunch.cashbox"
     		view_mode="form" target="new" view_type="form" />
-        
+
     </data>
 </openerp>
diff --git a/addons/lunch/wizard/lunch_order_cancel.py b/addons/lunch/wizard/lunch_order_cancel.py
index 91f25aa421a..c17c4e651ff 100644
--- a/addons/lunch/wizard/lunch_order_cancel.py
+++ b/addons/lunch/wizard/lunch_order_cancel.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 from osv import fields, osv
@@ -26,7 +26,7 @@ class lunch_order_cancel(osv.osv_memory):
     """
     _name = "lunch.order.cancel"
     _description = "Cancel Order"
-    
+
     def cancel(self, cr, uid, ids, context):
         """
         Cancel cashmove entry from cashmoves and update state to draft.
@@ -34,8 +34,9 @@ class lunch_order_cancel(osv.osv_memory):
         @param uid: the current user’s ID for security checks,
         @param ids: List  Lunch Order Cancel’s IDs
         """
-        return self.pool.get('lunch.order').lunch_order_cancel(cr, uid, context['active_ids'], context)
-        
+        data = context and context.get('active_ids', []) or []
+        return self.pool.get('lunch.order').lunch_order_cancel(cr, uid, data, context)
+
 lunch_order_cancel()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index c69d321b938..dcfe412af48 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+<!-- cancel order  -->
+
   		<record id="view_lunch_order_cancel" model="ir.ui.view">
             <field name="name">lunch.order.cancel.form</field>
             <field name="model">lunch.order.cancel</field>
@@ -18,21 +21,21 @@
                </form>
             </field>
   		</record>
-  		
+
         <record id="action_lunch_order_cancel" model="ir.actions.act_window">
             <field name="name">Cancel Order</field>
             <field name="res_model">lunch.order.cancel</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_lunch_order_cancel"/> 
+           <field name="view_id" ref="view_lunch_order_cancel"/>
            <field name="target">new</field>
            <field name="context">{'record_id':active_id}</field>
         </record>
-        
+
         <act_window id="action_lunch_order_cancel_values"
     		key2="client_action_multi" name="Cancel Order"
     		res_model="lunch.order.cancel" src_model="lunch.order"
     		view_mode="form" target="new" view_type="form" />
-        
+
     </data>
 </openerp>
diff --git a/addons/lunch/wizard/lunch_order_confirm.py b/addons/lunch/wizard/lunch_order_confirm.py
index 9b7476f40e3..f15f18b0867 100644
--- a/addons/lunch/wizard/lunch_order_confirm.py
+++ b/addons/lunch/wizard/lunch_order_confirm.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,21 +28,22 @@ class lunch_order_confirm(osv.osv_memory):
     _name = "lunch.order.confirm"
     _description = "confirm Order"
     _columns = {
-                'confirm_cashbox':fields.many2one('lunch.cashbox', 'Name of box', required=True), 
+                'confirm_cashbox':fields.many2one('lunch.cashbox', 'Name of box', required=True),
                 }
-    
+
     def confirm(self, cr, uid, ids, context):
         """
-        confirm Lunch Order.Create cashmoves in launch cashmoves when state is 
+        confirm Lunch Order.Create cashmoves in launch cashmoves when state is
                         confirm in lunch order.
-        @param cr: the current row, from the database cursor, 
-        @param uid: the current user’s ID for security checks, 
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
         @param ids: List  Lunch Order confirm’s IDs
-        @return: Dictionary {}.                
+        @return: Dictionary {}.
         """
+        data = context and context.get('active_ids', []) or []
         order_ref = self.pool.get('lunch.order')
-        for data in self.read(cr, uid, ids):
-            order_ref.confirm(cr, uid, context['active_ids'], data['confirm_cashbox'], context)
+        for confirm_obj in self.read(cr, uid, ids):
+            order_ref.confirm(cr, uid, data, confirm_obj['confirm_cashbox'], context)
             return {}
 
 lunch_order_confirm()
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index 89ddd8f6153..8afd25c2307 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+<!-- confirm order  -->
+
   		<record id="view_lunch_order_confirm" model="ir.ui.view">
             <field name="name">lunch.order.confirm.form</field>
             <field name="model">lunch.order.confirm</field>
@@ -20,21 +23,21 @@
                </form>
             </field>
   		</record>
-  		
+
         <record id="action_lunch_order_confirm" model="ir.actions.act_window">
             <field name="name">Confirm Order</field>
             <field name="res_model">lunch.order.confirm</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_lunch_order_confirm"/> 
+           <field name="view_id" ref="view_lunch_order_confirm"/>
            <field name="target">new</field>
            <field name="context">{'record_id':active_id}</field>
         </record>
-              
+
         <act_window id="action_lunch_order_confirm_values"
     		key2="client_action_multi" name="Confirm Order"
     		res_model="lunch.order.confirm" src_model="lunch.order"
     		view_mode="form" target="new" view_type="form" />
-        
+
     </data>
 </openerp>

From e73dd6009e67db442b301eecf624fa6c66dc9ed0 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 17 Mar 2010 10:33:01 +0530
Subject: [PATCH 031/248] [IMP]:audittrail: code optimization and apply doc
 string

bzr revid: atp@tinyerp.co.in-20100317050301-zqsbwy2ngf1h6cv2
---
 addons/audittrail/audittrail.py               | 398 ++++++++++--------
 addons/audittrail/audittrail_view.xml         |  75 +++-
 .../audittrail/wizard/audittrail_view_log.py  |  46 +-
 .../wizard/audittrail_view_log_view.xml       |  13 +-
 4 files changed, 298 insertions(+), 234 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 22ddcafd7f9..726937e62a3 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 from osv import fields, osv
 from osv.osv import osv_pool
 from tools.translate import _
@@ -30,16 +29,23 @@ import string
 import time, copy
 
 class audittrail_rule(osv.osv):
+    """
+    For Auddittrail RUle
+    """
     _name = 'audittrail.rule'
+    _description = "Audittrail Rule"
     _columns = {
         "name": fields.char("Rule Name", size=32, required=True),
         "object_id": fields.many2one('ir.model', 'Object', required=True),
-        "user_id": fields.many2many('res.users', 'audittail_rules_users', 'user_id', 'rule_id', 'Users'),
+        "user_id": fields.many2many('res.users', 'audittail_rules_users', 
+                                            'user_id', 'rule_id', 'Users'),
         "log_read": fields.boolean("Log reads"),
         "log_write": fields.boolean("Log writes"),
         "log_unlink": fields.boolean("Log deletes"),
         "log_create": fields.boolean("Log creates"),
-        "state": fields.selection((("draft", "Draft"), ("subscribed", "Subscribed")), "State", required=True),
+        "state": fields.selection((("draft", "Draft"), 
+                                   ("subscribed", "Subscribed")), 
+                                   "State", required=True), 
         "action_id":fields.many2one('ir.actions.act_window', "Action ID"),
     }
 
@@ -56,6 +62,9 @@ class audittrail_rule(osv.osv):
     __functions = {}
 
     def subscribe(self, cr, uid, ids, *args):
+        obj_action = self.pool.get('ir.actions.act_window')
+        obj_model = self.pool.get('ir.model.data')
+        #start Loop
         for thisrule in self.browse(cr, uid, ids):
             obj = self.pool.get(thisrule.object_id.model)
             if not obj:
@@ -63,48 +72,59 @@ class audittrail_rule(osv.osv):
                         _('WARNING:audittrail is not part of the pool'),
                         _('Change audittrail depends -- Setting rule as DRAFT'))
                 self.write(cr, uid, [thisrule.id], {"state": "draft"})
-            val={
-                 "name":'View Log',
-                 "res_model":'audittrail.log',
-                 "src_model":thisrule.object_id.model,
-                 "domain":"[('object_id','=',"+str(thisrule.object_id.id)+"),('res_id', '=', active_id)]"
+            val = {
+                 "name":'View Log', 
+                 "res_model":'audittrail.log', 
+                 "src_model": thisrule.object_id.model, 
+                 "domain":"[('object_id','=',"+str(thisrule.object_id.id)+"), ('res_id', '=', active_id)]"
 
             }
-            id=self.pool.get('ir.actions.act_window').create(cr, uid, val)
+            id = obj_action.create(cr, uid, val)
             self.write(cr, uid, [thisrule.id], {"state": "subscribed", "action_id":id})
             keyword = 'client_action_relate'
             value = 'ir.actions.act_window,'+str(id)
-            res=self.pool.get('ir.model.data').ir_set(cr, uid, 'action', keyword, 'View_log_'+thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False)
+            res = obj_model.ir_set(cr, uid, 'action', keyword, 'View_log_'+thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False)
+            #End Loop
         return True
 
-
-
     def unsubscribe(self, cr, uid, ids, *args):
+        
+        obj_action = self.pool.get('ir.actions.act_window')
+        obj_model = self.pool.get('ir.model.data')
+        val_obj = self.pool.get('ir.values')
+        #start Loop
         for thisrule in self.browse(cr, uid, ids):
             if thisrule.id in self.__functions :
                 for function in self.__functions[thisrule.id]:
                     setattr(function[0], function[1], function[2])
-            w_id=self.pool.get('ir.actions.act_window').search(cr, uid, [('name', '=', 'View Log'), ('res_model', '=', 'audittrail.log'), ('src_model', '=', thisrule.object_id.model)])
-            self.pool.get('ir.actions.act_window').unlink(cr, uid, w_id)
-            val_obj=self.pool.get('ir.values')
-            value="ir.actions.act_window"+','+str(w_id[0])
-            val_id=val_obj.search(cr, uid, [('model', '=', thisrule.object_id.model), ('value', '=', value)])
+            w_id = obj_action.search(cr, uid, [('name', '=', 'View Log'), ('res_model', '=', 'audittrail.log'), ('src_model', '=', thisrule.object_id.model)])
+            obj_action.unlink(cr, uid, w_id)
+            value = "ir.actions.act_window"+','+str(w_id[0])
+            val_id = val_obj.search(cr, uid, [('model', '=', thisrule.object_id.model), ('value', '=', value)])
             if val_id:
                 res = ir.ir_del(cr, uid, val_id[0])
             self.write(cr, uid, [thisrule.id], {"state": "draft"})
+        #End Loop
         return True
 
 audittrail_rule()
 
 
 class audittrail_log(osv.osv):
+    """
+    For Audittrail Log
+    """
+    
     _name = 'audittrail.log'
-
+    _description = "Audittrail Log"
     _columns = {
         "name": fields.char("Name", size=32),
         "object_id": fields.many2one('ir.model', 'Object'),
         "user_id": fields.many2one('res.users', 'User'),
-        "method": fields.selection((('read', 'Read'), ('write', 'Write'), ('unlink', 'Delete'), ('create', 'Create')), "Method"),
+        "method": fields.selection((('read', 'Read'), 
+                                    ('write', 'Write'), 
+                                    ('unlink', 'Delete'), 
+                                    ('create', 'Create')), "Method"),
         "timestamp": fields.datetime("Date"),
         "res_id":fields.integer('Resource Id'),
         "line_ids":fields.one2many('audittrail.log.line', 'log_id', 'Log lines'),
@@ -116,205 +136,217 @@ class audittrail_log(osv.osv):
 
 audittrail_log()
 
+
 class audittrail_log_line(osv.osv):
-    _name='audittrail.log.line'
-    _columns={
-              'field_id': fields.many2one('ir.model.fields', 'Fields', required=True),
-              'log_id':fields.many2one('audittrail.log', 'Log'),
-              'log':fields.integer("Log ID"),
-              'old_value':fields.text("Old Value"),
-              'new_value':fields.text("New Value"),
-              'old_value_text':fields.text('Old value Text'),
-              'new_value_text':fields.text('New value Text'),
-              'field_description':fields.char('Field Description' , size=64),
-              }
+    """
+    Audittrail Log Line.
+    """
+    _name = 'audittrail.log.line'
+    _description = "Log Line"
+    _columns = {
+          'field_id': fields.many2one('ir.model.fields', 'Fields', required=True),
+          'log_id':fields.many2one('audittrail.log', 'Log'),
+          'log':fields.integer("Log ID"),
+          'old_value':fields.text("Old Value"),
+          'new_value':fields.text("New Value"),
+          'old_value_text':fields.text('Old value Text'),
+          'new_value_text':fields.text('New value Text'),
+          'field_description':fields.char('Field Description' , size=64),
+        }
 
 audittrail_log_line()
 
+
+
 class audittrail_objects_proxy(osv_pool):
-    def get_value_text(self, cr, uid, field_name, values, object, context={}):
-            pool = pooler.get_pool(cr.dbname)
-            obj=pool.get(object.model)
-            obj_ids= pool.get('ir.model').search(cr, uid, [('model', '=', object.model)])
-            model_object=pool.get('ir.model').browse(cr, uid, obj_ids)[0]
-            f_id= pool.get('ir.model.fields').search(cr, uid, [('name', '=', field_name), ('model_id', '=', object.id)])
-            if f_id:
-                field=pool.get('ir.model.fields').read(cr, uid, f_id)[0]
-                model=field['relation']
+    
+    def get_value_text(self, cr, uid, field_name, values, object, context=None):
+        if not context:
+            context = {}
+        pool = pooler.get_pool(cr.dbname)
+        obj = pool.get(object.model)
+        obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object.model)])
+        model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+        f_id= pool.get('ir.model.fields').search(cr, uid, [('name', '=', field_name), ('model_id', '=', object.id)])
+        if f_id:
+            field = pool.get('ir.model.fields').read(cr, uid, f_id)[0]
+            model = field['relation']
 
-                if field['ttype']=='many2one':
-                    if values:
-                        if type(values)==tuple:
-                            values=values[0]
-                        val=pool.get(model).read(cr, uid, [values], [pool.get(model)._rec_name])
+            if field['ttype'] == 'many2one':
+                if values:
+                    if type(values) == tuple:
+                        values = values[0]
+                    val = pool.get(model).read(cr, uid, [values], [pool.get(model)._rec_name])
+                    if len(val):
+                        return val[0][pool.get(model)._rec_name]
+            elif field['ttype'] == 'many2many':
+                value = []
+                if values:
+                    for id in values:
+                        val = pool.get(model).read(cr, uid, [id], [pool.get(model)._rec_name])
                         if len(val):
-                            return val[0][pool.get(model)._rec_name]
-                elif field['ttype'] == 'many2many':
-                    value=[]
-                    if values:
-                        for id in values:
-                            val=pool.get(model).read(cr, uid, [id], [pool.get(model)._rec_name])
-                            if len(val):
-                                value.append(val[0][pool.get(model)._rec_name])
+                            value.append(val[0][pool.get(model)._rec_name])
+                return value
+
+            elif field['ttype'] == 'one2many':
+                if values:
+                    value = []
+                    for id in values:
+                        val = pool.get(model).read(cr, uid, [id], [pool.get(model)._rec_name])
+
+                        if len(val):
+                            value.append(val[0][pool.get(model)._rec_name])
                     return value
-
-                elif field['ttype'] == 'one2many':
-                    if values:
-                        value=[]
-                        for id in values:
-                            val=pool.get(model).read(cr, uid, [id], [pool.get(model)._rec_name])
-
-                            if len(val):
-                                value.append(val[0][pool.get(model)._rec_name])
-                        return value
             return values
 
     def create_log_line(self, cr, uid, id, object, lines=[]):
         pool = pooler.get_pool(cr.dbname)
-        obj=pool.get(object.model)
-        obj_ids= pool.get('ir.model').search(cr, uid, [('model', '=', object.model)])
-        model_object=pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+        obj = pool.get(object.model)
+        obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object.model)])
+        model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+        #start Loop
         for line in lines:
             if obj._inherits:
-                inherits_ids= pool.get('ir.model').search(cr, uid, [('model', '=', obj._inherits.keys()[0])])
-                f_id= pool.get('ir.model.fields').search(cr, uid, [('name', '=', line['name']), ('model_id', 'in', (object.id, inherits_ids[0]))])
+                inherits_ids = pool.get('ir.model').search(cr, uid, [('model', '=', obj._inherits.keys()[0])])
+                f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', line['name']), ('model_id', 'in', (object.id, inherits_ids[0]))])
             else:
-                f_id= pool.get('ir.model.fields').search(cr, uid, [('name', '=', line['name']), ('model_id', '=', object.id)])
+                f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', line['name']), ('model_id', '=', object.id)])
             if len(f_id):
-                fields=pool.get('ir.model.fields').read(cr, uid, f_id)
-                old_value='old_value' in line and  line['old_value'] or ''
-                new_value='new_value' in line and  line['new_value'] or ''
-                old_value_text='old_value_text' in line and  line['old_value_text'] or ''
-                new_value_text='new_value_text' in line and  line['new_value_text'] or ''
+                fields = pool.get('ir.model.fields').read(cr, uid, f_id)
+                old_value = 'old_value' in line and  line['old_value'] or ''
+                new_value = 'new_value' in line and  line['new_value'] or ''
+                old_value_text = 'old_value_text' in line and  line['old_value_text'] or ''
+                new_value_text = 'new_value_text' in line and  line['new_value_text'] or ''
                 
                 if old_value_text == new_value_text:
                     continue
-                if fields[0]['ttype']== 'many2one':
-                    if type(old_value)==tuple:
-                        old_value=old_value[0]
-                    if type(new_value)==tuple:
-                        new_value=new_value[0]
+                if fields[0]['ttype'] == 'many2one':
+                    if type(old_value) == tuple:
+                        old_value = old_value[0]
+                    if type(new_value) == tuple:
+                        new_value = new_value[0]
                 log_line_id = pool.get('audittrail.log.line').create(cr, uid, {"log_id": id, "field_id": f_id[0] , "old_value":old_value , "new_value":new_value, "old_value_text":old_value_text , "new_value_text":new_value_text, "field_description":fields[0]['field_description']})
                 cr.commit()
+                #End Loop
         return True
 
     def log_fct(self, db, uid, object, method, fct_src, *args):
-            logged_uids = []
-            pool = pooler.get_pool(db)
-            cr = pooler.get_db(db).cursor()
-            obj=pool.get(object)
-            obj_ids= pool.get('ir.model').search(cr, uid, [('model', '=', object)])
-            model_object=pool.get('ir.model').browse(cr, uid, obj_ids)[0]
-            if method in ('create'):
-                res_id = fct_src(db, uid, object, method, *args)
+        logged_uids = []
+        pool = pooler.get_pool(db)
+        cr = pooler.get_db(db).cursor()
+        obj = pool.get(object)
+        obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
+        model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
+        if method in ('create'):
+            res_id = fct_src(db, uid, object, method, *args)
+            cr.commit()
+            new_value = pool.get(model_object.model).read(cr, uid, [res_id], args[0].keys())[0]
+            if 'id' in new_value:
+                del new_value['id']
+            if not len(logged_uids) or uid in logged_uids:
+                resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
+                resource_name = resource_name and resource_name[0][1] or ''
+                id = pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
+                lines = []
+                for field in new_value:
+                    if new_value[field]:
+                        line = {
+                              'name':field,
+                              'new_value':new_value[field],
+                              'new_value_text': self.get_value_text(cr, uid, field, new_value[field], model_object)
+                              }
+                        lines.append(line)
+                self.create_log_line(cr, uid, id, model_object, lines)
+            cr.commit()
+            cr.close()
+            return res_id
+
+        if method in ('write'):
+            res_ids = args[0]
+            for res_id in res_ids:
+                old_values = pool.get(model_object.model).read(cr, uid, res_id, args[1].keys())
+                old_values_text = {}
+                for field in args[1].keys():
+                    old_values_text[field] = self.get_value_text(cr, uid, field, old_values[field], model_object)
+                res = fct_src(db, uid, object, method, *args)
                 cr.commit()
-                new_value=pool.get(model_object.model).read(cr, uid, [res_id], args[0].keys())[0]
-                if 'id' in new_value:
-                    del new_value['id']
-                if not len(logged_uids) or uid in logged_uids:
-                    resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
-                    resource_name = resource_name and resource_name[0][1] or ''
-                    id=pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
-                    lines=[]
-                    for field in new_value:
-                        if new_value[field]:
-                            line={
-                                  'name':field,
-                                  'new_value':new_value[field],
-                                  'new_value_text': self.get_value_text(cr, uid, field, new_value[field], model_object)
-                                  }
-                            lines.append(line)
-                    self.create_log_line(cr, uid, id, model_object, lines)
-                cr.commit()
-                cr.close()
-                return res_id
-
-            if method in ('write'):
-                res_ids=args[0]
-                for res_id in res_ids:
-                    old_values=pool.get(model_object.model).read(cr, uid, res_id, args[1].keys())
-                    old_values_text={}
-                    for field in args[1].keys():
-                        old_values_text[field] = self.get_value_text(cr, uid, field, old_values[field], model_object)
-                    res =fct_src(db, uid, object, method, *args)
-                    cr.commit()
-                    if res:
-                        new_values=pool.get(model_object.model).read(cr, uid, res_ids, args[1].keys())[0]
-                        if not len(logged_uids) or uid in logged_uids:
-                            resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
-                            resource_name = resource_name and resource_name[0][1] or ''
-                            id=pool.get('audittrail.log').create(cr, uid, {"method": method, "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
-                            lines=[]
-                            for field in args[1].keys():
-                                if args[1].keys():
-                                    line={
-                                          'name':field,
-                                          'new_value':field in new_values and new_values[field] or '',
-                                          'old_value':field in old_values and old_values[field] or '',
-                                          'new_value_text': self.get_value_text(cr, uid, field, new_values[field], model_object),
-                                          'old_value_text':old_values_text[field]
-                                          }
-                                    lines.append(line)
-                            cr.commit()
-                            self.create_log_line(cr, uid, id, model_object, lines)
-                    cr.close()
-                    return res
-
-            if method in ('read'):
-                res_ids=args[0]
-                old_values={}
-                res =fct_src(db, uid, object, method, *args)
-                if type(res)==list:
-
-                    for v in res:
-                        old_values[v['id']]=v
-                else:
-                    old_values[res['id']]=res
-                for res_id in old_values:
+                if res:
+                    new_values = pool.get(model_object.model).read(cr, uid, res_ids, args[1].keys())[0]
                     if not len(logged_uids) or uid in logged_uids:
                         resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                         resource_name = resource_name and resource_name[0][1] or ''
-                        id=pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
-                        lines=[]
-                        for field in old_values[res_id]:
-                            if old_values[res_id][field]:
-                                line={
-                                          'name':field,
-                                          'old_value':old_values[res_id][field],
-                                          'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
-                                          }
-                                lines.append(line)
-                    cr.commit()
-                    self.create_log_line(cr, uid, id, model_object, lines)
-                cr.close()
-                return res
-
-            if method in ('unlink'):
-                res_ids=args[0]
-                old_values={}
-                for res_id in res_ids:
-                    old_values[res_id]=pool.get(model_object.model).read(cr, uid, res_id, [])
-
-                for res_id in res_ids:
-                    if not len(logged_uids) or uid in logged_uids:
-                        resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
-                        resource_name = resource_name and resource_name[0][1] or ''
-                        id=pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
-                        lines=[]
-                        for field in old_values[res_id]:
-                            if old_values[res_id][field]:
-                                line={
+                        id = pool.get('audittrail.log').create(cr, uid, {"method": method, "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
+                        lines = []
+                        for field in args[1].keys():
+                            if args[1].keys():
+                                line = {
                                       'name':field,
-                                      'old_value':old_values[res_id][field],
-                                      'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
+                                      'new_value':field in new_values and new_values[field] or '',
+                                      'old_value':field in old_values and old_values[field] or '',
+                                      'new_value_text': self.get_value_text(cr, uid, field, new_values[field], model_object),
+                                      'old_value_text':old_values_text[field]
                                       }
                                 lines.append(line)
                         cr.commit()
                         self.create_log_line(cr, uid, id, model_object, lines)
-                res =fct_src(db, uid, object, method, *args)
                 cr.close()
                 return res
+
+        if method in ('read'):
+            res_ids = args[0]
+            old_values = {}
+            res = fct_src(db, uid, object, method, *args)
+            if type(res) == list:
+
+                for v in res:
+                    old_values[v['id']] = v
+            else:
+                old_values[res['id']] = res
+            for res_id in old_values:
+                if not len(logged_uids) or uid in logged_uids:
+                    resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
+                    resource_name = resource_name and resource_name[0][1] or ''
+                    id = pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
+                    lines = []
+                    for field in old_values[res_id]:
+                        if old_values[res_id][field]:
+                            line = {
+                                      'name':field,
+                                      'old_value':old_values[res_id][field],
+                                      'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
+                                      }
+                            lines.append(line)
+                cr.commit()
+                self.create_log_line(cr, uid, id, model_object, lines)
             cr.close()
+            return res
+
+        if method in ('unlink'):
+            res_ids=args[0]
+            old_values={}
+            for res_id in res_ids:
+                old_values[res_id]=pool.get(model_object.model).read(cr, uid, res_id, [])
+
+            for res_id in res_ids:
+                if not len(logged_uids) or uid in logged_uids:
+                    resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
+                    resource_name = resource_name and resource_name[0][1] or ''
+                    id = pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
+                    lines = []
+                    for field in old_values[res_id]:
+                        if old_values[res_id][field]:
+                            line = {
+                                  'name':field,
+                                  'old_value':old_values[res_id][field],
+                                  'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
+                                  }
+                            lines.append(line)
+                    cr.commit()
+                    self.create_log_line(cr, uid, id, model_object, lines)
+            res = fct_src(db, uid, object, method, *args)
+            cr.close()
+            return res
+        cr.close()
 
     def execute(self, db, uid, object, method, *args, **kw):
         pool = pooler.get_pool(db)
@@ -335,7 +367,7 @@ class audittrail_objects_proxy(osv_pool):
                 return fct_src(db, uid, object, method, *args)
             if not len(obj_ids):
                 return fct_src(db, uid, object, method, *args)
-            rule_ids=pool.get('audittrail.rule').search(cr, uid, [('object_id', '=', obj_ids[0]), ('state', '=', 'subscribed')])
+            rule_ids = pool.get('audittrail.rule').search(cr, uid, [('object_id', '=', obj_ids[0]), ('state', '=', 'subscribed')])
             if not len(rule_ids):
                 return fct_src(db, uid, object, method, *args)
 
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 536ca78741e..dec025b7e98 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
+	
+	<!-- Audittrail Rule form -->
+	
 		<record model="ir.ui.view" id="view_audittrail_rule_form">
 			<field name="name">audittrail.rule.form</field>
 			<field name="model">audittrail.rule</field>
@@ -17,12 +20,15 @@
 					<field name="user_id" select="1" colspan="4"/>
 					<field name="state" select="1" readonly="1" />
 					<group colspan="2" col="2">
-						<button string="Subscribe" name="subscribe" type="object" states="draft"/>
-						<button string="UnSubscribe" name="unsubscribe" type="object" states="subscribed"/>
+						<button string="Subscribe" name="subscribe"
+							type="object" states="draft" />
+						<button string="UnSubscribe" name="unsubscribe"
+							type="object" states="subscribed" />
 					</group>
 				</form>
 			</field>
 		</record>
+		
 		<record model="ir.ui.view" id="view_audittrail_rule_tree">
 			<field name="name">audittrail.rule.tree</field>
 			<field name="model">audittrail.rule</field>
@@ -40,6 +46,9 @@
 				</tree>
 			</field>
 		</record>
+		
+	<!-- Action for audittrail rule -->
+		
 		<record model="ir.actions.act_window" id="action_audittrail_rule_tree">
 			<field name="name">Rules</field>
 			<field name="res_model">audittrail.rule</field>
@@ -48,8 +57,11 @@
 			<field name="view_mode">tree,form</field>
 			<!--<field name="view_id" ref="view_audittrail_rule_form" />-->
 		</record>
-		<menuitem name="Audittrails" id="menu_action_audittrail" parent="base.menu_administration"/>
-		<menuitem name="Rules" id="menu_action_audittrail_rule_tree" action="action_audittrail_rule_tree" parent="menu_action_audittrail"/>
+		
+		<menuitem name="Audittrails" id="menu_action_audittrail"
+			parent="base.menu_administration" />
+		<menuitem name="Rules" id="menu_action_audittrail_rule_tree"
+			action="action_audittrail_rule_tree" parent="menu_action_audittrail" />
 
 
 		<record model="ir.actions.act_window" id="action_audittrail_rule_tree_sub">
@@ -60,6 +72,8 @@
 			<field name="domain">[('state','=','subscribed')]</field>
 			<field name="filter" eval="True"/>
 		</record>
+		
+		<!-- AuditTrail Log form -->
 
 		<record model="ir.ui.view" id="view_audittrail_log_form">
 			<field name="name">audittrail.log.form</field>
@@ -73,23 +87,34 @@
 					<field name="user_id" select="1" readonly="1"/>
 					<field name="res_id" readonly="1"/>
 					<field name="name" readonly="1" select="1"/>
-					<field name="line_ids"  colspan="4" mode="tree,form" widget="one2many_list" readonly="1">
+					<field name="line_ids" colspan="4" mode="tree,form"
+						widget="one2many_list" readonly="1">
 						<form string="Log Lines">
-							<field name="field_id" colspan="4" readonly="1"/>
-							<newline/>
-							<field name="field_description" colspan="4" readonly="1"/>
-							<newline/>
-							<separator string="Old Value : " colspan="2"/>
-							<separator string="New Value : " colspan="2"/>
-							<newline/>
-							<field name="old_value" nolabel="1" colspan="2" readonly="1"/>
-							<field name="new_value" nolabel="1" colspan="2" readonly="1"/>
-							<newline/>
-							<separator string="Old Value Text : " colspan="2"/>
-							<separator string="New Value Text: " colspan="2"/>
-							<newline/>
-							<field name="old_value_text" nolabel="1" colspan="2" readonly="1"/>
-							<field name="new_value_text" nolabel="1" colspan="2" readonly="1"/>
+							<field name="field_id" colspan="4"
+								readonly="1" />
+							<newline />
+							<field name="field_description" colspan="4"
+								readonly="1" />
+							<newline />
+							<separator string="Old Value : "
+								colspan="2" />
+							<separator string="New Value : "
+								colspan="2" />
+							<newline />
+							<field name="old_value" nolabel="1"
+								colspan="2" readonly="1" />
+							<field name="new_value" nolabel="1"
+								colspan="2" readonly="1" />
+							<newline />
+							<separator string="Old Value Text : "
+								colspan="2" />
+							<separator string="New Value Text: "
+								colspan="2" />
+							<newline />
+							<field name="old_value_text" nolabel="1"
+								colspan="2" readonly="1" />
+							<field name="new_value_text" nolabel="1"
+								colspan="2" readonly="1" />
 						</form>
 
 						<tree string="Log Lines">
@@ -117,15 +142,19 @@
 			</field>
 		</record>
 
+<!--  Action for Audittrail Log  -->
+
 		<record model="ir.actions.act_window" id="action_audittrail_log_tree">
 			<field name="name">Logs</field>
 			<field name="res_model">audittrail.log</field>
 			<field name="view_type">form</field>
 		</record>
-		<menuitem name="Logs" id="menu_action_audittrail_log_tree" action="action_audittrail_log_tree" parent="menu_action_audittrail"/>
+		<menuitem name="Logs" id="menu_action_audittrail_log_tree"
+			action="action_audittrail_log_tree" parent="menu_action_audittrail" />
 
 		<!--  <wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>-->
-		<menuitem name="View Logs" id="menu_action_log_tree2" action="action_audittrail_view_log"  parent="menu_action_audittrail"/>
+		<menuitem name="View Logs" id="menu_action_log_tree2"
+			action="action_audittrail_view_log" parent="menu_action_audittrail" />
 
-</data>
+	</data>
 </openerp>
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
index 2e170f27200..67e8b3934cb 100644
--- a/addons/audittrail/wizard/audittrail_view_log.py
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -20,26 +20,21 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
-import netsvc
-import pooler
 import time
-import tools
-import wizard
 
 class audittrail_view_log(osv.osv_memory):
     
     _name = "audittrail.view.log"
     _description = "View Log"
-    _columns ={
-               'from':fields.datetime('Log From'),
-               'to':fields.datetime('Log To', required = True)
-               }
-    _defaults = {
-                 'to': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
+    _columns = {
+              'from':fields.datetime('Log From'),
+              'to':fields.datetime('Log To', required = True)
              }
+    _defaults = {
+             'to': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
+           }
     
-    def log_open_window(self, cr, uid, ids, context):
+    def log_open_window(self, cr, uid, ids, context=None):
         """
         Open Log  form from given date range..
         @param cr: the current row, from the database cursor,
@@ -47,26 +42,27 @@ class audittrail_view_log(osv.osv_memory):
         @param ids: List of audittrail view log’s IDs.
         @return: Dictionary of  audittrail log form on given date range.
         """
+        if not context:
+            context = {}
+            
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
         result = mod_obj._get_id(cr, uid, 'audittrail', 'action_audittrail_log_tree')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id])[0]
-        log_obj= self.pool.get(result['res_model'])
-        log_id = log_obj.search(cr, uid, [])
-        log_model=log_obj.read(cr, uid,log_id,['object_id'])  
-        for datas in self.read(cr, uid, ids):     
-            if not datas['from']:
-                if  datas['to'] <> time.strftime("%Y-%m-%d %H:%M:%S"):
-                    result['domain'] = str([('timestamp', '<',datas['to'])])                
+        log_obj = self.pool.get(result['res_model'])
+        #log_id = log_obj.search(cr, uid, [])
+        #log_model = log_obj.read(cr, uid, log_id, ['object_id'])  
+        #start Loop 
+        for datas in self.read(cr, uid, ids):
+            if not datas.get('from', None):
+                if  datas.get('to') <> time.strftime("%Y-%m-%d %H:%M:%S"):
+                    result['domain'] = str([('timestamp', '<', datas.get('to'))])                
                 else:
-                        pass
+                    pass
             else:
-                result['domain'] = str([('timestamp', '>',datas['from']),('timestamp', '<',datas['to'])])
+                result['domain'] = str([('timestamp', '>', datas.get('from', None)), ('timestamp', '<', datas.get('to'))])
+        #End Loop        
         return result
 
 audittrail_view_log()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index 87648c7e136..e32bc65de40 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
+    <!-- Audittrail View Log  wizard-->
+    
   		<record id="view_audittrail_view_log" model="ir.ui.view">
             <field name="name">audittrail.view.log.form</field>
             <field name="model">audittrail.view.log</field>
@@ -14,12 +17,16 @@
                     </group>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-open" string="Open Logs" name="log_open_window" type="object"/>
-                   </group>
+                    	<button icon="gtk-cancel" special="cancel"
+                    		string="Cancel" />
+                    	<button icon="gtk-open" string="Open Logs"
+                    		name="log_open_window" type="object" />
+                    </group>
                </form>
             </field>
   		</record>
+  
+  <!-- action for audittrail view log wizard -->
   		
         <record id="action_audittrail_view_log" model="ir.actions.act_window">
             <field name="name">View log</field>

From 7a129bfc5d3d323e7b21b477a9d14a641fcd34a4 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 17 Mar 2010 10:36:34 +0530
Subject: [PATCH 032/248] [IMP]:board: code optimization and apply doc string

bzr revid: atp@tinyerp.co.in-20100317050634-2zwf6ti18md6552h
---
 addons/board/__init__.py                      |  1 -
 addons/board/__terp__.py                      |  1 -
 addons/board/board.py                         | 33 +++++++++++--
 addons/board/board_view.xml                   | 37 +++++++++++----
 addons/board/wizard/board_menu_create.py      | 46 +++++++++++--------
 .../board/wizard/board_menu_create_view.xml   | 13 ++++--
 6 files changed, 97 insertions(+), 34 deletions(-)

diff --git a/addons/board/__init__.py b/addons/board/__init__.py
index 47e5ea7bd80..e169935ef84 100644
--- a/addons/board/__init__.py
+++ b/addons/board/__init__.py
@@ -23,4 +23,3 @@ import board
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/board/__terp__.py b/addons/board/__terp__.py
index 8476be95f4e..bafb4be1602 100644
--- a/addons/board/__terp__.py
+++ b/addons/board/__terp__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-
 {
     'name': 'Dashboard main module',
     'version': '1.0',
diff --git a/addons/board/board.py b/addons/board/board.py
index 29e8a3310b4..9634be28178 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -23,13 +23,18 @@ import time
 from osv import fields,osv
 
 class board_board(osv.osv):
+    """
+    Board
+    """
     _name = 'board.board'
-
+    _description = "Board"
+    
     def create_view(self, cr, uid, ids, context):
 
         board = self.pool.get('board.board').browse(cr, uid, ids, context)
         left = []
         right = []
+        #start Loop
         for line in board.line_ids:
             linestr = '<action string="%s" name="%d" colspan="4"' % (line.name, line.action_id.id)
             if line.height:
@@ -41,6 +46,7 @@ class board_board(osv.osv):
                 left.append(linestr)
             else:
                 right.append(linestr)
+        #End Loop
         arch = """<?xml version="1.0"?>
             <form string="My Board">
             <hpaned>
@@ -69,6 +75,9 @@ class board_board(osv.osv):
         return result
 
     def create(self, cr, user, vals, context=None):
+        if not context:
+            context = {}
+            
         if not 'name' in vals:
             return False
         id = super(board_board, self).create(cr, user, vals, context)
@@ -85,6 +94,9 @@ class board_board(osv.osv):
         return id
 
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if not context:
+            context={}
+            
         res = {}
         res = super(board_board, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
 
@@ -110,8 +122,13 @@ class board_board(osv.osv):
 
 board_board()
 
+
 class board_line(osv.osv):
+    """
+    Board Line
+    """
     _name = 'board.board.line'
+    _description = "Board Line"
     _order = 'position,sequence'
     _columns = {
         'name': fields.char('Title', size=64, required=True),
@@ -120,15 +137,21 @@ class board_line(osv.osv):
         'width': fields.integer('Width'),
         'board_id': fields.many2one('board.board', 'Dashboard', required=True, ondelete='cascade'),
         'action_id': fields.many2one('ir.actions.act_window', 'Action', required=True),
-        'position': fields.selection([('left','Left'),('right','Right')], 'Position', required=True)
+        'position': fields.selection([('left','Left'),
+                                      ('right','Right')], 'Position', required=True)
     }
     _defaults = {
         'position': lambda *args: 'left'
     }
 board_line()
 
+
 class board_note_type(osv.osv):
+    """
+    Board note Type
+    """
     _name = 'board.note.type'
+    _description = "NOte Type"
     _columns = {
         'name': fields.char('Note Type', size=64, required=True),
     }
@@ -141,8 +164,13 @@ def _type_get(self, cr, uid, context={}):
     res = [(r['name'], r['name']) for r in res]
     return res
 
+
 class board_note(osv.osv):
+    """
+    Board Note
+    """
     _name = 'board.note'
+    _description = "Note"
     _columns = {
         'name': fields.char('Subject', size=128, required=True),
         'note': fields.text('Note'),
@@ -157,4 +185,3 @@ class board_note(osv.osv):
 board_note()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 981a5521818..6bfafa9cee7 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
-<!--		<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>-->
+        <menuitem icon="terp-graph" id="base.reporting_menu"
+        	name="Reporting" sequence="8" />
+        <!--		<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>-->
+
         <record id="view_board_note_tree" model="ir.ui.view">
             <field name="name">board.note.tree</field>
             <field name="model">board.note</field>
@@ -13,6 +15,9 @@
                 </tree>
             </field>
         </record>
+        
+        <!--Board Note form  -->
+        
         <record id="view_board_note_form" model="ir.ui.view">
             <field name="name">board.note.form</field>
             <field name="model">board.note</field>
@@ -27,6 +32,9 @@
                 </form>
             </field>
         </record>
+   
+<!-- Action for Publish note Form -->        
+   
         <record id="action_view_board_note_form" model="ir.actions.act_window">
             <field name="name">Publish a note</field>
             <field name="res_model">board.note</field>
@@ -46,6 +54,9 @@
                 </tree>
             </field>
         </record>
+        
+<!-- Dashboard Definition form -->        
+        
         <record id="view_board_form" model="ir.ui.view">
             <field name="name">board.board.form</field>
             <field name="model">board.board</field>
@@ -54,7 +65,10 @@
             <field name="arch" type="xml">
                 <form string="Dashboard">
                     <field name="name" select="1"/>
-                    <button colspan="2" name="%(action_board_menu_create)d" string="Create Menu" type="action" icon="gtk-justify-fill"/>
+                    <button colspan="2"
+                    	name="%(action_board_menu_create)d"
+                    	string="Create Menu" type="action"
+                    	icon="gtk-justify-fill" />
                     <field colspan="4" name="line_ids">
                         <tree string="Dashboard View">
                             <field name="name"/>
@@ -67,19 +81,24 @@
                             <field name="sequence"/>
                             <field name="width"/>
                             <field name="height"/>
-                            <field name="action_id" domain="[('view_type','!=','tree')]"/>
+                            <field name="action_id"
+                            	domain="[('view_type','!=','tree')]" />
                             <field name="position"/>
                         </form>
                     </field>
                 </form>
             </field>
         </record>
+    
+    <!-- Action for DashBoard Definition form -->
+        
         <record id="action_view_board_list_form" model="ir.actions.act_window">
             <field name="name">Dashboard Definition</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
+        
         <menuitem
             id="base.next_id_50"
             name="Configuration"
@@ -90,10 +109,12 @@
             action="action_view_board_list_form"
             id="menu_view_board_form"
             parent="base.next_id_50" sequence="1"/>
-        <menuitem action="action_view_board_note_form" id="menu_view_board_note_form" parent="base.next_id_50"
-                  sequence="3"
-                  groups="base.group_system" />
-        <act_window context="{'view': active_id}" id="dashboard_open" multi="True" name="Open Dashboard" res_model="board.board" src_model="board.board"/>
+        <menuitem action="action_view_board_note_form"
+        	id="menu_view_board_note_form" parent="base.next_id_50"
+        	sequence="3" groups="base.group_system" />
+        <act_window context="{'view': active_id}" id="dashboard_open"
+        	multi="True" name="Open Dashboard" res_model="board.board"
+        	src_model="board.board" />
 
     </data>
 </openerp>
diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 5c5dc800ba1..4d4bd1e5ab0 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -27,12 +27,15 @@ class board_menu_create(osv.osv_memory):
     Create Menu
     """
     def check_views(self, cr, uid, context):
-        board = self.pool.get('board.board').browse(cr, uid, context['active_id'])
-        if not board.line_ids:
-            raise osv.except_osv(_('User Error!'), _('Please Insert Dashboard View(s) !'))    
-        return False
+        
+        data = context and context.get('active_id', False) or False
+        if data:
+            board = self.pool.get('board.board').browse(cr, uid, data)
+            if not board.line_ids:
+                raise osv.except_osv(_('User Error!'), _('Please Insert Dashboard View(s) !'))    
+            return False
     
-    def board_menu_create(self, cr, uid, ids, context):
+    def board_menu_create(self, cr, uid, ids, context=None):
         """
         Create Menu.
         @param cr: the current row, from the database cursor,
@@ -40,22 +43,29 @@ class board_menu_create(osv.osv_memory):
         @param ids: List of Board Menu Create's IDs
         @return : Dictionary {}.
         """
-        board = self.pool.get('board.board').browse(cr, uid, context['active_id'])
-        action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
-            'name': board.name,
-            'view_type':'form',
-            'view_mode':'form',
-            'res_model': 'board.board',
-            'view_id': board.view_id.id,
-            })
+        if not context:
+            context={}
+             
+        context_id = context and context.get('active_id', False) or False
+        if context_id:
+            board = self.pool.get('board.board').browse(cr, uid, context_id)
+            action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
+                'name': board.name,
+                'view_type':'form',
+                'view_mode':'form',
+                'res_model': 'board.board',
+                'view_id': board.view_id.id,
+                })
+        obj_menu = self.pool.get('ir.ui.menu') 
+        #start Loop    
         for data in self.read(cr, uid, ids):
-            self.pool.get('ir.ui.menu').create(cr, uid, {
-                'name': data['menu_name'],
-                'parent_id': data['menu_parent_id'],
+            obj_menu.create(cr, uid, {
+                'name': data.get('menu_name'),
+                'parent_id': data.get('menu_parent_id'),
                 'icon': 'STOCK_SELECT_COLOR',
                 'action': 'ir.actions.act_window,'+str(action_id)
-                }, context)
-        
+                }, context=context)
+        #End Loop
         return {}
     
     _name = "board.menu.create"
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index e33e6d1cd52..a4398d1a07d 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
+    <!--Board menu create wizard  -->
+    
   		<record id="view_board_menu_create" model="ir.ui.view">
             <field name="name">board.menu.create.form</field>
             <field name="model">board.menu.create</field>
@@ -14,13 +17,17 @@
                     </group>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-save" string="Create Menu" name="board_menu_create" type="object"/>
-                   </group>
+                    	<button icon="gtk-cancel" special="cancel"
+                    		string="Cancel" />
+                    	<button icon="gtk-save" string="Create Menu"
+                    		name="board_menu_create" type="object" />
+                    </group>
                </form>
             </field>
   		</record>
   		
+  <!-- Action for Board Menu create wizard. -->
+  
         <record id="action_board_menu_create" model="ir.actions.act_window">
             <field name="name">Create Board Menu</field>
             <field name="res_model">board.menu.create</field>

From 7889ade9a88008395f142a7318448a118b5891b2 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 17 Mar 2010 11:09:51 +0530
Subject: [PATCH 033/248] [IMP]:base_report_creator: code optimization and
 apply doc string

bzr revid: atp@tinyerp.co.in-20100317053951-1aaazuw2d0xk8bjk
---
 .../base_report_creator.py                    | 149 ++++++++++--------
 .../base_report_creator_view.xml              |  44 ++++--
 .../wizard/report_menu_create.py              |  54 +++----
 .../wizard/report_menu_create_view.xml        |  11 +-
 4 files changed, 146 insertions(+), 112 deletions(-)

diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index b9ddba5385c..95c2e8a76e6 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -25,29 +25,10 @@ import tools
 from osv import fields,osv,orm
 from tools.translate import _
 
-#class ir_model_fields(osv.osv):
-#   _inherit = 'ir.model.fields'
-#   def _get_models(self, cr, uid, model_name, level=1):
-#       if not level:
-#           return []
-#       result = [model_name]
-#       print model_name
-#       for field,data in self.pool.get(model_name).fields_get(cr, uid).items():
-#           if data.get('relation', False):
-#               result += self._get_models(cr, uid, data['relation'], level-1)
-#       return result
-#   def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None):
-#       if context and ('model_id' in context):
-#           model_name = self.pool.get("ir.model").browse(cr, uid, context['model_id'], context).model
-#           models = self._get_models(cr, uid, model_name, context.get('model_level',2))
-#           models = map(lambda x: self.pool.get('ir.model').search(cr, uid, [('model','=',x)])[0], models)
-#           args.append(('model_id','in',models))
-#           print args
-#       return super(ir_model_fields, self).search(cr, uid, args, offset, limit, order, context)
-#ir_model_fields()
-
-
 class report_creator(osv.osv):
+    """
+    Report Creator
+    """
     _name = "base_report_creator.report"
     _description = "Report"
     model_set_id = False
@@ -55,8 +36,11 @@ class report_creator(osv.osv):
     # Should request only used fields
     #
     def export_data(self, cr, uid, ids, fields_to_export, context=None):
+        if not context:
+            context = {}
         data_l = self.read(cr, uid, ids, ['sql_query'], context)
         final_datas =[]
+        #start Loop
         for i in data_l:
             datas = []
             for key,value in i.items():
@@ -67,6 +51,7 @@ class report_creator(osv.osv):
                 else:
                     datas.append(str(value))
             final_datas += [datas]
+            #End Loop
         return {'datas':final_datas}
         
     def fields_get(self, cr, user, fields=None, context=None):
@@ -74,8 +59,10 @@ class report_creator(osv.osv):
             return super(report_creator, self).fields_get(cr, user, fields, context)
         report = self.browse(cr, user, context['report_id'])
         models = {}
+        #Start Loop
         for model in report.model_ids:
             models[model.model] = self.pool.get(model.model).fields_get(cr, user, context=context)
+        #End Loop
         fields = {}
         i = 0
         for f in report.field_ids:
@@ -173,7 +160,7 @@ class report_creator(osv.osv):
         }
         return result
 
-    def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
+    def read(self, cr, user, ids, fields = None, context = None, load = '_classic_read'):
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).read(cr, user, ids, fields, context, load)
         ctx = context or {}
@@ -198,43 +185,39 @@ class report_creator(osv.osv):
         return res
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        context_id = context and context.get('report_id', False) or False
+        
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).search(cr, user, args, offset, limit, order, context, count)
-        report = self.browse(cr, user, context['report_id'])
-        i = 0
-        fields = {}
-        for f in report.field_ids:
-            if f.field_id.model:
-                fields['field'+str(i)] = (f.field_id.model, f.field_id.name)
-                i+=1
-            else:
-                fields['column_count'] = (False, 'Count')   
-        newargs = []
-        newargs2 = []
-        for a in args:
-            if fields[a[0]][0]:
-                res = self.pool.get(fields[a[0]][0])._where_calc(cr, user, [[fields[a[0]][1],a[1],a[2]]], active_test=False, context=context)
-                newargs+=res[0]
-                newargs2+=res[1]
-            else:
-                newargs += [("count(*) " + a[1] +" " + str(a[2]))]
-        ctx = context or {}
-        ctx['getid'] = True
-        report = self._sql_query_get(cr, user, [context['report_id']], 'sql_query', None, ctx, where_plus=newargs, limit=limit, offset=offset)
-        query = report[context['report_id']]
-        cr.execute(query, newargs2)
-        result = cr.fetchall()
-        return map(lambda x: x[0], result)
+        if context_id:
+            report = self.browse(cr, user, context_id)
+            i = 0
+            fields = {}
+            for f in report.field_ids:
+                if f.field_id.model:
+                    fields['field'+str(i)] = (f.field_id.model, f.field_id.name)
+                    i+=1
+                else:
+                    fields['column_count'] = (False, 'Count')   
+            newargs = []
+            newargs2 = []
+            for a in args:
+                if fields[a[0]][0]:
+                    res = self.pool.get(fields[a[0]][0])._where_calc(cr, user, [[fields[a[0]][1],a[1],a[2]]], active_test = False, context = context)
+                    newargs+=res[0]
+                    newargs2+=res[1]
+                else:
+                    newargs += [("count(*) " + a[1] +" " + str(a[2]))]
+            ctx = context or {}
+            ctx['getid'] = True
+            report = self._sql_query_get(cr, user, [context_id], 'sql_query', None, ctx, where_plus = newargs, limit=limit, offset=offset)
+            query = report[context_id]
+            cr.execute(query, newargs2)
+            result = cr.fetchall()
+            return map(lambda x: x[0], result)
 
     def _path_get(self,cr, uid, models, filter_ids=[]):
-#       ret_str = """   sale_order_line
-#   left join sale_order on (sale_order_line.order_id=sale_order.id)
-#   left join res_partner on (res_partner.id=sale_order.partner_id)"""
-#       where_list = []
-#       for filter_id in filter_ids:
-#           where_list.append(filter_id.expression)
-#       if where_list:
-#           ret_str+="\nwhere\n\t"+" and\n\t".join(where_list)
+        
         self.model_set_id = False
         model_dict = {}
         from_list = []
@@ -366,13 +349,26 @@ class report_creator(osv.osv):
 
     _columns = {
         'name': fields.char('Report Name',size=64, required=True),
-        'type': fields.selection([('list','Rows And Columns Report'),], 'Report Type',required=True),#('sum','Summation Report')
+        'type': fields.selection([('list', 'Rows And Columns Report'), ], 'Report Type', required=True),#('sum','Summation Report')
         'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the report without removing it."),
-        'view_type1': fields.selection([('form','Form'),('tree','Tree'),('graph','Graph'),('calendar','Calendar')], 'First View', required=True),
-        'view_type2': fields.selection([('','/'),('form','Form'),('tree','Tree'),('graph','Graph'),('calendar','Calendar')], 'Second View'),
-        'view_type3': fields.selection([('','/'),('form','Form'),('tree','Tree'),('graph','Graph'),('calendar','Calendar')], 'Third View'),
-        'view_graph_type': fields.selection([('pie','Pie Chart'),('bar','Bar Chart')], 'Graph Type', required=True),
-        'view_graph_orientation': fields.selection([('horz','Horizontal'),('vert','Vertical')], 'Graph Orientation', required=True),
+        'view_type1': fields.selection([('form','Form'),
+                                        ('tree','Tree'),
+                                        ('graph','Graph'),
+                                        ('calendar','Calendar')], 'First View', required=True),
+        'view_type2': fields.selection([('','/'),
+                                        ('form','Form'),
+                                        ('tree','Tree'),
+                                        ('graph','Graph'),
+                                        ('calendar','Calendar')], 'Second View'),
+        'view_type3': fields.selection([('','/'),
+                                        ('form','Form'),
+                                        ('tree','Tree'),
+                                        ('graph','Graph'),
+                                        ('calendar','Calendar')], 'Third View'),
+        'view_graph_type': fields.selection([('pie','Pie Chart'),
+                                             ('bar','Bar Chart')], 'Graph Type', required=True),
+        'view_graph_orientation': fields.selection([('horz','Horizontal'),
+                                                    ('vert','Vertical')], 'Graph Orientation', required=True),
         'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id','model_id', 'Reported Objects'),
         'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'),
         'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'),
@@ -449,6 +445,9 @@ class report_creator(osv.osv):
 report_creator()
 
 class report_creator_field(osv.osv):
+    """
+    Report Creator Field
+    """
     _name = "base_report_creator.report.fields"
     _description = "Display Fields"
     _rec_name = 'field_id'
@@ -457,9 +456,18 @@ class report_creator_field(osv.osv):
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of fields."),
         'field_id': fields.many2one('ir.model.fields', 'Field'),
         'report_id': fields.many2one('base_report_creator.report','Report', on_delete='cascade'),
-        'group_method': fields.selection([('group','Grouped'),('sum','Sum'),('min','Minimum'),('count','Count'),('max','Maximum'),('avg','Average')], 'Grouping Method', required=True),
-        'graph_mode': fields.selection([('','/'),('x','X Axis'),('y','Y Axis')], 'Graph Mode'),
-        'calendar_mode': fields.selection([('','/'),('date_start','Starting Date'),('date_end','Ending Date'),('date_delay','Delay'),('date_stop','End Date'),('color','Unique Colors')], 'Calendar Mode'),
+        'group_method': fields.selection([('group','Grouped'),
+                                          ('sum','Sum'),
+                                          ('min','Minimum'),
+                                          ('count','Count'),
+                                          ('max','Maximum'),
+                                          ('avg','Average')], 'Grouping Method', required=True),
+        'graph_mode': fields.selection([('','/'), 
+                                        ('x','X Axis'),
+                                        ('y','Y Axis')], 'Graph Mode'),
+        'calendar_mode': fields.selection([('','/'),
+                                           ('date_start','Starting Date'),
+                                           ('date_end','Ending Date'),('date_delay','Delay'),('date_stop','End Date'),('color','Unique Colors')], 'Calendar Mode'),
     }
     _defaults = {
         'group_method': lambda *args: 'group',
@@ -468,17 +476,20 @@ class report_creator_field(osv.osv):
 report_creator_field()
 
 class report_creator_filter(osv.osv):
+    """
+    Report Creator Filter
+    """
     _name = "base_report_creator.report.filter"
     _description = "Report Filters"
     _columns = {
         'name': fields.char('Filter Name',size=64, required=True),
-        'expression': fields.text('Value', required=True,help='Provide an expression for the field based on which you want to filter the records.\n e.g. res_partner.id=3'),
-        'report_id': fields.many2one('base_report_creator.report','Report', on_delete='cascade'),
-        'condition' : fields.selection([('and','AND'),('or','OR')], 'Condition')
+        'expression': fields.text('Value', required=True, help='Provide an expression for the field based on which you want to filter the records.\n e.g. res_partner.id=3'),
+        'report_id': fields.many2one('base_report_creator.report', 'Report', on_delete='cascade'),
+        'condition' : fields.selection([('and','AND'),
+                                        ('or','OR')], 'Condition')
     }
     _defaults = {
         'condition': lambda *args: 'and',
     }
 report_creator_filter()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 1d606b93ec4..a69aed42048 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -27,6 +27,9 @@
             </tree>
         </field>
     </record>
+
+<!-- Report Creator form -->
+    
     <record model="ir.ui.view" id="base_report_creator_form">
         <field name="name">base_report_creator.report.form</field>
         <field name="model">base_report_creator.report</field>
@@ -41,7 +44,9 @@
                     <field name="model_ids" colspan="4" context="{'model_ids':model_ids}"/>
                     <separator string="State"  colspan="4"/>
                     <field name="state"/>
-                    <button string="Create Menu" name="%(action_report_menu_create)d" type="action" colspan="2" icon="gtk-justify-fill"/>
+                    <button string="Create Menu"
+                    	name="%(action_report_menu_create)d" type="action"
+                    	colspan="2" icon="gtk-justify-fill" />
                 </page><page string="View parameters">
                     <separator string="Used View" colspan="4"/>
                     <field name="view_type1"/>
@@ -54,12 +59,13 @@
                     <field name="field_ids" nolabel="1" colspan="4">
                         <form string="Fields">
                             <field name="sequence"/>
-                            <field name="field_id" domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []">
-                                <tree string="Field List">
-                                    <field name="model_id"/>
-                                    <field name="name"/>
-                                    <field name="field_description"/>
-                                </tree>
+                            <field name="field_id"
+                            	domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []">
+                            	<tree string="Field List">
+                            		<field name="model_id" />
+                            		<field name="name" />
+                            		<field name="field_description" />
+                            	</tree>
                             </field>
                             <field name="group_method"/>
                             <field name="graph_mode"/>
@@ -67,14 +73,18 @@
                         </form>
                         <tree editable="bottom" string="Fields to Display">
                             <field name="sequence"/>
-                            <field name="field_id" domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []" attrs="{'required':[('group_method','!=','count')]}"/>
+                            <field name="field_id"
+                            	domain="parent.model_ids and [('model_id','in',parent.model_ids[0][2]),('ttype','&lt;&gt;','many2many'),('ttype','&lt;&gt;','one2many')] or []"
+                            	attrs="{'required':[('group_method','!=','count')]}" />
                             <field name="group_method"/>
                             <field name="graph_mode"/>
                             <field name="calendar_mode"/>
                         </tree>
                     </field>
                 </page><page string="Filters on Fields">
-                    <button string="Add filter" name="%(wizard_set_filter_fields)d" type="action" icon="gtk-add"/>
+                    <button string="Add filter"
+                    	name="%(wizard_set_filter_fields)d" type="action"
+                    	icon="gtk-add" />
                     <field name="filter_ids" nolabel="1" colspan="4">
                         <tree string="Filters">
                             <field name="name"/>
@@ -87,8 +97,10 @@
                         </form>
                     </field>
                     <separator string="Legend" colspan="4"/>
-					<label string="Use %%(uid)s to filter by the connected user" align="0.0"/>
-                </page><page string="Security">
+                    <label
+                    	string="Use %%(uid)s to filter by the connected user"
+                    	align="0.0" />
+</page><page string="Security">
                     <separator string="Authorized Groups (empty for all)" colspan="4"/>
                     <field name="group_ids" colspan="4" nolabel="1"/>
                 </page><page string="SQL Query">
@@ -98,15 +110,20 @@
             </form>
         </field>
     </record>
+    
+ <!-- Action for Report creator form -->
+    
     <record model="ir.actions.act_window" id="base_report_creator_action">
     	<field name="name">Custom Report</field>
         <field name="res_model">base_report_creator.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
+    
     <menuitem
         name="Custom Reports" id="base.menu_custom_reports"
         action="base_report_creator_action" parent="base.reporting_menu" sequence="1"/>
+        
     <menuitem
         name="Custom Reports" parent="base.next_id_50"
         id="menu_base_report_creator_action_config"
@@ -122,10 +139,12 @@
             </tree>
         </field>
     </record>
+    
     <record model="ir.actions.act_window" id="base_report_creator_action_tree">
         <field name="res_model">base_report_creator.report</field>
         <field name="view_type">tree</field>
     </record>
+    
     <menuitem
         name="Custom Reports" parent="base.menu_custom_reports"
         id="menu_base_report_creator_action"
@@ -143,6 +162,7 @@
         <field name="value" eval="'ir.actions.wizard,%d'%wizard_report_open"/>
         <field name="object" eval="True"/>
     </record>
+    
     <record model="ir.values" id="ir_open_report_multi">
         <field name="key2" eval="'client_action_multi'"/>
         <field name="model" eval="'base_report_creator.report'"/>
@@ -151,7 +171,5 @@
         <field name="object" eval="True"/>
     </record>
 
-
-
     </data>
 </openerp>
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index 38821a81797..4bf284e4d38 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -19,14 +19,7 @@
 #
 ##############################################################################
 
-
 from osv import fields, osv
-from tools.translate import _
-import netsvc
-import pooler
-import time
-import tools
-import wizard
 
 class report_menu_create(osv.osv_memory):
     """
@@ -34,40 +27,47 @@ class report_menu_create(osv.osv_memory):
     """
     _name = "report.menu.create"
     _description = "Menu Create"
-    _columns ={
+    _columns = {
               'menu_name':fields.char('Menu Name', size=64, required=True),
               'menu_parent_id':fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
                }
     
-    def report_menu_create(self, cr, uid, ids, context):
+    def report_menu_create(self, cr, uid, ids, context=None):
         """
         Create Menu.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Report Menu Create's IDs
+        @return : Dictionary {}.
         """
-        board = self.pool.get('base_report_creator.report').browse(cr, uid, context['active_id'])
-        view = board.view_type1
-        if board.view_type2:
-            view+=','+board.view_type2
-        if board.view_type3:
-            view+=','+board.view_type3
-        action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
-            'name': board.name,
-            'view_type':'form',
-            'view_mode':view,
-            'context': "{'report_id':%d}" % (board.id,),
-            'res_model': 'base_report_creator.report'
-            })
+        if not context:
+            context={}
+        context_id = context and context.get('active_id', False) or False
+        if context_id:
+            board = self.pool.get('base_report_creator.report').browse(cr, uid, context_id)
+            view = board.view_type1
+            if board.view_type2:
+                view+=','+board.view_type2
+            if board.view_type3:
+                view+=','+board.view_type3
+            action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
+                'name': board.name,
+                'view_type':'form',
+                'view_mode':view,
+                'context': "{'report_id':%d}" % (board.id,),
+                'res_model': 'base_report_creator.report'
+                })
+        obj_menu = self.pool.get('ir.ui.menu')
+        #start Loop
         for data in self.read(cr, uid, ids):
-            self.pool.get('ir.ui.menu').create(cr, uid, {
-                'name': data['menu_name'],
-                'parent_id': data['menu_parent_id'],
+            obj_menu.create(cr, uid, {
+                'name': data.get('menu_name'),
+                'parent_id': data.get('menu_parent_id'),
                 'icon': 'STOCK_SELECT_COLOR',
                 'action': 'ir.actions.act_window,'+str(action_id)
-                }, context)
+                }, context=context)
             return {}
-    
+        #End Loop
 report_menu_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_creator/wizard/report_menu_create_view.xml b/addons/base_report_creator/wizard/report_menu_create_view.xml
index dd8ecb441c4..a484180ea06 100644
--- a/addons/base_report_creator/wizard/report_menu_create_view.xml
+++ b/addons/base_report_creator/wizard/report_menu_create_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
+    <!-- Create Menu For report -->
+    
   		<record id="view_report_menu_create" model="ir.ui.view">
             <field name="name">report.menu.create.form</field>
             <field name="model">report.menu.create</field>
@@ -14,9 +17,11 @@
                     </group>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-save" string="Create Menu" name="report_menu_create" type="object"/>
-                   </group>
+                    	<button icon="gtk-cancel" special="cancel"
+                    		string="Cancel" />
+                    	<button icon="gtk-save" string="Create Menu"
+                    		name="report_menu_create" type="object" />
+                    </group>
                </form>
             </field>
   		</record>

From 4ce432a55c47cf75c6923c0c9114f44a935c730e Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 17 Mar 2010 11:12:43 +0530
Subject: [PATCH 034/248] [IMP]:base_calendar: solved problem of integer
 argument in modify all event

bzr revid: atp@tinyerp.co.in-20100317054243-i4epv4uhti71wknm
---
 addons/base_calendar/base_calendar.py | 30 +++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 9835217c0e3..b339b739642 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -51,6 +51,7 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None):
     return re_dates
 
 def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
+    
     if base_calendar_id and isinstance(base_calendar_id, (str, unicode)):
         res = base_calendar_id.split('-')
         if len(res) >= 2:
@@ -832,19 +833,22 @@ rule or repeating pattern for anexception to a recurrence set"),
         new_id = self.copy(cr, uid, event_id, default=defaults, context=context)
         return new_id
 
-    def modify_all(self, cr, uid, event_id, defaults, context=None, *args):
-        event_id = base_calendar_id2real_id(event_id)
-        defaults.pop('id')
-        defaults.update({'table': self._table})
-
-        qry = "UPDATE %(table)s set name='%(name)s', \
-                        date='%(date)s', date_deadline='%(date_deadline)s'"
-        if defaults.get('alarm_id'):
-            qry += ", alarm_id=%(alarm_id)s"
-        if defaults.get('location'):
-            qry += ", location='%(location)s'"
-        qry += "WHERE id=%s" % (event_id)
-        cr.execute(qry % (defaults))
+    def modify_all(self, cr, uid, event_ids, defaults, context=None, *args):
+        #start Loop
+        for event_id in event_ids:
+            event_id = base_calendar_id2real_id(event_id)
+            defaults.pop('id')
+            defaults.update({'table': self._table})
+    
+            qry = "UPDATE %(table)s set name='%(name)s', \
+                            date='%(date)s', date_deadline='%(date_deadline)s'"
+            if defaults.get('alarm_id'):
+                qry += ", alarm_id=%(alarm_id)s"
+            if defaults.get('location'):
+                qry += ", location='%(location)s'"
+            qry += "WHERE id=%s" % (event_id)
+            cr.execute(qry % (defaults))
+            #End Loop
         return True
 
     def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100):

From 081026fa6ada26a99e87c1eb6c6427a7cc1eeee5 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 17 Mar 2010 12:31:01 +0530
Subject: [PATCH 035/248] [IMP]: crm: Improvment in lead to opportunity and
 opportunity to meeting wizards

bzr revid: rpa@tinyerp.com-20100317070101-4zde41b9icv19fdt
---
 addons/crm/wizard/crm_lead_to_opportunity.py  | 55 ++++++++++---------
 .../crm/wizard/crm_opportunity_to_meeting.py  | 49 +++++++++--------
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 3604c025d0a..7829a02f3ab 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -50,12 +50,13 @@ class crm_lead2opportunity(osv.osv_memory):
         @return : Dictionary value for created Opportunity form
         """
         value = {}
-        record_ids = context and context.get('active_ids', []) or []
-        if record_ids:
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
             lead_obj = self.pool.get('crm.lead')
             opp_obj = self. pool.get('crm.opportunity')
             data_obj = self.pool.get('ir.model.data')
-
+            
+            # Get Opportunity views
             result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
             res = data_obj.read(cr, uid, result, ['res_id'])
             id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
@@ -66,32 +67,32 @@ class crm_lead2opportunity(osv.osv_memory):
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
         for this in self.browse(cr, uid, ids, context=context):
-            for case in lead_obj.browse(cr, uid, record_ids, context=context):
-                new_opportunity_id = opp_obj.create(cr, uid, {
-                        'name': this.name, 
-                        'planned_revenue': this.planned_revenue, 
-                        'probability': this.probability, 
-                        'partner_id': case.partner_id and case.partner_id.id or False , 
-                        'section_id': case.section_id and case.section_id.id or False, 
-                        'description': case.description or False, 
-                        'date_deadline': case.date_deadline or False, 
-                        'partner_address_id': case.partner_address_id and \
-                                        case.partner_address_id.id or False , 
-                        'priority': case.priority, 
-                        'phone': case.phone, 
-                        'email_from': case.email_from
-                    })
+            lead = lead_obj.browse(cr, uid, record_id, context=context)
+            new_opportunity_id = opp_obj.create(cr, uid, {
+                    'name': this.name, 
+                    'planned_revenue': this.planned_revenue, 
+                    'probability': this.probability, 
+                    'partner_id': lead.partner_id and lead.partner_id.id or False , 
+                    'section_id': lead.section_id and lead.section_id.id or False, 
+                    'description': lead.description or False, 
+                    'date_deadline': lead.date_deadline or False, 
+                    'partner_address_id': lead.partner_address_id and \
+                                    lead.partner_address_id.id or False , 
+                    'priority': lead.priority, 
+                    'phone': lead.phone, 
+                    'email_from': lead.email_from
+                })
 
-                new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
-                vals = {
-                        'partner_id': this.partner_id and this.partner_id.id or False, 
-                        }
-                if not case.opportunity_id:
-                        vals.update({'opportunity_id' : new_opportunity.id})
+            new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
+            vals = {
+                    'partner_id': this.partner_id and this.partner_id.id or False, 
+                    }
+            if not lead.opportunity_id:
+                    vals.update({'opportunity_id' : new_opportunity.id})
 
-                lead_obj.write(cr, uid, [case.id], vals)
-                lead_obj.case_close(cr, uid, [case.id])
-                opp_obj.case_open(cr, uid, [new_opportunity_id])
+            lead_obj.write(cr, uid, [lead.id], vals)
+            lead_obj.case_close(cr, uid, [lead.id])
+            opp_obj.case_open(cr, uid, [new_opportunity_id])
 
             value = {
                     'name': _('Opportunity'), 
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting.py b/addons/crm/wizard/crm_opportunity_to_meeting.py
index 23b8b135833..9162edf28ff 100644
--- a/addons/crm/wizard/crm_opportunity_to_meeting.py
+++ b/addons/crm/wizard/crm_opportunity_to_meeting.py
@@ -50,11 +50,12 @@ class crm_opportunity2meeting(osv.osv_memory):
         @return : Dictionary value for created Meeting view
         """
         value = {}
-        record_ids = context and context.get('active_ids', []) or []
-        if record_ids:
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
             opp_obj = self.pool.get('crm.opportunity')
             data_obj = self.pool.get('ir.model.data')
-
+            
+            # Get meeting views
             result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
             res = data_obj.read(cr, uid, result, ['res_id'])
             id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
@@ -68,28 +69,28 @@ class crm_opportunity2meeting(osv.osv_memory):
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
         for this in self.browse(cr, uid, ids, context=context):
-            for opp in opp_obj.browse(cr, uid, record_ids, context=context):
-                context = {
-                            'default_opportunity_id': opp.id, 
-                            'default_partner_id': opp.partner_id and opp.partner_id.id or False, 
-                            'default_section_id': opp.section_id and opp.section_id.id or False, 
-                            'default_email_from': opp.email_from, 
-                            'default_state': 'open', 
-                            'default_name': opp.name
-                        }
-                        
-                value = {
-                    'name': _('Meetings'), 
-                    'domain' : "[('user_id','=',%s)]" % (uid), 
-                    'context': context, 
-                    'view_type': 'form', 
-                    'view_mode': 'calendar,form,tree', 
-                    'res_model': 'crm.meeting', 
-                    'view_id': False, 
-                    'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')], 
-                    'type': 'ir.actions.act_window', 
-                    'search_view_id': res['res_id']
+            opp = opp_obj.browse(cr, uid, record_id, context=context)
+            context = {
+                        'default_opportunity_id': opp.id, 
+                        'default_partner_id': opp.partner_id and opp.partner_id.id or False, 
+                        'default_section_id': opp.section_id and opp.section_id.id or False, 
+                        'default_email_from': opp.email_from, 
+                        'default_state': 'open', 
+                        'default_name': opp.name
                     }
+                    
+            value = {
+                'name': _('Meetings'), 
+                'domain' : "[('user_id','=',%s)]" % (uid), 
+                'context': context, 
+                'view_type': 'form', 
+                'view_mode': 'calendar,form,tree', 
+                'res_model': 'crm.meeting', 
+                'view_id': False, 
+                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')], 
+                'type': 'ir.actions.act_window', 
+                'search_view_id': res['res_id']
+                }
 
         return value
 

From 9336a7a278b5108e4c50d5b8a2f96f2a6380cc45 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Mar 2010 14:06:08 +0530
Subject: [PATCH 036/248] [IMP]: wiki: code optimization and apply csv file

bzr revid: ksa@tinyerp.co.in-20100317083608-6qoqjd0zdsfna8up
---
 addons/wiki/security/ir.model.access.csv      |   4 +
 addons/wiki/wiki.py                           | 126 ++++++++++++------
 addons/wiki/wiki_view.xml                     |  23 +++-
 addons/wiki/wizard/show_diff.py               |  10 ++
 addons/wiki/wizard/wiki_create_menu.py        |  36 ++---
 addons/wiki/wizard/wiki_create_menu_view.xml  |   4 +-
 addons/wiki/wizard/wiki_make_index.py         |  18 +--
 addons/wiki/wizard/wiki_make_index_view.xml   |   6 +-
 addons/wiki/wizard/wiki_wiki_help_open.py     |   3 +-
 .../wiki/wizard/wiki_wiki_help_open_view.xml  |   6 +-
 addons/wiki/wizard/wiki_wiki_page_open.py     |   6 +-
 .../wiki/wizard/wiki_wiki_page_open_view.xml  |   6 +-
 12 files changed, 165 insertions(+), 83 deletions(-)

diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv
index acb871141ff..9ddfa27eee2 100644
--- a/addons/wiki/security/ir.model.access.csv
+++ b/addons/wiki/security/ir.model.access.csv
@@ -6,3 +6,7 @@
 "wiki_groups_link","wiki.groups.link","model_wiki_groups_link","base.group_system",1,1,1,1
 "wiki_wiki_history","wiki.wiki.history","model_wiki_wiki_history","base.group_user",1,0,1,0
 "wiki_wizard_wiki_history_show_diff","wizard.wiki.history.show_diff","model_wizard_wiki_history_show_diff","base.group_user",1,1,1,1
+"wiki_wiki_page_open","wiki.wiki.page.open","model_wiki_wiki_page_open","base.group_user",1,1,1,1
+"wiki_create_menu","wiki.create.menu","model_wiki_create_menu","base.group_user",1,1,1,1
+"wiki_wiki_help_open","wiki.wiki.help.open","model_wiki_wiki_help_open","base.group_user",1,1,1,1
+"wiki_make_index","wiki.make.index","model_wiki_make_index","base.group_user",1,1,1,1
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 70511d3e56f..80c80ae7fe6 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -27,71 +27,89 @@
 ##############################################################################
 
 from osv import fields, osv
-import time
-from StringIO import StringIO
-from HTMLParser import HTMLParser
+import difflib
 
 class Wiki(osv.osv):
-    _name="wiki.wiki"
+    """ wiki """
+
+    _name = "wiki.wiki"
+
 Wiki()
 
 class WikiGroup(osv.osv):
     """ Wiki Groups """
+
     _name = "wiki.groups"
-    _description="Wiki Groups"
+    _description = "Wiki Groups"
     _order = 'name'
-    _columns={
+
+    _columns = {
        'name':fields.char('Wiki Group', size=256, select=True, required=True),
        'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'),
        'notes':fields.text("Description"),
        'create_date':fields.datetime("Created Date", select=True),
        'template': fields.text('Wiki Template'),
        'section': fields.boolean("Make Section ?"),
-       'method':fields.selection([('list','List'),('page','Home Page'),('tree','Tree')],'Display Method'),
+       'method':fields.selection([('list', 'List'), ('page', 'Home Page'), \
+                                   ('tree', 'Tree')], 'Display Method'),
        'home':fields.many2one('wiki.wiki', 'Pages'),
     }
+
     _defaults = {
         'method': lambda *a: 'page',
     }
+
 WikiGroup()
 
 
 class GroupLink(osv.osv):
     """ Apply Group Link """
+
     _name = "wiki.groups.link"
-    _description="Wiki Groups Links"
+    _description = "Wiki Groups Links"
     _rec_name = 'action_id'
-    _columns={
-       'group_id':fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
+
+    _columns = {
+       'group_id': fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
        'action_id': fields.many2one('ir.ui.menu', 'Menu')
     }
+
 GroupLink()
 
 
 class Wiki(osv.osv):
-    _inherit="wiki.wiki"
-    _description="Wiki Page"
+    """ Wiki Page """
+
+    _inherit = "wiki.wiki"
+    _description = "Wiki Page"
     _order = 'section,create_date desc'
-    _columns={
-        'name':fields.char('Title', size=256, select=True, required=True),
-        'write_uid':fields.many2one('res.users',"Last Author"),
-        'text_area':fields.text("Content"),
-        'create_uid':fields.many2one('res.users','Author', select=True),
-        'create_date':fields.datetime("Created on", select=True),
-        'write_date':fields.datetime("Modification Date", select=True),
-        'tags':fields.char('Tags', size=1024),
-        'history_id':fields.one2many('wiki.wiki.history','wiki_id','History Lines'),
-        'minor_edit':fields.boolean('Minor edit', select=True),
-        'summary':fields.char('Summary',size=256),
+
+    _columns = {
+        'name': fields.char('Title', size=256, select=True, required=True),
+        'write_uid': fields.many2one('res.users',"Last Author"),
+        'text_area': fields.text("Content"),
+        'create_uid': fields.many2one('res.users','Author', select=True),
+        'create_date': fields.datetime("Created on", select=True),
+        'write_date': fields.datetime("Modification Date", select=True),
+        'tags': fields.char('Tags', size=1024),
+        'history_id': fields.one2many('wiki.wiki.history','wiki_id','History Lines'),
+        'minor_edit': fields.boolean('Minor edit', select=True),
+        'summary': fields.char('Summary',size=256),
         'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"),
-        'group_id':fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
-        'toc':fields.boolean('Table of Contents'),
+        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
+        'toc': fields.boolean('Table of Contents'),
         'review': fields.boolean('Need Review'),
-        'parent_id':fields.many2one('wiki.wiki', 'Parent Page'),
-        'child_ids':fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
+        'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
+        'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
     }
 
     def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of wiki page’s IDs
+            @return : dictionay of open wiki page on give page section  """
+
         if (not group_id) or content:
             return {}
         grp = self.pool.get('wiki.groups').browse(cr, uid, group_id)
@@ -111,14 +129,24 @@ class Wiki(osv.osv):
                 'section': section
             }
         }
+
     def copy_data(self, cr, uid, id, default=None, context=None):
-        return super(Wiki, self).copy_data(cr, uid, id, {'wiki_id':False}, context)
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param id: Give wiki page's ID """
+
+        return super(Wiki, self).copy_data(cr, uid, id, {'wiki_id': False}, context)
 
     def create(self, cr, uid, vals, context=None):
-	id = super(Wiki,self).create(cr, uid, vals, context)
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks, """
+
+        id = super(Wiki,self).create(cr, uid, vals, context)
         history = self.pool.get('wiki.wiki.history')
-	if vals.get('text_area'):
-	    res = {
+        if vals.get('text_area'):
+            res = {
                 'minor_edit':vals.get('minor_edit', True),
                 'text_area':vals.get('text_area',''),
                 'write_uid':uid,
@@ -126,10 +154,14 @@ class Wiki(osv.osv):
                 'summary':vals.get('summary','')
             }
             history.create(cr, uid, res)
-	return id
+        return id
 
     def write(self, cr, uid, ids, vals, context=None):
-        result = super(Wiki,self).write(cr, uid, ids, vals, context)
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks, """
+
+        result = super(Wiki, self).write(cr, uid, ids, vals, context)
         history = self.pool.get('wiki.wiki.history')
         if vals.get('text_area'):
             for id in ids:
@@ -148,24 +180,30 @@ Wiki()
 
 class History(osv.osv):
     """ Wiki History """
-    _name="wiki.wiki.history"
-    _description="Wiki History"
-    _rec_name="date_time"
+
+    _name = "wiki.wiki.history"
+    _description = "Wiki History"
+    _rec_name = "date_time"
     _order = 'id DESC'
-    _columns={
-      'create_date':fields.datetime("Date",select=True),
-      'text_area':fields.text("Text area"),
-      'minor_edit':fields.boolean('This is a major edit ?',select=True),
-      'summary':fields.char('Summary',size=256, select=True),
-      'write_uid':fields.many2one('res.users',"Modify By", select=True),
-      'wiki_id':fields.many2one('wiki.wiki','Wiki Id', select=True)
+
+    _columns = {
+      'create_date': fields.datetime("Date",select=True),
+      'text_area': fields.text("Text area"),
+      'minor_edit': fields.boolean('This is a major edit ?',select=True),
+      'summary': fields.char('Summary',size=256, select=True),
+      'write_uid': fields.many2one('res.users',"Modify By", select=True),
+      'wiki_id': fields.many2one('wiki.wiki','Wiki Id', select=True)
     }
+
     _defaults = {
         'write_uid': lambda obj,cr,uid,context: uid,
     }
 
     def getDiff(self, cr, uid, v1, v2, context={}):
-        import difflib
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks, """
+
         history_pool = self.pool.get('wiki.wiki.history')
         text1 = history_pool.read(cr, uid, [v1], ['text_area'])[0]['text_area']
         text2 = history_pool.read(cr, uid, [v2], ['text_area'])[0]['text_area']
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 07f89257dbd..a4189ec6a8f 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -14,7 +14,7 @@
        <menuitem id="base.menu_document2" name="Collaborative Content"
        	parent="base.menu_document" />
 
-<!--  Wiki Groups  -->
+<!--  Wiki Groups Tree view -->
 
        <record model="ir.ui.view" id="wiki_group_tree">
             <field name="name">wiki.groups.tree</field>
@@ -26,6 +26,9 @@
                 </tree>
             </field>
         </record>
+
+<!--  Wiki Groups Form view -->
+
         <record model="ir.ui.view" id="wiki_group_form">
             <field name="name">wiki.groups.form</field>
             <field name="model">wiki.groups</field>
@@ -56,6 +59,8 @@
             </field>
         </record>
 
+<!--  Wiki Groups Action  -->
+
         <record model="ir.actions.act_window" id="action_wiki_groups">
             <field name="name">Wikis</field>
             <field name="res_model">wiki.groups</field>
@@ -74,7 +79,7 @@
             <field name="view_type">tree</field>
         </record>
 
-<!-- wiki  -->
+<!-- wiki Tree view For child -->
 
         <record id="view_wiki_tree_childs" model="ir.ui.view">
             <field name="name">wiki.wiki.tree.childs</field>
@@ -93,6 +98,8 @@
             </field>
         </record>
 
+<!-- wiki Tree view  -->
+
         <record model="ir.ui.view" id="view_wiki_tree">
             <field name="name">wiki.wiki.tree</field>
             <field name="model">wiki.wiki</field>
@@ -109,6 +116,8 @@
             </field>
         </record>
 
+<!-- wiki Form view  -->
+
         <record model="ir.ui.view" id="view_wiki_form">
             <field name="name">wiki.wiki.form</field>
             <field name="model">wiki.wiki</field>
@@ -134,6 +143,8 @@
             </field>
         </record>
 
+<!-- wiki Search view  -->
+
 		<record id="view_wiki_filter" model="ir.ui.view">
             <field name="name">wiki.wiki.search</field>
             <field name="model">wiki.wiki</field>
@@ -181,7 +192,7 @@
             <field name="filter" eval="True"/>
         </record>
 
-<!-- History  -->
+<!-- History Tree view -->
 
         <record model="ir.ui.view" id="view_wiki_history_tree">
             <field name="name">wiki.wiki.history.tree</field>
@@ -197,6 +208,8 @@
             </field>
         </record>
 
+<!-- History Form view  -->
+
         <record model="ir.ui.view" id="wiki_history_form">
             <field name="name">wiki.wiki.history.form</field>
             <field name="model">wiki.wiki.history</field>
@@ -212,6 +225,8 @@
             </field>
         </record>
 
+<!-- History Action  -->
+
         <record model="ir.actions.act_window" id="action_history">
             <field name="name">All Page Histories</field>
             <field name="res_model">wiki.wiki.history</field>
@@ -235,7 +250,7 @@
             <field name="key2">tree_but_open</field>
             <field name="model">wiki.groups</field>
             <field name="name">Search a Page</field>
-            <field eval="'ir.actions.wizard,%d'%wizard_open_page" name="value"/>
+            <field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
             <field eval="True" name="object"/>
         </record>
     </data>
diff --git a/addons/wiki/wizard/show_diff.py b/addons/wiki/wizard/show_diff.py
index d77130f2aed..18fd4f755dc 100644
--- a/addons/wiki/wizard/show_diff.py
+++ b/addons/wiki/wizard/show_diff.py
@@ -22,9 +22,16 @@
 from osv import fields,osv
 
 class showdiff(osv.osv_memory):
+    """ Disp[ay Difference for History """
+
     _name = 'wizard.wiki.history.show_diff'
 
     def _get_diff(self, cr, uid, ctx):
+
+        """ @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        """
+
         history = self.pool.get('wiki.wiki.history')
         ids = ctx.get('active_ids')
         diff = ""
@@ -46,8 +53,11 @@ class showdiff(osv.osv_memory):
     _columns = {
         'diff': fields.text('Diff'),
     }
+
     _defaults = {
         'diff': _get_diff
     }
+
 showdiff()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index 822e3a2aaf5..833ecb6436d 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -23,8 +23,10 @@ from osv import fields, osv
 
 class wiki_create_menu(osv.osv_memory):
     """ Create Menu """
+
     _name = "wiki.create.menu"
     _description = "Wizard Create Menu"
+
     _columns = {
         'menu_name': fields.char('Menu Name', size=256, select=True, required=True),
         'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
@@ -32,6 +34,7 @@ class wiki_create_menu(osv.osv_memory):
     }
 
     def wiki_menu_create(self, cr, uid, ids, context):
+
         """ Create Menu On the base of Group id and Action id
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -39,23 +42,22 @@ class wiki_create_menu(osv.osv_memory):
 
         """
         mod_obj = self.pool.get('ir.model.data')
-        action_id = mod_obj._get_id(cr, uid, 'wiki', 'action_view_wiki_wiki_page_open')
-        for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
-            for menu in self.browse(cr, uid, ids):
-                menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
-                'name':menu.menu_name,
-                'parent_id':menu.menu_parent_id.id,
-                'icon': 'STOCK_DIALOG_QUESTION',
-                'action': 'ir.actions.act_window,'+ str(action_id)
-                }, context)
-                home = menu.page.id
-                group_id = menu.id
-                res = {
-                'home':home,
-                }
-                self.pool.get('wiki.groups').write(cr, uid, ids, res)
-                self.pool.get('wiki.groups.link').create(cr, uid,
-                                    {'group_id': group_id, 'action_id':menu_id})
+        action_id = mod_obj._get_id(cr, uid, 'wiki','action_view_wiki_wiki_page_open')
+        for menu in self.browse(cr, uid, ids):
+            menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
+            'name':menu.menu_name,
+            'parent_id':menu.menu_parent_id.id,
+            'icon': 'STOCK_DIALOG_QUESTION',
+            'action': 'ir.actions.act_window,'+ str(action_id)
+            }, context)
+            home = menu.page.id
+            group_id = menu.id
+            res = {
+            'home':home,
+            }
+            self.pool.get('wiki.groups').write(cr, uid, ids, res)
+            self.pool.get('wiki.groups.link').create(cr, uid,
+                                {'group_id': group_id, 'action_id': menu_id})
 
         return {}
 
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index 20b666be906..e62f9647ecd 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-<!-- Create Menu  -->
+<!-- Create Menu From view -->
 
 		<record id="view_wiki_create_menu" model="ir.ui.view">
             <field name="name">Create Menu</field>
@@ -22,6 +22,8 @@
             </field>
 		</record>
 
+<!-- Create Menu Action -->
+
 		<record id="action_wiki_create_menu" model="ir.actions.act_window">
             <field name="name">Create Menu</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py
index ea180597c3d..5276ccaeb4f 100644
--- a/addons/wiki/wizard/wiki_make_index.py
+++ b/addons/wiki/wizard/wiki_make_index.py
@@ -2,19 +2,19 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2010 Tiny SPRl (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
+#    it under the terms of the GNU Affero General Public license as
 #    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    license, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    MERCHANTABIlITY or FITNESS FOR A PARTICUlAR PURPOSE.  See the
+#    GNU Affero General Public license for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU Affero General Public license
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
@@ -23,16 +23,16 @@ from osv import fields, osv
 
 class wiki_make_index(osv.osv_memory):
     """ Create Index For Selected Page """
+
     _name = "wiki.make.index"
     _description = "Create Index"
-    _columns = {
-    }
 
     def wiki_do_index(self, cr, uid, ids, context):
+
         """ Makes Index according to page hierarchy
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of wiki index’s IDs
+        @param ids: list of wiki index’s IDs
 
         """
         data = context and context.get('active_ids', []) or []
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 183a61183ef..7473bae56e0 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-<!-- Create Index  -->
+<!-- Create Index Form view  -->
 
     	<record id="view_wiki_make_index" model="ir.ui.view">
             <field name="name">Create Index</field>
@@ -20,6 +20,8 @@
             </field>
 		</record>
 
+<!-- Create Index Action  -->
+
 		<record id="action_view_wiki_make_index" model="ir.actions.act_window">
             <field name="name">Create Index</field>
             <field name="type">ir.actions.act_window</field>
@@ -30,6 +32,8 @@
             <field name="context">{'record_id' : active_id}</field>
     	</record>
 
+<!-- Create Index Action Window  -->
+
 		<act_window id="action_view_wiki_make_index_values"
     		key2="client_action_multi" name="Create Index"
     		res_model="wiki.make.index" src_model="wiki.wiki"
diff --git a/addons/wiki/wizard/wiki_wiki_help_open.py b/addons/wiki/wizard/wiki_wiki_help_open.py
index 37f3a3a6eb0..7df105b8847 100644
--- a/addons/wiki/wizard/wiki_wiki_help_open.py
+++ b/addons/wiki/wizard/wiki_wiki_help_open.py
@@ -26,10 +26,9 @@ class wiki_wiki_help_open(osv.osv_memory):
     """ Basic Wiki Editing """
     _name = "wiki.wiki.help.open"
     _description = "Basic Wiki Editing"
-    _columns = {
-    }
 
     def open_wiki_page(self, cr, uid, ids, context):
+
         """ Opens Wiki Page for Editing
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
diff --git a/addons/wiki/wizard/wiki_wiki_help_open_view.xml b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
index 79007eb68d0..226ceab271f 100644
--- a/addons/wiki/wizard/wiki_wiki_help_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_help_open_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-<!-- Editing Page  -->
+<!-- Editing Page Form view  -->
 
     	<record id="view_wiki_wiki_help_open" model="ir.ui.view">
             <field name="name">Basic Wiki Editing</field>
@@ -17,6 +17,8 @@
             </field>
 		</record>
 
+<!-- Editing Page Action  -->
+
 		<record id="action_view_wiki_wiki_help_open" model="ir.actions.act_window">
             <field name="name">Basic Wiki Editing</field>
             <field name="type">ir.actions.act_window</field>
@@ -26,6 +28,8 @@
             <field name="target">new</field>
         </record>
 
+<!-- Editing Page Action window -->
+
         <act_window id="action_view_wiki_wiki_help_open_vals"
     		key2="client_action_multi" name="Basic Wiki Editing"
     		res_model="wiki.wiki.help.open" src_model="wiki.wiki"
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 2b9675009ce..23326838f88 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -23,19 +23,19 @@ from osv import fields, osv
 
 class wiki_wiki_page_open(osv.osv_memory):
     """ wizard Open Page """
+
     _name = "wiki.wiki.page.open"
     _description = "wiz open page"
-    _columns = {
-
-    }
 
     def open_wiki_page(self, cr, uid, ids, context):
+
         """ Opens Wiki Page of Group
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of open wiki page’s IDs
         @return : dictionay of open wiki window on give group id
         """
+
         for group in self.pool.get('wiki.groups').browse(cr, uid,ids):
 
             value = {
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index b0f3da5899a..d0c41d0d37f 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-<!-- Open Page  -->
+<!-- Open Page Form view  -->
 
     	<record id="view_wiki_wiki_page_open" model="ir.ui.view">
             <field name="name">Open Page</field>
@@ -17,6 +17,8 @@
             </field>
 		</record>
 
+<!-- Open Page Action  -->
+
 		<record id="action_view_wiki_wiki_page_open" model="ir.actions.act_window">
             <field name="name">Open Page</field>
             <field name="type">ir.actions.act_window</field>
@@ -26,6 +28,8 @@
             <field name="target">new</field>
     	</record>
 
+<!-- Open Page Action window  -->
+
     	<act_window id="action_view_wiki_wiki_page_open_vals"
     		key2="client_action_multi" name="Open Wiki Page"
     		res_model="wiki.wiki.page.open" src_model="wiki.groups"

From 4df6498acf7b5d49ac4210a23ce403b1a0b3a395 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 17 Mar 2010 14:26:10 +0530
Subject: [PATCH 037/248] [IMP]: audittrail: code optimization and apply csv
 file

bzr revid: atp@tinyerp.co.in-20100317085610-3xc563aemadhpnx6
---
 addons/audittrail/audittrail.py               | 58 +++++++++++--------
 .../audittrail/security/ir.model.access.csv   |  1 +
 .../audittrail/wizard/audittrail_view_log.py  |  4 +-
 3 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 726937e62a3..2061a935adb 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -23,10 +23,8 @@ from osv import fields, osv
 from osv.osv import osv_pool
 from tools.translate import _
 import ir
-import netsvc
 import pooler
-import string
-import time, copy
+import time
 
 class audittrail_rule(osv.osv):
     """
@@ -62,6 +60,13 @@ class audittrail_rule(osv.osv):
     __functions = {}
 
     def subscribe(self, cr, uid, ids, *args):
+        """
+        subscriber Rule on object and apply action on that object.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Auddittrail RUle’s IDs.
+        @return: True 
+        """
         obj_action = self.pool.get('ir.actions.act_window')
         obj_model = self.pool.get('ir.model.data')
         #start Loop
@@ -76,7 +81,7 @@ class audittrail_rule(osv.osv):
                  "name":'View Log', 
                  "res_model":'audittrail.log', 
                  "src_model": thisrule.object_id.model, 
-                 "domain":"[('object_id','=',"+str(thisrule.object_id.id)+"), ('res_id', '=', active_id)]"
+                 "domain":"[('object_id','=', "+str(thisrule.object_id.id)+"), ('res_id', '=', active_id)]"
 
             }
             id = obj_action.create(cr, uid, val)
@@ -88,7 +93,13 @@ class audittrail_rule(osv.osv):
         return True
 
     def unsubscribe(self, cr, uid, ids, *args):
-        
+        """
+        unsubscribe  Rule on object
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Auddittrail RUle’s IDs.
+        @return: True 
+        """
         obj_action = self.pool.get('ir.actions.act_window')
         obj_model = self.pool.get('ir.model.data')
         val_obj = self.pool.get('ir.values')
@@ -114,7 +125,6 @@ class audittrail_log(osv.osv):
     """
     For Audittrail Log
     """
-    
     _name = 'audittrail.log'
     _description = "Audittrail Log"
     _columns = {
@@ -161,13 +171,13 @@ audittrail_log_line()
 class audittrail_objects_proxy(osv_pool):
     
     def get_value_text(self, cr, uid, field_name, values, object, context=None):
+        
         if not context:
             context = {}
         pool = pooler.get_pool(cr.dbname)
         obj = pool.get(object.model)
         obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object.model)])
-        model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
-        f_id= pool.get('ir.model.fields').search(cr, uid, [('name', '=', field_name), ('model_id', '=', object.id)])
+        f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', field_name), ('model_id', '=', object.id)])
         if f_id:
             field = pool.get('ir.model.fields').read(cr, uid, f_id)[0]
             model = field['relation']
@@ -177,14 +187,14 @@ class audittrail_objects_proxy(osv_pool):
                     if type(values) == tuple:
                         values = values[0]
                     val = pool.get(model).read(cr, uid, [values], [pool.get(model)._rec_name])
-                    if len(val):
+                    if val:
                         return val[0][pool.get(model)._rec_name]
             elif field['ttype'] == 'many2many':
                 value = []
                 if values:
                     for id in values:
                         val = pool.get(model).read(cr, uid, [id], [pool.get(model)._rec_name])
-                        if len(val):
+                        if val:
                             value.append(val[0][pool.get(model)._rec_name])
                 return value
 
@@ -194,7 +204,7 @@ class audittrail_objects_proxy(osv_pool):
                     for id in values:
                         val = pool.get(model).read(cr, uid, [id], [pool.get(model)._rec_name])
 
-                        if len(val):
+                        if val:
                             value.append(val[0][pool.get(model)._rec_name])
                     return value
             return values
@@ -211,7 +221,7 @@ class audittrail_objects_proxy(osv_pool):
                 f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', line['name']), ('model_id', 'in', (object.id, inherits_ids[0]))])
             else:
                 f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', line['name']), ('model_id', '=', object.id)])
-            if len(f_id):
+            if f_id:
                 fields = pool.get('ir.model.fields').read(cr, uid, f_id)
                 old_value = 'old_value' in line and  line['old_value'] or ''
                 new_value = 'new_value' in line and  line['new_value'] or ''
@@ -243,7 +253,7 @@ class audittrail_objects_proxy(osv_pool):
             new_value = pool.get(model_object.model).read(cr, uid, [res_id], args[0].keys())[0]
             if 'id' in new_value:
                 del new_value['id']
-            if not len(logged_uids) or uid in logged_uids:
+            if not logged_uids or uid in logged_uids:
                 resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                 resource_name = resource_name and resource_name[0][1] or ''
                 id = pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
@@ -272,7 +282,7 @@ class audittrail_objects_proxy(osv_pool):
                 cr.commit()
                 if res:
                     new_values = pool.get(model_object.model).read(cr, uid, res_ids, args[1].keys())[0]
-                    if not len(logged_uids) or uid in logged_uids:
+                    if not logged_uids or uid in logged_uids:
                         resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                         resource_name = resource_name and resource_name[0][1] or ''
                         id = pool.get('audittrail.log').create(cr, uid, {"method": method, "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
@@ -303,7 +313,7 @@ class audittrail_objects_proxy(osv_pool):
             else:
                 old_values[res['id']] = res
             for res_id in old_values:
-                if not len(logged_uids) or uid in logged_uids:
+                if not logged_uids or uid in logged_uids:
                     resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                     resource_name = resource_name and resource_name[0][1] or ''
                     id = pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
@@ -322,13 +332,13 @@ class audittrail_objects_proxy(osv_pool):
             return res
 
         if method in ('unlink'):
-            res_ids=args[0]
-            old_values={}
+            res_ids = args[0]
+            old_values = {}
             for res_id in res_ids:
-                old_values[res_id]=pool.get(model_object.model).read(cr, uid, res_id, [])
+                old_values[res_id] = pool.get(model_object.model).read(cr, uid, res_id, [])
 
             for res_id in res_ids:
-                if not len(logged_uids) or uid in logged_uids:
+                if not logged_uids or uid in logged_uids:
                     resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                     resource_name = resource_name and resource_name[0][1] or ''
                     id = pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
@@ -352,29 +362,29 @@ class audittrail_objects_proxy(osv_pool):
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
         cr.autocommit(True)
-        obj=pool.get(object)
+        obj = pool.get(object)
         logged_uids = []
         fct_src = super(audittrail_objects_proxy, self).execute
 
         def my_fct(db, uid, object, method, *args):
             field = method
             rule = False
-            obj_ids= pool.get('ir.model').search(cr, uid, [('model', '=', object)])
+            obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
             for obj_name in pool.obj_list():
                 if obj_name == 'audittrail.rule':
                     rule = True
             if not rule:
                 return fct_src(db, uid, object, method, *args)
-            if not len(obj_ids):
+            if not obj_ids:
                 return fct_src(db, uid, object, method, *args)
             rule_ids = pool.get('audittrail.rule').search(cr, uid, [('object_id', '=', obj_ids[0]), ('state', '=', 'subscribed')])
-            if not len(rule_ids):
+            if not rule_ids:
                 return fct_src(db, uid, object, method, *args)
 
             for thisrule in pool.get('audittrail.rule').browse(cr, uid, rule_ids):
                 for user in thisrule.user_id:
                     logged_uids.append(user.id)
-                if not len(logged_uids) or uid in logged_uids:
+                if not logged_uids or uid in logged_uids:
                     if field in ('read', 'write', 'create', 'unlink'):
                         if getattr(thisrule, 'log_'+field):
                             return self.log_fct(db, uid, object, method, fct_src, *args)
diff --git a/addons/audittrail/security/ir.model.access.csv b/addons/audittrail/security/ir.model.access.csv
index ac367182f26..9aba9ddf598 100644
--- a/addons/audittrail/security/ir.model.access.csv
+++ b/addons/audittrail/security/ir.model.access.csv
@@ -5,3 +5,4 @@
 "access_audittrail_rule_all_users","audittrail rule all","model_audittrail_rule","base.group_user",1,0,0,0
 "access_audittrail_log_all_users","audittrail log all","model_audittrail_log","base.group_user",1,0,1,0
 "access_audittrail_log_line_all_users","audittrail log line all","model_audittrail_log_line","base.group_user",1,0,1,0
+"access_audittrail_view_log","audittrail.view.log","model_audittrail_view_log","base.group_user",1,1,1,1
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
index 67e8b3934cb..44edb7653e5 100644
--- a/addons/audittrail/wizard/audittrail_view_log.py
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 

From 174ae8258e52e59d39bca3feba9a93bc92a9bb6f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 17 Mar 2010 14:57:12 +0530
Subject: [PATCH 038/248] [IMP]: wiki: Minor improvements

bzr revid: rpa@tinyerp.com-20100317092712-zizbyvkg82o8cx03
---
 addons/wiki/wiki.py                       | 94 +++++++++++------------
 addons/wiki/wiki_view.xml                 |  1 +
 addons/wiki/wizard/show_diff.py           |  7 +-
 addons/wiki/wizard/wiki_create_menu.py    | 27 +++----
 addons/wiki/wizard/wiki_make_index.py     |  7 +-
 addons/wiki/wizard/wiki_wiki_help_open.py | 14 ++--
 addons/wiki/wizard/wiki_wiki_page_open.py | 22 +++---
 7 files changed, 89 insertions(+), 83 deletions(-)

diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 80c80ae7fe6..55b71b8ae10 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -44,19 +44,19 @@ class WikiGroup(osv.osv):
     _order = 'name'
 
     _columns = {
-       'name':fields.char('Wiki Group', size=256, select=True, required=True),
-       'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'),
-       'notes':fields.text("Description"),
-       'create_date':fields.datetime("Created Date", select=True),
-       'template': fields.text('Wiki Template'),
-       'section': fields.boolean("Make Section ?"),
+       'name':fields.char('Wiki Group', size=256, select=True, required=True), 
+       'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'), 
+       'notes':fields.text("Description"), 
+       'create_date':fields.datetime("Created Date", select=True), 
+       'template': fields.text('Wiki Template'), 
+       'section': fields.boolean("Make Section ?"), 
        'method':fields.selection([('list', 'List'), ('page', 'Home Page'), \
-                                   ('tree', 'Tree')], 'Display Method'),
-       'home':fields.many2one('wiki.wiki', 'Pages'),
+                                   ('tree', 'Tree')], 'Display Method'), 
+       'home':fields.many2one('wiki.wiki', 'Pages'), 
     }
 
     _defaults = {
-        'method': lambda *a: 'page',
+        'method': lambda *a: 'page', 
     }
 
 WikiGroup()
@@ -70,7 +70,7 @@ class GroupLink(osv.osv):
     _rec_name = 'action_id'
 
     _columns = {
-       'group_id': fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'),
+       'group_id': fields.many2one('wiki.groups', 'Parent Group', ondelete='set null'), 
        'action_id': fields.many2one('ir.ui.menu', 'Menu')
     }
 
@@ -85,22 +85,22 @@ class Wiki(osv.osv):
     _order = 'section,create_date desc'
 
     _columns = {
-        'name': fields.char('Title', size=256, select=True, required=True),
-        'write_uid': fields.many2one('res.users',"Last Author"),
-        'text_area': fields.text("Content"),
-        'create_uid': fields.many2one('res.users','Author', select=True),
-        'create_date': fields.datetime("Created on", select=True),
-        'write_date': fields.datetime("Modification Date", select=True),
-        'tags': fields.char('Tags', size=1024),
-        'history_id': fields.one2many('wiki.wiki.history','wiki_id','History Lines'),
-        'minor_edit': fields.boolean('Minor edit', select=True),
-        'summary': fields.char('Summary',size=256),
-        'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"),
-        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'),
-        'toc': fields.boolean('Table of Contents'),
-        'review': fields.boolean('Need Review'),
-        'parent_id': fields.many2one('wiki.wiki', 'Parent Page'),
-        'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
+        'name': fields.char('Title', size=256, select=True, required=True), 
+        'write_uid': fields.many2one('res.users', "Last Author"), 
+        'text_area': fields.text("Content"), 
+        'create_uid': fields.many2one('res.users', 'Author', select=True), 
+        'create_date': fields.datetime("Created on", select=True), 
+        'write_date': fields.datetime("Modification Date", select=True), 
+        'tags': fields.char('Tags', size=1024), 
+        'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'), 
+        'minor_edit': fields.boolean('Minor edit', select=True), 
+        'summary': fields.char('Summary', size=256), 
+        'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"), 
+        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'), 
+        'toc': fields.boolean('Table of Contents'), 
+        'review': fields.boolean('Need Review'), 
+        'parent_id': fields.many2one('wiki.wiki', 'Parent Page'), 
+        'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'), 
     }
 
     def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
@@ -108,7 +108,7 @@ class Wiki(osv.osv):
         """ @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of wiki page’s IDs
-            @return : dictionay of open wiki page on give page section  """
+            @return: dictionay of open wiki page on give page section  """
 
         if (not group_id) or content:
             return {}
@@ -125,7 +125,7 @@ class Wiki(osv.osv):
         section = '.'.join(s)
         return {
             'value':{
-                'text_area': template,
+                'text_area': template, 
                 'section': section
             }
         }
@@ -143,15 +143,15 @@ class Wiki(osv.osv):
         """ @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks, """
 
-        id = super(Wiki,self).create(cr, uid, vals, context)
+        id = super(Wiki, self).create(cr, uid, vals, context)
         history = self.pool.get('wiki.wiki.history')
         if vals.get('text_area'):
             res = {
-                'minor_edit':vals.get('minor_edit', True),
-                'text_area':vals.get('text_area',''),
-                'write_uid':uid,
-                'wiki_id' : id,
-                'summary':vals.get('summary','')
+                'minor_edit': vals.get('minor_edit', True), 
+                'text_area': vals.get('text_area', ''), 
+                'write_uid': uid, 
+                'wiki_id': id, 
+                'summary':vals.get('summary', '')
             }
             history.create(cr, uid, res)
         return id
@@ -166,11 +166,11 @@ class Wiki(osv.osv):
         if vals.get('text_area'):
             for id in ids:
                 res = {
-                    'minor_edit':vals.get('minor_edit', True),
-                    'text_area':vals.get('text_area',''),
-                    'write_uid':uid,
-                    'wiki_id' : id,
-                    'summary':vals.get('summary','')
+                    'minor_edit': vals.get('minor_edit', True), 
+                    'text_area': vals.get('text_area', ''), 
+                    'write_uid': uid, 
+                    'wiki_id': id, 
+                    'summary': vals.get('summary', '')
                 }
                 history.create(cr, uid, res)
         return result
@@ -187,16 +187,16 @@ class History(osv.osv):
     _order = 'id DESC'
 
     _columns = {
-      'create_date': fields.datetime("Date",select=True),
-      'text_area': fields.text("Text area"),
-      'minor_edit': fields.boolean('This is a major edit ?',select=True),
-      'summary': fields.char('Summary',size=256, select=True),
-      'write_uid': fields.many2one('res.users',"Modify By", select=True),
-      'wiki_id': fields.many2one('wiki.wiki','Wiki Id', select=True)
-    }
+              'create_date': fields.datetime("Date", select=True), 
+              'text_area': fields.text("Text area"), 
+              'minor_edit': fields.boolean('This is a major edit ?', select=True), 
+              'summary': fields.char('Summary', size=256, select=True), 
+              'write_uid': fields.many2one('res.users', "Modify By", select=True), 
+              'wiki_id': fields.many2one('wiki.wiki', 'Wiki Id', select=True)
+            }
 
     _defaults = {
-        'write_uid': lambda obj,cr,uid,context: uid,
+        'write_uid': lambda obj, cr, uid, context: uid, 
     }
 
     def getDiff(self, cr, uid, v1, v2, context={}):
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index a4189ec6a8f..875aa460f6a 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -253,5 +253,6 @@
             <field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
             <field eval="True" name="object"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/wiki/wizard/show_diff.py b/addons/wiki/wizard/show_diff.py
index 18fd4f755dc..83708a8d8ce 100644
--- a/addons/wiki/wizard/show_diff.py
+++ b/addons/wiki/wizard/show_diff.py
@@ -19,7 +19,8 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
+from tools.translate import _
 
 class showdiff(osv.osv_memory):
     """ Disp[ay Difference for History """
@@ -43,7 +44,7 @@ class showdiff(osv.osv_memory):
 
         elif len(ids) == 1:
             old = history.browse(cr, uid, ids[0])
-            nids = history.search(cr, uid, [('wiki_id','=',old.wiki_id.id)])
+            nids = history.search(cr, uid, [('wiki_id', '=', old.wiki_id.id)])
             nids.sort()
             diff = history.getDiff(cr, uid, ids[0], nids[-1])
         else:
@@ -51,7 +52,7 @@ class showdiff(osv.osv_memory):
         return diff
 
     _columns = {
-        'diff': fields.text('Diff'),
+        'diff': fields.text('Diff'), 
     }
 
     _defaults = {
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index 833ecb6436d..597592ab154 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -28,9 +28,9 @@ class wiki_create_menu(osv.osv_memory):
     _description = "Wizard Create Menu"
 
     _columns = {
-        'menu_name': fields.char('Menu Name', size=256, select=True, required=True),
-        'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
-        'page': fields.many2one('wiki.wiki', 'Group Home Page'),
+        'menu_name': fields.char('Menu Name', size=256, select=True, required=True), 
+        'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True), 
+        'page': fields.many2one('wiki.wiki', 'Group Home Page'), 
     }
 
     def wiki_menu_create(self, cr, uid, ids, context):
@@ -42,25 +42,26 @@ class wiki_create_menu(osv.osv_memory):
 
         """
         mod_obj = self.pool.get('ir.model.data')
-        action_id = mod_obj._get_id(cr, uid, 'wiki','action_view_wiki_wiki_page_open')
+        action_id = mod_obj._get_id(cr, uid, 'wiki', 'action_view_wiki_wiki_page_open')
+
         for menu in self.browse(cr, uid, ids):
             menu_id = self.pool.get('ir.ui.menu').create(cr, uid, {
-            'name':menu.menu_name,
-            'parent_id':menu.menu_parent_id.id,
-            'icon': 'STOCK_DIALOG_QUESTION',
-            'action': 'ir.actions.act_window,'+ str(action_id)
-            }, context)
+                            'name':menu.menu_name, 
+                            'parent_id':menu.menu_parent_id.id, 
+                            'icon': 'STOCK_DIALOG_QUESTION', 
+                            'action': 'ir.actions.act_window,'+ str(action_id)
+                            }, context)
             home = menu.page.id
             group_id = menu.id
             res = {
-            'home':home,
-            }
+                    'home':home, 
+                    }
             self.pool.get('wiki.groups').write(cr, uid, ids, res)
-            self.pool.get('wiki.groups.link').create(cr, uid,
+            self.pool.get('wiki.groups.link').create(cr, uid, 
                                 {'group_id': group_id, 'action_id': menu_id})
 
         return {}
 
 wiki_create_menu()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py
index 5276ccaeb4f..24ebf19855e 100644
--- a/addons/wiki/wizard/wiki_make_index.py
+++ b/addons/wiki/wizard/wiki_make_index.py
@@ -36,13 +36,15 @@ class wiki_make_index(osv.osv_memory):
 
         """
         data = context and context.get('active_ids', []) or []
-        for index_obj in self.browse(cr,uid,ids):
+
+        for index_obj in self.browse(cr, uid, ids):
             wiki_pool = self.pool.get('wiki.wiki')
             cr.execute("Select id, section from wiki_wiki where id = ANY(%s) \
-                            order by section " ,(data,))
+                            order by section ", (data,))
             lst0 = cr.fetchall()
             lst = []
             s_ids = {}
+
             for l in lst0:
                 s_ids[l[1]] = l[0]
                 lst.append(l[1])
@@ -82,6 +84,7 @@ class wiki_make_index(osv.osv_memory):
 
             for rs in result:
                 wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]})
+
         return {}
 
 wiki_make_index()
diff --git a/addons/wiki/wizard/wiki_wiki_help_open.py b/addons/wiki/wizard/wiki_wiki_help_open.py
index 7df105b8847..1333f80b96f 100644
--- a/addons/wiki/wizard/wiki_wiki_help_open.py
+++ b/addons/wiki/wizard/wiki_wiki_help_open.py
@@ -35,15 +35,15 @@ class wiki_wiki_help_open(osv.osv_memory):
         @param ids: List of wiki page’s IDs
 
         """
-        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name','=','Basic Wiki Editing')])
+        pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')])
 
         value = {
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'wiki.wiki',
-            'view_id': False,
-            'res_id': pages[0],
-            'type': 'ir.actions.act_window',
+            'view_type': 'form', 
+            'view_mode': 'form,tree', 
+            'res_model': 'wiki.wiki', 
+            'view_id': False, 
+            'res_id': pages[0], 
+            'type': 'ir.actions.act_window', 
         }
 
         return value
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 23326838f88..d65748f989a 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -33,19 +33,19 @@ class wiki_wiki_page_open(osv.osv_memory):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of open wiki page’s IDs
-        @return : dictionay of open wiki window on give group id
+        @return: dictionay of open wiki window on give group id
         """
 
-        for group in self.pool.get('wiki.groups').browse(cr, uid,ids):
+        for group in self.pool.get('wiki.groups').browse(cr, uid, ids):
 
             value = {
-                'domain': "[('group_id','=',%d)]" % (group.id),
-                'name': 'Wiki Page',
-                'view_type': 'form',
-                'view_mode': 'form,tree',
-                'res_model': 'wiki.wiki',
-                'view_id': False,
-                'type': 'ir.actions.act_window',
+                'domain': "[('group_id','=',%d)]" % (group.id), 
+                'name': 'Wiki Page', 
+                'view_type': 'form', 
+                'view_mode': 'form,tree', 
+                'res_model': 'wiki.wiki', 
+                'view_id': False, 
+                'type': 'ir.actions.act_window', 
         }
         if group.method == 'page':
             value['res_id'] = group.home.id
@@ -53,9 +53,9 @@ class wiki_wiki_page_open(osv.osv_memory):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.childs')])
+            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
             value['view_id'] = view_id
-            value['domain'] = [('group_id','=',group.id),('parent_id','=',False)]
+            value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
             value['view_type'] = 'tree'
 
         return value

From 3acf0a3c448abb663fb53855db3fb92eac67f82d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 17 Mar 2010 15:15:10 +0530
Subject: [PATCH 039/248] [REF]: audittrail: Minor Improvments

bzr revid: rpa@tinyerp.com-20100317094510-mjzh3v6pcq88aew7
---
 addons/audittrail/audittrail.py               | 126 ++++++++++--------
 .../audittrail/wizard/audittrail_view_log.py  |   3 +-
 2 files changed, 69 insertions(+), 60 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 2061a935adb..be7d3787815 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -33,25 +33,25 @@ class audittrail_rule(osv.osv):
     _name = 'audittrail.rule'
     _description = "Audittrail Rule"
     _columns = {
-        "name": fields.char("Rule Name", size=32, required=True),
-        "object_id": fields.many2one('ir.model', 'Object', required=True),
+        "name": fields.char("Rule Name", size=32, required=True), 
+        "object_id": fields.many2one('ir.model', 'Object', required=True), 
         "user_id": fields.many2many('res.users', 'audittail_rules_users', 
-                                            'user_id', 'rule_id', 'Users'),
-        "log_read": fields.boolean("Log reads"),
-        "log_write": fields.boolean("Log writes"),
-        "log_unlink": fields.boolean("Log deletes"),
-        "log_create": fields.boolean("Log creates"),
+                                            'user_id', 'rule_id', 'Users'), 
+        "log_read": fields.boolean("Log reads"), 
+        "log_write": fields.boolean("Log writes"), 
+        "log_unlink": fields.boolean("Log deletes"), 
+        "log_create": fields.boolean("Log creates"), 
         "state": fields.selection((("draft", "Draft"), 
                                    ("subscribed", "Subscribed")), 
                                    "State", required=True), 
-        "action_id":fields.many2one('ir.actions.act_window', "Action ID"),
+        "action_id": fields.many2one('ir.actions.act_window', "Action ID"), 
     }
 
     _defaults = {
-        'state': lambda *a: 'draft',
-        'log_create': lambda *a: 1,
-        'log_unlink': lambda *a: 1,
-        'log_write': lambda *a: 1,
+        'state': lambda *a: 'draft', 
+        'log_create': lambda *a: 1, 
+        'log_unlink': lambda *a: 1, 
+        'log_write': lambda *a: 1, 
     }
 
     _sql_constraints = [
@@ -74,21 +74,21 @@ class audittrail_rule(osv.osv):
             obj = self.pool.get(thisrule.object_id.model)
             if not obj:
                 raise osv.except_osv(
-                        _('WARNING:audittrail is not part of the pool'),
+                        _('WARNING: audittrail is not part of the pool'), 
                         _('Change audittrail depends -- Setting rule as DRAFT'))
                 self.write(cr, uid, [thisrule.id], {"state": "draft"})
             val = {
-                 "name":'View Log', 
-                 "res_model":'audittrail.log', 
+                 "name": 'View Log', 
+                 "res_model": 'audittrail.log', 
                  "src_model": thisrule.object_id.model, 
-                 "domain":"[('object_id','=', "+str(thisrule.object_id.id)+"), ('res_id', '=', active_id)]"
+                 "domain": "[('object_id','=', " + str(thisrule.object_id.id) + "), ('res_id', '=', active_id)]"
 
             }
             id = obj_action.create(cr, uid, val)
-            self.write(cr, uid, [thisrule.id], {"state": "subscribed", "action_id":id})
+            self.write(cr, uid, [thisrule.id], {"state": "subscribed", "action_id": id})
             keyword = 'client_action_relate'
-            value = 'ir.actions.act_window,'+str(id)
-            res = obj_model.ir_set(cr, uid, 'action', keyword, 'View_log_'+thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False)
+            value = 'ir.actions.act_window,' + str(id)
+            res = obj_model.ir_set(cr, uid, 'action', keyword, 'View_log_' + thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False)
             #End Loop
         return True
 
@@ -101,16 +101,15 @@ class audittrail_rule(osv.osv):
         @return: True 
         """
         obj_action = self.pool.get('ir.actions.act_window')
-        obj_model = self.pool.get('ir.model.data')
         val_obj = self.pool.get('ir.values')
         #start Loop
         for thisrule in self.browse(cr, uid, ids):
-            if thisrule.id in self.__functions :
+            if thisrule.id in self.__functions:
                 for function in self.__functions[thisrule.id]:
                     setattr(function[0], function[1], function[2])
             w_id = obj_action.search(cr, uid, [('name', '=', 'View Log'), ('res_model', '=', 'audittrail.log'), ('src_model', '=', thisrule.object_id.model)])
             obj_action.unlink(cr, uid, w_id)
-            value = "ir.actions.act_window"+','+str(w_id[0])
+            value = "ir.actions.act_window" + ',' + str(w_id[0])
             val_id = val_obj.search(cr, uid, [('model', '=', thisrule.object_id.model), ('value', '=', value)])
             if val_id:
                 res = ir.ir_del(cr, uid, val_id[0])
@@ -128,16 +127,16 @@ class audittrail_log(osv.osv):
     _name = 'audittrail.log'
     _description = "Audittrail Log"
     _columns = {
-        "name": fields.char("Name", size=32),
-        "object_id": fields.many2one('ir.model', 'Object'),
-        "user_id": fields.many2one('res.users', 'User'),
+        "name": fields.char("Name", size=32), 
+        "object_id": fields.many2one('ir.model', 'Object'), 
+        "user_id": fields.many2one('res.users', 'User'), 
         "method": fields.selection((('read', 'Read'), 
                                     ('write', 'Write'), 
                                     ('unlink', 'Delete'), 
-                                    ('create', 'Create')), "Method"),
-        "timestamp": fields.datetime("Date"),
-        "res_id":fields.integer('Resource Id'),
-        "line_ids":fields.one2many('audittrail.log.line', 'log_id', 'Log lines'),
+                                    ('create', 'Create')), "Method"), 
+        "timestamp": fields.datetime("Date"), 
+        "res_id": fields.integer('Resource Id'), 
+        "line_ids": fields.one2many('audittrail.log.line', 'log_id', 'Log lines'), 
     }
     _defaults = {
         "timestamp": lambda *a: time.strftime("%Y-%m-%d %H:%M:%S")
@@ -154,14 +153,14 @@ class audittrail_log_line(osv.osv):
     _name = 'audittrail.log.line'
     _description = "Log Line"
     _columns = {
-          'field_id': fields.many2one('ir.model.fields', 'Fields', required=True),
-          'log_id':fields.many2one('audittrail.log', 'Log'),
-          'log':fields.integer("Log ID"),
-          'old_value':fields.text("Old Value"),
-          'new_value':fields.text("New Value"),
-          'old_value_text':fields.text('Old value Text'),
-          'new_value_text':fields.text('New value Text'),
-          'field_description':fields.char('Field Description' , size=64),
+          'field_id': fields.many2one('ir.model.fields', 'Fields', required=True), 
+          'log_id': fields.many2one('audittrail.log', 'Log'), 
+          'log': fields.integer("Log ID"), 
+          'old_value': fields.text("Old Value"), 
+          'new_value': fields.text("New Value"), 
+          'old_value_text': fields.text('Old value Text'), 
+          'new_value_text': fields.text('New value Text'), 
+          'field_description': fields.char('Field Description', size=64), 
         }
 
 audittrail_log_line()
@@ -175,8 +174,6 @@ class audittrail_objects_proxy(osv_pool):
         if not context:
             context = {}
         pool = pooler.get_pool(cr.dbname)
-        obj = pool.get(object.model)
-        obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object.model)])
         f_id = pool.get('ir.model.fields').search(cr, uid, [('name', '=', field_name), ('model_id', '=', object.id)])
         if f_id:
             field = pool.get('ir.model.fields').read(cr, uid, f_id)[0]
@@ -212,8 +209,6 @@ class audittrail_objects_proxy(osv_pool):
     def create_log_line(self, cr, uid, id, object, lines=[]):
         pool = pooler.get_pool(cr.dbname)
         obj = pool.get(object.model)
-        obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object.model)])
-        model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
         #start Loop
         for line in lines:
             if obj._inherits:
@@ -235,7 +230,16 @@ class audittrail_objects_proxy(osv_pool):
                         old_value = old_value[0]
                     if type(new_value) == tuple:
                         new_value = new_value[0]
-                log_line_id = pool.get('audittrail.log.line').create(cr, uid, {"log_id": id, "field_id": f_id[0] , "old_value":old_value , "new_value":new_value, "old_value_text":old_value_text , "new_value_text":new_value_text, "field_description":fields[0]['field_description']})
+                vals = {
+                        "log_id": id, 
+                        "field_id": f_id[0], 
+                        "old_value": old_value, 
+                        "new_value": new_value, 
+                        "old_value_text": old_value_text, 
+                        "new_value_text": new_value_text, 
+                        "field_description": fields[0]['field_description']
+                        }
+                line_id = pool.get('audittrail.log.line').create(cr, uid, vals)
                 cr.commit()
                 #End Loop
         return True
@@ -244,7 +248,6 @@ class audittrail_objects_proxy(osv_pool):
         logged_uids = []
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
-        obj = pool.get(object)
         obj_ids = pool.get('ir.model').search(cr, uid, [('model', '=', object)])
         model_object = pool.get('ir.model').browse(cr, uid, obj_ids)[0]
         if method in ('create'):
@@ -256,13 +259,19 @@ class audittrail_objects_proxy(osv_pool):
             if not logged_uids or uid in logged_uids:
                 resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                 resource_name = resource_name and resource_name[0][1] or ''
-                id = pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
+                vals = {
+                        "method": method, 
+                        "object_id": model_object.id, 
+                        "user_id": uid, "res_id": res_id, 
+                        "name": resource_name
+                        }
+                id = pool.get('audittrail.log').create(cr, uid, vals)
                 lines = []
                 for field in new_value:
                     if new_value[field]:
                         line = {
-                              'name':field,
-                              'new_value':new_value[field],
+                              'name': field, 
+                              'new_value': new_value[field], 
                               'new_value_text': self.get_value_text(cr, uid, field, new_value[field], model_object)
                               }
                         lines.append(line)
@@ -290,11 +299,11 @@ class audittrail_objects_proxy(osv_pool):
                         for field in args[1].keys():
                             if args[1].keys():
                                 line = {
-                                      'name':field,
-                                      'new_value':field in new_values and new_values[field] or '',
-                                      'old_value':field in old_values and old_values[field] or '',
-                                      'new_value_text': self.get_value_text(cr, uid, field, new_values[field], model_object),
-                                      'old_value_text':old_values_text[field]
+                                      'name': field, 
+                                      'new_value': field in new_values and new_values[field] or '', 
+                                      'old_value': field in old_values and old_values[field] or '', 
+                                      'new_value_text': self.get_value_text(cr, uid, field, new_values[field], model_object), 
+                                      'old_value_text': old_values_text[field]
                                       }
                                 lines.append(line)
                         cr.commit()
@@ -316,13 +325,13 @@ class audittrail_objects_proxy(osv_pool):
                 if not logged_uids or uid in logged_uids:
                     resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                     resource_name = resource_name and resource_name[0][1] or ''
-                    id = pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
+                    id = pool.get('audittrail.log').create(cr, uid, {"method": method, "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
                     lines = []
                     for field in old_values[res_id]:
                         if old_values[res_id][field]:
                             line = {
-                                      'name':field,
-                                      'old_value':old_values[res_id][field],
+                                      'name': field, 
+                                      'old_value': old_values[res_id][field], 
                                       'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
                                       }
                             lines.append(line)
@@ -341,13 +350,13 @@ class audittrail_objects_proxy(osv_pool):
                 if not logged_uids or uid in logged_uids:
                     resource_name = pool.get(model_object.model).name_get(cr, uid, [res_id])
                     resource_name = resource_name and resource_name[0][1] or ''
-                    id = pool.get('audittrail.log').create(cr, uid, {"method": method , "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
+                    id = pool.get('audittrail.log').create(cr, uid, {"method": method, "object_id": model_object.id, "user_id": uid, "res_id": res_id, "name": resource_name})
                     lines = []
                     for field in old_values[res_id]:
                         if old_values[res_id][field]:
                             line = {
-                                  'name':field,
-                                  'old_value':old_values[res_id][field],
+                                  'name': field, 
+                                  'old_value': old_values[res_id][field], 
                                   'old_value_text': self.get_value_text(cr, uid, field, old_values[res_id][field], model_object)
                                   }
                             lines.append(line)
@@ -362,7 +371,6 @@ class audittrail_objects_proxy(osv_pool):
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
         cr.autocommit(True)
-        obj = pool.get(object)
         logged_uids = []
         fct_src = super(audittrail_objects_proxy, self).execute
 
@@ -386,7 +394,7 @@ class audittrail_objects_proxy(osv_pool):
                     logged_uids.append(user.id)
                 if not logged_uids or uid in logged_uids:
                     if field in ('read', 'write', 'create', 'unlink'):
-                        if getattr(thisrule, 'log_'+field):
+                        if getattr(thisrule, 'log_' + field):
                             return self.log_fct(db, uid, object, method, fct_src, *args)
                 return fct_src(db, uid, object, method, *args)
         res = my_fct(db, uid, object, method, *args)
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
index 44edb7653e5..aa26c8cfd4c 100644
--- a/addons/audittrail/wizard/audittrail_view_log.py
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -50,9 +50,10 @@ class audittrail_view_log(osv.osv_memory):
         result = mod_obj._get_id(cr, uid, 'audittrail', 'action_audittrail_log_tree')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id])[0]
-        log_obj = self.pool.get(result['res_model'])
+        #log_obj = self.pool.get(result['res_model'])
         #log_id = log_obj.search(cr, uid, [])
         #log_model = log_obj.read(cr, uid, log_id, ['object_id'])  
+
         #start Loop 
         for datas in self.read(cr, uid, ids):
             if not datas.get('from', None):

From c759fe8400e169dbf8482cd6df452d5f690b59a4 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 17 Mar 2010 15:52:07 +0530
Subject: [PATCH 040/248] [IMP]: board: code optimization and apply csv file

bzr revid: atp@tinyerp.co.in-20100317102207-1cjejv359e9smpfu
---
 addons/board/board.py                     | 78 ++++++++++++++++-------
 addons/board/security/ir.model.access.csv | 11 ++--
 addons/board/wizard/board_menu_create.py  | 18 ++++--
 3 files changed, 72 insertions(+), 35 deletions(-)

diff --git a/addons/board/board.py b/addons/board/board.py
index 9634be28178..4fcdad8c517 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
+from osv import fields, osv
 import time
-from osv import fields,osv
 
 class board_board(osv.osv):
     """
@@ -29,20 +29,28 @@ class board_board(osv.osv):
     _name = 'board.board'
     _description = "Board"
     
-    def create_view(self, cr, uid, ids, context):
-
-        board = self.pool.get('board.board').browse(cr, uid, ids, context)
+    def create_view(self, cr, uid, ids, context=None):
+        """
+        Create  view
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Board's IDs
+        @return: arch of xml view.
+        """
+        if not context:
+            context = {}
+        board = self.pool.get('board.board').browse(cr, uid, ids, context=context)
         left = []
         right = []
         #start Loop
         for line in board.line_ids:
             linestr = '<action string="%s" name="%d" colspan="4"' % (line.name, line.action_id.id)
             if line.height:
-                linestr+=(' height="%d"' % (line.height,))
+                linestr += (' height="%d"' % (line.height, ))
             if line.width:
-                linestr+=(' width="%d"' % (line.width,))
+                linestr += (' width="%d"' % (line.width, ))
             linestr += '/>'
-            if line.position=='left':
+            if line.position == 'left':
                 left.append(linestr)
             else:
                 right.append(linestr)
@@ -58,23 +66,40 @@ class board_board(osv.osv):
                 </child2>
             </hpaned>
             </form>""" % ('\n'.join(left), '\n'.join(right))
-
+        
         return arch
 
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context = {}):
+        
+        """
+        Writes values in one or several fields.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Board's IDs
+        @param vals: dictionary with values to update. 
+                     dictionary must be with the form: {‘name_of_the_field’: value, ...}.
+        @return: True
+        """
         result = super(board_board, self).write(cr, uid, ids, vals, context)
         cr.commit()
 
         board = self.pool.get('board.board').browse(cr, uid, ids[0])
-
         view = self.create_view(cr, uid, ids[0], context)
         id = board.view_id.id
-        cr.execute("update ir_ui_view set arch=%s where id=%s" , (view, id))
+        cr.execute("update ir_ui_view set arch=%s where id=%s", (view, id))
         cr.commit()
-
         return result
 
     def create(self, cr, user, vals, context=None):
+        """
+        create new record.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param vals: dictionary of values for every field.
+                      dictionary must use this form: {‘name_of_the_field’: value, ...}
+        @return: id of new created record of board.board.
+        """
+        
         if not context:
             context = {}
             
@@ -83,41 +108,45 @@ class board_board(osv.osv):
         id = super(board_board, self).create(cr, user, vals, context)
         view_id = self.pool.get('ir.ui.view').create(cr, user, {
             'name': vals['name'],
-            'model':'board.board',
-            'priority':16,
+            'model': 'board.board',
+            'priority': 16,
             'type': 'form',
             'arch': self.create_view(cr, user, id, context),
         })
 
         super(board_board, self).write(cr, user, [id], {'view_id': view_id}, context)
-
+        
         return id
 
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """
+        Overrides orm field_view_get.
+        @return: Dictionary of Fields, arch and toolbar.
+        """
         if not context:
-            context={}
+            context = {}
             
         res = {}
         res = super(board_board, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
 
-        vids = self.pool.get('ir.ui.view.custom').search(cr, user, [('user_id','=',user), ('ref_id','=',view_id)])
+        vids = self.pool.get('ir.ui.view.custom').search(cr, user, [('user_id', '=', user), ('ref_id' ,'=', view_id)])
         if vids:
             view_id = vids[0]
             arch = self.pool.get('ir.ui.view.custom').browse(cr, user, view_id)
             res['arch'] = arch.arch
 
-        res['toolbar'] = {'print':[],'action':[],'relate':[]}
+        res['toolbar'] = {'print': [], 'action': [], 'relate': []}
         return res
 
     _columns = {
-        'name': fields.char('Dashboard', size=64, required=True),
-        'view_id': fields.many2one('ir.ui.view', 'Board View'),
+        'name': fields.char('Dashboard', size=64, required=True), 
+        'view_id': fields.many2one('ir.ui.view', 'Board View'), 
         'line_ids': fields.one2many('board.board.line', 'board_id', 'Action Views')
     }
 
     # the following lines added to let the button on dashboard work.
     _defaults = {
-        'name': lambda *args: 'Dashboard'
+        'name':  lambda *args:  'Dashboard'
     }
 
 board_board()
@@ -158,6 +187,9 @@ class board_note_type(osv.osv):
 board_note_type()
 
 def _type_get(self, cr, uid, context={}):
+    """
+    Get by default Note type.
+    """
     obj = self.pool.get('board.note.type')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['name'], context)
@@ -179,8 +211,8 @@ class board_note(osv.osv):
         'type': fields.selection(_type_get, 'Note type', size=64),
     }
     _defaults = {
-        'user_id': lambda object,cr,uid,context: uid,
-        'date': lambda object,cr,uid,context: time.strftime('%Y-%m-%d'),
+        'user_id': lambda object, cr, uid, context: uid, 
+        'date': lambda object, cr, uid, context: time.strftime('%Y-%m-%d'), 
     }
 board_note()
 
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 9505a83ab36..a9c42feda41 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -1,5 +1,6 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_board_board,board.board,model_board_board,base.group_user,1,1,1,1
-access_board_board_line,board.board.line,model_board_board_line,base.group_user,1,1,1,1
-access_board_note_type,board.note.type,model_board_note_type,base.group_user,1,1,1,1
-access_board_note,board.note,model_board_note,base.group_user,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_board_board","board.board","model_board_board","base.group_user",1,1,1,1
+"access_board_board_line","board.board.line","model_board_board_line","base.group_user",1,1,1,1
+"access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
+"access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
+"access_board_menu_create","board.menu.create","model_board_menu_create","base.group_user",1,1,1,1
diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 4d4bd1e5ab0..107c00ba142 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -27,12 +27,16 @@ class board_menu_create(osv.osv_memory):
     Create Menu
     """
     def check_views(self, cr, uid, context):
-        
+        """
+        check dashboard view on menu name field.
+        @return: False 
+        """
         data = context and context.get('active_id', False) or False
         if data:
             board = self.pool.get('board.board').browse(cr, uid, data)
             if not board.line_ids:
-                raise osv.except_osv(_('User Error!'), _('Please Insert Dashboard View(s) !'))    
+                raise osv.except_osv(_('User Error!'), 
+                                     _('Please Insert Dashboard View(s) !'))    
             return False
     
     def board_menu_create(self, cr, uid, ids, context=None):
@@ -44,7 +48,7 @@ class board_menu_create(osv.osv_memory):
         @return : Dictionary {}.
         """
         if not context:
-            context={}
+            context = {}
              
         context_id = context and context.get('active_id', False) or False
         if context_id:
@@ -63,7 +67,7 @@ class board_menu_create(osv.osv_memory):
                 'name': data.get('menu_name'),
                 'parent_id': data.get('menu_parent_id'),
                 'icon': 'STOCK_SELECT_COLOR',
-                'action': 'ir.actions.act_window,'+str(action_id)
+                'action': 'ir.actions.act_window,' + str(action_id)
                 }, context=context)
         #End Loop
         return {}
@@ -71,11 +75,11 @@ class board_menu_create(osv.osv_memory):
     _name = "board.menu.create"
     _description = "Menu Create"
     _columns = {
-             'menu_name':fields.char('Menu Name', size=64, required=True),
-             'menu_parent_id':fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
+             'menu_name': fields.char('Menu Name', size=64, required=True),
+             'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
           }
     _defaults = {
-            'menu_name':check_views,
+            'menu_name': check_views,
           }
 
 board_menu_create()

From da226e3078d2bb0a577b3d93dd7c35c9a1f3192e Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Mar 2010 16:13:25 +0530
Subject: [PATCH 041/248] [IMP]: lunch: code optimization and apply csv file
 and doc string

bzr revid: ksa@tinyerp.co.in-20100317104325-184sxsqphab0q84y
---
 addons/lunch/__terp__.py                   |  15 ++-
 addons/lunch/lunch.py                      | 135 ++++++++++++++-------
 addons/lunch/lunch_view.xml                |  38 ++++--
 addons/lunch/security/ir.model.access.csv  |  15 ++-
 addons/lunch/wizard/__init__.py            |   6 +-
 addons/lunch/wizard/lunch_cashbox_clean.py |   6 +
 addons/lunch/wizard/lunch_order_confirm.py |   2 +
 7 files changed, 152 insertions(+), 65 deletions(-)

diff --git a/addons/lunch/__terp__.py b/addons/lunch/__terp__.py
index b4fe451aac1..37a7ba4f452 100644
--- a/addons/lunch/__terp__.py
+++ b/addons/lunch/__terp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,18 +25,25 @@
     "version": "0.1",
     "depends": ["base"],
     "category" : "Generic Modules/Others",
+    'description': """
+    The base module to manage lunch
+
+    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.
+    Apply Different Category for the product.
+    """,
     "init_xml": [],
     "update_xml": [
         'security/ir.model.access.csv',
         'wizard/lunch_order_cancel_view.xml',
         'wizard/lunch_order_confirm_view.xml',
-        'wizard/lunch_cashbox_clean_view.xml', 
-        'lunch_view.xml', 
+        'wizard/lunch_cashbox_clean_view.xml',
+        'lunch_view.xml',
         'lunch_report.xml',
         #'process/lunch_process.xml'
     ],
     "demo_xml": ['lunch_demo.xml'],
     "installable": True,
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index ba6f816169d..db7b6e53f59 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -24,6 +24,7 @@ import time
 
 class lunch_category(osv.osv):
     """ Lunch category """
+
     _name = 'lunch.category'
     _description = "Category"
 
@@ -37,13 +38,18 @@ lunch_category()
 
 class lunch_product(osv.osv):
     """ Lunch Product """
+
     _name = 'lunch.product'
     _description = "Lunch Product"
 
     def _category_name_get(self, cr, uid, context={}):
-        """ Get category name """
+
+        """ Get category name
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,"""
+
         obj = self.pool.get('lunch.category')
-        cat_ids= obj.search(cr,uid,[])
+        cat_ids = obj.search(cr,uid,[])
         res = obj.read(cr, uid, cat_ids, ['name', 'category'])
         return [(str(r['id']), r['name']) for r in res]+ [('0','')]
 
@@ -64,20 +70,27 @@ lunch_product()
 
 class lunch_cashbox(osv.osv):
     """ cashbox for Lunch """
-    _name='lunch.cashbox'
+
+    _name = 'lunch.cashbox'
     _description = "Cashbox for Lunch "
 
 
     def amount_available(self, cr, uid, ids, field_name, arg, context):
-        cr.execute("SELECT box,sum(amount) from lunch_cashmove where active = 't' group by box")
-        r = dict(cr.fetchall())
-        for i in ids:
-            r.setdefault(i,0)
-        return r
 
-    _columns={
-        'manager': fields.many2one('res.users','Manager'),
-        'name': fields.char('Name',size=30,required=True, unique = True),
+        """ count available amount
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of create menu’s IDs """
+
+        cr.execute("SELECT box,sum(amount) from lunch_cashmove where active = 't' group by box")
+        amount = dict(cr.fetchall())
+        for i in ids:
+            amount.setdefault(i, 0)
+        return amount
+
+    _columns = {
+        'manager': fields.many2one('res.users', 'Manager'),
+        'name': fields.char('Name', size=30, required=True, unique = True),
         'sum_remain': fields.function(amount_available, method=True, string='Remained Total'),
         }
 
@@ -86,19 +99,20 @@ lunch_cashbox()
 
 class lunch_cashmove(osv.osv):
     """ Move cah """
-    _name= 'lunch.cashmove'
+
+    _name = 'lunch.cashmove'
     _description = "Move cash"
 
-    _columns={
-        'name': fields.char('Name',size=128),
-        'user_cashmove': fields.many2one('res.users','User Name', required=True),
-        'amount': fields.float('Amount', digits=(16,2)),
-        'box': fields.many2one('lunch.cashbox','Box Name',size=30,required=True),
+    _columns = {
+        'name': fields.char('Name', size=128),
+        'user_cashmove': fields.many2one('res.users', 'User Name', required=True),
+        'amount': fields.float('Amount', digits=(16, 2)),
+        'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, required=True),
         'active': fields.boolean('Active'),
         'create_date': fields.datetime('Created date', readonly=True),
         }
 
-    _defaults={
+    _defaults = {
     'active': lambda *a: True,
     }
 
@@ -107,60 +121,85 @@ lunch_cashmove()
 
 class lunch_order(osv.osv):
     """ Apply lunch order """
-    _name='lunch.order'
+
+    _name = 'lunch.order'
     _description = "Lunch Order"
-    _rec_name= "user_id"
+    _rec_name = "user_id"
 
     def _price_get(self, cr, uid, ids, name, args, context=None):
+
+        """ Get Price of Product
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List of Lunch order’s IDs"""
+
         res = {}
-        for o in self.browse(cr, uid, ids):
-            res[o.id] = o.product.price
+        for price in self.browse(cr, uid, ids):
+            res[price.id] = price.product.price
         return res
 
-    _columns={
-        'user_id': fields.many2one('res.users','User Name', required=True, \
-            readonly=True, states={'draft':[('readonly',False)]}),
-        'product': fields.many2one('lunch.product','Product', required=True, \
-            readonly=True, states={'draft':[('readonly',False)]}, change_default=True),
-        'date': fields.date('Date',readonly=True,states={'draft':[('readonly',False)]}),
-        'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True  ),
-        'descript': fields.char('Description Order', readonly=True, size=50,\
-            states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft','Draft'), ('confirmed','Confirmed'),],\
+    _columns = {
+        'user_id': fields.many2one('res.users', 'User Name', required=True, \
+            readonly=True, states={'draft':[('readonly', False)]}),
+        'product': fields.many2one('lunch.product', 'Product', required=True, \
+            readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
+        'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
+        'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True),
+        'descript': fields.char('Description Order', readonly=True, size=50, \
+            states = {'draft':[('readonly', False)]}),
+        'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
             'State', readonly=True, select=True),
         'price': fields.function(_price_get, method=True, string="Price"),
     }
 
-    _defaults={
+    _defaults = {
         'user_id': lambda self,cr,uid,context: uid,
         'date': lambda self,cr,uid,context: time.strftime('%Y-%m-%d'),
         'state': lambda self,cr,uid,context: 'draft',
     }
 
     def confirm(self,cr,uid,ids,box,context):
-        cashmove_ref= self.pool.get('lunch.cashmove')
-        for order in self.browse(cr,uid,ids):
+
+        """ confirm order
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of confirm order’s IDs """
+
+        cashmove_ref = self.pool.get('lunch.cashmove')
+        for order in self.browse(cr, uid, ids):
             if order.state == 'confirmed':
                 continue
-            new_id= cashmove_ref.create(cr,uid,{'name': order.product.name+' order',
+            new_id = cashmove_ref.createcr, uid, {'name': order.product.name+' order',
                             'amount':-order.product.price,
                             'user_cashmove':order.user_id.id,
                             'box':box,
                             'active':True,
-                            })
-            self.write(cr,uid,[order.id],{'cashmove':new_id, 'state':'confirmed'})
+                            }
+            self.write(cr, uid, [order.id], {'cashmove': new_id, 'state': 'confirmed'})
         return {}
 
-    def lunch_order_cancel(self,cr,uid,ids,context):
-        orders= self.browse(cr,uid,ids)
+    def lunch_order_cancel(self, cr, uid, ids, context):
+
+        """" cancel order
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List of create menu’s IDs """
+
+        orders = self.browse(cr, uid, ids)
         for order in orders:
             if not order.cashmove:
                 continue
         self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id])
-        self.write(cr,uid,ids,{'state':'draft'})
+        self.write(cr, uid, ids, {'state':'draft'})
         return {}
 
     def onchange_product(self, cr, uid, ids, product):
+
+        """ Get price for Product
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List of create menu’s IDs """
+
         if not product:
             return {'value': {'price': 0.0}}
         price = self.pool.get('lunch.product').read(cr, uid, product, ['price'])['price']
@@ -171,18 +210,22 @@ lunch_order()
 
 class report_lunch_amount(osv.osv):
     """ Lunch Amount Report """
-    _name='report.lunch.amount'
+
+    _name = 'report.lunch.amount'
     _description = "Amount available by user and box"
     _auto = False
-    _rec_name= "user"
+    _rec_name = "user"
 
     _columns = {
-        'user_id': fields.many2one('res.users','User Name',readonly=True),
-        'amount': fields.float('Amount', readonly=True, digits=(16,2)),
-        'box':fields.many2one('lunch.cashbox','Box Name',size=30,readonly=True),
+        'user_id': fields.many2one('res.users', 'User Name', readonly=True),
+        'amount': fields.float('Amount', readonly=True, digits=(16, 2)),
+        'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, readonly=True),
         }
 
     def init(self, cr):
+
+        """ @param cr: the current row, from the database cursor"""
+
         cr.execute("""
             create or replace view report_lunch_amount as (
                 select
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 87fff3cb273..eb24cdc53dc 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -18,7 +18,7 @@
           <menuitem name="Lunch" parent="base.menu_lunch_survey_root"
           	id="menu_lunch_category_root_configuration" sequence="1" />
 
-<!-- Lunch order  -->
+<!-- Lunch order Form view -->
 
           <record model="ir.ui.view" id="view_lunch_order_form">
             <field name="name">Order</field>
@@ -38,6 +38,8 @@
             </field>
         </record>
 
+<!-- Lunch order Tree view -->
+
         <record model="ir.ui.view" id="view_lunch_order_tree">
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
@@ -55,17 +57,18 @@
             </field>
         </record>
 
-
+<!-- Lunch order Action -->
 
         <record model="ir.actions.act_window" id="action_lunch_order_form">
                 <field name="name">Lunch Orders</field>
                 <field name="res_model">lunch.order</field>
                 <field name="view_mode">tree,form</field>
         </record>
+
         <menuitem name="Lunch Order" parent="menu_lunch"
         	id="menu_lunch_order_form" action="action_lunch_order_form" />
 
-<!--  Cash Box  -->
+<!--  Cash Box Form view  -->
 
         <record model="ir.ui.view" id="view_lunch_cashbox_form">
             <field name="name">CashBox</field>
@@ -78,6 +81,8 @@
             </field>
         </record>
 
+<!--  Cash Box Tree view  -->
+
         <record model="ir.ui.view" id="view_lunch_cashbox_tree">
             <field name="name">CashBox</field>
             <field name="model">lunch.cashbox</field>
@@ -91,6 +96,8 @@
             </field>
         </record>
 
+<!--  Cash Box Action  -->
+
         <record model="ir.actions.act_window" id="action_lunch_cashbox_form">
                 <field name="name"> CashBox </field>
                 <field name="res_model">lunch.cashbox</field>
@@ -101,7 +108,7 @@
         	id="menu_lunch_cashbox_form"
         	action="action_lunch_cashbox_form" />
 
-<!-- Cash Move  -->
+<!-- Cash Move Form view  -->
 
         <record model="ir.ui.view" id="view_lunch_cashmove_form">
             <field name="name">CashMove</field>
@@ -118,6 +125,8 @@
             </field>
         </record>
 
+<!-- Cash Move Tree view  -->
+
         <record model="ir.ui.view" id="view_lunch_cashmove_tree">
             <field name="name">CashMove</field>
             <field name="model">lunch.cashmove</field>
@@ -133,6 +142,8 @@
             </field>
         </record>
 
+<!-- Cash Move Action  -->
+
         <record model="ir.actions.act_window" id="action_lunch_cashmove_form">
                 <field name="name">CashMove</field>
                 <field name="res_model">lunch.cashmove</field>
@@ -142,7 +153,7 @@
         	id="menu_lunch_cashmove_form"
         	action="action_lunch_cashmove_form" />
 
-<!-- Lunch Category  -->
+<!-- Lunch Category Form view  -->
 
         <record model="ir.ui.view" id="view_lunch_category_form">
             <field name="name"> Category of product </field>
@@ -155,6 +166,8 @@
             </field>
         </record>
 
+<!-- Lunch Category Tree view  -->
+
         <record model="ir.ui.view" id="view_lunch_category_tree">
             <field name="name">Category</field>
             <field name="model">lunch.category</field>
@@ -166,12 +179,14 @@
             </field>
         </record>
 
+<!-- Lunch Category Action  -->
+
         <record model="ir.actions.act_window" id="action_lunch_category_form">
             <field name="name"> Category of product </field>
             <field name="res_model">lunch.category</field>
         </record>
 
-<!-- Lunch Product  -->
+<!-- Lunch Product Form view  -->
 
         <record model="ir.ui.view" id="view_lunch_product_form">
             <field name="name">Products</field>
@@ -188,6 +203,8 @@
             </field>
         </record>
 
+<!-- Lunch Product Tree view  -->
+
         <record model="ir.ui.view" id="view_lunch_product_tree">
             <field name="name">Products</field>
             <field name="model">lunch.product</field>
@@ -202,6 +219,8 @@
             </field>
         </record>
 
+<!-- Lunch Product Action  -->
+
         <record model="ir.actions.act_window" id="action_lunch_product_form">
             <field name="name">Product</field>
             <field name="res_model">lunch.product</field>
@@ -221,7 +240,8 @@
         	id="menu_lunch_category_form"
         	action="action_lunch_category_form" sequence="1" />
 
-<!-- Lunch Amount  -->
+
+<!-- Lunch Amount Tree view -->
 
         <record model="ir.ui.view" id="view_report_lunch_amount_tree">
             <field name="name">Lunch amount</field>
@@ -236,6 +256,8 @@
             </field>
         </record>
 
+<!-- Lunch Amount Form view -->
+
         <record model="ir.ui.view" id="view_report_lunch_amount_form">
             <field name="name">Lunch amount</field>
             <field name="model">report.lunch.amount</field>
@@ -249,6 +271,8 @@
             </field>
         </record>
 
+<!-- Lunch Amount Action -->
+
         <record model="ir.actions.act_window" id="action_report_lunch_amount_tree">
             <field name="name">Lunch amount</field>
             <field name="res_model">report.lunch.amount</field>
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index 43490780c36..5af63e329fd 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -1,7 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_lunch_category","lunch.category","model_lunch_category",base.group_user,1,1,1,1
-"access_lunch_product","lunch.product","model_lunch_product",base.group_user,1,1,1,1
-"access_lunch_cashbox","lunch.cashbox","model_lunch_cashbox",base.group_user,1,1,1,1
-"access_lunch_cashmove","lunch.cashmove","model_lunch_cashmove",base.group_user,1,1,1,1
-"access_lunch_order","lunch.order","model_lunch_order",base.group_user,1,1,1,1
-"access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount",base.group_user,1,1,1,1
\ No newline at end of file
+"access_lunch_category","lunch.category","model_lunch_category","base.group_user",1,1,1,1
+"access_lunch_product","lunch.product","model_lunch_product","base.group_user",1,1,1,1
+"access_lunch_cashbox","lunch.cashbox","model_lunch_cashbox","base.group_user",1,1,1,1
+"access_lunch_cashmove","lunch.cashmove","model_lunch_cashmove","base.group_user",1,1,1,1
+"access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
+"access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
+"lunch_order_confirm ","lunch.order.confirm","model_lunch_order_confirm","base.group_user",1,1,1,1
+"lunch_order_cancel","lunch.order.cancel","model_lunch_order_cancel","base.group_user",1,1,1,1
+"lunch_cashbox_clean","lunch.cashbox.clean","model_lunch_cashbox_clean","base.group_user",1,1,1,1
diff --git a/addons/lunch/wizard/__init__.py b/addons/lunch/wizard/__init__.py
index 543ebdbf8dc..e6b34c215ac 100644
--- a/addons/lunch/wizard/__init__.py
+++ b/addons/lunch/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,13 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import lunch_order_confirm
 import lunch_order_cancel
 import lunch_cashbox_clean
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/wizard/lunch_cashbox_clean.py b/addons/lunch/wizard/lunch_cashbox_clean.py
index b1a96556460..1956dc6d4b7 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean.py
+++ b/addons/lunch/wizard/lunch_cashbox_clean.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 
 class lunch_cashbox_clean(osv.osv_memory):
@@ -26,6 +27,7 @@ class lunch_cashbox_clean(osv.osv_memory):
      _description = "clean cashbox"
 
      def set_to_zero(self, cr, uid, ids, context):
+
          """
          clean Cashbox. set active fields False.
          @param cr: the current row, from the database cursor,
@@ -33,14 +35,18 @@ class lunch_cashbox_clean(osv.osv_memory):
          @param ids: List  Lunch cashbox Clean’s IDs
          @return:Dictionary {}.
          """
+
          data = context and context.get('active_ids', []) or []
          cashmove_ref = self.pool.get('lunch.cashmove')
+
          cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove \
                  where active = 't' and box in (%s) group by user_cashmove, \
                      box" % ','.join(map(str, data)))
          res = cr.fetchall()
+
          cr.execute("update lunch_cashmove set active = 'f' where active= 't' \
              and box in (%s)" % ','.join(map(str, data)))
+
          for (user_id, box_id, amount) in res:
             cashmove_ref.create(cr, uid, {'name': 'Summary for user' + str(user_id),
                         'amount': amount,
diff --git a/addons/lunch/wizard/lunch_order_confirm.py b/addons/lunch/wizard/lunch_order_confirm.py
index f15f18b0867..1a84e25febb 100644
--- a/addons/lunch/wizard/lunch_order_confirm.py
+++ b/addons/lunch/wizard/lunch_order_confirm.py
@@ -27,6 +27,7 @@ class lunch_order_confirm(osv.osv_memory):
     """
     _name = "lunch.order.confirm"
     _description = "confirm Order"
+
     _columns = {
                 'confirm_cashbox':fields.many2one('lunch.cashbox', 'Name of box', required=True),
                 }
@@ -42,6 +43,7 @@ class lunch_order_confirm(osv.osv_memory):
         """
         data = context and context.get('active_ids', []) or []
         order_ref = self.pool.get('lunch.order')
+
         for confirm_obj in self.read(cr, uid, ids):
             order_ref.confirm(cr, uid, data, confirm_obj['confirm_cashbox'], context)
             return {}

From 9089edc031bb265c267c2c194195d4c21e47b9f1 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Mar 2010 16:14:02 +0530
Subject: [PATCH 042/248] [IMP]: idea: code optimization and apply csv file and
 doc string

bzr revid: ksa@tinyerp.co.in-20100317104402-7ea5pgzk4z6q9p26
---
 addons/idea/__init__.py                    |   5 +-
 addons/idea/__terp__.py                    |  17 +++-
 addons/idea/idea.py                        | 104 +++++++++++++++------
 addons/idea/idea_view.xml                  |  46 +++++++--
 addons/idea/security/ir.model.access.csv   |   1 +
 addons/idea/wizard/__init__.py             |   6 +-
 addons/idea/wizard/idea_post_vote.py       |  10 +-
 addons/idea/wizard/idea_post_vote_view.xml |   7 +-
 8 files changed, 150 insertions(+), 46 deletions(-)

diff --git a/addons/idea/__init__.py b/addons/idea/__init__.py
index 2aa68d00eff..0cd3b1c090c 100644
--- a/addons/idea/__init__.py
+++ b/addons/idea/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,12 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import idea
 import wizard
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py
index f373506e3f1..68d0e7fbe6c 100644
--- a/addons/idea/__terp__.py
+++ b/addons/idea/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,7 +24,16 @@
     'name': 'Idea Manager',
     'version': '0.1',
     'category': 'Tools',
-    'description': """This module allows your user to easily and efficiently participate in the innovation of the enterprise. It allows everybody to express ideas about different subjects. Then, others users can comment these ideas and vote for particular ideas. Each idea as a score based on the different votes. The managers can obtain an easy view on best ideas from all the users. Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
+    'description': """This module allows your user to easily and efficiently
+                    participate in the innovation of the enterprise.
+                    It allows everybody to express ideas about different subjects.
+                    Then, others users can comment these ideas and vote for
+                    particular ideas. Each idea as a score based on the
+                    different votes.
+                    The managers can obtain an easy view on best ideas from all
+                    the users. Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
+
+
     'author': 'Tiny',
     'website': 'http://openerp.com',
     'depends': ['base'],
@@ -34,7 +43,7 @@
         'idea_view.xml',
         'idea_workflow.xml',
         'security/idea_security.xml',
-        'security/ir.model.access.csv',        
+        'security/ir.model.access.csv',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 270fdc87605..e698c85d0b4 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -27,13 +27,15 @@ DefaultVoteValue = '50'
 
 class idea_category(osv.osv):
     """ Category of Idea """
+
     _name = "idea.category"
     _description = "Category for an idea"
+
     _columns = {
         'name': fields.char('Category', size=64, required=True),
         'summary': fields.text('Summary'),
-        'parent_id': fields.many2one('idea.category','Parent Categories', ondelete='set null'),
-        'child_ids': fields.one2many('idea.category','parent_id','Child Categories')
+        'parent_id': fields.many2one('idea.category', 'Parent Categories', ondelete='set null'),
+        'child_ids': fields.one2many('idea.category', 'parent_id', 'Child Categories')
     }
     _sql_constraints = [
         ('name', 'unique(parent_id,name)', 'The name of the category must be unique' )
@@ -44,11 +46,18 @@ idea_category()
 
 
 class idea_idea(osv.osv):
+    """ Idea """
     _name = 'idea.idea'
     _rec_name = 'title'
 
     def _vote_avg_compute(self, cr, uid, ids, name, arg, context = None):
-        """ compute average for voting """
+
+        """ compute average for voting
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List of voting’s IDs
+         @return: dictionay of Idea """
+
         if not ids:
             return {}
 
@@ -61,8 +70,14 @@ class idea_idea(osv.osv):
         cr.execute(sql, (ids,))
         return dict(cr.fetchall())
 
-    def _vote_count(self,cr,uid,ids,name,arg,context=None):
-        """ count number of vote """
+    def _vote_count(self, cr, uid, ids, name, arg, context=None):
+
+        """ count number of vote
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List of voting count’s IDs
+         @return: dictionay of Idea """
+
         if not ids:
             return {}
 
@@ -75,8 +90,14 @@ class idea_idea(osv.osv):
         cr.execute(sql, (ids,))
         return dict(cr.fetchall())
 
-    def _comment_count(self,cr,uid,ids,name,arg,context=None):
-        """ count number of comment """
+    def _comment_count(self, cr, uid, ids, name, arg, context=None):
+
+        """ count number of comment
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of comment’s IDs
+        @return: dictionay of Idea """
+
         if not ids:
             return {}
 
@@ -86,32 +107,46 @@ class idea_idea(osv.osv):
                     GROUP BY i.id
                 """
 
-        cr.execute(sql,(ids,))
+        cr.execute(sql, (ids,))
         return dict(cr.fetchall())
 
     def _vote_read(self, cr, uid, ids, name, arg, context = None):
+
+        """ Read Vote
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of vote read’s IDs """
+
         res = {}
         for id in ids:
             res[id] = '-1'
         vote_obj = self.pool.get('idea.vote')
         votes_ids = vote_obj.search(cr, uid, [('idea_id', 'in', ids), ('user_id', '=', uid)])
         vote_obj_id = vote_obj.browse(cr, uid, votes_ids, context)
+
         for vote in vote_obj_id:
             res[vote.idea_id.id] = vote.score
         return res
 
     def _vote_save(self, cr, uid, id, field_name, field_value, arg, context = None):
+
+        """ save Vote
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of vote save’s IDs """
+
         vote_obj = self.pool.get('idea.vote')
-        vote = vote_obj.search(cr,uid,[('idea_id', '=', id),('user_id', '=', uid)])
+        vote = vote_obj.search(cr, uid, [('idea_id', '=', id), ('user_id', '=', uid)])
         textual_value = str(field_value)
+
         if vote:
-            if int(field_value)>=0:
-                vote_obj.write(cr,uid,vote,{'score': textual_value })
+            if int(field_value) >= 0:
+                vote_obj.write(cr, uid, vote, {'score': textual_value })
             else:
-                vote_obj.unlink(cr,uid,vote)
+                vote_obj.unlink(cr, uid, vote)
         else:
-            if int(field_value)>=0:
-                vote_obj.create(cr,uid, {'idea_id': id,'user_id': uid,'score': textual_value })
+            if int(field_value) >= 0:
+                vote_obj.create(cr, uid, {'idea_id': id, 'user_id': uid, 'score': textual_value })
 
 
     _columns = {
@@ -119,15 +154,20 @@ class idea_idea(osv.osv):
         'title': fields.char('Idea Summary', size=64, required=True),
         'description': fields.text('Description', required=True, help='Content of the idea'),
         'comment_ids': fields.one2many('idea.comment', 'idea_id', 'Comments'),
-        'create_date': fields.datetime( 'Creation date', readonly=True),
+        'create_date': fields.datetime('Creation date', readonly=True),
         'vote_ids': fields.one2many('idea.vote', 'idea_id', 'Vote'),
-        'my_vote': fields.function(_vote_read, fnct_inv = _vote_save, string="My Vote", method=True, type="selection", selection=VoteValues),
+        'my_vote': fields.function(_vote_read, fnct_inv = _vote_save, \
+                string="My Vote", method=True, type="selection", selection=VoteValues),
         'vote_avg': fields.function(_vote_avg_compute, method=True, string="Average Score", type="float"),
         'count_votes': fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
-        'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
-        'category_id': fields.many2one('idea.category', 'Category', required=True ),
-        'state': fields.selection([('draft','Draft'),('open','Opened'),('close','Accepted'),('cancel','Cancelled')], 'State', readonly=True,
-                                  help='When the Idea is created the state is \'Draft\'.\n It is opened by the user, the state is \'Opened\'.\
+        'count_comments': fields.function(_comment_count, method=True, \
+                                 string="Count of comments", type="integer"),
+        'category_id': fields.many2one('idea.category', 'Category', required=True),
+        'state': fields.selection([('draft', 'Draft'), ('open', 'Opened'), \
+                                ('close', 'Accepted'), ('cancel', 'Cancelled')], \
+                                 'State', readonly=True,
+                                  help='When the Idea is created the state is \'Draft\'.\n It is \
+                                   opened by the user, the state is \'Opened\'.\
                                     \nIf the idea is accepted, the state is \'Accepted\'.'),
         'stat_vote_ids': fields.one2many('idea.vote.stat', 'idea_id', 'Statistics', readonly=True),
     }
@@ -159,51 +199,61 @@ idea_idea()
 
 class idea_comment(osv.osv):
     """ Apply Idea for Comment """
+
     _name = 'idea.comment'
     _description = 'Comments'
     _rec_name = 'content'
+
     _columns = {
-        'idea_id': fields.many2one('idea.idea', 'Idea', required=True, ondelete='cascade' ),
-        'user_id': fields.many2one('res.users', 'User', required=True ),
-        'content': fields.text('Comment', required=True ),
-        'create_date' : fields.datetime('Creation date', readonly=True),
+        'idea_id': fields.many2one('idea.idea', 'Idea', required=True, ondelete='cascade'),
+        'user_id': fields.many2one('res.users', 'User', required=True),
+        'content': fields.text('Comment', required=True),
+        'create_date': fields.datetime('Creation date', readonly=True),
     }
+
     _defaults = {
         'user_id': lambda self, cr, uid, context: uid
     }
+
     _order = 'id desc'
+
 idea_comment()
 
 
 class idea_vote(osv.osv):
     """ Apply Idea for Vote """
+
     _name = 'idea.vote'
     _description = 'Vote for Idea'
     _rec_name = 'score'
+
     _columns = {
-        'user_id': fields.many2one( 'res.users', 'User'),
+        'user_id': fields.many2one('res.users', 'User'),
         'idea_id': fields.many2one('idea.idea', 'Idea', required=True, ondelete='cascade'),
-        'score': fields.selection( VoteValues, 'Score', required=True)
+        'score': fields.selection(VoteValues, 'Score', required=True)
     }
     _defaults = {
         'score': lambda *a: DefaultVoteValue,
     }
+
 idea_vote()
 
 
 class idea_vote_stat(osv.osv):
     """ Idea votes Statistics """
+
     _name = 'idea.vote.stat'
     _description = 'Idea Votes Statistics'
     _auto = False
     _rec_name = 'idea_id'
+
     _columns = {
         'idea_id': fields.many2one('idea.idea', 'Idea', readonly=True),
         'score': fields.selection(VoteValues, 'Score', readonly=True),
         'nbr': fields.integer('Number of Votes', readonly=True),
     }
 
-    def init(self,cr):
+    def init(self, cr):
         """
         initialize the sql view for the stats
 
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 88c196b2e43..9dad176d524 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-<!-- Idea Category  -->
+<!-- Idea Category Form View -->
 
     <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
         <record model="ir.ui.view" id="view_idea_category_form">
@@ -18,6 +18,9 @@
                 </form>
             </field>
         </record>
+
+<!-- Idea Category Tree View -->
+
         <record model="ir.ui.view" id="view_idea_category_tree">
             <field name="name">idea.category.tree</field>
             <field name="model">idea.category</field>
@@ -29,12 +32,16 @@
                 </tree>
             </field>
         </record>
+
+<!-- Idea Category Action -->
+
     <record model="ir.actions.act_window" id="action_idea_category">
         <field name="name">Categories</field>
         <field name="res_model">idea.category</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
+
     <menuitem name="Configuration" parent="base.menu_tools"
          id="base.menu_lunch_survey_root" sequence="6"/>
 
@@ -43,6 +50,8 @@
     <menuitem name="Categories" parent="menu_ideas"
     	id="menu_idea_category" action="action_idea_category" />
 
+<!-- Idea Category Action -->
+
     <record model="ir.actions.act_window" id="action_idea_category_tree">
         <field name="name">Ideas by Categories</field>
         <field name="res_model">idea.category</field>
@@ -57,7 +66,7 @@
         id="menu_idea_category_tree"
         action="action_idea_category_tree"/>
 
-<!-- Oepn Ideas  -->
+<!-- Oepn Ideas Action  -->
 
     <record model="ir.actions.act_window" id="action_idea_idea_categ_open">
         <field name="name">Open Ideas</field>
@@ -66,6 +75,7 @@
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','open'),('category_id','child_of',[active_id])]</field>
     </record>
+
     <record model="ir.values" id="action_idea_idea_categ_open_val">
         <field name="key2" eval=" 'tree_but_open'" />
         <field name="model" eval="'idea.category'" />
@@ -74,7 +84,7 @@
         <field name="object" eval="True" />
     </record>
 
-<!-- Idea statistics -->
+<!-- Idea statistics Form View -->
 
     <record model="ir.ui.view" id="view_idea_stat_form">
         <field name="name">idea.stat.form</field>
@@ -89,7 +99,7 @@
         </field>
     </record>
 
-<!-- Idea Vote  -->
+<!--Vote For Idea Tree View -->
 
     <record model="ir.ui.view" id="view_idea_vote_tree">
         <field name="name">idea.vote.tree</field>
@@ -103,6 +113,9 @@
         </tree>
         </field>
     </record>
+
+<!--Vote For Idea Form View  -->
+
     <record model="ir.ui.view" id="view_idea_vote_form">
         <field name="name">idea.vote.form</field>
         <field name="model">idea.vote</field>
@@ -116,7 +129,7 @@
         </field>
     </record>
 
-<!-- New Idea  -->
+<!-- New Idea Form View -->
 
     <record model="ir.ui.view" id="view_idea_idea_form">
         <field name="name">idea.idea.form</field>
@@ -166,6 +179,8 @@
         </field>
     </record>
 
+<!-- New Idea Tree View -->
+
     <record model="ir.ui.view" id="view_idea_idea_tree">
         <field name="name">idea.idea.tree</field>
         <field name="model">idea.idea</field>
@@ -179,7 +194,8 @@
             <field name="vote_avg" />
             <field name="count_comments" />
             <field name="count_votes" />
-            <button name="%(action_idea_post_vote)d" icon="gtk-execute" type="action" states="draft,open" string="Vote"/>
+            <button name="%(action_idea_post_vote)d" icon="gtk-execute"
+            	type="action" states="draft,open" string="Vote" />
         </tree>
         </field>
     </record>
@@ -208,7 +224,7 @@
         </field>
     </record>
 
-<!-- Comments on Idea  -->
+<!-- Comments on Idea Tree View -->
 
     <record model="ir.ui.view" id="view_idea_comment_tree">
         <field name="name">idea.comment.tree</field>
@@ -222,6 +238,9 @@
         </tree>
         </field>
     </record>
+
+<!-- Idea Action -->
+
     <record model="ir.actions.act_window" id="action_idea_idea">
         <field name="name">Ideas</field>
         <field name="res_model">idea.idea</field>
@@ -229,8 +248,11 @@
         <field name="view_mode">tree,form</field>
         <field name="search_view_id" ref="view_idea_idea_search"/>
     </record>
+
     <menuitem name="Ideas" parent="menu_ideas1" id="menu_idea_idea" action="action_idea_idea"/>
 
+<!-- Open Idea Action  -->
+
     <record model="ir.actions.act_window" id="action_idea_idea_open">
         <field name="name">Open Ideas</field>
         <field name="res_model">idea.idea</field>
@@ -240,6 +262,8 @@
         <field name="filter" eval="True"/>
     </record>
 
+<!-- Idea Votes Statistics Graph View -->
+
         <record model="ir.ui.view" id="view_idea_vote_stat_graph">
             <field name="name">idea.vote_stat.graph</field>
             <field name="model">idea.vote.stat</field>
@@ -252,6 +276,8 @@
             </field>
         </record>
 
+<!-- Idea Votes Statistics Form View -->
+
         <record model="ir.ui.view" id="view_idea_vote_stat_form">
             <field name="name">idea.vote.stat.form</field>
             <field name="model">idea.vote.stat</field>
@@ -264,6 +290,9 @@
                 </form>
             </field>
         </record>
+
+<!-- Idea Votes Statistics Tree View -->
+
         <record model="ir.ui.view" id="view_idea_vote_stat_tree">
             <field name="name">idea.vote.stat.tree</field>
             <field name="model">idea.vote.stat</field>
@@ -277,6 +306,8 @@
             </field>
         </record>
 
+<!-- Idea Votes Statistics Action -->
+
     <record model="ir.actions.act_window" id="action_idea_vote_stat">
         <field name="name">Statistics on Votes</field>
         <field name="res_model">idea.vote.stat</field>
@@ -290,6 +321,7 @@
 	<menuitem name="Vote Statistics" parent="menu_idea_reporting"
 		id="menu_idea_vote_stat" action="action_idea_vote_stat" />
 
+<!-- Vote For Idea Action  -->
 	<record model="ir.actions.act_window" id="action_idea_vote">
         <field name="name">Idea's vote</field>
         <field name="res_model">idea.vote</field>
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 4218f118772..0c720f2ee2d 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -5,3 +5,4 @@
 "access_idea_vote","idea.vote","model_idea_vote","base.group_user",1,1,1,1
 "access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,0,0,0
 "access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
+"idea_post_vote","idea.post.vote","model_idea_post_vote","base.group_user",1,1,1,1
diff --git a/addons/idea/wizard/__init__.py b/addons/idea/wizard/__init__.py
index 2e6f6d42096..7959847e4ef 100644
--- a/addons/idea/wizard/__init__.py
+++ b/addons/idea/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,8 +15,10 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import idea_post_vote
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index 858f85f214a..f76dd1aa562 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -18,12 +18,15 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 
 class idea_post_vote(osv.osv_memory):
+    """ Post Vote For Idea """
 
     _name = "idea.post.vote"
     _description = "Post vote"
+
     _columns = {
                 'vote': fields.selection([('-1', 'Not Voted'),
                                           ('0', 'Very Bad'),
@@ -34,6 +37,7 @@ class idea_post_vote(osv.osv_memory):
                 }
 
     def do_vote(self, cr, uid, ids, context):
+
         """
         Create idea vote.
         @param cr: the current row, from the database cursor,
@@ -41,10 +45,12 @@ class idea_post_vote(osv.osv_memory):
         @param ids: List of Idea Post vote’s IDs.
         @return: Dictionary {}
         """
+
         data = context and context.get('active_id', False) or False
         vote_obj = self.pool.get('idea.vote')
-        for dovote_obj in self.read(cr, uid, ids):
-            score = str(dovote_obj['vote'])
+
+        for do_vote_obj in self.read(cr, uid, ids):
+            score = str(do_vote_obj['vote'])
             dic = {'idea_id': data, 'user_id': uid, 'score': score }
             vote = vote_obj.create(cr, uid, dic)
             return {}
diff --git a/addons/idea/wizard/idea_post_vote_view.xml b/addons/idea/wizard/idea_post_vote_view.xml
index fecefacba1f..a6545c7d354 100644
--- a/addons/idea/wizard/idea_post_vote_view.xml
+++ b/addons/idea/wizard/idea_post_vote_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-<!-- Post Idea for vote   -->
+<!-- Post Idea for vote Form View  -->
 
   		<record id="view_idea_post_vote" model="ir.ui.view">
             <field name="name">idea.post.vote.form</field>
@@ -22,6 +22,8 @@
             </field>
   		</record>
 
+<!-- Post Idea for vote Action  -->
+
         <record id="action_idea_post_vote" model="ir.actions.act_window">
             <field name="name">Vote</field>
             <field name="res_model">idea.post.vote</field>
@@ -32,11 +34,12 @@
            <field name="context">{'record_id':active_id}</field>
         </record>
 
+<!-- Post Idea for vote Action Window  -->
+
         <act_window id="action_idea_post_vote_values"
     		key2="client_action_multi" name="vote"
     		res_model="idea.post.vote" src_model="idea.idea"
     		view_mode="form" target="new" view_type="form" />
 
-
     </data>
 </openerp>

From 4009482974533250261bd1f0321a448fb21804ca Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 17 Mar 2010 16:44:52 +0530
Subject: [PATCH 043/248] [FIX]: base_calendar: fixed problem of inviting
 partner with more than one contacts + send mail problem

bzr revid: rpa@tinyerp.com-20100317111452-49igqfs0n0i2nyx1
---
 addons/base_calendar/base_calendar.py | 45 +++++++++++++++++++--------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index b339b739642..479c65780ac 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -221,10 +221,12 @@ class invite_attendee_wizard(osv.osv_memory):
             res_obj = obj.browse(cr, uid, context['active_id'])
             type = datas.get('type')
             att_obj = self.pool.get('calendar.attendee')
-            vals = {}
+            vals = []
             mail_to = []
+            attendees = []
+            
             if not model == 'calendar.attendee':
-                vals = {'ref': '%s,%s' % (model, base_calendar_id2real_id(context['active_id']))}
+                ref = {'ref': '%s,%s' % (model, base_calendar_id2real_id(context['active_id']))}
     
             if type == 'internal':
                 user_obj = self.pool.get('res.users')
@@ -232,20 +234,28 @@ class invite_attendee_wizard(osv.osv_memory):
                     raise osv.except_osv(_('Error!'), ("Please select any User"))
                 for user_id in datas.get('user_ids'):
                     user = user_obj.browse(cr, uid, user_id)
-                    vals.update({'user_id': user_id, 
-                                         'email': user.address_id.email})
+                    res = {
+                           'user_id': user_id, 
+                           'email': user.address_id.email
+                           }
+                    res.update(ref)
+                    vals.append(res)
                     if user.address_id.email:
                         mail_to.append(user.address_id.email)
                     
             elif  type == 'external' and datas.get('email'):
-                vals.update({'email': datas['email']})
+                vals.append({'email': datas['email']})
                 mail_to.append(datas['email'])
+
             elif  type == 'partner':
                 add_obj = self.pool.get('res.partner.address')
                 for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
-                    vals.update({
-                                 'partner_address_id': contact.id, 
-                                 'email': contact.email})
+                    res = {
+                           'partner_address_id': contact.id, 
+                           'email': contact.email
+                           }
+                    res.update(ref)
+                    vals.append(res)
                     if contact.email:
                         mail_to.append(contact.email)
     
@@ -255,17 +265,23 @@ class invite_attendee_wizard(osv.osv_memory):
                     'parent_ids' : [(4, att.id)],
                     'ref': att.ref
                 })
+
+            for att_val in vals:
+                attendees.append(int(att_obj.create(cr, uid, att_val, context=context)))
+
+            if model_field:
+                for attendee in attendees:
+                    obj.write(cr, uid, res_obj.id, {model_field: [(4, attendee)]})
+
             if datas.get('send_mail'):
                 if not mail_to:
                     name =  map(lambda x: x[1], filter(lambda x: type==x[0], \
                                        self._columns['type'].selection))
                     raise osv.except_osv(_('Error!'), ("%s must have an email \
     Address to send mail") % (name[0]))
-                att_obj._send_mail(cr, uid, [att_id], mail_to, \
+                att_obj._send_mail(cr, uid, attendees, mail_to, \
                        email_from=tools.config.get('email_from', False))
-            att_id = att_obj.create(cr, uid, vals)
-            if model_field:
-                obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]})
+
         return {}
 
 
@@ -720,8 +736,11 @@ class calendar_event(osv.osv):
     def onchange_dates(self, cr, uid, ids, start_date, duration=False, end_date=False, context={}):
         if not start_date:
             return {}
-        start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
         value = {}
+        if not end_date and not duration:
+            duration = 8.00
+            value['duration'] = 8.00
+        start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
         if end_date and not duration:
             end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
             diff = end - start

From 764b7685a1c77b67b6de3ad6af78b16de3a619ea Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 17 Mar 2010 17:03:47 +0530
Subject: [PATCH 044/248] [FIX]: lunch: Fixed problem of cancel and confirm
 lunch wizard

bzr revid: rpa@tinyerp.com-20100317113347-1ceovcxubvsk47io
---
 addons/lunch/lunch.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index db7b6e53f59..3bf572d79e9 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -169,12 +169,12 @@ class lunch_order(osv.osv):
         for order in self.browse(cr, uid, ids):
             if order.state == 'confirmed':
                 continue
-            new_id = cashmove_ref.createcr, uid, {'name': order.product.name+' order',
+            new_id = cashmove_ref.create(cr, uid, {'name': order.product.name+' order',
                             'amount':-order.product.price,
                             'user_cashmove':order.user_id.id,
                             'box':box,
                             'active':True,
-                            }
+                            })
             self.write(cr, uid, [order.id], {'cashmove': new_id, 'state': 'confirmed'})
         return {}
 
@@ -189,7 +189,8 @@ class lunch_order(osv.osv):
         for order in orders:
             if not order.cashmove:
                 continue
-        self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id])
+        if order.cashmove.id:
+            self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id])
         self.write(cr, uid, ids, {'state':'draft'})
         return {}
 

From 85ae0fceee3d72a8355167e7710c992f244121ab Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Mar 2010 17:20:40 +0530
Subject: [PATCH 045/248] [IMP]: lunch: Improvement

bzr revid: ksa@tinyerp.co.in-20100317115040-812zv3ieasd4xm9p
---
 addons/lunch/lunch.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 3bf572d79e9..207d7ebe940 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -46,10 +46,11 @@ class lunch_product(osv.osv):
 
         """ Get category name
         @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,"""
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values"""
 
         obj = self.pool.get('lunch.category')
-        cat_ids = obj.search(cr,uid,[])
+        cat_ids = obj.search(cr, uid, [])
         res = obj.read(cr, uid, cat_ids, ['name', 'category'])
         return [(str(r['id']), r['name']) for r in res]+ [('0','')]
 
@@ -80,7 +81,8 @@ class lunch_cashbox(osv.osv):
         """ count available amount
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of create menu’s IDs """
+        @param ids: List of create menu’s IDs
+        @param context: A standard dictionary for contextual values """
 
         cr.execute("SELECT box,sum(amount) from lunch_cashmove where active = 't' group by box")
         amount = dict(cr.fetchall())
@@ -98,7 +100,7 @@ lunch_cashbox()
 
 
 class lunch_cashmove(osv.osv):
-    """ Move cah """
+    """ Move cash """
 
     _name = 'lunch.cashmove'
     _description = "Move cash"
@@ -131,7 +133,8 @@ class lunch_order(osv.osv):
         """ Get Price of Product
          @param cr: the current row, from the database cursor,
          @param uid: the current user’s ID for security checks,
-         @param ids: List of Lunch order’s IDs"""
+         @param ids: List of Lunch order’s IDs
+         @param context: A standard dictionary for contextual values """
 
         res = {}
         for price in self.browse(cr, uid, ids):
@@ -158,12 +161,13 @@ class lunch_order(osv.osv):
         'state': lambda self,cr,uid,context: 'draft',
     }
 
-    def confirm(self,cr,uid,ids,box,context):
+    def confirm(self, cr, uid, ids, box, context):
 
         """ confirm order
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of confirm order’s IDs """
+        @param ids: List of confirm order’s IDs
+        @param context: A standard dictionary for contextual values """
 
         cashmove_ref = self.pool.get('lunch.cashmove')
         for order in self.browse(cr, uid, ids):
@@ -183,7 +187,8 @@ class lunch_order(osv.osv):
         """" cancel order
          @param cr: the current row, from the database cursor,
          @param uid: the current user’s ID for security checks,
-         @param ids: List of create menu’s IDs """
+         @param ids: List of create menu’s IDs
+         @param context: A standard dictionary for contextual values """
 
         orders = self.browse(cr, uid, ids)
         for order in orders:
@@ -199,7 +204,8 @@ class lunch_order(osv.osv):
         """ Get price for Product
          @param cr: the current row, from the database cursor,
          @param uid: the current user’s ID for security checks,
-         @param ids: List of create menu’s IDs """
+         @param ids: List of create menu’s IDs
+         @product: Product To Ordered """
 
         if not product:
             return {'value': {'price': 0.0}}

From a6cfc17f74f392410499b071cb27dcfac92c126d Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Wed, 17 Mar 2010 18:25:17 +0530
Subject: [PATCH 046/248] [IMP]: base_report_creator: code optimization and
 apply csv file

bzr revid: atp@tinyerp.co.in-20100317125517-2j196axg121h0k2x
---
 .../base_report_creator.py                    | 380 +++++++++++-------
 .../base_report_creator_view.xml              |   3 +-
 .../security/ir.model.access.csv              |   9 +-
 .../wizard/report_menu_create.py              |  10 +-
 4 files changed, 238 insertions(+), 164 deletions(-)

diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 95c2e8a76e6..00f23faba99 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -19,10 +19,7 @@
 #
 ##############################################################################
 
-import string
-import time
-import tools
-from osv import fields,osv,orm
+from osv import fields, osv
 from tools.translate import _
 
 class report_creator(osv.osv):
@@ -36,51 +33,74 @@ class report_creator(osv.osv):
     # Should request only used fields
     #
     def export_data(self, cr, uid, ids, fields_to_export, context=None):
+        
         if not context:
             context = {}
         data_l = self.read(cr, uid, ids, ['sql_query'], context)
-        final_datas =[]
+        final_datas = []
         #start Loop
         for i in data_l:
             datas = []
-            for key,value in i.items():
+            for key, value in i.items():
                 if key not in fields_to_export:
                     continue
-                if isinstance(value,tuple):
+                if isinstance(value, tuple):
                     datas.append(str(value[1]))
                 else:
                     datas.append(str(value))
             final_datas += [datas]
             #End Loop
-        return {'datas':final_datas}
+        return {'datas': final_datas}
         
     def fields_get(self, cr, user, fields=None, context=None):
+        """
+        Get Fields.
+        @param cr: the current row, from the database cursor,
+        @param user: the current user’s ID for security checks,
+        @param Fields: List of field of customer reports form.
+        @return: Dictionary of Fields
+        """
+        if not context:
+            context = {}
+            
+        data = context and context.get('report_id', False) or False
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).fields_get(cr, user, fields, context)
-        report = self.browse(cr, user, context['report_id'])
-        models = {}
+        if data:
+            report = self.browse(cr, user, data)
+            models = {}
         #Start Loop
-        for model in report.model_ids:
-            models[model.model] = self.pool.get(model.model).fields_get(cr, user, context=context)
-        #End Loop
-        fields = {}
-        i = 0
-        for f in report.field_ids:
-            if f.field_id.model:
-                fields['field'+str(i)] = models[f.field_id.model][f.field_id.name]
-                i+=1
-            else:
-                fields['column_count'] = {'readonly': True, 'type': 'integer', 'string': 'Count', 'size': 64, 'name': 'column_count'}
-            
-        return fields
+            for model in report.model_ids:
+                models[model.model] = self.pool.get(model.model).fields_get(cr, user, context=context)
+            #End Loop
+            fields = {}
+            i = 0
+            for f in report.field_ids:
+                if f.field_id.model:
+                    fields['field'+str(i)] = models[f.field_id.model][f.field_id.name]
+                    i += 1
+                else:
+                    fields['column_count'] = {'readonly': True, 'type': 'integer', 'string': 'Count', 'size': 64, 'name': 'column_count'}
+              
+            return fields
 
     #
     # Should Call self.fields_get !
     #
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """
+        Overrides orm field_view_get.
+        @param cr: the current row, from the database cursor,
+        @param user: the current user’s ID for security checks,
+        @return: Dictionary of Fields, arch and toolbar.
+        """
+        if not context:
+            context = {}
+          
+        data = context and context.get('report_id', False) or False    
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        report = self.browse(cr, user, context['report_id'])
+        report = self.browse(cr, user, data)
         models = {}
         for model in report.model_ids:
             models[model.model] = self.pool.get(model.model).fields_get(cr, user, context=context)
@@ -89,33 +109,33 @@ class report_creator(osv.osv):
         for f in report.field_ids:
             if f.field_id.model:
                 fields['field'+str(i)] = models[f.field_id.model][f.field_id.name]
-                i+=1
+                i += 1
             else:
                 fields['column_count'] = {'readonly': True, 'type': 'integer', 'string': 'Count', 'size': 64, 'name': 'column_count'}
             
         arch = '<?xml version="1.0" encoding="utf-8"?>\n'
-        if view_type=='graph':
-            arch +='<graph string="%s" type="%s" orientation="%s">' % (report.name, report.view_graph_type,report.view_graph_orientation)
+        if view_type == 'graph':
+            arch  += '<graph string="%s" type="%s" orientation="%s">' % (report.name, report.view_graph_type, report.view_graph_orientation)
             for val in ('x','y'):
                 i = 0
                 for f in report.field_ids:
-                    if f.graph_mode==val:
+                    if f.graph_mode == val:
                         if f.field_id.model:
                             arch += '<field name="%s" select="1"/>' % ('field'+str(i),)
-                            i+=1
+                            i += 1
                         else:
                             arch += '<field name="%s" select="1"/>' % ('column_count',)
                     
-        elif view_type=='calendar':
-            required_types = ['date_start','date_delay','color']
-            set_dict = {'view_type':view_type,'string':report.name}
+        elif view_type == 'calendar':
+            required_types = ['date_start', 'date_delay', 'color']
+            set_dict = {'view_type':view_type, 'string':report.name}
             temp_list = []
-            i=0
+            i = 0
             for f in report.field_ids:
                 if f.calendar_mode and f.calendar_mode in required_types:
                     if f.field_id.model:
                         field_cal = 'field'+str(i)
-                        i+=1
+                        i += 1
                     else:
                         field_cal = 'column_count'
                     set_dict[f.calendar_mode] = field_cal   
@@ -123,20 +143,20 @@ class report_creator(osv.osv):
 
                 else:
                     if f.field_id.model:
-                        temp_list.append('''<field name="%(name)s" select="1"/>''' % {'name':'field'+str(i)})
-                        i+=1
+                        temp_list.append('''<field name = "%(name)s" select = "1"/>''' % {'name': 'field' + str(i)})
+                        i += 1
                     else:
                         temp_list.append('''<field name="%(name)s" select="1"/>''' % {'name':'column_count'})    
                     
-            arch += '''<%(view_type)s string="%(string)s" date_start="%(date_start)s" ''' %set_dict
-            if set_dict.get('date_delay',False):
-                arch +=''' date_delay="%(date_delay)s"  '''%set_dict
+            arch += '''<% (view_type)s string = "%(string)s" date_start = "%(date_start)s" ''' % set_dict
+            if set_dict.get('date_delay', False):
+                arch += ''' date_delay = "%(date_delay)s"  ''' % set_dict
 
-            if set_dict.get('date_stop',False):
-                arch +=''' date_stop="%(date_stop)s" '''%set_dict
+            if set_dict.get('date_stop', False):
+                arch += ''' date_stop="%(date_stop)s" '''%set_dict
 
-            if set_dict.get('color',False):
-                arch +=''' color="%(color)s"'''%set_dict
+            if set_dict.get('color', False):
+                arch += ''' color="%(color)s"'''%set_dict
             arch += '''>'''
             arch += ''.join(temp_list)
         else:
@@ -144,8 +164,8 @@ class report_creator(osv.osv):
             i = 0
             for f in report.field_ids:
                 if f.field_id.model:
-                    arch += '<field name="%s" select="1"/>' % ('field'+str(i),)
-                    i+=1
+                    arch += '<field name="%s" select="1"/>' % ('field' + str(i),)
+                    i += 1
                 else:
                     arch += '<field name="%s" select="1"/>' % ('column_count',)
         arch += '</%s>' % (view_type,)
@@ -158,33 +178,53 @@ class report_creator(osv.osv):
             'action': [],
             'relate': []
         }
+        
         return result
 
     def read(self, cr, user, ids, fields = None, context = None, load = '_classic_read'):
+        """
+        overrides  orm Read method.Read List of fields for report creator.
+        @param cr: the current row, from the database cursor,
+        @param user: the current user’s ID for security checks,
+        @param ids: List of report creator's id.
+        @param fields: List of fields.
+        @return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
+        """
+        data = context and context.get('report_id', False) or False
         if (not context) or 'report_id' not in context:
             return super(report_creator, self).read(cr, user, ids, fields, context, load)
         ctx = context or {}
         wp = ''
-        if self.model_set_id:
-            wp = [self._id_get(cr, user, context['report_id'], context)+(' in (%s)' % (','.join(map(lambda x: "'"+str(x)+"'",ids))))]
-        report = self._sql_query_get(cr, user, [context['report_id']], 'sql_query', None, ctx, where_plus = wp)
-        sql_query = report[context['report_id']]
-        cr.execute(sql_query)
-        res = cr.dictfetchall()
-        fields_get = self.fields_get(cr,user,None,context)
-        for r in res:
-            for k in r:
-                r[k] = r[k] or False
-                field_dict = fields_get.get(k)
-                field_type = field_dict and field_dict.get('type',False) or False
-                if field_type and field_type == 'many2one':
-                    if r[k]==False:
-                        continue
-                    related_name = self.pool.get(field_dict.get('relation')).name_get(cr,user,[r[k]],context)[0]
-                    r[k] = related_name
-        return res
+        if data:
+            if self.model_set_id:
+                wp = [self._id_get(cr, user, data, context) + (' in (%s)' % (','.join(map(lambda x: "'" + str(x) + "'", ids))))]
+            report = self._sql_query_get(cr, user, [data], 'sql_query', None, ctx, where_plus = wp)
+            sql_query = report[data]
+            cr.execute(sql_query)
+            res = cr.dictfetchall()
+            fields_get = self.fields_get(cr, user, None, context)
+            for r in res:
+                for k in r:
+                    r[k] = r[k] or False
+                    field_dict = fields_get.get(k)
+                    field_type = field_dict and field_dict.get('type', False) or False
+                    if field_type and field_type == 'many2one':
+                        if r[k] == False:
+                            continue
+                        related_name = self.pool.get(field_dict.get('relation')).name_get(cr, user, [r[k]], context)[0]
+                        r[k] = related_name
+            
+            return res
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        """
+        overrides  orm search method.
+        @param cr: the current row, from the database cursor,
+        @param user: the current user’s ID for security checks,
+        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+        @return: List of id 
+        """
+
         context_id = context and context.get('report_id', False) or False
         
         if (not context) or 'report_id' not in context:
@@ -196,16 +236,16 @@ class report_creator(osv.osv):
             for f in report.field_ids:
                 if f.field_id.model:
                     fields['field'+str(i)] = (f.field_id.model, f.field_id.name)
-                    i+=1
+                    i += 1
                 else:
                     fields['column_count'] = (False, 'Count')   
             newargs = []
             newargs2 = []
             for a in args:
                 if fields[a[0]][0]:
-                    res = self.pool.get(fields[a[0]][0])._where_calc(cr, user, [[fields[a[0]][1],a[1],a[2]]], active_test = False, context = context)
-                    newargs+=res[0]
-                    newargs2+=res[1]
+                    res = self.pool.get(fields[a[0]][0])._where_calc(cr, user, [[fields[a[0]][1], a[1], a[2]]], active_test = False, context = context)
+                    newargs += res[0]
+                    newargs2 += res[1]
                 else:
                     newargs += [("count(*) " + a[1] +" " + str(a[2]))]
             ctx = context or {}
@@ -216,8 +256,12 @@ class report_creator(osv.osv):
             result = cr.fetchall()
             return map(lambda x: x[0], result)
 
-    def _path_get(self,cr, uid, models, filter_ids=[]):
-        
+    def _path_get(self, cr, uid, models, filter_ids=[]):
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param models: List of object.
+        """
         self.model_set_id = False
         model_dict = {}
         from_list = []
@@ -225,7 +269,7 @@ class report_creator(osv.osv):
         filter_list = []
         for model in models:
             model_dict[model.model] = self.pool.get(model.model)._table
-            
+        
         model_list = model_dict.keys()
         reference_model_dict = {}
         for model in model_dict:
@@ -233,7 +277,7 @@ class report_creator(osv.osv):
             rest_list = model_dict.keys()
             rest_list.remove(model)
             model_pool = self.pool.get(model)
-            fields_get = model_pool.fields_get(cr,uid)
+            fields_get = model_pool.fields_get(cr, uid)
             model_columns = {}
             
             def _get_inherit_fields(obj):
@@ -242,24 +286,24 @@ class report_creator(osv.osv):
                 model_columns.update(pool_model._columns)
                 #Adding the columns of its _inherits
                 for record in pool_model._inherits.keys():
-                     _get_inherit_fields(record)
+                    _get_inherit_fields(record)
 
             _get_inherit_fields(model)         
             
-            fields_filter = dict(filter(lambda x:x[1].get('relation',False) 
+            fields_filter = dict(filter(lambda x:x[1].get('relation', False) 
                                         and x[1].get('relation') in rest_list 
-                                        and x[1].get('type')=='many2one' 
-                                        and not (isinstance(model_columns[x[0]],fields.function) or isinstance(model_columns[x[0]],fields.related)), fields_get.items()))
+                                        and x[1].get('type') == 'many2one' 
+                                        and not (isinstance(model_columns[x[0]], fields.function) or isinstance(model_columns[x[0]], fields.related)), fields_get.items()))
             if fields_filter:
                 model in model_list and model_list.remove(model)
-            model_count = reference_model_dict.get(model,False)
+            model_count = reference_model_dict.get(model, False)
             if model_count:
                 reference_model_dict[model] = model_count +1
             else:
                 reference_model_dict[model] = 1
-            for k,v in fields_filter.items():
+            for k, v in fields_filter.items():
                 v.get('relation') in model_list and model_list.remove(v.get('relation'))
-                relation_count = reference_model_dict.get(v.get('relation'),False)
+                relation_count = reference_model_dict.get(v.get('relation'), False)
                 if relation_count:
                     reference_model_dict[v.get('relation')] = relation_count+1
                 else:
@@ -271,9 +315,9 @@ class report_creator(osv.osv):
         if reference_model_dict:
             self.model_set_id = model_dict.get(reference_model_dict.keys()[reference_model_dict.values().index(min(reference_model_dict.values()))])
         if model_list and not len(model_dict.keys()) == 1:
-            raise osv.except_osv(_('No Related Models!!'),_('These is/are model(s) (%s) in selection which is/are not related to any other model') % ','.join(model_list))
+            raise osv.except_osv(_('No Related Models!!'), _('These is/are model(s) (%s) in selection which is/are not related to any other model') % ','.join(model_list))
 
-        if filter_ids and where_list<>[]:
+        if filter_ids and where_list <> []:
             filter_list.append(' and ')
             filter_list.append(' ')
 
@@ -288,25 +332,32 @@ class report_creator(osv.osv):
         else:
             ret_str = ",\n".join(from_list)
 
-
         if where_list:
             where_list = list(set(where_list))
-            ret_str+="\n where \n"+" and\n".join(where_list)
+            ret_str += "\n where \n"+" and\n".join(where_list)
             ret_str = ret_str.strip()
         if filter_list:
-            ret_str +="\n".join(filter_list)
+            ret_str += "\n".join(filter_list)
             if ret_str.endswith('and'):
                 ret_str = ret_str[0:len(ret_str)-3]
             if ret_str.endswith('or'):
                 ret_str = ret_str[0:len(ret_str)-2]
             ret_str = ret_str.strip()
-        return ret_str % {'uid' : uid}
+       
+        return ret_str % {'uid': uid}
 
     def _id_get(self, cr, uid, id, context):
+        """
+        Get Model id
+        """
 #       return 'min(sale_order_line.id)'
         return self.model_set_id and 'min('+self.model_set_id+'.id)'
 
     def _sql_query_get(self, cr, uid, ids, prop, unknow_none, context, where_plus=[], limit=None, offset=None):
+        """
+        Get sql query which return on sql_query field.
+        @return: Dictionary of sql query. 
+        """
         result = {}
         for obj in self.browse(cr, uid, ids):
             fields = []
@@ -315,7 +366,7 @@ class report_creator(osv.osv):
             for f in obj.field_ids:
                 # Allowing to use count(*)
                 if not f.field_id.model and f.group_method == 'count':
-                    fields.insert(0,('count(*) as column_count'))
+                    fields.insert(0, ('count(*) as column_count'))
                     continue
                 t = self.pool.get(f.field_id.model_id.model)._table
                 if f.group_method == 'group':
@@ -323,11 +374,11 @@ class report_creator(osv.osv):
                 else:
                     fields.append('\t'+f.group_method+'('+t+'.'+f.field_id.name+')'+' as field'+str(i))
                 groupby.append(t+'.'+f.field_id.name)
-                i+=1
+                i += 1
             models = self._path_get(cr, uid, obj.model_ids, obj.filter_ids)
             check = self._id_get(cr, uid, ids[0], context)
             if check<>False:
-                fields.insert(0,(check+' as id'))
+                fields.insert(0, (check + ' as id'))
 
             if models:
                 result[obj.id] = """select
@@ -348,49 +399,58 @@ class report_creator(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Report Name',size=64, required=True),
-        'type': fields.selection([('list', 'Rows And Columns Report'), ], 'Report Type', required=True),#('sum','Summation Report')
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the report without removing it."),
-        'view_type1': fields.selection([('form','Form'),
-                                        ('tree','Tree'),
-                                        ('graph','Graph'),
-                                        ('calendar','Calendar')], 'First View', required=True),
-        'view_type2': fields.selection([('','/'),
-                                        ('form','Form'),
-                                        ('tree','Tree'),
-                                        ('graph','Graph'),
-                                        ('calendar','Calendar')], 'Second View'),
-        'view_type3': fields.selection([('','/'),
-                                        ('form','Form'),
-                                        ('tree','Tree'),
-                                        ('graph','Graph'),
-                                        ('calendar','Calendar')], 'Third View'),
-        'view_graph_type': fields.selection([('pie','Pie Chart'),
-                                             ('bar','Bar Chart')], 'Graph Type', required=True),
-        'view_graph_orientation': fields.selection([('horz','Horizontal'),
-                                                    ('vert','Vertical')], 'Graph Orientation', required=True),
-        'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id','model_id', 'Reported Objects'),
-        'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'),
-        'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'),
+        'name': fields.char('Report Name', size=64, required=True), 
+        'type': fields.selection([('list', 'Rows And Columns Report'), ], 'Report Type', required=True), #('sum','Summation Report')
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the report without removing it."), 
+        'view_type1': fields.selection([('form', 'Form'), 
+                                        ('tree', 'Tree'), 
+                                        ('graph', 'Graph'), 
+                                        ('calendar', 'Calendar')], 'First View', required=True), 
+        'view_type2': fields.selection([('', '/'), 
+                                        ('form', 'Form'), 
+                                        ('tree', 'Tree'), 
+                                        ('graph', 'Graph'), 
+                                        ('calendar', 'Calendar')], 'Second View'), 
+        'view_type3': fields.selection([('', '/'), 
+                                        ('form', 'Form'), 
+                                        ('tree', 'Tree'), 
+                                        ('graph', 'Graph'), 
+                                        ('calendar', 'Calendar')], 'Third View'), 
+        'view_graph_type': fields.selection([('pie', 'Pie Chart'), 
+                                             ('bar', 'Bar Chart')], 'Graph Type', required=True), 
+        'view_graph_orientation': fields.selection([('horz', 'Horizontal'), 
+                                                    ('vert', 'Vertical')], 'Graph Orientation', required=True), 
+        'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id', 'model_id', 'Reported Objects'), 
+        'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'), 
+        'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'), 
         'state': fields.selection([
-                ('draft','Draft'),
-                ('valid','Valid')],
-                'State', required=True,
+                ('draft', 'Draft'), 
+                ('valid', 'Valid')], 
+                'State', required=True, 
                 help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed custom report. \
-                    \n* The \'Valid\' state is used when user validates the custom report.'),
-        'sql_query': fields.function(_sql_query_get, method=True, type="text", string='SQL Query', store=True),
-        'group_ids': fields.many2many('res.groups', 'base_report_creator_group_rel','report_id','group_id','Authorized Groups'),
+                    \n* The \'Valid\' state is used when user validates the custom report.'), 
+        'sql_query': fields.function(_sql_query_get, method=True, type="text", string='SQL Query', store=True), 
+        'group_ids': fields.many2many('res.groups', 'base_report_creator_group_rel', 'report_id', 'group_id', 'Authorized Groups'), 
     }
     _defaults = {
-        'type': lambda *args: 'list',
-        'state': lambda *args: 'draft',
-        'active': lambda *args: True,
-        'view_type1': lambda *args: 'tree',
-        'view_type2': lambda *args: 'graph',
-        'view_graph_type': lambda *args: 'bar',
-        'view_graph_orientation': lambda *args: 'horz',
+        'type': lambda *args: 'list', 
+        'state': lambda *args: 'draft', 
+        'active': lambda *args: True, 
+        'view_type1': lambda *args: 'tree', 
+        'view_type2': lambda *args: 'graph', 
+        'view_graph_type': lambda *args: 'bar', 
+        'view_graph_orientation': lambda *args: 'horz', 
     }
     def _function_field(self, cr, uid, ids):
+        """
+        constraints function which specify that 
+                not display field which are not stored in Database.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Report creator's id.       
+        @return: True if display field which are  stored in database.
+                     or false if display field which are not store in dtabase.
+        """
         this_objs = self.browse(cr, uid, ids)
         for obj in this_objs:
             for fld in obj.field_ids:
@@ -398,13 +458,23 @@ class report_creator(osv.osv):
                 if not fld.field_id.model and fld.group_method == 'count':
                     continue
                 model_column = self.pool.get(fld.field_id.model)._columns[fld.field_id.name]
-                if (isinstance(model_column,fields.function) or isinstance(model_column,fields.related)) and not model_column.store:
+                if (isinstance(model_column, fields.function) or isinstance(model_column, fields.related)) and not model_column.store:
                     return False
         return True
 
     def _aggregation_error(self, cr, uid, ids):
-        aggregate_columns = ('integer','float')
-        apply_functions = ('sum','min','max','avg','count')
+        """
+        constraints function which specify that 
+                aggregate function to the non calculated field..
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Report creator's id.       
+        @return: True if model colume type is in integer or float.
+                     or false model colume type is not in integer or float.
+        """
+        
+        aggregate_columns = ('integer', 'float')
+        apply_functions = ('sum', 'min', 'max', 'avg', 'count')
         this_objs = self.browse(cr, uid, ids)
         for obj in this_objs:
             for fld in obj.field_ids:
@@ -421,7 +491,7 @@ class report_creator(osv.osv):
         required_types = []
         this_objs = self.browse(cr, uid, ids)
         for obj in this_objs:
-            if obj.view_type1=='calendar' or obj.view_type2=='calendar' or obj.view_type3=='calendar':
+            if obj.view_type1 == 'calendar' or obj.view_type2 == 'calendar' or obj.view_type3 == 'calendar':
                 for fld in obj.field_ids:
                     # Allowing to use count(*)
                     if not fld.field_id.model and fld.group_method == 'count':
@@ -438,12 +508,13 @@ class report_creator(osv.osv):
         return True
 
     _constraints = [
-        (_function_field, 'You can not display field which are not stored in Database.', ['field_ids']),
-        (_aggregation_error, 'You can apply aggregate function to the non calculated field.', ['field_ids']),
-        (_calander_view_error, "You must have to give calendar view's color,start date and delay.", ['field_ids']),
+        (_function_field, 'You can not display field which are not stored in Database.', ['field_ids']), 
+        (_aggregation_error, 'You can apply aggregate function to the non calculated field.', ['field_ids']), 
+        (_calander_view_error, "You must have to give calendar view's color,start date and delay.", ['field_ids']), 
     ]
 report_creator()
 
+
 class report_creator_field(osv.osv):
     """
     Report Creator Field
@@ -453,28 +524,29 @@ class report_creator_field(osv.osv):
     _rec_name = 'field_id'
     _order = "sequence,id"
     _columns = {
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of fields."),
-        'field_id': fields.many2one('ir.model.fields', 'Field'),
-        'report_id': fields.many2one('base_report_creator.report','Report', on_delete='cascade'),
-        'group_method': fields.selection([('group','Grouped'),
-                                          ('sum','Sum'),
-                                          ('min','Minimum'),
-                                          ('count','Count'),
-                                          ('max','Maximum'),
-                                          ('avg','Average')], 'Grouping Method', required=True),
-        'graph_mode': fields.selection([('','/'), 
-                                        ('x','X Axis'),
-                                        ('y','Y Axis')], 'Graph Mode'),
-        'calendar_mode': fields.selection([('','/'),
-                                           ('date_start','Starting Date'),
-                                           ('date_end','Ending Date'),('date_delay','Delay'),('date_stop','End Date'),('color','Unique Colors')], 'Calendar Mode'),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of fields."), 
+        'field_id': fields.many2one('ir.model.fields', 'Field'), 
+        'report_id': fields.many2one('base_report_creator.report', 'Report', on_delete='cascade'), 
+        'group_method': fields.selection([('group', 'Grouped'), 
+                                          ('sum', 'Sum'), 
+                                          ('min', 'Minimum'), 
+                                          ('count', 'Count'), 
+                                          ('max', 'Maximum'), 
+                                          ('avg', 'Average')], 'Grouping Method', required=True), 
+        'graph_mode': fields.selection([('', '/'), 
+                                        ('x', 'X Axis'), 
+                                        ('y', 'Y Axis')], 'Graph Mode'), 
+        'calendar_mode': fields.selection([('', '/'), 
+                                           ('date_start', 'Starting Date'), 
+                                           ('date_end', 'Ending Date'), ('date_delay', 'Delay'), ('date_stop', 'End Date'), ('color', 'Unique Colors')], 'Calendar Mode'), 
     }
     _defaults = {
-        'group_method': lambda *args: 'group',
-        'graph_mode': lambda *args: '',
+        'group_method': lambda *args: 'group', 
+        'graph_mode': lambda *args: '', 
     }
 report_creator_field()
 
+
 class report_creator_filter(osv.osv):
     """
     Report Creator Filter
@@ -482,14 +554,14 @@ class report_creator_filter(osv.osv):
     _name = "base_report_creator.report.filter"
     _description = "Report Filters"
     _columns = {
-        'name': fields.char('Filter Name',size=64, required=True),
-        'expression': fields.text('Value', required=True, help='Provide an expression for the field based on which you want to filter the records.\n e.g. res_partner.id=3'),
-        'report_id': fields.many2one('base_report_creator.report', 'Report', on_delete='cascade'),
-        'condition' : fields.selection([('and','AND'),
-                                        ('or','OR')], 'Condition')
+        'name': fields.char('Filter Name', size=64, required=True), 
+        'expression': fields.text('Value', required=True, help='Provide an expression for the field based on which you want to filter the records.\n e.g. res_partner.id=3'), 
+        'report_id': fields.many2one('base_report_creator.report', 'Report', on_delete='cascade'), 
+        'condition': fields.selection([('and', 'AND'), 
+                                        ('or', 'OR')], 'Condition')
     }
     _defaults = {
-        'condition': lambda *args: 'and',
+        'condition': lambda *args: 'and', 
     }
 report_creator_filter()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index a69aed42048..ac3052a7769 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -41,7 +41,8 @@
                 <field name="active" select="2"/>
                 <notebook colspan="4">
                 <page string="General Configuration">
-                    <field name="model_ids" colspan="4" context="{'model_ids':model_ids}"/>
+                    <field name="model_ids" colspan="4"
+                    	context="{'model_ids':model_ids}" />
                     <separator string="State"  colspan="4"/>
                     <field name="state"/>
                     <button string="Create Menu"
diff --git a/addons/base_report_creator/security/ir.model.access.csv b/addons/base_report_creator/security/ir.model.access.csv
index d5c50e3920e..932c1a623f6 100644
--- a/addons/base_report_creator/security/ir.model.access.csv
+++ b/addons/base_report_creator/security/ir.model.access.csv
@@ -1,4 +1,5 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_base_report_creator_report,base_report_creator.report,model_base_report_creator_report,base.group_system,1,1,1,1
-access_base_report_creator_report_fields,base_report_creator.report.fields,model_base_report_creator_report_fields,base.group_system,1,1,1,1
-access_base_report_creator_report_filter,base_report_creator.report.filter,model_base_report_creator_report_filter,base.group_system,1,1,1,1
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_base_report_creator_report","base_report_creator.report","model_base_report_creator_report","base.group_system",1,1,1,1
+"access_base_report_creator_report_fields","base_report_creator.report.fields","model_base_report_creator_report_fields","base.group_system",1,1,1,1
+"access_base_report_creator_report_filter","base_report_creator.report.filter","model_base_report_creator_report_filter","base.group_system",1,1,1,1
+"access_report_menu_create","report.menu.create","model_report_menu_create","base.group_system",1,1,1,1
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index 4bf284e4d38..06e48b2ee8f 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -38,18 +38,18 @@ class report_menu_create(osv.osv_memory):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Report Menu Create's IDs
-        @return : Dictionary {}.
+        @return: Dictionary {}.
         """
         if not context:
-            context={}
+            context = {}
         context_id = context and context.get('active_id', False) or False
         if context_id:
             board = self.pool.get('base_report_creator.report').browse(cr, uid, context_id)
             view = board.view_type1
             if board.view_type2:
-                view+=','+board.view_type2
+                view += ',' + board.view_type2
             if board.view_type3:
-                view+=','+board.view_type3
+                view += ',' + board.view_type3
             action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
                 'name': board.name,
                 'view_type':'form',
@@ -64,7 +64,7 @@ class report_menu_create(osv.osv_memory):
                 'name': data.get('menu_name'),
                 'parent_id': data.get('menu_parent_id'),
                 'icon': 'STOCK_SELECT_COLOR',
-                'action': 'ir.actions.act_window,'+str(action_id)
+                'action': 'ir.actions.act_window, ' + str(action_id)
                 }, context=context)
             return {}
         #End Loop

From bd9e9ef507d254fd1c8682d6312b4e543c6bddff Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 17 Mar 2010 18:27:11 +0530
Subject: [PATCH 047/248] [REF]: crm: * Improvement in lead, opportunity wizard
 * Improved code quality * Put proper docstring

bzr revid: rpa@tinyerp.com-20100317125711-z59f06w4x8fdefl1
---
 addons/crm/__terp__.py                        |   2 +-
 addons/crm/crm_phonecall_view.xml             |   2 +-
 addons/crm/wizard/__init__.py                 |   2 +-
 addons/crm/wizard/crm_lead_to_opportunity.py  |  53 +++----
 .../crm/wizard/crm_opportunity_to_meeting.py  |   1 -
 .../wizard/crm_opportunity_to_phonecall.py    |   9 +-
 addons/crm/wizard/crm_phonecall2phonecall.py  | 145 ++++++++++++------
 addons/crm/wizard/crm_phonecall2phonecall.xml |  16 +-
 .../wizard/crm_phonecall_to_opportunity.py    | 135 ++++++++++++++++
 ... => crm_phonecall_to_opportunity_view.xml} |  16 +-
 addons/crm/wizard/phonecall_to_opportunity.py | 107 -------------
 11 files changed, 290 insertions(+), 198 deletions(-)
 create mode 100644 addons/crm/wizard/crm_phonecall_to_opportunity.py
 rename addons/crm/wizard/{phonecall2opportunity.xml => crm_phonecall_to_opportunity_view.xml} (78%)
 delete mode 100644 addons/crm/wizard/phonecall_to_opportunity.py

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index bf14aab0eb6..26d80adaf68 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -66,7 +66,7 @@ between mails and Open ERP.""",
         'wizard/crm_phonecall2phonecall.xml',
         'wizard/phonecall2meeting.xml',
         'wizard/phonecall2partner_view.xml',
-        'wizard/phonecall2opportunity.xml',
+        'wizard/crm_phonecall_to_opportunity_view.xml',
         'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/crm_opportunity_to_phonecall_view.xml',
         'crm_wizard.xml', 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 416e0802b92..1574b171c3c 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -86,7 +86,7 @@
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
 					<label colspan="6"  string=""/>                                 
-	                <button string="Schedule Call Other" 
+	                <button string="Schedule Other Call" 
 	                 icon="gtk-redo"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index b477600af07..2e9ab90561b 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -34,7 +34,7 @@ import crm_opportunity_to_phonecall
 import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
-import phonecall_to_opportunity
+import crm_phonecall_to_opportunity
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 7829a02f3ab..ad798607991 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -65,34 +65,35 @@ class crm_lead2opportunity(osv.osv_memory):
                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
             if id3:
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-        for this in self.browse(cr, uid, ids, context=context):
+            
             lead = lead_obj.browse(cr, uid, record_id, context=context)
-            new_opportunity_id = opp_obj.create(cr, uid, {
-                    'name': this.name, 
-                    'planned_revenue': this.planned_revenue, 
-                    'probability': this.probability, 
-                    'partner_id': lead.partner_id and lead.partner_id.id or False , 
-                    'section_id': lead.section_id and lead.section_id.id or False, 
-                    'description': lead.description or False, 
-                    'date_deadline': lead.date_deadline or False, 
-                    'partner_address_id': lead.partner_address_id and \
-                                    lead.partner_address_id.id or False , 
-                    'priority': lead.priority, 
-                    'phone': lead.phone, 
-                    'email_from': lead.email_from
-                })
 
-            new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
-            vals = {
-                    'partner_id': this.partner_id and this.partner_id.id or False, 
-                    }
-            if not lead.opportunity_id:
-                    vals.update({'opportunity_id' : new_opportunity.id})
-
-            lead_obj.write(cr, uid, [lead.id], vals)
-            lead_obj.case_close(cr, uid, [lead.id])
-            opp_obj.case_open(cr, uid, [new_opportunity_id])
+            for this in self.browse(cr, uid, ids, context=context):
+                new_opportunity_id = opp_obj.create(cr, uid, {
+                        'name': this.name, 
+                        'planned_revenue': this.planned_revenue, 
+                        'probability': this.probability, 
+                        'partner_id': lead.partner_id and lead.partner_id.id or False , 
+                        'section_id': lead.section_id and lead.section_id.id or False, 
+                        'description': lead.description or False, 
+                        'date_deadline': lead.date_deadline or False, 
+                        'partner_address_id': lead.partner_address_id and \
+                                        lead.partner_address_id.id or False , 
+                        'priority': lead.priority, 
+                        'phone': lead.phone, 
+                        'email_from': lead.email_from
+                    })
+    
+                new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
+                vals = {
+                        'partner_id': this.partner_id and this.partner_id.id or False, 
+                        }
+                if not lead.opportunity_id:
+                        vals.update({'opportunity_id' : new_opportunity.id})
+    
+                lead_obj.write(cr, uid, [lead.id], vals)
+                lead_obj.case_close(cr, uid, [lead.id])
+                opp_obj.case_open(cr, uid, [new_opportunity_id])
 
             value = {
                     'name': _('Opportunity'), 
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting.py b/addons/crm/wizard/crm_opportunity_to_meeting.py
index 9162edf28ff..2af7ddc8e35 100644
--- a/addons/crm/wizard/crm_opportunity_to_meeting.py
+++ b/addons/crm/wizard/crm_opportunity_to_meeting.py
@@ -68,7 +68,6 @@ class crm_opportunity2meeting(osv.osv_memory):
             if id3:
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
-        for this in self.browse(cr, uid, ids, context=context):
             opp = opp_obj.browse(cr, uid, record_id, context=context)
             context = {
                         'default_opportunity_id': opp.id, 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index 359ae594320..f816f51a89b 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -23,6 +23,8 @@ from osv import osv, fields
 from tools.translate import _
 
 class crm_opportunity2phonecall(osv.osv_memory):
+    """Converts Opportunity to Phonecall"""
+
     _name = 'crm.opportunity2phonecall'
     _description = 'Opportunity to Phonecall'
 
@@ -85,8 +87,11 @@ class crm_opportunity2phonecall(osv.osv_memory):
         result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
         res = mod_obj.read(cr, uid, result, ['res_id'])
 
-        # Select the view
         data_obj = self.pool.get('ir.model.data')
+        categ_id = mod_obj._get_id(cr, uid, 'crm', 'categ_phone1')
+        categ_id = data_obj.browse(cr, uid, categ_id, context=context).res_id
+        
+        # Select the view
         id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
         id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
         if id2:
@@ -100,7 +105,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
                         'name' : opp.name, 
                         'case_id' : opp.id , 
                         'user_id' : this.user_id and this.user_id.id or False, 
-                        'categ_id' : opp.categ_id and opp.categ_id.id or False, 
+                        'categ_id' : categ_id, 
                         'description' : opp.description or False, 
                         'date' : this.date, 
                         'section_id' : opp.section_id and opp.section_id.id or False, 
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
index 557b5da71f5..60c05e3d6ed 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.py
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -1,88 +1,131 @@
-# -*- encoding: utf-8 -*-
-############################################################################################
+# -*- coding: utf-8 -*-
+##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-############################################################################################
-############################################################################################
+##############################################################################
 
 from osv import osv, fields
-import netsvc
-import time
-import tools
-import mx.DateTime
-from tools import config
 from tools.translate import _
-import tools
 
 class crm_phonecall2phonecall(osv.osv_memory):
+    """ Converts Phonecall to Phonecall"""
+
     _name = 'crm.phonecall2phonecall'
     _description = 'Phonecall To Phonecall'
 
     def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Phonecall to Phonecall form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Phonecall's IDs
+        @param context: A standard dictionary for contextual values
+        """
         return {'type':'ir.actions.act_window_close'}
 
     def action_apply(self, cr, uid, ids, context=None):
-        this = self.browse(cr, uid, ids)[0]
-        values={}
-        record_id = context and context.get('record_id', False) or False
+        """
+        This converts Phonecall to Phonecall and opens Phonecall view
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Phonecall IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Opportunity form
+        """
+        res = {}
+        record_id = context and context.get('active_id', False) or False
+        phonecall_obj = self.pool.get('crm.phonecall')
+
         if record_id:
-            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
-                values['name']=this.name
-                values['user_id']=this.user_id and this.user_id.id
-                values['categ_id']=case.categ_id and case.categ_id.id or False
-                values['section_id']=case.section_id and case.section_id.id
-                values['description']=case.description or ''
-                values['partner_id']=case.partner_id.id
-                values['partner_address_id']=case.partner_address_id.id
-                values['partner_mobile']=case.partner_mobile or False
-                values['priority']=case.priority
-                values['partner_phone']=case.partner_phone or False
-                values['date']=this.date
-                phonecall_proxy = self.pool.get('crm.phonecall')
-                phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)
-            value = {            
+            data_obj = self.pool.get('ir.model.data')
+            
+            # Get Phonecall views
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+            phonecall = phonecall_obj.browse(cr, uid, record_id, context=context)
+
+            for this in self.browse(cr, uid, ids, context=context):
+                values = {
+                        'name': this.name, 
+                        'user_id': this.user_id and this.user_id.id, 
+                        'categ_id': phonecall.categ_id and phonecall.categ_id.id or False, 
+                        'section_id': phonecall.section_id and phonecall.section_id.id, 
+                        'description': phonecall.description or '', 
+                        'partner_id': phonecall.partner_id.id, 
+                        'partner_address_id': phonecall.partner_address_id.id, 
+                        'partner_mobile': phonecall.partner_mobile or False, 
+                        'priority': phonecall.priority, 
+                        'partner_phone': phonecall.partner_phone or False, 
+                        'date': this.date
+                          }
+                phonecall_id = phonecall_obj.create(cr, uid, values, context=context)
+            print phonecall_id
+            res = {
                 'name': _('Phone Call'),
                 'view_type': 'form',
                 'view_mode': 'form',
                 'res_model': 'crm.phonecall',
                 'view_id': False,
+                'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
                 'type': 'ir.actions.act_window',
                 'res_id': phonecall_id
                 }
-        return value
+        return res
 
     _columns = {
-        'name' : fields.char('Call summary', size=64, required=True, select=1),
-        'user_id' : fields.many2one('res.users',"Assign To"),
-        'date': fields.datetime('Date'),
-        'section_id':fields.many2one('crm.case.section','Sales Team'),
-
-    }
+                'name' : fields.char('Call summary', size=64, required=True, select=1),
+                'user_id' : fields.many2one('res.users',"Assign To"),
+                'date': fields.datetime('Date'),
+                'section_id':fields.many2one('crm.case.section','Sales Team'),
+                }
+    
     def default_get(self, cr, uid, fields, context=None):
-        record_id = context and context.get('record_id', False) or False
-        res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        record_id = context and context.get('active_id', False) or False
         if record_id:
-            phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
-            res['name']=phonecall_id.name
-            res['user_id']=phonecall_id.user_id and phonecall_id.user_id.id or False
-            res['date']=phonecall_id.date 
-            res['section_id']=phonecall_id.section_id and phonecall_id.section_id.id or False 
+            phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
+            res = {
+                    'name': phonecall.name, 
+                    'user_id': phonecall.user_id and phonecall.user_id.id or False, 
+                    'date': phonecall.date, 
+                    'section_id': phonecall.section_id and phonecall.section_id.id or False
+                   }
         return res
-crm_phonecall2phonecall()
\ No newline at end of file
+
+crm_phonecall2phonecall()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.xml b/addons/crm/wizard/crm_phonecall2phonecall.xml
index b4911e48b15..cdc673d0e65 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.xml
+++ b/addons/crm/wizard/crm_phonecall2phonecall.xml
@@ -1,23 +1,31 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+    
+    <!-- Phonecall to Phonecall view -->
+    
         <record model="ir.ui.view" id="phonecall_to_phonecall_view">
             <field name="name">crm.phonecall2phonecall.form</field>
             <field name="model">crm.phonecall2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule Other Call" col="2">
+                <form string="Schedule Other Call">
                 		<field name="name"/>
 						<field name="user_id" />
 						<field name="date" string="Planned Date"/>
 						<field name="section_id"/>
-                    <group colspan="2" col="2" >
+						<separator string=" " colspan="4"/>
+                    <group colspan="4" col="3" >
+                    	<label string=" " />
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                        <button name="action_apply" type="object" string="_Schedule" icon="gtk-go-forward" />
                     </group>
                 </form>
             </field>
         </record>
+
+<!-- Phonecall to Phonecall action -->
+
         <record model="ir.actions.act_window" id="phonecall_to_phonecall_act">
             <field name="name">Schedule Other Call</field>
             <field name="res_model">crm.phonecall2phonecall</field>
@@ -25,7 +33,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="phonecall_to_phonecall_view"/>
             <field name="target">new</field>
-         	<field name="context">{'record_id' : active_id}</field>
         </record>
+
     </data>
 </openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
new file mode 100644
index 00000000000..b18e02270ad
--- /dev/null
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_phonecall2opportunity(osv.osv_memory):
+    """ Converts Phonecall to Opportunity"""
+
+    _name = 'crm.phonecall2opportunity'
+    _description = 'Phonecall To Opportunity'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Phonecall to Opportunity form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Opportunity's IDs
+        @param context: A standard dictionary for contextual values
+        """
+
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        """
+        This converts Phonecall to Opportunity and opens Phonecall view
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Opportunity IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Opportunity form
+        """
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            opp_obj = self.pool.get('crm.opportunity')
+            phonecall_obj = self.pool.get('crm.phonecall')
+            case = phonecall_obj.browse(cr, uid, record_id, context=context)
+
+            if case.state in ['done', 'cancel']:
+                raise osv.except_osv(_("Warning"), _("Closed/Cancelled Phone \
+Call Could not convert into Opportunity"))
+            else:
+                data_obj = self.pool.get('ir.model.data')
+                result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+                res = data_obj.read(cr, uid, result, ['res_id'])
+                id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+                id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+                if id2:
+                    id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+                if id3:
+                    id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+                for this in self.browse(cr, uid, ids, context=context):
+                    new_opportunity_id = opp_obj.create(cr, uid, {
+                                    'name': this.name, 
+                                    'planned_revenue': this.planned_revenue, 
+                                    'probability': this.probability, 
+                                    'partner_id': this.partner_id and this.partner_id.id or False, 
+                                    'section_id': case.section_id and case.section_id.id or False, 
+                                    'description': case.description or False, 
+                                    'phonecall_id': case.id, 
+                                    'priority': case.priority, 
+                                    'phone': case.partner_phone or False, 
+                                })
+                    new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
+                    vals = {
+                                'partner_id': this.partner_id.id, 
+                                'opportunity_id' : new_opportunity_id, 
+                                }
+                    phonecall_obj.write(cr, uid, [case.id], vals)
+                    phonecall_obj.case_close(cr, uid, [case.id])
+                    opp_obj.case_open(cr, uid, [new_opportunity_id])
+
+            value = {
+                'name': _('Opportunity'), 
+                'view_type': 'form', 
+                'view_mode': 'form,tree', 
+                'res_model': 'crm.opportunity', 
+                'res_id': int(new_opportunity_id), 
+                'view_id': False, 
+                'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')], 
+                'type': 'ir.actions.act_window', 
+                'search_view_id': res['res_id']
+            }
+            return value
+
+    _columns = {
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1), 
+        'probability': fields.float('Success Probability'), 
+        'planned_revenue': fields.float('Expected Revenue'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
+            res = {
+                    'name': phonecall.name, 
+                    'partner_id': phonecall.partner_id and phonecall.partner_id.id or False
+                   }
+        return res
+
+crm_phonecall2opportunity()
diff --git a/addons/crm/wizard/phonecall2opportunity.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
similarity index 78%
rename from addons/crm/wizard/phonecall2opportunity.xml
rename to addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index 607db601433..ea024831b54 100644
--- a/addons/crm/wizard/phonecall2opportunity.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -1,24 +1,32 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
+<!-- Phonecall to Opportunity view -->
+    
         <record model="ir.ui.view" id="phonecall2opportunity_view">
             <field name="name">crm.phonecall2opportunity.form</field>
             <field name="model">crm.phonecall2opportunity</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Convert To Opportunity " col="2">
+                <form string="Convert To Opportunity ">
                 		<field name="name"/>
 						<field name="partner_id" />
 						<newline/>
 						<field name="planned_revenue"/>
 						<field name="probability"/>
-                    <group colspan="2" col="2" >
+					<separator string=" " colspan="4"/>
+                    <group colspan="4" col="3" >
+                    	<label string=" " />
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                        <button name="action_apply" type="object" string="_Convert" icon="gtk-convert" />
                     </group>
                 </form>
             </field>
         </record>
+
+<!-- Phonecall to Opportunity action -->
+
         <record model="ir.actions.act_window" id="phonecall2opportunity_act">
             <field name="name">Convert To Opportunity</field>
             <field name="res_model">crm.phonecall2opportunity</field>
@@ -26,7 +34,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="phonecall2opportunity_view"/>
             <field name="target">new</field>
-         	<field name="context">{'record_id' : active_id}</field>
         </record>
+
     </data>
 </openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/phonecall_to_opportunity.py b/addons/crm/wizard/phonecall_to_opportunity.py
deleted file mode 100644
index f2cd3897fa6..00000000000
--- a/addons/crm/wizard/phonecall_to_opportunity.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- encoding: utf-8 -*-
-############################################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-############################################################################################
-############################################################################################
-
-from osv import osv, fields
-import netsvc
-import time
-import tools
-import mx.DateTime
-from tools import config
-from tools.translate import _
-import tools
-
-class crm_phonecall2opportunity(osv.osv_memory):
-    _name = 'crm.phonecall2opportunity'
-    _description = 'Phonecall To Opportunity'
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {'type':'ir.actions.act_window_close'}
-
-    def action_apply(self, cr, uid, ids, context=None):
-        this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('record_id', False) or False
-        if record_id:
-            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
-                if case.state in ['done', 'cancel']:       
-                            raise osv.except_osv(_("Warning"),
-                                                 _("Closed/Cancelled Phone Call Could not convert into Opportunity"))
-                else:
-                    data_obj = self.pool.get('ir.model.data')
-                    result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-                    res = data_obj.read(cr, uid, result, ['res_id'])
-                    id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-                    id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-                    if id2:
-                        id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-                    if id3:
-                        id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-                    opportunity_case_obj = self.pool.get('crm.opportunity')
-                    phonecall_case_obj = self.pool.get('crm.phonecall')
-                           
-                    new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
-                                    'name': this.name,
-                                    'planned_revenue': this.planned_revenue,
-                                    'probability': this.probability,
-                                    'partner_id': this.partner_id and  this.partner_id.id or False,                 
-                                    'section_id': case.section_id and case.section_id.id or False,
-                                    'description': case.description or False,         
-                                    'phonecall_id': case.id,
-                                    'priority': case.priority,
-                                    'phone': case.partner_phone or False,
-                                })
-                    new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
-                    vals = {
-                                'partner_id': this.partner_id.id, 
-                                'opportunity_id' : new_opportunity_id,                
-                                }            
-                    phonecall_case_obj.write(cr, uid, [case.id], vals)
-                    phonecall_case_obj.case_close(cr, uid, [case.id])
-                    phonecall_case_obj.case_open(cr, uid, [new_opportunity_id])
-            value = {            
-                'name': _('Opportunity'),
-                'view_type': 'form',
-                'view_mode': 'form,tree',
-                'res_model': 'crm.opportunity',
-                'res_id': int(new_opportunity_id),
-                'view_id': False,
-                'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'] 
-            }
-            return value
-    _columns = {
-        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
-        'probability': fields.float('Success Probability'),
-        'planned_revenue': fields.float('Expected Revenue'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-    }
-    def default_get(self, cr, uid, fields, context=None):
-        record_id = context and context.get('record_id', False) or False
-        res = super(crm_phonecall2opportunity, self).default_get(cr, uid, fields, context=context)
-        if record_id:
-            phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
-            res['name']=phonecall_id.name
-            res['partner_id']=phonecall_id.partner_id and phonecall_id.partner_id.id
-        return res
-crm_phonecall2opportunity()
\ No newline at end of file

From 4470f8aad1b70ac7d1d2eea49dcef4dbcc17bcf2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 17 Mar 2010 18:57:04 +0530
Subject: [PATCH 048/248] [IMP]: crm: Improvement in phonecall to partner
 wizard + Added proper docstring

bzr revid: rpa@tinyerp.com-20100317132704-4fzstp888prq7b3k
---
 addons/crm/__terp__.py                        |   2 +-
 addons/crm/wizard/__init__.py                 |   2 +-
 .../crm/wizard/crm_lead_to_partner_view.xml   |   2 +
 addons/crm/wizard/crm_phonecall_to_partner.py | 191 ++++++++++++++++++
 .../wizard/crm_phonecall_to_partner_view.xml  |  53 +++++
 addons/crm/wizard/phonecall2partner.py        | 134 ------------
 addons/crm/wizard/phonecall2partner_view.xml  |  67 ------
 7 files changed, 248 insertions(+), 203 deletions(-)
 create mode 100644 addons/crm/wizard/crm_phonecall_to_partner.py
 create mode 100644 addons/crm/wizard/crm_phonecall_to_partner_view.xml
 delete mode 100644 addons/crm/wizard/phonecall2partner.py
 delete mode 100644 addons/crm/wizard/phonecall2partner_view.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 26d80adaf68..2ed47c61351 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -65,7 +65,7 @@ between mails and Open ERP.""",
         'wizard/crm_lead_to_opportunity_view.xml',
         'wizard/crm_phonecall2phonecall.xml',
         'wizard/phonecall2meeting.xml',
-        'wizard/phonecall2partner_view.xml',
+        'wizard/crm_phonecall_to_partner_view.xml',
         'wizard/crm_phonecall_to_opportunity_view.xml',
         'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/crm_opportunity_to_phonecall_view.xml',
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 2e9ab90561b..2d0a7eaf651 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -32,7 +32,7 @@ import crm_opportunity_to_meeting
 import crm_opportunity_to_phonecall
 
 import crm_phonecall2phonecall
-import phonecall2partner
+import crm_phonecall_to_partner
 import phonecall2meeting
 import crm_phonecall_to_opportunity
 
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index 78898dd25da..e4729b78cad 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -11,6 +11,7 @@
 	      	<form string="Create a Partner?">
 	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
         		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+        		<separator string="" colspan="4" />
 	      		<group col="4" colspan="4">
 	      			<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
 	      			<button name="open_create_partner" string="Create _Partner" type="object" icon="gtk-ok"/>
@@ -31,6 +32,7 @@
 	      		<group attrs="{'invisible':[('action','!=','exist')]}">
 		            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
 		        </group>
+		        <separator string="" colspan="4" />
 	      		<group col="4" colspan="4">
 	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
 	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
new file mode 100644
index 00000000000..ef563c02be0
--- /dev/null
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -0,0 +1,191 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_phonecall2partner(osv.osv_memory):
+    """ Converts phonecall to partner """
+
+    _name = 'crm.phonecall2partner'
+    _description = 'Phonecall to Partner'
+
+    _columns = {
+        'action': fields.selection([('exist', 'Link to an existing partner'), \
+                                    ('create', 'Create a new partner')], \
+                                    'Action', required=True), 
+        'partner_id': fields.many2one('res.partner', 'Partner')
+        }
+
+    def _select_partner(self, cr, uid, context=None):
+        """
+        This function Searches for Partner from selected phonecall.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value 
+        @param context: A standard dictionary for contextual values 
+
+        @return : Partner id if any for selected phonecall.
+        """
+        if not context:
+            context = {}
+
+        phonecall_obj = self.pool.get('crm.phonecall')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('active_ids', [])
+        value = {}
+
+        for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
+            if phonecall.partner_id:
+                 raise osv.except_osv(_('Warning !'), 
+                    _('A partner is already defined on this phonecall.'))
+
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', phonecall.name or phonecall.name)])
+            if not partner_ids and phonecall.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', phonecall.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        return partner_id
+
+    _defaults = {
+        'action': lambda *a:'exist', 
+        'partner_id': _select_partner
+        }
+
+    def open_create_partner(self, cr, uid, ids, context=None):
+        """
+        This function Opens form of create partner.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for next form.
+        """
+        if not context:
+            context = {}
+
+        view_obj = self.pool.get('ir.ui.view')
+        view_id = view_obj.search(cr, uid, [('model', '=', 'crm.phonecall2partner'), \
+                                 ('name', '=', 'crm.phonecall2partner.view')])
+        return {
+            'view_mode': 'form', 
+            'view_type': 'form', 
+            'view_id': view_id or False, 
+            'res_model': 'crm.phonecall2partner', 
+            'context': context, 
+            'type': 'ir.actions.act_window', 
+            'target': 'new', 
+            }
+
+
+    def _create_partner(self, cr, uid, ids, context=None):
+        """
+        This function Creates partner based on action.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary {}.
+        """
+        if not context:
+            context = {}
+
+        phonecall_obj = self.pool.get('crm.phonecall')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        partner_ids = []
+        contact_id = False
+
+        rec_ids = context and context.get('active_ids', [])
+        
+        for data in self.browse(cr, uid, ids):
+            for phonecall in phonecall_obj.browse(cr, uid, rec_ids):
+                if data.action == 'create':
+                    partner_id = partner_obj.create(cr, uid, {
+                        'name': phonecall.name or phonecall.name, 
+                        'user_id': phonecall.user_id.id, 
+                        'comment': phonecall.description, 
+                    })
+                    contact_id = contact_obj.create(cr, uid, {
+                        'partner_id': partner_id, 
+                        'name': phonecall.name, 
+                        'phone': phonecall.partner_phone, 
+                    })
+    
+                else:
+                    if data.partner_id:
+                        partner_id = data.partner_id.id
+                        contact_id = partner_obj.address_get(cr, uid, [partner_id])['default']
+
+                partner_ids.append(partner_id)
+
+                vals = {}
+                if partner_id:
+                    vals.update({'partner_id': partner_id})
+                if contact_id:
+                    vals.update({'partner_address_id': contact_id})
+                phonecall_obj.write(cr, uid, [phonecall.id], vals)
+        return partner_ids
+
+    def make_partner(self, cr, uid, ids, context=None):
+        """
+        This function Makes partner based on action.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Partner form.
+        """
+        if not context:
+            context = {}
+
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+
+        value = {
+            'domain': "[]", 
+            'view_type': 'form', 
+            'view_mode': 'form,tree', 
+            'res_model': 'res.partner', 
+            'res_id': partner_ids and int(partner_ids[0]) or False, 
+            'view_id': False, 
+            'context': context, 
+            'type': 'ir.actions.act_window', 
+            'search_view_id': res['res_id']
+        }
+        return value
+
+crm_phonecall2partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
new file mode 100644
index 00000000000..524384328f3
--- /dev/null
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -0,0 +1,53 @@
+<openerp>
+  	<data>
+
+  	<!-- Phonecall to partner confirmation form -->
+  	
+  		<record id="view_crm_phonecall2partner_create" model="ir.ui.view">
+	      <field name="name">crm.phonecall2partner.view.create</field>
+	      <field name="model">crm.phonecall2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<label string="Are you sure you want to create a partner based on this Phonecall ?" colspan="4"/>
+        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+        		<separator string="" colspan="4" />
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	
+	<!-- Phonecall to partner  form view -->
+	
+	   <record id="view_crm_phonecall2partner" model="ir.ui.view">
+	      <field name="name">crm.phonecall2partner.view</field>
+	      <field name="model">crm.phonecall2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id"/>
+		        </group>
+		        <separator string="" colspan="4" />
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+
+	 <!-- Phonecall to Partner wizard -->
+
+	   <act_window id="action_crm_phonecall2partner"
+    		key2="client_action_multi" name="Create a Partner"
+    		res_model="crm.phonecall2partner" src_model="crm.phonecall"
+    		view_id="view_crm_phonecall2partner_create"
+    		view_mode="form" target="new" view_type="form" />
+
+ 	</data>
+</openerp>
diff --git a/addons/crm/wizard/phonecall2partner.py b/addons/crm/wizard/phonecall2partner.py
deleted file mode 100644
index 295a46f57a4..00000000000
--- a/addons/crm/wizard/phonecall2partner.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from mx.DateTime import now
-
-from osv import osv, fields
-import netsvc
-import ir
-import pooler
-from tools.translate import _
-
-class crm_phonecall2partner(osv.osv_memory):
-    _name = 'crm.phonecall2partner'
-    _description = 'Phone Call to Partner'
-    
-    _columns = {
-        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
-        'partner_id': fields.many2one('res.partner','Partner'), 
-    }
-    _defaults = {
-        'action': lambda *a:'exist',
-    }
-    
-    def create_partner(self, cr, uid, ids, context):
-        view_obj = self.pool.get('ir.ui.view')
-        view_id = view_obj.search(cr,uid,[('model','=','crm.phonecall2partner'),('name','=','crm.phonecall2partner.view')])
-        return {
-            'view_mode': 'form',
-            'view_type': 'form',
-            'view_id': view_id or False,
-            'res_model': 'crm.phonecall2partner',
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-        
-    def selectPartner(self, cr, uid, ids, context):
-        case_obj = self.pool.get('crm.phonecall')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        rec_ids = context and context.get('record_ids',False)
-        value={}
-        for case in case_obj.browse(cr, uid, rec_ids):
-            if case.partner_id:
-                raise osv.except_osv(_('Warning !'),
-                    _('A partner is already defined on this lead.'))
-           
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_contact or case.name)])            
-            if not partner_ids and case.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-
-            partner_id = partner_ids and partner_ids[0] or False
-        if not partner_id:
-            value = self._make_partner(cr, uid, ids, context)           
-        return value 
-
-    def _create_partner(self, cr, uid, ids, context):
-        case_obj = self.pool.get('crm.phonecall')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        datas = self.browse(cr, uid, ids)[0]
-        partner_ids = []
-        partner_id = False
-        contact_id = False
-        rec_ids = context and context.get('record_ids',False)
-        for case in case_obj.browse(cr, uid, rec_ids):
-            if datas.action == 'create':
-                partner_id = partner_obj.create(cr, uid, {
-                    'name': case.partner_contact or case.name,
-                    'user_id': case.user_id.id,
-                    'comment': case.description,
-                })
-                contact_id = contact_obj.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'name': case.name,
-                    'phone': case.partner_phone,
-                    'mobile': case.partner_mobile,
-                    'email': case.email_from
-                })
-
-            else:
-                if datas.partner_id:
-                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
-                    partner_id = partner.id
-                    contact_id = partner.address and partner.address[0].id
-
-            partner_ids.append(partner_id)
-            vals = {}
-            if partner_id:
-                vals.update({'partner_id': partner_id})
-            if contact_id:
-                vals.update({'partner_address_id': contact_id})
-            case_obj.write(cr, uid, [case.id], vals)   
-        return partner_ids
-
-    def _make_partner(self, cr, uid, ids, context): 
-        partner_ids = self._create_partner(cr, uid, ids, context)
-        mod_obj = self.pool.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'domain': "[]",
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'res.partner',
-            'res_id': partner_ids and int(partner_ids[0]) or False,
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-    
-crm_phonecall2partner()
-
diff --git a/addons/crm/wizard/phonecall2partner_view.xml b/addons/crm/wizard/phonecall2partner_view.xml
deleted file mode 100644
index cad1e421406..00000000000
--- a/addons/crm/wizard/phonecall2partner_view.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<openerp>
-  	<data>
-  		<record id="view_crm_phonecall2partner_create" model="ir.ui.view">
-	      <field name="name">crm.phonecall2partner.view.create</field>
-	      <field name="model">crm.phonecall2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
-	   <record id="action_crm_phonecall2partner_create" model="ir.actions.act_window">
-	      <field name="name">Create a Partner</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.phonecall2partner</field>
-	      <field name="view_id" ref="view_crm_lead2partner_create"/>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	      <field name="context">{'record_ids' : active_ids}</field>
-	   </record>
-	   
-	   <record model="ir.values" id="values_crm_phonecall2partner_create">
-            <field name="model_id" ref="crm.model_crm_lead" />
-            <field name="object" eval="1" />
-            <field name="name">Create Partner</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_phonecall2partner_create'))" />
-            <field name="key">action</field>
-            <field name="model">crm.phonecall</field>
-        </record>
-	   
-	   <record id="view_crm_phonecall2partner" model="ir.ui.view">
-	      <field name="name">crm.phonecall2partner.view</field>
-	      <field name="model">crm.phonecall2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<field name="action"/>
-	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id"/>
-		        </group>
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
-	   <record id="action_crm_phonecall2partner" model="ir.actions.act_window">
-	      <field name="name">Create a Partner</field>
-	      <field name="type">ir.actions.act_window</field>
-	      <field name="res_model">crm.phonecall2partner</field>
-	      <field name="view_id" ref="view_crm_phonecall2partner"/>
-	      <field name="view_type">form</field>
-	      <field name="view_mode">form</field>
-	      <field name="target">new</field>
-	      <field name="context">{'record_ids' : active_ids}</field>
-	   </record>
- 	</data>
-</openerp>

From e8c8414c8b242ae0cd7ebb92a7449b0e96a936f0 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Mar 2010 19:11:06 +0530
Subject: [PATCH 049/248] [IMP]: olap: code optimization and apply csv file and
 doc string

bzr revid: ksa@tinyerp.co.in-20100317134106-p2f47zevn98vnxhi
---
 addons/olap/__init__.py                       |   33 +-
 addons/olap/__terp__.py                       |   24 +-
 addons/olap/olap.py                           | 1342 +++++++++++------
 addons/olap/wizard/__init__.py                |   32 +-
 addons/olap/wizard/olap_load_column.py        |   50 +-
 addons/olap/wizard/olap_load_column_view.xml  |    6 +-
 addons/olap/wizard/olap_query_logs_clear.py   |   39 +-
 .../wizard/olap_query_logs_clear_view.xml     |    6 +-
 addons/olap/wizard/wizard_load_data.py        |  183 ++-
 9 files changed, 1063 insertions(+), 652 deletions(-)

diff --git a/addons/olap/__init__.py b/addons/olap/__init__.py
index fbc12796e54..8e5f0dfc12c 100755
--- a/addons/olap/__init__.py
+++ b/addons/olap/__init__.py
@@ -1,28 +1,21 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#                    Fabien Pinckaers <fp@tiny.Be>
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/olap/__terp__.py b/addons/olap/__terp__.py
index d716fb83ddf..b981dd5e3c1 100644
--- a/addons/olap/__terp__.py
+++ b/addons/olap/__terp__.py
@@ -1,3 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 {
     "name" : "Olap Schemes Management",
     "version" : "0.1",
@@ -17,7 +38,8 @@
         "data/olap_cube_view.xml",
         "data/olap_fact_view.xml",
         "data/olap_cube_workflow.xml",
-        "data/olap_security.xml"
+        "data/olap_security.xml",
+        'security/ir.model.access.csv'
     ],
     "demo_xml" : ["data/olap_demo.xml"],
     "active": False,
diff --git a/addons/olap/olap.py b/addons/olap/olap.py
index 08effb18ffd..5081619ce71 100644
--- a/addons/olap/olap.py
+++ b/addons/olap/olap.py
@@ -1,28 +1,24 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import psycopg2
 import sqlalchemy
 import time
@@ -31,32 +27,45 @@ from pyparsing import *
 import wizard
 import pooler
 from osv import osv
-from osv import fields,osv
+from osv import fields, osv
 import netsvc
 import cube
 from cube import levels
-import MySQLdb
-import cx_Oracle
 
 
 class olap_fact_database(osv.osv):
     """ Olap Fact Database """
+
     _name = "olap.fact.database"
     _description = "Olap Fact Database"
 
-    def _connection_get(self,cr,uid,ids,field_name,arg,context = {}):
+    def _connection_get(self, cr, uid, ids, field_name, arg, context = {}):
         """
             Return a connection string url needed by SQL Alchemy. Exemple:
             'postgres://scott:tiger@localhost:5432/mydatabase'
+             @param cr: the current row, from the database cursor,
+             @param uid: the current user’s ID for security checks,
+             @param ids: List of connection’s IDs
+             @param context: A standard dictionary for contextual values
+
         """
         res = {}
-        for obj in self.browse(cr,uid,ids,context):
-            res[obj.id] = '%s://%s:%s@%s:%d/%s' % (obj.type,obj.db_login,obj.db_password,obj.db_host,obj.db_port,obj.db_name)
+        for obj in self.browse(cr, uid, ids, context):
+            res[obj.id] = '%s://%s:%s@%s:%d/%s' % (obj.type, obj.db_login, \
+                        obj.db_password, obj.db_host, obj.db_port, obj.db_name)
         return res
 
-    def test_connection(self,cr,uid,ids,context = {}):
+    def test_connection(self, cr, uid, ids, context = {}):
+
+        """ Test connection for postgres Or ,MySql Or ,Oracle
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Test Connection’s IDs
+        @param context: A standard dictionary for contextual values
+        """
+
         try:
-            self_obj = self.browse(cr,uid,ids,context)
+            self_obj = self.browse(cr, uid, ids, context)
             for obj in self_obj:
                 host = obj.db_host
                 port = obj.db_port
@@ -64,41 +73,54 @@ class olap_fact_database(osv.osv):
                 user = obj.db_login
                 password = obj.db_password
                 type = obj.type
+
                 if type == 'postgres':
-                    tdb = psycopg2.connect('host=%s port=%s dbname=%s user=%s password=%s' % (host,port,db_name,user,password))
+                    tdb = psycopg2.connect('host=%s port=%s dbname=%s user=%s \
+                            password=%s' % (host,port,db_name,user,password))
+
                 elif type == 'mysql':
                     try:
                         import MySQLdb
-                        tdb = MySQLdb.connect(host = host,port = port,db = db,user = user,passwd = passwd)
+                        tdb = MySQLdb.connect(host = host, port = port, db = db, user = user, passwd = passwd)
 
                     except Exception,e:
-                        raise osv.except_osv('Error (MySQLdb) : ',e)
+                        raise osv.except_osv('Error (MySQLdb) : ', e)
+
                 elif type == 'oracle':
                     try:
                         import cx_Oracle
-                        tdb = cx_Oracle.connect(user,password,host)
+                        tdb = cx_Oracle.connect(user, password, host)
 
                     except Exception,e:
-                        raise osv.except_osv('Error (cx_Oracle) : ',e)
+                        raise osv.except_osv('Error (cx_Oracle) : ', e)
 
         except Exception,e:
-            raise osv.except_osv('BI Error !',e)
+            raise osv.except_osv('BI Error !', e)
 
         return True
 
     _columns = {
-        'name': fields.char('Fact name',size = 64,required = True),
-        'db_name': fields.char('Database name',size = 64,required = True , help = "Name of the database to be used for analysis."),
-        'db_login': fields.char('Database login',size = 64,required = True, help = "Login for the database name specified."),
-        'db_password': fields.char('Database password',size = 64,invisible = True,required = True, help = "Password for the login."),
-        'db_host': fields.char('Database host',size = 64,required = True , help= "Give hostname to make connection to the database."),
-        'db_port': fields.integer('Database port',required = True, help = " Port to be used in connection"),
-        'type': fields.selection([('mysql','MySQL' ),('postgres','PostgreSQL' ),('oracle','Oracle' )],'Database type',required = True ),
-        'connection_type': fields.selection([('socket','Socket' ),('port','Port' )],'Connection type',required = True ),
-        'connection_url': fields.function(_connection_get,method = True,type = 'char',string = 'Connection URL',size = 128 ),
-        'table_ids': fields.one2many('olap.database.tables','fact_database_id','Tables' ),
-        'loaded': fields.boolean('Loaded',readonly = True ),
+        'name': fields.char('Fact name', size = 64, required = True),
+        'db_name': fields.char('Database name', size = 64, required = True , \
+                        help = "Name of the database to be used for analysis."),
+        'db_login': fields.char('Database login', size = 64, required = True,\
+                         help = "Login for the database name specified."),
+        'db_password': fields.char('Database password', size = 64,\
+                     invisible = True, required = True, help = "Password for the login."),
+        'db_host': fields.char('Database host', size = 64, required = True ,\
+                             help= "Give hostname to make connection to the database."),
+        'db_port': fields.integer('Database port', required = True, \
+                                help = " Port to be used in connection"),
+        'type': fields.selection([('mysql', 'MySQL'), ('postgres', 'PostgreSQL'),\
+                             ('oracle', 'Oracle')], 'Database type', required = True),
+        'connection_type': fields.selection([('socket', 'Socket'), ('port', 'Port')],\
+                                         'Connection type', required = True),
+        'connection_url': fields.function(_connection_get, method = True, \
+                                type = 'char', string = 'Connection URL', size = 128),
+        'table_ids': fields.one2many('olap.database.tables', 'fact_database_id', 'Tables'),
+        'loaded': fields.boolean('Loaded', readonly = True),
     }
+
     _defaults = {
         'type': lambda * args: 'postgres',
         'connection_type': lambda * args: 'port',
@@ -107,26 +129,35 @@ class olap_fact_database(osv.osv):
         'db_port': lambda * args: '5432',
         'loaded' : lambda * args: False,
     }
+
 olap_fact_database()
 
 
 class olap_schema(osv.osv ):
     """ Olap Schema """
+
     _name = "olap.schema"
     _description = "Olap Schema"
 
-    def _app_detect(self,cr,uid,ids,field_name,arg,context = {}):
+    def _app_detect(self, cr, uid, ids, field_name, arg, context = {}):
+
         """
             Return a Application type
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Detected Application’s IDs
+            @param context: A standard dictionary for contextual values
         """
         res = {}
 
         app_objs = self.pool.get('olap.application')
-        app_ids = app_objs.search(cr,uid,[] )
-        app_res = app_objs.browse(cr,uid,app_ids)
-        for obj in self.browse(cr,uid,ids,context):
+        app_ids = app_objs.search(cr, uid, [])
+        app_res = app_objs.browse(cr, uid, app_ids)
+
+        for obj in self.browse(cr, uid, ids, context):
             if obj.database_id.type == 'postgres':
                 e = sqlalchemy.create_engine(obj.database_id.connection_url)
+
                 for app_obj in app_res:
                     try:
                         result = e.execute(app_obj.query)
@@ -135,6 +166,7 @@ class olap_schema(osv.osv ):
                         continue
                     except:
                         continue
+
                 if not res.has_key(obj.id):
                     res[obj.id] = "Unknown Application"
             else:
@@ -143,24 +175,25 @@ class olap_schema(osv.osv ):
 
     _columns = {
         'name': fields.char('Schema name',size = 64,required = True),
-        'note': fields.text('Schema description' ),
-        'cube_ids': fields.one2many('olap.cube','schema_id','Cubes'),
-        'database_id': fields.many2one('olap.fact.database','Database Connection',required = True),
-        'loaded': fields.boolean('Loading Datastructure',readonly = True),
-        'configure': fields.boolean('Configuring Datastructure',readonly = True),
-        'ready': fields.boolean('Ready',readonly = True),
+        'note': fields.text('Schema description'),
+        'cube_ids': fields.one2many('olap.cube', 'schema_id', 'Cubes'),
+        'database_id': fields.many2one('olap.fact.database', 'Database Connection', required = True),
+        'loaded': fields.boolean('Loading Datastructure', readonly = True),
+        'configure': fields.boolean('Configuring Datastructure', readonly = True),
+        'ready': fields.boolean('Ready', readonly = True),
         'state': fields.selection([
-            ('none','Nothing has been Configured'),
-            ('dbconnect','Database Connected' ),
-            ('dbload','The Structure is Loaded'),
-            ('dbconfigure','The Structure is Configured.'),
-            ('dbready','Schema is ready to use'),
-            ('done','We Can Start building Cube'),
-            ],'Schema State',readonly = True),
-        'app_detect': fields.function(_app_detect, method = True, type = 'char',\
+            ('none', 'Nothing has been Configured'),
+            ('dbconnect', 'Database Connected'),
+            ('dbload', 'The Structure is Loaded'),
+            ('dbconfigure', 'The Structure is Configured.'),
+            ('dbready', 'Schema is ready to use'),
+            ('done', 'We Can Start building Cube'),
+            ], 'Schema State', readonly = True),
+        'app_detect': fields.function(_app_detect, method = True, type = 'char', \
                                        string = 'Connection URL', size = 128),
 
     }
+
     _defaults = {
         'loaded' : lambda * args: False,
         'state': lambda * a: 'none',
@@ -168,18 +201,28 @@ class olap_schema(osv.osv ):
         'ready': lambda * a: False
         }
 
-    def action_dbconnect(self,cr,uid,ids,context = {}):
-        schema = self.browse(cr,uid,ids,context)[0]
+    def action_dbconnect(self, cr, uid, ids, context = {}):
+
+        """ Connect DB with postgres ,Or MySql , Or  Orcale
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Database Connection action’s IDs
+        @param context: A standard dictionary for contextual values
+    """
+
+        schema = self.browse(cr, uid, ids, context)[0]
         type = schema.database_id.type
         maxconn = 64
+
         try:
             if type == 'postgres':
                 host = schema.database_id.db_host and "host=%s" % schema.database_id.db_host or ''
                 port = schema.database_id.db_port and "port=%s" % schema.database_id.db_port or ''
                 name = schema.database_id.db_name and "dbname=%s" % schema.database_id.db_name or ''
                 user = schema.database_id.db_login and "user=%s" % schema.database_id.db_login or ''
-                password = schema.database_id.db_password and "password=%s" % schema.database_id.db_password or ''
-                tdb = psycopg2.connect('%s %s %s %s %s' % (host,port,name,user,password))
+                password = schema.database_id.db_password and \
+                        "password=%s" % schema.database_id.db_password or ''
+                tdb = psycopg2.connect('%s %s %s %s %s' % (host, port, name, user, password))
 
             elif type == 'mysql':
                 try:
@@ -188,9 +231,9 @@ class olap_schema(osv.osv ):
                     db = schema.database_id.db_name or ''
                     user = schema.database_id.db_login or ''
                     passwd = schema.database_id.db_password or ''
-                    tdb = MySQLdb.connect(host = host,port = port,db = db,user = user,passwd = passwd)
-                except Exception,e:
-                    raise osv.except_osv('Error (MySQLdb) : ',e)
+                    tdb = MySQLdb.connect(host = host, port = port, db = db, user = user, passwd = passwd)
+                except Exception, e:
+                    raise osv.except_osv('Error (MySQLdb) : ', e)
 
             elif type == 'oracle':
                 try:
@@ -199,46 +242,75 @@ class olap_schema(osv.osv ):
                     db = schema.database_id.db_name or ''
                     user = schema.database_id.db_name.upper() or ''
                     password = int(schema.database_id.db_password) or ''
-                    tdb = cx_Oracle.connect(user,password,host)
-                except Exception,e:
-                    raise osv.except_osv('Error (cx_Oracle) : ',e)
+                    tdb = cx_Oracle.connect(user, password, host)
+                except Exception, e:
+                    raise osv.except_osv('Error (cx_Oracle) : ', e)
 
             for id in ids:
-                self.write(cr,uid,id,{'state': 'dbconnect'})
-        except Exception,e:
+                self.write(cr, uid, id, {'state': 'dbconnect'})
+        except Exception, e:
 
-            raise osv.except_osv('BI Error !',e)
+            raise osv.except_osv('BI Error !', e)
 
         return True
 
-    def action_dbload(self,cr,uid,ids,context = {}):
+    def action_dbload(self, cr, uid, ids, context = {}):
+
+        """ Load DB
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List of Database Load Action’s IDs
+         @param context: A standard dictionary for contextual values
+        """
+
         for id in ids:
-            id_change = self.browse(cr,uid,id)
-            self.write(cr,uid,id,{'loaded':True})
-            self.write(cr,uid,id,{'state':'dbload'})
+            id_change = self.browse(cr, uid, id)
+            self.write(cr, uid, id, {'loaded': True})
+            self.write(cr, uid, id, {'state': 'dbload'})
         return True
 
 
-    def action_dbconfigure(self,cr,uid,ids,context = {}):
+    def action_dbconfigure(self, cr, uid, ids, context = {}):
+
+        """ Configure with Database
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List of Database Configuraion Action’s IDs
+         @param context: A standard dictionary for contextual values
+        """
+
         for id in ids:
-            id_browsed = self.browse(cr,uid,id)
+            id_browsed = self.browse(cr, uid, id)
+
             if not id_browsed.state == 'dbconfigure':
-                self.write(cr,uid,id,{'state':'dbconfigure'})
-                self.write(cr,uid,id,{'configure':True})
+                self.write(cr, uid, id, {'state': 'dbconfigure'})
+                self.write(cr, uid, id, {'configure': True})
         return True
 
-    def action_dbready(self,cr,uid,ids,context = {}):
+    def action_dbready(self, cr, uid, ids, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+        @param ids: List of Database Action’s IDs
+        @param context: A standard dictionary for contextual values """
+
         for id in ids:
-            self.write(cr,uid,id,{'ready':True})
-            self.write(cr,uid,id,{'state':'done'})
+            self.write(cr, uid, id, {'ready': True})
+            self.write(cr, uid, id, {'state': 'done'})
         return True
 
-    def action_done(self,cr,uid,ids,context = {}):
+    def action_done(self, cr, uid, ids, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+        @param ids: List of Action’s IDs
+        @param context: A standard dictionary for contextual values """
+
         for id in ids:
-            self.write(cr,uid,id,{'state':'done'})
+            self.write(cr, uid, id, {'state': 'done'})
         return True
 
-    def create_xml_schema(self,cr,uid,xml_schema,context = {}):
+    def create_xml_schema(self, cr, uid, xml_schema, context = {}):
         """
             This function fill in the database according to a XML schema.
             Exemple of schema:
@@ -270,87 +342,120 @@ class olap_schema(osv.osv ):
         """
         raise 'Not implemented !'
 
-    def request(self,cr,uid,name,request,context = {}):
-        ids = self.search(cr,uid,[('name','=',name)])
-        if not len(ids):
+    def request(self, cr, uid, name, request, context = {}):
+
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Request’s IDs
+        @param context: A standard dictionary for contextual values
+        """
+
+        ids = self.search(cr, uid, [('name', '=', name)])
+
+        if not ids:
             raise 'Schema not found !'
-        schema = self.browse(cr,uid,ids[0],context)
+        schema = self.browse(cr, uid, ids[0], context)
         print 'Parsing MDX...'
-        print '\t',request
+        print '        ', request
         mdx_parser = cube.mdx_parser()
         mdx = mdx_parser.parse(request)
 
         print 'Validating MDX...'
         mdx.preprocess()
-        validate,cubex = mdx.validate(schema)
+        validate, cubex = mdx.validate(schema)
 
         print 'Running MDX...'
-        res_comp = self.pool.get('res.company').search(cr,uid,([]))
-        res_comp = self.pool.get('res.company').browse(cr,uid,res_comp)
+        res_comp = self.pool.get('res.company').search(cr, uid, ([]))
+        res_comp = self.pool.get('res.company').browse(cr, uid, res_comp)
         currency = res_comp[0].currency_id.name
-        print " Default Currency",currency
+        print " Default Currency", currency
         data = mdx.run(currency)
 
         print 'Running Done...'
         print 'Formatting Output...'
+
         if cubex.query_log:
             log = context.get('log')
+
             if log:
                 connection = schema.database_id.connection_url
-                mdx.log(cr,uid,cubex,request,context)
+                mdx.log(cr, uid, cubex, request, context)
         return cube.mdx_output(data)
+
 olap_schema()
 
 
 class olap_database_tables(osv.osv):
     """ Database Tables """
+
     _name = "olap.database.tables"
     _description = "Olap Database Tables"
+
     _columns = {
-        'table_db_name': fields.char('Table Name',size = 64,required = True,readonly = True),
-        'name': fields.char('End-User Name',size = 64,required = True),
-        'columns': fields.one2many('olap.database.columns','table_id','Columns'),
-        'fact_database_id': fields.many2one('olap.fact.database','Database Id',required = True,ondelete = 'cascade',readonly = True),
+        'table_db_name': fields.char('Table Name', size = 64, required = True, readonly = True),
+        'name': fields.char('End-User Name', size = 64, required = True),
+        'columns': fields.one2many('olap.database.columns', 'table_id', 'Columns'),
+        'fact_database_id': fields.many2one('olap.fact.database', 'Database Id',\
+                             required = True, ondelete = 'cascade', readonly = True),
         'active': fields.boolean('Active'),
         'hide': fields.boolean('Hidden'),
     }
+
     _defaults = {
         'active': lambda * args: True,
         'hide': lambda * args: False
     }
-    def name_get(self,cr,uid,ids,context = {}):
+
+    def name_get(self, cr, uid, ids, context = {}):
+
+        """ Get Database Name
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Name’s IDs
+        @param context: A standard dictionary for contextual values """
+
         result = []
-        for t in self.browse(cr,uid,ids,context):
+
+        for t in self.browse(cr, uid, ids, context):
+
             if t.name <> t.table_db_name:
-                result.append((t.id,t.name + ' (' + t.table_db_name + ')'))
+                result.append((t.id, t.name + ' (' + t.table_db_name + ')'))
             else:
-                result.append((t.id,t.name))
+                result.append((t.id, t.name))
         return result
 
-    def show_col_view(self,cr,uid,ids,context = {}):
-        ids_cols = self.pool.get('olap.database.columns').search(cr,uid,([('table_id','=',ids[0])]))
-        id = self.pool.get('ir.ui.view').search(cr,uid,\
-                ([('name','=','olap.database.columns.tree')]),context = {})[0]
+    def show_col_view(self, cr, uid, ids, context = {}):
+        """ Open Tree View of Database Columns
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List of Column’s IDs
+         @param context: A standard dictionary for contextual values """
+
+        ids_cols = self.pool.get('olap.database.columns').search(cr, uid, ([('table_id', '=', ids[0])]))
+        id = self.pool.get('ir.ui.view').search(cr, uid, \
+                ([('name', '=', 'olap.database.columns.tree')]), context = {})[0]
+
         return {
-            'domain': "[('id','in', [" + ','.join(map(str,ids_cols)) + "])]",
+            'domain': "[('id','in', [" + ','.join(map(str, ids_cols)) + "])]",
             'name': 'Database Columns',
             'view_type': 'form',
             'view_mode': 'tree',
             'res_model': 'olap.database.columns',
-            'views': [(id,'tree'),(False,'form')],
+            'views': [(id, 'tree'), (False, 'form')],
             'type': 'ir.actions.act_window',
         }
 
-    def hide_col(self,cr,uid,ids,context = {}):
+    def hide_col(self, cr, uid, ids, context = {}):
         # To hide all the related columns also
         for id in ids:
-             self.write(cr,uid,id,{'hide':True})
+            self.write(cr, uid, id, {'hide':True})
         return {}
 
-    def show_col(self,cr,uid,ids,context = {}):
+    def show_col(self, cr, uid, ids, context = {}):
         # To show or unhide all the columns also
         for id in ids:
-             self.write(cr,uid,id,{'hide':False})
+            self.write(cr, uid, id, {'hide':False})
         return {}
 
 
@@ -359,8 +464,10 @@ olap_database_tables()
 
 class olap_database_columns(osv.osv):
     """ Database Columns """
+
     _name = "olap.database.columns"
     _description = "Olap Database Columns"
+
     datatypes = {
         'timestamp': 'TimeStamp without Time Zone',
         'timestampz': 'TimeStamp with Time Zone',
@@ -379,155 +486,204 @@ class olap_database_columns(osv.osv):
     'number':'NUMBER',
     }
 
-    def _datatypes_get(self,*args,**argv):
+    def _datatypes_get(self, *args, **argv):
+
+        """ @param *args: For Positional Argument
+            @param **args: For Keyword Argument """
+
         return self.datatypes.items()
+
     _columns = {
-        'column_db_name': fields.char('Column DBName',size = 64,required = True,readonly = True),
-        'name': fields.char('Column Name',size = 64,required = True),
-        'table_id': fields.many2one('olap.database.tables','Table Id',required = True,ondelete = 'cascade',select = True,readonly = True),
+        'column_db_name': fields.char('Column DBName', size = 64, required = True, readonly = True),
+        'name': fields.char('Column Name', size = 64, required = True),
+        'table_id': fields.many2one('olap.database.tables', 'Table Id',\
+                         required = True, ondelete = 'cascade', select = True, readonly = True),
         'primary_key': fields.boolean('Primary Key'),
-        'type': fields.selection(_datatypes_get,'Type',size = 64,required = True,readonly = True),
-        'related_to': fields.many2one('olap.database.tables','Related To',required = False,readonly = True),
+        'type': fields.selection(_datatypes_get, 'Type', size = 64, required = True, readonly = True),
+        'related_to': fields.many2one('olap.database.tables', 'Related To', required = False, readonly = True),
         'active': fields.boolean('Active'),
         'hide': fields.boolean('Hidden'),
     }
+
     _defaults = {
         'hide': lambda * args: False,
         'active': lambda * args: True,
         'primary_key': lambda * args: False,
     }
 
-    def name_get(self,cr,uid,ids,context = {}):
+    def name_get(self, cr, uid, ids, context = {}):
+
+        """ Get Database Column
+         @param cr: the current row, from the database cursor,
+         @param uid: the current user’s ID for security checks,
+         @param ids: List of Name’s IDs
+         @param context: A standard dictionary for contextual values """
+
         result = []
-        for t in self.browse(cr,uid,ids,context):
+
+        for t in self.browse(cr, uid, ids, context):
+
             if t.name <> t.column_db_name:
-                result.append((t.id,t.table_id.table_db_name + ' (' + t.name + ')'))
+                result.append((t.id, t.table_id.table_db_name + ' (' + t.name + ')'))
             else:
-                result.append((t.id,t.table_id.table_db_name + ' (' + t.name + ')'))
+                result.append((t.id, t.table_id.table_db_name + ' (' + t.name + ')'))
         return result
 
 
-    def search(self,cr,uid,args,offset = 0,limit = None,order = None,
-            context = None,count = False):
+    def search(self, cr, uid, args, offset = 0, limit = None, order = None,
+            context = None, count = False):
+
         if not context:
-            return super(olap_database_columns,self).search(cr,uid,args,offset,limit,
-                    order,context = context,count = count)
+            return super(olap_database_columns, self).search(cr, uid, args, offset, limit,
+                    order, context = context, count = count)
         col_pool = self.pool.get('olap.database.columns')
+
         if context and context.has_key('fk') and context['fk']:
+
             if context.has_key('dim_x') and context['dim_x']:
-                dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['dim_x']))
+                dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['dim_x']))
                 make_ids = []
                 make_ids.append(dim_obj.cube_id.table_id.column_link_id.table_id.id)
 
                 for lines in  dim_obj.cube_id.table_id.line_ids:
                     make_ids.append(lines.field_id.related_to.id)
                     make_ids.append(lines.field_id.table_id.id)
-                args = [('table_id','in',make_ids),('related_to','<>',False),\
-                        ('hide','<>',True),('active','<>',False)]
-                return super(olap_database_columns,self).search(cr,uid,args,\
-                            offset,limit,order,context = context,count = count)
+                args = [('table_id', 'in', make_ids), ('related_to', '<>', False), \
+                        ('hide', '<>', True), ('active', '<>', False)]
+                return super(olap_database_columns, self).search(cr, uid, args, \
+                            offset, limit, order, context = context, count = count)
 
         if args and context and context.has_key('flag') and context['flag']:
             ids = args[0][2][0][2]
 
             if ids:
-                col_obj = col_pool.browse(cr,uid,ids)
+                col_obj = col_pool.browse(cr, uid, ids)
                 make_ids = []
+
                 for lines in col_obj:
                     make_ids.append(lines.related_to.id)
-                link_id = col_pool.browse(cr,uid,int(context['link_col']))
+                link_id = col_pool.browse(cr, uid, int(context['link_col']))
                 make_ids.append(link_id.table_id.id)
-                args = ['|',('table_id','in',make_ids),('related_to','in',make_ids),\
-                        ('primary_key','<>',True),('hide','<>',True),('active','<>',False)]
-                ids = super(olap_database_columns,self).search(cr,uid,args,\
-                        offset,limit,order,context = context,count = count)
+                args = ['|', ('table_id', 'in', make_ids), ('related_to', 'in', make_ids), \
+                        ('primary_key', '<>', True), ('hide', '<>', True), ('active', '<>', False)]
+                ids = super(olap_database_columns, self).search(cr, uid, args, \
+                        offset, limit, order, context = context, count = count)
                 return ids
+
             elif context and context.has_key('master_dim') and context['master_dim']:
                 make_ids = []
-                col_obj = col_pool.browse(cr,uid,int(context['link_col']))
-                args = ['|',('table_id','=',col_obj.related_to.id),\
-                    ('related_to','=',col_obj.table_id.id),('hide','<>',True),('active','<>',False)]
-                return  super(olap_database_columns,self).search(cr,uid,args,\
-                            offset,limit,order,context = context,count = count)
+                col_obj = col_pool.browse(cr, uid, int(context['link_col']))
+                args = ['|', ('table_id', '=', col_obj.related_to.id), \
+                    ('related_to', '=', col_obj.table_id.id), ('hide', '<>', True), ('active', '<>', False)]
+                return  super(olap_database_columns, self).search(cr, uid, args, \
+                            offset, limit, order, context = context, count = count)
             else:
-                col = col_pool.browse(cr,uid,int(context['link_col']))
+                col = col_pool.browse(cr, uid, int(context['link_col']))
                 base_table = col.table_id
-                args = ['|',('table_id','=',base_table.id),\
-                    ('related_to','=',base_table.id),('hide','<>',True),('active','<>',False)]
-                return super(olap_database_columns,self).search(cr,uid,args,\
-                            offset,limit,order,context = context,count = count)
+                args = ['|', ('table_id', '=', base_table.id), \
+                    ('related_to', '=', base_table.id), ('hide', '<>', True), ('active', '<>', False)]
+                return super(olap_database_columns, self).search(cr, uid, args, \
+                            offset, limit, order, context = context, count = count)
 
 
         if context and context.has_key('filter_cols_cube'):
-            cube_obj = self.pool.get('olap.cube').browse(cr,uid,int(context['filter_cols_cube']))
+            cube_obj = self.pool.get('olap.cube').browse(cr, uid, int(context['filter_cols_cube']))
             make_ids = []
             make_ids.append(cube_obj.table_id.column_link_id.related_to.id)
+
             for lines in cube_obj.table_id.line_ids:
                 make_ids.append(lines.table_id.id)
+
             if make_ids:
                 make_ids.append(cube_obj.table_id.line_ids[len(cube_obj.table_id.line_ids) - 1].field_id.related_to.id)
-                args = [('table_id','in',make_ids),('related_to','=',False),\
-                    ('primary_key','<>',True),\
-                    ('type','not in',['date','timestamp','timestampz','time']),\
-                    ('hide','<>',True),('active','<>',False)]
-                ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,
-                    order,context = context,count = count)
+                args = [('table_id', 'in', make_ids), ('related_to', '=', False), \
+                    ('primary_key', '<>', True), \
+                    ('type', 'not in', ['date', 'timestamp', 'timestampz', 'time']), \
+                    ('hide', '<>', True), ('active', '<>', False)]
+                ids = super(olap_database_columns, self).search(cr, uid, args, offset, limit,
+                    order, context = context, count = count)
                 return ids
 
         elif context and context.has_key('filter_cols_hier'):
-            hier_obj = self.pool.get('olap.hierarchy').browse(cr,uid,int(context['filter_cols_hier']))
+            hier_obj = self.pool.get('olap.hierarchy').browse(cr, uid, int(context['filter_cols_hier']))
             make_ids = []
+
             if hier_obj.table_id.line_ids:
+
                 for lines in hier_obj.table_id.line_ids:
                     make_ids.append(lines.field_id.related_to.id)
 
                 if make_ids:
                     make_ids.append(hier_obj.table_id.column_link_id.related_to.id)
                     make_ids.append(hier_obj.table_id.column_link_id.table_id.id)
-                    args = [('table_id','in',make_ids),('hide','<>',True),('active','<>',False)]
-                    ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,
-                        order,context = context,count = count)
+                    args = [('table_id', 'in', make_ids), ('hide', '<>', True), ('active', '<>', False)]
+                    ids = super(olap_database_columns, self).search(cr, uid, args, offset, limit,
+                        order, context = context, count = count)
                     return ids
             else:
-                args = [('table_id','=',hier_obj.table_id.column_link_id.related_to.id)]
-                ids = super(olap_database_columns,self).search(cr,uid,args,offset,limit,
-                        order,context = context,count = count)
+                args = [('table_id', '=', hier_obj.table_id.column_link_id.related_to.id)]
+                ids = super(olap_database_columns, self).search(cr, uid, args, offset, limit,
+                        order, context = context, count = count)
                 return ids
         elif context and context.has_key('fk') and context['fk']:
-            args = [('primary_key','=',True),('hide','<>',True),('active','<>',False)]
+            args = [('primary_key', '=', True), ('hide', '<>', True), ('active', '<>', False)]
 
         else:
             if context and context.has_key('master_dim') and context['master_dim']:
-                dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['master_dim']))
+                dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['master_dim']))
                 lines = dim_obj.cube_id.table_id.line_ids
                 table_ids = []
+
                 for line in lines:
                     table_ids.append(line.table_id.id)
-                args = [('table_id','in',table_ids),('related_to','<>',False),\
-                        ('hide','<>',True),('active','<>',False)]
+                args = [('table_id', 'in', table_ids), ('related_to', '<>', False), \
+                        ('hide', '<>', True), ('active', '<>', False)]
+
             elif context and context.has_key('master_schema') and context['master_schema']:
-                    args = [('primary_key','=','True')]
-        return super(olap_database_columns,self).search(cr,uid,args,offset,limit,
-                    order,context = context,count = count)
+                args = [('primary_key', '=', 'True')]
+
+        return super(olap_database_columns, self).search(cr, uid, args, offset, limit,
+                    order, context = context, count = count)
 
 
-    def hide_col(self,cr,uid,ids,context = {}):
+    def hide_col(self, cr, uid, ids, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Hide Column’s IDs
+            @param context: A standard dictionary for contextual values """
+
         for id in ids:
-             self.write(cr,uid,id,{'hide':True})
+            self.write(cr, uid, id, {'hide':True})
         return {}
 
-    def show_col(self,cr,uid,ids,context = {}):
+    def show_col(self, cr, uid, ids, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of column’s IDs
+            @param context: A standard dictionary for contextual values """
+
         for id in ids:
-             self.write(cr,uid,id,{'hide':True})
+            self.write(cr, uid, id, {'hide': True})
         return {}
 
-    def field_add(self,cr,uid,ids,context = {}):
-        col_data = self.pool.get('olap.database.columns').read(cr,uid,ids,[],context)[0]
+    def field_add(self, cr, uid, ids, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Field’s IDs
+            @param context: A standard dictionary for contextual values """
+
+        col_data = self.pool.get('olap.database.columns').read(cr, uid, ids, [], context)[0]
         ctx_list = []
+
         if col_data['related_to']:
             table_id = col_data['related_to'][0]
+
         else:
             table_id = col_data['table_id'][0]
+
         if context['parent_id']:
             parent_id = context['parent_id']
             val = {
@@ -535,29 +691,41 @@ class olap_database_columns(osv.osv):
             'table_id':table_id,
             'field_id':ids[0]
             }
-            id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context)
+            id = self.pool.get('olap.cube.table.line').create(cr, uid, val, context)
+
         else:
-            parent_id = self.pool.get('olap.cube.table').create(cr,uid,\
-                                    {'name':col_data['table_id'][1]},context)
-            ctx_list = [('client','web'),('app','bi'),('id',parent_id)]
+            parent_id = self.pool.get('olap.cube.table').create(cr, uid, \
+                                    {'name': col_data['table_id'][1]}, context)
+            ctx_list = [('client', 'web'), ('app', 'bi'), ('id', parent_id)]
+
         return ctx_list
 
-    def make_hierarchy(self,cr,uid,ids,context = {}):
-        col_data = self.pool.get('olap.database.columns').read(cr,uid,ids,[],context)[0]
+    def make_hierarchy(self, cr, uid, ids, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Hierarchy’s IDs
+            @param context: A standard dictionary for contextual values """
+
+        col_data = self.pool.get('olap.database.columns').read(cr, uid, ids, [], context)[0]
         ctx_list = []
+
         if context and context.has_key('hier_parent_id')and context['hier_parent_id']:
-            hier_obj = self.pool.get('olap.hierarchy').browse(cr,uid,context['hier_parent_id'])
+            hier_obj = self.pool.get('olap.hierarchy').browse(cr, uid, context['hier_parent_id'])
             pk_table = hier_obj.table_id.name
+
         elif context and context.has_key('hier_parent_table'):
-            cube_table_obj = self.pool.get('olap.cube.table').browse(cr,uid,context['hier_parent_table'])
+            cube_table_obj = self.pool.get('olap.cube.table').browse(cr, uid, context['hier_parent_table'])
             pk_table = cube_table_obj.name
+
         val = {
              'field_name':col_data['name'],
              'name':col_data['name'],
              'primary_key_table':pk_table
         }
+
         if context['hier_parent_id']:
-            id = self.pool.get('olap.hierarchy').write(cr,uid,context['hier_parent_id'],val,context)
+            id = self.pool.get('olap.hierarchy').write(cr, uid, context['hier_parent_id'], val, context)
         else:
             if context['parent_name']: val['name'] = context['parent_name']
             if context['parent_dimension']:val['dimension_id'] = context['parent_dimension']
@@ -567,9 +735,10 @@ class olap_database_columns(osv.osv):
             if context['parent_member_all']: val['member_all'] = context['parent_member_all']
             if context['parent_member_default']: val['member_default'] = context['parent_member_default']
             if context['parent_type']: val['type'] = context['parent_type']
+
             val['primary_key_table'] = col_data['table_id'][1]
-            id = self.pool.get('olap.hierarchy').create(cr,uid,val,context)
-            ctx_list = [('client','web'),('app','bi'),('id',id)]
+            id = self.pool.get('olap.hierarchy').create(cr, uid, val, context)
+            ctx_list = [('client', 'web'), ('app', 'bi'), ('id', id)]
         return ctx_list
 
 olap_database_columns()
@@ -577,16 +746,24 @@ olap_database_columns()
 
 class olap_cube_table(osv.osv):
     """ Cube Table """
+
     _name = "olap.cube.table"
     _description = "Olap cube table"
 
-    def write(self,cr,uid,ids,vals,context = None):
-        if vals and vals.get('available_table_ids',0) and context and \
+    def write(self, cr, uid, ids, vals, context = None):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Cube Table’s IDs
+            @param context: A standard dictionary for contextual values """
+
+        if vals and vals.get('available_table_ids', 0) and context and \
             (context.has_key('master_dim') or context.has_key('d_id') or \
              context.has_key('parent_schema_id')):
             new_fields = vals['available_table_ids'][0][2]
             final = []
-            for data in self.browse(cr,uid,ids):
+
+            for data in self.browse(cr, uid, ids):
                 orignal_lines = []
                 for line in data.line_ids:
                     orignal_lines.append(line.id)
@@ -594,114 +771,162 @@ class olap_cube_table(osv.osv):
                 orignal_fields = []
                 for line in data.line_ids:
                     orignal_fields.append(line.field_id.id)
+
                 if len(orignal_fields) < len(new_fields):
+
                     if new_fields[:len(orignal_fields)] == orignal_fields:
                         new_fields = new_fields[len(orignal_fields):]
-                        cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,new_fields)
+                        cols_obj = self.pool.get('olap.database.columns').browse(cr, uid, new_fields)
                         val = {}
                         val['cube_table_id'] = ids[0]
                         for col in cols_obj:
                             val['table_id'] = col.table_id.id
                             val['field_id'] = col.id
-                        id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+                        id = self.pool.get('olap.cube.table.line').create(cr, uid, val, context = context)
+
                     else:
-                        cols_obj = self.pool.get('olap.database.columns').unlink(cr,uid,orignal_lines)
-                        cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,new_fields)
+                        cols_obj = self.pool.get('olap.database.columns').unlink(cr, uid, orignal_lines)
+                        cols_obj = self.pool.get('olap.database.columns').browse(cr, uid, new_fields)
                         val = {}
                         val['cube_table_id'] = ids[0]
                         for col in cols_obj:
                             val['table_id'] = col.table_id.id
                             val['field_id'] = col.id
-                        id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+                        id = self.pool.get('olap.cube.table.line').create(cr, uid, val, context = context)
 
                 elif len(orignal_fields) > len(new_fields):
+
                     if orignal_fields[:len(new_fields)] == new_fields:
                         remove_id = orignal_lines[len(new_fields):]
-                        id = self.pool.get('olap.cube.table.line').unlink(cr,uid,remove_id,context = context)
+                        id = self.pool.get('olap.cube.table.line').unlink(cr,\
+                                                 uid, remove_id, context = context)
+
                     else:
                         val = {}
-                        id = self.pool.get('olap.cube.table.line').unlink(cr,uid,orignal_lines ,context = context)
-                        cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,new_fields)
+                        id = self.pool.get('olap.cube.table.line').unlink(cr, \
+                                             uid, orignal_lines , context = context)
+                        cols_obj = self.pool.get('olap.database.columns').browse(cr, uid, new_fields)
                         val = {}
                         val['cube_table_id'] = ids[0]
                         for col in cols_obj:
                             val['table_id'] = col.table_id.id
                             val['field_id'] = col.id
-                        id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
-            return  super(olap_cube_table,self).write(cr,uid,ids,vals,context)
+                        id = self.pool.get('olap.cube.table.line').create(cr, uid, val, context = context)
 
-    def create(self,cr,uid,vals,context = None):
-        cube_table_id = super(olap_cube_table,self).create(cr,uid,vals,context)
-        if vals and vals.get('available_table_ids',0) and context and \
+            return  super(olap_cube_table, self).write(cr, uid, ids, vals, context)
+
+    def create(self, cr, uid, vals, context = None):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
+        cube_table_id = super(olap_cube_table, self).create(cr, uid, vals, context)
+
+        if vals and vals.get('available_table_ids', 0) and context and \
             (context.has_key('d_id') or context.has_key('parent_schema_id') or \
               context.has_key('master_dim') or context.has_key('d_id')):
             lines_ids = vals['available_table_ids'][0][2]
-            cols_obj = self.pool.get('olap.database.columns').browse(cr,uid,lines_ids)
+            cols_obj = self.pool.get('olap.database.columns').browse(cr, uid, lines_ids)
             val = {}
             val['cube_table_id'] = cube_table_id
+
             for col in cols_obj:
                 val['table_id'] = col.table_id.id
                 val['field_id'] = col.id
-                id = self.pool.get('olap.cube.table.line').create(cr,uid,val,context = context)
+                id = self.pool.get('olap.cube.table.line').create(cr, uid, val, context = context)
         return cube_table_id
 
-    def search(self,cr,uid,args,offset = 0,limit = None,order = None,
-            context = None,count = False):
+    def search(self, cr, uid, args, offset = 0, limit = None, order = None,
+            context = None, count = False):
         if context and context.has_key('parent_schema_id'):
-            args = [('schema_id','=',context['parent_schema_id'])]
-        if context and context.has_key('d_id'):
-            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(['d_id']))
-            args = [('schema_id','=',dim_obj.cube_id.schema_id.id)]
-        return super(olap_cube_table,self).search(cr,uid,args,offset,limit,\
-                                        order,context = context,count = count)
+            args = [('schema_id', '=', context['parent_schema_id'])]
+
+        if context and context.has_key('d_id'):
+            dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(['d_id']))
+            args = [('schema_id', '=', dim_obj.cube_id.schema_id.id)]
+
+        return super(olap_cube_table, self).search(cr, uid, args, offset, limit, \
+                                        order, context = context, count = count)
+
+    def _available_table_get(self, cr, uid, ids, name, arg, context = None):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Available Table’s IDs
+            @param context: A standard dictionary for contextual values """
 
-    def _available_table_get(self,cr,uid,ids,name,arg,context = None):
         result = {}
         parent_table_id = []
         parent_table_ids = []
         field_obj = self.pool.get('olap.database.columns')
-        for table in self.browse(cr,uid,ids,context):
+
+        for table in self.browse(cr, uid, ids, context):
             if table.line_ids:
                 ids = []
-                ids = map(lambda x: x.field_id.id,table.line_ids)
+                ids = map(lambda x: x.field_id.id, table.line_ids)
                 result[table.id] = ids
             else:
                 result[table.id] = []
         return result
 
-    def _set_schema(self,cr,uid,context = {}):
+    def _set_schema(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         if context and context.has_key('d_id'):
-            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
             return dim_obj.cube_id.schema_id.id
+
         if context and context.has_key('parent_schema_id'):
             return context['parent_schema_id']
 
-    def _set_name(self,cr,uid,context = {}):
+    def _set_name(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         if context and context.has_key('d_id'):
-            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
+            dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
             return dim_obj.cubeAid.table_id.name
 
-    def _get_id(self,cr,uid,ids,context = {}):
+    def _get_id(self, cr, uid, ids, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         if context and context.has_key('d_id'):
-            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['d_id']))
-            table_id = self.pool.get('olap.database.tables').search(cr,uid,\
-                        [('table_db_name','in',[dim_obj.cube_id.table_id.name]),\
-                        ('fact_database_id','=',dim_obj.cube_id.schema_id.database_id.id)])
-            col_ids = self.pool.get('olap.database.columns').search(cr,uid,\
-                        [('table_id','in',table_id),('hide','<>',True),('related_to','<>',False)])
+            dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['d_id']))
+            table_id = self.pool.get('olap.database.tables').search(cr, uid, \
+                        [('table_db_name', 'in', [dim_obj.cube_id.table_id.name]), \
+                        ('fact_database_id', '=', dim_obj.cube_id.schema_id.database_id.id)])
+            col_ids = self.pool.get('olap.database.columns').search(cr, uid, \
+                        [('table_id', 'in', table_id), ('hide', '<>', True), ('related_to', '<>', False)])
+
         else:
-            col_ids = self.pool.get('olap.database.columns').search(cr,uid,\
-                                [('primary_key','=',True),('hide','<>',True)])
+            col_ids = self.pool.get('olap.database.columns').search(cr, uid, \
+                                [('primary_key', '=', True), ('hide', '<>', True)])
+
         return col_ids
 
-    def _def_set(self,cr,uid,context = {}):
+    def _def_set(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         return []
 
     _columns = {
-        'name': fields.char('Table name',size = 64,required = True),
-        'line_ids': fields.one2many('olap.cube.table.line','cube_table_id','Database Tables',required = True),
-        'schema_id':fields.many2one('olap.schema','Schema id',ondelete = 'cascade'),
-        'column_link_id':fields.many2one('olap.database.columns','Relational Column' ,required = True),
+        'name': fields.char('Table name', size = 64, required = True),
+        'line_ids': fields.one2many('olap.cube.table.line', 'cube_table_id',\
+                                 'Database Tables', required = True),
+        'schema_id':fields.many2one('olap.schema', 'Schema id', ondelete = 'cascade'),
+        'column_link_id':fields.many2one('olap.database.columns', 'Relational Column' , required = True),
         'available_table_ids': fields.function(
             _available_table_get,
             method = True,
@@ -710,50 +935,75 @@ class olap_cube_table(osv.osv):
             type = "many2many"
        ),
     }
+
     _defaults = {
         'schema_id':_set_schema,
     }
-    def field_add(self,cr,uid,ids,context = {}):
+    def field_add(self, cr, uid, ids, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         return {}
+
 olap_cube_table()
 
 
 class olap_cube_table_line(osv.osv):
     """ Cube Table Line """
+
     _name = "olap.cube.table.line"
     _description = "Olap cube table"
     _rec_name = 'table_id'
+
     _columns = {
-        'cube_table_id': fields.many2one('olap.cube.table','Cube Table',required = True,ondelete = 'cascade'),
-        'table_id': fields.many2one('olap.database.tables','Database Table',required = True,ondelete = 'cascade'),
-        'field_id': fields.many2one('olap.database.columns','Link Field'),
+        'cube_table_id': fields.many2one('olap.cube.table', 'Cube Table',\
+                                 required = True, ondelete = 'cascade'),
+        'table_id': fields.many2one('olap.database.tables', 'Database Table',\
+                                 required = True, ondelete = 'cascade'),
+        'field_id': fields.many2one('olap.database.columns', 'Link Field'),
     }
     # Set the Table when changing field_id
-    def onchange_field_id(self,*args,**argv):
+    def onchange_field_id(self, *args, **argv):
+
+        """ @param *args: For Positional Argument
+            @param **args: For Keyword Argument """
+
         pass
+
 olap_cube_table_line()
 
 
 class olap_cube(osv.osv):
     """ Olap Cube """
+
     _name = "olap.cube"
     _description = "Olap cube"
 
-    def _set_schema(self,cr,uid,context = {}):
+    def _set_schema(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         if context and context.has_key('schema_id'):
             return context['schema_id']
         return False
 
     _columns = {
-        'name': fields.char('Cube name',size = 64,required = True),
-        'table_id': fields.many2one('olap.cube.table','Fact table',size = 64,required = True, help="Table(s) for cube."),
-        'schema_id': fields.many2one('olap.schema','Schema',readonly = True),
-        'dimension_ids': fields.one2many('olap.dimension','cube_id','Dimensions'),
-        'measure_ids': fields.one2many('olap.measure','cube_id','Measures'),
+        'name': fields.char('Cube name', size = 64, required = True),
+        'table_id': fields.many2one('olap.cube.table', 'Fact table', size = 64,\
+                             required = True, help="Table(s) for cube."),
+        'schema_id': fields.many2one('olap.schema', 'Schema', readonly = True),
+        'dimension_ids': fields.one2many('olap.dimension', 'cube_id', 'Dimensions'),
+        'measure_ids': fields.one2many('olap.measure', 'cube_id', 'Measures'),
         'query_log': fields.boolean('Query Logging', help = "Enabling this will \
                         log all the queries in the browser"),
-        'query_ids': fields.one2many('olap.query.logs','cube_id','Queries'),
+        'query_ids': fields.one2many('olap.query.logs', 'cube_id', 'Queries'),
     }
+
     _defaults = {
                  'schema_id': _set_schema
                  }
@@ -764,14 +1014,15 @@ class olap_query_logs(osv.osv):
     """ Query Logs """
     _name = "olap.query.logs"
     _description = "Olap query logs"
+
     _columns = {
-        'user_id': fields.many2one('res.users','Tiny ERP User'),
-        'query': fields.text('Query',required = True),
-        'time': fields.datetime('Time',required = True),
-        'result_size': fields.integer('Result Size',readonly = True),
-        'cube_id': fields.many2one('olap.cube','Cube',required = True),
+        'user_id': fields.many2one('res.users', 'Tiny ERP User'),
+        'query': fields.text('Query', required = True),
+        'time': fields.datetime('Time', required = True),
+        'result_size': fields.integer('Result Size', readonly = True),
+        'cube_id': fields.many2one('olap.cube', 'Cube', required = True),
         'count': fields.integer('Count', readonly=True),
-        'schema_id': fields.many2one('olap.schema','Schema',readonly = True),
+        'schema_id': fields.many2one('olap.schema', 'Schema', readonly = True),
     }
 
     _defaults = {
@@ -782,18 +1033,25 @@ olap_query_logs()
 
 class olap_dimension(osv.osv):
     """ Olap Dimension """
+
     _name = "olap.dimension"
     _description = "Olap dimension"
 
-    def _set_cube(self,cr,uid,context = {}):
+    def _set_cube(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         if context and context.has_key('cube_id'):
             return context['cube_id']
         return False
 
     _columns = {
-        'name': fields.char('Dimension name',size = 64,required = True),
-        'cube_id': fields.many2one('olap.cube','Cube',required = True),
-        'hierarchy_ids': fields.one2many('olap.hierarchy','dimension_id','Hierarchies'),
+        'name': fields.char('Dimension name', size = 64, required = True),
+        'cube_id': fields.many2one('olap.cube', 'Cube', required = True),
+        'hierarchy_ids': fields.one2many('olap.hierarchy', 'dimension_id', 'Hierarchies'),
     }
     _defaults = {
                  'cube_id': _set_cube,
@@ -804,9 +1062,11 @@ olap_dimension()
 
 class olap_hierarchy(osv.osv):
     """ Olap Hierarchy """
+
     _name = "olap.hierarchy"
     _description = "Olap hierarchy"
     _order = "sequence, id"
+
     hierarchy_type = {
         'date': 'Date',
         'date_year': 'Year of Date',
@@ -815,30 +1075,47 @@ class olap_hierarchy(osv.osv):
         'many2one': 'Many2one'
     }
 
-    def _set_dimension(self,cr,uid,context = {}):
+    def _set_dimension(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         if context and context.has_key('dimension_id'):
             return context['dimension_id']
         return False
 
-    def _set_name(self,cr,uid,context = {}):
+    def _set_name(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         if context and context.has_key('dimension_id'):
-            dim_obj = self.pool.get('olap.dimension').browse(cr,uid,int(context['dimension_id']))
+            dim_obj = self.pool.get('olap.dimension').browse(cr, uid, int(context['dimension_id']))
             return dim_obj.name
         return False
 
-    def _hierarchy_get(self,*args,**argv):
+    def _hierarchy_get(self, *args, **argv):
+
+        """ @param *args: For Positional Argument
+            @param **args: For Keyword Argument """
+
         return self.hierarchy_type.items()
 
     _columns = {
-        'name': fields.char('Hierarchy name',size = 64,required = True),
-        'primary_key': fields.char('Primary key',size = 64),
-        'primary_key_table': fields.char('Primary key table',size = 64),
-        'sequence': fields.integer('Sequence',required = True),
-        'dimension_id': fields.many2one('olap.dimension','Dimension',required = True),
-        'level_ids': fields.one2many('olap.level','hierarchy_id','Levels'),
-        'table_id': fields.many2one('olap.cube.table','Fact table(s)',\
+        'name': fields.char('Hierarchy name', size = 64, required = True),
+        'primary_key': fields.char('Primary key', size = 64),
+        'primary_key_table': fields.char('Primary key table', size = 64),
+        'sequence': fields.integer('Sequence', required = True),
+        'dimension_id': fields.many2one('olap.dimension', 'Dimension', required = True),
+        'level_ids': fields.one2many('olap.level', 'hierarchy_id', 'Levels'),
+        'table_id': fields.many2one('olap.cube.table', 'Fact table(s)', \
                     required = True , help ="Table(s) to make hierarchy on the cube."),
     }
+
     _defaults = {
         'sequence': lambda * args: 1,
         'primary_key': lambda * args: 'id',
@@ -854,6 +1131,7 @@ class olap_level(osv.osv):
     _name = "olap.level"
     _description = "Olap level"
     _order = "sequence, id"
+
     _types = {
         'normal': levels.level_normal(),
         'date_year': levels.level_date_year(),
@@ -861,42 +1139,62 @@ class olap_level(osv.osv):
         'date_month': levels.level_date_month()
     }
 
-    def _set_hierarchy(self,cr,uid,context = {}):
+    def _set_hierarchy(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values """
+
         if context and context.has_key('hierarchy_id'):
             return context['hierarchy_id']
         return False
 
-    def _set_name(self,cr,uid,context = {}):
+    def _set_name(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         if context and context.has_key('hierarchy_id'):
-            hier_obj = self.pool.get('olap.hierarchy').browse(cr,uid,int(context['hierarchy_id']))
+            hier_obj = self.pool.get('olap.hierarchy').browse(cr, uid, int(context['hierarchy_id']))
             return hier_obj.name
 
-    def onchange_column_name(self,cr,uid,ids,column,context = {}):
+    def onchange_column_name(self, cr, uid, ids, column, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         if not column:
             return {}
         val = {}
-        col = self.pool.get('olap.database.columns').browse(cr,uid,column)
+        col = self.pool.get('olap.database.columns').browse(cr, uid, column)
         val['table_name'] = col.table_id.table_db_name
         val['column_id_name'] = col.column_db_name
         if (col.type == 'date'):
             val['type'] = 'date_year'
         return {'value':val}
 
-    def _type_get(self,cr,uid,*args,**argv):
+    def _type_get(self, cr, uid, *args, **argv):
+
+        """ @param *args: For Positional Argument
+        @param **args: For Keyword Argument
+        """
+
         keys = self._types.keys()
         return map(lambda x: (x,x),keys)
 
 
     _columns = {
-        'name': fields.char('Level name',size = 64,required = True),
-        'column_name':fields.many2one('olap.database.columns','Columns Name',required = True),
-        'column_id_name': fields.char('Column ID',size = 64,required = True),
-        'type': fields.selection(selection = _type_get,string = 'Level class',size = 64,required = True),
-        'table_name': fields.char('Table name',size = 64,required = True,\
+        'name': fields.char('Level name', size = 64, required = True),
+        'column_name':fields.many2one('olap.database.columns', 'Columns Name', required = True),
+        'column_id_name': fields.char('Column ID', size = 64, required = True),
+        'type': fields.selection(selection = _type_get, string = 'Level class', size = 64, required = True),
+        'table_name': fields.char('Table name', size = 64, required = True, \
                 help = "The name of the table on which the column is defined.\
                          If False, take the table from the hierarchy."),
-        'sequence': fields.integer('Sequence',required = True),
-        'hierarchy_id': fields.many2one('olap.hierarchy','Hierarchy',required = True),
+        'sequence': fields.integer('Sequence', required = True),
+        'hierarchy_id': fields.many2one('olap.hierarchy', 'Hierarchy', required = True),
     }
 
     _defaults = {
@@ -915,40 +1213,59 @@ class olap_measure(osv.osv):
     _name = "olap.measure"
     _description = "Olap measure"
 
-    def _set_cube(self,cr,uid,context = {}):
+    def _set_cube(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         if context and context.has_key('cube_id'):
             return context['cube_id']
         return False
 
-    def onchange_measure_name(self,cr,uid,ids,column,context = {}):
+    def onchange_measure_name(self, cr, uid, ids, column, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         val = {}
         if not column:
             return {}
-        col = self.pool.get('olap.database.columns').browse(cr,uid,column)
+        col = self.pool.get('olap.database.columns').browse(cr, uid, column)
         val['table_name'] = col.table_id.table_db_name
         val['value_column_id_name'] = col.column_db_name
         val['name'] = col.column_db_name
         return {'value':val}
 
     _columns = {
-        'name': fields.char('Measure name',size = 64,required = True),
-        'cube_id': fields.many2one('olap.cube','Cube',required = True),
-        'value_column': fields.many2one('olap.database.columns','Fact Table Column'),
-        'value_column_id_name': fields.char('Column ID',size = 64),
-        'table_name': fields.char('Table name',size = 64,help = "The name of the table on which the column is defined. If False, take the table from the cube."),
-        'measure_type': fields.selection([('fact_column','Fact Table Column'),('sql_expr','SQL Expression')],'Measure Type',required = True,help = "Select between auto column or sql expression for the measures"),
-        'value_sql': fields.char('SQL Expression',size = 200,help = "You can provide valid sql expression. Make sure it have function with fully qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"),
-        'agregator': fields.selection([('sum','Sum'),('count','count'),('avg','Average')],'Agregator',required = True),
-        'datatype': fields.selection([('int','Integer'),('float','Float')],'Datatype',required = True),
+        'name': fields.char('Measure name', size = 64, required = True),
+        'cube_id': fields.many2one('olap.cube', 'Cube', required = True),
+        'value_column': fields.many2one('olap.database.columns', 'Fact Table Column'),
+        'value_column_id_name': fields.char('Column ID', size = 64),
+        'table_name': fields.char('Table name', size = 64, help = "The name of \
+                        the table on which the column is defined. If False, take the table from the cube."),
+        'measure_type': fields.selection([('fact_column', 'Fact Table Column'),\
+                             ('sql_expr', 'SQL Expression')],\
+                             'Measure Type', required = True,\
+                             help = "Select between auto column or sql expression for the measures"),
+        'value_sql': fields.char('SQL Expression', size = 200, help = "You can \
+                            provide valid sql expression. Make sure it have \
+                         function with fully qualified column name like \
+                         (sum,avg ...)(tablename.columnname (+,- ...) tablename.columnname)"),
+        'agregator': fields.selection([('sum', 'Sum'), ('count', 'count'),\
+                                     ('avg', 'Average')], 'Agregator', required = True),
+        'datatype': fields.selection([('int', 'Integer'), ('float', 'Float')], 'Datatype', required = True),
         'formatstring': fields.selection([
-                                ('none','None (0000.00)'),
-                                ('cr_prefix','Prefix Default Currency (EUR 0000.00)'),
-                                ('cr_postfix','Postfix Default Currency(0000.00 EUR)'),
-                                ('cr_prefix_comma','Prefix Default Currency with comma seperator (EUR 0,000.00)'),
-                                ('cr_postfix_comma','Postfix Default Currency with comma seperator (0,000.00 EUR)'),
+                                ('none', 'None (0000.00)'),
+                                ('cr_prefix', 'Prefix Default Currency (EUR 0000.00)'),
+                                ('cr_postfix', 'Postfix Default Currency(0000.00 EUR)'),
+                                ('cr_prefix_comma', 'Prefix Default Currency with comma seperator (EUR 0,000.00)'),
+                                ('cr_postfix_comma', 'Postfix Default Currency with comma seperator (0,000.00 EUR)'),
                                 ('comma_sep', 'Comma Seperator (0,000)')
-                                ],'Format string',required = True, help=" Let you specify how the measure to be displayed in cube browser"),
+                                ], 'Format string', required = True, help=" Let you specify how the measure to be displayed in cube browser"),
     }
+
     _defaults = {
         'agregator': lambda * args: 'sum',
         'datatype': lambda * args: 'float',
@@ -956,6 +1273,7 @@ class olap_measure(osv.osv):
         'cube_id': _set_cube,
         'measure_type':lambda * args:'fact_column',
     }
+
 olap_measure()
 
 
@@ -963,25 +1281,30 @@ class olap_application(osv.osv):
     """ Olap Application """
     _name = "olap.application"
     _description = "Olap application"
+
     _columns = {
-        'name': fields.char('Application name',size = 64,required = True),
+        'name': fields.char('Application name', size = 64, required = True),
         'query': fields.text('Application Query'),
-        'table_ids': fields.one2many('olap.application.table','application_id','Tables'),
-        'field_ids': fields.one2many('olap.application.field','application_id','Fields'),
+        'table_ids': fields.one2many('olap.application.table', 'application_id', 'Tables'),
+        'field_ids': fields.one2many('olap.application.field', 'application_id', 'Fields'),
     }
+
 olap_application()
 
 
 class olap_application_table(osv.osv):
     """ Application Table """
+
     _name = "olap.application.table"
     _description = "Olap application table"
+
     _columns = {
-        'name': fields.char('Application table name',size = 64,required = True),
-        'table_name': fields.char('Table name',size = 64,required = True),
+        'name': fields.char('Application table name', size = 64, required = True),
+        'table_name': fields.char('Table name', size = 64, required = True),
         'is_hidden': fields.boolean('Hidden'),
-        'application_id': fields.many2one('olap.application','Application Id',required = True),
+        'application_id': fields.many2one('olap.application', 'Application Id', required = True),
     }
+
 olap_application_table()
 
 
@@ -989,52 +1312,66 @@ class olap_application_field(osv.osv):
     """ Application Field """
     _name = "olap.application.field"
     _description = "Olap application field"
+
     _columns = {
-        'name': fields.char('Application field name',size = 64,required = True),
-        'table_name': fields.char('Application table name',size = 64),
-        'field_name':fields.char('Field name',size = 64),
+        'name': fields.char('Application field name', size = 64, required = True),
+        'table_name': fields.char('Application table name', size = 64),
+        'field_name':fields.char('Field name', size = 64),
         'is_hidden': fields.boolean('Hidden'),
-        'application_id': fields.many2one('olap.application','Application Id',required = True),
+        'application_id': fields.many2one('olap.application', 'Application Id', required = True),
     }
+
 olap_application_field()
 
 
 class olap_saved_query(osv.osv):
     """ Olap Saved Query """
+
     _name = "olap.saved.query"
     _decription = "Olap Saved Query"
 
     _columns = {
-                'name': fields.text('Query Name',size = 64),
-                'user_id': fields.many2one('res.users','User'),
-                'query': fields.text('Query',required = True),
-                'cube_id': fields.many2one('olap.cube','Cube',required = True),
+                'name': fields.text('Query Name', size = 64),
+                'user_id': fields.many2one('res.users', 'User'),
+                'query': fields.text('Query', required = True),
+                'cube_id': fields.many2one('olap.cube', 'Cube', required = True),
                 'mdx_id': fields.char('Module', size=64),
-                'schema_id': fields.many2one('olap.schema','Schema',required = True),
-                'time': fields.datetime('Time',required = True),
+                'schema_id': fields.many2one('olap.schema', 'Schema', required = True),
+                'time': fields.datetime('Time', required = True),
                 'axis_keys': fields.text('Axis Keys'),
                 }
+
 olap_saved_query()
 # Wizard for the Load Data Structure
 # Replacement for the Load Wizard according to the new structure
 class bi_load_db_wizard(osv.osv_memory):
     _name = 'bi.load.db.wizard'
 
-    def _get_fact_table(self,cr,uid,ctx):
+    def _get_fact_table(self, cr, uid, ctx):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ctx: A standard dictionary for contextual values """
+
         if ctx and ctx.has_key('active_id'):
-            schema_obj = self.pool.get('olap.schema').browse(cr,uid,ctx['active_id'])
+            schema_obj = self.pool.get('olap.schema').browse(cr, uid, ctx['active_id'])
             return schema_obj.name
         return False
 
-    def _get_db_name(self,cr,uid,ctx):
+    def _get_db_name(self, cr, uid, ctx):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ctx: A standard dictionary for contextual values """
+
         if ctx and ctx.has_key('active_id'):
-            schema_obj = self.pool.get('olap.schema').browse(cr,uid,ctx['active_id'])
+            schema_obj = self.pool.get('olap.schema').browse(cr, uid, ctx['active_id'])
             return schema_obj.database_id.name
         return False
 
     _columns = {
-        'fact_table':fields.char('Fact Name' ,size = 64,readonly = True),
-        'db_name':fields.char('Database Name',size = 64,readonly = True)
+        'fact_table':fields.char('Fact Name' , size = 64, readonly = True),
+        'db_name':fields.char('Database Name', size = 64, readonly = True)
     }
 
     _defaults = {
@@ -1042,10 +1379,16 @@ class bi_load_db_wizard(osv.osv_memory):
         'db_name': _get_db_name,
     }
 
-    def action_load(self,cr,uid,ids,context = None):
+    def action_load(self, cr, uid, ids, context = None):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: Load Action’s IDs
+            @param context: A standard dictionary for contextual values """
+
         data = context and context.get('active_id', False) or False
         if context and context.has_key('active_id'):
-            lines = self.pool.get('olap.schema').browse(cr,uid,data)
+            lines = self.pool.get('olap.schema').browse(cr, uid, data)
             pool = pooler.get_pool(cr.dbname)
             id_db = lines.database_id.id
             type = lines.database_id.type
@@ -1058,13 +1401,13 @@ class bi_load_db_wizard(osv.osv_memory):
                 port = lines.database_id.db_port and "port=%s" % lines.database_id.db_port or ''
                 name = lines.database_id.db_name and "dbname=%s" % lines.database_id.db_name or ''
                 user = lines.database_id.db_login and "user=%s" % lines.database_id.db_login or ''
-                password = lines.database_id.db_password and "password=%s" % lines.database_id.db_password or ''
-                tdb = psycopg2.connect('%s %s %s %s %s' % (host,port,name,user,password))
+                password = lines.database_id.db_password and \
+                        "password=%s" % lines.database_id.db_password or ''
+                tdb = psycopg2.connect('%s %s %s %s %s' % (host, port, name, user, password))
                 cr_db = tdb.cursor()
-                cr.execute('select table_db_name,id from olap_database_tables \
-                            where fact_database_id=%d',(id_db,))
+                cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d',(id_db,))
                 tables = dict(cr.fetchall())
-                tables_id = map(lambda x: str(tables[x]),tables)
+                tables_id = map(lambda x: str(tables[x]), tables)
                 print 'Creating / Updating Tables...'
                 cr_db.execute("select table_name, table_catalog from \
                         INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
@@ -1074,10 +1417,10 @@ class bi_load_db_wizard(osv.osv_memory):
                         'table_db_name':table[0]
                     }
                     if table[0] in tables.keys():
-                        table_id = tobj.write(cr,uid,[tables[table[0]]],val,context)
+                        table_id = tobj.write(cr, uid, [tables[table[0]]], val, context)
                     else:
                         val['name'] = table[0]
-                        tables[val['name']] = tobj.create(cr,uid,val,context)
+                        tables[val['name']] = tobj.create(cr, uid, val, context)
 
                 print 'Creating / Updating Columns ....'
                 cols = {}
@@ -1089,15 +1432,15 @@ class bi_load_db_wizard(osv.osv_memory):
                          olap_database_columns.id, olap_database_columns.table_id \
                         from olap_database_columns join olap_database_tables \
                         on olap_database_columns.table_id = olap_database_tables.id \
-                        where olap_database_tables.fact_database_id=%d",(id_db,))
+                        where olap_database_tables.fact_database_id=%d", (id_db,))
                 table_col = {}
                 cols_name = {}
                 for x in tables:
                     table_col[str(tables[x])] = [{}]
                 for data in cr.fetchall():
-                    cols[str(data[1])] = (data[0],int(data[2]))
+                    cols[str(data[1])] = (data[0], int(data[2]))
                     table_col[str(data[2])][0][data[0]] = data[1]
-                    cols_name[str(data[0])] = (data[1],int(data[2]))
+                    cols_name[str(data[0])] = (data[1], int(data[2]))
                 cr_db.execute("""SELECT
                         table_name, column_name, udt_name
                     from
@@ -1109,18 +1452,19 @@ class bi_load_db_wizard(osv.osv_memory):
                         'column_db_name': col[1],
                         'type': col[2],
                     }
-                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])),cols)
+                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])), cols)
                     if col[0] in tables.keys() and col[1] in cols_name.keys() and id_made:
-                        if table_col[str(tables[col[0]])][0] and col[1] in table_col[str(tables[col[0]])][0].keys():
-                            col_id = tcol.write(cr,uid,table_col[str(tables[col[0]])][0][col[1]],val,context)
+                        if table_col[str(tables[col[0]])][0] and col[1] in \
+                                        table_col[str(tables[col[0]])][0].keys():
+                            col_id = tcol.write(cr, uid, table_col[str(tables[col[0]])][0][col[1]], val, context)
                         else:
                             val['name'] = col[1]
-                            id_made = tcol.create(cr,uid,val,context)
-                            cols[str(id_made)] = (val['name'],int(val['table_id']))
+                            id_made = tcol.create(cr, uid, val, context)
+                            cols[str(id_made)] = (val['name'], int(val['table_id']))
                     else:
                         val['name'] = col[1]
-                        id_made = tcol.create(cr,uid,val,context)
-                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+                        id_made = tcol.create(cr, uid, val, context)
+                        cols[str(id_made)] = (val['name'], int(val['table_id']))
 
                 print 'Creating / Updating Constraints...'
                 cr_db.execute("""select
@@ -1139,8 +1483,8 @@ class bi_load_db_wizard(osv.osv_memory):
                         'primary_key':True
                     }
 
-                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and(constraint[1] == cols[x][0])),cols)
-                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and(constraint[1] == cols[x][0])), cols)
+                    col_id = tcol.write(cr, uid, int(id_to_write[0]), val, context)
 
                 print "Updating the Foreign key constraint"
                 cr_db.execute("""select
@@ -1168,9 +1512,10 @@ class bi_load_db_wizard(osv.osv_memory):
                     val = {
                         'related_to':tables[for_key[constraint[2]]]
                     }
-                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])and (constraint[1] == cols[x][0])),cols)
+                    id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])\
+                                                and (constraint[1] == cols[x][0])), cols)
                     if id_to_write:
-                        col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+                        col_id = tcol.write(cr, uid, int(id_to_write[0]), val, context)
 
 
             elif type == 'mysql':
@@ -1181,16 +1526,16 @@ class bi_load_db_wizard(osv.osv_memory):
                     db = lines.database_id.db_name or ''
                     user = lines.database_id.db_login or ''
                     passwd = lines.database_id.db_password or ''
-                    tdb = MySQLdb.connect(host = host,port = port,db = db,user = user,passwd = passwd)
+                    tdb = MySQLdb.connect(host = host, port = port, db = db, user = user, passwd = passwd)
 
-                except Exception,e:
-                    raise osv.except_osv('MySQLdb Packages Not Installed.',e)
+                except Exception, e:
+                    raise osv.except_osv('MySQLdb Packages Not Installed.', e)
 
                 cr_db = tdb.cursor()
                 cr.execute('select table_db_name,id from olap_database_tables \
-                                 where fact_database_id=%d',(id_db,))
+                                 where fact_database_id=%d', (id_db,))
                 tables = dict(cr.fetchall())
-                tables_id = map(lambda x: str(tables[x]),tables)
+                tables_id = map(lambda x: str(tables[x]), tables)
                 cols = {}
                 if tables_id:
                     cr.execute('select column_db_name,id,table_id from \
@@ -1199,9 +1544,9 @@ class bi_load_db_wizard(osv.osv_memory):
                     cr.execute('select column_db_name,id,table_id from olap_database_columns')
 
                 for data in cr.fetchall():
-                    cols[str(data[1])] = (data[0],int(data[2]))
+                    cols[str(data[1])] = (data[0], int(data[2]))
                 cr_db.execute("select table_name, table_catalog from \
-                    INFORMATION_SCHEMA.tables where table_schema =%s",(db_name))
+                    INFORMATION_SCHEMA.tables where table_schema =%s", (db_name))
 
                 for table in cr_db.fetchall():
                     val = {
@@ -1210,16 +1555,16 @@ class bi_load_db_wizard(osv.osv_memory):
                     }
 
                     if table[0] in tables.keys():
-                        table_id = tobj.write(cr,uid,[tables[table[0]]],val,context)
+                        table_id = tobj.write(cr, uid, [tables[table[0]]], val, context)
 
                     else:
                         val['name'] = table[0]
-                        tables[val['name']] = tobj.create(cr,uid,val,context)
+                        tables[val['name']] = tobj.create(cr, uid, val, context)
                 cr_db.execute("""SELECT
                         table_name, column_name, data_type
                     from
                         INFORMATION_SCHEMA.columns
-                    WHERE table_schema = %s""",(db_name))
+                    WHERE table_schema = %s""", (db_name))
 
                 for col in cr_db.fetchall():
 
@@ -1229,13 +1574,13 @@ class bi_load_db_wizard(osv.osv_memory):
                         'type': col[2],
                     }
 
-                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])),cols)
+                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])), cols)
                     if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
-                        col_id = tcol.write(cr,uid,cols[tables[str(col[0])]],val,context)
+                        col_id = tcol.write(cr, uid, cols[tables[str(col[0])]], val, context)
                     else:
                         val['name'] = col[1]
-                        id_made = tcol.create(cr,uid,val,context)
-                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+                        id_made = tcol.create(cr, uid, val, context)
+                        cols[str(id_made)] = (val['name'], int(val['table_id']))
 
                 cr_db.execute("""select
                         REFERENCED_COLUMN_NAME,REFERENCED_TABLE_NAME,COLUMN_NAME,TABLE_NAME
@@ -1246,7 +1591,7 @@ class bi_load_db_wizard(osv.osv_memory):
                                     select constraint_name from INFORMATION_SCHEMA .table_constraints
                                     where
                                         constraint_type in('PRIMARY KEY','FOREIGN KEY'))
-                                    """,(db_name))
+                                    """, (db_name))
                 for constraint in cr_db.fetchall():
 
                     if constraint[0]:
@@ -1259,8 +1604,8 @@ class bi_load_db_wizard(osv.osv_memory):
                              'primary_key':True
                              }
                     id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[3]])and \
-                                                (constraint[2] == cols[x][0])),cols)
-                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+                                                (constraint[2] == cols[x][0])), cols)
+                    col_id = tcol.write(cr, uid, int(id_to_write[0]), val, context)
 
             elif type == 'oracle':
                 try:
@@ -1270,16 +1615,16 @@ class bi_load_db_wizard(osv.osv_memory):
                     db = lines.database_id.db_name or ''
                     user = lines.database_id.db_login.upper() or ''
                     passwd = lines.database_id.db_password or ''
-                    tdb = cx_Oracle.connect(user,passwrd,host)
+                    tdb = cx_Oracle.connect(user, passwrd, host)
 
-                except Exception,e:
-                            raise osv.except_osv('cx_Oracle Packages Not Installed.',e)
+                except Exception, e:
+                    raise osv.except_osv('cx_Oracle Packages Not Installed.', e)
 
                 cr_db = tdb.cursor()
                 cr.execute('select table_db_name,id from olap_database_tables \
-                                    where fact_database_id=%d',(id_db,))
+                                    where fact_database_id=%d', (id_db,))
                 tables = dict(cr.fetchall())
-                tables_id = map(lambda x: str(tables[x]),tables)
+                tables_id = map(lambda x: str(tables[x]), tables)
                 cols = {}
                 if tables_id:
                     cr.execute('select column_db_name,id,table_id from \
@@ -1288,9 +1633,9 @@ class bi_load_db_wizard(osv.osv_memory):
                     cr.execute('select column_db_name,id,table_id from olap_database_columns')
 
                 for data in cr.fetchall():
-                    cols[str(data[1])] = (data[0],int(data[2]))
+                    cols[str(data[1])] = (data[0], int(data[2]))
 
-                cr_db.execute("select table_name from all_tables where owner =%s",(user))
+                cr_db.execute("select table_name from all_tables where owner =%s", (user))
                 temp = cr_db.fetchall()
                 for table in temp:
                     val = {
@@ -1299,17 +1644,17 @@ class bi_load_db_wizard(osv.osv_memory):
                     }
 
                     if table[0] in tables.keys():
-                        table_id = tobj.write(cr,uid,[tables[table[0]]],val,context)
+                        table_id = tobj.write(cr, uid, [tables[table[0]]], val, context)
 
                     else:
                         val['name'] = table[0]
-                        tables[val['name']] = tobj.create(cr,uid,val,context)
+                        tables[val['name']] = tobj.create(cr, uid, val, context)
 
                 cr_db.execute("""SELECT
                         table_name, column_name, data_type
                     from
                         all_tab_columns
-                    WHERE owner = %s""",(user))
+                    WHERE owner = %s""", (user))
                 temp = cr_db.fetchall()
                 for col in temp:
                     if col[2] == 'NUMBER':
@@ -1326,13 +1671,13 @@ class bi_load_db_wizard(osv.osv_memory):
                         'type': type_col,
                     }
 
-                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])),cols)
+                    id_made = filter(lambda x:(int(cols[x][1]) == int(tables[col[0]])), cols)
                     if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
-                        col_id = tcol.write(cr,uid,cols[tables[str(col[0])]],val,context)
+                        col_id = tcol.write(cr, uid, cols[tables[str(col[0])]], val, context)
                     else:
                         val['name'] = col[1]
-                        id_made = tcol.create(cr,uid,val,context)
-                        cols[str(id_made)] = (val['name'],int(val['table_id']))
+                        id_made = tcol.create(cr, uid, val, context)
+                        cols[str(id_made)] = (val['name'], int(val['table_id']))
 
                 cr_db.execute("""select
                         table_name,column_name,constraint_name
@@ -1343,7 +1688,7 @@ class bi_load_db_wizard(osv.osv_memory):
                                     select constraint_name from all_constraints
                                     where
                                         constraint_type = 'P' and owner= %s)
-                                    """,(user))
+                                    """, (user))
                 temp = cr_db.fetchall()
                 pk_table = {}
                 for constraint in temp:
@@ -1353,14 +1698,14 @@ class bi_load_db_wizard(osv.osv_memory):
                     pk_table[constraint[2]] = constraint[0]
 
                     id_to_write = filter(lambda x : (int(cols[x][1]) == int(tables[constraint[0]])\
-                                            and(constraint[1] == cols[x][0])),cols)
-                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+                                            and(constraint[1] == cols[x][0])), cols)
+                    col_id = tcol.write(cr, uid, int(id_to_write[0]), val, context)
 
                 cr_db.execute("""select
                                 constraint_name,r_constraint_name from all_constraints
                                     where
                                         constraint_type = 'R'  and owner = %s
-                                    """,(user))
+                                    """, (user))
                 constraints_map = {}
                 for data in cr_db.fetchall():
                     constraints_map[data[0]] = data[1]
@@ -1374,7 +1719,7 @@ class bi_load_db_wizard(osv.osv_memory):
                                     select constraint_name from all_constraints
                                     where
                                         constraint_type = 'R' and owner = %s)
-                                    """,(user))
+                                    """, (user))
 
 
                 temp = cr_db.fetchall()
@@ -1385,21 +1730,26 @@ class bi_load_db_wizard(osv.osv_memory):
                         'related_to' : tables[req_table]
                     }
                     id_to_write = filter(lambda x:(int(cols[x][1]) == int(tables[constraint[0]])\
-                                                and (constraint[1] == cols[x][0])),cols)
-                    col_id = tcol.write(cr,uid,int(id_to_write[0]),val,context)
+                                                and (constraint[1] == cols[x][0])), cols)
+                    col_id = tcol.write(cr, uid, int(id_to_write[0]), val, context)
 
             data = context and context.get('active_id', False) or False
-            temp = pooler.get_pool(cr.dbname).get('olap.fact.database').write(cr,uid,[id_db],{'loaded':True})
+            temp = pooler.get_pool(cr.dbname).get('olap.fact.database').write(cr, uid, [id_db], {'loaded':True})
             wf_service = netsvc.LocalService('workflow')
-            wf_service.trg_validate(uid,'olap.schema',data,'dbload',cr)
-            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
-                                [('model','=','ir.ui.view'),('name','=','view_olap_schema_form')])
-            resource_id = self.pool.get('ir.model.data').read(cr,uid,\
-                                    model_data_ids,fields = ['res_id'])[0]['res_id']
+            wf_service.trg_validate(uid, 'olap.schema', data, 'dbload', cr)
+            model_data_ids = self.pool.get('ir.model.data').search(cr, uid, \
+                                [('model', '=', 'ir.ui.view'), ('name', '=', 'view_olap_schema_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr, uid, \
+                                    model_data_ids, fields = ['res_id'])[0]['res_id']
 
             return {'type':'ir.actions.act_window_close' }
 
-    def action_cancel(self,cr,uid,ids,context = None):
+    def action_cancel(self, cr, uid, ids, context = None):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of create menu’s IDs
+            @param context: A standard dictionary for contextual values """
 
         return {'type':'ir.actions.act_window_close' }
 
@@ -1409,15 +1759,20 @@ bi_load_db_wizard()
 class bi_auto_configure_wizard(osv.osv_memory):
     _name = 'bi.auto.configure.wizard'
 
-    def _get_name(self,cr,uid,context):
+    def _get_name(self, cr, uid, context):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         data = context and context.get('active_id', False) or False
         if context and context.has_key('active_id'):
-            schema_obj = self.pool.get('olap.schema').browse(cr,uid,data)
+            schema_obj = self.pool.get('olap.schema').browse(cr, uid, data)
             return schema_obj.name
         return False
 
     _columns = {
-        'name':fields.char('Fact Name' ,size = 64,readonly = True),
+        'name':fields.char('Fact Name' , size = 64, readonly = True),
 
         }
 
@@ -1425,27 +1780,34 @@ class bi_auto_configure_wizard(osv.osv_memory):
                    'name':_get_name,
                    }
 
-    def action_load(self,cr,uid,ids,context = None):
+    def action_load(self, cr, uid, ids, context = None):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of create menu’s IDs
+            @param context: A standard dictionary for contextual values """
+
         vals = {}
         apptabnew_vals = {}
         appfieldnew_vals = {}
         data = context and context.get('active_id', False) or False
-        ids = pooler.get_pool(cr.dbname).get('olap.schema').browse(cr,uid,data)
+        ids = pooler.get_pool(cr.dbname).get('olap.schema').browse(cr, uid, data)
 
         if ids.app_detect == "Unknown Application":
-            raise wizard.except_wizard('Warning','The Application is Unknown, we can not configure it automatically.')
+            raise wizard.except_wizard('Warning', 'The Application is Unknown,\
+                             we can not configure it automatically.')
 
         else:
             app_objs = pooler.get_pool(cr.dbname).get('olap.application')
-            app_ids = app_objs.search(cr,uid,[])
-            app_res = app_objs.browse(cr,uid,app_ids)
+            app_ids = app_objs.search(cr, uid, [])
+            app_res = app_objs.browse(cr, uid, app_ids)
             app_id = ''
             for x_app in app_res:
-                  app_id = x_app['id']
+                app_id = x_app['id']
 
             apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
-            apptab_ids = apptab_objs.search(cr,uid,[])
-            apptab_res = apptab_objs.browse(cr,uid,apptab_ids)
+            apptab_ids = apptab_objs.search(cr, uid, [])
+            apptab_res = apptab_objs.browse(cr, uid, apptab_ids)
             apptab_name = []
             map_apptab_name = {}
             map_apptab_name_id = {}
@@ -1454,116 +1816,124 @@ class bi_auto_configure_wizard(osv.osv_memory):
                 map_apptab_name_id[aptab.table_name] = aptab
 
             appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
-            appfield_ids = appfield_objs.search(cr,uid,[])
-            appfield_res = appfield_objs.browse(cr,uid,appfield_ids)
-            appfield_data_res = appfield_objs.browse(cr,uid,appfield_ids)
+            appfield_ids = appfield_objs.search(cr, uid, [])
+            appfield_res = appfield_objs.browse(cr, uid, appfield_ids)
+            appfield_data_res = appfield_objs.browse(cr, uid, appfield_ids)
             appcol_name = []
             for apcol in appfield_res:
                 appcol_name.append(apcol.name)
 
             dbtab_obj = pooler.get_pool(cr.dbname).get('olap.database.tables')
-            id_tables = dbtab_obj.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
-            tables_main = dbtab_obj.read(cr,uid,id_tables,context = {'wizard':True})
+            id_tables = dbtab_obj.search(cr, uid, [('fact_database_id', '=', ids.database_id.id)])
+            tables_main = dbtab_obj.read(cr, uid, id_tables, context = {'wizard':True})
             for tables in tables_main:
-                end_user_name = {'name':(" ").join(map(lambda x:x.capitalize(),\
+                end_user_name = {'name':(" ").join(map(lambda x:x.capitalize(), \
                                                 tables['table_db_name'].split("_")))}
-                table_new = dbtab_obj.write(cr,uid,tables['id'],end_user_name)
+                table_new = dbtab_obj.write(cr, uid, tables['id'], end_user_name)
                 if not(tables['table_db_name'].startswith('ir') or \
                        tables['table_db_name'].startswith('wkf') or \
                        tables['table_db_name'].startswith('res_groups') or \
                        tables['table_db_name'].startswith('res_role')) and \
-                       tables['table_db_name'] not in ['inherit','user_rule_group_rel','group_rule_group_rel']:
+                       tables['table_db_name'] not in ['inherit', 'user_rule_group_rel',\
+                                                 'group_rule_group_rel']:
                     vals = {}
 
                     if len(apptab_ids) == 0 and (tables['table_db_name'] not in apptab_name):
                         vals['table_name'] = tables['table_db_name']
-                        vals['name'] = (" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
+                        vals['name'] = (" ").join(map(lambda x:x.capitalize(), tables['name'].split("_")))
                         vals['is_hidden'] = tables['hide']
                         vals['application_id'] = app_id
-                        table_new = dbtab_obj.write(cr,uid,tables['id'],{'hide':False})
-                        apptab_new_obj = apptab_objs.create(cr,uid,vals)
+                        table_new = dbtab_obj.write(cr, uid, tables['id'], {'hide':False})
+                        apptab_new_obj = apptab_objs.create(cr, uid, vals)
+
                     else:
                         if map_apptab_name_id.has_key(tables['table_db_name']):
                             app_table = map_apptab_name_id[tables['table_db_name']]
                             if ((app_table['table_name'] == tables['table_db_name']) \
                                 and not (app_table['table_name'] == tables['name'])):
-                                vals['name'] = (" ").join(map(lambda x:x.capitalize(),\
+                                vals['name'] = (" ").join(map(lambda x:x.capitalize(), \
                                                             tables['name'].split("_")))
                                 vals['is_hidden'] = tables['hide']
-                                tables_obj_new = apptab_objs.write(cr,uid,app_table['id'],vals)
+                                tables_obj_new = apptab_objs.write(cr, uid, app_table['id'], vals)
+
                         else:
                             vals['table_name'] = tables['table_db_name']
-                            vals['name'] = (" ").join(map(lambda x:x.capitalize(),\
+                            vals['name'] = (" ").join(map(lambda x:x.capitalize(), \
                                                         tables['table_db_name'].split("_")))
                             vals['is_hidden'] = tables['hide']
                             vals['application_id'] = app_id
-                            apptab_new_obj = apptab_objs.create(cr,uid,vals)
-            id_columns = pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr,uid,\
-                                                            [('table_id','in',id_tables)])
-            columns = pooler.get_pool(cr.dbname).get('olap.database.columns').read(cr,uid,id_columns,[])
+                            apptab_new_obj = apptab_objs.create(cr, uid, vals)
+            id_columns = pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr, uid, \
+                                                            [('table_id', 'in', id_tables)])
+            columns = pooler.get_pool(cr.dbname).get('olap.database.columns').read(cr, uid, id_columns, [])
             for columns in columns:
                 vals = {}
+
                 if len(appfield_ids) == 0 and (columns['column_db_name'] not in appcol_name):
                     vals['field_name'] = columns['column_db_name']
                     vals['table_name'] = columns['table_id'][1]
-                    vals['name'] = (" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                    vals['name'] = (" ").join(map(lambda x:x.capitalize(), columns['name'].split("_")))
                     vals['is_hidden'] = columns['hide']
                     vals['application_id'] = x_app['id']
-                    appfield_new_obj = appfield_objs.create(cr,uid,vals)
+                    appfield_new_obj = appfield_objs.create(cr, uid, vals)
+
                 else:
                     filter_column = filter(lambda x: columns['column_db_name'] == x['field_name'] \
-                                    and columns['table_id'][1] == x['table_name'],appfield_data_res)
+                                    and columns['table_id'][1] == x['table_name'], appfield_data_res)
                     if map_apptab_name_id.has_key(columns['table_id'][1]) and filter_column:
                         table_id_write = map_apptab_name_id[columns['table_id'][1]]
-                        vals['name'] = (" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                        vals['name'] = (" ").join(map(lambda x:x.capitalize(), columns['name'].split("_")))
                         vals['is_hidden'] = columns['hide']
-                        appfield_new_obj = appfield_objs.write(cr,uid,filter_column[0]['id'],vals)
+                        appfield_new_obj = appfield_objs.write(cr, uid, filter_column[0]['id'], vals)
+
                     else:
                         vals['field_name'] = columns['column_db_name']
                         vals['table_name'] = columns['table_id'][1]
-                        vals['name'] = (" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
+                        vals['name'] = (" ").join(map(lambda x:x.capitalize(), columns['name'].split("_")))
                         vals['is_hidden'] = columns['hide']
                         vals['application_id'] = x_app['id']
-                        appfield_new_obj = appfield_objs.create(cr,uid,vals)
+                        appfield_new_obj = appfield_objs.create(cr, uid, vals)
 
 
             database_tables = pooler.get_pool(cr.dbname).get('olap.database.tables')
-            id_tables = database_tables.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
-            tables = database_tables.read(cr,uid,id_tables,[])
+            id_tables = database_tables.search(cr, uid, [('fact_database_id', '=', ids.database_id.id)])
+            tables = database_tables.read(cr, uid, id_tables, [])
             make_id = []
             for table in tables:
                 vals = {}
+
                 if (table['table_db_name'].startswith('ir') or \
                         table['table_db_name'].startswith('wkf')) or \
                         (table['table_db_name'].startswith('res_groups')) or \
                         (table['table_db_name'] in \
-                         ['inherit','res_roles','user_rule_group_rel',\
-                          'res_roles_users_rel','group_rule_group_rel']):
+                         ['inherit', 'res_roles', 'user_rule_group_rel', \
+                          'res_roles_users_rel', 'group_rule_group_rel']):
                     vals['hide'] = True
                     vals['active'] = False
                     make_id.append(table['id'])
-                    database_tables.write(cr,uid,table['id'],vals)
+                    database_tables.write(cr, uid, table['id'], vals)
 
             database_columns = pooler.get_pool(cr.dbname).get('olap.database.columns')
-            id_columns = database_columns.search(cr,uid,[('table_id','in',make_id)])
-            columns = database_columns.read(cr,uid,id_columns,[])
+            id_columns = database_columns.search(cr, uid, [('table_id', 'in', make_id)])
+            columns = database_columns.read(cr, uid, id_columns, [])
+
             for col in columns:
                 val = {}
                 vals['hide'] = True
                 vals['active'] = False
-                database_columns.write(cr,uid,col['id'],vals)
+                database_columns.write(cr, uid, col['id'], vals)
 
             data = context and context.get('active_id', False) or False
             wf_service = netsvc.LocalService('workflow')
-            wf_service.trg_validate(uid,'olap.schema',data,'dbconfigure',cr)
-            model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
-                        [('model','=','ir.ui.view'),('name','=','view_olap_schema_form')])
-            resource_id = self.pool.get('ir.model.data').read(cr,uid,\
-                                model_data_ids,fields = ['res_id'])[0]['res_id']
+            wf_service.trg_validate(uid, 'olap.schema', data, 'dbconfigure', cr)
+            model_data_ids = self.pool.get('ir.model.data').search(cr, uid, \
+                        [('model', '=', 'ir.ui.view'), ('name', '=', 'view_olap_schema_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr, uid, \
+                                model_data_ids, fields = ['res_id'])[0]['res_id']
 
             return {'type':'ir.actions.act_window_close' }
 
-    def action_cancel(self,cr,uid,ids,context = None):
+    def action_cancel(self, cr, uid, ids, context = None):
 
         return {'type':'ir.actions.act_window_close' }
 
@@ -1572,28 +1942,42 @@ bi_auto_configure_wizard()
 
 class olap_warehouse_wizard(osv.osv_memory):
     """ Warehouse """
+
     _name = "olap.warehouse.wizard"
     _description = "Olap Warehouse"
 
     def _get_queries(self, cr, uid, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         query_obj = self.pool.get('olap.query.logs')
-        qry_ids = query_obj.search(cr, uid, [('user_id','=',uid),('count','>=',3)])
+        qry_ids = query_obj.search(cr, uid, [('user_id', '=', uid), ('count', '>=', 3)])
+
         if qry_ids:
             query = ''
-            for id in query_obj.browse(cr,uid,qry_ids,context):
+            for id in query_obj.browse(cr, uid, qry_ids, context):
                 if query == '':
                     query = id.query
                 else:
                     query = query + '\n'+id.query
             return query
+
         else:
             return ''
     def action_ok(self, cr, uid, ids, context = {}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Action’s IDs
+            @param context: A standard dictionary for contextual values """
         return {'type':'ir.actions.act_window_close' }
 
     _columns = {
-                'query':fields.text('Query',readonly=True),
+                'query':fields.text('Query', readonly=True),
                 }
+
     _defaults = {
         'query': _get_queries,
         }
@@ -1605,33 +1989,47 @@ class olap_parameters_config_wizard(osv.osv_memory):
     _name = "olap.parameters.config.wizard"
     _description = "Olap Server Parameters"
 
-    def _get_host(self,cr,uid,context = None):
+    def _get_host(self, cr, uid, context = None):
+
+        """ Get Host ID
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         obj = self.pool.get('olap')
         objid = self.pool.get('ir.model.data')
-        aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
-        aid = objid.browse(cr,uid,aid,context = context).res_id
-        aid = self.pool.get('ir.actions.url').browse(cr,uid,aid,context = context)
+        aid = objid._get_id(cr, uid, 'olap', 'menu_url_cube_browser')
+        aid = objid.browse(cr, uid, aid, context = context).res_id
+        aid = self.pool.get('ir.actions.url').browse(cr, uid, aid, context = context)
+
         s_p = Literal("http://").suppress() + Word(alphanums + "_" + ".") +\
                  Literal(":").suppress() + Word(nums) + Literal("/").suppress()\
                   + Word(alphanums + "_" + " ").suppress()
         return s_p.parseString(aid.url)[0]
 
-    def _get_port(self,cr,uid,context = None):
+    def _get_port(self, cr, uid, context = None):
+
+        """ Get Port
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         obj = self.pool.get('olap')
         objid = self.pool.get('ir.model.data')
-        aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
-        aid = objid.browse(cr,uid,aid,context = context).res_id
-        aid = self.pool.get('ir.actions.url').browse(cr,uid,aid,context = context)
+        aid = objid._get_id(cr, uid, 'olap', 'menu_url_cube_browser')
+        aid = objid.browse(cr, uid, aid, context = context).res_id
+        aid = self.pool.get('ir.actions.url').browse(cr, uid, aid, context = context)
+
         s_p = Literal("http://").suppress() + Word(alphanums + "_" + ".") + \
               Literal(":").suppress() + Word(nums) + Literal("/").suppress() + \
                Word(alphanums + "_" + " ").suppress()
         return s_p.parseString(aid.url)[1]
 
     _columns = {
-        'host_name' : fields.char('Server Name',size = 64,help = "Put here the server address or IP \
-                Put localhost if its not clear.",required = True),
-        'host_port' : fields.char('Port',size = 4,help = "Put the port for the server. Put 8080 if \
-                its not clear.",required = True),
+        'host_name' : fields.char('Server Name', size = 64, help = "Put here the server address or IP \
+                Put localhost if its not clear.", required = True),
+        'host_port' : fields.char('Port', size = 4, help = "Put the port for the server. Put 8080 if \
+                its not clear.", required = True),
             }
 
     _defaults = {
@@ -1639,7 +2037,13 @@ class olap_parameters_config_wizard(osv.osv_memory):
         'host_port': _get_port,
         }
 
-    def action_cancel(self,cr,uid,ids,conect = None):
+    def action_cancel(self, cr, uid, ids, conect = None):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of create menu’s IDs
+            @param context: A standard dictionary for contextual values """
+
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
@@ -1648,17 +2052,27 @@ class olap_parameters_config_wizard(osv.osv_memory):
                 'target':'new',
          }
 
-    def action_config(self,cr,uid,ids,context = None):
-        conf = self.browse(cr,uid,ids[0],context)
+    def action_config(self, cr, uid, ids, context = None):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of create menu’s IDs
+            @param context: A standard dictionary for contextual values """
+
+        conf = self.browse(cr, uid, ids[0], context)
         obj = self.pool.get('olap')
         objid = self.pool.get('ir.model.data')
-        aid = objid._get_id(cr,uid,'olap','menu_url_cube_browser')
-        aid = objid.browse(cr,uid,aid,context = context).res_id
-        self.pool.get('ir.actions.url').write(cr,uid,[aid],{'url': 'http://' + (conf.host_name or 'localhost') + ':' + (conf.host_port or '8080') + '/browser'})
+        aid = objid._get_id(cr, uid, 'olap', 'menu_url_cube_browser')
+        aid = objid.browse(cr, uid, aid, context = context).res_id
+        self.pool.get('ir.actions.url').write(cr, uid, [aid],\
+                        {'url': 'http://' + (conf.host_name or 'localhost')\
+                         + ':' + (conf.host_port or '8080') + '/browser'})
 
-        aid = objid._get_id(cr,uid,'olap','menu_url_cube_designer')
-        aid = objid.browse(cr,uid,aid,context = context).res_id
-        self.pool.get('ir.actions.url').write(cr,uid,[aid],{'url': 'http://' + (conf.host_name or 'localhost') + ':' + (conf.host_port or '8080') + '/designer'})
+        aid = objid._get_id(cr, uid, 'olap', 'menu_url_cube_designer')
+        aid = objid.browse(cr, uid, aid, context = context).res_id
+        self.pool.get('ir.actions.url').write(cr, uid, [aid],\
+                 {'url': 'http://' + (conf.host_name or 'localhost') +\
+                   ':' + (conf.host_port or '8080') + '/designer'})
 
         return {
                 'view_type': 'form',
diff --git a/addons/olap/wizard/__init__.py b/addons/olap/wizard/__init__.py
index e7871702628..85b903179e5 100755
--- a/addons/olap/wizard/__init__.py
+++ b/addons/olap/wizard/__init__.py
@@ -1,27 +1,21 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/olap/wizard/olap_load_column.py b/addons/olap/wizard/olap_load_column.py
index 6fe594f60c8..fe723756cad 100755
--- a/addons/olap/wizard/olap_load_column.py
+++ b/addons/olap/wizard/olap_load_column.py
@@ -1,27 +1,21 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -32,6 +26,7 @@ class olap_load_column(osv.osv_memory):
     _description = "Olap Load Column"
 
     def get_table_data(self, cr, uid, ids, context={}):
+
         """
         This function load column
         @param cr: the current row, from the database cursor,
@@ -41,13 +36,13 @@ class olap_load_column(osv.osv_memory):
 
         """
         data = context and context.get('active_id', False) or False
-        ids_cols = self.pool.get('olap.database.columns').search(cr, uid,\
-                             ([('table_id','=',data)]),context={})
-        model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
-                        [('model','=','ir.ui.view'),\
-                    ('name','=','view_olap_database_columns_form')],context={})
-        resource_id = self.pool.get('ir.model.data').read(cr,uid,\
-                                model_data_ids,fields=['res_id'])[0]['res_id']
+        ids_cols = self.pool.get('olap.database.columns').search(cr, uid, \
+                             ([('table_id', '=', data)]), context={})
+        model_data_ids = self.pool.get('ir.model.data').search(cr, uid, \
+                            [('model', '=', 'ir.ui.view'), \
+                            ('name', '=', 'view_olap_database_columns_form')], context={})
+        resource_id = self.pool.get('ir.model.data').read(cr, uid, \
+                                model_data_ids, fields=['res_id'])[0]['res_id']
         return {
             'domain': "[('id','in', ["+','.join(map(str,ids_cols))+"])]",
             'name': 'Database Columns',
@@ -57,9 +52,6 @@ class olap_load_column(osv.osv_memory):
             'views': [(False,'tree'),(resource_id,'form')],
             'type': 'ir.actions.act_window',
         }
-    _columns = {
-
-            }
 
 olap_load_column()
 
diff --git a/addons/olap/wizard/olap_load_column_view.xml b/addons/olap/wizard/olap_load_column_view.xml
index 21053274e54..e79e8fcfb42 100644
--- a/addons/olap/wizard/olap_load_column_view.xml
+++ b/addons/olap/wizard/olap_load_column_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-<!-- Open Column  -->
+<!-- Open Column From View -->
 
     	<record id="view_olap_load_column" model="ir.ui.view">
             <field name="name">Open Columns</field>
@@ -16,6 +16,8 @@
             </field>
 		</record>
 
+<!-- Open Column Action -->
+
 		<record id="action_olap_load_column" model="ir.actions.act_window">
             <field name="name">Open Columns</field>
             <field name="type">ir.actions.act_window</field>
@@ -26,6 +28,8 @@
             <field name="target">new</field>
     	</record>
 
+<!-- Open Column Action Window -->
+
         <act_window id="action_olap_load_column_values"
     		key2="client_action_multi" name="Open Columns"
     		res_model="olap.load.column" src_model="olap.database.columns"
diff --git a/addons/olap/wizard/olap_query_logs_clear.py b/addons/olap/wizard/olap_query_logs_clear.py
index 95623ac11d3..8003fc6be85 100755
--- a/addons/olap/wizard/olap_query_logs_clear.py
+++ b/addons/olap/wizard/olap_query_logs_clear.py
@@ -1,27 +1,21 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -30,6 +24,7 @@ from osv import fields, osv
 class olap_query_logs_clear(osv.osv_memory):
     _name = "olap.query.logs.clear"
     _description = "Olap Query Logs Clear"
+
     _columns = {
         'user_name':fields.char('User',size=64,required=True,readonly=True),
     }
@@ -50,8 +45,8 @@ class olap_query_logs_clear(osv.osv_memory):
         @param ids: List of load column,
         @return: dictionary of query logs clear message window
         """
-        ids = self.pool.get('olap.query.logs').search(cr,uid,[('user_id','=',uid)])
-        self.pool.get('olap.query.logs').unlink(cr, uid,ids,context)
+        ids = self.pool.get('olap.query.logs').search(cr, uid, [('user_id', '=', uid)])
+        self.pool.get('olap.query.logs').unlink(cr, uid, ids, context)
         data_obj = self.pool.get('ir.model.data')
         id2 = data_obj._get_id(cr, uid, 'olap', 'view_olap_query_logs_clear_msg')
         if id2:
@@ -73,9 +68,7 @@ class olap_query_logs_clear_msg(osv.osv_memory):
     """   Display clear log message    """
     _name = "olap.query.logs.clear.msg"
     _description = "Olap Query Logs Clear Message"
-    _columns = {
 
-            }
 olap_query_logs_clear_msg()
 
 # vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/olap_query_logs_clear_view.xml b/addons/olap/wizard/olap_query_logs_clear_view.xml
index a780988c2b9..c4015673049 100644
--- a/addons/olap/wizard/olap_query_logs_clear_view.xml
+++ b/addons/olap/wizard/olap_query_logs_clear_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-<!-- Create Logs  -->
+<!-- Create Logs Form View -->
 
     	<record id="view_olap_query_logs_clear" model="ir.ui.view">
             <field name="name">Clear Logs</field>
@@ -21,6 +21,8 @@
             </field>
 		</record>
 
+<!-- Create Logs Action -->
+
 		<record id="action_view_olap_query_logs_clear" model="ir.actions.act_window">
             <field name="name">Clear Logs </field>
             <field name="type">ir.actions.act_window</field>
@@ -30,6 +32,8 @@
             <field name="target">new</field>
     	</record>
 
+<!-- Clear Logs Form View -->
+
 		<record id="view_olap_query_logs_clear_msg" model="ir.ui.view">
             <field name="name">Clear Logs Message</field>
             <field name="model">olap.query.logs.clear.msg</field>
diff --git a/addons/olap/wizard/wizard_load_data.py b/addons/olap/wizard/wizard_load_data.py
index 320c69683ec..0e7ae8a1508 100755
--- a/addons/olap/wizard/wizard_load_data.py
+++ b/addons/olap/wizard/wizard_load_data.py
@@ -1,29 +1,24 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import psycopg2
 import time
 
@@ -41,11 +36,11 @@ form1 = '''<?xml version="1.0"?>
 <form string="Load Database Structure">
 
     <label align="0.0" string="We will load the complete structure of the database by introspection,
-     so that you will be able to work on it, and specify a better structure 
+     so that you will be able to work on it, and specify a better structure
     according to your reporting needs." colspan="4" />
     <newline/>
-    <label align="0.0" string="After having loaded the structure, you will be able to hide/show or 
-    rename tables and columns to simplify end-users interface. The following database 
+    <label align="0.0" string="After having loaded the structure, you will be able to hide/show or
+    rename tables and columns to simplify end-users interface. The following database
     will be loaded:" colspan="4"/>
     <field align="0.0" name='fact_table'/>
     <newline/>
@@ -81,37 +76,37 @@ def olap_db_connect(self,cr,uid,part,context={}):
             cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
         else:
             cr.execute('select column_db_name,id,table_id from olap_database_columns')
-      
+
         for data in cr.fetchall():
             cols[str(data[1])]=(data[0],int(data[2]))
-            
-        print 'Creating / Updating Tables...' 
+
+        print 'Creating / Updating Tables...'
         cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables as a where a.table_schema = 'public'")
         for table in cr_db.fetchall():
             val = {
                 'fact_database_id':id_db,
                 'table_db_name':table[0]
             }
-           
+
             if table[0] in tables.keys():
                 table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
             else:
                 val['name']=table[0]
-                tables[val['name']] = tobj.create(cr,uid,val, context)    
-        print 'Creating / Updating Columns...' 
+                tables[val['name']] = tobj.create(cr,uid,val, context)
+        print 'Creating / Updating Columns...'
         cr_db.execute("""SELECT
                 table_name, column_name, udt_name
             from
                 INFORMATION_SCHEMA.columns
             WHERE table_schema = 'public'""")
-        
+
         for col in cr_db.fetchall():
             val={
                 'table_id': tables[col[0]],
                 'column_db_name': col[1],
                 'type': col[2],
             }
-            
+
             id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
             if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
                 col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
@@ -119,54 +114,54 @@ def olap_db_connect(self,cr,uid,part,context={}):
                 val['name']=col[1]
                 id_made = tcol.create(cr,uid,val, context)
                 cols[str(id_made)] = (val['name'],int(val['table_id']))
-        print 'Creating / Updating Constraints...' 
-        cr_db.execute("""select 
-                table_name,column_name 
-            from 
+        print 'Creating / Updating Constraints...'
+        cr_db.execute("""select
+                table_name,column_name
+            from
                 INFORMATION_schema.key_column_usage
-            where 
+            where
                 constraint_name in (
                             select constraint_name from INFORMATION_SCHEMA .table_constraints
-                            where 
+                            where
                                 constraint_type = 'PRIMARY KEY')""")
-        print "Updating the Primary Key Constraint" 
+        print "Updating the Primary Key Constraint"
         for constraint in cr_db.fetchall():
             val={
                 'primary_key':True
             }
-            
+
             id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and(constraint[1]==cols[x][0])),cols)
-            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
-        print "Updating the Foreign key constraint" 
-        cr_db.execute("""select 
-                    constraint_name,table_name 
-            from 
-                INFORMATION_schema.constraint_column_usage 
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)
+        print "Updating the Foreign key constraint"
+        cr_db.execute("""select
+                    constraint_name,table_name
+            from
+                INFORMATION_schema.constraint_column_usage
             where
                 constraint_name in (
-                            select constraint_name from INFORMATION_SCHEMA.table_constraints 
-                            where 
+                            select constraint_name from INFORMATION_SCHEMA.table_constraints
+                            where
                                 constraint_type = 'FOREIGN KEY')""")
         for_key=dict(cr_db.fetchall())
-        
-        cr_db.execute("""select 
-                     table_name,column_name,constraint_name 
-                 from 
+
+        cr_db.execute("""select
+                     table_name,column_name,constraint_name
+                 from
                      INFORMATION_schema.key_column_usage
-                 where 
+                 where
                      constraint_name in (
-                                 select constraint_name from INFORMATION_SCHEMA.table_constraints 
-                                 where 
-                                     constraint_type = 'FOREIGN KEY')""") 
+                                 select constraint_name from INFORMATION_SCHEMA.table_constraints
+                                 where
+                                     constraint_type = 'FOREIGN KEY')""")
 
         for constraint in cr_db.fetchall():
             val={
                 'related_to':tables[for_key[constraint[2]]]
             }
             id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
-            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context) 
-    
-    
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
+
     elif type =='mysql':
         try:
             import MySQLdb
@@ -176,10 +171,10 @@ def olap_db_connect(self,cr,uid,part,context={}):
             user = lines.database_id.db_login or ''
             passwd = lines.database_id.db_password or ''
             tdb = MySQLdb.connect(host = host,port = port, db = db, user = user, passwd = passwd)
-            
+
         except Exception, e:
             raise osv.except_osv('MySQLdb Packages Not Installed.',e )
-        
+
         cr_db = tdb.cursor()
         cr.execute('select table_db_name,id from olap_database_tables where fact_database_id=%d', (id_db,))
         tables = dict(cr.fetchall())
@@ -189,20 +184,20 @@ def olap_db_connect(self,cr,uid,part,context={}):
             cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
         else:
             cr.execute('select column_db_name,id,table_id from olap_database_columns')
-        
+
         for data in cr.fetchall():
             cols[str(data[1])]=(data[0],int(data[2]))
         cr_db.execute("select table_name, table_catalog from INFORMATION_SCHEMA.tables where table_schema =%s",(db_name))
-        
+
         for table in cr_db.fetchall():
             val = {
                 'fact_database_id':id_db,
                 'table_db_name':table[0]
             }
-           
+
             if table[0] in tables.keys():
                 table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
-                
+
             else:
                 val['name']=table[0]
                 tables[val['name']] = tobj.create(cr,uid,val, context)
@@ -211,15 +206,15 @@ def olap_db_connect(self,cr,uid,part,context={}):
             from
                 INFORMATION_SCHEMA.columns
             WHERE table_schema = %s""",(db_name))
-        
+
         for col in cr_db.fetchall():
-            
+
             val={
                 'table_id': tables[col[0]],
                 'column_db_name': col[1],
                 'type': col[2],
             }
-            
+
             id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
             if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
                 col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
@@ -227,32 +222,32 @@ def olap_db_connect(self,cr,uid,part,context={}):
                 val['name']=col[1]
                 id_made = tcol.create(cr,uid,val, context)
                 cols[str(id_made)] = (val['name'],int(val['table_id']))
-       
-        cr_db.execute("""select 
+
+        cr_db.execute("""select
                 REFERENCED_COLUMN_NAME,REFERENCED_TABLE_NAME,COLUMN_NAME,TABLE_NAME
-            from 
+            from
                 INFORMATION_schema.key_column_usage
-            where table_schema= %s and 
+            where table_schema= %s and
                 constraint_name in (
                             select constraint_name from INFORMATION_SCHEMA .table_constraints
-                            where 
+                            where
                                 constraint_type in('PRIMARY KEY','FOREIGN KEY'))
-                            """,(db_name)) 
+                            """,(db_name))
 
         for constraint in cr_db.fetchall():
-            
+
             if constraint[0]:
                 val={
                      'related_to':tables[constraint[1]]
                      }
             else:
-                
+
                 val={
                      'primary_key':True
                      }
             id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[3]])and(constraint[2]==cols[x][0])),cols)
-            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)  
-    
+            col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)
+
     elif type == 'oracle':
         try:
             import cx_Oracle
@@ -262,7 +257,7 @@ def olap_db_connect(self,cr,uid,part,context={}):
             user = lines.database_id.db_login.upper() or ''
             passwd = lines.database_id.db_password or ''
             tdb = cx_Oracle.connect(user, passwrd, host)
-            
+
         except Exception, e:
                     raise osv.except_osv('cx_Oracle Packages Not Installed.',e )
 
@@ -275,7 +270,7 @@ def olap_db_connect(self,cr,uid,part,context={}):
             cr.execute('select column_db_name,id,table_id from olap_database_columns where table_id in (' + ','.join(tables_id) +')')
         else:
             cr.execute('select column_db_name,id,table_id from olap_database_columns')
-        
+
         for data in cr.fetchall():
             cols[str(data[1])]=(data[0],int(data[2]))
 
@@ -286,10 +281,10 @@ def olap_db_connect(self,cr,uid,part,context={}):
                 'fact_database_id':id_db,
                 'table_db_name':table[0]
             }
-            
+
             if table[0] in tables.keys():
                 table_id=tobj.write(cr,uid,[tables[table[0]]], val, context)
-                
+
             else:
                 val['name']=table[0]
                 tables[val['name']] = tobj.create(cr,uid,val, context)
@@ -297,7 +292,7 @@ def olap_db_connect(self,cr,uid,part,context={}):
         cr_db.execute("""SELECT
                 table_name, column_name, data_type
             from
-                all_tab_columns 
+                all_tab_columns
             WHERE owner = %s""",(user))
         temp = cr_db.fetchall()
         for col in temp:
@@ -314,7 +309,7 @@ def olap_db_connect(self,cr,uid,part,context={}):
                 'column_db_name': col[1],
                 'type': type_col,
             }
-            
+
             id_made=filter(lambda x:(int(cols[x][1])==int(tables[col[0]])),cols)
             if col[1] in cols.keys() and col[0] in tables.keys()and id_made:
                 col_id=tcol.write(cr,uid,cols[tables[str(col[0])]], val, context)
@@ -323,18 +318,18 @@ def olap_db_connect(self,cr,uid,part,context={}):
                 id_made = tcol.create(cr,uid,val, context)
                 cols[str(id_made)] = (val['name'],int(val['table_id']))
 
-        cr_db.execute("""select 
+        cr_db.execute("""select
                 table_name,column_name,constraint_name
-            from 
+            from
                 all_cons_columns
             where
                 constraint_name in (
                             select constraint_name from all_constraints
-                            where 
+                            where
                                 constraint_type = 'P' and owner= %s)
-                            """,(user)) 
+                            """,(user))
         temp = cr_db.fetchall()
-        pk_table = {}        
+        pk_table = {}
         for constraint in temp:
             val={
                 'primary_key' : True
@@ -344,26 +339,26 @@ def olap_db_connect(self,cr,uid,part,context={}):
             id_to_write=filter(lambda x : (int(cols[x][1])==int(tables[constraint[0]])and(constraint[1]==cols[x][0])),cols)
             col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)
 
-        cr_db.execute("""select 
+        cr_db.execute("""select
                         constraint_name,r_constraint_name from all_constraints
-                            where 
+                            where
                                 constraint_type = 'R'  and owner = %s
                             """,(user))
         constraints_map={}
         for data in cr_db.fetchall():
             constraints_map[data[0]]=data[1]
 
-        cr_db.execute("""select 
+        cr_db.execute("""select
                 table_name,column_name,constraint_name
-            from 
+            from
                 all_cons_columns
             where
                 constraint_name in (
                             select constraint_name from all_constraints
-                            where 
+                            where
                                 constraint_type = 'R' and owner = %s)
                             """,(user))
-            
+
 
         temp = cr_db.fetchall()
         for constraint in temp:
@@ -374,7 +369,7 @@ def olap_db_connect(self,cr,uid,part,context={}):
             }
             id_to_write=filter(lambda x:(int(cols[x][1])==int(tables[constraint[0]])and (constraint[1]==cols[x][0])),cols)
             col_id=tcol.write(cr,uid,int(id_to_write[0]),val,context)
-            
+
     pooler.get_pool(cr.dbname).get('olap.fact.database').write(cr,uid,[id_db],{'loaded':True})
     wf_service = netsvc.LocalService('workflow')
     wf_service.trg_validate(uid, 'olap.schema', part['id'], 'dbload', cr)

From 84d1f690cea6c0082b2656a07cec5d1c84e5c605 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 18 Mar 2010 10:55:18 +0530
Subject: [PATCH 050/248] [FIX]: crm: Fixed problem of wrong file name in terp

bzr revid: rpa@tinyerp.com-20100318052518-2u6mjsfuyateo1z3
---
 addons/crm/__terp__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index cc2b4ffd340..2ed47c61351 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -65,7 +65,7 @@ between mails and Open ERP.""",
         'wizard/crm_lead_to_opportunity_view.xml',
         'wizard/crm_phonecall2phonecall.xml',
         'wizard/phonecall2meeting.xml',
-        'wizard/phonecall2partner_view.xml',
+        'wizard/crm_phonecall_to_partner_view.xml',
         'wizard/crm_phonecall_to_opportunity_view.xml',
         'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/crm_opportunity_to_phonecall_view.xml',
@@ -117,4 +117,3 @@ between mails and Open ERP.""",
     'certificate': '0079056041421', 
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From f47c0ee32b5f49894fd2345460d0154fa448dc5d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 18 Mar 2010 12:01:52 +0530
Subject: [PATCH 051/248] [IMP]: base_calendar: Improvement in attendee
 invitation , fixed problems of changes related to reference fields

bzr revid: rpa@tinyerp.com-20100318063152-0p5whxax1xkk3yyf
---
 addons/base_calendar/base_calendar.py | 31 +++++++++++++++------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 97d8aac18ca..c289100d3ae 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -224,7 +224,8 @@ class invite_attendee_wizard(osv.osv_memory):
             vals = []
             mail_to = []
             attendees = []
-            
+            ref = {}
+
             if not model == 'calendar.attendee':
                 ref = {'ref': '%s,%s' % (model, base_calendar_id2real_id(context['active_id']))}
     
@@ -242,9 +243,11 @@ class invite_attendee_wizard(osv.osv_memory):
                     vals.append(res)
                     if user.address_id.email:
                         mail_to.append(user.address_id.email)
-                    
+
             elif  type == 'external' and datas.get('email'):
-                vals.append({'email': datas['email']})
+                res = {'email': datas['email']}
+                res.update(ref)
+                vals.append(res)
                 mail_to.append(datas['email'])
 
             elif  type == 'partner':
@@ -258,16 +261,15 @@ class invite_attendee_wizard(osv.osv_memory):
                     vals.append(res)
                     if contact.email:
                         mail_to.append(contact.email)
-    
-            if model == 'calendar.attendee':
-                att = att_obj.browse(cr, uid, context['active_id'])
-                vals.update({
-                    'parent_ids' : [(4, att.id)],
-                    'ref': att.ref
-                })
 
+            att = att_obj.browse(cr, uid, context['active_id'])
             for att_val in vals:
-                attendees.append(int(att_obj.create(cr, uid, att_val, context=context)))
+                if model == 'calendar.attendee':
+                    att_val.update({
+                        'parent_ids' : [(4, att.id)],
+                        'ref': att.ref._name + ',' + str(att.ref.id)
+                    })
+                attendees.append(att_obj.create(cr, uid, att_val))
 
             if model_field:
                 for attendee in attendees:
@@ -497,8 +499,7 @@ request was delegated to"),
             if user:
                 ref = vals.get('ref', None)
                 if ref:
-                    event_ref = ref
-                    if event_ref.user_id.id != user[0]:
+                    if ref.user_id.id != user[0]:
                         defaults = {'user_id':  user[0]}
                         new_event = model_obj.copy(cr, uid, event, default=defaults, context=context)
             self.write(cr, uid, invite, {'state': 'accepted'}, context)
@@ -507,7 +508,9 @@ request was delegated to"),
     def do_decline(self, cr, uid, ids, context=None, *args):
         self.write(cr, uid, ids, {'state': 'declined'}, context)
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
+        if not context:
+            context = {}
         if not vals.get("email") and vals.get("cn"):
             cnval = vals.get("cn").split(':')
             email =  filter(lambda x:x.__contains__('@'), cnval)

From 0cac3f59979db983cf71b8f3ad0544f8d2c024d4 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 18 Mar 2010 12:22:11 +0530
Subject: [PATCH 052/248] [FIX]: base_calendar: Fixed problem in send mail
 beacuse of ref field

bzr revid: rpa@tinyerp.com-20100318065211-2jt2rzuszi532843
---
 addons/base_calendar/base_calendar.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index c289100d3ae..2cf2ad96226 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -452,11 +452,9 @@ request was delegated to"),
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
             sign = '<br>'.join(sign and sign.split('\n') or [])
             res_obj = att.ref
-            if res_obj and len(res_obj):
-                res_obj = res_obj[0]
             sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
             att_infos = []
-            other_invitaion_ids = self.search(cr, uid, [('ref','=',att.ref)])
+            other_invitaion_ids = self.search(cr, uid, [('ref','=', att.ref._name + ',' + str(att.ref.id))])
             for att2 in self.browse(cr, uid, other_invitaion_ids):
                 att_infos.append(((att2.user_id and att2.user_id.name) or \
                              (att2.partner_id and att2.partner_id.name) or \

From a81819bf12477631e0b65be9e9c857bf959047a4 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 18 Mar 2010 12:35:41 +0530
Subject: [PATCH 053/248] [IMP]: crm: Minor improvement in lead to opportunity
 wizard

bzr revid: rpa@tinyerp.com-20100318070541-igwhez64av41pyds
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index ad798607991..0e1f12bf4fd 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -127,8 +127,7 @@ class crm_lead2opportunity(osv.osv_memory):
         @return : default values of fields.
         """
         lead_obj = self.pool.get('crm.lead')
-        res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
-
+        res = {}
         for lead in lead_obj.browse(cr, uid, context.get('active_ids', [])):
             if lead.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
@@ -136,9 +135,11 @@ Leads Could not convert into Opportunity"))
             if lead.state != 'open':
                 raise osv.except_osv(_('Warning !'), _('Lead should be in \
 \'Open\' state before converting to Opportunity.'))
-
-            res['name'] = lead.partner_name
-            res['partner_id'] = lead.partner_id and lead.partner_id.id or False
+            
+            res = {
+                    'name': lead.partner_name, 
+                    'partner_id': lead.partner_id and lead.partner_id.id or False, 
+                   }
         return res
 
 crm_lead2opportunity()

From 82d77f3024b7313544c5f03bea54cc032c8680ae Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 18 Mar 2010 14:16:13 +0530
Subject: [PATCH 054/248] [IMP]: crm: In crm Report file Apply format code +
 quality and dostring

bzr revid: ksa@tinyerp.co.in-20100318084613-mk90nka0qmwtnk57
---
 addons/crm/crm_report.xml                     |   4 +-
 addons/crm/crm_report_view.xml                |  27 ++--
 addons/crm/crm_view.xml                       |  34 ++---
 addons/crm/report/crm_claim_report.py         |  49 +++++++-
 addons/crm/report/crm_claim_report_view.xml   |  41 +++---
 addons/crm/report/crm_fundraising_report.py   |  46 ++++++-
 .../report/crm_fundraising_report_view.xml    |  38 +++---
 addons/crm/report/crm_helpdesk_report.py      |  21 +++-
 .../crm/report/crm_helpdesk_report_view.xml   | 118 +++++++++++++-----
 addons/crm/report/crm_lead_report.py          |  45 ++++++-
 addons/crm/report/crm_lead_report_view.xml    |  48 ++++---
 addons/crm/report/crm_opportunity_report.py   |  58 +++++++--
 .../report/crm_opportunity_report_view.xml    |  47 ++++---
 addons/crm/report/crm_phonecall_report.py     |  48 +++++--
 .../crm/report/crm_phonecall_report_view.xml  |  41 +++---
 addons/crm/report/crm_report.py               |  70 ++++++++---
 addons/crm/report/crm_report_view.xml         | 118 ++++++++++++------
 addons/crm/report/report_businessopp.py       |  45 ++++---
 18 files changed, 654 insertions(+), 244 deletions(-)

diff --git a/addons/crm/crm_report.xml b/addons/crm/crm_report.xml
index abfdb7e065b..d5009ed6e01 100644
--- a/addons/crm/crm_report.xml
+++ b/addons/crm/crm_report.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False" id="crm_business_opportunities_report" keyword="client_print_multi" menu="True" model="crm.case" multi="True" name="crm.case" string="Business Opportunities"/>
+        <report auto="False" id="crm_business_opportunities_report"
+        	keyword="client_print_multi" menu="True" model="crm.case"
+        	multi="True" name="crm.case" string="Business Opportunities" />
     </data>
 </openerp>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 04e4f235988..b7722ac8443 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
+
     #
     # Cases by section and category2 of case
     #
-<!--		<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm"-->
-<!--			sequence="50"/>-->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_tree">
         <field name="name">CRM Report - Sections and Type(Tree)</field>
@@ -161,7 +160,6 @@
         <field name="view_mode">graph,tree</field>
         <field name="search_view_id" ref="view_crm_case_section_stage_filter"/>
     </record>
-<!--    <menuitem parent="next_id_64" name="Cases by Section and Stage" action="action_report_crm_case_section_stage_tree" id="menu_crm_case_section_stage_tree"/>-->
 
     #
     # Cases by section, category and stage
@@ -211,9 +209,13 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
                    <group col='8' colspan='4'>
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section, Category and Stage for this year"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by Section, Category and Stage for this month"/>
-						<separator orientation="vertical"/>
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"
+                   			help="Cases by Section, Category and Stage for this year" />
+                   		<filter string="This Month" icon="terp-hr"
+                   			domain="[('month','=',time.localtime()[1])]"
+                   			help="Cases by Section, Category and Stage for this month" />
+                   		<separator orientation="vertical"/>
 						<field name="section_id" select="1" widget="selection"/>
 						<field name="nbr" select="1"/>
                 		<field name="state" select="1"/>
@@ -240,7 +242,6 @@
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_crm_case_section_categ_stage_filter"/>
     </record>
-<!--    <menuitem parent="next_id_64" name="Cases by Section, Category and Stage" action="action_report_crm_case_section_categ_stage_tree" id="menu_crm_case_section_categ_stage_tree"/>-->
 
     #
     # Cases by section, category and category2
@@ -292,9 +293,13 @@
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
                    <group col='12' colspan='4'>
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by User for this year"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by User for this month"/>
-						<separator orientation="vertical"/>
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"
+                   			help="Cases by User for this year" />
+                   		<filter string="This Month" icon="terp-hr"
+                   			domain="[('month','=',time.localtime()[1])]"
+                   			help="Cases by User for this month" />
+                   		<separator orientation="vertical"/>
 						<field name="section_id" select="1" widget="selection"/>
 						<field name="nbr" select="1"/>
                 		<field name="state" select="1"/>
@@ -321,6 +326,6 @@
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_crm_case_section_categ_categ2_filter"/>
     </record>
-<!--    <menuitem parent="next_id_64" name="Cases by Section, Category and Type" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/>-->
+
 </data>
 </openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 908cdd6fa91..e783e10c658 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -4,8 +4,10 @@
 <!--        <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>-->
         <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>
 
-        <wizard id="wizard_crm_send_mail" model="crm.case.history" name="crm.send.mail" string="Send Mail" menu="False"/>
-        <wizard id="wizard_crm_new_send_mail" model="crm.case" name="crm.new.send.mail" string="Send New Mail" menu="False"/>
+        <wizard id="wizard_crm_send_mail" model="crm.case.history"
+        	name="crm.send.mail" string="Send Mail" menu="False" />
+        <wizard id="wizard_crm_new_send_mail" model="crm.case"
+        	name="crm.new.send.mail" string="Send New Mail" menu="False" />
 
         <!-- Case Sections -->
         <record id="crm_case_section_view_form" model="ir.ui.view">
@@ -61,7 +63,7 @@
                     <field name="name"/>
                     <field name="probability"/>
                     <field name="section_id"/>
-                    
+
                 </tree>
             </field>
         </record>
@@ -91,7 +93,7 @@
         </record>
         <menuitem  id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
 
-        
+
         <!-- Case Categories -->
         <record id="crm_case_categ-view" model="ir.ui.view">
             <field name="name">crm.case.categ.form</field>
@@ -101,7 +103,7 @@
                 <form string="Case Category">
                     <field name="name" select="1"/>
                     <field name="section_id" select="1" widget="selection"/>
-                    <field name="object_id"  invisible="1" />                    
+                    <field name="object_id"  invisible="1" />
                 </form>
             </field>
         </record>
@@ -112,7 +114,7 @@
             <field name="arch" type="xml">
                 <tree string="Case Category">
                     <field name="name"/>
-                    <field name="section_id"/>                    
+                    <field name="section_id"/>
                 </tree>
             </field>
         </record>
@@ -126,8 +128,8 @@
         <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration"/>
 
         <menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="crm.menu_crm_configuration"/>
-        
-        
+
+
         # ------------------------------------------------------
         # Resource Type of case
         # ------------------------------------------------------
@@ -155,7 +157,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="crm_case_resource_type_act" model="ir.actions.act_window">
             <field name="name">Resource Type</field>
             <field name="res_model">crm.case.resource.type</field>
@@ -163,9 +165,9 @@
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
         <menuitem  id="menu_crm_case_resource_type" name="Resource Type" parent="crm.menu_crm_configuration"/>
-        
+
         <!--<menuitem action="crm_case_resource_type_act" id="menu_crm_case_resource_act" parent="menu_crm_case_resource_type"/>-->
-        
+
 
 <!--        <menuitem id="next_id_52" name="All Cases" parent="crm.menu_crm" sequence="1"/>-->
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
@@ -176,8 +178,8 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 <!--        <menuitem action="crm_case_section_act_tree" id="menu_crm_case_section_act_tree" parent="next_id_52"/>-->
-        
-        
+
+
        <record id="view_crm_email_add_cc_wizard" model="ir.ui.view">
             <field name="name">Add CC</field>
             <field name="model">crm.email.add.cc</field>
@@ -599,7 +601,7 @@
                     </field>
                 </field>
         </record>
-		
+
 		<record id="view_partners_form_crm1" model="ir.ui.view">
                 <field name="name">view.res.partner.form.crm.inherited1</field>
                 <field name="model">res.partner</field>
@@ -612,7 +614,7 @@
                     </field>
                 </field>
         </record>
-        
+
         <record id="view_partners_form_crm2" model="ir.ui.view">
                 <field name="name">view.res.partner.form.crm.inherited2</field>
                 <field name="model">res.partner</field>
@@ -625,7 +627,7 @@
                     </field>
                 </field>
         </record>
-        
+
         <record id="view_partners_form_crm3" model="ir.ui.view">
                 <field name="name">view.res.partner.form.crm.inherited3</field>
                 <field name="model">res.partner</field>
diff --git a/addons/crm/report/crm_claim_report.py b/addons/crm/report/crm_claim_report.py
index cd814e7e2fb..23cb7f65c56 100644
--- a/addons/crm/report/crm_claim_report.py
+++ b/addons/crm/report/crm_claim_report.py
@@ -1,18 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 from osv import fields,osv
 import tools
 
+
 class crm_claim_report(osv.osv):
+    """ CRM Claim Report"""
+
     _name = "crm.claim.report"
     _auto = False
     _inherit = "crm.case.report"
+    _description = "CRM Claim Report"
+
     _columns = {
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]", readonly=True),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]",readonly=True),
-        'partner_id': fields.many2one('res.partner', 'Partner',readonly=True), 
-        'company_id': fields.many2one('res.company','Company',readonly=True),  
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
+                        domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.claim')]", readonly=True),
+        'categ_id': fields.many2one('crm.case.categ', 'Category',\
+                         domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.claim')]", readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
     }
+
     def init(self, cr):
+
+        """
+        @param cr: the current row, from the database cursor,
+        Display Number of cases And Section Name """
+
         tools.drop_view_if_exists(cr, 'crm_claim_report')
         cr.execute("""
             create or replace view crm_claim_report as (
@@ -34,8 +70,11 @@ class crm_claim_report(osv.osv):
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     crm_claim c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id, c.stage_id,c.categ_id,c.partner_id,c.company_id
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), \
+                        c.state, c.user_id,c.section_id, c.stage_id,\
+                        c.categ_id,c.partner_id,c.company_id
             )""")
+
 crm_claim_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/report/crm_claim_report_view.xml b/addons/crm/report/crm_claim_report_view.xml
index 3ff638aeaa7..a00df8b03a0 100644
--- a/addons/crm/report/crm_claim_report_view.xml
+++ b/addons/crm/report/crm_claim_report_view.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>	
+    <data>
+
+<!-- CRM Claim Report Tree View -->
 
         <record id="view_report_crm_claim_tree" model="ir.ui.view">
             <field name="name">crm.claim.report.tree</field>
@@ -22,6 +24,9 @@
                 </tree>
             </field>
         </record>
+
+<!-- CRM Claim Report Form View -->
+
         <record id="view_report_crm_claim_form" model="ir.ui.view">
             <field name="name">crm.claim.report.form</field>
             <field name="model">crm.claim.report</field>
@@ -37,7 +42,9 @@
                 </field>
             </field>
         </record>
-        
+
+<!-- CRM Claim Report Graph View -->
+
         <record id="view_report_crm_claim_graph" model="ir.ui.view">
             <field name="name">crm.claim.report.graph</field>
             <field name="model">crm.claim.report</field>
@@ -51,18 +58,24 @@
             </field>
         </record>
 
+<!-- CRM Claim Report Search View -->
+
         <record id="view_report_crm_claim_filter" model="ir.ui.view">
             <field name="name">crm.claim.report.select</field>
             <field name="model">crm.claim.report</field>
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-             <xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]' position='after'>
-                <filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
-            </xpath>
+             <xpath
+             	expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+             	position='after'>
+             	<filter string="Stage" icon="terp-sale" domain="[]"
+             		context="{'group_by':'stage_id'}" />
+             </xpath>
             </field>
         </record>
-        
+
+<!-- CRM Claim Report Action -->
 
         <record id="action_report_crm_claim" model="ir.actions.act_window">
             <field name="name">Claims</field>
@@ -73,24 +86,24 @@
             <field name="search_view_id" ref="view_report_crm_claim_filter"/>
 
         </record>
-                       	
+
        	<record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="view_report_crm_claim_tree"/>
 	        <field name="act_window_id" ref="action_report_crm_claim"/>
-	    </record>        
-                             	
+	    </record>
+
        	<record model="ir.actions.act_window.view" id="action_report_crm_claim_graph">
 	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="view_report_crm_claim_graph"/>
 	        <field name="act_window_id" ref="action_report_crm_claim"/>
-	    </record>        
-      
-        
-        <menuitem name="Claims" id="menu_report_crm_claim_tree" action="action_report_crm_claim" parent="base.next_id_64"/>       
+	    </record>
+
+       	<menuitem name="Claims" id="menu_report_crm_claim_tree"
+       		action="action_report_crm_claim" parent="base.next_id_64" />
 
 
-  </data>
+    </data>
 </openerp>
diff --git a/addons/crm/report/crm_fundraising_report.py b/addons/crm/report/crm_fundraising_report.py
index a778223ca0c..fd0c884fc8d 100644
--- a/addons/crm/report/crm_fundraising_report.py
+++ b/addons/crm/report/crm_fundraising_report.py
@@ -1,20 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 from osv import fields,osv
 import tools
 
+
 class crm_fundraising_report(osv.osv):
+    """CRM Fundraising Report"""
+
     _name = "crm.fundraising.report"
     _auto = False
     _inherit = "crm.case.report"
+    _description = "CRM Fundraising Report"
+
     _columns = {
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+                    domain="[('section_id','=',section_id),\
+                    ('object_id.model', '=', 'crm.fundraising')]"),
         'probability': fields.float('Avg. Probability', readonly=True),
         'amount_revenue': fields.float('Est.Revenue', readonly=True),
         'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
-        'partner_id': fields.many2one('res.partner', 'Partner'),       
-        'company_id': fields.many2one('res.company','Company'),  
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
+
     def init(self, cr):
+
+        """ @param cr: the current row, from the database cursor
+            Display Number of cases and Average Probability """
+
         tools.drop_view_if_exists(cr, 'crm_fundraising_report')
         cr.execute("""
             create or replace view crm_fundraising_report as (
@@ -32,13 +65,16 @@ class crm_fundraising_report(osv.osv):
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
-                    sum(planned_revenue) as amount_revenue,                    
+                    sum(planned_revenue) as amount_revenue,
                     sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
                     avg(probability)::decimal(16,2) as probability,
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     crm_fundraising c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.categ_id,c.partner_id,c.company_id
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
+                     c.state, c.user_id,c.section_id,c.categ_id,c.partner_id,c.company_id
             )""")
+
 crm_fundraising_report()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml
index 65f0f339a43..1eeb5871e13 100644
--- a/addons/crm/report/crm_fundraising_report_view.xml
+++ b/addons/crm/report/crm_fundraising_report_view.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	<!--
-	Fundraising by user and section
-	-->
+
+<!-- Fundraising by user and section Tree View-->
 
         <record id="view_report_crm_fundraising_tree" model="ir.ui.view">
             <field name="name">crm.fundraising.report.tree</field>
@@ -15,7 +14,7 @@
 					<field name="month"/>
 					<field name="section_id" />
                     <field name="user_id" />
-    				<field name="company_id" />                    
+    				<field name="company_id" />
                     <field name="partner_id" />
                 	<field name="nbr" string="#Fundraising"/>
                     <field name="amount_revenue"  sum="Total Revenue"/>
@@ -25,7 +24,9 @@
                     <field name="state" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                </tree>
-            </field>	
+            </field>
+
+<!-- Fundraising by user and section Form View-->
 
         </record>
         <record id="view_report_crm_fundraising_form" model="ir.ui.view">
@@ -42,7 +43,9 @@
                 </field>
             </field>
         </record>
-        
+
+<!-- Fundraising by user and section Graph View-->
+
         <record id="view_report_crm_fundraising_graph" model="ir.ui.view">
             <field name="name">crm.fundraising.report.graph</field>
             <field name="model">crm.fundraising.report</field>
@@ -56,6 +59,8 @@
             </field>
         </record>
 
+<!-- Fundraising by user and section Search View-->
+
         <record id="view_report_crm_fundraising_filter" model="ir.ui.view">
             <field name="name">crm.fundraising.report.select</field>
             <field name="model">crm.fundraising.report</field>
@@ -66,7 +71,9 @@
                </field>
             </field>
         </record>
-        
+
+<!-- Fundraising by user and section Action -->
+
         <record id="action_report_crm_fundraising" model="ir.actions.act_window">
             <field name="name">Fundraising</field>
             <field name="res_model">crm.fundraising.report</field>
@@ -75,22 +82,25 @@
             <field name="view_id" ref="view_report_crm_fundraising_tree"/>
             <field name="search_view_id" ref="view_report_crm_fundraising_filter"/>
         </record>
-        
-               	
+
+
        	<record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="view_report_crm_fundraising_tree"/>
 	        <field name="act_window_id" ref="action_report_crm_fundraising"/>
-	    </record> 
+	    </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_fundrising_graph">
 	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="view_report_crm_fundraising_graph"/>
 	        <field name="act_window_id" ref="action_report_crm_fundraising"/>
-	    </record>            
-        <menuitem name="Fundraising" action="action_report_crm_fundraising" id="menu_report_crm_fundraising_tree" parent="base.next_id_64"/>
-                
-   	</data>
+	    </record>
+
+        <menuitem name="Fundraising"
+        	action="action_report_crm_fundraising"
+        	id="menu_report_crm_fundraising_tree" parent="base.next_id_64" />
+
+    </data>
 </openerp>
diff --git a/addons/crm/report/crm_helpdesk_report.py b/addons/crm/report/crm_helpdesk_report.py
index 7a855378d19..7694352f523 100644
--- a/addons/crm/report/crm_helpdesk_report.py
+++ b/addons/crm/report/crm_helpdesk_report.py
@@ -18,23 +18,33 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields,osv
 import tools
 
+
 class crm_helpdesk_report(osv.osv):
+    """ Helpdesk report after Sales Services """
+
     _name = "crm.helpdesk.report"
     _description = "Helpdesk report after Sales Services"
     _auto = False
     _inherit = "crm.case.report"
+
     _columns = {
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
-        'partner_id': fields.many2one('res.partner', 'Partner' ,readonly=True),
-        'company_id': fields.many2one('res.company','Company',readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'date_deadline': fields.date('Deadline'),
-        'priority': fields.selection([('5','Lowest'),('4','Low'),('3','Normal'),('2','High'),('1','Highest')], 'Priority'),
+        'priority': fields.selection([('5', 'Lowest'), ('4', 'Low'), \
+                    ('3', 'Normal'), ('2', 'High'), ('1', 'Highest')], 'Priority'),
     }
 
     def init(self, cr):
+
+        """@param cr: the current row, from the database cursor
+           Display Deadline ,Responsible user, partner ,Department """
+
         tools.drop_view_if_exists(cr, 'crm_helpdesk_report')
         cr.execute("""
             create or replace view crm_helpdesk_report as (
@@ -56,8 +66,11 @@ class crm_helpdesk_report(osv.osv):
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     crm_helpdesk c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.priority, c.partner_id,c.company_id,c.date_deadline
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
+                     c.state, c.user_id,c.section_id,c.priority,\
+                      c.partner_id,c.company_id,c.date_deadline
             )""")
+
 crm_helpdesk_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/report/crm_helpdesk_report_view.xml b/addons/crm/report/crm_helpdesk_report_view.xml
index 06a69333bd7..dc1306e3623 100644
--- a/addons/crm/report/crm_helpdesk_report_view.xml
+++ b/addons/crm/report/crm_helpdesk_report_view.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	<!--
-	Helpdesk report after Sales Services
-	-->
+
+<!-- Helpdesk report after Sales Services Tree View -->
 
         <record id="view_report_crm_helpdesk_tree" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.tree</field>
@@ -25,6 +24,9 @@
 				</tree>
             </field>
         </record>
+
+<!-- Helpdesk report after Sales Services Form View -->
+
         <record id="view_report_crm_helpdesk_form" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.form</field>
             <field name="model">crm.helpdesk.report</field>
@@ -40,6 +42,8 @@
             </field>
         </record>
 
+<!-- Helpdesk report after Sales Services Graph View -->
+
         <record id="view_report_crm_helpdesk_graph" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.graph</field>
             <field name="model">crm.helpdesk.report</field>
@@ -53,6 +57,8 @@
             </field>
         </record>
 
+<!-- Helpdesk report after Sales Services Search View -->
+
 		<record id="view_report_crm_helpdesk_filter" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.select</field>
             <field name="model">crm.helpdesk.report</field>
@@ -60,26 +66,46 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="9">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" default="1" />
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
-                        <separator orientation="vertical"/>
-						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
-						<filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
-						<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>
-						<filter string="Deadline" icon="terp-hr" domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]"/>
-						<separator orientation="vertical"/>
-						<field name="section_id" default="context.get('section_id', False)" widget="selection"
-                    				context="{'invisible_section': False}">
-                   		 <filter icon="terp-crm"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id','=',uid)]"
-                        help="My section"/>
-                        </field>
-                          <field name="company_id" widget="selection">
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"
+                   			default="1" />
+
+                   		<filter string="This Month" icon="terp-hr"
+                   			domain="[('month','=',time.strftime('%%m'))]"
+                   			default="1" />
+
+                   		<separator orientation="vertical" />
+                   		<filter string="Current" icon="terp-hr"
+                   			domain="[('state','in',('open','draft'))]" />
+
+                   		<filter string="Won" icon="terp-hr"
+                   			domain="[('state','=','done')]" />
+
+                   		<filter string="Lost" icon="terp-hr"
+                   			domain="[('state','=','cancel')]" />
+
+                   		<filter string="Deadline" icon="terp-hr"
+                   			domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" />
+
+                   		<separator orientation="vertical" />
+                   		<field name="section_id"
+                   			default="context.get('section_id', False)"
+                   			widget="selection"
+                   			context="{'invisible_section': False}">
+
+                   			<filter icon="terp-crm"
+                   				context="{'invisible_section': False}"
+                   				domain="[('section_id.user_id','=',uid)]"
+                   				help="My section" />
+
+                   		</field>
+                   		<field name="company_id" widget="selection">
+
                            <filter icon="terp-crm"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
+
                         </field>
                          <field name="user_id" widget="selection"/>
                    </group>
@@ -88,36 +114,63 @@
                         <filter icon="terp-sale"
                     		string="Lowest"
                     		domain="[('priority','=','5')]"/>
+
                     	<filter icon="terp-sale"
                     		string="Low"
                     		domain="[('priority','=','4')]"/>
+
                     	<filter icon="terp-sale"
                     		string="Normal"
                     		domain="[('priority','=','3')]"/>
+
                     	<filter icon="terp-sale"
                     		string="High"
                     		domain="[('priority','=','2')]"/>
+
                     	<filter icon="terp-sale"
                     		string="Highest"
                     		domain="[('priority','=','1')]"/>
 
                    </group>
                    <newline/>
-                  <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}" default="1" />
-                        <filter string="Company" icon="terp-sale" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="Section" icon="terp-sale" domain="[]" context="{'group_by':'section_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Partner" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-                    	<separator orientation="vertical"/>
-                    	<filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
 
-                   </group>
+<!-- Helpdesk report after Sales Services Apply Group -->
+
+                  <group expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'user_id'}"
+                        	default="1" />
+
+                        <filter string="Company" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Partner" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'partner_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Month" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'name'}" />
+
+                  </group>
                </search>
             </field>
         </record>
+
+<!-- Helpdesk report after Sales Services Action -->
+
         <record id="action_report_crm_helpdesk" model="ir.actions.act_window">
             <field name="name">Helpdesk</field>
             <field name="res_model">crm.helpdesk.report</field>
@@ -141,8 +194,9 @@
 	        <field name="act_window_id" ref="action_report_crm_helpdesk"/>
 	    </record>
 
-        <menuitem name="Helpdesk" action="action_report_crm_helpdesk" id="menu_report_crm_helpdesks_tree" parent="base.next_id_64"/>
+        <menuitem name="Helpdesk" action="action_report_crm_helpdesk"
+        	id="menu_report_crm_helpdesks_tree" parent="base.next_id_64" />
 
-  </data>
+    </data>
 </openerp>
 
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index b0911553981..02b3c3a018e 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -1,18 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 from osv import fields,osv
 import tools
 
 class crm_lead_report(osv.osv):
+    """ CRM Lead Report """
     _name = "crm.lead.report"
     _auto = False
     _inherit = "crm.case.report"
+    _description = "CRM Lead Report"
+
     _columns = {
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]" ,readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]", readonly=True),
-        'partner_id': fields.many2one('res.partner', 'Partner' ,readonly=True),
-        'company_id': fields.many2one('res.company','Company',readonly=True),  
+        'categ_id': fields.many2one('crm.case.categ', 'Category',\
+                         domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.lead')]" , readonly=True),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
+                         domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.lead')]", readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
     }
     def init(self, cr):
+
+        """ @param cr: the current row, from the database cursor
+            CRM Lead Report"""
+
         tools.drop_view_if_exists(cr, 'crm_lead_report')
         cr.execute("""
             create or replace view crm_lead_report as (
@@ -34,7 +66,10 @@ class crm_lead_report(osv.osv):
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     crm_lead c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.stage_id,categ_id,c.partner_id,c.company_id
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
+                     c.state, c.user_id,c.section_id,c.stage_id,categ_id,c.partner_id,c.company_id
             )""")
+
 crm_lead_report()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index c16bb42eade..06cb2b01aa8 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	<!--
-	Leads by user and section
-	-->
+
+<!-- Leads by user and section Tree View -->
 
         <record id="view_report_crm_lead_tree" model="ir.ui.view">
             <field name="name">crm.lead.report.tree</field>
@@ -15,8 +14,8 @@
 				<field name="month"/>
 				<field name="section_id" />
 				<field name="user_id" />
-    			<field name="company_id" />				
-				<field name="partner_id" />				
+    			<field name="company_id" />
+				<field name="partner_id" />
 				<field name="nbr" string="#Leads"/>
                 <field name="delay_close"/>
                 <field name="state"  invisible="1"/>
@@ -25,6 +24,9 @@
              </tree>
             </field>
         </record>
+
+<!-- Leads by user and section Form View -->
+
         <record id="view_report_crm_lead_form" model="ir.ui.view">
             <field name="name">crm.lead.report.form</field>
             <field name="model">crm.lead.report</field>
@@ -37,7 +39,9 @@
                 </field>
             </field>
         </record>
-        
+
+<!-- Leads by user and section Graph View -->
+
         <record id="view_report_crm_lead_graph" model="ir.ui.view">
             <field name="name">crm.lead.report.graph</field>
             <field name="model">crm.lead.report</field>
@@ -51,42 +55,50 @@
             </field>
         </record>
 
+<!-- Leads by user and section Search View -->
+
         <record id="view_report_crm_lead_filter" model="ir.ui.view">
             <field name="name">crm.lead.report.select</field>
             <field name="model">crm.lead.report</field>
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-			<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]' position='after'>
-					<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
-            	</xpath>
+			<xpath
+				expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+				position='after'>
+				<filter string="Stage" icon="terp-sale" domain="[]"
+					context="{'group_by':'stage_id'}" />
+			</xpath>
             </field>
         </record>
-       	
-  
+
+<!-- Leads by user and section Action -->
+
         <record id="action_report_crm_lead" model="ir.actions.act_window">
             <field name="name">Leads</field>
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_report_crm_lead_filter"/>
-           
+
         </record>
-               	
+
        	<record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="view_report_crm_lead_tree"/>
 	        <field name="act_window_id" ref="action_report_crm_lead"/>
-	    </record>        
-                     	
+	    </record>
+
        	<record model="ir.actions.act_window.view" id="action_report_crm_lead_graph">
 	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="view_report_crm_lead_graph"/>
 	        <field name="act_window_id" ref="action_report_crm_lead"/>
-	    </record>        
+	    </record>
 
-        <menuitem name="Leads" id="menu_report_crm_leads_tree" parent="base.next_id_64" action="action_report_crm_lead"/>       
-  </data>
+       	<menuitem name="Leads" id="menu_report_crm_leads_tree"
+       		parent="base.next_id_64" action="action_report_crm_lead" />
+
+    </data>
 </openerp>
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index d6d3fb8a95b..1f07d2ff1eb 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -1,23 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 from osv import fields,osv
 import tools
 
 class crm_opportunity_report(osv.osv):
-    _name = "crm.opportunity.report"    
+    """ CRM Opportunity Report """
+
+    _name = "crm.opportunity.report"
     _auto = False
-    _inherit = "crm.case.report"    
-    
+    _inherit = "crm.case.report"
+    _description = "CRM Opportunity Report"
+
     _columns = {
         'probability': fields.float('Avg. Probability', readonly=True),
-        'amount_revenue': fields.float('Est.Revenue', readonly=True),        
+        'amount_revenue': fields.float('Est.Revenue', readonly=True),
         'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True),
-        'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True),
-        'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),  
-        'company_id': fields.many2one('res.company', 'Company',readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),  
+        'categ_id': fields.many2one('crm.case.categ', 'Category',\
+                     domain="[('section_id','=',section_id),\
+                    ('object_id.model', '=', 'crm.opportunity')]", readonly=True),
+        'stage_id':fields.many2one('crm.case.stage', 'Stage',\
+                     domain="[('section_id','=',section_id),\
+                     ('object_id.model', '=', 'crm.opportunity')]", readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
     }
+
     def init(self, cr):
+
+        """ @param cr: the current row, from the database cursor
+            Display Est.Revenue , Average Probability ,Est.Revenue Probabilit """
+
         tools.drop_view_if_exists(cr, 'crm_opportunity_report')
         cr.execute("""
             create or replace view crm_opportunity_report as (
@@ -36,13 +69,16 @@ class crm_opportunity_report(osv.osv):
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
-                    sum(planned_revenue) as amount_revenue,                    
+                    sum(planned_revenue) as amount_revenue,
                     sum((planned_revenue*probability)/100.0)::decimal(16,2) as amount_revenue_prob,
                     avg(probability)::decimal(16,2) as probability,
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     crm_opportunity c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.stage_id,c.categ_id,c.partner_id,company_id
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
+                     c.state, c.user_id,c.section_id,c.stage_id,c.categ_id,c.partner_id,company_id
             )""")
+
 crm_opportunity_report()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
index 58f2466d1fe..8763510eab1 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_view.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	<!--
-	Opportunities by user and section
-	-->
+
+<!-- Opportunities by user and section Tree View  -->
 
         <record id="view_report_crm_opportunity_tree" model="ir.ui.view">
             <field name="name">crm.opportunity.report.tree</field>
@@ -16,7 +15,7 @@
 					<field name="section_id" />
                     <field name="user_id" />
                     <field name="company_id"/>
-					<field name="partner_id"/>                    
+					<field name="partner_id"/>
                 	<field name="nbr" string="#Opportunities"/>
                     <field name="amount_revenue"  sum="Total Revenue"/>
                     <field name="probability" widget="progressbar"/>
@@ -26,8 +25,11 @@
                     <field name="stage_id"  invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                </tree>
-            </field>	
+            </field>
         </record>
+
+<!-- Opportunities by user and section Form View  -->
+
         <record id="view_report_crm_opportunity_form" model="ir.ui.view">
             <field name="name">crm.opportunity.report.form</field>
             <field name="model">crm.opportunity.report</field>
@@ -43,7 +45,9 @@
                 </field>
             </field>
         </record>
-        
+
+<!-- Opportunities by user and section Graph View  -->
+
         <record id="view_report_crm_opportunity_graph" model="ir.ui.view">
             <field name="name">crm.opportunity.report.graph</field>
             <field name="model">crm.opportunity.report</field>
@@ -57,20 +61,28 @@
             </field>
         </record>
 
+<!-- Opportunities by user and section Search View  -->
+
         <record id="view_report_crm_opportunity_filter" model="ir.ui.view">
             <field name="name">crm.opportunity.report.select</field>
             <field name="model">crm.opportunity.report</field>
             <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]' position='after'>
-        	        <filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
-        	        <separator orientation="vertical"/>
-        	         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-	            </xpath>
+				<xpath
+					expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
+					position='after'>
+					<filter string="Stage" icon="terp-sale" domain="[]"
+						context="{'group_by':'stage_id'}" />
+					<separator orientation="vertical" />
+					<filter string="Partner" icon="terp-partner"
+						domain="[]" context="{'group_by':'partner_id'}" />
+				</xpath>
             </field>
         </record>
-        
+
+<!-- Opportunities by user and section Action  -->
+
         <record id="action_report_crm_opportunity" model="ir.actions.act_window">
             <field name="name">Opportunities</field>
             <field name="res_model">crm.opportunity.report</field>
@@ -83,14 +95,17 @@
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="view_report_crm_opportunity_tree"/>
 	        <field name="act_window_id" ref="action_report_crm_opportunity"/>
-	    </record> 
+	    </record>
         <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_graph">
 	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="view_report_crm_opportunity_graph"/>
 	        <field name="act_window_id" ref="action_report_crm_opportunity"/>
-	    </record>  
+	    </record>
 
-        <menuitem name="Opportunities" action="action_report_crm_opportunity" id="menu_report_crm_opportunity_tree" parent="base.next_id_64"/>        
-	</data>
+        <menuitem name="Opportunities"
+        	action="action_report_crm_opportunity"
+        	id="menu_report_crm_opportunity_tree" parent="base.next_id_64" />
+
+    </data>
 </openerp>
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 327094ebb8e..6e5dc5cdd42 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -1,18 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 from osv import fields,osv
 import tools
 
 class crm_phonecall_report(osv.osv):
+    """ Phone calls by user and section """
+
     _name = "crm.phonecall.report"
     _description = "Phone calls by user and section"
     _auto = False
     _inherit = "crm.case.report"
-    _columns = {                
+
+    _columns = {
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"),
-        'partner_id': fields.many2one('res.partner', 'Partner' ,readonly=True),
-        'company_id': fields.many2one('res.company','Company',readonly=True),  
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+                        domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.phonecall')]"),
+        'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
     }
+
     def init(self, cr):
+
+        """ @param cr: the current row, from the database cursor,
+            Phone Calls By User And Section """
+
         tools.drop_view_if_exists(cr, 'crm_phonecall_report')
         cr.execute("""
             create or replace view crm_phonecall_report as (
@@ -26,14 +57,17 @@ class crm_phonecall_report(osv.osv):
                     c.categ_id,
                     c.partner_id,
                     c.company_id,
-                    count(*) as nbr, 
+                    count(*) as nbr,
                     0 as avg_answers,
                     0.0 as perc_done,
-                    0.0 as perc_cancel,                   
+                    0.0 as perc_cancel,
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     crm_phonecall c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id, c.categ_id,c.partner_id,c.company_id
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
+                     c.state, c.user_id,c.section_id, c.categ_id,c.partner_id,c.company_id
             )""")
+
 crm_phonecall_report()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index fafe538d92e..a41880a7ff7 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	<!--
-	Phone calls by user and section
-	-->
+
+<!-- Phone calls by user and section Tree View -->
 
         <record id="view_report_crm_phonecall_tree" model="ir.ui.view">
             <field name="name">crm.phonecall.report.tree</field>
@@ -20,10 +19,13 @@
 					<field name="nbr" string="#Phone calls" />
 	                <field name="delay_close"/>
                     <field name="state" invisible="1"/>
-                    <field name="categ_id" invisible="1"/>	                
+                    <field name="categ_id" invisible="1"/>
 				</tree>
             </field>
         </record>
+
+<!-- Phone calls by user and section Form View -->
+
         <record id="view_report_crm_phonecall_form" model="ir.ui.view">
             <field name="name">crm.phonecall.report.form</field>
             <field name="model">crm.phonecall.report</field>
@@ -38,7 +40,9 @@
                 </field>
             </field>
         </record>
-        
+
+<!-- Phone calls by user and section Graph View -->
+
         <record id="view_report_crm_phonecall_graph" model="ir.ui.view">
             <field name="name">crm.phonecall.report.graph</field>
             <field name="model">crm.phonecall.report</field>
@@ -50,7 +54,10 @@
                     <field group="True" name="user_id"/>
                 </graph>
             </field>
-        </record> 
+        </record>
+
+<!-- Phone calls by user and section Search View -->
+
         <record id="view_report_crm_phonecall_filter" model="ir.ui.view">
             <field name="name">crm.phonecall.report.select</field>
             <field name="model">crm.phonecall.report</field>
@@ -60,8 +67,10 @@
                  <field name="user_id" position="before">
                </field>
             </field>
-        </record>       
-        
+        </record>
+
+<!-- Phone calls by user and section Action -->
+
         <record id="action_report_crm_phonecall" model="ir.actions.act_window">
             <field name="name">Phone Calls</field>
             <field name="res_model">crm.phonecall.report</field>
@@ -70,22 +79,24 @@
             <field name="view_id" ref="view_report_crm_phonecall_tree"/>
             <field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
         </record>
-               	
+
        	<record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="view_report_crm_phonecall_tree"/>
 	        <field name="act_window_id" ref="action_report_crm_phonecall"/>
-	    </record>  
+	    </record>
 
         <record model="ir.actions.act_window.view" id="action_report_crm_phonecall_graph">
 	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="view_report_crm_phonecall_graph"/>
 	        <field name="act_window_id" ref="action_report_crm_phonecall"/>
-	    </record>         
-              
-        <menuitem name="Phone Calls" action="action_report_crm_phonecall" id="menu_report_crm_phonecalls_tree" parent="base.next_id_64"/>
-                
-  </data>
+	    </record>
+
+        <menuitem name="Phone Calls"
+        	action="action_report_crm_phonecall"
+        	id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" />
+
+    </data>
 </openerp>
diff --git a/addons/crm/report/crm_report.py b/addons/crm/report/crm_report.py
index 2781768abf8..82f3a049de4 100644
--- a/addons/crm/report/crm_report.py
+++ b/addons/crm/report/crm_report.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
 import tools
 
 AVAILABLE_STATES = [
@@ -31,22 +31,31 @@ AVAILABLE_STATES = [
 ]
 
 class crm_case_report(osv.osv):
+    """ Cases and section """
+
     _name = "crm.case.report"
     _description = "Cases and section"
     _auto = False
 
     def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of case and section Data’s IDs
+            @param context: A standard dictionary for contextual values """
+
         res = {}
         state_perc = 0.0
         avg_ans = 0.0
-        
+
         for case in self.browse(cr, uid, ids, context):
             if field_name != 'avg_answers':
                 state = field_name[5:]
-                cr.execute("select count(*) from crm_opportunity where section_id =%s and state='%s'"%(case.section_id.id,state))
+                cr.execute("select count(*) from crm_opportunity where \
+                    section_id =%s and state='%s'"%(case.section_id.id, state))
                 state_cases = cr.fetchone()[0]
-                perc_state = (state_cases / float(case.nbr) ) * 100
-                
+                perc_state = (state_cases / float(case.nbr)) * 100
+
                 res[case.id] = perc_state
             else:
                 model_name = self._name.split('report.')
@@ -55,29 +64,39 @@ class crm_case_report(osv.osv):
                 else:
                     model_name = model_name[1]
 
-                    cr.execute("select count(*) from crm_case_log l, ir_model m  where l.model_id=m.id and m.model = '%s'" , model_name)
+                    cr.execute("select count(*) from crm_case_log l, ir_model m \
+                         where l.model_id=m.id and m.model = '%s'" , model_name)
                     logs = cr.fetchone()[0]
-                    
+
                     avg_ans = logs / case.nbr
-                    res[case.id] = avg_ans       
-        
+                    res[case.id] = avg_ans
+
         return res
 
     _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
+        'name': fields.char('Year', size=64, required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),        
+        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
-        'avg_answers': fields.function(_get_data,string='Avg. Answers', method=True,type="integer"),
-        'perc_done': fields.function(_get_data,string='%Done', method=True,type="float"),
-        'perc_cancel': fields.function(_get_data,string='%Cancel', method=True,type="float"),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-        'company_id': fields.many2one('res.company','Company',readonly=True),                                  
+        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
+        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
+        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
+        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+                                  ('03', 'March'), ('04', 'April'),\
+                                  ('05', 'May'), ('06', 'June'), \
+                                  ('07', 'July'), ('08', 'August'),\
+                                  ('09', 'September'), ('10', 'October'),\
+                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
     }
+
     _order = 'name desc, user_id'
+
     def init(self, cr):
+
+        """ @param cr: the current row, from the database cursor """
+
         tools.drop_view_if_exists(cr, 'crm_case_report')
         cr.execute("""
             create or replace view crm_case_report as (
@@ -92,24 +111,34 @@ class crm_case_report(osv.osv):
                     count(*) as nbr
                 from
                     crm_case c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.company_id
+                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
+                         c.state, c.user_id,c.section_id,c.company_id
             )""")
+
 crm_case_report()
 
+
 class report_crm_case_service_dashboard(osv.osv):
+    """ Report of Closed and Open CRM Cases within past 15 days """
+
     _name = "report.crm.case.service.dashboard"
     _description = "Report of Closed and Open CRM Cases within past 15 days"
     _auto = False
-    _columns = {        
+
+    _columns = {
         'date_deadline': fields.datetime('Deadline', readonly=True),
         'name': fields.char('Description', size=64, readonly=True),
         'user_id': fields.many2one('res.users', 'Responsible', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'create_date' : fields.datetime('Create Date', readonly=True)
     }
+
     _order = 'create_date'
-    
+
     def init(self, cr):
+
+        """ @param cr: the current row, from the database cursor """
+
         cr.execute("""create or replace view report_crm_case_service_dashboard as (
             select
                 cse.id as id, cse.date_deadline as date_deadline,
@@ -128,6 +157,7 @@ class report_crm_case_service_dashboard(osv.osv):
                     AND
                     cse.state='open')
             )""")
+
 report_crm_case_service_dashboard()
 
 
diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index aa5eadde787..e5729553fa2 100644
--- a/addons/crm/report/crm_report_view.xml
+++ b/addons/crm/report/crm_report_view.xml
@@ -2,6 +2,8 @@
 <openerp>
     <data>
 
+<!-- CRM Case Report Tree View -->
+
         <record id="view_crm_case_tree" model="ir.ui.view">
             <field name="name">crm.case.report.tree</field>
             <field name="model">crm.case.report</field>
@@ -18,6 +20,9 @@
                 </tree>
             </field>
         </record>
+
+<!-- CRM Case Report Form View -->
+
         <record id="view_crm_case_form" model="ir.ui.view">
             <field name="name">crm.case.report.form</field>
             <field name="model">>crm.case.report</field>
@@ -34,6 +39,8 @@
             </field>
         </record>
 
+<!-- CRM Case Report Graph View -->
+
         <record id="view_crm_case_graph" model="ir.ui.view">
             <field name="name">crm.case.report</field>
             <field name="model">crm.case.report</field>
@@ -47,6 +54,8 @@
             </field>
         </record>
 
+<!-- CRM Case Report Search View -->
+
         <record id="view_crm_case_filter" model="ir.ui.view">
             <field name="name">crm.case.report.select</field>
             <field name="model">crm.case.report</field>
@@ -54,48 +63,83 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="8">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" default="1" />
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
-                        <separator orientation="vertical"/>
-						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
-						<filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
-						<filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>
-						<separator orientation="vertical"/>
-						<field name="section_id" default="context.get('section_id', False)" widget="selection"
-                    				context="{'invisible_section': False}">
-                   		 <filter icon="terp-crm"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id','=',uid)]"
-                        help="My section"/>
-                        </field>
-                          <field name="company_id" widget="selection">
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"
+                   			default="1" />
+
+                   		<filter string="This Month" icon="terp-hr"
+                   			domain="[('month','=',time.strftime('%%m'))]"
+                   			default="1" />
+
+                   		<separator orientation="vertical" />
+                   		<filter string="Current" icon="terp-hr"
+                   			domain="[('state','in',('open','draft'))]" />
+
+                   		<filter string="Won" icon="terp-hr"
+                   			domain="[('state','=','done')]" />
+
+                   		<filter string="Lost" icon="terp-hr"
+                   			domain="[('state','=','cancel')]" />
+
+                   		<separator orientation="vertical" />
+                   		<field name="section_id"
+                   			default="context.get('section_id', False)"
+                   			widget="selection"
+                   			context="{'invisible_section': False}">
+
+                   			<filter icon="terp-crm"
+                   				context="{'invisible_section': False}"
+                   				domain="[('section_id.user_id','=',uid)]"
+                   				help="My section" />
+
+                   		</field>
+                   		<field name="company_id" widget="selection">
                            <filter icon="terp-crm"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
+
                       	<field name="user_id" select="1" widget="selection">
 	            			<filter icon="terp-crm" string="My Task" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}" default="1" />
-                        <filter string="Company" icon="terp-sale" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="Section" icon="terp-sale" domain="[]" context="{'group_by':'section_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
-                    	<filter string="Category" icon="terp-sale" domain="[]" context="{'group_by':'categ_id'}"/>
-                    	 <separator orientation="vertical"/>
-                    	<filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
-                    	<filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
+                        <filter string="User" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'user_id'}"
+                        	default="1" />
 
-                   </group>
+                        <filter string="Company" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'categ_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Month" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'name'}" />
+
+                  </group>
                </search>
             </field>
         </record>
+
 	    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
 
+<!-- CRM Case Report Action -->
 
         <record id="action_report_crm_case_tree" model="ir.actions.act_window">
             <field name="name">Cases</field>
@@ -104,20 +148,22 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
-        <!--<menuitem action="action_report_crm_case_user_tree" id="menu_crm_case_user_tree" parent="crm.next_id_52"/>
--->
-       <!-- <menuitem action="action_report_crm_case_categ_tree" id="menu_crm_case_categ_tree" parent="crm.next_id_52"/>-->
 
-        <act_window domain="[('user_id', '=', active_id)]" id="act_res_users_2_report_crm_case_user" name="Monthly cases" res_model="crm.case.report" src_model="res.users"/>
+        <act_window domain="[('user_id', '=', active_id)]"
+        	id="act_res_users_2_report_crm_case_user" name="Monthly cases"
+        	res_model="crm.case.report" src_model="res.users" />
 
-        <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_user" name="Monthly cases by user" res_model="crm.case.report" src_model="crm.case.section"/>
+        <act_window domain="[('section_id', '=', active_id)]"
+        	id="act_crm_case_section_2_report_crm_case_user"
+        	name="Monthly cases by user" res_model="crm.case.report"
+        	src_model="crm.case.section" />
 
-        <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_categ" name="Monthly cases by section" res_model="crm.case.report" src_model="crm.case.section"/>
+        <act_window domain="[('section_id', '=', active_id)]"
+        	id="act_crm_case_section_2_report_crm_case_categ"
+        	name="Monthly cases by section" res_model="crm.case.report"
+        	src_model="crm.case.section" />
 
-
-
-
-        <!-- Closed & Open CRM Case view for Random Activities dashboard  -->
+<!-- Closed & Open CRM Case view for Random Activities dashboard Tree View -->
 
         <record id="board_view_crm_case_open_dashboard_tree" model="ir.ui.view">
             <field name="name">report.crm.case.service.dashboard.tree</field>
@@ -147,6 +193,8 @@
             </field>
         </record>
 
+<!-- Closed & Open CRM Case view for Random Activities dashboard Action -->
+
         <record id="action_view_closed_crm_case_dashboard" model="ir.actions.act_window">
 	    	<field name="name">Closed CRM Cases Within Past 15 Days</field>
 	    	<field name="res_model">report.crm.case.service.dashboard</field>
diff --git a/addons/crm/report/report_businessopp.py b/addons/crm/report/report_businessopp.py
index 240f361770e..9e08a9941ee 100644
--- a/addons/crm/report/report_businessopp.py
+++ b/addons/crm/report/report_businessopp.py
@@ -38,16 +38,28 @@ theme.use_color = 1
 random.seed(0)
 
 class external_pdf(render):
+
+    """ Generate External PDF """
+
     def __init__(self, pdf):
         render.__init__(self)
         self.pdf = pdf
-        self.output_type='pdf'
+        self.output_type = 'pdf'
 
     def _render(self):
         return self.pdf
 
 class report_custom(report_int):
+
+    """ Create Custom Report """
+
     def create(self, cr, uid, ids, datas, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of IDs
+            @param context: A standard dictionary for contextual values """
+
         assert len(ids), 'You should provide some ids!'
         responsible_data = {}
         responsible_names = {}
@@ -55,7 +67,10 @@ class report_custom(report_int):
         minbenef = 999999999999999999999
         maxbenef = 0
 
-        cr.execute('select probability, planned_revenue, planned_cost, user_id, res_users.name as name from crm_case left join res_users on (crm_case.user_id=res_users.id) where crm_case.id =ANY(%s) order by user_id',(ids,))
+        cr.execute('select probability, planned_revenue, planned_cost, user_id,\
+                 res_users.name as name from crm_case left join res_users on \
+                 (crm_case.user_id=res_users.id) where crm_case.id =ANY(%s) order by user_id',(ids,))
+
         res = cr.dictfetchall()
         for row in res:
             proba = row['probability'] or 0 / 100.0
@@ -100,14 +115,14 @@ class report_custom(report_int):
 #-echelle variable
 
         pdf_string = StringIO.StringIO()
-        can = canvas.init(fname=pdf_string, format='pdf')
+        can = canvas.init(fname = pdf_string, format = 'pdf')
 
         chart_object.set_defaults(line_plot.T, line_style=None)
 
         xaxis = axis.X(label=None, format="%d%%", tic_interval=20)
         yaxis = axis.Y()
 
-        x_range_a, x_range_b = (0,100)
+        x_range_a, x_range_b = (0, 100)
         y_range_a, y_range_b = (minbenef, maxbenef)
         if y_range_a == 0.0:
             y_range_a += 0.0001
@@ -115,7 +130,7 @@ class report_custom(report_int):
         ar = area.T(
             size = (300,200),
             y_grid_interval = 10000,
-            y_grid_style=None,
+            y_grid_style = None,
             x_range = (x_range_a, x_range_b),
             y_range = (y_range_a, y_range_b),
             x_axis = xaxis,
@@ -134,16 +149,17 @@ class report_custom(report_int):
         # second graph (top right)
         ar = area.T(legend = legend.T(),
                     size = (200,100),
-                    loc=(100,250),
+                    loc = (100,250),
                     x_grid_interval = lambda min, max: [40,60,80,100],
-                    x_grid_style=line_style.gray70_dash1,
+                    x_grid_style = line_style.gray70_dash1,
                     x_range = (33, 100),
-                    x_axis = axis.X(label=None, minor_tic_interval=lambda min,max: [50, 70, 90], format=lambda x: ""),
-                    y_axis=axis.Y(label="Planned amounts"))
+                    x_axis = axis.X(label=None, minor_tic_interval = lambda min,max: [50, 70, 90],\
+                                     format=lambda x: ""),
+                    y_axis = axis.Y(label="Planned amounts"))
 
         bar_plot.fill_styles.reset();
-        plot1=bar_plot.T(label="Cost", data=data, fill_style=fill_style.red)
-        plot2=bar_plot.T(label="Revenue", data=data, hcol=2, stack_on = plot1, fill_style=fill_style.blue)
+        plot1 = bar_plot.T(label="Cost", data=data, fill_style=fill_style.red)
+        plot2 = bar_plot.T(label="Revenue", data=data, hcol=2, stack_on = plot1, fill_style=fill_style.blue)
 
         ar.add_plot(plot1, plot2)
 
@@ -154,14 +170,14 @@ class report_custom(report_int):
         can.line(line_style.black, 0, 0, 300, 50)
 
         # vertical lines
-        ls = line_style.T(width=0.4, color=color.gray70, dash=(2,2))
+        ls = line_style.T(width=0.4, color=color.gray70, dash=(2, 2))
         for x in range(120, 300, 60):
             can.line(ls, x, 0, x, 250)
 
         # draw arrows to the right
         a = arrow.fat1
-        for y in range(60,150,10):
-            a.draw([(285,y), (315,y)], can=can)
+        for y in range(60, 150, 10):
+            a.draw([(285, y), (315, y)], can=can)
 
         # close canvas so that the file is written to "disk"
         can.close()
@@ -174,6 +190,5 @@ class report_custom(report_int):
 
 report_custom('report.crm.case')
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From ffc05c3d7123141c36bb60704149bf6983e1358e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 18 Mar 2010 14:30:14 +0530
Subject: [PATCH 055/248] [IMP]: crm: Implemented view_init in lead to
 opportunity

bzr revid: rpa@tinyerp.com-20100318090014-x6rto1sezw1edh69
---
 addons/crm/wizard/crm_lead_to_opportunity.py | 39 ++++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 0e1f12bf4fd..181be829897 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -114,6 +114,27 @@ class crm_lead2opportunity(osv.osv_memory):
         'planned_revenue': fields.float('Expected Revenue'), 
         'partner_id': fields.many2one('res.partner', 'Partner'), 
     }
+    
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        lead_obj = self.pool.get('crm.lead')
+
+        for lead in lead_obj.browse(cr, uid, context.get('active_ids', [])):
+            if lead.state in ['done', 'cancel']:
+                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
+Leads Could not convert into Opportunity"))
+            if lead.state != 'open':
+                raise osv.except_osv(_('Warning !'), _('Lead should be in \
+\'Open\' state before converting to Opportunity.'))
+        return True
 
     def default_get(self, cr, uid, fields, context=None):
         """
@@ -127,19 +148,13 @@ class crm_lead2opportunity(osv.osv_memory):
         @return : default values of fields.
         """
         lead_obj = self.pool.get('crm.lead')
-        res = {}
+        res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
+
         for lead in lead_obj.browse(cr, uid, context.get('active_ids', [])):
-            if lead.state in ['done', 'cancel']:
-                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
-Leads Could not convert into Opportunity"))
-            if lead.state != 'open':
-                raise osv.except_osv(_('Warning !'), _('Lead should be in \
-\'Open\' state before converting to Opportunity.'))
-            
-            res = {
-                    'name': lead.partner_name, 
-                    'partner_id': lead.partner_id and lead.partner_id.id or False, 
-                   }
+            if 'name' in fields:
+                res.update({'name': lead.partner_name})
+            if 'partner_id' in fields:
+                res.update({'partner_id': lead.partner_id and lead.partner_id.id or False})
         return res
 
 crm_lead2opportunity()

From df1b66d74db42163f296e5aa9e616a80cac7a052 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 18 Mar 2010 14:42:15 +0530
Subject: [PATCH 056/248] [IMP]: audittrail: updated docstring

bzr revid: rpa@tinyerp.com-20100318091215-r7d3pz7amdqbydq4
---
 addons/audittrail/audittrail.py | 53 ++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index be7d3787815..80166298edb 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -28,7 +28,7 @@ import time
 
 class audittrail_rule(osv.osv):
     """
-    For Auddittrail RUle
+    For Auddittrail Rule
     """
     _name = 'audittrail.rule'
     _description = "Audittrail Rule"
@@ -61,10 +61,10 @@ class audittrail_rule(osv.osv):
 
     def subscribe(self, cr, uid, ids, *args):
         """
-        subscriber Rule on object and apply action on that object.
+        Subscribe Rule for auditing changes on object and apply shortcut for logs on that object.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of Auddittrail RUle’s IDs.
+        @param ids: List of Auddittrail Rule’s IDs.
         @return: True 
         """
         obj_action = self.pool.get('ir.actions.act_window')
@@ -94,10 +94,10 @@ class audittrail_rule(osv.osv):
 
     def unsubscribe(self, cr, uid, ids, *args):
         """
-        unsubscribe  Rule on object
+        Unsubscribe Auditing Rule on object
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of Auddittrail RUle’s IDs.
+        @param ids: List of Auddittrail Rule’s IDs.
         @return: True 
         """
         obj_action = self.pool.get('ir.actions.act_window')
@@ -126,6 +126,7 @@ class audittrail_log(osv.osv):
     """
     _name = 'audittrail.log'
     _description = "Audittrail Log"
+
     _columns = {
         "name": fields.char("Name", size=32), 
         "object_id": fields.many2one('ir.model', 'Object'), 
@@ -138,6 +139,7 @@ class audittrail_log(osv.osv):
         "res_id": fields.integer('Resource Id'), 
         "line_ids": fields.one2many('audittrail.log.line', 'log_id', 'Log lines'), 
     }
+
     _defaults = {
         "timestamp": lambda *a: time.strftime("%Y-%m-%d %H:%M:%S")
     }
@@ -166,11 +168,20 @@ class audittrail_log_line(osv.osv):
 audittrail_log_line()
 
 
-
 class audittrail_objects_proxy(osv_pool):
+    """ Uses Object proxy for auditing changes on object of subscribed Rules"""
     
     def get_value_text(self, cr, uid, field_name, values, object, context=None):
-        
+        """
+        Gets textual values for the fields
+        e.g.: For field of type many2one it gives its name value instead of id
+
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param field_name: List of fields for text values 
+        @param values: Values for field to be converted into textual values  
+        @return: values: List of textual values for given fields 
+        """
         if not context:
             context = {}
         pool = pooler.get_pool(cr.dbname)
@@ -207,6 +218,15 @@ class audittrail_objects_proxy(osv_pool):
             return values
 
     def create_log_line(self, cr, uid, id, object, lines=[]):
+        """
+        Creates lines for changed fields with its old and new values
+
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param object: Object who's values are being changed
+        @param lines: List of values for line is to be created
+        """
+        
         pool = pooler.get_pool(cr.dbname)
         obj = pool.get(object.model)
         #start Loop
@@ -245,6 +265,16 @@ class audittrail_objects_proxy(osv_pool):
         return True
 
     def log_fct(self, db, uid, object, method, fct_src, *args):
+        """
+        Logging function: This function is performs logging oprations according to method
+        @param db: the current database
+        @param uid: the current user’s ID for security checks,
+        @param object: Object who's values are being changed
+        @param method: method to log: create, read, write, unlink 
+        @param fct_src: execute method of Object proxy
+        
+        @return: Returns result as per method of Object proxy 
+        """
         logged_uids = []
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
@@ -368,6 +398,15 @@ class audittrail_objects_proxy(osv_pool):
         cr.close()
 
     def execute(self, db, uid, object, method, *args, **kw):
+        """
+        Overrides Object Proxy execute method
+        @param db: the current database
+        @param uid: the current user’s ID for security checks,
+        @param object: Object who's values are being changed
+        @param method: method to log: create, read, write, unlink 
+        
+        @return: Returns result as per method of Object proxy 
+        """
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
         cr.autocommit(True)

From 599c2043ae5127fbca07fab8c72a7b1309dc54a8 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 18 Mar 2010 15:47:35 +0530
Subject: [PATCH 057/248] [IMP]: crm: Apply view_init method in crm

bzr revid: ksa@tinyerp.co.in-20100318101735-0w9qsa4bqw2s93zq
---
 addons/crm/wizard/crm_lead_to_partner.py      |  98 ++++++++-------
 .../wizard/crm_phonecall_to_opportunity.py    | 114 ++++++++++--------
 addons/crm/wizard/crm_phonecall_to_partner.py |  76 +++++++-----
 3 files changed, 164 insertions(+), 124 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index ec59e483bc9..344fec0df9c 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -31,18 +31,36 @@ class crm_lead2partner(osv.osv_memory):
     _columns = {
         'action': fields.selection([('exist', 'Link to an existing partner'), \
                                     ('create', 'Create a new partner')], \
-                                    'Action', required=True), 
+                                    'Action', required=True),
         'partner_id': fields.many2one('res.partner', 'Partner')
         }
 
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+
+        lead_obj = self.pool.get('crm.lead')
+        rec_ids = context and context.get('active_ids', [])
+        for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
+            if lead.partner_id:
+                     raise osv.except_osv(_('Warning !'),
+                        _('A partner is already defined on this lead.'))
+
     def _select_partner(self, cr, uid, context=None):
         """
         This function Searches for Partner from selected lead.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value 
-        @param context: A standard dictionary for contextual values 
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
 
         @return : Partner id if any for selected lead.
         """
@@ -55,10 +73,6 @@ class crm_lead2partner(osv.osv_memory):
         rec_ids = context and context.get('active_ids', [])
         value={}
         for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
-            if lead.partner_id:
-                 raise osv.except_osv(_('Warning !'), 
-                    _('A partner is already defined on this lead.'))
-
             partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
             if not partner_ids and lead.email_from:
                 address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
@@ -70,7 +84,7 @@ class crm_lead2partner(osv.osv_memory):
         return partner_id
 
     _defaults = {
-        'action': lambda *a:'exist', 
+        'action': lambda *a:'exist',
         'partner_id': _select_partner
         }
 
@@ -92,13 +106,13 @@ class crm_lead2partner(osv.osv_memory):
         view_id = view_obj.search(cr, uid, [('model', '=', 'crm.lead2partner'), \
                                      ('name', '=', 'crm.lead2partner.view')])
         return {
-            'view_mode': 'form', 
-            'view_type': 'form', 
-            'view_id': view_id or False, 
-            'res_model': 'crm.lead2partner', 
-            'context': context, 
-            'type': 'ir.actions.act_window', 
-            'target': 'new', 
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': view_id or False,
+            'res_model': 'crm.lead2partner',
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
             }
 
 
@@ -123,32 +137,32 @@ class crm_lead2partner(osv.osv_memory):
         partner_id = False
         contact_id = False
         rec_ids = context and context.get('active_ids', [])
-        
+
         for data in self.browse(cr, uid, ids):
             for lead in lead_obj.browse(cr, uid, rec_ids):
                 if data.action == 'create':
                     partner_id = partner_obj.create(cr, uid, {
-                        'name': lead.partner_name or lead.name, 
-                        'user_id': lead.user_id.id, 
-                        'comment': lead.description, 
+                        'name': lead.partner_name or lead.name,
+                        'user_id': lead.user_id.id,
+                        'comment': lead.description,
                     })
                     contact_id = contact_obj.create(cr, uid, {
-                        'partner_id': partner_id, 
-                        'name': lead.name, 
-                        'phone': lead.phone, 
-                        'mobile': lead.mobile, 
-                        'email': lead.email_from, 
-                        'fax': lead.fax, 
-                        'title': lead.title, 
-                        'function': lead.function and lead.function.id or False, 
-                        'street': lead.street, 
-                        'street2': lead.street2, 
-                        'zip': lead.zip, 
-                        'city': lead.city, 
-                        'country_id': lead.country_id and lead.country_id.id or False, 
-                        'state_id': lead.state_id and lead.state_id.id or False, 
+                        'partner_id': partner_id,
+                        'name': lead.name,
+                        'phone': lead.phone,
+                        'mobile': lead.mobile,
+                        'email': lead.email_from,
+                        'fax': lead.fax,
+                        'title': lead.title,
+                        'function': lead.function and lead.function.id or False,
+                        'street': lead.street,
+                        'street2': lead.street2,
+                        'zip': lead.zip,
+                        'city': lead.city,
+                        'country_id': lead.country_id and lead.country_id.id or False,
+                        'state_id': lead.state_id and lead.state_id.id or False,
                     })
-    
+
                 else:
                     if data.partner_id:
                         partner_id = data.partner_id.id
@@ -184,14 +198,14 @@ class crm_lead2partner(osv.osv_memory):
         res = mod_obj.read(cr, uid, result, ['res_id'])
 
         value = {
-            'domain': "[]", 
-            'view_type': 'form', 
-            'view_mode': 'form,tree', 
-            'res_model': 'res.partner', 
-            'res_id': partner_ids and int(partner_ids[0]) or False, 
-            'view_id': False, 
-            'context': context, 
-            'type': 'ir.actions.act_window', 
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': partner_ids and int(partner_ids[0]) or False,
+            'view_id': False,
+            'context': context,
+            'type': 'ir.actions.act_window',
             'search_view_id': res['res_id']
         }
         return value
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index b18e02270ad..8b29b4945c1 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -40,6 +40,23 @@ class crm_phonecall2opportunity(osv.osv_memory):
 
         return {'type':'ir.actions.act_window_close'}
 
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        record_id = context and context.get('active_id', False) or False
+        case = phonecall_obj.browse(cr, uid, record_id, context=context)
+        if case.state in ['done', 'cancel']:
+                raise osv.except_osv(_("Warning"), _("Closed/Cancelled Phone \
+                        Call Could not convert into Opportunity"))
+
+
     def action_apply(self, cr, uid, ids, context=None):
         """
         This converts Phonecall to Opportunity and opens Phonecall view
@@ -56,60 +73,55 @@ class crm_phonecall2opportunity(osv.osv_memory):
             opp_obj = self.pool.get('crm.opportunity')
             phonecall_obj = self.pool.get('crm.phonecall')
             case = phonecall_obj.browse(cr, uid, record_id, context=context)
+            data_obj = self.pool.get('ir.model.data')
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
-            if case.state in ['done', 'cancel']:
-                raise osv.except_osv(_("Warning"), _("Closed/Cancelled Phone \
-Call Could not convert into Opportunity"))
-            else:
-                data_obj = self.pool.get('ir.model.data')
-                result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-                res = data_obj.read(cr, uid, result, ['res_id'])
-                id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-                id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-                if id2:
-                    id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-                if id3:
-                    id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            for this in self.browse(cr, uid, ids, context=context):
+                new_opportunity_id = opp_obj.create(cr, uid, {
+                                'name': this.name,
+                                'planned_revenue': this.planned_revenue,
+                                'probability': this.probability,
+                                'partner_id': this.partner_id and this.partner_id.id or False,
+                                'section_id': case.section_id and case.section_id.id or False,
+                                'description': case.description or False,
+                                'phonecall_id': case.id,
+                                'priority': case.priority,
+                                'phone': case.partner_phone or False,
+                            })
+                new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
+                vals = {
+                            'partner_id': this.partner_id.id,
+                            'opportunity_id' : new_opportunity_id,
+                            }
+                phonecall_obj.write(cr, uid, [case.id], vals)
+                phonecall_obj.case_close(cr, uid, [case.id])
+                opp_obj.case_open(cr, uid, [new_opportunity_id])
 
-                for this in self.browse(cr, uid, ids, context=context):
-                    new_opportunity_id = opp_obj.create(cr, uid, {
-                                    'name': this.name, 
-                                    'planned_revenue': this.planned_revenue, 
-                                    'probability': this.probability, 
-                                    'partner_id': this.partner_id and this.partner_id.id or False, 
-                                    'section_id': case.section_id and case.section_id.id or False, 
-                                    'description': case.description or False, 
-                                    'phonecall_id': case.id, 
-                                    'priority': case.priority, 
-                                    'phone': case.partner_phone or False, 
-                                })
-                    new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
-                    vals = {
-                                'partner_id': this.partner_id.id, 
-                                'opportunity_id' : new_opportunity_id, 
-                                }
-                    phonecall_obj.write(cr, uid, [case.id], vals)
-                    phonecall_obj.case_close(cr, uid, [case.id])
-                    opp_obj.case_open(cr, uid, [new_opportunity_id])
-
-            value = {
-                'name': _('Opportunity'), 
-                'view_type': 'form', 
-                'view_mode': 'form,tree', 
-                'res_model': 'crm.opportunity', 
-                'res_id': int(new_opportunity_id), 
-                'view_id': False, 
-                'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')], 
-                'type': 'ir.actions.act_window', 
-                'search_view_id': res['res_id']
-            }
-            return value
+        value = {
+            'name': _('Opportunity'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'crm.opportunity',
+            'res_id': int(new_opportunity_id),
+            'view_id': False,
+            'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id']
+        }
+        return value
 
     _columns = {
-        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1), 
-        'probability': fields.float('Success Probability'), 
-        'planned_revenue': fields.float('Expected Revenue'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
+        'probability': fields.float('Success Probability'),
+        'planned_revenue': fields.float('Expected Revenue'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -127,7 +139,7 @@ Call Could not convert into Opportunity"))
         if record_id:
             phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
             res = {
-                    'name': phonecall.name, 
+                    'name': phonecall.name,
                     'partner_id': phonecall.partner_id and phonecall.partner_id.id or False
                    }
         return res
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index ef563c02be0..00bd1993c94 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -31,18 +31,36 @@ class crm_phonecall2partner(osv.osv_memory):
     _columns = {
         'action': fields.selection([('exist', 'Link to an existing partner'), \
                                     ('create', 'Create a new partner')], \
-                                    'Action', required=True), 
+                                    'Action', required=True),
         'partner_id': fields.many2one('res.partner', 'Partner')
         }
 
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        phonecall_obj = self.pool.get('crm.phonecall')
+        rec_ids = context and context.get('active_ids', [])
+        for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
+            if phonecall.partner_id:
+                 raise osv.except_osv(_('Warning !'),
+                    _('A partner is already defined on this phonecall.'))
+
+
     def _select_partner(self, cr, uid, context=None):
         """
         This function Searches for Partner from selected phonecall.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value 
-        @param context: A standard dictionary for contextual values 
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
 
         @return : Partner id if any for selected phonecall.
         """
@@ -56,10 +74,6 @@ class crm_phonecall2partner(osv.osv_memory):
         value = {}
 
         for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
-            if phonecall.partner_id:
-                 raise osv.except_osv(_('Warning !'), 
-                    _('A partner is already defined on this phonecall.'))
-
             partner_ids = partner_obj.search(cr, uid, [('name', '=', phonecall.name or phonecall.name)])
             if not partner_ids and phonecall.email_from:
                 address_ids = contact_obj.search(cr, uid, [('email', '=', phonecall.email_from)])
@@ -71,7 +85,7 @@ class crm_phonecall2partner(osv.osv_memory):
         return partner_id
 
     _defaults = {
-        'action': lambda *a:'exist', 
+        'action': lambda *a:'exist',
         'partner_id': _select_partner
         }
 
@@ -93,13 +107,13 @@ class crm_phonecall2partner(osv.osv_memory):
         view_id = view_obj.search(cr, uid, [('model', '=', 'crm.phonecall2partner'), \
                                  ('name', '=', 'crm.phonecall2partner.view')])
         return {
-            'view_mode': 'form', 
-            'view_type': 'form', 
-            'view_id': view_id or False, 
-            'res_model': 'crm.phonecall2partner', 
-            'context': context, 
-            'type': 'ir.actions.act_window', 
-            'target': 'new', 
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': view_id or False,
+            'res_model': 'crm.phonecall2partner',
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
             }
 
 
@@ -124,21 +138,21 @@ class crm_phonecall2partner(osv.osv_memory):
         contact_id = False
 
         rec_ids = context and context.get('active_ids', [])
-        
+
         for data in self.browse(cr, uid, ids):
             for phonecall in phonecall_obj.browse(cr, uid, rec_ids):
                 if data.action == 'create':
                     partner_id = partner_obj.create(cr, uid, {
-                        'name': phonecall.name or phonecall.name, 
-                        'user_id': phonecall.user_id.id, 
-                        'comment': phonecall.description, 
+                        'name': phonecall.name or phonecall.name,
+                        'user_id': phonecall.user_id.id,
+                        'comment': phonecall.description,
                     })
                     contact_id = contact_obj.create(cr, uid, {
-                        'partner_id': partner_id, 
-                        'name': phonecall.name, 
-                        'phone': phonecall.partner_phone, 
+                        'partner_id': partner_id,
+                        'name': phonecall.name,
+                        'phone': phonecall.partner_phone,
                     })
-    
+
                 else:
                     if data.partner_id:
                         partner_id = data.partner_id.id
@@ -174,14 +188,14 @@ class crm_phonecall2partner(osv.osv_memory):
         res = mod_obj.read(cr, uid, result, ['res_id'])
 
         value = {
-            'domain': "[]", 
-            'view_type': 'form', 
-            'view_mode': 'form,tree', 
-            'res_model': 'res.partner', 
-            'res_id': partner_ids and int(partner_ids[0]) or False, 
-            'view_id': False, 
-            'context': context, 
-            'type': 'ir.actions.act_window', 
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': partner_ids and int(partner_ids[0]) or False,
+            'view_id': False,
+            'context': context,
+            'type': 'ir.actions.act_window',
             'search_view_id': res['res_id']
         }
         return value

From 60e7b429d0115feb24a71e9c22f205dbccc739c2 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 18 Mar 2010 15:48:29 +0530
Subject: [PATCH 058/248] [IMP]: board: Apply view_init method in board

bzr revid: ksa@tinyerp.co.in-20100318101829-gmbuio3nz4hinczt
---
 addons/board/wizard/board_menu_create.py | 33 ++++++++++++++----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 107c00ba142..19dba75b415 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,19 +26,26 @@ class board_menu_create(osv.osv_memory):
     """
     Create Menu
     """
-    def check_views(self, cr, uid, context):
+    def view_init(self, cr, uid, fields, context=None):
         """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
         check dashboard view on menu name field.
-        @return: False 
+        @return: False
         """
         data = context and context.get('active_id', False) or False
         if data:
             board = self.pool.get('board.board').browse(cr, uid, data)
             if not board.line_ids:
-                raise osv.except_osv(_('User Error!'), 
-                                     _('Please Insert Dashboard View(s) !'))    
+                raise osv.except_osv(_('User Error!'),
+                                     _('Please Insert Dashboard View(s) !'))
             return False
-    
+
     def board_menu_create(self, cr, uid, ids, context=None):
         """
         Create Menu.
@@ -49,7 +56,7 @@ class board_menu_create(osv.osv_memory):
         """
         if not context:
             context = {}
-             
+
         context_id = context and context.get('active_id', False) or False
         if context_id:
             board = self.pool.get('board.board').browse(cr, uid, context_id)
@@ -60,8 +67,8 @@ class board_menu_create(osv.osv_memory):
                 'res_model': 'board.board',
                 'view_id': board.view_id.id,
                 })
-        obj_menu = self.pool.get('ir.ui.menu') 
-        #start Loop    
+        obj_menu = self.pool.get('ir.ui.menu')
+        #start Loop
         for data in self.read(cr, uid, ids):
             obj_menu.create(cr, uid, {
                 'name': data.get('menu_name'),
@@ -71,16 +78,14 @@ class board_menu_create(osv.osv_memory):
                 }, context=context)
         #End Loop
         return {}
-    
+
     _name = "board.menu.create"
     _description = "Menu Create"
+
     _columns = {
              'menu_name': fields.char('Menu Name', size=64, required=True),
              'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
           }
-    _defaults = {
-            'menu_name': check_views,
-          }
 
 board_menu_create()
 

From e56f3c673c82ddc00c2d5b848aad5673c8654d76 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 18 Mar 2010 16:03:28 +0530
Subject: [PATCH 059/248] [IMP]: crm: Improvement in phonecall to opportuniy
 wizard

bzr revid: rpa@tinyerp.com-20100318103328-yogulp3rvdo2y98l
---
 addons/crm/wizard/crm_phonecall_to_opportunity.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index 8b29b4945c1..5d44ad4b2bf 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -50,11 +50,12 @@ class crm_phonecall2opportunity(osv.osv_memory):
         @param context: A standard dictionary for contextual values
 
         """
+        phonecall_obj = self.pool.get('crm.phonecall')
         record_id = context and context.get('active_id', False) or False
         case = phonecall_obj.browse(cr, uid, record_id, context=context)
         if case.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning"), _("Closed/Cancelled Phone \
-                        Call Could not convert into Opportunity"))
+Call Could not convert into Opportunity"))
 
 
     def action_apply(self, cr, uid, ids, context=None):
@@ -136,12 +137,14 @@ class crm_phonecall2opportunity(osv.osv_memory):
         @return : default values of fields.
         """
         record_id = context and context.get('active_id', False) or False
+        res = super(crm_phonecall2opportunity, self).default_get(cr, uid, fields, context=context)
+
         if record_id:
             phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
-            res = {
-                    'name': phonecall.name,
-                    'partner_id': phonecall.partner_id and phonecall.partner_id.id or False
-                   }
+            if 'name' in fields:
+                res.update({'name': phonecall.name})
+            if 'partner_id' in fields:
+                res.update({'partner_id': phonecall.partner_id and phonecall.partner_id.id or False})
         return res
 
 crm_phonecall2opportunity()

From 1de1bbf6ec58a40fa6df93a0e10e8bec749b4bcf Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 18 Mar 2010 16:22:45 +0530
Subject: [PATCH 060/248] [IMP]: crm: Improvement in Phonecall to Meeting
 wizard, put proper docstring

bzr revid: rpa@tinyerp.com-20100318105245-8c5hojj4jru85ydb
---
 addons/crm/__terp__.py                        |  8 +-
 addons/crm/wizard/__init__.py                 |  4 +-
 .../crm_opportunity_to_meeting_view.xml       |  1 -
 addons/crm/wizard/crm_phonecall_to_meeting.py | 99 +++++++++++++++++++
 ....xml => crm_phonecall_to_meeting_view.xml} | 10 +-
 ...ecall.py => crm_phonecall_to_phonecall.py} |  0
 ...ml => crm_phonecall_to_phonecall_view.xml} |  0
 addons/crm/wizard/phonecall2meeting.py        | 75 --------------
 8 files changed, 114 insertions(+), 83 deletions(-)
 create mode 100644 addons/crm/wizard/crm_phonecall_to_meeting.py
 rename addons/crm/wizard/{phonecall2meeting.xml => crm_phonecall_to_meeting_view.xml} (82%)
 rename addons/crm/wizard/{crm_phonecall2phonecall.py => crm_phonecall_to_phonecall.py} (100%)
 rename addons/crm/wizard/{crm_phonecall2phonecall.xml => crm_phonecall_to_phonecall_view.xml} (100%)
 delete mode 100644 addons/crm/wizard/phonecall2meeting.py

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 2ed47c61351..25a4c0839b2 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -63,12 +63,15 @@ between mails and Open ERP.""",
     'update_xml': [
         'wizard/crm_lead_to_partner_view.xml',
         'wizard/crm_lead_to_opportunity_view.xml',
-        'wizard/crm_phonecall2phonecall.xml',
-        'wizard/phonecall2meeting.xml',
+
+        'wizard/crm_phonecall_to_phonecall_view.xml',
+        'wizard/crm_phonecall_to_meeting_view.xml',
         'wizard/crm_phonecall_to_partner_view.xml',
         'wizard/crm_phonecall_to_opportunity_view.xml',
+
         'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/crm_opportunity_to_phonecall_view.xml',
+
         'crm_wizard.xml', 
         'crm_view.xml',
          
@@ -77,7 +80,6 @@ between mails and Open ERP.""",
         'crm_lead_menu.xml', 
         'crm_meeting_view.xml', 
         'crm_meeting_menu.xml', 
-        #'crm_phonecall_wizard.xml', 
         'crm_phonecall_view.xml', 
         'crm_phonecall_menu.xml',         
         'crm_opportunity_view.xml', 
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 2d0a7eaf651..4ab5e00ad67 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -31,9 +31,9 @@ import crm_lead_to_opportunity
 import crm_opportunity_to_meeting
 import crm_opportunity_to_phonecall
 
-import crm_phonecall2phonecall
+import crm_phonecall_to_phonecall
 import crm_phonecall_to_partner
-import phonecall2meeting
+import crm_phonecall_to_meeting
 import crm_phonecall_to_opportunity
 
 
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting_view.xml b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
index 99229aa738d..7ea05598d28 100644
--- a/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
@@ -30,7 +30,6 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="opportunity2meeting_view"/>
             <field name="target">new</field>
-         	<field name="context">{'record_id' : active_id}</field>
         </record>
 
     </data>
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py
new file mode 100644
index 00000000000..e3edcf894e0
--- /dev/null
+++ b/addons/crm/wizard/crm_phonecall_to_meeting.py
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from tools.translate import _
+
+class crm_phonecall2meeting(osv.osv_memory):
+    """ Phonecall to Meeting """
+
+    _name = 'crm.phonecall2meeting'
+    _description = 'Phonecall To Meeting'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Phonecall to Meeting form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Meeting IDs
+        @param context: A standard dictionary for contextual values
+
+        """
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_make_meeting(self, cr, uid, ids, context=None):
+        """
+        This opens Meeting's calendar view to schedule meeting on current Phonecall
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Meeting IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Meeting view
+        """
+        value = {}
+        record_id = context and context.get('active_id', False) or False
+
+        if record_id:
+            phonecall_obj = self.pool.get('crm.phonecall')                   
+            data_obj = self.pool.get('ir.model.data')
+
+            # Get meeting views
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            if id1:
+                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+            phonecall = phonecall_obj.browse(cr, uid, record_id, context=context)
+            context = {
+                        'default_phonecall_id': phonecall.id, 
+                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False, 
+                        'default_email': phonecall.email_from , 
+                        'default_name': phonecall.name
+                    }
+
+            value = {
+                'name': _('Meetings'), 
+                'domain' : "[('user_id','=',%s)]" % (uid), 
+                'context': context, 
+                'view_type': 'form', 
+                'view_mode': 'calendar,form,tree', 
+                'res_model': 'crm.meeting', 
+                'view_id': False, 
+                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')], 
+                'type': 'ir.actions.act_window', 
+                'search_view_id': res['res_id']
+                }
+
+        return value
+
+crm_phonecall2meeting()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/phonecall2meeting.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
similarity index 82%
rename from addons/crm/wizard/phonecall2meeting.xml
rename to addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index fe90bbe5cd6..11561b81e8c 100644
--- a/addons/crm/wizard/phonecall2meeting.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
+	    <!-- Phonecall to meeting view -->
+
         <record model="ir.ui.view" id="phonecall2phonecall2meeting_view">
             <field name="name">crm.phonecall2meeting.form</field>
             <field name="model">crm.phonecall2meeting</field>
@@ -8,10 +11,13 @@
             <field name="arch" type="xml">
                 <form string="Convert To Meeting ">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                        <button name="action_make_meeting" type="object" string="_Convert" icon="gtk-convert" />
                 </form>
             </field>
         </record>
+
+	    <!-- Phonecall to meeting action -->
+
         <record model="ir.actions.act_window" id="phonecall2meeting_act">
             <field name="name">Convert To Meeting</field>
             <field name="res_model">crm.phonecall2meeting</field>
@@ -19,7 +25,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="phonecall2phonecall2meeting_view"/>
             <field name="target">new</field>
-         	<field name="context">{'record_id' : active_id}</field>
         </record>
+
     </data>
 </openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
similarity index 100%
rename from addons/crm/wizard/crm_phonecall2phonecall.py
rename to addons/crm/wizard/crm_phonecall_to_phonecall.py
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
similarity index 100%
rename from addons/crm/wizard/crm_phonecall2phonecall.xml
rename to addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
diff --git a/addons/crm/wizard/phonecall2meeting.py b/addons/crm/wizard/phonecall2meeting.py
deleted file mode 100644
index 89c0537aadd..00000000000
--- a/addons/crm/wizard/phonecall2meeting.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- encoding: utf-8 -*-
-############################################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-############################################################################################
-############################################################################################
-
-from osv import osv, fields
-import netsvc
-import time
-import tools
-import mx.DateTime
-from tools import config
-from tools.translate import _
-import tools
-
-class crm_phonecall2meeting(osv.osv_memory):
-    _name = 'crm.phonecall2meeting'
-    _description = 'Phonecall To Meeting'
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {'type':'ir.actions.act_window_close'}
-
-    def action_makeMeeting(self, cr, uid, ids, context=None):
-        this = self.browse(cr, uid, ids[0], context=context)
-        record_id = context and context.get('record_id', False) or False
-        if record_id:
-            phonecall_case_obj = self.pool.get('crm.phonecall')                   
-            data_obj = self.pool.get('ir.model.data')
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            id = data_obj.read(cr, uid, result, ['res_id'])
-            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            if id1:
-                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-            phonecall = phonecall_case_obj.browse(cr, uid, record_id, context=context)
-            partner_id = phonecall.partner_id and phonecall.partner_id.id or False
-            name = phonecall.name
-            email = phonecall.email_from
-            section_id = phonecall.section_id and phonecall.section_id.id or False      
-        return {            
-            'name': _('Meetings'),
-            'domain' : "[('user_id','=',%s)]"%(uid), 
-            'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},        
-            'view_type': 'form',
-            'view_mode': 'calendar,form,tree',
-            'res_model': 'crm.meeting',
-            'view_id': False,
-            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']
-            }
-crm_phonecall2meeting()
\ No newline at end of file

From 3be0ab4baabee67daff90bf4063c43eb8d1c5db0 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 18 Mar 2010 16:52:25 +0530
Subject: [PATCH 061/248] [IMP]: board: Improvement in board menu create wizard

bzr revid: ksa@tinyerp.co.in-20100318112225-ze5wwcw3a2fbx988
---
 addons/board/wizard/board_menu_create.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 19dba75b415..9697d00a2d3 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -46,6 +46,7 @@ class board_menu_create(osv.osv_memory):
                                      _('Please Insert Dashboard View(s) !'))
             return False
 
+
     def board_menu_create(self, cr, uid, ids, context=None):
         """
         Create Menu.

From 03fedcaab98a31bdcbf8e203d10d45cd9d1af4e5 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 18 Mar 2010 16:53:49 +0530
Subject: [PATCH 062/248] [IMP]: crm: Improvement in Lead to Partner and
 phonecall to partner wizard

bzr revid: ksa@tinyerp.co.in-20100318112349-w1nlurgxhcl6p7j8
---
 addons/crm/report/crm_claim_report.py         |  4 +-
 addons/crm/report/crm_fundraising_report.py   |  5 +-
 addons/crm/report/crm_helpdesk_report.py      |  6 +-
 addons/crm/report/crm_lead_report.py          |  6 +-
 addons/crm/report/crm_opportunity_report.py   |  5 +-
 addons/crm/report/crm_phonecall_report.py     |  5 +-
 addons/crm/wizard/crm_lead_to_opportunity.py  | 59 ++++++++++---------
 addons/crm/wizard/crm_phonecall_to_partner.py |  1 -
 8 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/addons/crm/report/crm_claim_report.py b/addons/crm/report/crm_claim_report.py
index 23cb7f65c56..03e439d889e 100644
--- a/addons/crm/report/crm_claim_report.py
+++ b/addons/crm/report/crm_claim_report.py
@@ -45,9 +45,9 @@ class crm_claim_report(osv.osv):
 
     def init(self, cr):
 
-        """
+        """ Display Number of cases And Section Name
         @param cr: the current row, from the database cursor,
-        Display Number of cases And Section Name """
+         """
 
         tools.drop_view_if_exists(cr, 'crm_claim_report')
         cr.execute("""
diff --git a/addons/crm/report/crm_fundraising_report.py b/addons/crm/report/crm_fundraising_report.py
index fd0c884fc8d..d0ff60a4055 100644
--- a/addons/crm/report/crm_fundraising_report.py
+++ b/addons/crm/report/crm_fundraising_report.py
@@ -45,8 +45,9 @@ class crm_fundraising_report(osv.osv):
 
     def init(self, cr):
 
-        """ @param cr: the current row, from the database cursor
-            Display Number of cases and Average Probability """
+        """  Display Number of cases and Average Probability
+            @param cr: the current row, from the database cursor
+        """
 
         tools.drop_view_if_exists(cr, 'crm_fundraising_report')
         cr.execute("""
diff --git a/addons/crm/report/crm_helpdesk_report.py b/addons/crm/report/crm_helpdesk_report.py
index 7694352f523..9884b7cd584 100644
--- a/addons/crm/report/crm_helpdesk_report.py
+++ b/addons/crm/report/crm_helpdesk_report.py
@@ -42,8 +42,10 @@ class crm_helpdesk_report(osv.osv):
 
     def init(self, cr):
 
-        """@param cr: the current row, from the database cursor
-           Display Deadline ,Responsible user, partner ,Department """
+        """
+            Display Deadline ,Responsible user, partner ,Department
+            @param cr: the current row, from the database cursor
+        """
 
         tools.drop_view_if_exists(cr, 'crm_helpdesk_report')
         cr.execute("""
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 02b3c3a018e..6c092f4f984 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -42,8 +42,10 @@ class crm_lead_report(osv.osv):
     }
     def init(self, cr):
 
-        """ @param cr: the current row, from the database cursor
-            CRM Lead Report"""
+        """
+            CRM Lead Report
+            @param cr: the current row, from the database cursor
+        """
 
         tools.drop_view_if_exists(cr, 'crm_lead_report')
         cr.execute("""
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index 1f07d2ff1eb..db3a7e65d24 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -48,8 +48,9 @@ class crm_opportunity_report(osv.osv):
 
     def init(self, cr):
 
-        """ @param cr: the current row, from the database cursor
-            Display Est.Revenue , Average Probability ,Est.Revenue Probabilit """
+        """ Display Est.Revenue , Average Probability ,Est.Revenue Probability
+            @param cr: the current row, from the database cursor
+        """
 
         tools.drop_view_if_exists(cr, 'crm_opportunity_report')
         cr.execute("""
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 6e5dc5cdd42..a72bfbd9c1f 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -41,8 +41,9 @@ class crm_phonecall_report(osv.osv):
 
     def init(self, cr):
 
-        """ @param cr: the current row, from the database cursor,
-            Phone Calls By User And Section """
+        """ Phone Calls By User And Section
+            @param cr: the current row, from the database cursor,
+        """
 
         tools.drop_view_if_exists(cr, 'crm_phonecall_report')
         cr.execute("""
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 181be829897..6191f02d2fa 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -55,7 +55,7 @@ class crm_lead2opportunity(osv.osv_memory):
             lead_obj = self.pool.get('crm.lead')
             opp_obj = self. pool.get('crm.opportunity')
             data_obj = self.pool.get('ir.model.data')
-            
+
             # Get Opportunity views
             result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
             res = data_obj.read(cr, uid, result, ['res_id'])
@@ -65,56 +65,56 @@ class crm_lead2opportunity(osv.osv_memory):
                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
             if id3:
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-            
+
             lead = lead_obj.browse(cr, uid, record_id, context=context)
 
             for this in self.browse(cr, uid, ids, context=context):
                 new_opportunity_id = opp_obj.create(cr, uid, {
-                        'name': this.name, 
-                        'planned_revenue': this.planned_revenue, 
-                        'probability': this.probability, 
-                        'partner_id': lead.partner_id and lead.partner_id.id or False , 
-                        'section_id': lead.section_id and lead.section_id.id or False, 
-                        'description': lead.description or False, 
-                        'date_deadline': lead.date_deadline or False, 
+                        'name': this.name,
+                        'planned_revenue': this.planned_revenue,
+                        'probability': this.probability,
+                        'partner_id': lead.partner_id and lead.partner_id.id or False ,
+                        'section_id': lead.section_id and lead.section_id.id or False,
+                        'description': lead.description or False,
+                        'date_deadline': lead.date_deadline or False,
                         'partner_address_id': lead.partner_address_id and \
-                                        lead.partner_address_id.id or False , 
-                        'priority': lead.priority, 
-                        'phone': lead.phone, 
+                                        lead.partner_address_id.id or False ,
+                        'priority': lead.priority,
+                        'phone': lead.phone,
                         'email_from': lead.email_from
                     })
-    
+
                 new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
                 vals = {
-                        'partner_id': this.partner_id and this.partner_id.id or False, 
+                        'partner_id': this.partner_id and this.partner_id.id or False,
                         }
                 if not lead.opportunity_id:
                         vals.update({'opportunity_id' : new_opportunity.id})
-    
+
                 lead_obj.write(cr, uid, [lead.id], vals)
                 lead_obj.case_close(cr, uid, [lead.id])
                 opp_obj.case_open(cr, uid, [new_opportunity_id])
 
             value = {
-                    'name': _('Opportunity'), 
-                    'view_type': 'form', 
-                    'view_mode': 'form,tree', 
-                    'res_model': 'crm.opportunity', 
-                    'res_id': int(new_opportunity_id), 
-                    'view_id': False, 
-                    'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')], 
-                    'type': 'ir.actions.act_window', 
+                    'name': _('Opportunity'),
+                    'view_type': 'form',
+                    'view_mode': 'form,tree',
+                    'res_model': 'crm.opportunity',
+                    'res_id': int(new_opportunity_id),
+                    'view_id': False,
+                    'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
+                    'type': 'ir.actions.act_window',
                     'search_view_id': res['res_id']
                     }
         return value
 
     _columns = {
-        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1), 
-        'probability': fields.float('Success Probability'), 
-        'planned_revenue': fields.float('Expected Revenue'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
+        'probability': fields.float('Success Probability'),
+        'planned_revenue': fields.float('Expected Revenue'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
     }
-    
+
     def view_init(self, cr, uid, fields, context=None):
         """
         This function checks for precondition before wizard executes
@@ -148,9 +148,10 @@ Leads Could not convert into Opportunity"))
         @return : default values of fields.
         """
         lead_obj = self.pool.get('crm.lead')
+        data = context and context.get('active_ids', []) or []
         res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
 
-        for lead in lead_obj.browse(cr, uid, context.get('active_ids', [])):
+        for lead in lead_obj.browse(cr, uid, data, []):
             if 'name' in fields:
                 res.update({'name': lead.partner_name})
             if 'partner_id' in fields:
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index 00bd1993c94..5dbef42b50f 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -52,7 +52,6 @@ class crm_phonecall2partner(osv.osv_memory):
                  raise osv.except_osv(_('Warning !'),
                     _('A partner is already defined on this phonecall.'))
 
-
     def _select_partner(self, cr, uid, context=None):
         """
         This function Searches for Partner from selected phonecall.

From 5392d76270f8752f60a79b3afe347c0e99ee6778 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 18 Mar 2010 17:00:31 +0530
Subject: [PATCH 063/248] [IMP]: base_calendar: code optimization and add csv
 file

bzr revid: atp@tinyerp.co.in-20100318113031-8ejquziyohqxmvda
---
 addons/base_calendar/__init__.py              |   0
 addons/base_calendar/__terp__.py              |   0
 addons/base_calendar/base_calendar.py         | 295 +++++++++--
 addons/base_calendar/base_calendar_data.xml   | 489 +++++-------------
 addons/base_calendar/base_calendar_view.xml   |  18 +-
 .../security/ir.model.access.csv              |   1 +
 addons/base_calendar/wizard/__init__.py       |   0
 .../wizard/calendar_event_edit_all.py         |  68 +--
 .../wizard/calendar_event_edit_all_view.xml   |   0
 9 files changed, 430 insertions(+), 441 deletions(-)
 mode change 100644 => 100755 addons/base_calendar/__init__.py
 mode change 100644 => 100755 addons/base_calendar/__terp__.py
 mode change 100644 => 100755 addons/base_calendar/base_calendar_data.xml
 mode change 100644 => 100755 addons/base_calendar/base_calendar_view.xml
 mode change 100644 => 100755 addons/base_calendar/security/ir.model.access.csv
 mode change 100644 => 100755 addons/base_calendar/wizard/__init__.py
 mode change 100644 => 100755 addons/base_calendar/wizard/calendar_event_edit_all.py
 mode change 100644 => 100755 addons/base_calendar/wizard/calendar_event_edit_all_view.xml

diff --git a/addons/base_calendar/__init__.py b/addons/base_calendar/__init__.py
old mode 100644
new mode 100755
diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__terp__.py
old mode 100644
new mode 100755
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 2cf2ad96226..36e761c9b59 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -24,19 +24,20 @@ from dateutil import rrule
 from osv import fields, osv
 from service import web_services
 from tools.translate import _
-import base64
-import pooler
 import pytz
 import re
 import time
 import tools
 
 months = {
-        1:"January", 2:"February", 3:"March", 4:"April", \
-        5:"May", 6:"June", 7:"July", 8:"August", 9:"September", \
-        10:"October", 11:"November", 12:"December"}
+        1: "January", 2: "February", 3: "March", 4: "April", \
+        5: "May", 6: "June", 7: "July", 8: "August", 9: "September", \
+        10: "October", 11: "November", 12: "December"}
 
 def get_recurrent_dates(rrulestring, exdate, startdate=None):
+    """
+    Get recurrent dates
+    """
     def todate(date):
         val = parser.parse(''.join((re.compile('\d')).findall(date)))
         return val
@@ -51,7 +52,10 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None):
     return re_dates
 
 def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
-    
+    """
+    Convert base calendar id into real id.
+    @return: base calendar id
+    """
     if base_calendar_id and isinstance(base_calendar_id, (str, unicode)):
         res = base_calendar_id.split('-')
         if len(res) >= 2:
@@ -66,6 +70,10 @@ def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
     return base_calendar_id and int(base_calendar_id) or base_calendar_id
 
 def real_id2base_calendar_id(real_id, recurrent_date):
+    """
+    Convert  real id into base_calendar_id.
+    @return: real id with recurrent date.
+    """
     if real_id and recurrent_date:
         recurrent_date = time.strftime("%Y%m%d%H%M%S", \
                          time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
@@ -74,6 +82,13 @@ def real_id2base_calendar_id(real_id, recurrent_date):
 
 
 def _links_get(self, cr, uid, context={}):
+    """
+    Get request link.
+    @param cr: the current row, from the database cursor,
+    @param uid: the current user’s ID for security checks,
+    @param context: A standard dictionary for contextual values
+    @return: list of dictionary which contain object and name and id.
+    """
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
@@ -186,6 +201,10 @@ html_invitation = """
 """
 
 class invite_attendee_wizard(osv.osv_memory):
+    """
+    Invite attendee.
+    """
+    
     _name = "base_calendar.invite.attendee"
     _description = "Invite Attendees"
 
@@ -208,17 +227,27 @@ class invite_attendee_wizard(osv.osv_memory):
                  }
 
     def do_invite(self, cr, uid, ids, context={}):
-        for att_id in ids:
-            datas = self.read(cr, uid, att_id)
+        """
+        Invite attendee for meeting..
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of base calendar invite attendee’s IDs.
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of {}.
+        """
+        for datas in self.read(cr, uid, ids):
+            
             model = False
             model_field = False
+            context_id = context and context.get('active_id', False) or False
             if not context or not context.get('model'):
                 return {}
             else:
                 model = context.get('model')
             model_field = context.get('attendee_field', False)
+            
             obj = self.pool.get(model)
-            res_obj = obj.browse(cr, uid, context['active_id'])
+            res_obj = obj.browse(cr, uid, context_id)
             type = datas.get('type')
             att_obj = self.pool.get('calendar.attendee')
             vals = []
@@ -227,8 +256,10 @@ class invite_attendee_wizard(osv.osv_memory):
             ref = {}
 
             if not model == 'calendar.attendee':
-                ref = {'ref': '%s,%s' % (model, base_calendar_id2real_id(context['active_id']))}
-    
+                if context_id:
+                    ref = {'ref': '%s,%s' % (model, base_calendar_id2real_id(context_id))}
+                else: 
+                    return {}
             if type == 'internal':
                 user_obj = self.pool.get('res.users')
                 if not datas.get('user_ids'):
@@ -262,11 +293,11 @@ class invite_attendee_wizard(osv.osv_memory):
                     if contact.email:
                         mail_to.append(contact.email)
 
-            att = att_obj.browse(cr, uid, context['active_id'])
+            att = att_obj.browse(cr, uid, context_id)
             for att_val in vals:
                 if model == 'calendar.attendee':
                     att_val.update({
-                        'parent_ids' : [(4, att.id)],
+                        'parent_ids': [(4, att.id)], 
                         'ref': att.ref._name + ',' + str(att.ref.id)
                     })
                 attendees.append(att_obj.create(cr, uid, att_val))
@@ -288,6 +319,13 @@ class invite_attendee_wizard(osv.osv_memory):
 
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
+        """
+        Make entry on contact_ids on change of partner_id field.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of base calendar invite attendee’s IDs.
+        @return: dictionary of value.
+        """
         if not partner_id:
             return {'value': {'contact_ids': []}}
         cr.execute('select id from res_partner_address \
@@ -298,6 +336,9 @@ class invite_attendee_wizard(osv.osv_memory):
 invite_attendee_wizard()
 
 class calendar_attendee(osv.osv):
+    """
+    Calendar Attendee Information
+    """
     _name = 'calendar.attendee'
     _description = 'Attendee information'
     _rec_name = 'cutype'
@@ -305,14 +346,25 @@ class calendar_attendee(osv.osv):
     __attribute__ = {}
 
     def _get_address(self, name=None, email=None):
+        """
+        Get Email Address
+        """
         if name and email:
             name += ':'
         return (name or '') + (email and ('MAILTO:' + email) or '')
 
     def _compute_data(self, cr, uid, ids, name, arg, context):
+        """
+        Compute data on field.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar attendee’s IDs.
+        @param name: name of field.
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of form {id: {'field Name': value'}}.
+        """
         name = name[0]
         result = {}
-
         for attdata in self.browse(cr, uid, ids, context=context):
             id = attdata.id
             result[id] = {}
@@ -349,12 +401,12 @@ class calendar_attendee(osv.osv):
                     result[id][name] = False
             if name == 'event_end_date':
                 if attdata.ref:
-                     result[id][name] = attdata.ref.date_deadline
+                    result[id][name] = attdata.ref.date_deadline
                 else:
                     result[id][name] = False
             if name == 'sent_by_uid':
                 if attdata.ref:
-                    result[id][name] = (attdata.ref.user_id.id,attdata.ref.user_id.name)
+                    result[id][name] = (attdata.ref.user_id.id, attdata.ref.user_id.name)
                 else:
                     result[id][name] = uid
             if name == 'language':
@@ -364,12 +416,26 @@ class calendar_attendee(osv.osv):
         return result
 
     def _links_get(self, cr, uid, context={}):
+        """
+        Get request link and put in ref field.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        @return: list of dictionary which contain object and name and id.
+        """
         obj = self.pool.get('res.request.link')
         ids = obj.search(cr, uid, [])
         res = obj.read(cr, uid, ids, ['object', 'name'], context)
         return [(r['object'], r['name']) for r in res]
 
     def _lang_get(self, cr, uid, context={}):
+        """
+        Get language for language function field.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        @return: list of dictionary which contain code and name and id.
+        """
         obj = self.pool.get('res.lang')
         ids = obj.search(cr, uid, [])
         res = obj.read(cr, uid, ids, ['code', 'name'], context)
@@ -399,11 +465,11 @@ class calendar_attendee(osv.osv):
         'delegated_to': fields.function(_compute_data, method=True, \
                 string='Delegated To', type="char", size=124, store=True, \
                 multi='delegated_to', help="The users that the original \
-request was delegated to"),         
+request was delegated to"), 
         'delegated_from': fields.function(_compute_data, method=True, string=\
-            'Delegated From', type="char", store=True, size=124, multi='delegated_from'),        
-        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated From'),
-        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated To'),  
+            'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated From'), 
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated To'), 
         'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
         'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), 
         'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
@@ -428,15 +494,28 @@ request was delegated to"),
         return False
         
     def msg_act_get(self, msg):
+        """
+        Get Message.
+        @return: dictionary of actions which contain state field value.
+        """
+        
         mailgate_obj = self.pool.get('mail.gateway')
         body = mailgate_obj.msg_body_get(msg)
         actions = {}
         res = self.response_re.findall(body['body'])
         if res:
-                actions['state'] = res[0]
+            actions['state'] = res[0]
         return actions
 
     def msg_update(self, cr, uid, ids, msg, data={}, default_act='None'):
+        """
+        Update msg state which may be accepted.declined.tentative.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar attendee’s IDs.
+        @param context: A standard dictionary for contextual values
+        @return: True
+        """
         msg_actions = self.msg_act_get(msg)
         if msg_actions.get('state'):
             if msg_actions['state'] in ['YES', 'NO', 'MAYBE']:
@@ -447,14 +526,25 @@ request was delegated to"),
         return True
 
     def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context={}):
+        """
+        send mail.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar attendee’s IDs.
+        @param context: A standard dictionary for contextual values
+        @return: True
+        """
+        
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
         for att in self.browse(cr, uid, ids, context=context):
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
             sign = '<br>'.join(sign and sign.split('\n') or [])
             res_obj = att.ref
+            if res_obj and len(res_obj):
+                res_obj = res_obj[0]
             sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
             att_infos = []
-            other_invitaion_ids = self.search(cr, uid, [('ref','=', att.ref._name + ',' + str(att.ref.id))])
+            other_invitaion_ids = self.search(cr, uid, [('ref', '=', att.ref)])
             for att2 in self.browse(cr, uid, other_invitaion_ids):
                 att_infos.append(((att2.user_id and att2.user_id.name) or \
                              (att2.partner_id and att2.partner_id.name) or \
@@ -481,6 +571,14 @@ request was delegated to"),
                     ) 
             return True
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
+        """
+        Make entry on email and availbility  on change of user_id field.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar attendee’s IDs.
+        @param user_id: User id
+        @return: dictionary of value. which put value in email and availability fields.
+        """
         if not user_id:
             return {'value': {'email': ''}}
         usr_obj = self.pool.get('res.users')
@@ -491,22 +589,33 @@ request was delegated to"),
         self.write(cr, uid, ids, {'state': 'tentative'}, context)
 
     def do_accept(self, cr, uid, ids, context=None, *args):
-        for invite in ids:
-            vals = self.read(cr, uid, invite, context=context)
+        """
+        Update state which value is  accepted.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar attendee’s IDs.
+        @return: True
+        """
+        if not context:
+            context = {}
+        
+        for vals in self.read(cr, uid, ids, context=context):
             user = vals.get('user_id')
             if user:
                 ref = vals.get('ref', None)
+                
                 if ref:
                     if ref.user_id.id != user[0]:
                         defaults = {'user_id':  user[0]}
                         new_event = model_obj.copy(cr, uid, event, default=defaults, context=context)
-            self.write(cr, uid, invite, {'state': 'accepted'}, context)
+            self.write(cr, uid, ids, {'state': 'accepted'}, context)
         return True
 
     def do_decline(self, cr, uid, ids, context=None, *args):
         self.write(cr, uid, ids, {'state': 'declined'}, context)
 
     def create(self, cr, uid, vals, context=None):
+
         if not context:
             context = {}
         if not vals.get("email") and vals.get("cn"):
@@ -547,12 +656,22 @@ are both optional, but if one occurs, so MUST the other"""),
     }
 
     def do_alarm_create(self, cr, uid, ids, model, date, context={}):
+        """
+        Create Alarm
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of res alarm’s IDs.
+        @param model: Model name.
+        @param context: A standard dictionary for contextual values
+        @return: True
+        """
         alarm_obj = self.pool.get('calendar.alarm')
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
-        
+       
         model_obj = self.pool.get(model)
         for data in model_obj.browse(cr, uid, ids):
+            
             basic_alarm = data.alarm_id
             if not context.get('alarm_id'):
                 self.do_alarm_unlink(cr, uid, [data.id], model)
@@ -584,6 +703,14 @@ are both optional, but if one occurs, so MUST the other"""),
         return True
 
     def do_alarm_unlink(self, cr, uid, ids, model, context={}):
+        """
+        Delete alarm specified in ids 
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of res alarm’s IDs.
+        @param model: Model name.
+        @return: True
+        """
         alarm_obj = self.pool.get('calendar.alarm')
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
@@ -638,6 +765,14 @@ or contains the text to be used for display"""),
      }
 
     def create(self, cr, uid, vals, context={}):
+        """
+        create new record.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param vals: dictionary of fields value.{‘name_of_the_field’: value, ...}
+        @param context: A standard dictionary for contextual values
+        @return: new record id for calendar_alarm.
+        """
         event_date = vals.get('event_date', False)
         if event_date:
             dtstart = datetime.strptime(vals['event_date'], "%Y-%m-%d %H:%M:%S")
@@ -652,8 +787,9 @@ or contains the text to be used for display"""),
         res = super(calendar_alarm, self).create(cr, uid, vals, context)
         return res
 
-    def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False,\
+    def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, \
                        context=None):
+
         if not context:
             context = {}
         current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
@@ -662,7 +798,7 @@ or contains the text to be used for display"""),
                     where alarm.state = %s and alarm.trigger_date <= %s", ('run', current_datetime))
         res = cr.dictfetchall()
         alarm_ids = map(lambda x: x['id'], res)
-        attendee_obj = self.pool.get('calendar.attendee')
+        #attendee_obj = self.pool.get('calendar.attendee')
         request_obj = self.pool.get('res.request')
         mail_to = []
         for alarm in self.browse(cr, uid, alarm_ids):
@@ -741,8 +877,17 @@ class calendar_event(osv.osv):
         return {'value': value}
 
     def _get_rulestring(self, cr, uid, ids, name, arg, context=None):
+        """
+        Get rule string.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param id: List of  calendar event's ids. 
+        @param context: A standard dictionary for contextual values
+        @return: dictionary of rrule value.
+        """
         result = {}
         for event in ids:
+            
             datas = self.read(cr, uid, event)
             if datas.get('rrule_type'):
                 if datas.get('rrule_type') == 'none':
@@ -753,7 +898,8 @@ class calendar_event(osv.osv):
                 else:
                     result[event] = self.compute_rule_string(cr, uid, {'freq':\
                                         datas.get('rrule_type').upper(), \
-                                        'interval': 1}, context=context)
+                                      'interval': 1}, context=context)
+       
         return result
 
     _columns = {
@@ -826,6 +972,7 @@ rule or repeating pattern for anexception to a recurrence set"),
     }
     
     def modify_this(self, cr, uid, event_id, defaults, real_date, context=None, *args):
+
         event_id = base_calendar_id2real_id(event_id)
         datas = self.read(cr, uid, event_id, context=context)
         defaults.update({
@@ -842,19 +989,27 @@ rule or repeating pattern for anexception to a recurrence set"),
         return new_id
 
     def modify_all(self, cr, uid, event_ids, defaults, context=None, *args):
+        """
+        Modify name, date, date_deadline fields.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param event_ids: List of crm meeting’s IDs.
+        @return: True
+        """
         #start Loop
         for event_id in event_ids:
             event_id = base_calendar_id2real_id(event_id)
+            
             defaults.pop('id')
             defaults.update({'table': self._table})
     
-            qry = "UPDATE %(table)s set name='%(name)s', \
-                            date='%(date)s', date_deadline='%(date_deadline)s'"
+            qry = "UPDATE %(table)s set name = '%(name)s', \
+                            date = '% (date)s',  date_deadline = '% (date_deadline)s'"
             if defaults.get('alarm_id'):
-                qry += ", alarm_id=%(alarm_id)s"
+                qry += ", alarm_id = %(alarm_id)s"
             if defaults.get('location'):
-                qry += ", location='%(location)s'"
-            qry += "WHERE id=%s" % (event_id)
+                qry += ", location = '%(location)s'"
+            qry += "WHERE id = %s" % (event_id)
             cr.execute(qry % (defaults))
             #End Loop
         return True
@@ -932,6 +1087,15 @@ rule or repeating pattern for anexception to a recurrence set"),
         return ids
 
     def compute_rule_string(self, cr, uid, datas, context=None, *args):
+        """
+        Compute rule string.
+        @param self: the object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param datas: dictionary of freq and interval value.
+        @return: string value which compute  FREQILY;INTERVAL 
+        """
+        
         weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
         weekstring = ''
         monthstring = ''
@@ -977,6 +1141,13 @@ rule or repeating pattern for anexception to a recurrence set"),
 
     def search(self, cr, uid, args, offset=0, limit=100, order=None, 
             context=None, count=False):
+        """
+        Overrides  orm search method.
+        @param cr: the current row, from the database cursor,
+        @param user: the current user’s ID for security checks,
+        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+        @return: List of id 
+        """
         args_without_date = []
         start_date = False
         until_date = False
@@ -994,6 +1165,15 @@ rule or repeating pattern for anexception to a recurrence set"),
 
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        """
+        Writes values in one or several fields.
+        @param self: the object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of crm meeting's ids
+        @param vals: Dictionary of field value.
+        @return: True
+        """
         if not context:
             context = {}
         if isinstance(ids, (str, int, long)):
@@ -1010,7 +1190,7 @@ rule or repeating pattern for anexception to a recurrence set"),
                     data.update(vals)
                     new_id = self.modify_this(cr, uid, event_id, data, \
                                                 real_date, context)
-                    context.update({'active_id': new_id,'active_ids': [new_id]})
+                    context.update({'active_id': new_id, 'active_ids': [new_id]})
                     continue
             event_id = base_calendar_id2real_id(event_id)
             if not event_id in new_ids:
@@ -1021,9 +1201,18 @@ rule or repeating pattern for anexception to a recurrence set"),
             context.update({'alarm_id': vals.get('alarm_id')})
             alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', \
                                             context=context)
+        
         return res
 
     def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
+        """
+        Overrides  orm browse method.
+        @param self: the object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of crm meeting's ids
+        @return: the object list.
+        """
         if isinstance(ids, (str, int, long)):
             select = [ids]
         else:
@@ -1033,9 +1222,18 @@ rule or repeating pattern for anexception to a recurrence set"),
                                                     list_class, fields_process)
         if isinstance(ids, (str, int, long)):
             return res and res[0] or False
+        
         return res
 
     def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
+        """
+        Overrides  orm Read method.Read List of fields for calendar event.
+        @param cr: the current row, from the database cursor,
+        @param user: the current user’s ID for security checks,
+        @param ids: List of calendar event's id.
+        @param fields: List of fields.
+        @return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
+        """
         if isinstance(ids, (str, int, long)):
             select = [ids]
         else:
@@ -1059,12 +1257,27 @@ rule or repeating pattern for anexception to a recurrence set"),
         return result
 
     def copy(self, cr, uid, id, default=None, context={}):
+        """
+        Duplicate record on specified id.
+        @param self: the object pointer.
+        @param cr: the current row, from the database cursor,
+        @param id: id of record from which we duplicated.
+        @return: Duplicate record id.
+        """
         res = super(calendar_event, self).copy(cr, uid, base_calendar_id2real_id(id), default, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
+        
         return res
 
     def unlink(self, cr, uid, ids, context=None):
+        """
+        Deletes records specified in ids.
+        @param self: the object pointer.
+        @param cr: the current row, from the database cursor,
+        @param id: List of calendar event's id.
+        @return: True
+        """
         res = False
         for id in ids:
             ls = base_calendar_id2real_id(id)
@@ -1090,6 +1303,14 @@ rule or repeating pattern for anexception to a recurrence set"),
         return res
 
     def create(self, cr, uid, vals, context={}):
+        """
+        Create new record.
+        @param self: the object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param vals: dictionary of every field value.
+        @return: new created record id.
+        """
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
@@ -1157,7 +1378,7 @@ class ir_values(osv.osv):
                 new_model.append((data[0], base_calendar_id2real_id(data[1])))
             else:
                 new_model.append(data)
-        return super(ir_values, self).set(cr, uid, key, key2, name, new_model,\
+        return super(ir_values, self).set(cr, uid, key, key2, name, new_model, \
                     value, replace, isobject, meta, preserve_user, company)
 
     def get(self, cr, uid, key, key2, models, meta=False, context={}, \
@@ -1214,7 +1435,7 @@ class res_users(osv.osv):
                     ('state', '=', 'accepted'), ('user_id', 'in', ids)
                     ])
 
-        result = cr.dictfetchall()
+       # result = cr.dictfetchall()
         for attendee_data in attendee_obj.read(cr, uid, attendee_ids, ['user_id']):
             user_id = attendee_data['user_id']
             status = 'busy'
diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml
old mode 100644
new mode 100755
index 7ebab73aca5..c8b20ac134b
--- a/addons/base_calendar/base_calendar_data.xml
+++ b/addons/base_calendar/base_calendar_data.xml
@@ -1,376 +1,133 @@
 <?xml version="1.0"?>
 <openerp>
+
 	<data noupdate="1">
-		
-
-		<!--		Event attributes-->
-
-		<record model="basic.calendar.attributes" id="field_event_comment">
-			<field name="name">comment</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_uid">
-			<field name="name">uid</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_seq">
-			<field name="name">seq</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_recurrence-id">
-			<field name="name">recurrence-id</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_transp">
-			<field name="name">transp</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_attendee">
-			<field name="name">attendee</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_related">
-			<field name="name">related</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_rrule">
-			<field name="name">rrule</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_dtend">
-			<field name="name">dtend</field>
-			<field name="type">vevent</field>
+		<record model="res.alarm" id="alarm1">
+			<field name="name">1 minute before</field>
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="1" />
+			<field name="trigger_interval">minutes</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
+
+		<record model="res.alarm" id="alarm2">
+			<field name="name">5 minutes before</field>
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="5" />
+			<field name="trigger_interval">minutes</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
 		</record>
 
-		<record model="basic.calendar.attributes" id="field_event_valarm">
-			<field name="name">valarm</field>
-			<field name="type">vevent</field>
-		</record>
-		
-		<record model="basic.calendar.attributes" id="field_event_vtimezone">
-			<field name="name">vtimezone</field>
-			<field name="type">vevent</field>
-		</record>
-		
-		<record model="basic.calendar.attributes" id="field_event_priority">
-			<field name="name">priority</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_location">
-			<field name="name">location</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_exrule">
-			<field name="name">exrule</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_resources">
-			<field name="name">resources</field>
-			<field name="type">vevent</field>
-		</record>
+		<record model="res.alarm" id="alarm3">
+			<field name="name">10 minutes before</field>
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="10" />
+			<field name="trigger_interval">minutes</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
+
+		<record model="res.alarm" id="alarm4">
+			<field name="name">15 minutes before</field>
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="15" />
+			<field name="trigger_interval">minutes</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
+
+		<record model="res.alarm" id="alarm5">
+			<field name="name">30 minutes before</field>
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="30" />
+			<field name="trigger_interval">minutes</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
+
+		<record model="res.alarm" id="alarm6">
+			<field name="name">45 minutes before</field>
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="45" />
+			<field name="trigger_interval">minutes</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
+
+		<record model="res.alarm" id="alarm7">
+			<field name="name">1 hour before</field>
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="1" />
+			<field name="trigger_interval">hours</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
+
+		<record model="res.alarm" id="alarm8">
+			<field name="name">2 hours before</field>
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="2" />
+			<field name="trigger_interval">hours</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
+
+		<record model="res.alarm" id="alarm9">
+			<field name="name">3 hours before</field>
+
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="3" />
+			<field name="trigger_interval">hours</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
+
+		<record model="res.alarm" id="alarm10">
+			<field name="name">4 hours before</field>
+
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="4" />
+			<field name="trigger_interval">hours</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
+
+		<record model="res.alarm" id="alarm11">
+			<field name="name">5 hours before</field>
+
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="5" />
+			<field name="trigger_interval">hours</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
+
+		<record model="res.alarm" id="alarm12">
+			<field name="name">18 hours before</field>
+
+			<field name="active" eval="1" />
+			<field name="trigger_duration" eval="18" />
+			<field name="trigger_interval">hours</field>
+			<field name="trigger_occurs">before</field>
+			<field name="trigger_related">start</field>
+		</record>
 
-		<record model="basic.calendar.attributes" id="field_event_rstatus">
-			<field name="name">rstatus</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_status">
-			<field name="name">status</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_exdate">
-			<field name="name">exdate</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_dtstamp">
-			<field name="name">dtstamp</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_description">
-			<field name="name">description</field>
-			<field name="type">vevent</field>
-		</record>
 
-		<record model="basic.calendar.attributes" id="field_event_rdate">
-			<field name="name">rdate</field>
-			<field name="type">vevent</field>
+		<!-- Scheduler for Event Alarm-->
+		<record forcecreate="True" id="ir_cron_scheduler_alarm"
+			model="ir.cron">
+			<field name="name">Run Event Reminder</field>
+			<field eval="True" name="active" />
+			<field name="user_id" ref="base.user_root" />
+			<field name="interval_number">1</field>
+			<field name="interval_type">minutes</field>
+			<field name="numbercall">-1</field>
+			<field eval="False" name="doall" />
+			<field eval="'calendar.alarm'" name="model" />
+			<field eval="'do_run_scheduler'" name="function" />
+			<field eval="'(False,)'" name="args" />
 		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_dtstart">
-			<field name="name">dtstart</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_class">
-			<field name="name">class</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_x-openobject-model">
-			<field name="name">x-openobject-model</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_created">
-			<field name="name">created</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_url">
-			<field name="name">url</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_summary">
-			<field name="name">summary</field>
-			<field name="type">vevent</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_event_contact">
-			<field name="name">contact</field>
-			<field name="type">vevent</field>
-		</record>
-
-
-<!--		Todo attributes-->
-
-		<record model="basic.calendar.attributes" id="field_todo_status">
-			<field name="name">status</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_comment">
-			<field name="name">comment</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_attendee">
-			<field name="name">attendee</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_valarm">
-			<field name="name">valarm</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_description">
-			<field name="name">description</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_seq">
-			<field name="name">seq</field>
-			<field name="type">vtodo</field>
-		</record>
-		
-		<record model="basic.calendar.attributes" id="field_todo_vtimezone">
-			<field name="name">vtimezone</field>
-			<field name="type">vtodo</field>
-		</record>
-		
-		<record model="basic.calendar.attributes" id="field_todo_url">
-			<field name="name">url</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_completed">
-			<field name="name">completed</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_percent">
-			<field name="name">percent</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_due">
-			<field name="name">due</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_summary">
-			<field name="name">summary</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_priority">
-			<field name="name">priority</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_exdate">
-			<field name="name">exdate</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_location">
-			<field name="name">location</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_exrule">
-			<field name="name">exrule</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_duration">
-			<field name="name">duration</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_organizer">
-			<field name="name">organizer</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_dtstart">
-			<field name="name">dtstart</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_rrule">
-			<field name="name">rrule</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_class">
-			<field name="name">class</field>
-			<field name="type">vtodo</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_todo_uid">
-			<field name="name">uid</field>
-			<field name="type">vtodo</field>
-		</record>
-
-<!--		Attendee's attributes-->
-
-		<record model="basic.calendar.attributes" id="field_attendee_cn">
-			<field name="name">cn</field>
-			<field name="type">attendee</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_attendee_sent-by">
-			<field name="name">sent-by</field>
-			<field name="type">attendee</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_attendee_language">
-			<field name="name">language</field>
-			<field name="type">attendee</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_attendee_delegated-from">
-			<field name="name">delegated-from</field>
-			<field name="type">attendee</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_attendee_member">
-			<field name="name">member</field>
-			<field name="type">attendee</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_attendee_cutype">
-			<field name="name">cutype</field>
-			<field name="type">attendee</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_attendee_role">
-			<field name="name">role</field>
-			<field name="type">attendee</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_attendee_partstat">
-			<field name="name">partstat</field>
-			<field name="type">attendee</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_attendee_delegated-to">
-			<field name="name">delegated-to</field>
-			<field name="type">attendee</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_attendee_dir">
-			<field name="name">dir</field>
-			<field name="type">attendee</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_attendee_rsvp">
-			<field name="name">rsvp</field>
-			<field name="type">attendee</field>
-		</record>
-
-<!--	Alarm attributes-->
-
-		<record model="basic.calendar.attributes" id="field_alarm_attendee">
-			<field name="name">attendee</field>
-			<field name="type">alarm</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_alarm_trigger_duration">
-			<field name="name">trigger_duration</field>
-			<field name="type">alarm</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_alarm_description">
-			<field name="name">description</field>
-			<field name="type">alarm</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_alarm_attach">
-			<field name="name">attach</field>
-			<field name="type">alarm</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_alarm_trigger_occurs">
-			<field name="name">trigger_occurs</field>
-			<field name="type">alarm</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_alarm_trigger_interval">
-			<field name="name">trigger_interval</field>
-			<field name="type">alarm</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_alarm_summary">
-			<field name="name">summary</field>
-			<field name="type">alarm</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_alarm_duration">
-			<field name="name">duration</field>
-			<field name="type">alarm</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_alarm_repeat">
-			<field name="name">repeat</field>
-			<field name="type">alarm</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_alarm_action">
-			<field name="name">action</field>
-			<field name="type">alarm</field>
-		</record>
-
-		<record model="basic.calendar.attributes" id="field_alarm_trigger_related">
-			<field name="name">trigger_related</field>
-			<field name="type">alarm</field>
-		</record>
-
 	</data>
 </openerp>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
old mode 100644
new mode 100755
index de5758400d8..90518021f81
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -71,8 +71,10 @@
                             <group colspan="4" col="4">
                                 <field name="user_id" string="Invited User"/>
                                 <newline/>
-                                <field name="partner_address_id" string="Partner Contact"/>
-                                <field name="partner_id" string="Partner" readonly="1"/>
+                                <field name="partner_address_id"
+                                	string="Partner Contact" />
+                                <field name="partner_id"
+                                	string="Partner" readonly="1" />
                                 <field name="role" string="Role" />
                                 <field name="cutype" string="Invitation type" />
                                 <field name="rsvp" /> 
@@ -96,17 +98,21 @@
             		</notebook>
             		<group col="6" colspan="4">
 	                        <field name="state" select="2" />
-	                        <button name="do_tentative" states="needs-action,declined,accepted"
+	                        <button name="do_tentative"
+	                        	states="needs-action,declined,accepted"
 	                        	string="Uncertain" type="object"
 	                        	icon="terp-crm" />
-	                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined"
+	                        <button name="do_accept" string="Accept"
+	                        	states="needs-action,tentative,declined"
 	                        	type="object" icon="gtk-apply" />
-	                        <button name="do_decline" string="Decline"  states="needs-action,tentative,accepted"
+	                        <button name="do_decline" string="Decline"
+	                        	states="needs-action,tentative,accepted"
 	                        	type="object" icon="gtk-cancel" />
 	                        <button
 	                        	name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
 	                        	string="Delegate" type="action"
-	                        	icon="gtk-sort-descending" states="needs-action,tentative,declined,accepted"
+	                        	icon="gtk-sort-descending"
+	                        	states="needs-action,tentative,declined,accepted"
 	                        	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
             		</group>
             	</form>
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
old mode 100644
new mode 100755
index 2851e392e0b..ebf2ce92092
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -5,3 +5,4 @@
 "access_calendar_event_all","calendar.event","model_calendar_event",,1,1,1,1
 "access_calendar_todo","calendar.todo","model_calendar_todo",,1,1,1,1
 "access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",,1,1,1,1
+"access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",,1,1,1,1
diff --git a/addons/base_calendar/wizard/__init__.py b/addons/base_calendar/wizard/__init__.py
old mode 100644
new mode 100755
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
old mode 100644
new mode 100755
index d13b6ef8b38..8b929ce55c5
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -20,37 +20,35 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
-import netsvc
-import pooler
-import time
-import tools
-import wizard
 
 class calendar_event_edit_all(osv.osv_memory):
     
     def _default_values(self, cr, uid, context={}):
-            """
-            @Return : Get Default value for Start Date
-            """
+        """
+        @Return: Get Default value for Start Date
+        """
+        context_id = context and context.get('active_id', False) or False
+        if context_id:
             if context.get('date'):
                  return context.get('date')
             else:
-                model = context.get('model')
+                model = context.get('model', False)
                 model_obj = self.pool.get(model)
-                event = model_obj.read(cr, uid, context['active_id'], ['name', 'location', 'alarm_id'])
-                return event['date']
+                event = model_obj.read(cr, uid, context_id, ['name', 'location', 'alarm_id'])
+                return event['date']    
         
     def _default_deadline(self, cr, uid, context={}):
-            """
-            @return : Get Default value for End Date
-            """
+        """
+        @return: Get Default value for End Date
+        """
+        context_id = context and context.get('active_id', False) or False
+        if context_id:
             if context.get('date_deadline'):
-                 return context.get('date_deadline')
+                return context.get('date_deadline')
             else:
-                model = context.get('model')
+                model = context.get('model', False)
                 model_obj = self.pool.get(model)
-                event = model_obj.read(cr, uid, context['active_id'], ['name', 'location', 'alarm_id'])
+                event = model_obj.read(cr, uid, context_id, ['name', 'location', 'alarm_id'])
                 return event['date_deadline']
 
     def modify_this(self, cr, uid, ids, context=None):
@@ -59,25 +57,31 @@ class calendar_event_edit_all(osv.osv_memory):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of calendar event edit all’s IDs
+        @return: dictionary {}
         """
-        for datas in self.read(cr, uid, ids):
-            model = context.get('model')
-            model_obj = self.pool.get(model)
-            model_obj.modify_all(cr, uid, [context['active_id']], datas, context)
-            return {}
-    
+        if not context:
+            context = {}
+            
+        context_id = context and context.get('active_id', False) or False
+        if context_id:
+            for datas in self.read(cr, uid, ids):
+                model = context.get('model', False)
+                model_obj = self.pool.get(model)
+                model_obj.modify_all(cr, uid, [context_id], datas, context=context)
+                return {}
+
     _name = "calendar.event.edit.all"
     _description = "Calendar Edit all event"
-    _columns ={
-              'name':fields.char('Title', size=64, required=True),
-              'date':fields.datetime('Start Date', required=True),
-              'date_deadline':fields.datetime('End Date', required=True),
-              'location':fields.char('Location', size=124),
-              'alarm_id':fields.many2one('res.alarm', 'Reminder'),
+    _columns = {
+              'name': fields.char('Title', size=64, required=True), 
+              'date': fields.datetime('Start Date', required=True), 
+              'date_deadline': fields.datetime('End Date', required=True), 
+              'location': fields.char('Location', size=124), 
+              'alarm_id': fields.many2one('res.alarm', 'Reminder'), 
                }
     _defaults = {
-                 'date':_default_values,
-                 'date_deadline':_default_deadline
+                 'date': _default_values, 
+                 'date_deadline': _default_deadline
              }
     
 calendar_event_edit_all()
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
old mode 100644
new mode 100755

From 3b8a7a9b445e5bfe8ee513b642e480e5b4f08b04 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 18 Mar 2010 18:07:00 +0530
Subject: [PATCH 064/248] [FIX]: base_calendar: Fixed problem in accepting
 invitation, corrected invitation copy

bzr revid: rpa@tinyerp.com-20100318123700-qekpxyi33wxli3nt
---
 addons/base_calendar/base_calendar.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 36e761c9b59..0ef73c19794 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -598,17 +598,15 @@ request was delegated to"),
         """
         if not context:
             context = {}
-        
-        for vals in self.read(cr, uid, ids, context=context):
-            user = vals.get('user_id')
+        for vals in self.browse(cr, uid, ids, context=context):
+            user = vals.user_id
             if user:
-                ref = vals.get('ref', None)
-                
-                if ref:
-                    if ref.user_id.id != user[0]:
-                        defaults = {'user_id':  user[0]}
-                        new_event = model_obj.copy(cr, uid, event, default=defaults, context=context)
-            self.write(cr, uid, ids, {'state': 'accepted'}, context)
+                mod_obj = self.pool.get(vals.ref._name)
+                if vals.ref:
+                    if vals.ref.user_id.id != user.id:
+                        defaults = {'user_id':  user.id}
+                        new_event = mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
+            self.write(cr, uid, vals.id, {'state': 'accepted'}, context)
         return True
 
     def do_decline(self, cr, uid, ids, context=None, *args):

From 15e91924f2afe57022b7a5cad404242fe2a4db2a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 18 Mar 2010 19:24:30 +0530
Subject: [PATCH 065/248] [IMP]: crm: Improvement in crm send mail wizard,
 converted it into osv_memory wizard, Merged old send new mail and send mail
 wizards into new one

bzr revid: rpa@tinyerp.com-20100318135430-t7gfwb7n98poeorb
---
 addons/crm/__terp__.py                        |   3 +-
 addons/crm/crm_claims_view.xml                |  13 +-
 addons/crm/crm_fund_view.xml                  |  13 +-
 addons/crm/crm_helpdesk_view.xml              |  11 +-
 addons/crm/crm_lead_view.xml                  |  13 +-
 addons/crm/crm_opportunity_view.xml           |  11 +-
 addons/crm/crm_view.xml                       |  16 +-
 addons/crm/wizard/__init__.py                 |   5 +-
 addons/crm/wizard/crm_phonecall_wizard.py     | 314 ------------------
 addons/crm/wizard/crm_send_new_email.py       | 220 ++++++++++++
 addons/crm/wizard/crm_send_new_email_view.xml |  78 +++++
 .../crm/wizard/wizard_crm_new_send_email.py   | 135 --------
 addons/crm/wizard/wizard_crm_send_email.py    | 107 ------
 addons/hr_recruitment/hr_hr_view.xml          |  13 +-
 addons/project_issue/project_issue_view.xml   |  11 +-
 15 files changed, 376 insertions(+), 587 deletions(-)
 delete mode 100644 addons/crm/wizard/crm_phonecall_wizard.py
 create mode 100644 addons/crm/wizard/crm_send_new_email.py
 create mode 100644 addons/crm/wizard/crm_send_new_email_view.xml
 delete mode 100644 addons/crm/wizard/wizard_crm_new_send_email.py
 delete mode 100644 addons/crm/wizard/wizard_crm_send_email.py

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 25a4c0839b2..9567d449d9f 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -71,7 +71,8 @@ between mails and Open ERP.""",
 
         'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/crm_opportunity_to_phonecall_view.xml',
-
+        
+        'wizard/crm_send_new_email_view.xml', 
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index f51f6890d0c..181769c1bc1 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -157,7 +157,11 @@
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                            <button colspan="4"
+                            	string="Reply to Last Email"
+                            	name="%(crm.action_crm_reply_mail)d"
+                            	context="{'mail':'reply', 'model': 'crm.claim'}" icon="gtk-undo"
+                            	type="action" />
                         </form>
                         <tree string="Communication history">
                             <field name="description"/>
@@ -165,8 +169,11 @@
                             <field name="date"/>
                         </tree>
                     </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
-                 </page>
+                    <button colspan="4" string="Send New Email"
+                    	name="%(crm.action_crm_send_new_mail)d"
+                    	context="{'mail':'new', 'model': 'crm.claim'}" icon="gtk-go-forward"
+                    	type="action" />
+                </page>
                 </notebook>
                 </group>
             </form>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index a78d5e3eeb6..e08f5f09413 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -155,15 +155,22 @@
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
-                        </form>
+                            <button colspan="4"
+                            	string="Reply to Last Email"
+                            	name="%(crm.action_crm_reply_mail)d"
+                            	context="{'mail':'reply', 'model': 'crm.fundraising'}" icon="gtk-undo"
+                            	type="action" />
+                       </form>
                         <tree string="Communication history">
                             <field name="description"/>
                             <field name="email"/>
                             <field name="date"/>
                         </tree>
                     </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                    <button colspan="4" string="Send New Email"
+                    	name="%(crm.action_crm_send_new_mail)d"
+                    	context="{'mail':'new', 'model': 'crm.fundraising'}" icon="gtk-go-forward"
+                    	type="action" />
                  </page>
                 </notebook>
             </form>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index ec662885a04..87d0f6df757 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -103,7 +103,11 @@
                                </group>
                                <newline/>
                                <field name="description" colspan="4" nolabel="1"/>
-                               <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                               <button colspan="4"
+                               	string="Reply to Last Email"
+                               	name="%(crm.action_crm_reply_mail)d"
+                               	context="{'mail':'reply', 'model': 'crm.helpdesk'}"
+                               	icon="gtk-undo" type="action" />
                            </form>
                            <tree string="Communication history">
                                <field name="description"/>
@@ -111,7 +115,10 @@
                                <field name="date"/>
                            </tree>
                        </field>
-                       <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                       <button colspan="4" string="Send New Email"
+                       	name="%(crm.action_crm_send_new_mail)d"
+                       	context="{'mail':'new', 'model': 'crm.helpdesk'}" icon="gtk-go-forward"
+                       	type="action" />
                     </page>
                 </notebook>
             </form>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9b040763809..640f6d32d56 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -124,8 +124,13 @@
                                     icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-go-forward" type="action"/>
+                            <field name="description" colspan="4"
+                            	nolabel="1" widget="text_tag" readonly="1" />
+                            <button colspan="4"
+                            	string="Reply to Last Email"
+                            	name="%(crm.action_crm_reply_mail)d"
+                            	context="{'mail':'reply', 'model': 'crm.lead'}"
+                            	icon="gtk-go-forward" type="action" />
                         </form>
                         <tree string="Communication history">
                             <field name="description"/>
@@ -134,8 +139,8 @@
                         </tree>
                     </field>
                     <button colspan="4" string="Send New Email"
-                        name="%(crm.wizard_crm_new_send_mail)d"
-                        context="{'mail':'new'}" icon="gtk-go-forward"
+                        name="%(crm.action_crm_send_new_mail)d"
+                        context="{'mail':'new', 'model': 'crm.lead'}" icon="gtk-go-forward"
                         type="action" />
                  </page>
                  <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 318cd353c69..dfe02ff1eea 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -147,7 +147,11 @@
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                            <button colspan="4"
+                            	string="Reply to Last Email"
+                            	name="%(crm.action_crm_reply_mail)d"
+                            	context="{'mail':'reply', 'model': 'crm.opportunity'}" icon="gtk-undo"
+                            	type="action" />
                         </form>
                         <tree string="Communication history">
                             <field name="description"/>
@@ -155,7 +159,10 @@
                             <field name="date"/>
                         </tree>
                     </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                    <button colspan="4" string="Send New Email"
+                    	name="%(crm.action_crm_send_new_mail)d"
+                    	context="{'mail':'new', 'model': 'crm.opportunity'}" icon="gtk-go-forward"
+                    	type="action" />
                  </page>
                 </notebook>
             </form>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index e783e10c658..7af6ebcc868 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -4,11 +4,6 @@
 <!--        <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>-->
         <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>
 
-        <wizard id="wizard_crm_send_mail" model="crm.case.history"
-        	name="crm.send.mail" string="Send Mail" menu="False" />
-        <wizard id="wizard_crm_new_send_mail" model="crm.case"
-        	name="crm.new.send.mail" string="Send New Mail" menu="False" />
-
         <!-- Case Sections -->
         <record id="crm_case_section_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.form</field>
@@ -353,7 +348,11 @@
                                    </group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4" string="Reply to Last Email" name="%(wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                                   <button colspan="4"
+                                   	string="Reply to Last Email"
+                                   	name="%(action_crm_reply_mail)d"
+                                   	context="{'mail':'reply', 'model': 'crm.case'}"
+                                   	icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -361,7 +360,10 @@
                                    <field name="date"/>
                                </tree>
                            </field>
-                           <button colspan="4" string="Send New Email" name="%(wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                           <button colspan="4" string="Send New Email"
+                           	name="%(action_crm_send_new_mail)d"
+                           	context="{'mail':'new', 'model': 'crm.case'}"
+                           	icon="gtk-go-forward" type="action" />
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 4ab5e00ad67..0a74cfebc30 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -19,10 +19,7 @@
 #
 ##############################################################################
 
-import crm_phonecall_wizard
-
-import wizard_crm_send_email
-import wizard_crm_new_send_email
+import crm_send_new_email
 import wizard_history_event
 
 import crm_lead_to_partner
diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py
deleted file mode 100644
index 9fcec41936e..00000000000
--- a/addons/crm/wizard/crm_phonecall_wizard.py
+++ /dev/null
@@ -1,314 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-from tools.translate import _
-
-class partner_create(wizard.interface):
-
-    case_form = """<?xml version="1.0"?>
-    <form string="Create a Partner">
-        <label string="Are you sure you want to create a partner based on this phonecall ?" colspan="4"/>
-        <label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        <!--field name="close"/-->
-    </form>"""
-
-    case_fields = {
-        'close': {'type':'boolean', 'string':'Close Phonecall'}
-    }
-
-    partner_form = """<?xml version="1.0"?>
-    <form string="Create a Partner">
-        <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        <label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        <newline />
-        <field name="action"/>
-        <group attrs="{'invisible':[('action','!=','exist')]}">
-            <field name="partner_id"/>
-        </group>
-    </form>"""
-
-    partner_fields = {
-        'action': {'type':'selection',
-                'selection':[('exist','Link to an existing partner'),('create','Create a new partner')],
-                'string':'Action', 'required':True, 'default': lambda *a:'exist'},
-        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
-    }
-
-    def _selectPartner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.phonecall')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.partner_id:
-                raise wizard.except_wizard(_('Warning !'),
-                    _('A partner is already defined on this phonecall.'))                        
-        return {}
-
-    def _create_partner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)        
-        case_obj = pool.get('crm.phonecall')
-        partner_obj = pool.get('res.partner')
-        contact_obj = pool.get('res.partner.address')
-        partner_ids = []
-        partner_id = False
-        contact_id = False
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if data['form']['action'] == 'create':
-                partner_id = partner_obj.create(cr, uid, {
-                    'name': case.partner_contact or case.name,
-                    'user_id': case.user_id.id,
-                    'comment': case.description,
-                })
-                contact_id = contact_obj.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'name': case.name,
-                    'phone': case.partner_phone,
-                    'mobile': case.partner_mobile,
-                    'email': case.email_from
-                })
-
-            else:
-                if data['form']['partner_id']:
-                    partner = partner_obj.browse(cr,uid,data['form']['partner_id'])
-                    partner_id = partner.id
-                    contact_id = partner.address and partner.address[0].id
-
-            partner_ids.append(partner_id)
-            vals = {}
-            if partner_id:
-                vals.update({'partner_id': partner_id})
-            if contact_id:
-                vals.update({'partner_address_id': contact_id})
-            case_obj.write(cr, uid, [case.id], vals)   
-        return partner_ids
-
-    def _make_partner(self, cr, uid, data, context): 
-        pool = pooler.get_pool(cr.dbname)             
-        partner_ids = self._create_partner(cr, uid, data, context)
-        mod_obj = pool.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'domain': "[]",
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'res.partner',
-            'res_id': partner_ids and int(partner_ids[0]) or False,
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-
-    states = {
-        'init': {
-            'actions': [_selectPartner],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('create_partner', 'Create Partner', 'gtk-go-forward')]}
-        },
-        'create_partner': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': partner_form, 'fields': partner_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('create', 'Continue', 'gtk-go-forward')]}
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _make_partner, 'state': 'end'}
-        }
-    }
-
-
-partner_create('crm.phonecall.partner_create')
-
-class phonecall2opportunity(partner_create):
-    
-    case_form = """<?xml version="1.0"?>
-    <form string="Convert To Opportunity">
-        <field name="name"/>
-        <field name="partner_id"/>
-        <newline/>
-        <field name="planned_revenue"/>
-        <field name="probability"/>
-    </form>"""
-
-    case_fields = {
-        'name': {'type':'char', 'size':64, 'string':'Opportunity Summary', 'required':True},
-        'planned_revenue': {'type':'float', 'digits':(16,2), 'string': 'Expected Revenue'},
-        'probability': {'type':'float', 'digits':(16,2), 'string': 'Success Probability'},
-        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
-    }
-    
-    def _check_state(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.phonecall')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.state in ['done', 'cancel']:
-                raise wizard.except_wizard(_('Warning !'),
-                    _('Closed/Cancelled Phone Call Could not convert into Opportunity.'))
-        return {}
-
-    def _selectopportunity(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.phonecall')
-        case = case_obj.browse(cr, uid, data['id'])
-        return {'name': case.name, 'partner_id':case.partner_id and case.partner_id.id or False}
-
-    def _selectChoice(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.phonecall')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if not case.partner_id:
-                return 'create_partner'
-        return 'opportunity'
-
-    def _makeOrder(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        res = data_obj.read(cr, uid, result, ['res_id'])
-        
-
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-        phonecall_case_obj = pool.get('crm.phonecall')
-        opportunity_case_obj = pool.get('crm.opportunity')
-        for phonecall in phonecall_case_obj.browse(cr, uid, data['ids']):                     
-            new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
-                'name': data['form']['name'],
-                'planned_revenue': data['form']['planned_revenue'],
-                'probability': data['form']['probability'],
-                'partner_id': data['form']['partner_id'],                 
-                'section_id': phonecall.section_id.id,
-                'description': phonecall.description,         
-                'phonecall_id': phonecall.id,
-                'priority': phonecall.priority,
-                'phone': phonecall.partner_phone,
-            })
-            new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
-            vals = {
-                'partner_id': data['form']['partner_id'], 
-                'opportunity_id' : new_opportunity_id,                
-                }            
-            phonecall_case_obj.write(cr, uid, [phonecall.id], vals)
-            phonecall_case_obj.case_close(cr, uid, [phonecall.id])
-            opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
-        value = {            
-            'name': _('Opportunity'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.opportunity',
-            'res_id': int(new_opportunity_id),
-            'view_id': False,
-            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-
-    def _makePartner(self, cr, uid, data, context):
-        partner_ids = self._create_partner(cr, uid, data, context)
-        return {}
-
-    states = {
-        'init': {
-            'actions': [_check_state],
-            'result': {'type':'choice','next_state':_selectChoice}
-        },
-        'create_partner': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': partner_create.partner_form, 'fields': partner_create.partner_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('opportunity', 'Skip', 'gtk-goto-last'),('create', 'Continue', 'gtk-go-forward')]}
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makePartner, 'state':'opportunity' }
-        },
-        'opportunity': {
-            'actions': [_selectopportunity],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('confirm', 'Create Opportunity', 'gtk-go-forward')]}
-        },
-        'confirm': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeOrder, 'state': 'end'}
-        }
-    }
-
-phonecall2opportunity('crm.phonecall.opportunity_set')
-
-class phonecall2meeting(wizard.interface):
-
-    def _makeMeeting(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        phonecall_case_obj = pool.get('crm.phonecall')                   
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-        id = data_obj.read(cr, uid, result, ['res_id'])
-        id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-        if id1:
-            id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        phonecall = phonecall_case_obj.browse(cr, uid, data['id'], context=context)
-        partner_id = phonecall.partner_id and phonecall.partner_id.id or False
-        name = phonecall.name
-        email = phonecall.email_from
-        section_id = phonecall.section_id and phonecall.section_id.id or False      
-        return {            
-            'name': _('Meetings'),
-            'domain' : "[('user_id','=',%s)]"%(uid), 
-            'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},        
-            'view_type': 'form',
-            'view_mode': 'calendar,form,tree',
-            'res_model': 'crm.meeting',
-            'view_id': False,
-            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']
-            }
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
-        },
-        'order': {
-            'actions': [],
-            'result': {'type': 'state', 'state': 'end'}
-        }
-    }
-phonecall2meeting('crm.phonecall.meeting_set')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_send_new_email.py b/addons/crm/wizard/crm_send_new_email.py
new file mode 100644
index 00000000000..3687d23a5a3
--- /dev/null
+++ b/addons/crm/wizard/crm_send_new_email.py
@@ -0,0 +1,220 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from mx.DateTime import now
+
+import wizard
+import netsvc
+import ir
+import pooler
+import tools
+import base64
+from tools.translate import _
+from osv import osv, fields
+
+class crm_send_new_email(osv.osv_memory):
+    """ Sends new email for the case"""
+    _name = "crm.send.new.mail"
+    _description = "Case Send new email"
+
+    _columns = {
+                'to' : fields.char('To', size=64, required=True), 
+                'cc' : fields.char('CC', size=128), 
+                'subject' : fields.char('Subject', size=128, required=True), 
+                'text' : fields.text('Message', required=True), 
+                'state': fields.selection([('done', 'Done'), ('pending', 'Pending'), ('unchanged', 'Unchanged')], string='State', required=True), 
+                'doc1': fields.binary("Attachment1"), 
+                'doc2': fields.binary("Attachment2"), 
+                'doc3': fields.binary("Attachment3"), 
+                }
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Phonecall to Opportunity form
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Opportunity's IDs
+        @param context: A standard dictionary for contextual values
+        """
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_send(self, cr, uid, ids, context=None):
+        """ This sends an email to ALL the addresses of the selected partners.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Opportunity's IDs
+        @param context: A standard dictionary for contextual values
+        """
+        if not context:
+            context = {}
+        
+        if not context.get('model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+
+        model = context.get('model')
+        case_pool = self.pool.get(model)
+        res_id = context and context.get('active_id', False) or False
+
+        for data in self.read(cr, uid, ids, context=context):
+            attach = filter(lambda x: x, [data['doc1'], data['doc2'], data['doc3']])
+            attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
+            
+            if context.get('mail', 'new') == 'new':
+                case = case_pool.browse(cr, uid, res_id)
+            else:
+                hist_obj = self.pool.get('crm.case.history')
+                hist = hist_obj.browse(cr, uid, res_id)
+                model = hist.log_id.model_id.model
+                model_pool = self.pool.get(model)
+                case = model_pool.browse(cr, uid, hist.log_id.res_id)
+            emails = [data['to']] + (data['cc'] or '').split(',')
+            emails = filter(None, emails)
+            body = data['text']
+
+            if case.user_id.signature:
+                body += '\n\n%s' % (case.user_id.signature)
+
+            case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['to'], details=body)
+
+            flag = tools.email_send(
+                case.user_id.address_id.email, 
+                emails, 
+                data['subject'], 
+                case_pool.format_body(body), 
+                attach=attach, 
+                reply_to=case.section_id.reply_to, 
+                openobject_id=str(case.id), 
+                subtype="html"
+            )
+            if flag:
+                if data['state'] == 'unchanged':
+                    pass
+                elif data['state'] == 'done':
+                    case_pool.case_close(cr, uid, [data['id']])
+                elif data['state'] == 'pending':
+                    case_pool.case_pending(cr, uid, [data['id']])
+                cr.commit()
+
+#            Commented because form does not close due to raise
+#                raise osv.except_osv(_('Email!'), ("Email Successfully Sent"))
+#            else:
+#                raise osv.except_osv(_('Warning!'), _("Email not sent !"))
+        return {}
+    
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        if not context:
+            context = {}
+        
+        if not context.get('model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+        
+        res = super(crm_send_new_email, self).default_get(cr, uid, fields, context=context)
+
+        if context.get('mail') == 'reply':
+            res.update(self.get_reply_defaults(cr, uid, fields, context=context))
+            return res
+
+        model = context.get('model')
+        mod_obj = self.pool.get(model)
+        res_id = context and context.get('active_ids', []) or []
+
+        for case in mod_obj.browse(cr, uid, res_id):
+            if 'to' in fields:
+                res.update({'to': case.email_from})
+            if 'subject' in fields:
+                res.update({'subject': case.name})
+            if 'cc' in fields:
+                res.update({'cc': case.email_cc or ''})
+            if 'text' in fields:
+                res.update({'text': case.description or ''})
+            if 'state' in fields:
+                res.update({'state': 'done'})
+        return res
+    
+    def get_reply_defaults(self, cr, uid, fields, context=None):
+        """
+        This function gets default values for reply mail
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        hist_obj = self.pool.get('crm.case.history')
+        res_ids = context and context.get('active_ids', []) or []
+        res = {}
+        for hist in hist_obj.browse(cr, uid, res_ids):
+            model = hist.log_id.model_id.model
+            model_pool = self.pool.get(model)
+            case = model_pool.browse(cr, uid, hist.log_id.res_id)
+            if 'to' in fields:
+                res.update({'to': hist.email})
+            if 'text' in fields:
+                res.update({'text': '>' + hist.description.replace('\n', '\n> ')})
+            if 'subject' in fields:
+                res.update({'subject': case.name or ''})
+        return res
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        if not context:
+            context = {}
+        
+        if not context.get('model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+        model = context.get('model')
+        mod_obj = self.pool.get(model)
+        if context.get('mail') == 'reply':
+            return True
+        for case in mod_obj.browse(cr, uid, context.get('active_ids', [])):
+            if not case.user_id:
+                raise osv.except_osv(_('Error'), _('You must define a responsible user for this case in order to use this action!'))
+            if not case.user_id.address_id.email:
+                raise osv.except_osv(_('Warning!'), _("Please specify user's email address !"))
+
+        return True
+
+crm_send_new_email()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_send_new_email_view.xml b/addons/crm/wizard/crm_send_new_email_view.xml
new file mode 100644
index 00000000000..5411bf72af0
--- /dev/null
+++ b/addons/crm/wizard/crm_send_new_email_view.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+<!-- Send New Mail view -->
+    
+        <record model="ir.ui.view" id="crm_send_new_mail_view">
+            <field name="name">crm.new.send.mail.form</field>
+            <field name="model">crm.send.new.mail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Send New Mail" col="2">
+                	<field name="to" />
+                	<field name="cc" />
+                	<field name="subject" />
+                	<field name="text" widget="text_tag"/>
+                	<field name="doc1" />
+                	<field name="doc2" />
+                	<field name="doc3" />
+                	<separator colspan="4" string="Set case state to" />
+                	<field name="state" />
+                	<separator string=" " colspan="4"/>
+                    <group colspan="4" col="3" >
+                    	<label string=" " />
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_send" type="object" string="_Send" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+<!-- Send New Mail action -->
+
+        <record model="ir.actions.act_window" id="action_crm_send_new_mail">
+            <field name="name">Send New Mail</field>
+            <field name="res_model">crm.send.new.mail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_send_new_mail_view"/>
+            <field name="target">new</field>
+        </record>
+	
+	
+	<!-- Reply to Mail view -->
+    
+        <record model="ir.ui.view" id="crm_reply_mail_view">
+            <field name="name">crm.new.send.mail.form</field>
+            <field name="model">crm.send.new.mail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Reply to last Mail" col="2">
+                	<field name="to" />
+                	<field name="cc" />
+                	<field name="subject" />
+                	<field name="text" widget="text_tag"/>
+                	<separator string=" " colspan="4"/>
+                    <group colspan="4" col="3" >
+                    	<label string=" " />
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_send" type="object" string="_Send Reply" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+<!-- Reply to Mail action -->
+
+        <record model="ir.actions.act_window" id="action_crm_reply_mail">
+            <field name="name">Reply to last Mail</field>
+            <field name="res_model">crm.send.new.mail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_reply_mail_view"/>
+            <field name="target">new</field>
+        </record>
+	
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py
deleted file mode 100644
index ef878f3249f..00000000000
--- a/addons/crm/wizard/wizard_crm_new_send_email.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-import tools
-import base64
-from tools.translate import _
-
-
-email_send_form = '''<?xml version="1.0"?>
-<form string="Mass Mailing">
-    <field name="to"/>
-    <newline/>
-    <field name="cc"/>
-    <newline/>
-    <field name="subject"/>
-    <newline/>
-    <field name="text" />
-    <newline/>
-    <field name="doc1" />
-    <newline/>
-    <field name="doc2" />
-    <newline/>
-    <field name="doc3" />
-    <separator colspan="4" string="Set case state to"/>
-    <newline/>
-    <field name="state" />
-</form>'''
-
-email_send_fields = {
-    'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
-    'cc': {'string':"CC", 'type':'char', 'size':128,},
-    'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
-    'text': {'string':'Message', 'type':'text_tag', 'required':True},
-    'state':{'string':'State', 'type':'selection', 'selection':[('done','Done'),('pending','Pending'),('unchanged','Unchanged')]},
-    'doc1' :  {'string':"Attachment1", 'type':'binary'},
-    'doc2' :  {'string':"Attachment2", 'type':'binary'},
-    'doc3' :  {'string':"Attachment3", 'type':'binary'},
-    'state' :  {'string':"Set State to", 'type':'selection', 'required' : True, 'default' :'done',\
-                    'selection': [('unchanged','Unchanged'),('done','Done'),('pending','Pending')]},
-}
-
-# this sends an email to ALL the addresses of the selected partners.
-def _mass_mail_send(self, cr, uid, data, context):
-    attach = filter(lambda x: x, [data['form']['doc1'],  data['form']['doc2'],  data['form']['doc3']])
-    attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
-
-    pool = pooler.get_pool(cr.dbname)
-    case_pool=pool.get(data.get('model'))
-
-    case = case_pool.browse(cr,uid,data['ids'])[0]    
-    emails = [data['form']['to']] + (data['form']['cc'] or '').split(',')
-    emails = filter(None, emails)
-    body = data['form']['text']
-    if case.user_id.signature:
-        body += '\n\n%s' % (case.user_id.signature)
-    case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['form']['to'], details=body)
-    flag = tools.email_send(
-        case.user_id.address_id.email,
-        emails,
-        data['form']['subject'],
-        case_pool.format_body(body),
-        attach=attach,
-        reply_to=case.section_id.reply_to,
-        openobject_id=str(case.id), 
-        subtype="html"
-    )
-    if flag:
-        if data['form']['state'] == 'unchanged':
-            pass
-        elif data['form']['state'] == 'done':
-            case_pool.case_close(cr, uid, data['ids'])
-        elif data['form']['state'] == 'pending':
-            case_pool.case_pending(cr, uid, data['ids'])
-        cr.commit()
-        raise wizard.except_wizard(_('Email!'),("Email Successfully Sent"))
-    else:
-        raise wizard.except_wizard(_('Warning!'),_("Email not sent !"))
-    return {}
-
-def _get_info(self, cr, uid, data, context):
-    if not data['id']:
-        return {}
-        
-    pool = pooler.get_pool(cr.dbname)
-    case = pool.get(data.get('model')).browse(cr, uid, data['id'])
-    if not case.user_id:
-        raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))
-    if not case.user_id.address_id.email:
-        raise wizard.except_wizard(_('Warning!'),_("Please specify user's email address !"))
-        
-    return {
-        'to': case.email_from, 
-        'subject': case.name, 
-        'cc': case.email_cc or ''
-    }
-    
-class wizard_send_mail(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_info],
-            'result': {'type': 'form', 'arch': email_send_form, 'fields': email_send_fields, 'state':[('end','Cancel','gtk-cancel'), ('send','Send Email','gtk-go-forward')]}
-        },
-        'send': {
-            'actions': [_mass_mail_send],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wizard_send_mail('crm.new.send.mail')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm/wizard/wizard_crm_send_email.py b/addons/crm/wizard/wizard_crm_send_email.py
deleted file mode 100644
index d6b3732d5e7..00000000000
--- a/addons/crm/wizard/wizard_crm_send_email.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-import tools
-from tools.translate import _
-
-
-email_send_form = '''<?xml version="1.0"?>
-<form string="Mass Mailing">
-    <field name="to"/>
-    <newline/>
-    <field name="cc"/>
-    <newline/>
-    <field name="subject"/>
-    <newline/>
-    <field name="text" />
-</form>'''
-
-email_send_fields = {
-    'to': {'string':"To", 'type':'char', 'size':64, 'required':True},
-    'cc': {'string':"CC", 'type':'char', 'size':128,},
-    'subject': {'string':'Subject', 'type':'char', 'size':128, 'required':True},
-    'text': {'string':'Message', 'type':'text_tag', 'required':True}
-}
-
-# this sends an email to ALL the addresses of the selected partners.
-def _mass_mail_send(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-
-    hist_obj = pool.get('crm.case.history').browse(cr,uid,data['ids'])[0]
-    model = hist_obj.log_id.model_id.model
-    model_pool = pool.get(model)
-    case = model_pool.browse(cr, uid, hist_obj.log_id.res_id)
-    model_pool._history(cr, uid, [case], _('Send'), history=True, email=False)
-    model_pool.write(cr, uid, [case.id], {
-                'som': False,
-                'canal_id': False,
-                })
-    emails = [data['form']['to']] + (data['form']['cc'] or '').split(',')
-    emails = filter(None, emails)
-    body = data['form']['text']
-    if case.user_id.signature:
-        body += '\n\n%s' % (case.user_id.signature)
-    tools.email_send(
-        case.user_id.address_id.email,
-        emails,
-        data['form']['subject'],
-        model_pool.format_body(body),
-        reply_to=case.section_id.reply_to,
-        openobject_id=str(case.id), 
-        subtype="html"
-    )
-    return {}
-
-def _get_info(self, cr, uid, data, context):
-    if not data['id']:
-        raise wizard.except_wizard(_('Error'),_('There is no mail to reply!'))
-    pool = pooler.get_pool(cr.dbname)
-    hist_obj = pool.get('crm.case.history').browse(cr,uid,data['ids'])[0]
-    model = hist_obj.log_id.model_id.model
-    model_pool = pool.get(model)
-    case = model_pool.browse(cr, uid, hist_obj.log_id.res_id)
-    if not case.email_from:
-        raise wizard.except_wizard(_('Error'),_('You must put a Partner eMail to use this action!'))
-    if not case.user_id:
-        raise wizard.except_wizard(_('Error'),_('You must define a responsible user for this case in order to use this action!'))
-    return {'to': case.email_from,'subject': '['+str(case.id)+'] '+case.name,'cc': case.email_cc or '', 'text': '> ' + hist_obj.description.replace('\n','\n> ')}
-    
-class wizard_send_mail(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_info],
-            'result': {'type': 'form', 'arch': email_send_form, 'fields': email_send_fields, 'state':[('end','Cancel','gtk-cancel'), ('send','Send Email','gtk-go-forward')]}
-        },
-        'send': {
-            'actions': [_mass_mail_send],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wizard_send_mail('crm.send.mail')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_recruitment/hr_hr_view.xml b/addons/hr_recruitment/hr_hr_view.xml
index c86de0f9737..8e6cb840fb0 100644
--- a/addons/hr_recruitment/hr_hr_view.xml
+++ b/addons/hr_recruitment/hr_hr_view.xml
@@ -156,7 +156,11 @@
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
-                            <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                            <button colspan="4"
+                            	string="Reply to Last Email"
+                            	name="%(crm.action_crm_reply_mail)d"
+                            	context="{'mail':'reply', 'model': 'hr.applicant'}" icon="gtk-undo"
+                            	type="action" />
                         </form>
                         <tree string="Communication history">
                            <field name="description"/>
@@ -164,8 +168,11 @@
                            <field name="date"/>
                         </tree>
                     </field>
-                    <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
-                 </page>
+                       <button colspan="4" string="Send New Email"
+                       	name="%(crm.action_crm_send_new_mail)d"
+                       	context="{'mail':'new', 'model': 'hr.applicant'}" icon="gtk-go-forward"
+                       	type="action" />
+                   </page>
                 </notebook>
             </form>
         </field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 57c1bf4fa43..41a99f29afe 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -109,7 +109,11 @@
                                     </group>
                                     <newline/>
                                     <field name="description" colspan="4" nolabel="1"/>
-                                    <button colspan="4" string="Reply to Last Email" name="%(crm.wizard_crm_send_mail)d" context="{'mail':'reply'}" icon="gtk-undo" type="action"/>
+                                    <button colspan="4"
+                                    	string="Reply to Last Email"
+                                    	name="%(crm.action_crm_reply_mail)d"
+                                    	context="{'mail':'reply', 'model': 'project.issue'}"
+                                    	icon="gtk-undo" type="action" />
                                 </form>
                                 <tree string="Communication history">
                                     <field name="description"/>
@@ -117,7 +121,10 @@
                                     <field name="date"/>
                                 </tree>
                             </field>
-                            <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                            <button colspan="4" string="Send New Email"
+                            	name="%(crm.action_crm_send_new_mail)d"
+                            	context="{'mail':'new', 'model': 'project.issue'}"
+                            	icon="gtk-go-forward" type="action" />
                         </page>
                         <page string="Worklogs">
                             <separator string="Timesheets" colspan="4" />

From b7489580822088c01baf8149a8b38351d165dc93 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Thu, 18 Mar 2010 18:39:33 +0100
Subject: [PATCH 066/248] [REF]
 hr,hr_attendance,hr_expense,hr_holidays,hr_timesheets,stock: Review some
 layouts

bzr revid: stephane@openerp.com-20100318173933-5mdevsd8oeon8vu7
---
 addons/hr/hr_view.xml                         | 50 +++++++------
 addons/hr_attendance/hr_attendance.py         |  8 +++
 addons/hr_attendance/hr_attendance_view.xml   | 10 ++-
 addons/hr_expense/hr_expense_view.xml         | 70 ++++++++++---------
 addons/hr_holidays/hr_view.xml                | 45 ++++++------
 addons/hr_holidays/wizard/holidays_summary.py |  4 +-
 .../wizard/holidays_summary_employees.py      |  4 +-
 .../hr_timesheet_sheet_view.xml               | 16 ++---
 .../report/report_stock_picking_view.xml      |  4 +-
 9 files changed, 119 insertions(+), 92 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f98150f815b..ce12d776baf 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -38,20 +38,6 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Personal Information">
-                            <group col="2" colspan="2">
-                                <separator colspan="2" string="Social IDs"/>
-                                <field name="ssnid"/>
-                                <field name="sinid" groups="base.group_extended"/>
-                                <field name="otherid"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Status" colspan="2"/>
-                                <field name="gender"/>
-                                <field name="marital"/>
-                                <field name="country_id"/>
-                                <field name="birthday"/>
-                            </group>
-
                             <group col="2" colspan="2">
                                 <separator string="Contact Information" colspan="2"/>
                                 <field name="address_home_id" colspan="2"/>
@@ -62,6 +48,13 @@
                                 <field name="work_location"/>
                             </group>
 
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Social IDs"/>
+                                <field name="ssnid"/>
+                                <field name="sinid" groups="base.group_extended"/>
+                                <field name="otherid"/>
+                            </group>
+
                             <group col="2" colspan="2">
                                 <separator string="Position" colspan="2"/>
                                 <field name="job_id" widget="selection"/>
@@ -70,6 +63,14 @@
                                 <field name="parent_id" select="1"/>
                                 <field name="coach_id" select="1"/>
                             </group>
+
+                            <group col="2" colspan="2">
+                                <separator string="Status" colspan="2"/>
+                                <field name="gender"/>
+                                <field name="marital"/>
+                                <field name="country_id"/>
+                                <field name="birthday"/>
+                            </group>
                         </page>
                         <page string="Notes">
                             <field colspan="4" nolabel="1" name="notes"/>
@@ -87,10 +88,11 @@
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>
-                    <field name="job_id"/>
+                    <field name="ssnid"/>
                     <field name="work_phone"/>
                     <field name="work_email"/>
                     <field name="department_id"/>
+                    <field name="job_id"/>
                     <field name="parent_id"/>
                 </tree>
             </field>
@@ -101,18 +103,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
-                    <group col='6' colspan='2'>
-                        <field name="name"/>
-                        <field name="job_id" widget="selection"/>
-                        <field name="department_id" widget="selection"/>
-                        <field name="parent_id">
-                               <filter icon="terp-partner" domain="[('parent_id','child_of',uid),('id', '!=', uid)]"  help="Employees under me"/>
-                         </field>
-                    </group>
+                    <filter icon="terp-partner" domain="[('parent_id','child_of',uid),('id', '!=', uid)]" string ="My Employees"/>
+                    <separator orientation="vertical" />
+                    <field name="name"/>
+                    <field name="ssnid"/>
+                    <field name="department_id" widget="selection"/>
+                    <field name="job_id" widget="selection"/>
+                    <field name="parent_id" widget="selection" />
                     <newline />
 
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
                     </group>
                 </search>
              </field>
@@ -152,6 +154,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="view_id" ref="view_employee_tree"/>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
         <!--<menuitem
@@ -206,6 +209,7 @@
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>
+                    <field name="ssnid"/>
                     <field name="user_id"/>
                     <field name="address_id"/>
 
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 1262896d17f..cca69186f0c 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -46,11 +46,19 @@ def _employee_get(obj,cr,uid,context={}):
 class hr_attendance(osv.osv):
     _name = "hr.attendance"
     _description = "Attendance"
+
+    def _day_compute(self, cr, uid, ids, fieldnames, args, context=None):
+        res = dict.fromkeys(ids, '')
+        for obj in self.browse(cr, uid, ids, context=context):
+            res[obj.id] = time.strftime('%Y-%m-%d', time.strptime(obj.name, '%Y-%m-%d %H:%M:%S'))
+
+        return res
     _columns = {
         'name' : fields.datetime('Date', required=True),
         'action' : fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'),('action','Action')], 'Action', required=True),
         'action_desc' : fields.many2one("hr.action.reason", "Action reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
         'employee_id' : fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
+        'day' : fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
     }
     _defaults = {
         'name' : lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 0c25e6eb34f..7e0bd2c3f31 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Employee attendance">
                     <field name="employee_id" select="1"/>
-                    <field colspan="4" name="name" select="1"/>
+                    <field name="name" select="1"/>
                     <field name="action" select="1"/>
                     <field name="action_desc" select="1"/>
                 </form>
@@ -48,9 +48,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
+                    <filter icon="terp-sale" string="My Attendances" domain="[('employee_id.user_id.id', '=', uid)]" />
+                    <filter icon="terp-sale" string="Today" domain="[('name::date','=',current_date)]" />
+                    <separator orientation="vertical"/>
                     <field name="employee_id" select="1" />
                     <field name="name" select="1"  />
                     <field name="action" select="1" />
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="11" col="11">
+                        <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter string="Day" icon="terp-sale" domain="[]" context="{'group_by':'day'}"/>
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 16828a87a1a..dd71c67a201 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -26,7 +26,8 @@
             <field name="model">hr.expense.expense</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Expenses">
+                <tree string="Expenses"
+                    colors="blue:state == 'draft'">
                     <field name="date"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
@@ -66,8 +67,8 @@
             <field name="arch" type="xml">
                 <form string="Expenses Sheet">
                     <group colspan="4" col="6">
-                        <field name="name" select="1"/>
                         <field name="employee_id" select="1"/>
+                        <field name="name" select="1"/>
                         <field name="id" select="2"/>
                         <field name="date" select="1"/>
                         <field name="amount"/>
@@ -127,39 +128,42 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Expense">
-                <group col="20" colspan="4">
-                      <filter
-                        icon="terp-hr"
-                        domain="[('state','=','draft')]"
-                        string="Draft"
-                        help="Draft Expense"/>
-                      <filter
-                        icon="terp-hr"
-                        domain="[('state','=','confirm')]"
-                        string="To Validate"
-                        help="Confirmed Expense"/>
-                      <filter
-                        icon="terp-hr"
-                        domain="[('state','=','accepted')]"
-                        string="To Pay"
-                        help="Expenses to Invoice"/>
-                      <separator orientation="vertical"/>
-                      <field name="name" select='1'/>
-                      <field name="user_id" select="1" widget="selection">
-                          <filter
-                            icon="gtk-execute"
-                            help="My Expenses"
+                    <group col="20" colspan="4">
+                        <filter
+                            icon="terp-hr"
+                            string="My Expenses"
                             default="1"
                             domain="[('user_id','=',uid)]"/>
-                      </field>
-                      <field name="state" select="1"/>
-                      <field name="department_id" widget="selection">
-                      	<filter icon="terp-crm"
-								domain="[('department_id','=',context.get('department_id',False))]"
-								help="Expenses of My Department"/>
-						</field>
-                 </group>
-                 </search>
+                        <filter icon="terp-hr"
+                            domain="[('department_id','=',context.get('department_id',False))]"
+                            string="Expenses of My Department"/>
+                        <separator orientation="vertical" />
+                        <filter
+                            icon="terp-hr"
+                            domain="[('state','=','draft')]"
+                            string="Draft"
+                            help="Draft Expense"/>
+                        <filter
+                            icon="terp-hr"
+                            domain="[('state','=','confirm')]"
+                            string="To Validate"
+                            help="Confirmed Expense"/>
+                        <filter
+                            icon="terp-hr"
+                            domain="[('state','=','accepted')]"
+                            string="To Pay"
+                            help="Expenses to Invoice"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" select="1" widget="selection" />
+                        <field name="name" select='1'/>
+                        <field name="department_id" widget="selection" />
+                        <field name="state" select="1"/>
+                    </group>
+                    <newline />
+                    <group expand="1" string="Group By..." colspan="11" col="11">
+                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index d46898bd6bb..6f900b0e45e 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -7,24 +7,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave">
-                       <group col='8' colspan='4'>
-                           <filter icon="terp-hr" domain="[('state','=','draft')]" string="To Confirm"/>
-                           <filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/>
-                           <separator orientation="vertical"/> 
-                          <field name="name" select='1'/>
-                          <field name="state" select="1">
-                              <filter icon="terp-hr" domain="[('state','=','refuse')]" help="Refused Holidays"/>
-                              <filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
-                          </field>                          
-                          <field name="user_id" select="1" widget="selection">
-                              <filter icon="gtk-execute" help="My Leaves" domain="[('user_id','=',uid)]" />  
-                          </field> 
-                          <field name="department_id" select="1" widget="selection">
-                          		<filter icon="gtk-execute" domain="[('department_id','=',context.get('department_id',False))]"
-								help="My Departments Leaves"/>
-                          </field>
-                      </group>
-                 </search>
+                    <group col='8' colspan='4'>
+                        <filter icon="terp-hr" domain="[('state','=','draft')]" string="To Confirm"/>
+                        <filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/>
+                        <filter icon="terp-hr" domain="[('department_id','=',context.get('department_id',False))]"
+                            string="My Departments Leaves"/>
+                        <filter icon="terp-hr" help="My Leaves" domain="[('user_id','=',uid)]" string="My Leaves"/>  
+                        <separator orientation="vertical"/> 
+                        <field name="user_id" select="1" widget="selection" />
+                        <field name="department_id" select="1" widget="selection" />
+                        <field name="name" select='1'/>
+                        <field name="state" select="1">
+                            <filter icon="terp-hr" domain="[('state','=','refuse')]" help="Refused Holidays"/>
+                            <filter icon="terp-hr" domain="[('state','=','validate')]" help="Validated Holidays"/>
+                        </field>                          
+                    </group>
+                    <newline />
+                    <group expand="1" string="Group By..." colspan="11" col="11">
+                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -134,16 +136,17 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Leaves">
-                    <field name="name"/>
+                <tree string="Leaves"
+                    colors="red:state == 'refuse';grey:state == 'cancel'">
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
                     <field name="date_from"/>
                     <field name="date_to"/>
+                    <field name="name"/>
                     <field name="holiday_status_id"/>
-                    <field name="state"/>
                     <field name="type"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/hr_holidays/wizard/holidays_summary.py b/addons/hr_holidays/wizard/holidays_summary.py
index d60fc3b0873..0b6a05247f0 100644
--- a/addons/hr_holidays/wizard/holidays_summary.py
+++ b/addons/hr_holidays/wizard/holidays_summary.py
@@ -77,7 +77,7 @@ class wizard_report(wizard.interface):
     states={
         'init':{
             'actions':[_check],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel'), ('checkdept', 'Print')]}
+            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel', 'gtk-cancel'), ('checkdept', 'Print', 'gtk-print')]}
         },
         'checkdept': {
             'actions': [],
@@ -85,7 +85,7 @@ class wizard_report(wizard.interface):
         },
         'notify': {
             'actions': [],
-            'result': {'type':'form','arch':zero_form,'fields':zero_fields,'state':[('end','Ok')]}
+            'result': {'type':'form','arch':zero_form,'fields':zero_fields,'state':[('end','Ok', 'gtk-ok')]}
         },
         'report':{
             'actions':[],
diff --git a/addons/hr_holidays/wizard/holidays_summary_employees.py b/addons/hr_holidays/wizard/holidays_summary_employees.py
index a621e6d5912..006118ecd26 100644
--- a/addons/hr_holidays/wizard/holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/holidays_summary_employees.py
@@ -67,7 +67,7 @@ class wizard_report(wizard.interface):
     states={
         'init':{
             'actions':[_check],
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel'), ('checkemp', 'Print')]}
+            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel','gtk-cancel'), ('checkemp', 'Print', 'gtk-print')]}
         },
         'checkemp': {
             'actions': [],
@@ -75,7 +75,7 @@ class wizard_report(wizard.interface):
         },
         'notify': {
             'actions': [],
-            'result': {'type':'form','arch':zero_form,'fields':zero_fields,'state':[('end','Ok')]}
+            'result': {'type':'form','arch':zero_form,'fields':zero_fields,'state':[('end','Ok', 'gtk-ok')]}
         },
         'report':{
             'actions':[],
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 24008e64843..5cec137c874 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -7,7 +7,8 @@
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Timesheets">
+                <tree string="Timesheets"
+                    colors="blue:state == 'draft';grey:state == 'done'">
                     <field name="user_id"/>
                     <field name="department_id"/>
                     <field name="date_from"/>
@@ -156,9 +157,11 @@
                                     <field name="total_difference" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
                                 </tree>
                             </field>
-                            <field name="total_attendance" widget="float_time"/>
-                            <field name="total_timesheet" widget="float_time"/>
-                            <field name="total_difference" widget="float_time"/>
+                            <group colspan="4" col="6">
+                                <field name="total_attendance" widget="float_time"/>
+                                <field name="total_timesheet" widget="float_time"/>
+                                <field name="total_difference" widget="float_time"/>
+                            </group>
                         </page>
                     </notebook>
                     <field name="state"/>
@@ -182,10 +185,7 @@
                         <filter icon="terp-crm" string="Unvalidated" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-crm" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
-                        <field name="state">
-                            <filter icon="terp-hr" domain="[('state','=','draft')]" help="Draft Timesheets"/>
-                            <filter icon="terp-hr" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
-                        </field>
+                        <field name="state" />
                         <field name="name" select="1"/>
                         <field name="user_id" select="1" widget="selection">
                             <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Timesheet"/>
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index f2d4bfe4507..1f2d347efdc 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -61,8 +61,8 @@
 						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
                         <separator orientation="vertical"/>
   						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
-  						<filter string="Order Date" icon="terp-stock" domain="[('order_date',=,time.strftime('%%m/%%d/%%Y'))]"  />
-  						<filter string="Expected Date" icon="terp-hr" domain="[('expected_date',=,time.strftime('%%m/%%d/%%Y'))]"/>
+  						<filter string="Order Date" icon="terp-stock" domain="[('order_date',=,time.strftime('%%Y-%%m-%%d'))]"  />
+  						<filter string="Expected Date" icon="terp-hr" domain="[('expected_date',=,time.strftime('%%Y-%%m-%%d'))]"/>
 						<separator orientation="vertical"/>
 						<field name="reference" />
 						<field name="origin" />

From 8c0b1d3e2f24af00b0124c949102ca16491d7b2c Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 19 Mar 2010 11:20:07 +0530
Subject: [PATCH 067/248] [IMP]: crm: Remove one extra field state from crm
 meeting view.

bzr revid: atp@tinyerp.co.in-20100319055007-0qmkuebqa7x0wvg1
---
 addons/crm/crm_meeting_view.xml | 1 -
 1 file changed, 1 deletion(-)
 mode change 100644 => 100755 addons/crm/crm_meeting_view.xml

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
old mode 100644
new mode 100755
index 59bedbb3b6a..a469a722e11
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -149,7 +149,6 @@
                                         <field name="cutype" select="1" />
                                         <field name="role" select="1" />
                                         <separator colspan="4" string="" />
-                                        <field name="state" />
                                         <group col="6" colspan="4">
                                             <field name="state" select="2" />
                                             <button name="do_tentative" states="needs-action,declined,accepted"

From 38470a93d2e1441f80272a2f303583489beb4fab Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 19 Mar 2010 11:29:41 +0530
Subject: [PATCH 068/248] [IMP]: base_calendar: Fixed problem in accepting
 invitation, NoneType ref field value

bzr revid: atp@tinyerp.co.in-20100319055941-cvupsmhmbcq2iqd3
---
 addons/base_calendar/base_calendar.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 0ef73c19794..4aa274a0a68 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -294,14 +294,15 @@ class invite_attendee_wizard(osv.osv_memory):
                         mail_to.append(contact.email)
 
             att = att_obj.browse(cr, uid, context_id)
+           
             for att_val in vals:
                 if model == 'calendar.attendee':
-                    att_val.update({
-                        'parent_ids': [(4, att.id)], 
-                        'ref': att.ref._name + ',' + str(att.ref.id)
-                    })
+                    if ref:
+                        att_val.update({
+                            'parent_ids': [(4, att.id)], 
+                            'ref': att.ref._name + ',' +str(att.ref.id)
+                            })
                 attendees.append(att_obj.create(cr, uid, att_val))
-
             if model_field:
                 for attendee in attendees:
                     obj.write(cr, uid, res_obj.id, {model_field: [(4, attendee)]})
@@ -534,7 +535,6 @@ request was delegated to"),
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
         for att in self.browse(cr, uid, ids, context=context):
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
@@ -598,15 +598,18 @@ request was delegated to"),
         """
         if not context:
             context = {}
+
         for vals in self.browse(cr, uid, ids, context=context):
             user = vals.user_id
             if user:
+
                 mod_obj = self.pool.get(vals.ref._name)
                 if vals.ref:
                     if vals.ref.user_id.id != user.id:
                         defaults = {'user_id':  user.id}
                         new_event = mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
             self.write(cr, uid, vals.id, {'state': 'accepted'}, context)
+
         return True
 
     def do_decline(self, cr, uid, ids, context=None, *args):

From 0067a88c5c699a8c5012c90ed16b875dc61bdc17 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Fri, 19 Mar 2010 14:11:30 +0530
Subject: [PATCH 069/248] [IMP] document :- support indexation of docx to TXT
 and PPTX to TXT.

bzr revid: ysa@tinyerp.co.in-20100319084130-uoh0twqfq12230ff
---
 addons/document/document.py         |  2 +-
 addons/document/document_storage.py |  2 ++
 addons/document/std_index.py        | 38 ++++++++++++++++++++++++-----
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index f3ffd2f6f6c..86f02e85269 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -77,7 +77,7 @@ class document_file(osv.osv):
         # the directory id now is mandatory. It can still be computed automatically.
         'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True),
         'file_size': fields.integer('File Size', required=True),
-        'file_type': fields.char('Content Type', size=64),
+        'file_type': fields.char('Content Type', size=128),
         # If ir.attachment contained any data before document is installed, preserve
         # the data, don't drop the column!
         'db_datas': fields.binary('Data', oldname='datas'),
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index 0fd85e0be6d..bea11d6d12e 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -266,6 +266,8 @@ class document_storage(osv.osv):
         try:
             icont = ''
             mime = ira.file_type
+            if not mime:
+                mime = ""
             try:
                 mime, icont = cntIndex.doIndex(data, ira.datas_fname,
                 ira.file_type or None, fname)
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index 26e5d542f01..efd36d9607c 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -50,18 +50,23 @@ class TxtIndex(indexer):
         
 cntIndex.register(TxtIndex())
 
-class PptIndex(indexer):
+class PptxIndex(indexer):
     def _getMimeTypes(self):
-        return [ 'application/ms-word']
+        return [ 'application/vnd.openxmlformats-officedocument.presentationml.presentation']
     
     def _getExtensions(self):
-        return ['.ppt']
+        return ['.pptx']
 
     def _doIndexFile(self,fname):
-        fp = Popen(['ppthtml', fname], shell=False, stdout=PIPE).stdout
-        return _to_unicode( fp.read())
+        # f you want to Download docx2txt package then used  http://sourceforge.net/projects/pptx2txt/" link.
+        # To install this tool, just copy pptx2txt.pl to appropriate place (e.g. /usr/bin directory)
+        fp = Popen(['pptx2txt.pl', fname], shell=False, stdout=PIPE).stdout
+        fp.read()
+        file_obj = open(str(fname + ".txt"), "r")
+        data = file_obj.read()
+        return _to_unicode(data)
 
-cntIndex.register(PptIndex())
+cntIndex.register(PptxIndex())
 
 class DocIndex(indexer):
     def _getMimeTypes(self):
@@ -76,6 +81,27 @@ class DocIndex(indexer):
 
 cntIndex.register(DocIndex())
 
+class DocxIndex(indexer):
+    def _getMimeTypes(self):
+        return [ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document']
+    
+    def _getExtensions(self):
+        return ['.docx']
+
+    def _doIndexFile(self,fname):
+        # If you want to Download docx2txt package then used  "http://sourceforge.net/projects/docx2txt/" link.   
+        # In case, you don't want to use Makefile for installation, you can follow these steps for manual installation.
+        # Copy docx2txt.pl, docx2txt.sh and docx2txt.config to appropriate place (e.g. /usr/bin directory) . used following command.
+        # --> cp docx2txt.pl docx2txt.sh docx2txt.config /usr/bin/
+
+        fp = Popen(['docx2txt.pl', fname], shell=False, stdout=PIPE).stdout
+        fp.read()
+        file_obj = open(str(fname + ".txt"), "r")
+        data = file_obj.read()
+        return _to_unicode(data)
+
+cntIndex.register(DocxIndex())
+
 class PdfIndex(indexer):
     def _getMimeTypes(self):
         return [ 'application/pdf']

From 345eb6c815721856fce28b4defe3def30c373d0b Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Fri, 19 Mar 2010 14:16:37 +0530
Subject: [PATCH 070/248] [IMP] document :- change comment

bzr revid: ysa@tinyerp.co.in-20100319084637-414kuvw8m3dsj697
---
 addons/document/std_index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index efd36d9607c..acf21967682 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -58,7 +58,7 @@ class PptxIndex(indexer):
         return ['.pptx']
 
     def _doIndexFile(self,fname):
-        # f you want to Download docx2txt package then used  http://sourceforge.net/projects/pptx2txt/" link.
+        # Download pptx2txt package then used  http://sourceforge.net/projects/pptx2txt/" link.
         # To install this tool, just copy pptx2txt.pl to appropriate place (e.g. /usr/bin directory)
         fp = Popen(['pptx2txt.pl', fname], shell=False, stdout=PIPE).stdout
         fp.read()

From 741cf6eb5de63e6ad40fa6608fab0e4aac923dcc Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 14:26:49 +0530
Subject: [PATCH 071/248] [IMP]: crm: Implemented top posting in reply mail
 wizard

bzr revid: rpa@tinyerp.com-20100319085649-u9yafa8203fo5l5r
---
 addons/crm/wizard/crm_send_new_email.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/crm/wizard/crm_send_new_email.py b/addons/crm/wizard/crm_send_new_email.py
index 3687d23a5a3..f18f2144d2c 100644
--- a/addons/crm/wizard/crm_send_new_email.py
+++ b/addons/crm/wizard/crm_send_new_email.py
@@ -20,16 +20,10 @@
 #
 ##############################################################################
 
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-import tools
-import base64
-from tools.translate import _
 from osv import osv, fields
+from tools.translate import _
+import base64
+import tools
 
 class crm_send_new_email(osv.osv_memory):
     """ Sends new email for the case"""
@@ -183,7 +177,14 @@ class crm_send_new_email(osv.osv_memory):
             if 'to' in fields:
                 res.update({'to': hist.email})
             if 'text' in fields:
-                res.update({'text': '>' + hist.description.replace('\n', '\n> ')})
+                header = '-------- Original Message --------'
+                sender = 'From: ' + case.user_id.address_id.email
+                to = 'To: ' + hist.email
+                sentdate = 'Sent: ' + hist.date
+                desc = '\n' + hist.description
+                original = [header, sender, to, sentdate, desc]
+                original = '\n'.join(original)
+                res.update({'text': '\n\n' + original})
             if 'subject' in fields:
                 res.update({'subject': case.name or ''})
         return res

From f31e44f5bc610fe6d53e30d28632191f0603e802 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 14:42:04 +0530
Subject: [PATCH 072/248] [IMP]: crm: Put text_tag in communication history
 description

bzr revid: rpa@tinyerp.com-20100319091204-ztk121vlxg2p02ne
---
 addons/crm/crm_claims_view.xml              | 3 ++-
 addons/crm/crm_fund_view.xml                | 3 ++-
 addons/crm/crm_helpdesk_view.xml            | 3 ++-
 addons/crm/crm_opportunity_view.xml         | 3 ++-
 addons/hr_recruitment/hr_hr_view.xml        | 3 ++-
 addons/project_issue/project_issue_view.xml | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 181769c1bc1..a6080a18d7a 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -156,7 +156,8 @@
                                     icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
+                            <field name="description" colspan="4"
+                            	nolabel="1" widget="text_tag" readonly="1" />
                             <button colspan="4"
                             	string="Reply to Last Email"
                             	name="%(crm.action_crm_reply_mail)d"
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index e08f5f09413..0b8db88220b 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -154,7 +154,8 @@
 								    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
+                            <field name="description" colspan="4"
+                            	nolabel="1" widget="text_tag" readonly="1" />
                             <button colspan="4"
                             	string="Reply to Last Email"
                             	name="%(crm.action_crm_reply_mail)d"
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 87d0f6df757..2702f179395 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -50,7 +50,8 @@
                         </group>
 
                         <separator colspan="4" string="Details"/>
-                        <field name="description" colspan="4" nolabel="1"/>
+                        <field name="description" colspan="4"
+                            	nolabel="1" widget="text_tag" readonly="1" />
                         <separator colspan="4"/>
                         <group col="8" colspan="4">
                             <field name="state" select="1"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index dfe02ff1eea..76399accba8 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -146,7 +146,8 @@
                                     icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
+                            <field name="description" colspan="4"
+                            	nolabel="1" widget="text_tag" readonly="1" />
                             <button colspan="4"
                             	string="Reply to Last Email"
                             	name="%(crm.action_crm_reply_mail)d"
diff --git a/addons/hr_recruitment/hr_hr_view.xml b/addons/hr_recruitment/hr_hr_view.xml
index 8e6cb840fb0..db4876dc547 100644
--- a/addons/hr_recruitment/hr_hr_view.xml
+++ b/addons/hr_recruitment/hr_hr_view.xml
@@ -155,7 +155,8 @@
                                    icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
-                            <field name="description" colspan="4" nolabel="1"/>
+                            <field name="description" colspan="4"
+                            	nolabel="1" widget="text_tag" readonly="1" />
                             <button colspan="4"
                             	string="Reply to Last Email"
                             	name="%(crm.action_crm_reply_mail)d"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 41a99f29afe..78ec171aee2 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -108,7 +108,8 @@
                                             icon="gtk-add" type="action"/>
                                     </group>
                                     <newline/>
-                                    <field name="description" colspan="4" nolabel="1"/>
+                                    <field name="description" colspan="4" 
+                                    		nolabel="1" widget="text_tag" readonly="1" />
                                     <button colspan="4"
                                     	string="Reply to Last Email"
                                     	name="%(crm.action_crm_reply_mail)d"

From 15eb9aa27dc19f0bbafc045b98b1a0bc20b1d6be Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 19 Mar 2010 15:07:06 +0530
Subject: [PATCH 073/248] [IMP]: crm: Improvement in lead to partner for
 function_name field

bzr revid: ksa@tinyerp.co.in-20100319093706-p7etkjrhkox0fgi1
---
 addons/crm/wizard/crm_lead_to_partner.py |  3 +-
 addons/crm/wizard/crm_send_new_email.py  | 44 ++++++++++++------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 344fec0df9c..aa47a3a808c 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -146,6 +146,7 @@ class crm_lead2partner(osv.osv_memory):
                         'user_id': lead.user_id.id,
                         'comment': lead.description,
                     })
+                    function_id = self.pool.get('res.partner.function').search(cr,uid,[('name','=',lead.function_name)])
                     contact_id = contact_obj.create(cr, uid, {
                         'partner_id': partner_id,
                         'name': lead.name,
@@ -154,7 +155,7 @@ class crm_lead2partner(osv.osv_memory):
                         'email': lead.email_from,
                         'fax': lead.fax,
                         'title': lead.title,
-                        'function': lead.function and lead.function.id or False,
+                        'function': function_id and function_id[0] or False,
                         'street': lead.street,
                         'street2': lead.street2,
                         'zip': lead.zip,
diff --git a/addons/crm/wizard/crm_send_new_email.py b/addons/crm/wizard/crm_send_new_email.py
index f18f2144d2c..599d9022ef7 100644
--- a/addons/crm/wizard/crm_send_new_email.py
+++ b/addons/crm/wizard/crm_send_new_email.py
@@ -31,14 +31,14 @@ class crm_send_new_email(osv.osv_memory):
     _description = "Case Send new email"
 
     _columns = {
-                'to' : fields.char('To', size=64, required=True), 
-                'cc' : fields.char('CC', size=128), 
-                'subject' : fields.char('Subject', size=128, required=True), 
-                'text' : fields.text('Message', required=True), 
-                'state': fields.selection([('done', 'Done'), ('pending', 'Pending'), ('unchanged', 'Unchanged')], string='State', required=True), 
-                'doc1': fields.binary("Attachment1"), 
-                'doc2': fields.binary("Attachment2"), 
-                'doc3': fields.binary("Attachment3"), 
+                'to' : fields.char('To', size=64, required=True),
+                'cc' : fields.char('CC', size=128),
+                'subject': fields.char('Subject', size=128, required=True),
+                'text': fields.text('Message', required=True),
+                'state': fields.selection([('done', 'Done'), ('pending', 'Pending'), ('unchanged', 'Unchanged')], string='State', required=True),
+                'doc1': fields.binary("Attachment1"),
+                'doc2': fields.binary("Attachment2"),
+                'doc3': fields.binary("Attachment3"),
                 }
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -62,7 +62,7 @@ class crm_send_new_email(osv.osv_memory):
         """
         if not context:
             context = {}
-        
+
         if not context.get('model'):
             raise osv.except_osv(_('Error'), _('Can not send mail!'))
 
@@ -73,7 +73,7 @@ class crm_send_new_email(osv.osv_memory):
         for data in self.read(cr, uid, ids, context=context):
             attach = filter(lambda x: x, [data['doc1'], data['doc2'], data['doc3']])
             attach = map(lambda x: x and ('Attachment'+str(attach.index(x)+1), base64.decodestring(x)), attach)
-            
+
             if context.get('mail', 'new') == 'new':
                 case = case_pool.browse(cr, uid, res_id)
             else:
@@ -92,13 +92,13 @@ class crm_send_new_email(osv.osv_memory):
             case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['to'], details=body)
 
             flag = tools.email_send(
-                case.user_id.address_id.email, 
-                emails, 
-                data['subject'], 
-                case_pool.format_body(body), 
-                attach=attach, 
-                reply_to=case.section_id.reply_to, 
-                openobject_id=str(case.id), 
+                case.user_id.address_id.email,
+                emails,
+                data['subject'],
+                case_pool.format_body(body),
+                attach=attach,
+                reply_to=case.section_id.reply_to,
+                openobject_id=str(case.id),
                 subtype="html"
             )
             if flag:
@@ -115,7 +115,7 @@ class crm_send_new_email(osv.osv_memory):
 #            else:
 #                raise osv.except_osv(_('Warning!'), _("Email not sent !"))
         return {}
-    
+
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
@@ -129,10 +129,10 @@ class crm_send_new_email(osv.osv_memory):
         """
         if not context:
             context = {}
-        
+
         if not context.get('model'):
             raise osv.except_osv(_('Error'), _('Can not send mail!'))
-        
+
         res = super(crm_send_new_email, self).default_get(cr, uid, fields, context=context)
 
         if context.get('mail') == 'reply':
@@ -155,7 +155,7 @@ class crm_send_new_email(osv.osv_memory):
             if 'state' in fields:
                 res.update({'state': 'done'})
         return res
-    
+
     def get_reply_defaults(self, cr, uid, fields, context=None):
         """
         This function gets default values for reply mail
@@ -201,7 +201,7 @@ class crm_send_new_email(osv.osv_memory):
         """
         if not context:
             context = {}
-        
+
         if not context.get('model'):
             raise osv.except_osv(_('Error'), _('Can not send mail!'))
         model = context.get('model')

From b69f690fc35885bd297f1aafdd7f85f6be2ab29b Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 19 Mar 2010 15:36:28 +0530
Subject: [PATCH 074/248] [IMP]: crm: code optimization and add docstring

bzr revid: atp@tinyerp.co.in-20100319100628-o2zxj3xr6k36bubq
---
 addons/crm/crm_claim.py        |  40 +++++-----
 addons/crm/crm_claims_data.xml | 137 ++++++++++++++++++---------------
 addons/crm/crm_claims_demo.xml |   9 +++
 addons/crm/crm_claims_menu.xml |  81 ++++++++++---------
 addons/crm/crm_claims_view.xml | 113 +++++++++++++++++----------
 5 files changed, 218 insertions(+), 162 deletions(-)
 mode change 100644 => 100755 addons/crm/crm_claim.py
 mode change 100644 => 100755 addons/crm/crm_claims_data.xml
 mode change 100644 => 100755 addons/crm/crm_claims_demo.xml
 mode change 100644 => 100755 addons/crm/crm_claims_menu.xml
 mode change 100644 => 100755 addons/crm/crm_claims_view.xml

diff --git a/addons/crm/crm_claim.py b/addons/crm/crm_claim.py
old mode 100644
new mode 100755
index 2a560da15b9..cbd34af2e52
--- a/addons/crm/crm_claim.py
+++ b/addons/crm/crm_claim.py
@@ -23,37 +23,39 @@ from osv import fields, osv
 import crm
 
 class crm_claim(osv.osv):
+    """
+    Crm claim
+    """
     _name = "crm.claim"
     _description = "Claim Cases"
     _order = "id desc"
     _inherit = 'crm.case'
     _columns = {
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'date': fields.datetime('Date'),
-        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
-                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
-        'planned_revenue': fields.float('Planned Revenue'),
-        'planned_cost': fields.float('Planned Costs'),
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'date': fields.datetime('Date'), 
+        'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
+        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 
+        'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \
+                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."), 
+        'planned_revenue': fields.float('Planned Revenue'), 
+        'planned_cost': fields.float('Planned Costs'), 
         'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
                                                                        "the partner mentality in relation to our services.The scale has" \
-                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
-        'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Claim Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"),
+                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."), 
+        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"), 
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'type_id': fields.many2one('crm.case.resource.type', 'Claim Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"), 
         
-        'partner_name': fields.char("Employee's Name", size=64),
-        'partner_mobile': fields.char('Mobile', size=32),
-        'partner_phone': fields.char('Phone', size=32),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"),
-        'probability': fields.float('Probability (%)'),     
+        'partner_name': fields.char("Employee's Name", size=64), 
+        'partner_mobile': fields.char('Mobile', size=32), 
+        'partner_phone': fields.char('Phone', size=32), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"), 
+        'probability': fields.float('Probability (%)'), 
     }
     
     _defaults = {
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
     }
     
 crm_claim()
 
-
diff --git a/addons/crm/crm_claims_data.xml b/addons/crm/crm_claims_data.xml
old mode 100644
new mode 100755
index f9388e06daf..fc1b37e14be
--- a/addons/crm/crm_claims_data.xml
+++ b/addons/crm/crm_claims_data.xml
@@ -1,67 +1,78 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
+	<data noupdate="1">
 
-	<!--
-	Claims Categories
-	-->
-	<record model="crm.case.categ" id="categ_claim1">
-		<field name="name">Factual Claims</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-	</record>
-	<record model="crm.case.categ" id="categ_claim2">
-		<field name="name">Value Claims</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-	</record>
-	<record model="crm.case.categ" id="categ_claim3">
-		<field name="name">Policy Claims</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-	</record>
-
-	<!--
-	Case Category2
-	-->
-	<record model="crm.case.resource.type" id="type_claim1">
-		<field name="name">Corrective</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-	</record>	
-	<record model="crm.case.resource.type" id="type_claim2">
-		<field name="name">Preventive</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-	</record>
-
-	<!--
-	Case Stage
-	-->
-	<record model="crm.case.stage" id="stage_claim1">
-		<field name="name">Accepted as Claim</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-	</record>	
-	<record model="crm.case.stage" id="stage_claim2">
-		<field name="name">Fixed</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-	</record>	
-	<record model="crm.case.stage" id="stage_claim3">
-		<field name="name">Won't fix</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-	</record>	
-	<record model="crm.case.stage" id="stage_claim4">
-		<field name="name">Invalid</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-	</record>	
-	<record model="crm.case.stage" id="stage_claim5">
-		<field name="name">Awaiting Response</field>
-		<field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
-	</record>
-</data>
+		<!--
+		Claims Categories
+		-->
+		
+		<record model="crm.case.categ" id="categ_claim1">
+			<field name="name">Factual Claims</field>
+			<field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+		</record>
+		
+		<record model="crm.case.categ" id="categ_claim2">
+			<field name="name">Value Claims</field>
+			<field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+		</record>
+		
+		<record model="crm.case.categ" id="categ_claim3">
+			<field name="name">Policy Claims</field>
+			<field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+		</record>
+	
+		<!--
+		Case Category2
+		-->
+		
+		<record model="crm.case.resource.type" id="type_claim1">
+			<field name="name">Corrective</field>
+			<field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+		</record>	
+		
+		<record model="crm.case.resource.type" id="type_claim2">
+			<field name="name">Preventive</field>
+			<field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+		</record>
+	
+		<!--
+		Case Stage
+		-->
+		
+		<record model="crm.case.stage" id="stage_claim1">
+			<field name="name">Accepted as Claim</field>
+			<field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+		</record>	
+		
+		<record model="crm.case.stage" id="stage_claim2">
+			<field name="name">Fixed</field>
+			<field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+		</record>
+			
+		<record model="crm.case.stage" id="stage_claim3">
+			<field name="name">Won't fix</field>
+			<field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+		</record>	
+		
+		<record model="crm.case.stage" id="stage_claim4">
+			<field name="name">Invalid</field>
+			<field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+		</record>	
+		
+		<record model="crm.case.stage" id="stage_claim5">
+			<field name="name">Awaiting Response</field>
+			<field name="section_id" ref="section_sales_department"/>
+			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
+		</record>
+	
+	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/crm/crm_claims_demo.xml b/addons/crm/crm_claims_demo.xml
old mode 100644
new mode 100755
index 525998c02ff..daa5914e167
--- a/addons/crm/crm_claims_demo.xml
+++ b/addons/crm/crm_claims_demo.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
 	<data noupdate="1">
+	
 	<!-- 
 		((((((((((( Demo Cases ))))))))))) 
 	-->
+	
 		<record id="crm_case_claim01" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_15"/>
 			<field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
@@ -20,6 +22,7 @@
 			<field name="stage_id" ref="crm.stage_claim1"/>
 			<field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
 		</record>
+		
 		<record id="crm_case_claim02" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_6"/>
 			<field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
@@ -36,6 +39,7 @@
 			<field name="stage_id" ref="crm.stage_claim5"/>
 			<field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
 		</record>
+		
 		<record id="crm_case_claim03" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_2"/>
 			<field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
@@ -53,6 +57,7 @@
 			<field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
 			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
 		</record>
+		
 		<record id="crm_case_claim04" model="crm.claim">
 			<field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
 			<field name="type_id" ref="crm.type_claim2"/>
@@ -68,6 +73,7 @@
 			<field name="stage_id" ref="crm.stage_claim5"/>
 			<field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
 		</record>
+		
 		<record id="crm_case_claim05" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_10"/>
 			<field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
@@ -84,6 +90,7 @@
 			<field name="stage_id" ref="crm.stage_claim3"/>
 			<field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
 		</record>
+		
 		<record id="crm_case_claim06" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_1"/>
 			<field eval="1" name="active"/>
@@ -101,6 +108,7 @@
 			<field eval="&quot;(373) 907-1009&quot;" name="partner_phone"/>
 			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
 		</record>
+		
 		<record id="crm_case_claims07" model="crm.claim">
 			<field eval="1" name="active"/>
 			<field name="type_id" ref="crm.type_claim1"/>
@@ -116,5 +124,6 @@
 			<field name="stage_id" ref="crm.stage_claim2"/>
 			<field eval="&quot;(282) 603-7489&quot;" name="partner_phone"/>
 		</record>
+		
 	</data>
 </openerp>
diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml
old mode 100644
new mode 100755
index e50b984f8e3..24afc46de58
--- a/addons/crm/crm_claims_menu.xml
+++ b/addons/crm/crm_claims_menu.xml
@@ -1,44 +1,49 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">
-    <menuitem id="base.menu_aftersale" name="After-Sale Services" parent="base.menu_base_partner" sequence="6"/>
-
-    ######################## CLAIMS (menu) ###########################
-    <record model="ir.actions.act_window" id="crm_case_categ_claim0">
-        <field name="name">Claims</field>
-        <field name="res_model">crm.claim</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar,form,graph</field>
-        <field name="view_id" ref="crm_case_claims_tree_view"/>        
-        <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_claims_tree_view"/>
-        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_claims_calendar_view"/>
-        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_claims_form_view"/>
-        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
-        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-    </record>  
-
-    <menuitem name="Claims" id="menu_crm_case_claims"  parent="base.menu_aftersale" action="crm_case_categ_claim0"/>
+	<data noupdate="1">
 
+	    <menuitem id="base.menu_aftersale" name="After-Sale Services" parent="base.menu_base_partner" sequence="6"/>
+	
+	    <!-- Claims Menu -->
+	   
+	    <record model="ir.actions.act_window" id="crm_case_categ_claim0">
+	        <field name="name">Claims</field>
+	        <field name="res_model">crm.claim</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,calendar,form,graph</field>
+	        <field name="view_id" ref="crm_case_claims_tree_view"/>        
+	        <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
+	    </record>
+	    
+	    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="crm_case_claims_tree_view"/>
+	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
+	    </record>
+	    
+	    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">calendar</field>
+	        <field name="view_id" ref="crm_case_claims_calendar_view"/>
+	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
+	    </record>
+	    
+	    <record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
+	        <field name="sequence" eval="3"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="crm_case_claims_form_view"/>
+	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
+	    </record>
+	    
+	    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
+	        <field name="sequence" eval="4"/>
+	        <field name="view_mode">graph</field>
+	        <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
+	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
+	    </record>  
+	
+	    <menuitem name="Claims" id="menu_crm_case_claims"  parent="base.menu_aftersale" action="crm_case_categ_claim0"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
old mode 100644
new mode 100755
index a6080a18d7a..dc9708d89ba
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -1,45 +1,52 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    # ------------------------------------------------------
-    # Claims
-    # ------------------------------------------------------
+    
+    <!-- Claims categories  -->
+   
     <record id="crm_claim_categ_action" model="ir.actions.act_window">
         <field name="name">Claim Categories</field>
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
-         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-           <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
-    <menuitem action="crm_claim_categ_action" id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ"/>
-    # ------------------------------------------------------
-    # Stages
-    # ------------------------------------------------------
-        <record id="crm_claim_stage_act" model="ir.actions.act_window">
-            <field name="name">Claim Stages</field>
-            <field name="res_model">crm.case.stage</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_stage_tree"/>
-           <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-          <field name="context">{'object_id':'crm.claim'}</field>
-        </record>
-      <menuitem action="crm_claim_stage_act" id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage"/>
+    
+    <menuitem action="crm_claim_categ_action"
+    	id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
 
-    # ------------------------------------------------------
-    # Resource Type
-    # ------------------------------------------------------
-        <record id="crm_claim_resource_act" model="ir.actions.act_window">
-            <field name="name">Claim Resource Type</field>
-            <field name="res_model">crm.case.resource.type</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-           <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-          <field name="context">{'object_id':'crm.claim'}</field>
-        </record>
-      <menuitem action="crm_claim_resource_act" id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_resource_type"/>
+    <!-- Claim Stages -->
+ 
+    <record id="crm_claim_stage_act" model="ir.actions.act_window">
+        <field name="name">Claim Stages</field>
+        <field name="res_model">crm.case.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+        <field name="context">{'object_id':'crm.claim'}</field>
+    </record>
+        
+    <menuitem action="crm_claim_stage_act"
+        	id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
 
-    <!-- Claims    -->
+    <!-- Claim Resource Type -->
+
+    <record id="crm_claim_resource_act" model="ir.actions.act_window">
+        <field name="name">Claim Resource Type</field>
+        <field name="res_model">crm.case.resource.type</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
+        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+        <field name="context">{'object_id':'crm.claim'}</field>
+    </record>
+        
+    <menuitem action="crm_claim_resource_act"
+        	id="menu_crm_claim_stage_act"
+        	parent="crm.menu_crm_case_resource_type" />
+
+        <!-- Claims    -->
+    
     <record model="ir.ui.view" id="crm_case_claims_tree_view">
         <field name="name">CRM - Claims Tree</field>
         <field name="model">crm.claim</field>
@@ -52,15 +59,24 @@
                 <field name="user_id" />
                 <field name="section_id" string="Section" />
                 <field name="date" string="Claim Date"/>
-                 <field name="date_deadline" string="Deadline"/>
-                 <field name="date_closed" string="Closure Date"/>
+                <field name="date_deadline" string="Deadline"/>
+                <field name="date_closed" string="Closure Date"/>
                 <field name="categ_id" string="Type" select="1"/>
                 <field name="state"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
-                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                <button name="case_close" string="Close" states="open,draft,pending" type="object"  icon="gtk-close"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                <button name="case_open" string="Open"
+                	states="draft,pending" type="object"
+                	icon="gtk-go-forward" />
+                <button name="case_pending" string="Pending"
+                	states="draft,open" type="object"
+                	icon="gtk-media-pause" />
+                <button name="case_close" string="Close"
+                	states="open,draft,pending" type="object"
+                	icon="gtk-close" />
+                <button name="case_cancel" string="Cancel"
+                	states="draft,open,pending" type="object"
+                	icon="gtk-cancel" />
+                <button name="case_reset" string="Reset to Draft"
+                	states="done,cancel" type="object" icon="gtk-convert" />
             </tree>
         </field>
     </record>
@@ -77,6 +93,7 @@
                     <field name="date_deadline" string="Deadline"/>
                 </group>
                 <group colspan="4" col="4">
+
                 <notebook>
                 <page string="Claim Info">
                     <separator colspan="4" string="Communication"/>
@@ -176,11 +193,14 @@
                     	type="action" />
                 </page>
                 </notebook>
+
                 </group>
             </form>
         </field>
     </record>
 
+	<!-- Claim Calendar view -->
+
     <record model="ir.ui.view" id="crm_case_claims_calendar_view">
         <field name="name">CRM - Claims Calendar</field>
         <field name="model">crm.claim</field>
@@ -195,6 +215,8 @@
         </field>
     </record>
 
+	<!-- Claim Graph view -->
+
     <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
         <field name="name">CRM -Graph</field>
         <field name="model">crm.claim</field>
@@ -208,7 +230,9 @@
         </field>
     </record>
 
-   <record id="view_crm_case_claims_filter" model="ir.ui.view">
+	<!-- Crm claim Search view -->
+
+    <record id="view_crm_case_claims_filter" model="ir.ui.view">
             <field name="name">CRM - Claims Search</field>
             <field name="model">crm.claim</field>
             <field name="type">search</field>
@@ -240,18 +264,23 @@
 	                   		help="Unassigned Claims" />
                    </field>
                    <field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
-                       <filter icon="terp-crm"
+	                   	<filter icon="terp-crm"
                            domain="[('section_id','=',context.get('section_id',False))]"
                            help="My section"
                            />
                    </field>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="10" col="20">
-                       <filter string="Deadline" icon="terp-crm" domain="[]" context="{'group_by':'date_deadline'}"/>
-                       <filter string="Closure" icon="terp-crm" domain="[]"  context="{'group_by':'date_closed'}"/>
+	                   	<filter string="Deadline" icon="terp-crm"
+                       	domain="[]"
+                       	context="{'group_by':'date_deadline'}" />
+                        <filter string="Closure" icon="terp-crm"
+                       	domain="[]"
+                       	context="{'group_by':'date_closed'}" />
                    </group>
                </search>
            </field>
         </record>
+        
      </data>
 </openerp>

From 32b05f4fc73a8f942c8b987eb186322ea754953f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 16:14:08 +0530
Subject: [PATCH 075/248] [IMP]: caldav: Uncommented import of DAV server file

bzr revid: rpa@tinyerp.com-20100319104408-w1jyvtbi7halpy26
---
 addons/caldav/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/caldav/__init__.py b/addons/caldav/__init__.py
index a7731ca526a..19f11301420 100644
--- a/addons/caldav/__init__.py
+++ b/addons/caldav/__init__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 import caldav
-#import caldav_cache
-#import caldav_fs
-#import caldav_node
-#import webdav_server
+import caldav_cache
+import caldav_fs
+import caldav_node
+import webdav_server
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From f19c017bf7fdd8ae32e5abb7398a24cac4655ad5 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 16:15:25 +0530
Subject: [PATCH 076/248] [IMP]: caldav: Replaced ir.values with act_window for
 wizard, Added proper access rights

bzr revid: rpa@tinyerp.com-20100319104525-vv58ba6nyfuqm72u
---
 addons/caldav/security/ir.model.access.csv       | 13 +++++++++++++
 .../caldav/wizard/calendar_event_export_view.xml | 11 -----------
 .../caldav/wizard/calendar_event_import_view.xml | 16 +++++-----------
 .../wizard/calendar_event_subscribe_view.xml     | 16 +++++-----------
 4 files changed, 23 insertions(+), 33 deletions(-)
 create mode 100644 addons/caldav/security/ir.model.access.csv

diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
new file mode 100644
index 00000000000..74064f43d75
--- /dev/null
+++ b/addons/caldav/security/ir.model.access.csv
@@ -0,0 +1,13 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_basic_calendar_all","basic.calendar","model_basic_calendar","base.group_user",1,1,1,1
+"access_basic_calendar_event_all","basic.calendar.event","model_basic_calendar_event","base.group_user",1,1,1,0
+"access_basic_calendar_attendee_all","basic.calendar.attendee","model_basic_calendar_attendee","base.group_user",1,1,1,0
+"access_calendar_todo_all","basic.calendar.todo","model_basic_calendar_todo","base.group_user",1,1,1,0
+"access_basic_calendar_alarm_all","basic.calendar.alarm","model_basic_calendar_alarm","base.group_user",1,1,1,1
+"access_basic_calendar_lines","basic.calendar.lines","model_basic_calendar_lines","base.group_user",1,1,1,1
+"access_basic_calendar_attributes","basic.calendar.attributes","model_basic_calendar_attributes","base.group_user",1,1,1,1
+"access_basic_calendar_fields","basic.calendar.fields","model_basic_calendar_fields","base.group_user",1,1,1,1
+"access_basic_calendar_timezone","basic.calendar.timezone","model_basic_calendar_timezone","base.group_user",1,1,1,1
+"access_calendar_event_export","calendar.event.export","model_calendar_event_export","base.group_user",1,1,1,1
+"access_calendar_event_import","calendar.event.import","model_calendar_event_import","base.group_user",1,1,1,1
+"access_calendar_event_subscribe","calendar.event.subscribe","model_calendar_event_subscribe","base.group_user",1,1,1,1
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
index 0a049e15083..48b6224c2c7 100644
--- a/addons/caldav/wizard/calendar_event_export_view.xml
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -26,18 +26,7 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_calendar_event_export"/> 
            <field name="target">new</field>
-           <field name="context">{'record_id':active_id}</field>
         </record>
-              
-<!--        <record id="action_calendar_event_export_values" model="ir.values">-->
-<!--            <field name="model_id" ref="caldav.model_basic_calendar" />-->
-<!--            <field name="object" eval="1" />-->
-<!--            <field name="name">Export .ics File</field>-->
-<!--            <field name="key2">client_action_multi</field>-->
-<!--            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_export'))"/>-->
-<!--            <field name="key">action</field> -->
-<!--            <field name="model">basic.calendar</field>-->
-<!--        </record>-->
 
 
     	<act_window id="action_calendar_event_export_values"
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 1fbd89b2499..575da70bd41 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -44,18 +44,12 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_calendar_event_import"/> 
            <field name="target">new</field>
-           <field name="context">{'record_id':active_id}</field>
         </record>
               
-        <record id="action_calendar_event_import_values" model="ir.values">
-            <field name="model_id" ref="caldav.model_basic_calendar" />
-            <field name="object" eval="1" />
-            <field name="name">Import .ics File</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_import'))"/>
-            <field name="key">action</field> 
-            <field name="model">basic.calendar</field>
-        </record>
-        
+        <act_window id="action_calendar_event_import_values"
+    		key2="client_action_multi" name="Import .ics File"
+    		res_model="calendar.event.import" src_model="basic.calendar"
+    		view_mode="form" target="new" view_type="form" />
+   		
     </data>
 </openerp>
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index 95c06c20f6e..c42834bfebc 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -44,18 +44,12 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_calendar_event_subscribe"/> 
            <field name="target">new</field>
-           <field name="context">{'record_id':active_id}</field>
-        </record>
-              
-        <record id="action_calendar_event_subscribe_values" model="ir.values">
-            <field name="model_id" ref="caldav.model_basic_calendar" />
-            <field name="object" eval="1" />
-            <field name="name">Subscribe</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_subscribe'))"/>
-            <field name="key">action</field> 
-            <field name="model">basic.calendar</field>
         </record>
         
+        <act_window id="action_calendar_event_subscribe_values"
+    		key2="client_action_multi" name="Subscribe"
+    		res_model="calendar.event.subscribe" src_model="basic.calendar"
+    		view_mode="form" target="new" view_type="form" />
+        
     </data>
 </openerp>
\ No newline at end of file

From 7b428425557f1627f88ee55dce1992cabbccf741 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 16:18:06 +0530
Subject: [PATCH 077/248] [IMP]: caldav: Remaining changes for private method

bzr revid: rpa@tinyerp.com-20100319104806-oahojw954wygoanq
---
 addons/caldav/wizard/calendar_event_import.py          | 3 ++-
 addons/caldav/wizard/calendar_event_import_view.xml    | 2 +-
 addons/caldav/wizard/calendar_event_subscribe.py       | 4 ++--
 addons/caldav/wizard/calendar_event_subscribe_view.xml | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py
index ba72e1c8c6d..1a8a0a771f0 100644
--- a/addons/caldav/wizard/calendar_event_import.py
+++ b/addons/caldav/wizard/calendar_event_import.py
@@ -33,7 +33,8 @@ class calendar_event_import(osv.osv_memory):
     Import Calendar Event.
     """
     cnt = 0
-    def _process_imp_ics(self, cr, uid, ids, context=None):
+
+    def process_imp_ics(self, cr, uid, ids, context=None):
         """
         Process Import ics File.
         @param cr: the current row, from the database cursor,
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 575da70bd41..6a697de5fee 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -14,7 +14,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                    	<button  icon="gtk-ok"  name="_process_imp_ics"  string="_Import" type="object"/>
+                    	<button  icon="gtk-ok"  name="process_imp_ics"  string="_Import" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/caldav/wizard/calendar_event_subscribe.py b/addons/caldav/wizard/calendar_event_subscribe.py
index aa539938877..3893e2a1c09 100644
--- a/addons/caldav/wizard/calendar_event_subscribe.py
+++ b/addons/caldav/wizard/calendar_event_subscribe.py
@@ -34,7 +34,8 @@ class calendar_event_subscribe(osv.osv_memory):
     Subscribe  Calendar Event.
     """
     cnt = 0
-    def _process_imp_ics(self, cr, uid, ids, context=None):
+
+    def process_imp_ics(self, cr, uid, ids, context=None):
         """
         process ics file.
         @param cr: the current row, from the database cursor,
@@ -85,5 +86,4 @@ class calendar_event_subscribe(osv.osv_memory):
     
 calendar_event_subscribe()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index c42834bfebc..43224013268 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -14,7 +14,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                    	<button  icon="gtk-ok"  name="_process_imp_ics"  string="_Subscribe" type="object"/>
+                    	<button  icon="gtk-ok"  name="process_imp_ics"  string="_Subscribe" type="object"/>
                    </group>
                </form>
             </field>

From 111f00867e902065c11df54c4d3aad17ebd73a97 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 16:20:01 +0530
Subject: [PATCH 078/248] [IMP]: crm: Put old wizard of lead to opportunity
 because of choice problem in osv_memory wizard

bzr revid: rpa@tinyerp.com-20100319105001-i57t1dyur6y18k6c
---
 addons/crm/crm_lead_view.xml                  |   2 +-
 addons/crm/wizard/crm_lead_to_opportunity.py  | 277 ++++++++++++++++++
 .../wizard/crm_lead_to_opportunity_view.xml   |  29 +-
 3 files changed, 306 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 640f6d32d56..7f4d5030de4 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -46,7 +46,7 @@
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
-                            name="%(action_crm_lead2opportunity)d" 
+                            name="%(wizard_crm_lead_opportunity_set)d" 
                             string="Convert"
                             help="Convert into Opportunity"
                             icon="gtk-index" 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 6191f02d2fa..152df5d732f 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -19,8 +19,285 @@
 #
 ##############################################################################
 
+from mx.DateTime import now
 from osv import osv, fields
 from tools.translate import _
+import ir
+import netsvc
+import pooler
+import wizard
+
+#===============================================================================
+# Put original wizard because of type=choice in init
+# Remove it after solution for type=choice
+#===============================================================================
+
+class partner_create(wizard.interface):
+
+    case_form = """<?xml version="1.0"?>
+    <form string="Create a Partner">
+        <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        <label string="You may have to verify that this partner does not exist already." colspan="4"/>
+        <!--field name="close"/-->
+    </form>"""
+
+    case_fields = {
+        'close': {'type':'boolean', 'string':'Close Lead'}
+    }
+
+    partner_form = """<?xml version="1.0"?>
+    <form string="Create a Partner">
+        <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        <label string="You may have to verify that this partner does not exist already." colspan="4"/>
+        <newline />
+        <field name="action"/>
+        <group attrs="{'invisible':[('action','!=','exist')]}">
+            <field name="partner_id"/>
+        </group>
+    </form>"""
+
+    partner_fields = {
+        'action': {'type':'selection',
+                'selection':[('exist','Link to an existing partner'),('create','Create a new partner')],
+                'string':'Action', 'required':True, 'default': lambda *a:'exist'},
+        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
+    }
+    
+    def _selectPartner(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        case_obj = pool.get('crm.lead')
+        partner_obj = pool.get('res.partner')
+        contact_obj = pool.get('res.partner.address')
+        for case in case_obj.browse(cr, uid, data['ids']):
+            if case.partner_id:
+                raise wizard.except_wizard(_('Warning !'),
+                    _('A partner is already defined on this lead.'))
+           
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])            
+            if not partner_ids and case.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        vals = {'partner_id': partner_id}
+        if not partner_id:
+            vals['action'] = 'create'            
+        return vals
+
+    def _create_partner(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)        
+        case_obj = pool.get('crm.lead')
+        partner_obj = pool.get('res.partner')
+        contact_obj = pool.get('res.partner.address')
+        partner_ids = []
+        partner_id = False
+        contact_id = False
+        for case in case_obj.browse(cr, uid, data['ids']):
+            if data['form']['action'] == 'create':
+                partner_id = partner_obj.create(cr, uid, {
+                    'name': case.partner_name or case.name,
+                    'user_id': case.user_id.id,
+                    'comment': case.description,
+                })
+                contact_id = contact_obj.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': case.name,
+                    'phone': case.phone,
+                    'mobile': case.mobile,
+                    'email': case.email_from,
+                    'fax': case.fax,
+                    'title': case.title,
+                    'function': case.function and case.function.id or False,
+                    'street': case.street,
+                    'street2': case.street2,
+                    'zip': case.zip,
+                    'city': case.city,
+                    'country_id': case.country_id and case.country_id.id or False,
+                    'state_id': case.state_id and case.state_id.id or False,
+                })
+
+            else:
+                if data['form']['partner_id']:
+                    partner = partner_obj.browse(cr,uid,data['form']['partner_id'])
+                    partner_id = partner.id
+                    contact_id = partner.address and partner.address[0].id
+
+            partner_ids.append(partner_id)
+            vals = {}
+            if partner_id:
+                vals.update({'partner_id': partner_id})
+            if contact_id:
+                vals.update({'partner_address_id': contact_id})
+            case_obj.write(cr, uid, [case.id], vals)   
+        return partner_ids
+
+    def _make_partner(self, cr, uid, data, context): 
+        pool = pooler.get_pool(cr.dbname)             
+        partner_ids = self._create_partner(cr, uid, data, context)
+        mod_obj = pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        value = {
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': partner_ids and int(partner_ids[0]) or False,
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
+        return value
+
+    states = {
+        'init': {
+            'actions': [_selectPartner],
+            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
+                'state' : [('end', 'Cancel', 'gtk-cancel'),('create_partner', 'Create Partner', 'gtk-go-forward')]}
+        },
+        'create_partner': {
+            'actions': [],
+            'result': {'type': 'form', 'arch': partner_form, 'fields': partner_fields,
+                'state' : [('end', 'Cancel', 'gtk-cancel'),('create', 'Continue', 'gtk-go-forward')]}
+        },
+        'create': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _make_partner, 'state': 'end'}
+        }
+    }
+
+partner_create('crm.lead.partner_create')
+
+
+class lead2opportunity(partner_create):
+
+    case_form = """<?xml version="1.0"?>
+    <form string="Convert To Opportunity">
+        <field name="name"/>
+        <field name="partner_id"/>
+        <newline/>
+        <field name="planned_revenue"/>
+        <field name="probability"/>
+    </form>"""
+
+    case_fields = {
+        'name': {'type':'char', 'size':64, 'string':'Opportunity Summary', 'required':True},
+        'planned_revenue': {'type':'float', 'digits':(16,2), 'string': 'Expected Revenue'},
+        'probability': {'type':'float', 'digits':(16,2), 'string': 'Success Probability'},
+        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
+    }
+    
+    def _check_state(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        case_obj = pool.get('crm.lead')
+        for case in case_obj.browse(cr, uid, data['ids']):
+            if case.state != 'open':
+                raise wizard.except_wizard(_('Warning !'),
+                    _('Lead should be in \'Open\' state before converting to Opportunity.'))
+        return {}
+
+    def _selectopportunity(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        case_obj = pool.get('crm.lead')
+        case = case_obj.browse(cr, uid, data['id'])
+        return {'name': case.name, 'partner_id':case.partner_id and case.partner_id.id or False}
+
+    def _selectChoice(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        case_obj = pool.get('crm.lead')
+        for case in case_obj.browse(cr, uid, data['ids']):
+            if not case.partner_id:
+                return 'create_partner'
+        return 'opportunity'
+
+    def _makeOrder(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        data_obj = pool.get('ir.model.data')
+        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+        res = data_obj.read(cr, uid, result, ['res_id'])
+        
+
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        lead_case_obj = pool.get('crm.lead')
+        opportunity_case_obj = pool.get('crm.opportunity')        
+        for lead in lead_case_obj.browse(cr, uid, data['ids']):
+            new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                'name': data['form']['name'],
+                'planned_revenue': data['form']['planned_revenue'],
+                'probability': data['form']['probability'],
+                'partner_id': data['form']['partner_id'],
+                'section_id':lead.section_id.id,
+                'description':lead.description,
+                'date_deadline': lead.date_deadline,
+                'partner_address_id':lead.partner_address_id.id, 
+                'priority': lead.priority,
+                'phone': lead.phone,                
+                'email_from': lead.email_from
+            })       
+            
+            new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
+            
+            vals = {
+                'partner_id': data['form']['partner_id'],                
+                }
+            if not lead.opportunity_id:
+                vals.update({'opportunity_id' : new_opportunity.id})
+
+            lead_case_obj.write(cr, uid, [lead.id], vals)
+            lead_case_obj.case_close(cr, uid, [lead.id])
+            opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
+        
+        value = {            
+            'name': _('Opportunity'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'crm.opportunity',
+            'res_id': int(new_opportunity_id),
+            'view_id': False,
+            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
+        return value
+
+    def _makePartner(self, cr, uid, data, context):
+        partner_ids = self._create_partner(cr, uid, data, context)
+        return {}
+
+    states = {
+        'init': {
+            'actions': [_check_state],
+            'result': {'type':'choice','next_state':_selectChoice}
+        },
+        'create_partner': {
+            'actions': [partner_create._selectPartner],
+            'result': {'type': 'form', 'arch': partner_create.partner_form, 'fields': partner_create.partner_fields,
+                'state' : [('end', 'Cancel', 'gtk-cancel'),('opportunity', 'Skip', 'gtk-goto-last'), ('create', 'Continue', 'gtk-go-forward')]}
+        },
+        'create': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _makePartner, 'state':'opportunity' }
+        },
+        'opportunity': {
+            'actions': [_selectopportunity],
+            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
+                'state' : [('end', 'Cancel', 'gtk-cancel'),('confirm', 'Create Opportunity', 'gtk-go-forward')]}
+        },
+        'confirm': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _makeOrder, 'state': 'end'}
+        }
+    }
+
+lead2opportunity('crm.lead.opportunity_set')
 
 class crm_lead2opportunity(osv.osv_memory):
     _name = 'crm.lead2opportunity'
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index ac559c070a9..f76b54a91b9 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,6 +1,33 @@
 <openerp>
   	<data>
-		
+
+	<wizard
+            id="wizard_crm_lead_opportunity_set"
+            keyword="client_action_multi"
+            model="crm.lead"
+            name="crm.lead.opportunity_set"
+            multi="True" menu="False"
+            string="Convert To Opportunity"/>
+            
+		<!-- Lead to Opportunity confirmation view -->
+
+        <record model="ir.ui.view" id="lead_to_opportunity_pre_view">
+            <field name="name">crm.opportunity2meeting.form</field>
+            <field name="model">crm.opportunity2meeting</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Meeting">
+                	<label string="Are you sure to schedule a meeting for this Opportunity?" colspan="4"/>
+                	<newline/>
+                	<separator colspan="4" string=""/>
+                	<button name="action_cancel" string="_Cancel"
+                		icon="gtk-cancel" special="cancel" />
+                	<button name="action_makeMeeting" type="object"
+                		string="_Schedule" icon="gtk-go-forward" />
+                </form>
+            </field>
+        </record>
+        
 		<!-- Lead to Opportunity view -->
 
   		<record id="view_crm_lead2opportunity_create" model="ir.ui.view">

From cebfc5b7e8b446f2f8b91079ad62d3aaca134a70 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 16:21:46 +0530
Subject: [PATCH 079/248] [IMP]: crm: Taken new changes of mailgateway script
 from trunk addons

bzr revid: rpa@tinyerp.com-20100319105146-jzr60u8iy0nscvsp
---
 .../crm/scripts/openerp_mailgate/openerp_mailgate.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index a81c2a5776d..3b03c03d008 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -176,8 +176,8 @@ class email_parser(object):
 
         try:
             id = self.rpc(self.model, 'create', data)
-            self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
-            self.rpc(self.model, 'case_open', [id])
+            self.rpc(self.model, 'history', [id], 'Receive', True, msg['From'], message['body'])
+            #self.rpc(self.model, 'case_open', [id])
         except Exception, e:
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
                 e = '\n\nThe Specified user does not have an access to the CRM case.'
@@ -291,7 +291,7 @@ class email_parser(object):
 
         self.rpc(self.model, act, [id])
         self.rpc(self.model, 'write', [id], data)
-        self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
+        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
         return id
 
     def msg_send(self, msg, emails, priority=None):
@@ -323,7 +323,7 @@ class email_parser(object):
             'description':body, 
         }
         self.rpc(self.model, 'write', [id], data)
-        self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
+        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
         return id
 
     def msg_test(self, msg, case_str):
@@ -375,7 +375,7 @@ class email_parser(object):
 
 if __name__ == '__main__':
     import sys, optparse
-    parser = optparse.OptionParser( usage='usage: %prog [options]', version='%prog v1.0')
+    parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.0')
     group = optparse.OptionGroup(parser, "Note", 
         "This program parse a mail from standard input and communicate "
         "with the Open ERP server for case management in the CRM module.")
@@ -397,4 +397,4 @@ if __name__ == '__main__':
 
     parser.parse(msg_txt)
  
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From f5bac7a41dad3f40ede6dfe7d961977db0267d3b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 16:31:15 +0530
Subject: [PATCH 080/248] [IMP]: crm: Improvement in default_get for
 opportunity and phonecall to phonecall wizards

bzr revid: rpa@tinyerp.com-20100319110115-ieufxtyu7yipkxzk
---
 .../crm/wizard/crm_opportunity_to_phonecall.py   | 11 +++++++----
 addons/crm/wizard/crm_phonecall_to_phonecall.py  | 16 ++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index f816f51a89b..148ec3aec6e 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -49,11 +49,14 @@ class crm_opportunity2phonecall(osv.osv_memory):
 
         opp_obj = self.pool.get('crm.opportunity')
         record_ids = context and context.get('active_ids', []) or []
-        res = {}
+        res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
-            res['name'] = opp.name
-            res['user_id'] = opp.user_id and opp.user_id.id or False
-            res['section_id'] = opp.section_id and opp.section_id.id or False
+            if 'name' in fields:
+                res.update({'name': opp.name})
+            if 'user_id' in fields:
+                res.update({'user_id': opp.user_id and opp.user_id.id or False})
+            if 'section_id' in fields:
+                res.update({'section_id': opp.section_id and opp.section_id.id or False})
         return res
 
     def action_cancel(self, cr, uid, ids, context=None):
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index 60c05e3d6ed..e925d9ef330 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -115,15 +115,19 @@ class crm_phonecall2phonecall(osv.osv_memory):
 
         @return : default values of fields.
         """
+        res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
         if record_id:
             phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
-            res = {
-                    'name': phonecall.name, 
-                    'user_id': phonecall.user_id and phonecall.user_id.id or False, 
-                    'date': phonecall.date, 
-                    'section_id': phonecall.section_id and phonecall.section_id.id or False
-                   }
+            if 'name' in fields:
+                res.update({'name': phonecall.name})
+            if 'user_id' in fields:
+                res.update({'user_id': phonecall.user_id and phonecall.user_id.id or False})
+            if 'date' in fields:
+                res.update({'date': phonecall.date})
+            if 'section_id' in fields:
+                res.update({'section_id': phonecall.section_id and phonecall.section_id.id or False})
+
         return res
 
 crm_phonecall2phonecall()

From 8974fbb8578289e8545e8118a39014937efaffcd Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 16:34:13 +0530
Subject: [PATCH 081/248] [IMP]: crm: Improvement in phonecall to meeting view

bzr revid: rpa@tinyerp.com-20100319110413-yck266gcg82pou2y
---
 addons/crm/wizard/crm_phonecall_to_meeting_view.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index 11561b81e8c..0e889c7b272 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -9,9 +9,14 @@
             <field name="model">crm.phonecall2meeting</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Convert To Meeting ">
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_make_meeting" type="object" string="_Convert" icon="gtk-convert" />
+                <form string="Convert To Meeting">
+                	<label string="Are you sure to schedule a Meeting for this Phonecall?" colspan="4"/>
+                	<newline/>
+                	<separator colspan="4" string=""/>
+                	<button name="action_cancel" string="_Cancel"
+                		icon="gtk-cancel" special="cancel" />
+                	<button name="action_make_meeting" type="object"
+                		string="_Schedule" icon="gtk-go-forward" />
                 </form>
             </field>
         </record>

From ab9241d29aee74b0727d446e7fd85c85107b63bc Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Fri, 19 Mar 2010 16:38:36 +0530
Subject: [PATCH 082/248] [IMP] document :- change comment

bzr revid: ysa@tinyerp.co.in-20100319110836-qdo8kq5r23gib8h4
---
 addons/document/std_index.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index acf21967682..d44694361b6 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -58,7 +58,7 @@ class PptxIndex(indexer):
         return ['.pptx']
 
     def _doIndexFile(self,fname):
-        # Download pptx2txt package then used  http://sourceforge.net/projects/pptx2txt/" link.
+        # Download pptx2txt package from  http://sourceforge.net/projects/pptx2txt/" link.
         # To install this tool, just copy pptx2txt.pl to appropriate place (e.g. /usr/bin directory)
         fp = Popen(['pptx2txt.pl', fname], shell=False, stdout=PIPE).stdout
         fp.read()
@@ -89,7 +89,7 @@ class DocxIndex(indexer):
         return ['.docx']
 
     def _doIndexFile(self,fname):
-        # If you want to Download docx2txt package then used  "http://sourceforge.net/projects/docx2txt/" link.   
+        # Download docx2txt package from  "http://sourceforge.net/projects/docx2txt/" link.   
         # In case, you don't want to use Makefile for installation, you can follow these steps for manual installation.
         # Copy docx2txt.pl, docx2txt.sh and docx2txt.config to appropriate place (e.g. /usr/bin directory) . used following command.
         # --> cp docx2txt.pl docx2txt.sh docx2txt.config /usr/bin/

From 0f6344b448f20557c8e6df7c7090ee5b11bc5120 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 16:45:35 +0530
Subject: [PATCH 083/248] [IMP, REF]: crm: Renamed send new mail wizard to send
 mail wizard as its used for reply also + Improvement access rules

bzr revid: rpa@tinyerp.com-20100319111535-6h2he0v814u1lh09
---
 addons/crm/__terp__.py                        |   2 +-
 addons/crm/crm.py                             | 349 +++++++++---------
 addons/crm/crm_claims_view.xml                |   2 +-
 addons/crm/crm_fund_view.xml                  |   2 +-
 addons/crm/crm_helpdesk_view.xml              |   2 +-
 addons/crm/crm_lead_view.xml                  |   2 +-
 addons/crm/crm_opportunity_view.xml           |   2 +-
 addons/crm/crm_view.xml                       |   2 +-
 addons/crm/security/ir.model.access.csv       |  19 +-
 addons/crm/wizard/__init__.py                 |   2 +-
 ...rm_send_new_email.py => crm_send_email.py} |   2 +-
 ...email_view.xml => crm_send_email_view.xml} |  12 +-
 addons/hr_recruitment/hr_hr_view.xml          |   2 +-
 addons/project_issue/project_issue_view.xml   |   2 +-
 14 files changed, 208 insertions(+), 194 deletions(-)
 rename addons/crm/wizard/{crm_send_new_email.py => crm_send_email.py} (99%)
 rename addons/crm/wizard/{crm_send_new_email_view.xml => crm_send_email_view.xml} (89%)

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 9567d449d9f..5931a056c7b 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -72,7 +72,7 @@ between mails and Open ERP.""",
         'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/crm_opportunity_to_phonecall_view.xml',
         
-        'wizard/crm_send_new_email_view.xml', 
+        'wizard/crm_send_email_view.xml', 
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 01a0039cec5..ea3d330c1e5 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -22,83 +22,95 @@
 from datetime import datetime
 from datetime import timedelta
 from osv import fields
-from osv import orm
 from osv import osv
-from osv.orm import except_orm
 from tools.translate import _
-import base64
-import mx.DateTime
-import os
-import re
 import time
 import tools
 
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
+    ('draft', 'Draft'), 
+    ('open', 'Open'), 
+    ('cancel', 'Cancelled'), 
+    ('done', 'Closed'), 
+    ('pending', 'Pending')
 ]
 
 AVAILABLE_PRIORITIES = [
-    ('5','Lowest'),
-    ('4','Low'),
-    ('3','Normal'),
-    ('2','High'),
-    ('1','Highest')
+    ('5', 'Lowest'), 
+    ('4', 'Low'), 
+    ('3', 'Normal'), 
+    ('2', 'High'), 
+    ('1', 'Highest')
 ]
 
 icon_lst = {
-    'form':'STOCK_NEW',
-    'tree':'STOCK_JUSTIFY_FILL',
-    'calendar':'STOCK_SELECT_COLOR'
+    'form': 'STOCK_NEW', 
+    'tree': 'STOCK_JUSTIFY_FILL', 
+    'calendar': 'STOCK_SELECT_COLOR'
 }
 
 class crm_case_section(osv.osv):
+    """ Cases Section"""
+    
     _name = "crm.case.section"
     _description = "Sales Teams"
     _order = "name"
+    
     _columns = {
-        'name': fields.char('Sales Team',size=64, required=True, translate=True),
-        'code': fields.char('Code',size=8),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the sales team without removing it."),
-        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
-        'user_id': fields.many2one('res.users', 'Responsible User'),
-        'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
-        'parent_id': fields.many2one('crm.case.section', 'Parent Section'),
-        'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'),
+        'name': fields.char('Sales Team', size=64, required=True, translate=True), 
+        'code': fields.char('Code', size=8), 
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the sales team without removing it."), 
+        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"), 
+        'user_id': fields.many2one('res.users', 'Responsible User'), 
+        'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"), 
+        'parent_id': fields.many2one('crm.case.section', 'Parent Section'), 
+        'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'), 
     }
+    
     _defaults = {
-        'active': lambda *a: 1,
-        'allow_unlink': lambda *a: 1,
+        'active': lambda *a: 1, 
+        'allow_unlink': lambda *a: 1, 
     }
+    
     _sql_constraints = [
         ('code_uniq', 'unique (code)', 'The code of the section must be unique !')
     ]
+    
     def _check_recursion(self, cr, uid, ids):
+        """ 
+        Checks for recursion level for sections
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of section ids 
+        """
         level = 100
+        
         while len(ids):
-            cr.execute('select distinct parent_id from crm_case_section where id =ANY(%s)',(ids,))
-            ids = filter(None, map(lambda x:x[0], cr.fetchall()))
+            cr.execute('select distinct parent_id from crm_case_section where id =ANY(%s)', (ids,))
+            ids = filter(None, map(lambda x: x[0], cr.fetchall()))
             if not level:
                 return False
             level -= 1
+        
         return True
+    
     _constraints = [
         (_check_recursion, 'Error ! You cannot create recursive sections.', ['parent_id'])
     ]
+    
     def name_get(self, cr, uid, ids, context={}):
+        """Overrides orm  """
         if not len(ids):
             return []
-        reads = self.read(cr, uid, ids, ['name','parent_id'], context)
+        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
         res = []
         for record in reads:
             name = record['name']
             if record['parent_id']:
-                name = record['parent_id'][1]+' / '+name
+                name = record['parent_id'][1] + ' / ' + name
             res.append((record['id'], name))
         return res
 crm_case_section()
@@ -108,13 +120,13 @@ class crm_case_categ(osv.osv):
     _description = "Category of case"
 
     _columns = {
-        'name': fields.char('Case Category Name', size=64, required=True, translate=True),        
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'object_id': fields.many2one('ir.model','Object Name'),        
+        'name': fields.char('Case Category Name', size=64, required=True, translate=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+        'object_id': fields.many2one('ir.model', 'Object Name'), 
     }
     def _find_object_id(self, cr, uid, context=None):
         object_id = context and context.get('object_id', False) or False
-        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
+        ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0] 
     _defaults = {        
         'object_id' : _find_object_id
@@ -127,13 +139,13 @@ class crm_case_resource_type(osv.osv):
     _description = "Resource Type of case"
     _rec_name = "name"
     _columns = {
-        'name': fields.char('Case Resource Type', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'object_id': fields.many2one('ir.model','Object Name'),        
+        'name': fields.char('Case Resource Type', size=64, required=True, translate=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+        'object_id': fields.many2one('ir.model', 'Object Name'), 
     }
     def _find_object_id(self, cr, uid, context=None):
         object_id = context and context.get('object_id', False) or False
-        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
+        ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0] 
     _defaults = {
         'object_id' : _find_object_id
@@ -147,21 +159,21 @@ class crm_case_stage(osv.osv):
     _rec_name = 'name'
     _order = "sequence"
     _columns = {
-        'name': fields.char('Stage Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
-        'object_id': fields.many2one('ir.model','Object Name'),
-        'probability': fields.float('Probability (%)', required=True),
-        'on_change': fields.boolean('Change Probability Automatically',help="Change Probability on next and previous stages."),
+        'name': fields.char('Stage Name', size=64, required=True, translate=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."), 
+        'object_id': fields.many2one('ir.model', 'Object Name'), 
+        'probability': fields.float('Probability (%)', required=True), 
+        'on_change': fields.boolean('Change Probability Automatically', help="Change Probability on next and previous stages."), 
         'requirements': fields.text('Requirements')
     }
     def _find_object_id(self, cr, uid, context=None):
         object_id = context and context.get('object_id', False) or False
-        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
+        ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]     
     _defaults = {
-        'sequence': lambda *args: 1,
-        'probability': lambda *args: 0.0,
+        'sequence': lambda *args: 1, 
+        'probability': lambda *args: 0.0, 
         'object_id' : _find_object_id
     }
     
@@ -188,8 +200,9 @@ class crm_case(osv.osv):
         return res
 
     def copy(self, cr, uid, id, default=None, context={}):
-        if not default: default = {}
-        default.update( {'state':'draft', 'id':False})
+        if not default:
+            default = {}
+        default.update({'state': 'draft', 'id': False})
         return super(crm_case, self).copy(cr, uid, id, default, context)
 
     def _get_log_ids(self, cr, uid, ids, field_names, arg, context={}):
@@ -205,55 +218,55 @@ class crm_case(osv.osv):
         if not history_obj:
             return result
         for case in self.browse(cr, uid, ids, context):
-            model_ids = model_obj.search(cr, uid, [('model','=',case._name)])
-            history_ids = history_obj.search(cr, uid, [('model_id','=',model_ids[0]),('res_id','=',case.id)])             
+            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
+            history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]), ('res_id', '=', case.id)])             
             if history_ids:
-                result[case.id] = {name:history_ids}
+                result[case.id] = {name: history_ids}
             else:
-                result[case.id] = {name:[]}         
+                result[case.id] = {name: []}         
         return result
 
     _columns = {
-        'id': fields.integer('ID', readonly=True),
-        'name': fields.char('Description', size=1024, required=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the case without removing it."),
-        'description': fields.text('Description'),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True, help='Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway.'),
-        'email_from': fields.char('Email', size=128, help="These people will receive email."),
+        'id': fields.integer('ID', readonly=True), 
+        'name': fields.char('Description', size=1024, required=True), 
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the case without removing it."), 
+        'description': fields.text('Description'), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True, help='Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway.'), 
+        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
         'email_cc': fields.text('Watchers Emails', size=252 , help="These people will receive a copy of the future" \
-                                                                    " communication between partner and users by email"),
-        'probability': fields.float('Probability'),
-        'email_last': fields.function(_email_last, method=True,
-            string='Latest E-Mail', type='text'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
-        'create_date': fields.datetime('Creation Date' ,readonly=True),
-        'write_date': fields.datetime('Update Date' ,readonly=True),
-        'date_deadline': fields.date('Deadline'),
-        'user_id': fields.many2one('res.users', 'Responsible'),
-        'history_line': fields.function(_get_log_ids, method=True, type='one2many', multi="history_line", relation="crm.case.history", string="Communication"),
-        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', multi="log_ids", relation="crm.case.log", string="Logs History"),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
+                                                                    " communication between partner and users by email"), 
+        'probability': fields.float('Probability'), 
+        'email_last': fields.function(_email_last, method=True, 
+            string='Latest E-Mail', type='text'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"), 
+        'create_date': fields.datetime('Creation Date' , readonly=True), 
+        'write_date': fields.datetime('Update Date' , readonly=True), 
+        'date_deadline': fields.date('Deadline'), 
+        'user_id': fields.many2one('res.users', 'Responsible'), 
+        'history_line': fields.function(_get_log_ids, method=True, type='one2many', multi="history_line", relation="crm.case.history", string="Communication"), 
+        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', multi="log_ids", relation="crm.case.log", string="Logs History"), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"), 
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
-                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-        'company_id': fields.many2one('res.company','Company'),
+                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
+        'company_id': fields.many2one('res.company', 'Company'), 
     }
     def _get_default_partner_address(self, cr, uid, context):
-        if not context.get('portal',False):
+        if not context.get('portal', False):
             return False
         return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
     def _get_default_partner(self, cr, uid, context):
-        if not context.get('portal',False):
+        if not context.get('portal', False):
             return False
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         if not user.address_id:
             return False
         return user.address_id.partner_id.id
     def _get_default_email(self, cr, uid, context):
-        if not context.get('portal',False):
+        if not context.get('portal', False):
             return False
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         if not user.address_id:
@@ -265,26 +278,26 @@ class crm_case(osv.osv):
         return uid
 
     def _get_section(self, cr, uid, context):
-       user = self.pool.get('res.users').browse(cr, uid, uid,context=context)
+       user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
        return user.context_section_id.id or False
 
     _defaults = {
-        'active': lambda *a: 1,
-        'user_id': _get_default_user,
-        'partner_id': _get_default_partner,
-        'partner_address_id': _get_default_partner_address,
-        'email_from': _get_default_email,
-        'state': lambda *a: 'draft',
-        'date_deadline': lambda *a:(datetime.today() + timedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S'),
-        'section_id': _get_section,
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
+        'active': lambda *a: 1, 
+        'user_id': _get_default_user, 
+        'partner_id': _get_default_partner, 
+        'partner_address_id': _get_default_partner_address, 
+        'email_from': _get_default_email, 
+        'state': lambda *a: 'draft', 
+        'date_deadline': lambda *a: (datetime.today() + timedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S'), 
+        'section_id': _get_section, 
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), 
     }
     _order = 'date_deadline desc, create_date desc,id desc'
 
     def unlink(self, cr, uid, ids, context={}):
         for case in self.browse(cr, uid, ids, context):
             if (not case.section_id.allow_unlink) and (case.state <> 'draft'):
-                raise osv.except_osv(_('Warning !'),
+                raise osv.except_osv(_('Warning !'), 
                     _('You can not delete this case. You should better cancel it.'))
         return super(crm_case, self).unlink(cr, uid, ids, context)
 
@@ -337,20 +350,20 @@ class crm_case(osv.osv):
     
     def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}):
         cases = self.browse(cr, uid, ids, context=context)
-        return self.__history(cr, uid, cases, keyword=keyword,\
-                               history=history, email=email, details=details,\
+        return self.__history(cr, uid, cases, keyword=keyword, \
+                               history=history, email=email, details=details, \
                                context=context)
 
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
         model_obj = self.pool.get('ir.model')          
         for case in cases:
-            model_ids = model_obj.search(cr, uid, [('model','=',case._name)])            
+            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])            
             data = {
-                'name': keyword,                
-                'user_id': uid,
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'model_id' : model_ids and model_ids[0] or False,
-                'res_id': case.id,
+                'name': keyword, 
+                'user_id': uid, 
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
+                'model_id' : model_ids and model_ids[0] or False, 
+                'res_id': case.id, 
                 'section_id': case.section_id.id
             }
             obj = self.pool.get('crm.case.log')
@@ -368,7 +381,7 @@ class crm_case(osv.osv):
         res = super(crm_case, self).create(cr, uid, *args, **argv)
         cases = self.browse(cr, uid, [res])
         cases[0].state # to fill the browse record cache
-        self._action(cr,uid, cases, 'draft')
+        self._action(cr, uid, cases, 'draft')
         return res
 
     def add_reply(self, cursor, user, ids, context=None):
@@ -376,34 +389,34 @@ class crm_case(osv.osv):
             if case.email_last:
                 description = email_last
                 self.write(cursor, user, case.id, {
-                    'description': '> ' + description.replace('\n','\n> '),
+                    'description': '> ' + description.replace('\n', '\n> '), 
                     }, context=context)
         return True
 
-    def case_log(self, cr, uid, ids,context={}, email=False, *args):
+    def case_log(self, cr, uid, ids, context={}, email=False, *args):
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Historize'), history=True, email=email)
-        return self.write(cr, uid, ids, {'description': False, 'som': False,
+        return self.write(cr, uid, ids, {'description': False, 'som': False, 
             'canal_id': False})
 
     def case_log_reply(self, cr, uid, ids, context={}, email=False, *args):
         cases = self.browse(cr, uid, ids)
         for case in cases:
             if not case.email_from:
-                raise osv.except_osv(_('Error!'),
+                raise osv.except_osv(_('Error!'), 
                         _('You must put a Partner eMail to use this action!'))
             if not case.user_id:
-                raise osv.except_osv(_('Error!'),
+                raise osv.except_osv(_('Error!'), 
                         _('You must define a responsible user for this case in order to use this action!'))
             if not case.description:
-                raise osv.except_osv(_('Error!'),
+                raise osv.except_osv(_('Error!'), 
                         _('Can not send mail with empty body,you should have description in the body'))
         self.__history(cr, uid, cases, _('Send'), history=True, email=False)
         for case in cases:
             self.write(cr, uid, [case.id], {
-                'description': False,
-                'som': False,
-                'canal_id': False,
+                'description': False, 
+                'som': False, 
+                'canal_id': False, 
                 })
             emails = [case.email_from] + (case.email_cc or '').split(',')
             emails = filter(None, emails)
@@ -413,34 +426,34 @@ class crm_case(osv.osv):
 
             emailfrom = case.user_id.address_id and case.user_id.address_id.email or False
             if not emailfrom:
-                raise osv.except_osv(_('Error!'),
+                raise osv.except_osv(_('Error!'), 
                         _("No E-Mail ID Found for your Company address!"))
 
             tools.email_send(
-                emailfrom,
-                emails,
-                '['+str(case.id)+'] '+case.name,
-                self.format_body(body),
-                reply_to=case.section_id.reply_to,
-                openobject_id=str(case.id)
+                emailfrom, 
+                emails, 
+                '[' + str(case.id) + '] ' + case.name, 
+                self.format_body(body), 
+                reply_to = case.section_id.reply_to, 
+                openobject_id = str(case.id)
             )
         return True
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
         if not part:
-            return {'value':{'partner_address_id': False, 
-                            'email_from': False,
+            return {'value': {'partner_address_id': False, 
+                            'email_from': False, 
                             }}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
         data = {'partner_address_id': addr['contact']}
         data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        return {'value':data}
+        return {'value': data}
 
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
         data = {}
         if not add:
             return {'value': {'email_from': False, 'partner_name2': False}}
-        address= self.pool.get('res.partner.address').browse(cr, uid, add)
+        address = self.pool.get('res.partner.address').browse(cr, uid, add)
         data['email_from'] = address.email
         return {'value': data}
 
@@ -448,17 +461,17 @@ class crm_case(osv.osv):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Close'))
-        self.write(cr, uid, ids, {'state':'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
+        self.write(cr, uid, ids, {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         #
         # We use the cache of cases to keep the old case state
         #
-        self._action(cr,uid, cases, 'done')
+        self._action(cr, uid, cases, 'done')
         return True
 
     def case_escalate(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         for case in cases:
-            data = {'active':True, 'user_id': False}
+            data = {'active': True, 'user_id': False}
             if case.section_id.parent_id:
                 data['section_id'] = case.section_id.parent_id.id
                 if case.section_id.parent_id.user_id:
@@ -468,7 +481,7 @@ class crm_case(osv.osv):
             self.write(cr, uid, ids, data)
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Escalate'))
-        self._action(cr,uid, cases, 'escalate')        
+        self._action(cr, uid, cases, 'escalate')        
         return True
 
 
@@ -476,11 +489,11 @@ class crm_case(osv.osv):
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Open'))
         for case in cases:
-            data = {'state':'open', 'active':True}
+            data = {'state': 'open', 'active': True}
             if not case.user_id:
                 data['user_id'] = uid
             self.write(cr, uid, ids, data)
-        self._action(cr,uid, cases, 'open')
+        self._action(cr, uid, cases, 'open')
         return True
 
 
@@ -488,24 +501,24 @@ class crm_case(osv.osv):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Cancel'))
-        self.write(cr, uid, ids, {'state':'cancel', 'active':True})
-        self._action(cr,uid, cases, 'cancel')
+        self.write(cr, uid, ids, {'state': 'cancel', 'active': True})
+        self._action(cr, uid, cases, 'cancel')
         return True
 
     def case_pending(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Pending'))
-        self.write(cr, uid, ids, {'state':'pending', 'active':True})
-        self._action(cr,uid, cases, 'pending')
+        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
+        self._action(cr, uid, cases, 'pending')
         return True
 
     def case_reset(self, cr, uid, ids, *args):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Draft'))
-        self.write(cr, uid, ids, {'state':'draft', 'active':True})
-        self._action(cr,uid, cases, 'draft')
+        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
+        self._action(cr, uid, cases, 'draft')
         return True   
 
 crm_case()
@@ -516,17 +529,17 @@ class crm_case_log(osv.osv):
     _description = "Case Communication History"
     _order = "id desc"
     _columns = {
-        'name': fields.char('Status', size=64),
-        'som': fields.many2one('res.partner.som', 'State of Mind'),
-        'date': fields.datetime('Date'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel'),
-        'section_id': fields.many2one('crm.case.section', 'Section'),
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
-        'model_id': fields.many2one('ir.model', "Model"),
-        'res_id': fields.integer('Resource ID'),
+        'name': fields.char('Status', size=64), 
+        'som': fields.many2one('res.partner.som', 'State of Mind'), 
+        'date': fields.datetime('Date'), 
+        'canal_id': fields.many2one('res.partner.canal', 'Channel'), 
+        'section_id': fields.many2one('crm.case.section', 'Section'), 
+        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
+        'model_id': fields.many2one('ir.model', "Model"), 
+        'res_id': fields.integer('Resource ID'), 
     }
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
     }
 crm_case_log()
 
@@ -534,7 +547,7 @@ class crm_case_history(osv.osv):
     _name = "crm.case.history"
     _description = "Case history"
     _order = "id desc"
-    _inherits = {'crm.case.log':"log_id"}    
+    _inherits = {'crm.case.log': "log_id"}    
 
     def _note_get(self, cursor, user, ids, name, arg, context=None):
         res = {}
@@ -543,10 +556,10 @@ class crm_case_history(osv.osv):
             res[hist.id] += (hist.description or '')
         return res
     _columns = {
-        'description': fields.text('Description'),
-        'note': fields.function(_note_get, method=True, string="Description", type="text"),
-        'email': fields.char('Email', size=84),
-        'log_id': fields.many2one('crm.case.log','Log',ondelete='cascade'),
+        'description': fields.text('Description'), 
+        'note': fields.function(_note_get, method=True, string="Description", type="text"), 
+        'email': fields.char('Email', size=84), 
+        'log_id': fields.many2one('crm.case.log', 'Log', ondelete='cascade'), 
     }
 crm_case_history()
 
@@ -554,26 +567,26 @@ class crm_email_add_cc_wizard(osv.osv_memory):
     _name = "crm.email.add.cc"
     _description = "Email Add CC"
     _columns = {
-        'name': fields.selection([('user','User'),('partner','Partner'),('email','Email Address')], 'Send to', required=True),
-        'user_id': fields.many2one('res.users',"User"),
-        'partner_id': fields.many2one('res.partner',"Partner"),
-        'email': fields.char('Email', size=32),
-        'subject': fields.char('Subject', size=32),
+        'name': fields.selection([('user', 'User'), ('partner', 'Partner'), ('email', 'Email Address')], 'Send to', required=True), 
+        'user_id': fields.many2one('res.users', "User"), 
+        'partner_id': fields.many2one('res.partner', "Partner"), 
+        'email': fields.char('Email', size=32), 
+        'subject': fields.char('Subject', size=32), 
     }
 
     def change_email(self, cr, uid, ids, user, partner):
         if (not partner and not user):
-            return {'value':{'email': False}}
+            return {'value': {'email': False}}
         email = False
         if partner:
             addr = self.pool.get('res.partner').address_get(cr, uid, [partner], ['contact'])
             if addr:
-                email = self.pool.get('res.partner.address').read(cr, uid,addr['contact'] , ['email'])['email']
+                email = self.pool.get('res.partner.address').read(cr, uid, addr['contact'] , ['email'])['email']
         elif user:
             addr = self.pool.get('res.users').read(cr, uid, user, ['address_id'])['address_id']
             if addr:
-                email = self.pool.get('res.partner.address').read(cr, uid,addr[0] , ['email'])['email']
-        return {'value':{'email': email}}
+                email = self.pool.get('res.partner.address').read(cr, uid, addr[0] , ['email'])['email']
+        return {'value': {'email': email}}
 
 
     def add_cc(self, cr, uid, ids, context={}):
@@ -587,20 +600,20 @@ class crm_email_add_cc_wizard(osv.osv_memory):
         model = history_line.log_id.model_id.model
         model_pool = self.pool.get(model)
         case = model_pool.browse(cr, uid, history_line.log_id.res_id)
-        body = history_line.description.replace('\n','\n> ')
+        body = history_line.description.replace('\n', '\n> ')
         flag = tools.email_send(
-            case.user_id.address_id.email,
-            [case.email_from],
-            subject or '['+str(case.id)+'] '+case.name,
-            model_pool.format_body(body),
-            email_cc = [email],
-            openobject_id=str(case.id),
-            subtype="html"
+            case.user_id.address_id.email, 
+            [case.email_from], 
+            subject or '[' + str(case.id) + '] ' + case.name, 
+            model_pool.format_body(body), 
+            email_cc = [email], 
+            openobject_id = str(case.id), 
+            subtype = "html"
         )
         if flag:
-            model_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc +','+ email or email})
+            model_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ',' + email or email})
         else:
-            raise osv.except_osv(_('Email Fail!'),("Lastest Email is not sent successfully"))
+            raise osv.except_osv(_('Email Fail!'), ("Lastest Email is not sent successfully"))
         return {}
 
 crm_email_add_cc_wizard()
@@ -609,7 +622,7 @@ class users(osv.osv):
     _inherit = 'res.users'
     _description = "Users"
     _columns = {
-        'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'context_section_id': fields.many2one('crm.case.section', 'Sales Team'), 
     }
 users()
 
@@ -617,7 +630,7 @@ users()
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
     }
 
 res_partner()
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index dc9708d89ba..1af94e62e11 100755
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -188,7 +188,7 @@
                         </tree>
                     </field>
                     <button colspan="4" string="Send New Email"
-                    	name="%(crm.action_crm_send_new_mail)d"
+                    	name="%(crm.action_crm_send_mail)d"
                     	context="{'mail':'new', 'model': 'crm.claim'}" icon="gtk-go-forward"
                     	type="action" />
                 </page>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 0b8db88220b..6d2a76df625 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -169,7 +169,7 @@
                         </tree>
                     </field>
                     <button colspan="4" string="Send New Email"
-                    	name="%(crm.action_crm_send_new_mail)d"
+                    	name="%(crm.action_crm_send_mail)d"
                     	context="{'mail':'new', 'model': 'crm.fundraising'}" icon="gtk-go-forward"
                     	type="action" />
                  </page>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 2702f179395..c3f95deb253 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -117,7 +117,7 @@
                            </tree>
                        </field>
                        <button colspan="4" string="Send New Email"
-                       	name="%(crm.action_crm_send_new_mail)d"
+                       	name="%(crm.action_crm_send_mail)d"
                        	context="{'mail':'new', 'model': 'crm.helpdesk'}" icon="gtk-go-forward"
                        	type="action" />
                     </page>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7f4d5030de4..51243f3e271 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -139,7 +139,7 @@
                         </tree>
                     </field>
                     <button colspan="4" string="Send New Email"
-                        name="%(crm.action_crm_send_new_mail)d"
+                        name="%(crm.action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}" icon="gtk-go-forward"
                         type="action" />
                  </page>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 76399accba8..9a6fb6fb9a1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -161,7 +161,7 @@
                         </tree>
                     </field>
                     <button colspan="4" string="Send New Email"
-                    	name="%(crm.action_crm_send_new_mail)d"
+                    	name="%(crm.action_crm_send_mail)d"
                     	context="{'mail':'new', 'model': 'crm.opportunity'}" icon="gtk-go-forward"
                     	type="action" />
                  </page>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 7af6ebcc868..a970701b735 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -361,7 +361,7 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_new_mail)d"
+                           	name="%(action_crm_send_mail)d"
                            	context="{'mail':'new', 'model': 'crm.case'}"
                            	icon="gtk-go-forward" type="action" />
                         </page>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index cd47367c8bd..3ed862b98b9 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -32,12 +32,13 @@
 "access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
 "access_crm_opportunity_report_user","crm.opportunity.report","model_crm_opportunity_report","crm.group_crm_user",1,0,0,0
 "access_report_crm_case_service_dashboard","report.crm.case.service.dashboard","model_report_crm_case_service_dashboard","crm.group_crm_user",1,0,0,0
-"access_crm_lead2partner","crm.lead2partner","model_crm_lead2partner","crm.group_crm_user",1,0,0,0
-"access_crm_lead2opportunity","crm.lead2opportunity","model_crm_lead2opportunity","crm.group_crm_user",1,0,0,0
-"access_crm_opportunity2meeting","crm.opportunity2meeting","model_crm_opportunity2meeting","crm.group_crm_user",1,0,0,0
-"access_crm_opportunity2phonecall","crm.opportunity2phonecall","model_crm_opportunity2phonecall","crm.group_crm_user",1,0,0,0
-"access_crm_phonecall2phonecall","crm.phonecall2phonecall","model_crm_phonecall2phonecall","crm.group_crm_user",1,0,0,0
-"access_crm_phonecall2partner","crm.phonecall2partner","model_crm_phonecall2partner","crm.group_crm_user",1,0,0,0
-"access_crm_phonecall2meeting","crm.phonecall2meeting","model_crm_phonecall2meeting","crm.group_crm_user",1,0,0,0
-"access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,0,0,0
-"access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,0,0,0
+"access_crm_lead2partner","crm.lead2partner","model_crm_lead2partner","crm.group_crm_user",1,1,1,1
+"access_crm_lead2opportunity","crm.lead2opportunity","model_crm_lead2opportunity","crm.group_crm_user",1,1,1,1
+"access_crm_opportunity2meeting","crm.opportunity2meeting","model_crm_opportunity2meeting","crm.group_crm_user",1,1,1,1
+"access_crm_opportunity2phonecall","crm.opportunity2phonecall","model_crm_opportunity2phonecall","crm.group_crm_user",1,1,1,1
+"access_crm_phonecall2phonecall","crm.phonecall2phonecall","model_crm_phonecall2phonecall","crm.group_crm_user",1,1,1,1
+"access_crm_phonecall2partner","crm.phonecall2partner","model_crm_phonecall2partner","crm.group_crm_user",1,1,1,1
+"access_crm_phonecall2meeting","crm.phonecall2meeting","model_crm_phonecall2meeting","crm.group_crm_user",1,1,1,1
+"access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,1,1,1
+"access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
+"access_crm_send_mail","crm.send.mail","model_crmsend_mail","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 0a74cfebc30..e95897a8495 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import crm_send_new_email
+import crm_send_email
 import wizard_history_event
 
 import crm_lead_to_partner
diff --git a/addons/crm/wizard/crm_send_new_email.py b/addons/crm/wizard/crm_send_email.py
similarity index 99%
rename from addons/crm/wizard/crm_send_new_email.py
rename to addons/crm/wizard/crm_send_email.py
index 599d9022ef7..17442fe0052 100644
--- a/addons/crm/wizard/crm_send_new_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -27,7 +27,7 @@ import tools
 
 class crm_send_new_email(osv.osv_memory):
     """ Sends new email for the case"""
-    _name = "crm.send.new.mail"
+    _name = "crm.send.mail"
     _description = "Case Send new email"
 
     _columns = {
diff --git a/addons/crm/wizard/crm_send_new_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
similarity index 89%
rename from addons/crm/wizard/crm_send_new_email_view.xml
rename to addons/crm/wizard/crm_send_email_view.xml
index 5411bf72af0..33b692b2d76 100644
--- a/addons/crm/wizard/crm_send_new_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -6,7 +6,7 @@
     
         <record model="ir.ui.view" id="crm_send_new_mail_view">
             <field name="name">crm.new.send.mail.form</field>
-            <field name="model">crm.send.new.mail</field>
+            <field name="model">crm.send.mail</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Send New Mail" col="2">
@@ -31,9 +31,9 @@
 
 <!-- Send New Mail action -->
 
-        <record model="ir.actions.act_window" id="action_crm_send_new_mail">
+        <record model="ir.actions.act_window" id="action_crm_send_mail">
             <field name="name">Send New Mail</field>
-            <field name="res_model">crm.send.new.mail</field>
+            <field name="res_model">crm.send.mail</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="crm_send_new_mail_view"/>
@@ -44,8 +44,8 @@
 	<!-- Reply to Mail view -->
     
         <record model="ir.ui.view" id="crm_reply_mail_view">
-            <field name="name">crm.new.send.mail.form</field>
-            <field name="model">crm.send.new.mail</field>
+            <field name="name">crm.mail.reply.form</field>
+            <field name="model">crm.send.mail</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reply to last Mail" col="2">
@@ -67,7 +67,7 @@
 
         <record model="ir.actions.act_window" id="action_crm_reply_mail">
             <field name="name">Reply to last Mail</field>
-            <field name="res_model">crm.send.new.mail</field>
+            <field name="res_model">crm.send.mail</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="crm_reply_mail_view"/>
diff --git a/addons/hr_recruitment/hr_hr_view.xml b/addons/hr_recruitment/hr_hr_view.xml
index db4876dc547..2e018239200 100644
--- a/addons/hr_recruitment/hr_hr_view.xml
+++ b/addons/hr_recruitment/hr_hr_view.xml
@@ -170,7 +170,7 @@
                         </tree>
                     </field>
                        <button colspan="4" string="Send New Email"
-                       	name="%(crm.action_crm_send_new_mail)d"
+                       	name="%(crm.action_crm_send_mail)d"
                        	context="{'mail':'new', 'model': 'hr.applicant'}" icon="gtk-go-forward"
                        	type="action" />
                    </page>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 78ec171aee2..e1bff3750e2 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -123,7 +123,7 @@
                                 </tree>
                             </field>
                             <button colspan="4" string="Send New Email"
-                            	name="%(crm.action_crm_send_new_mail)d"
+                            	name="%(crm.action_crm_send_mail)d"
                             	context="{'mail':'new', 'model': 'project.issue'}"
                             	icon="gtk-go-forward" type="action" />
                         </page>

From 71fa375ac07ed23e7105f253fc45fff98890c1c4 Mon Sep 17 00:00:00 2001
From: Paul J Stevens <>
Date: Fri, 19 Mar 2010 16:52:22 +0530
Subject: [PATCH 084/248] [IMP] document :- Bug #539644 - backward
 compatibility for file utility

bzr revid: ysa@tinyerp.co.in-20100319112222-7k4hv6xbfjh06dnv
---
 addons/document/content_index.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index 9e47621b4c3..a13ba35b60a 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -158,11 +158,10 @@ class contentIndex():
                     os.write(fd, content)
                     os.close(fd)
             
-                #fp = Popen(['file','-b','--mime-type',fname], shell=False, stdout=PIPE).stdout
-                fp = Popen(['file','-b',fname], shell=False, stdout=PIPE).stdout
+                fp = Popen(['file','-b','--mime',fname], shell=False, stdout=PIPE).stdout
                 result = fp.read()
                 fp.close()
-                mime2 = result.strip()
+                mime2 = result.split(';')[0]
                 self.__logger.debug('File gave us: %s', mime2)
                 # Note that the temporary file still exists now.
                 mime,fobj = mime_match(mime2, self.mimes)

From 414c04bd74987cdfa72b200823423cba25affe70 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 19 Mar 2010 17:00:14 +0530
Subject: [PATCH 085/248] [IMP]: wiki idea lunch: removed context from wizard
 action window

bzr revid: ksa@tinyerp.co.in-20100319113014-3k481o946nkjvn43
---
 addons/idea/wizard/idea_post_vote_view.xml       | 1 -
 addons/lunch/wizard/lunch_cashbox_clean_view.xml | 1 -
 addons/lunch/wizard/lunch_order_cancel_view.xml  | 1 -
 addons/lunch/wizard/lunch_order_confirm_view.xml | 1 -
 addons/wiki/wizard/wiki_make_index_view.xml      | 1 -
 5 files changed, 5 deletions(-)

diff --git a/addons/idea/wizard/idea_post_vote_view.xml b/addons/idea/wizard/idea_post_vote_view.xml
index a6545c7d354..e49e91f5661 100644
--- a/addons/idea/wizard/idea_post_vote_view.xml
+++ b/addons/idea/wizard/idea_post_vote_view.xml
@@ -31,7 +31,6 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_idea_post_vote"/>
            <field name="target">new</field>
-           <field name="context">{'record_id':active_id}</field>
         </record>
 
 <!-- Post Idea for vote Action Window  -->
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 20fb2416ade..ce463c5a02a 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -29,7 +29,6 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_lunch_cashbox_clean"/>
            <field name="target">new</field>
-           <field name="context">{'record_id':active_id}</field>
         </record>
 
         <act_window id="action_lunch_cashbox_clean_values"
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index dcfe412af48..39fa1f87d62 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -29,7 +29,6 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_lunch_order_cancel"/>
            <field name="target">new</field>
-           <field name="context">{'record_id':active_id}</field>
         </record>
 
         <act_window id="action_lunch_order_cancel_values"
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index 8afd25c2307..aa59acae628 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -31,7 +31,6 @@
             <field name="view_mode">tree,form</field>
            <field name="view_id" ref="view_lunch_order_confirm"/>
            <field name="target">new</field>
-           <field name="context">{'record_id':active_id}</field>
         </record>
 
         <act_window id="action_lunch_order_confirm_values"
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 7473bae56e0..3e5a87d4462 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -29,7 +29,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'record_id' : active_id}</field>
     	</record>
 
 <!-- Create Index Action Window  -->

From 8870356b08d1976b3a3d52ce68ba12ea80061a69 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 17:04:57 +0530
Subject: [PATCH 086/248] [IMP]: project_issue: Taken recent changes from trunk
 addons

bzr revid: rpa@tinyerp.com-20100319113457-6z5k5860sc45q6as
---
 addons/project_issue/project_issue.py | 31 ++++++++++-----------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 7877e76a8dd..e4494c48565 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -19,20 +19,17 @@
 #
 ##############################################################################
 
-import time
-import re
-import os
-import base64
-
-from tools.translate import _
-
-import tools
+from crm import crm
+from datetime import datetime, timedelta
 from osv import fields,osv,orm
 from osv.orm import except_orm
-from datetime import datetime, timedelta
-
-from crm import crm
+from tools.translate import _
+import base64
+import os
+import re
 import time
+import time
+import tools
 
 
 class project_issue(osv.osv):
@@ -78,15 +75,9 @@ class project_issue(osv.osv):
         'date': fields.datetime('Date'),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
                                                                         " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
-        'planned_revenue': fields.float('Planned Revenue'),
-        'planned_cost': fields.float('Planned Costs'),
-        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
-                                                                       "the partner mentality in relation to our services.The scale has" \
-                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
         'categ_id': fields.many2one('crm.case.categ','Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('object_id.model', '=', 'project.issue')]"),
-
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Severity'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
         'partner_phone': fields.char('Phone', size=32),
@@ -133,7 +124,7 @@ class project_issue(osv.osv):
         stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
         if not stage.on_change:
             return {'value':{}}
-        return {'value':{'probability':stage.probability}}
+        return {'value':{}}
 
     _defaults = {
         'project_id':_get_project,

From 7a7d44d5a5d33d44e3214291fdfb8a5d40ad1c42 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 17:52:07 +0530
Subject: [PATCH 087/248] [IMP]: crm: Minor improvement in reply mail view
 [FIX]: fixed problem in access csv

bzr revid: rpa@tinyerp.com-20100319122207-sqw4ryfkk2oqoz9z
---
 addons/crm/security/ir.model.access.csv   | 2 +-
 addons/crm/wizard/crm_send_email_view.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 3ed862b98b9..ea6b704f5d8 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -41,4 +41,4 @@
 "access_crm_phonecall2meeting","crm.phonecall2meeting","model_crm_phonecall2meeting","crm.group_crm_user",1,1,1,1
 "access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,1,1,1
 "access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
-"access_crm_send_mail","crm.send.mail","model_crmsend_mail","crm.group_crm_user",1,1,1,1
+"access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index 33b692b2d76..bc11edfec2b 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -53,6 +53,9 @@
                 	<field name="cc" />
                 	<field name="subject" />
                 	<field name="text" widget="text_tag"/>
+                	<field name="doc1" />
+                	<field name="doc2" />
+                	<field name="doc3" />
                 	<separator string=" " colspan="4"/>
                     <group colspan="4" col="3" >
                     	<label string=" " />

From b901634015dbf2e3decf808f3d031ea8f1b769de Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 19 Mar 2010 18:22:50 +0530
Subject: [PATCH 088/248] [ADD]: crm: Added old wizard for phonecall and
 opportunity to meeting because of action in init of wizard is not possible in
 osv_memory wizard

bzr revid: rpa@tinyerp.com-20100319125250-6m68rs678puy31ta
---
 addons/crm/crm_opportunity_view.xml           |  2 +-
 addons/crm/crm_phonecall_view.xml             |  4 +-
 .../crm/wizard/crm_opportunity_to_meeting.py  | 58 +++++++++++++++++++
 .../crm_opportunity_to_meeting_view.xml       | 10 ++++
 addons/crm/wizard/crm_phonecall_to_meeting.py | 54 +++++++++++++++++
 .../wizard/crm_phonecall_to_meeting_view.xml  | 10 ++++
 6 files changed, 135 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9a6fb6fb9a1..17dc6ee393a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -64,7 +64,7 @@
                     </group>
                     <field name="user_id"/>
                     <button string="Schedule Meeting"
-                        name="%(opportunity2meeting_act)d" icon="gtk-redo" type="action" />
+                        name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
                     <field name="planned_revenue"/>
                     <field name="probability"/>
                     <field name="date_deadline" string="Expected Closing"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 1574b171c3c..64be1683d74 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -54,7 +54,7 @@
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
                     states="draft,open,pending"
-                    name="%(phonecall2meeting_act)d"  type="action" />
+                    name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -75,7 +75,7 @@
                     <field name="date" string="Planned Date"/>
                     <field name="user_id"/>
                     <button string="Schedule a Meeting"
-                        name="%(phonecall2meeting_act)d"
+                        name="%(wizard_crm_phonecall_meeting_set)d"
                         icon="gtk-redo"
                         type="action" />
                     <field name="partner_phone"/>
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting.py b/addons/crm/wizard/crm_opportunity_to_meeting.py
index 2af7ddc8e35..a2f94a5a96f 100644
--- a/addons/crm/wizard/crm_opportunity_to_meeting.py
+++ b/addons/crm/wizard/crm_opportunity_to_meeting.py
@@ -21,6 +21,64 @@
 
 from osv import osv
 from tools.translate import _
+import wizard
+import pooler
+
+#===============================================================================
+# Put original wizard because of action in init
+# Remove it after solution foraction in init
+#===============================================================================
+
+class opportunity2meeting(wizard.interface):
+
+    def _makeMeeting(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        opportunity_case_obj = pool.get('crm.opportunity')                
+        data_obj = pool.get('ir.model.data')
+        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+        id = data_obj.read(cr, uid, result, ['res_id'])
+        id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+        if id1:
+            id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        opportunity = opportunity_case_obj.browse(cr, uid, data['id'], context=context)
+        partner_id = opportunity.partner_id and opportunity.partner_id.id or False
+        name = opportunity.name
+        email = opportunity.email_from
+        section_id = opportunity.section_id and opportunity.section_id.id or False
+        return {            
+            'name': _('Meetings'),
+            'domain' : "[('user_id','=',%s), ('opportunity_id', '=', %s)]"%(uid, data['id']),  
+            'context': {'default_partner_id': partner_id, 
+                        'default_opportunity_id': data['id'], 
+                        'default_section_id': section_id, 
+                        'default_email_from': email, 
+                        'default_state':'open', 'default_name':name},
+            'view_type': 'form',
+            'view_mode': 'tree,form,calendar',
+            'res_model': 'crm.meeting',
+            'view_id': False,
+            'views': [(id1, 'calendar'), (id3, 'tree'), (id2, 'form')], 
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+            }
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
+        },
+        'order': {
+            'actions': [],
+            'result': {'type': 'state', 'state': 'end'}
+        }
+    }
+opportunity2meeting('crm.opportunity.meeting_set')
 
 class crm_opportunity2meeting(osv.osv_memory):
     _name = 'crm.opportunity2meeting'
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting_view.xml b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
index 7ea05598d28..9fdf506d313 100644
--- a/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+    
+<!--  Old wizard -->
+
+	<wizard
+            id="wizard_crm_opportunity_meeting_set"
+            keyword="client_action_multi"
+            model="crm.opportunity"
+			name="crm.opportunity.meeting_set"
+			menu="False"
+            string="Schedule Meeting"/>	
 
 	    <!-- Opportunity to meeting view -->
 
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py
index e3edcf894e0..bf63c319a71 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting.py
+++ b/addons/crm/wizard/crm_phonecall_to_meeting.py
@@ -21,6 +21,60 @@
 
 from osv import osv
 from tools.translate import _
+import wizard
+import pooler
+
+#===============================================================================
+# Put original wizard because of action in init
+# Remove it after solution foraction in init
+#===============================================================================
+
+class phonecall2meeting(wizard.interface):
+
+    def _makeMeeting(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        phonecall_case_obj = pool.get('crm.phonecall')                   
+        data_obj = pool.get('ir.model.data')
+        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+        id = data_obj.read(cr, uid, result, ['res_id'])
+        id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+        if id1:
+            id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        phonecall = phonecall_case_obj.browse(cr, uid, data['id'], context=context)
+        partner_id = phonecall.partner_id and phonecall.partner_id.id or False
+        name = phonecall.name
+        email = phonecall.email_from
+        section_id = phonecall.section_id and phonecall.section_id.id or False      
+        return {            
+            'name': _('Meetings'),
+            'domain' : "[('user_id','=',%s)]"%(uid), 
+            'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},        
+            'view_type': 'form',
+            'view_mode': 'calendar,form,tree',
+            'res_model': 'crm.meeting',
+            'view_id': False,
+            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+            }
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
+        },
+        'order': {
+            'actions': [],
+            'result': {'type': 'state', 'state': 'end'}
+        }
+    }
+phonecall2meeting('crm.phonecall.meeting_set')
 
 class crm_phonecall2meeting(osv.osv_memory):
     """ Phonecall to Meeting """
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index 0e889c7b272..ef2fe196348 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -2,6 +2,16 @@
 <openerp>
     <data>
 
+<!--  Old wizard -->
+
+	<wizard
+            id="wizard_crm_phonecall_meeting_set"
+            keyword="client_action_multi"
+            model="crm.phonecall"
+            name="crm.phonecall.meeting_set"
+            multi="True"
+            string="Schedule Meeting"/>
+            
 	    <!-- Phonecall to meeting view -->
 
         <record model="ir.ui.view" id="phonecall2phonecall2meeting_view">

From 50005078fc6a0c1da2fc90e8a4bd7a52c3231bcc Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 22 Mar 2010 06:10:19 +0100
Subject: [PATCH 089/248] mailgate fixes

bzr revid: al@openerp.com-20100322051019-x6zn4km8ldvnfgnl
---
 .../openerp_mailgate/openerp_mailgate.py      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 3b03c03d008..9db7e24acee 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -206,7 +206,7 @@ class email_parser(object):
 #                       'file_name':'file data',
 #                   }
 #   }
-#   #
+
     def msg_body_get(self, msg):
         message = {};
         message['body'] = '';
@@ -215,7 +215,7 @@ class email_parser(object):
         counter = 1;
         def replace(match):
             return ''
-            
+
         for part in msg.walk():
             if part.get_content_maintype() == 'multipart':
                 continue
@@ -264,7 +264,7 @@ class email_parser(object):
         body['body'] = body_data
 
         data = {
-            'description': body['body'], 
+#            'description': body['body'],
         }
         act = 'case_pending'
         if 'state' in actions:
@@ -291,7 +291,7 @@ class email_parser(object):
 
         self.rpc(self.model, act, [id])
         self.rpc(self.model, 'write', [id], data)
-        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
+        self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], body['body'])
         return id
 
     def msg_send(self, msg, emails, priority=None):
@@ -318,11 +318,11 @@ class email_parser(object):
         body = message['body']
         act = 'case_open'
         self.rpc(self.model, act, [id])
-        body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
-        data = {
-            'description':body, 
-        }
-        self.rpc(self.model, 'write', [id], data)
+        #body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
+        #data = {
+        #    'description':body, 
+        #}
+        #self.rpc(self.model, 'write', [id], data)
         self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
         return id
 
@@ -397,4 +397,4 @@ if __name__ == '__main__':
 
     parser.parse(msg_txt)
  
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From dec4f76f84b713e0613956784a6ca75571dd21b6 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 12:28:37 +0530
Subject: [PATCH 090/248] [IMP] survey :- convert simple wizard
 survey.print.statistics in osv_memory wizard

bzr revid: ysa@tinyerp.co.in-20100322065837-y0jfmp04v227db48
---
 addons/survey/__terp__.py                     |  8 +++-
 .../survey/report/survey_analysis_report.py   |  2 +-
 addons/survey/survey_report.xml               | 20 ++++----
 addons/survey/survey_view.xml                 |  2 -
 addons/survey/wizard/__init__.py              |  2 +-
 ...atistics.py => survey_print_statistics.py} | 46 ++++++++-----------
 .../survey/wizard/survey_print_statistics.xml | 37 +++++++++++++++
 7 files changed, 78 insertions(+), 39 deletions(-)
 rename addons/survey/wizard/{wizard_print_survey_statistics.py => survey_print_statistics.py} (53%)
 create mode 100644 addons/survey/wizard/survey_print_statistics.xml

diff --git a/addons/survey/__terp__.py b/addons/survey/__terp__.py
index 0a0e2af1bb9..f2ac8b4e723 100644
--- a/addons/survey/__terp__.py
+++ b/addons/survey/__terp__.py
@@ -32,7 +32,13 @@
     """,
     'author': 'Tiny',
     'depends': ['base'],
-    'update_xml': ['survey_report.xml','survey_data.xml','survey_que_wizard.xml','survey_wizard.xml','survey_view.xml','security/ir.model.access.csv'],
+    'update_xml': ['survey_report.xml',
+                   'survey_data.xml',
+                   'survey_que_wizard.xml',
+                   'survey_wizard.xml',
+                   'survey_view.xml',
+                   'security/ir.model.access.csv'
+                   ,'wizard/survey_print_statistics.xml'],
     'demo_xml': ['survey_demo.xml'],
     'installable': True,
     'active': False,
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index a3a54bf4950..25f553551a9 100755
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -102,7 +102,7 @@ class survey_analysis(report_rml):
                     </para>"""
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
         if datas.has_key('form') and datas['form']['survey_ids']:
-           ids =  datas['form']['survey_ids'][0][2]
+           ids =  datas['form']['survey_ids']
             
         for survey in surv_obj.browse(cr, uid, ids):
             rml += """<blockTable colWidths="280.0,100.0,120.0" style="Table_heading">
diff --git a/addons/survey/survey_report.xml b/addons/survey/survey_report.xml
index ab057d16e33..c74d9d1d544 100644
--- a/addons/survey/survey_report.xml
+++ b/addons/survey/survey_report.xml
@@ -9,14 +9,18 @@
 				menu="False"
 				string="Survey Form"/>
 
-		<report auto="True" id="survey_analysis" model="survey"
-			name="survey.analysis"
-			rml=""
-			string="Print Survey Statistics"/>
+		<report auto="True" 
+				id="survey_analysis" 
+				model="survey"
+				name="survey.analysis"
+				rml="" 
+				string="Print Survey Statistics"/>
 
-		<report auto="True" id="survey_browse_response" model="survey"
-			name="survey.browse.response"
-			rml=""
-			string="Print Answers"/>
+		<report auto="True" 
+				id="survey_browse_response" 
+				model="survey"
+				name="survey.browse.response"
+				rml=""
+				string="Print Answers"/>
 	</data>
 </openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 4339703bb91..98cbe175c45 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1161,7 +1161,5 @@
 		<menuitem action="wizard_browse_answer" id="menu_wizard_browse_answer"
 			parent="menu_reporting" type="wizard" icon="STOCK_PRINT" groups="group_survey_manager"/>
 
-		<menuitem action="wizard_print_survey_statistics" id="menu_wizard_print_survey_statistics"
-			parent="menu_reporting" type="wizard" icon="STOCK_PRINT" groups="group_survey_manager"/>
     </data>
 </openerp>
diff --git a/addons/survey/wizard/__init__.py b/addons/survey/wizard/__init__.py
index 35f8cf03820..3c907e805d9 100755
--- a/addons/survey/wizard/__init__.py
+++ b/addons/survey/wizard/__init__.py
@@ -23,6 +23,6 @@
 import wizard_survey
 import wizard_print_survey
 import wizard_browse_answer
-import wizard_print_survey_statistics
+import survey_print_statistics
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/wizard_print_survey_statistics.py b/addons/survey/wizard/survey_print_statistics.py
similarity index 53%
rename from addons/survey/wizard/wizard_print_survey_statistics.py
rename to addons/survey/wizard/survey_print_statistics.py
index 0dcac11e01f..078f94878b0 100644
--- a/addons/survey/wizard/wizard_print_survey_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -20,33 +20,27 @@
 #
 ##############################################################################
 
-import wizard
-import time
-import pooler
-from random import choice
-import string
-import tools
+from osv import fields, osv
 from tools.translate import _
 
-_survey_form = '''<?xml version="1.0"?>
-<form string="Print Survey Statistics">
-    <field name="survey_ids" colspan="4" nolabel="1"/>
-</form>'''
-
-_survey_fields = {
-    'survey_ids': {'string': 'Survey', 'type': 'many2many', 'relation': 'survey','required':'1'},
+class survey_print_statistics(osv.osv_memory):
+    _name = 'survey.print.statistics'
+    _columns = {
+        'survey_ids': fields.many2many('survey','survey_print_statistics','survey_id','print_id', "Survey", required="1"),
     }
 
-class print_survey_statistics_wizard(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form', 'arch' :_survey_form, 'fields' :_survey_fields,\
-                             'state' : [('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-print')]}
-                },
-        'print': {
-            'actions': [],
-            'result': {'type':'print', 'report':'survey.analysis', 'state':'end'}
-        }
-    }
-print_survey_statistics_wizard('wizard.print.survey.statistics')
+    def action_next(self, cr, uid, ids, context=None):
+        datas = {'ids' : context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['survey_ids'], context)
+        res = res and res[0] or {}  
+        datas['form'] = res
+        datas['model'] = 'survey.print.statistics'
+        return { 
+                    'type':'ir.actions.report.xml',
+                    'report_name':'survey.analysis',
+                    'datas':datas,               
+               }
+
+survey_print_statistics()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
new file mode 100644
index 00000000000..8838a18098c
--- /dev/null
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!-- Survey Print Statistics Form View -->
+				 
+		<record id="view_survey_print_statistics" model="ir.ui.view">
+			<field name="name">Survey Print Statistics</field>
+			<field name="model">survey.print.statistics</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Survey Print Statistics">
+					<field name="survey_ids" nolabel="1" colspan="4" />
+					<separator colspan="4" />
+					<label align="0.0" colspan="2" string="" />
+					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+					<button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
+				</form>
+			</field>
+		</record>
+
+		<!-- Survey Print Statistics action -->
+
+		<record id="action_view_survey_print_statistics"
+			model="ir.actions.act_window">
+			<field name="name">Survey Print Statistics</field>
+			<field name="res_model">survey.print.statistics</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+		</record>
+
+		<menuitem name="Print Survey Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
+			parent="menu_reporting" icon="STOCK_PRINT" groups="group_survey_manager"/>
+
+	</data>
+</openerp>
\ No newline at end of file

From feb52a3a20a23b6d2f7364e4830bec7f877bbce6 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 22 Mar 2010 13:04:06 +0530
Subject: [PATCH 091/248] [FIX+IMP] crm: crm send mail wizard

bzr revid: hmo@tinyerp.com-20100322073406-wr8masbwghfv0l3w
---
 addons/crm/crm.py                         |  7 +++--
 addons/crm/wizard/crm_send_email.py       | 34 ++++++++++++-----------
 addons/crm/wizard/crm_send_email_view.xml | 12 ++++----
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index ea3d330c1e5..80e1b8e246a 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -370,9 +370,9 @@ class crm_case(osv.osv):
             if history:
                 obj = self.pool.get('crm.case.history')
                 data['description'] = details or case.description
-                data['email'] = email or \
-                        (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or False
+                data['email'] = email or False
+                data['email_from'] = (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from',False)
             res = obj.create(cr, uid, data, context)            
         return True
     _history = __history
@@ -559,6 +559,7 @@ class crm_case_history(osv.osv):
         'description': fields.text('Description'), 
         'note': fields.function(_note_get, method=True, string="Description", type="text"), 
         'email': fields.char('Email', size=84), 
+        'email_from' : fields.char('From Email', size=84),
         'log_id': fields.many2one('crm.case.log', 'Log', ondelete='cascade'), 
     }
 crm_case_history()
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 17442fe0052..de189e6f51c 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -90,24 +90,24 @@ class crm_send_new_email(osv.osv_memory):
                 body += '\n\n%s' % (case.user_id.signature)
 
             case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['to'], details=body)
-
+            email_from = (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from',False)
             flag = tools.email_send(
-                case.user_id.address_id.email,
+                email_from,
                 emails,
                 data['subject'],
                 case_pool.format_body(body),
                 attach=attach,
                 reply_to=case.section_id.reply_to,
-                openobject_id=str(case.id),
-                subtype="html"
-            )
+                openobject_id=str(case.id),                
+            )           
             if flag:
                 if data['state'] == 'unchanged':
                     pass
                 elif data['state'] == 'done':
-                    case_pool.case_close(cr, uid, [data['id']])
+                    case_pool.case_close(cr, uid, [case.id])
                 elif data['state'] == 'pending':
-                    case_pool.case_pending(cr, uid, [data['id']])
+                    case_pool.case_pending(cr, uid, [case.id])
                 cr.commit()
 
 #            Commented because form does not close due to raise
@@ -153,7 +153,7 @@ class crm_send_new_email(osv.osv_memory):
             if 'text' in fields:
                 res.update({'text': case.description or ''})
             if 'state' in fields:
-                res.update({'state': 'done'})
+                res.update({'state': 'pending'})
         return res
 
     def get_reply_defaults(self, cr, uid, fields, context=None):
@@ -174,19 +174,21 @@ class crm_send_new_email(osv.osv_memory):
             model = hist.log_id.model_id.model
             model_pool = self.pool.get(model)
             case = model_pool.browse(cr, uid, hist.log_id.res_id)
-            if 'to' in fields:
+            if 'to' in fields and hist.email:
                 res.update({'to': hist.email})
             if 'text' in fields:
-                header = '-------- Original Message --------'
-                sender = 'From: ' + case.user_id.address_id.email
-                to = 'To: ' + hist.email
-                sentdate = 'Sent: ' + hist.date
-                desc = '\n' + hist.description
+                header = '-------- Original Message --------'                
+                sender = 'From: %s' %(hist.email_from or tools.config.get('email_from',False))                
+                to = 'To: %s' % (hist.email)
+                sentdate = 'Sent: %s' % (hist.date)
+                desc = '\n%s'%(hist.description)
                 original = [header, sender, to, sentdate, desc]
                 original = '\n'.join(original)
-                res.update({'text': '\n\n' + original})
+                res.update({'text': '\n\n%s'%(original)})
             if 'subject' in fields:
-                res.update({'subject': case.name or ''})
+                res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')}) 
+            #if 'state' in fields:
+            #    res.update({'state': 'pending'})       
         return res
 
     def view_init(self, cr, uid, fields_list, context=None):
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index bc11edfec2b..ece20c89efd 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -12,11 +12,12 @@
                 <form string="Send New Mail" col="2">
                 	<field name="to" />
                 	<field name="cc" />
-                	<field name="subject" />
-                	<field name="text" widget="text_tag"/>
+                	<field name="subject" />                	
                 	<field name="doc1" />
                 	<field name="doc2" />
                 	<field name="doc3" />
+                    <separator string="" colspan="4"/>
+                    <field name="text" nolabel="1" colspan="4"/>
                 	<separator colspan="4" string="Set case state to" />
                 	<field name="state" />
                 	<separator string=" " colspan="4"/>
@@ -51,11 +52,12 @@
                 <form string="Reply to last Mail" col="2">
                 	<field name="to" />
                 	<field name="cc" />
-                	<field name="subject" />
-                	<field name="text" widget="text_tag"/>
+                	<field name="subject" />                	
                 	<field name="doc1" />
                 	<field name="doc2" />
                 	<field name="doc3" />
+                    <separator string="" colspan="4"/>
+                    <field name="text" nolabel="1" colspan="4"/>
                 	<separator string=" " colspan="4"/>
                     <group colspan="4" col="3" >
                     	<label string=" " />
@@ -78,4 +80,4 @@
         </record>
 	
     </data>
-</openerp>   
\ No newline at end of file
+</openerp>   

From 89cb33165e143b53c987d9c18ba54c5cad4ffd38 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 13:10:07 +0530
Subject: [PATCH 092/248] survey :- convert simple wizard(survey.print.answer
 and survey.browse.answer) to osv_memory wizard

bzr revid: ysa@tinyerp.co.in-20100322074007-xq1a2f60hve2fn1f
---
 addons/survey/__terp__.py                     |  6 +-
 .../survey/report/survey_browse_response.py   |  2 +-
 addons/survey/survey.py                       | 40 ----------
 addons/survey/survey_que_wizard.xml           | 32 --------
 addons/survey/survey_view.xml                 |  7 --
 addons/survey/survey_wizard.xml               |  5 --
 addons/survey/wizard/__init__.py              |  3 +-
 addons/survey/wizard/survey_browse_answer.py  | 67 +++++++++++++++++
 addons/survey/wizard/survey_browse_answer.xml | 41 +++++++++++
 addons/survey/wizard/survey_print_answer.py   | 57 +++++++++++++++
 addons/survey/wizard/survey_print_answer.xml  | 43 +++++++++++
 addons/survey/wizard/wizard_browse_answer.py  | 73 -------------------
 12 files changed, 215 insertions(+), 161 deletions(-)
 create mode 100644 addons/survey/wizard/survey_browse_answer.py
 create mode 100644 addons/survey/wizard/survey_browse_answer.xml
 create mode 100644 addons/survey/wizard/survey_print_answer.py
 create mode 100644 addons/survey/wizard/survey_print_answer.xml
 delete mode 100644 addons/survey/wizard/wizard_browse_answer.py

diff --git a/addons/survey/__terp__.py b/addons/survey/__terp__.py
index f2ac8b4e723..c4548c6c6e4 100644
--- a/addons/survey/__terp__.py
+++ b/addons/survey/__terp__.py
@@ -37,8 +37,10 @@
                    'survey_que_wizard.xml',
                    'survey_wizard.xml',
                    'survey_view.xml',
-                   'security/ir.model.access.csv'
-                   ,'wizard/survey_print_statistics.xml'],
+                   'security/ir.model.access.csv',
+                   'wizard/survey_print_statistics.xml',
+                   'wizard/survey_print_answer.xml',
+                   'wizard/survey_browse_answer.xml'],
     'demo_xml': ['survey_demo.xml'],
     'installable': True,
     'active': False,
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 25c9a32ce2b..41c38ceef4d 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -187,7 +187,7 @@ class survey_browse_response(report_rml):
                   <story>"""
         surv_resp_obj = pooler.get_pool(cr.dbname).get('survey.response')
         if datas.has_key('form') and datas['form'].has_key('response_ids'):
-            response_id = datas['form']['response_ids'][0][2]
+            response_id = datas['form']['response_ids']
         elif context.has_key('response_id') and context['response_id']:
             response_id = [int(context['response_id'][0])]
         else:
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 555db5439ba..b3870e82b48 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -1812,44 +1812,4 @@ class survey_request(osv.osv):
 
 survey_request()
 
-
-class survey_print_answer(osv.osv_memory):
-    _name = 'survey.print.answer'
-
-    def _get_survey(self, cr, uid, context=None):
-        surv_obj = self.pool.get("survey")
-        surv_resp_obj = self.pool.get("survey.response")
-        result = []
-        for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
-            if surv_resp_obj.search(cr, uid, [('survey_id', '=', sur.id)]):
-                result.append((sur.id, sur.title))
-        return result
-
-    _columns = {
-        'survey_id': fields.selection(_get_survey, "Survey", required="1"),
-        'response_id': fields.many2one("survey.response", "Survey Response"),
-    }
-
-    def action_next(self, cr, uid, ids, context=None):
-        record = self.read(cr, uid, ids, [])[0]
-        if record['response_id']:
-            res_id = [(record['response_id'])]
-        else:
-            sur_response_obj = self.pool.get('survey.response')
-            res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))])
-        context.update({'active' : True,'survey_id' : record['survey_id'], 'response_id' : res_id, 'response_no' : 0})
-        search_obj = self.pool.get('ir.ui.view')
-        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        return {
-            'view_type': 'form',
-            "view_mode": 'form',
-            'res_model': 'survey.question.wiz',
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            'search_view_id':search_id[0],
-            'context' : context
-         }
-
-survey_print_answer()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/survey_que_wizard.xml b/addons/survey/survey_que_wizard.xml
index 3f2550d93ee..e11ec81866b 100644
--- a/addons/survey/survey_que_wizard.xml
+++ b/addons/survey/survey_que_wizard.xml
@@ -78,37 +78,5 @@
 			<field name="target">new</field>
 		</record>
 		
-
-		<!--
-			Browse Response Wizard (Survey print answer) 
-		 -->
-		 
-		<record id="view_survey_answer" model="ir.ui.view">
-			<field name="name">Survey</field>
-			<field name="model">survey.print.answer</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Survey">
-					<separator colspan="4"  string =  "Select Survey and related response"/>
-					<field name="survey_id" width="250"/>
-					<field name="response_id" domain="[('survey_id','=', survey_id)]"/>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
-				</form>
-			</field>
-		</record>
-
-		<record id="action_browse_survey_response"
-			model="ir.actions.act_window">
-			<field name="name">Answer Survey</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">survey.print.answer</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-
 	</data>
 </openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 98cbe175c45..0f0a482604f 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1154,12 +1154,5 @@
 			action="action_view_survey_name" parent="menu_answer_surveys"
 			groups="group_survey_manager,group_survey_user" icon="STOCK_INDEX"/>
 
-		<menuitem name="Browse Answers" id="menu_browse_survey_response"
-			action="action_browse_survey_response" parent="menu_reporting"
-			groups="group_survey_manager" icon="STOCK_PRINT_PREVIEW"/>
-
-		<menuitem action="wizard_browse_answer" id="menu_wizard_browse_answer"
-			parent="menu_reporting" type="wizard" icon="STOCK_PRINT" groups="group_survey_manager"/>
-
     </data>
 </openerp>
diff --git a/addons/survey/survey_wizard.xml b/addons/survey/survey_wizard.xml
index cacba61354b..2bc7b7d1910 100644
--- a/addons/survey/survey_wizard.xml
+++ b/addons/survey/survey_wizard.xml
@@ -8,10 +8,5 @@
 		<wizard string="Print Survey" id="wizard_print_survey"
 			model="survey" name="wizard.print.survey"/>
 
-		<wizard string="Print Answers" id="wizard_browse_answer"
-			model="survey.response" name="wizard.browse.answer"/>
-
-		<wizard string="Print Survey Statistics" id="wizard_print_survey_statistics"
-			model="survey" multi="True" name="wizard.print.survey.statistics"/>
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/__init__.py b/addons/survey/wizard/__init__.py
index 3c907e805d9..b767a2ced6d 100755
--- a/addons/survey/wizard/__init__.py
+++ b/addons/survey/wizard/__init__.py
@@ -22,7 +22,8 @@
 
 import wizard_survey
 import wizard_print_survey
-import wizard_browse_answer
 import survey_print_statistics
+import survey_print_answer
+import survey_browse_answer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
new file mode 100644
index 00000000000..120585c72a4
--- /dev/null
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+
+class survey_browse_answer(osv.osv_memory):
+    _name = 'survey.browse.answer'
+
+    def _get_survey(self, cr, uid, context=None):
+        surv_obj = self.pool.get("survey")
+        surv_resp_obj = self.pool.get("survey.response")
+        result = []
+        for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
+            if surv_resp_obj.search(cr, uid, [('survey_id', '=', sur.id)]):
+                result.append((sur.id, sur.title))
+        return result
+
+    _columns = {
+        'survey_id': fields.selection(_get_survey, "Survey", required="1"),
+        'response_id': fields.many2one("survey.response", "Survey Response"),
+    }
+
+    def action_next(self, cr, uid, ids, context=None):
+        record = self.read(cr, uid, ids, [])
+        record = record and record[0] or {} 
+        if record['response_id']:
+            res_id = [(record['response_id'])]
+        else:
+            sur_response_obj = self.pool.get('survey.response')
+            res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))])
+        context.update({'active' : True,'survey_id' : record['survey_id'], 'response_id' : res_id, 'response_no' : 0})
+        search_obj = self.pool.get('ir.ui.view')
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        return {
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'search_view_id':search_id[0],
+            'context' : context
+         }
+
+survey_browse_answer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
new file mode 100644
index 00000000000..ae689bece25
--- /dev/null
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!--
+			Browse Response Wizard (Survey Browse answer) 
+		 -->
+		 
+		<record id="view_survey_answer" model="ir.ui.view">
+			<field name="name">Survey</field>
+			<field name="model">survey.browse.answer</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Survey">
+					<separator colspan="4"  string =  "Select Survey and related response"/>
+					<field name="survey_id" width="250"/>
+					<field name="response_id" domain="[('survey_id','=', survey_id)]"/>
+					<separator colspan="4" />
+					<label align="0.0" colspan="2" string="" />
+					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+					<button colspan="1" icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
+				</form>
+			</field>
+		</record>
+
+		<record id="action_browse_survey_response"
+			model="ir.actions.act_window">
+			<field name="name">Answer Survey</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">survey.browse.answer</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+		</record>
+
+		<menuitem name="Browse Answers" id="menu_browse_survey_response"
+			action="action_browse_survey_response" parent="menu_reporting"
+			groups="group_survey_manager" icon="STOCK_PRINT_PREVIEW"/>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
new file mode 100644
index 00000000000..3057836d559
--- /dev/null
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -0,0 +1,57 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class survey_print_answer(osv.osv_memory):
+    _name = 'survey.print.answer'
+    _columns = {
+        'response_ids' : fields.many2many('survey.response','survey_print_response','response_id','print_id', "Response", required="1"),
+        'orientation' : fields.selection([('vertical','Portrait(Vertical)'),('horizontal','Landscape(Horizontal)')], 'Orientation'),
+        'paper_size' : fields.selection([('letter','Letter (8.5" x 11")'),('legal','Legal (8.5" x 14")'),('a4','A4 (210mm x 297mm)')], 'Paper Size'),
+        'page_number' : fields.boolean('Include Page Numvers'),
+        'without_pagebreak' : fields.boolean('Print Without Page Breaks')
+    }
+
+    _defaults = {
+            'orientation': lambda *a:'vertical',
+            'paper_size': lambda *a:'letter',
+            'page_number':lambda *a: 0,
+            'without_pagebreak':lambda *a: 0
+    }
+
+    def action_next(self, cr, uid, ids, context=None):
+        datas = {'ids' : context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size', 'page_number', 'without_pagebreak'], context)
+        res = res and res[0] or {}  
+        datas['form'] = res
+        datas['model'] = 'survey.print.answer'
+        return { 
+                    'type':'ir.actions.report.xml',
+                    'report_name':'survey.browse.response',
+                    'datas':datas,               
+               }
+
+survey_print_answer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
new file mode 100644
index 00000000000..fc754fa2e6c
--- /dev/null
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!-- Survey Print answer Form View -->
+				 
+		<record id="view_survey_print_answer" model="ir.ui.view">
+			<field name="name">Survey Print Answer</field>
+			<field name="model">survey.print.answer</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Print Answer">
+					<separator string="Answer" colspan="4"/>
+					<field name="response_ids" nolabel="1" colspan="4" />
+				    <separator string="Print Option" colspan="4"/>
+				    <field name="orientation" colspan="4"/>
+				    <field name="paper_size" colspan="4"/>
+				    <field name="page_number" colspan="4"/>
+				    <field name="without_pagebreak" colspan="4"/>
+					<separator colspan="4" />
+					<label align="0.0" colspan="2" string="" />
+					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+					<button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
+				</form>
+			</field>
+		</record>
+
+		<!-- Survey Print answer action -->
+
+		<record id="action_view_survey_print_answer"
+			model="ir.actions.act_window">
+			<field name="name">Print Answer</field>
+			<field name="res_model">survey.print.answer</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+		</record>
+
+		<menuitem name="Print Answer" action="action_view_survey_print_answer" id="menu_print_survey_answer"
+			parent="menu_reporting" icon="STOCK_PRINT" groups="group_survey_manager"/>
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/survey/wizard/wizard_browse_answer.py b/addons/survey/wizard/wizard_browse_answer.py
deleted file mode 100644
index 90cde78fec9..00000000000
--- a/addons/survey/wizard/wizard_browse_answer.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import time
-import pooler
-from random import choice
-import string
-import tools
-from tools.translate import _
-
-_survey_form = '''<?xml version="1.0"?>
-<form string="Browse Answer">
-    <separator string="Answer" colspan="4"/>
-     <field name="response_ids" colspan="4" nolabel="1"/>
-    <separator string="Print Option" colspan="4"/>
-    <field name="orientation" colspan="4"/>
-    <field name="paper_size" colspan="4"/>
-    <field name="page_number" colspan="4"/>
-    <field name="without_pagebreak" colspan="4"/>
-</form>'''
-
-_survey_fields = {
-    'response_ids': {'string': 'Survey', 'type': 'many2many', 'relation': 'survey.response','required':'1'},
-    'orientation':{
-        'string':"Orientation",
-        'type':'selection',
-        'selection':[('vertical','Portrait(Vertical)'),
-                     ('horizontal','Landscape(Horizontal)')],
-        'default': lambda *a:'vertical'},
-    'paper_size':{
-        'string':"Paper Size",
-        'type':'selection',
-        'selection':[('letter','Letter (8.5" x 11")'),
-                     ('legal','Legal (8.5" x 14")'),
-                     ('a4','A4 (210mm x 297mm)')],
-        'default': lambda *a:'letter'},
-    'page_number': {'string':'Include Page Numbers', 'type':'boolean', 'default':lambda *a: 0},
-    'without_pagebreak': {'string':'Print Without Page Breaks', 'type':'boolean', 'default':lambda *a: 0},
-    }
-
-class browse_answer_wizard(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form', 'arch' :_survey_form, 'fields' :_survey_fields,\
-                             'state' : [('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-print')]}
-                },
-        'print': {
-            'actions': [],
-            'result': {'type':'print', 'report':'survey.browse.response', 'state':'end'}
-        }
-    }
-browse_answer_wizard('wizard.browse.answer')

From 4f64d9ca92da0f16b6a0230f3c0b904e3d29ced7 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 22 Mar 2010 13:43:44 +0530
Subject: [PATCH 093/248] [IMP] crm : set normal priority

bzr revid: hmo@tinyerp.com-20100322081344-hea0pq1lvtrsoaq0
---
 addons/crm/crm_helpdesk.py    | 4 ++++
 addons/crm/crm_lead.py        | 1 +
 addons/crm/crm_opportunity.py | 1 +
 addons/crm/crm_phonecall.py   | 3 ++-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_helpdesk.py b/addons/crm/crm_helpdesk.py
index 2553e58f5ed..43f48025572 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm/crm_helpdesk.py
@@ -44,6 +44,10 @@ class crm_helpdesk(osv.osv):
             'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.helpdesk')]"),
             'duration': fields.float('Duration'),
     }
+    _defaults = {
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+    }
 
 crm_helpdesk()
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 63bb4670711..ae1e6c66d48 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -83,6 +83,7 @@ class crm_lead(osv.osv):
 
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
 crm_lead()
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index d2fff629c5a..da5a1c719a7 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -117,6 +117,7 @@ class crm_opportunity(osv.osv):
 
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.opportunity', context=c),
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
 crm_opportunity()
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 6a65195a38b..52af836d5b7 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -42,7 +42,8 @@ class crm_phonecall(osv.osv):
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),
     }
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S')
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 crm_phonecall()
 

From 509790bbcbad2a6e9452e85cf00ecbfbbf67c655 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 14:24:56 +0530
Subject: [PATCH 094/248] [ADD]: olap: Added missing security file

bzr revid: ksa@tinyerp.co.in-20100322085456-2wjl3cp3akyifga2
---
 addons/olap/security/ir.model.access.csv | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 addons/olap/security/ir.model.access.csv

diff --git a/addons/olap/security/ir.model.access.csv b/addons/olap/security/ir.model.access.csv
new file mode 100644
index 00000000000..d400bf80bb0
--- /dev/null
+++ b/addons/olap/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"olap_query_logs_clear","olap.query.logs.clear","model_olap_query_logs_clear","base.group_user",1,1,1,1
+"olap_query_logs_clear_msg","olap.query.logs.clear.msg","model_olap_query_logs_clear_msg","base.group_user",1,1,1,1
+"olap_load_column","olap.load.column","model_olap_load_column","base.group_user",1,1,1,1
+"olap_saved_query","olap.saved.query","model_olap_saved_query","base.group_user",1,1,1,1
+"olap_warehouse_wizard","olap.warehouse.wizard","model_olap_warehouse_wizard","base.group_user",1,1,1,1
+"olap_parameters_config_wizard","olap.parameters.config.wizard","model_olap_parameters_config_wizard","base.group_user",1,1,1,1
+"olap_bi_load_db_wizard","bi.load.db.wizard ","model_bi_load_db_wizard","base.group_user",1,1,1,1
+"olap_bi_auto_configure_wizard","bi.auto.configure.wizard","model_bi_auto_configure_wizard","base.group_user",1,1,1,1

From 51e376ba0caf6807cbf1870c17a9d801a6dd2858 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 14:42:54 +0530
Subject: [PATCH 095/248] [IMP] survey :- convert simple
 wizard(survey_selection and survey_answer) to osv_memory wizard.

bzr revid: ysa@tinyerp.co.in-20100322091254-3txcn4bwo0j7ozuo
---
 addons/survey/__terp__.py                     |    3 +-
 addons/survey/survey.py                       | 1162 -----------------
 addons/survey/wizard/__init__.py              |    2 +
 addons/survey/wizard/survey_answer.py         | 1110 ++++++++++++++++
 addons/survey/wizard/survey_answer.xml        |   43 +
 addons/survey/wizard/survey_selection.py      |  108 ++
 .../survey_selection.xml}                     |   38 +-
 7 files changed, 1266 insertions(+), 1200 deletions(-)
 create mode 100644 addons/survey/wizard/survey_answer.py
 create mode 100644 addons/survey/wizard/survey_answer.xml
 create mode 100644 addons/survey/wizard/survey_selection.py
 rename addons/survey/{survey_que_wizard.xml => wizard/survey_selection.xml} (55%)

diff --git a/addons/survey/__terp__.py b/addons/survey/__terp__.py
index c4548c6c6e4..1074d429f62 100644
--- a/addons/survey/__terp__.py
+++ b/addons/survey/__terp__.py
@@ -34,8 +34,9 @@
     'depends': ['base'],
     'update_xml': ['survey_report.xml',
                    'survey_data.xml',
-                   'survey_que_wizard.xml',
                    'survey_wizard.xml',
+                   'wizard/survey_selection.xml',
+                   'wizard/survey_answer.xml',
                    'survey_view.xml',
                    'security/ir.model.access.csv',
                    'wizard/survey_print_statistics.xml',
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index b3870e82b48..0e548cb1a30 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -21,13 +21,10 @@
 ##############################################################################
 
 from osv import fields, osv
-import datetime
 from time import strftime
 import datetime
 import copy
 from tools.translate import _
-from lxml import etree
-from tools import to_xml
 import tools
 from mx.DateTime import *
 import netsvc
@@ -603,1165 +600,6 @@ class survey_response_answer(osv.osv):
 
 survey_response_answer()
 
-class survey_name_wiz(osv.osv_memory):
-    _name = 'survey.name.wiz'
-
-    def default_get(self, cr, uid, fields, context={}):
-        if not context:
-            context = {}
-        data = super(survey_name_wiz, self).default_get(cr, uid, fields, context)
-        if context.has_key('survey_id'):
-            data['survey_id'] = context.get('survey_id',False)
-        return data
-
-    def _get_survey(self, cr, uid, context=None):
-        surv_obj = self.pool.get("survey")
-        result = []
-        if context.has_key('survey_id'):
-            for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
-                result.append((sur.id, sur.title))
-            return result
-        group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / Manager')])
-        user_obj = self.pool.get('res.users')
-        user_rec = user_obj.read(cr, uid, uid)
-        for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
-            if sur.state == 'open':
-                if group_id[0]  in user_rec['groups_id']:
-                    result.append((sur.id, sur.title))
-                elif sur.id in user_rec['survey_id']:
-                    result.append((sur.id, sur.title))
-        return result
-
-    _columns = {
-        'survey_id': fields.selection(_get_survey, "Survey", required="1"),
-        'page_no' : fields.integer('Page Number'),
-        'note' : fields.text("Description"),
-        'page' : fields.char('Page Position',size = 12),
-        'transfer' : fields.boolean('Page Transfer'),
-        'store_ans' : fields.text('Store Answer'),
-        'response' : fields.char('Response',size=16)
-    }
-    _defaults = {
-        'page_no' : lambda * a: - 1,
-        'page' : lambda * a: 'next',
-        'transfer' : lambda * a: 1,
-        'response' : lambda * a: 0,
-    }
-
-    def action_next(self, cr, uid, ids, context=None):
-        survey_obj = self.pool.get('survey')
-        search_obj = self.pool.get('ir.ui.view')
-
-        sur_id = self.read(cr, uid, ids, [])[0]
-        survey_id = sur_id['survey_id']
-        context.update({'survey_id' : survey_id, 'sur_name_id' : sur_id['id']})
-        cr.execute('select count(id) from survey_history where user_id=%s\
-                    and survey_id=%s' % (uid,survey_id))
-
-        res = cr.fetchone()[0]
-        user_limit = survey_obj.read(cr, uid, survey_id, ['response_user'])['response_user']
-        if user_limit and res >= user_limit:
-            raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
-        
-        sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id'])
-        if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']:
-            raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
-
-        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-
-        return {
-            'view_type': 'form',
-            "view_mode": 'form',
-            'res_model': 'survey.question.wiz',
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            'search_view_id':search_id[0],
-            'context' : context
-         }
-
-    def on_change_survey(self, cr, uid, ids, survey_id, context=None):
-        notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note']
-        return {'value': {'note' : notes}}
-
-survey_name_wiz()
-
-class survey_question_wiz(osv.osv_memory):
-    _name = 'survey.question.wiz'
-    _columns = {
-        'name': fields.integer('Number'),
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
-        result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
-        surv_name_wiz = self.pool.get('survey.name.wiz')
-        survey_obj = self.pool.get('survey')
-        page_obj = self.pool.get('survey.page')
-        que_obj = self.pool.get('survey.question')
-        ans_obj = self.pool.get('survey.answer')
-        sur_response_obj = self.pool.get('survey.response')
-        que_col_head = self.pool.get('survey.question.column.heading')
-        user_obj = self.pool.get('res.users')
-
-        if view_type in ['form']:
-            wiz_id = 0
-            if not context.has_key('sur_name_id'):
-                res_data = {
-                        'survey_id' : context.get('survey_id', False),
-                        'page_no' :-1,
-                        'page':'next',
-                        'transfer' :1,
-                        'response':0
-                }
-                wiz_id = surv_name_wiz.create(cr, uid, res_data)
-                sur_name_rec = surv_name_wiz.read(cr, uid, wiz_id, [])
-                context.update({'sur_name_id' :wiz_id})
-            else:
-                sur_name_rec = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
-
-            if context.has_key('active_id'):
-                context.pop('active_id')
-
-            survey_id = context.get('survey_id', False)
-            sur_rec = survey_obj.read(cr, uid, survey_id, [])
-            p_id = sur_rec['page_ids']
-            total_pages = len(p_id)
-            pre_button = False
-            readonly = 0
-
-            if context.has_key('response_id') and context.get('response_id', False) and int(context['response_id'][0]) > 0:
-                readonly = 1
-
-            if not sur_name_rec['page_no'] + 1 :
-                surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':{}})
-
-            sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
-            page_number = int(sur_name_rec['page_no'])
-            if sur_name_read['transfer'] or not sur_name_rec['page_no'] + 1:
-                surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'transfer':False})
-                flag = False
-                fields = {}
-                if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == -1:
-                    if total_pages > sur_name_rec['page_no'] + 1:
-                        if ((context.has_key('active') and not context.get('active', False)) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1:
-                            if sur_rec['state'] != "open" :
-                                raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
-                            cr.execute('select count(id) from survey_history where user_id=%s\
-                                                    and survey_id=%s' % (uid,survey_id))
-                            res = cr.fetchone()[0]
-                            user_limit = survey_obj.read(cr, uid, survey_id, ['response_user'])['response_user']
-                            if user_limit and res >= user_limit:
-                                raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
-
-                        if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey'] and not sur_name_rec['page_no'] + 1:
-                            survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
-
-                        p_id = p_id[sur_name_rec['page_no'] + 1]
-                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec['page_no'] + 1})
-                        flag = True
-                        page_number += 1
-                    if sur_name_rec['page_no'] > - 1:
-                        pre_button = True
-                else:
-                    if sur_name_rec['page_no'] != 0:
-                        p_id = p_id[sur_name_rec['page_no'] - 1]
-                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec['page_no'] - 1})
-                        flag = True
-                        page_number -= 1
-
-                    if sur_name_rec['page_no'] > 1:
-                        pre_button = True
-                if flag:
-                    pag_rec = page_obj.read(cr, uid, p_id)
-                    xml_form = etree.Element('form', {'string': _(tools.ustr(pag_rec['title']))})
-                    xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-                    if context.has_key('response_id') and context.get('response_id', False)  and int(context.get('response_id',0)[0]) > 0:
-                        xml_group = etree.SubElement(xml_form, 'group', {'col': '40', 'colspan': '4'})
-                        record = sur_response_obj.browse(cr, uid, context['response_id'][context['response_no']])
-                        etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr('Answer Of :- ' + record.user_id.name + ',  Date :- ' + record.date_create.split('.')[0]  )), 'align':"0.0"})
-                        etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(" Response :- " + str(context.get('response_no',0) + 1) +"/" + str(len(context.get('response_id',0))) )), 'align':"0.0"})
-                        if context.get('response_no',0) > 0:
-                            etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_forward_previous",'string': tools.ustr("Previous Answer"),'type':"object"})
-                        if context.get('response_no',0) + 1 < len(context.get('response_id',0)):
-                            etree.SubElement(xml_group, 'button', {'colspan':"1",'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
-
-                    if wiz_id:
-                        fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}}
-                        etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0)})
-
-                    if pag_rec['note']:
-                        xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-                        for que_test in pag_rec['note'].split('\n'):
-                            etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
-                    que_ids = pag_rec['question_ids']
-                    qu_no = 0
-
-                    for que in que_ids:
-                        qu_no += 1
-                        que_rec = que_obj.read(cr, uid, que)
-                        descriptive_text = ""
-                        separator_string = tools.ustr(qu_no) + "." + tools.ustr(que_rec['question'])
-                        if ((context.has_key('active') and not context.get('active',False)) or not context.has_key('active')) and que_rec['is_require_answer']:
-                            star = '*'
-                        else:
-                            star = ''
-                        xml_group = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '4'})
-
-                        if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
-                            xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
-                            etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
-                            xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
-                            context.update({'question_id' : tools.ustr(que),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer'], 'page_id' : p_id})
-                            etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-edit", 'type' :'object', 'name':"action_edit_question", 'context' : tools.ustr(context)})
-                            etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-delete", 'type' :'object','name':"action_delete_question", 'context' : tools.ustr(context)})
-                        else:
-                            xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-                            etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '4'})
-
-                        ans_ids = ans_obj.read(cr, uid, que_rec['answer_choice_ids'], [])
-                        xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-
-                        if que_rec['type'] == 'multiple_choice_only_one_ans':
-                            selection = []
-                            for ans in ans_ids:
-                                selection.append((tools.ustr(ans['id']), ans['answer']))
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
-                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_selection"})
-                            fields[tools.ustr(que) + "_selection"] = {'type':'selection', 'selection' :selection, 'string':"Answer"}
-
-                        elif que_rec['type'] == 'multiple_choice_multiple_ans':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
-                            for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
-                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'boolean', 'string':ans['answer']}
-
-                        elif que_rec['type'] in ['matrix_of_choices_only_one_ans', 'rating_scale']:
-                            if que_rec['comment_column']:
-                                col = "4"
-                                colspan = "4"
-                            else:
-                               col = "2"
-                               colspan = "2"
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': tools.ustr(col), 'colspan': tools.ustr(colspan)})
-                            for row in ans_ids:
-                                etree.SubElement(xml_group, 'newline')
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_selection_" + tools.ustr(row['id']),'string':to_xml(tools.ustr(row['answer']))})
-                                selection = [('','')]
-                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                    selection.append((str(col['id']), col['title']))
-                                fields[tools.ustr(que) + "_selection_" + tools.ustr(row['id'])] = {'type':'selection', 'selection' : selection, 'string': "Answer"}
-                                if que_rec['comment_column']:
-                                   fields[tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id']) + "_field"] = {'type':'char', 'size' : 255, 'string':tools.ustr(que_rec['column_name']), 'views':{}}
-                                   etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id'])+ "_field"})
-
-                        elif que_rec['type'] == 'matrix_of_choices_only_multi_ans':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
-                            etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
-                            for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col['title']),'colspan': '1'})
-                            for row in ans_ids:
-                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row['answer'])) +' :-', 'align': '0.0'})
-                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']), 'nolabel':"1"})
-                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'boolean', 'string': col['title']}
-
-                        elif que_rec['type'] == 'matrix_of_drop_down_menus':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
-                            etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
-                            for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col['title']),'colspan': '1'})
-                            for row in ans_ids:
-                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row['answer']))+' :-', 'align': '0.0'})
-                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                    selection = []
-                                    if col['menu_choice']:
-                                        for item in col['menu_choice'].split('\n'):
-                                            if item and not item.strip() == '': selection.append((item ,item))
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']),'nolabel':'1'})
-                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'selection', 'string': col['title'], 'selection':selection}
-
-                        elif que_rec['type'] == 'multiple_textboxes':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
-                            type = "char"
-                            if que_rec['is_validation_require']:
-                                if que_rec['validation_type'] in ['must_be_whole_number']:
-                                    type = "integer"
-                                elif que_rec['validation_type'] in ['must_be_decimal_number']:
-                                    type = "float"
-                                elif que_rec['validation_type'] in ['must_be_date']:
-                                    type = "date"
-                            for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
-                                if type == "char" :
-                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
-                                else:
-                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type': str(type), 'string':ans['answer']}
-
-                        elif que_rec['type'] == 'numerical_textboxes':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
-                            for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"})
-                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"] = {'type':'integer', 'string':ans['answer']}
-
-                        elif que_rec['type'] == 'date':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
-                            for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
-                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'date', 'string':ans['answer']}
-
-                        elif que_rec['type'] == 'date_and_time':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
-                            for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
-                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'datetime', 'string':ans['answer']}
-
-                        elif que_rec['type'] == 'descriptive_text':
-                            for que_test in que_rec['descriptive_text'].split('\n'):
-                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
-
-                        elif que_rec['type'] == 'single_textbox':
-                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_single", 'nolabel':"1" ,'colspan':"4"})
-                            fields[tools.ustr(que) + "_single"] = {'type':'char', 'size' : 255, 'string':"single_textbox", 'views':{}}
-
-                        elif que_rec['type'] == 'comment':
-                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_comment", 'nolabel':"1" ,'colspan':"4"})
-                            fields[tools.ustr(que) + "_comment"] = {'type':'text', 'string':"Comment/Eassy Box", 'views':{}}
-
-                        elif que_rec['type'] == 'table':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids'])), 'colspan': '4'})
-                            for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col['title']),'colspan': '1'})
-                            for row in range(0,que_rec['no_of_rows']):
-                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row), 'nolabel':"1"})
-                                    fields[tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row)] = {'type':'char','size':255,'views':{}}
-
-                        elif que_rec['type'] == 'multiple_textboxes_diff_type':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
-                            for ans in ans_ids:
-                                if ans['type'] == "email" :
-                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'widget':'email','width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
-                                else:
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
-                                    if ans['type'] == "char" :
-                                        fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
-                                    elif ans['type'] in ['integer','float','date','datetime']:
-                                        fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type': str(ans['type']), 'string':ans['answer']}
-                                    else:
-                                        selection = []
-                                        if ans['menu_choice']:
-                                            for item in ans['menu_choice'].split('\n'):
-                                                if item and not item.strip() == '': selection.append((item ,item))
-                                        fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'selection', 'selection' : selection, 'string':ans['answer']}
-
-                        if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale'] and que_rec['is_comment_require']:
-                            if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans'] and que_rec['comment_field_type'] in ['char','text'] and que_rec['make_comment_field']:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_otherfield", 'colspan':"4"})
-                                fields[tools.ustr(que) + "_otherfield"] = {'type':'boolean', 'string':que_rec['comment_label'], 'views':{}}
-                                if que_rec['comment_field_type'] == 'char':
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
-                                    fields[tools.ustr(que) + "_other"] = {'type': 'char', 'string': '', 'size':255, 'views':{}}
-                                elif que_rec['comment_field_type'] == 'text':
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
-                                    fields[tools.ustr(que) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
-                            else:
-                                if que_rec['comment_field_type'] == 'char':
-                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec['comment_label'])),'colspan':"4"})
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
-                                    fields[tools.ustr(que) + "_other"] = {'type': 'char', 'string': '', 'size':255, 'views':{}}
-                                elif que_rec['comment_field_type'] == 'text':
-                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec['comment_label'])),'colspan':"4"})
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
-                                    fields[tools.ustr(que) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
-
-                    etree.SubElement(xml_form, 'separator', {'colspan': '4'})
-                    xml_group = etree.SubElement(xml_form, 'group', {'col': '6', 'colspan': '4'})
-                    etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
-                    fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
-                    etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
-                    etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
-
-                    if pre_button:
-                        etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
-                    but_string = "Next"
-                    if int(page_number) + 1 == total_pages:
-                        but_string = "Done"
-
-                    if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
-                    elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
-                    elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context)})
-                    else:
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context)})
-
-                    if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
-                        etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
-                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer']})
-                        xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
-
-                    root = xml_form.getroottree()
-                    result['arch'] = etree.tostring(root)
-                    result['fields'] = fields
-                    result['context'] = context
-                else:
-                    survey_obj.write(cr, uid, survey_id, {'tot_comp_survey' : sur_rec['tot_comp_survey'] + 1})
-                    sur_response_obj.write(cr, uid, [sur_name_read['response']], {'state' : 'done'})
-
-                    if sur_rec['send_response']:
-                        survey_data = survey_obj.browse(cr, uid, int(survey_id))
-                        response_id = surv_name_wiz.read(cr,uid,context.get('sur_name_id',False))['response']
-                        context.update({'response_id':response_id})
-                        report = self.create_report(cr, uid, [int(survey_id)], 'report.survey.browse.response', survey_data.title,context)
-                        attachments = []
-                        file = open(tools.config['addons_path'] + '/survey/report/' + survey_data.title + ".pdf")
-                        file_data = ""
-                        while 1:
-                            line = file.readline()
-                            file_data += line
-                            if not line:
-                                break
-
-                        attachments.append((survey_data.title + ".pdf",file_data))
-                        file.close()
-                        os.remove(tools.config['addons_path'] + '/survey/report/' + survey_data.title + ".pdf")
-                        user_email = False
-                        resp_email = False
-
-                        if user_obj.browse(cr, uid, uid).address_id.id:
-                            cr.execute("select email from res_partner_address where id =%d" % user_obj.browse(cr, uid, uid).address_id.id)
-                            user_email = cr.fetchone()[0]
-                        resp_id = survey_data.responsible_id.address_id
-
-                        if resp_id:
-                            cr.execute("select email from res_partner_address where id =%d" % resp_id.id)
-                            resp_email = cr.fetchone()[0]
-                        if user_email and resp_email:
-                            mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_obj.browse(cr, uid, uid).name) + " Give Response Of " + survey_data.title + " Survey.\n\n Thanks,"
-                            tools.email_send(user_email, [resp_email], "Survey Response Of " + str(user_obj.browse(cr, uid, uid).name) , mail, attach = attachments)
-
-                    xml_form = etree.Element('form', {'string': _('Complete Survey Response')})
-                    etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
-                    etree.SubElement(xml_form, 'label', {'string': 'Thanks for your response'})
-                    etree.SubElement(xml_form, 'newline')
-                    etree.SubElement(xml_form, 'button', {'icon': "gtk-go-forward", 'special':"cancel",'string':"OK",'colspan':"2"})
-                    root = xml_form.getroottree()
-                    result['arch'] = etree.tostring(root)
-                    result['fields'] = {}
-                    result['context'] = context
-        return result
-
-    def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
-        if not report_name or not res_ids:
-            return (False, Exception('Report name and Resources ids are required !!!'))
-        try:
-            ret_file_name = tools.config['addons_path'] + '/survey/report/' + file_name + '.pdf'
-            service = netsvc.LocalService(report_name);
-            (result, format) = service.create(cr, uid, res_ids, {}, context)
-            fp = open(ret_file_name, 'wb+');
-            fp.write(result);
-            fp.close();
-
-        except Exception,e:
-            print 'Exception in create report:',e
-            return (False, str(e))
-
-        return (True, ret_file_name)
-
-    def default_get(self, cr, uid, fields_list, context=None):
-        value = {}
-        for field in fields_list:
-            if field.split('_')[0] == 'progress':
-                tot_page_id = self.pool.get('survey').browse(cr, uid, context.get('survey_id',False))
-                tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids))
-                value[field] = tot_per
-        response_obj = self.pool.get('survey.response')
-        surv_name_wiz = self.pool.get('survey.name.wiz')
-        
-        if context.has_key('response_id') and context.get('response_id') and int(context['response_id'][0]) > 0:
-            data = super(survey_question_wiz, self).default_get(cr, uid, fields_list, context)
-            response_ans = response_obj.browse(cr, uid, context['response_id'][context['response_no']])
-            fields_list.sort()
-
-            for que in response_ans.question_ids:
-                for field in fields_list:
-                    if field.split('_')[0] != "progress" and field.split('_')[0] == str(que.question_id.id):
-                        if que.response_answer_ids and len(field.split('_')) == 4 and field.split('_')[1] == "commentcolumn" and field.split('_')[3] == "field":
-                            for ans in que.response_answer_ids:
-                                if str(field.split('_')[2]) == str(ans.answer_id.id):
-                                    value[field] = ans.comment_field
-
-                        if que.response_table_ids and len(field.split('_')) == 4 and field.split('_')[1] == "table":
-                            for ans in que.response_table_ids:
-                                if str(field.split('_')[2]) == str(ans.column_id.id) and str(field.split('_')[3]) ==  str(ans.name):
-                                    value[field] = ans.value
-
-                        if que.comment and (field.split('_')[1] == "comment" or field.split('_')[1] == "other"):
-                            value[field] = str(que.comment)
-
-                        elif que.single_text and field.split('_')[1] == "single":
-                            value[field] = str(que.single_text)
-
-                        elif que.response_answer_ids and len(field.split('_')) == 3 and field.split('_')[1] == "selection":
-                            for ans in que.response_answer_ids:
-                                if str(field.split('_')[2]) == str( ans.answer_id.id):
-                                    value[field] = str(ans.column_id.id)
-
-                        elif que.response_answer_ids and len(field.split('_')) == 2 and field.split('_')[1] == "selection":
-                            value[field] = str(que.response_answer_ids[0].answer_id.id)
-
-                        elif que.response_answer_ids and len(field.split('_')) == 3 and field.split('_')[2] != "multi" and field.split('_')[2] != "numeric":
-                            for ans in que.response_answer_ids:
-                                if str(field.split('_')[1]) == str( ans.answer_id.id) and str(field.split('_')[2]) == str(ans.column_id.id):
-                                    if ans.value_choice:
-                                        value[field] = ans.value_choice
-                                    else:
-                                        value[field] = True
-
-                        else:
-                            for ans in que.response_answer_ids:
-                                if str(field.split('_')[1]) == str( ans.answer_id.id):
-                                    value[field] = ans.answer
-
-        else:
-            if not context.has_key('sur_name_id'):
-                return value
-            if context.has_key('active') and context.get('active',False):
-                return value
-            
-            sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
-            ans_list = []
-            for key,val in sur_name_read['store_ans'].items():
-                for field in fields_list:
-                    if field in list(val):
-                        value[field] = val[field]
-
-        return value
-
-    def create(self, cr, uid, vals, context=None):
-        if context.has_key('active') and context.get('active',False):
-            return True
-
-        for key,val in vals.items():
-            if key.split('_')[0] == "progress":
-                vals.pop(key)
-            if not context.has_key('sur_name_id') and key.split('_')[0] == "wizardid":
-                context.update({'sur_name_id': int(key.split('_')[1])})
-                vals.pop(key)
-
-        click_state = True
-        click_update = []
-        surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_all_resp_obj = self.pool.get('survey.response')
-        surv_tbl_column_obj = self.pool.get('survey.tbl.column.heading')
-        survey_obj = self.pool.get('survey')
-        resp_obj = self.pool.get('survey.response.line')
-        res_ans_obj = self.pool.get('survey.response.answer')
-        que_obj = self.pool.get('survey.question')
-        sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False), [])
-        response_id =  0
-
-        if not sur_name_read['response']:
-            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context['survey_id']})
-            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'response' : tools.ustr(response_id)})
-        else:
-            response_id = int(sur_name_read['response'])
-
-        if response_id not in surv_all_resp_obj.search(cr, uid, []):
-            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context.get('survey_id',False)})
-            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'response' : tools.ustr(response_id)})
-
-        #click first time on next button then increemnet on total start suvey
-        if not sur_name_read['store_ans']:
-            his_id = self.pool.get('survey.history').create(cr, uid, {'user_id': uid, \
-                                              'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': sur_name_read['survey_id']})
-            sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
-            survey_obj.write(cr, uid, sur_name_read['survey_id'],  {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
-            if context.has_key('cur_id'):
-                if context.has_key('request') and context.get('request',False):
-                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
-                    self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
-                else:
-                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
-
-        for key,val in sur_name_read['store_ans'].items():
-            for field in vals:
-                if field.split('_')[0] == val['question_id']:
-                    click_state = False
-                    click_update.append(key)
-                    break
-
-        if click_state:
-            que_li = []
-            resp_id_list = []
-            for key, val in vals.items():
-                que_id = key.split('_')[0]
-                if que_id not in que_li:
-                    que_li.append(que_id)
-                    que_rec = que_obj.read(cr, uid, [int(que_id)], [])[0]
-                    res_data =  {
-                        'question_id':que_id, 
-                        'date_create':datetime.datetime.now(),
-                        'state':'done',
-                        'response_id' : response_id
-                    }
-                    resp_id = resp_obj.create(cr, uid, res_data)
-                    resp_id_list.append(resp_id)
-                    sur_name_read['store_ans'].update({resp_id:{'question_id':que_id}})
-                    surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
-                    select_count = 0
-                    numeric_sum = 0
-                    selected_value = []
-                    matrix_list = []
-                    comment_field = False
-                    comment_value = False
-                    response_list = []
-
-                    for key1, val1 in vals.items():
-                        if val1 and key1.split('_')[1] == "table" and key1.split('_')[0] == que_id:
-                            surv_tbl_column_obj.create(cr, uid, {'response_table_id' : resp_id,'column_id':key1.split('_')[2], 'name':key1.split('_')[3], 'value' : val1})
-                            sur_name_read['store_ans'][resp_id].update({key1:val1})
-                            select_count += 1
-
-                        elif val1 and key1.split('_')[1] == "otherfield" and key1.split('_')[0] == que_id:
-                            comment_field = True
-                            sur_name_read['store_ans'][resp_id].update({key1:val1})
-                            select_count += 1
-                            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
-                            continue
-
-                        elif val1 and key1.split('_')[1] == "selection" and key1.split('_')[0] == que_id:
-                            if len(key1.split('_')) > 2:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'column_id' : val1})
-                                selected_value.append(val1)
-                                response_list.append(str(ans_create_id) + "_" + str(key1.split('_')[-1]))
-                            else:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':val1})
-                            sur_name_read['store_ans'][resp_id].update({key1:val1})
-                            select_count += 1
-
-                        elif key1.split('_')[1] == "other" and key1.split('_')[0] == que_id:
-                            if not val1:
-                                comment_value = True
-                            else:
-                                error = False
-                                if que_rec['is_comment_require'] and que_rec['comment_valid_type'] == 'must_be_specific_length':
-                                    if (not val1 and  que_rec['comment_minimum_no']) or len(val1) <  que_rec['comment_minimum_no'] or len(val1) > que_rec['comment_maximum_no']:
-                                        error = True
-                                elif que_rec['is_comment_require'] and  que_rec['comment_valid_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
-                                    error = False
-                                    try:
-                                        if que_rec['comment_valid_type'] == 'must_be_whole_number':
-                                            value = int(val1)
-                                            if value <  que_rec['comment_minimum_no'] or value > que_rec['comment_maximum_no']:
-                                                error = True
-                                        elif que_rec['comment_valid_type'] == 'must_be_decimal_number':
-                                            value = float(val1)
-                                            if value <  que_rec['comment_minimum_float'] or value > que_rec['comment_maximum_float']:
-                                                error = True
-                                        elif que_rec['comment_valid_type'] == 'must_be_date':
-                                            value = datetime.datetime.strptime(val1, "%Y-%m-%d")
-                                            if value <  datetime.datetime.strptime(que_rec['comment_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['comment_maximum_date'], "%Y-%m-%d"):
-                                                error = True
-                                    except:
-                                        error = True
-                                elif que_rec['is_comment_require'] and  que_rec['comment_valid_type'] == 'must_be_email_address':
-                                    import re
-                                    if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val1) == None:
-                                            error = True
-                                if error:
-                                    for res in resp_id_list:
-                                        sur_name_read['store_ans'].pop(res)
-                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
-
-                                resp_obj.write(cr, uid, resp_id, {'comment':val1})
-                                sur_name_read['store_ans'][resp_id].update({key1:val1})
-
-                        elif val1 and key1.split('_')[1] == "comment" and key1.split('_')[0] == que_id:
-                            resp_obj.write(cr, uid, resp_id, {'comment':val1})
-                            sur_name_read['store_ans'][resp_id].update({key1:val1})
-                            select_count += 1
-
-                        elif val1 and key1.split('_')[0] == que_id and (key1.split('_')[1] == "single"  or (len(key1.split('_')) > 2 and key1.split('_')[2] == 'multi')):
-                            error = False
-                            if que_rec['is_validation_require'] and que_rec['validation_type'] == 'must_be_specific_length':
-                                if (not val1 and  que_rec['validation_minimum_no']) or len(val1) <  que_rec['validation_minimum_no'] or len(val1) > que_rec['validation_maximum_no']:
-                                    error = True
-                            elif que_rec['is_validation_require'] and que_rec['validation_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
-                                error = False
-                                try:
-                                    if que_rec['validation_type'] == 'must_be_whole_number':
-                                        value = int(val1)
-                                        if value <  que_rec['validation_minimum_no'] or value > que_rec['validation_maximum_no']:
-                                            error = True
-                                    elif que_rec['validation_type'] == 'must_be_decimal_number':
-                                        value = float(val1)
-                                        if value <  que_rec['validation_minimum_float'] or value > que_rec['validation_maximum_float']:
-                                            error = True
-                                    elif que_rec['validation_type'] == 'must_be_date':
-                                        value = datetime.datetime.strptime(val1, "%Y-%m-%d")
-                                        if value <  datetime.datetime.strptime(que_rec['validation_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['validation_maximum_date'], "%Y-%m-%d"):
-                                            error = True
-                                except:
-                                    error = True
-                            elif que_rec['is_validation_require'] and que_rec['validation_type'] == 'must_be_email_address':
-                                import re
-                                if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val1) == None:
-                                        error = True
-                            if error:
-                                for res in resp_id_list:
-                                    sur_name_read['store_ans'].pop(res)
-                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
-
-                            if key1.split('_')[1] == "single" :
-                                resp_obj.write(cr, uid, resp_id, {'single_text':val1})
-                            else:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : val1})
-
-                            sur_name_read['store_ans'][resp_id].update({key1:val1})
-                            select_count += 1
-
-                        elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) > 2 and key1.split('_')[2] == 'numeric':
-                            if not val1=="0":
-                                try:
-                                    numeric_sum += int(val1)
-                                    ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : val1})
-                                    sur_name_read['store_ans'][resp_id].update({key1:val1})
-                                    select_count += 1
-                                except:
-                                    for res in resp_id_list:
-                                        sur_name_read['store_ans'].pop(res)
-                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' \nPlease enter an integer value " ))
-
-                        elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 3:
-                            if type(val1) == type('') or type(val1) == type(u''):
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'column_id' : key1.split('_')[2], 'value_choice' : val1})
-                                sur_name_read['store_ans'][resp_id].update({key1:val1})
-                            else:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'column_id' : key1.split('_')[2]})
-                                sur_name_read['store_ans'][resp_id].update({key1:True})
-
-                            matrix_list.append(key1.split('_')[0] + '_' + key1.split('_')[1])
-                            select_count += 1
-
-                        elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 2:
-                            ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'answer' : val1})
-                            sur_name_read['store_ans'][resp_id].update({key1:val1})
-                            select_count += 1
-                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
-
-                    for key,val in vals.items():
-                        if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == que_id:
-                            for res_id in response_list:
-                                if key.split('_')[2] in res_id.split('_')[1]:
-                                    a = res_ans_obj.write(cr, uid, [res_id.split('_')[0]], {'comment_field':val})
-                                    sur_name_read['store_ans'][resp_id].update({key:val})
-
-                    if comment_field and comment_value:
-                        for res in resp_id_list:
-                            sur_name_read['store_ans'].pop(res)
-                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
-
-                    if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
-                        for res in resp_id_list:
-                            sur_name_read['store_ans'].pop(res)
-                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
-
-                    if not select_count:
-                        resp_obj.write(cr, uid, resp_id, {'state':'skip'})
-
-                    if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
-                        for res in resp_id_list:
-                            sur_name_read['store_ans'].pop(res)
-                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
-
-                    if que_rec['type'] in ['multiple_textboxes_diff_type', 'multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
-                        if matrix_list:
-                            if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
-                            (que_rec['required_type'] == 'at least' and len(list(set(matrix_list))) < que_rec['req_ans']) or \
-                            (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > que_rec['req_ans']) or \
-                            (que_rec['required_type'] == 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \
-                            (que_rec['required_type'] == 'a range' and (len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):
-                                for res in resp_id_list:
-                                    sur_name_read['store_ans'].pop(res)
-                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
-
-                        elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
-                            (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
-                            (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
-                            (que_rec['required_type'] == 'exactly' and select_count != que_rec['req_ans']) or \
-                            (que_rec['required_type'] == 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):
-                            for res in resp_id_list:
-                                sur_name_read['store_ans'].pop(res)
-                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
-
-                    if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
-                        for res in resp_id_list:
-                            sur_name_read['store_ans'].pop(res)
-                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
-
-        else:
-            resp_id_list = []
-            for update in click_update:
-                que_rec = que_obj.read(cr, uid , [int(sur_name_read['store_ans'][update]['question_id'])], [])[0]
-                res_ans_obj.unlink(cr, uid,res_ans_obj.search(cr, uid, [('response_id', '=', update)]))
-                surv_tbl_column_obj.unlink(cr, uid,surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', update)]))
-                resp_id_list.append(update)
-                sur_name_read['store_ans'].update({update:{'question_id':sur_name_read['store_ans'][update]['question_id']}})
-                surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
-                select_count = 0
-                numeric_sum = 0
-                selected_value = []
-                matrix_list = []
-                comment_field = False
-                comment_value = False
-                response_list = []
-
-                for key, val in vals.items():
-                    ans_id_len = key.split('_')
-                    if ans_id_len[0] == sur_name_read['store_ans'][update]['question_id']:
-                        if val and key.split('_')[1] == "table":
-                            surv_tbl_column_obj.create(cr, uid, {'response_table_id' : update,'column_id':key.split('_')[2], 'name':key.split('_')[3], 'value' : val})
-                            sur_name_read['store_ans'][update].update({key:val})
-                            resp_obj.write(cr, uid, update, {'state': 'done'})
-
-                        elif val and key.split('_')[1] == "otherfield" :
-                            comment_field = True
-                            sur_name_read['store_ans'][update].update({key:val})
-                            select_count += 1
-                            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
-                            continue
-
-                        elif val and key.split('_')[1] == "selection":
-                            if len(key.split('_')) > 2:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':key.split('_')[-1], 'column_id' : val})
-                                selected_value.append(val)
-                                response_list.append(str(ans_create_id) + "_" + str(key.split('_')[-1]))
-                            else:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id': val})
-                            resp_obj.write(cr, uid, update, {'state': 'done'})
-                            sur_name_read['store_ans'][update].update({key:val})
-                            select_count += 1
-
-                        elif key.split('_')[1] == "other":
-                            if not val:
-                                comment_value = True
-                            else:
-                                error = False
-                                if que_rec['is_comment_require'] and  que_rec['comment_valid_type'] == 'must_be_specific_length':
-                                    if (not val and  que_rec['comment_minimum_no']) or len(val) <  que_rec['comment_minimum_no'] or len(val) > que_rec['comment_maximum_no']:
-                                        error = True
-                                elif que_rec['is_comment_require'] and  que_rec['comment_valid_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
-                                    try:
-                                        if que_rec['comment_valid_type'] == 'must_be_whole_number':
-                                            value = int(val)
-                                            if value <  que_rec['comment_minimum_no'] or value > que_rec['comment_maximum_no']:
-                                                error = True
-                                        elif que_rec['comment_valid_type'] == 'must_be_decimal_number':
-                                            value = float(val)
-                                            if value <  que_rec['comment_minimum_float'] or value > que_rec['comment_maximum_float']:
-                                                error = True
-                                        elif que_rec['comment_valid_type'] == 'must_be_date':
-                                            value = datetime.datetime.strptime(val, "%Y-%m-%d")
-                                            if value <  datetime.datetime.strptime(que_rec['comment_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['comment_maximum_date'], "%Y-%m-%d"):
-                                                error = True
-                                    except:
-                                        error = True
-                                elif que_rec['is_comment_require'] and  que_rec['comment_valid_type'] == 'must_be_email_address':
-                                    import re
-                                    if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
-                                            error = True
-                                if error:
-                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
-                                resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
-                                sur_name_read['store_ans'][update].update({key:val})
-
-                        elif val and key.split('_')[1] == "comment":
-                            resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
-                            sur_name_read['store_ans'][update].update({key:val})
-                            select_count += 1
-
-                        elif val and (key.split('_')[1] == "single"  or (len(key.split('_')) > 2 and key.split('_')[2] == 'multi')):
-                            error = False
-                            if que_rec['is_validation_require'] and que_rec['validation_type'] == 'must_be_specific_length':
-                                if (not val and  que_rec['validation_minimum_no']) or len(val) <  que_rec['validation_minimum_no'] or len(val) > que_rec['validation_maximum_no']:
-                                    error = True
-                            elif que_rec['is_validation_require'] and que_rec['validation_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
-                                error = False
-                                try:
-                                    if que_rec['validation_type'] == 'must_be_whole_number':
-                                        value = int(val)
-                                        if value <  que_rec['validation_minimum_no'] or value > que_rec['validation_maximum_no']:
-                                            error = True
-                                    elif que_rec['validation_type'] == 'must_be_decimal_number':
-                                        value = float(val)
-                                        if value <  que_rec['validation_minimum_float'] or value > que_rec['validation_maximum_float']:
-                                            error = True
-                                    elif que_rec['validation_type'] == 'must_be_date':
-                                        value = datetime.datetime.strptime(val, "%Y-%m-%d")
-                                        if value <  datetime.datetime.strptime(que_rec['validation_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['validation_maximum_date'], "%Y-%m-%d"):
-                                            error = True
-                                except Exception ,e:
-                                    error = True
-                            elif que_rec['is_validation_require'] and  que_rec['validation_type'] == 'must_be_email_address':
-                                import re
-                                if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
-                                        error = True
-                            if error:
-                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
-                            if key.split('_')[1] == "single" :
-                                resp_obj.write(cr, uid, update, {'single_text':val,'state': 'done'})
-                            else:
-                                resp_obj.write(cr, uid, update, {'state': 'done'})
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : val})
-                            sur_name_read['store_ans'][update].update({key:val})
-                            select_count += 1
-
-                        elif val and len(key.split('_')) > 2 and key.split('_')[2] == 'numeric':
-                            if not val=="0":
-                                try:
-                                    numeric_sum += int(val)
-                                    resp_obj.write(cr, uid, update, {'state': 'done'})
-                                    ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : val})
-                                    sur_name_read['store_ans'][update].update({key:val})
-                                    select_count += 1
-                                except:
-                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' \n Please enter an integer value " ))
-
-                        elif val and len(key.split('_')) == 3:
-                            resp_obj.write(cr, uid, update, {'state': 'done'})
-                            if type(val) == type('') or type(val) == type(u''):
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'column_id' : ans_id_len[2], 'value_choice' : val})
-                                sur_name_read['store_ans'][update].update({key:val})
-                            else:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'column_id' : ans_id_len[2]})
-                                sur_name_read['store_ans'][update].update({key:True})
-                            matrix_list.append(key.split('_')[0] + '_' + key.split('_')[1])
-                            select_count += 1
-
-                        elif val and len(key.split('_')) == 2:
-                            resp_obj.write(cr, uid, update, {'state': 'done'})
-                            ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[-1], 'answer' : val})
-                            sur_name_read['store_ans'][update].update({key:val})
-                            select_count += 1
-                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
-
-                for key,val in vals.items():
-                    if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == sur_name_read['store_ans'][update]['question_id']:
-                        for res_id in response_list:
-                            if key.split('_')[2] in res_id.split('_')[1]:
-                                a = res_ans_obj.write(cr, uid, [res_id.split('_')[0]], {'comment_field':val})
-                                sur_name_read['store_ans'][update].update({key:val})
-
-                if comment_field and comment_value:
-                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
-
-                if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
-                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
-
-                if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
-                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
-
-                if not select_count:
-                    resp_obj.write(cr, uid, update, {'state': 'skip'})
-
-                if que_rec['type'] in ['multiple_textboxes_diff_type','multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
-                    if matrix_list:
-                        if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
-                        (que_rec['required_type'] == 'at least' and len(list(set(matrix_list))) < que_rec['req_ans']) or \
-                        (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > que_rec['req_ans']) or \
-                        (que_rec['required_type'] == 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \
-                        (que_rec['required_type'] == 'a range' and (len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):
-                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
-
-                    elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
-                        (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
-                        (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
-                        (que_rec['required_type'] == 'exactly' and select_count != que_rec['req_ans']) or \
-                        (que_rec['required_type'] == 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):
-                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
-
-                if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
-                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
-
-        return True
-
-    def action_new_question(self,cr, uid, ids, context):
-        for key,val in context.items():
-            if type(key) == type(True):
-                context.pop(key)
-        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),('name','=','survey_question_wizard_test')])
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'view_id': view_id,
-                'context': context
-                }
-
-    def action_new_page(self, cr, uid, ids, context):
-        for key,val in context.items():
-            if type(key) == type(True):
-                context.pop(key)
-        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),('name','=','survey_page_wizard_test')])
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.page',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'view_id': view_id,
-                'context': context
-                }
-
-    def action_edit_page(self,cr, uid, ids, context):
-        for key,val in context.items():
-            if type(key) == type(True):
-                context.pop(key)
-        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),('name','=','survey_page_wizard_test')])
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.page',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'res_id' : int(context.get('page_id',0)),
-                'view_id': view_id,
-                'context': context
-                }
-
-    def action_delete_page(self,cr, uid, ids, context):
-        for key,val in context.items():
-            if type(key) == type(True):
-                context.pop(key)
-
-        self.pool.get('survey.page').unlink(cr, uid, [context.get('page_id',False)])
-        search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',False) })
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
-
-    def action_edit_question(self,cr, uid, ids, context):
-        for key,val in context.items():
-            if type(key) == type(True):
-                context.pop(key)
-        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),('name','=','survey_question_wizard_test')])
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'res_id' : int(context.get('question_id',0)),
-                'view_id': view_id,
-                'context': context
-                }
-
-    def action_delete_question(self,cr, uid, ids, context):
-        for key,val in context.items():
-            if type(key) == type(True):
-                context.pop(key)
-
-        que_obj = self.pool.get('survey.question')
-        que_obj.unlink(cr, uid, [context.get('question_id',False)])
-        search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',0) })
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
-
-    def action_forward_previous(self, cr, uid, ids, context=None):
-        search_obj = self.pool.get('ir.ui.view')
-        surv_name_wiz = self.pool.get('survey.name.wiz')
-        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
-        context.update({'sur_name_id' :wiz_id, 'response_no' : context.get('response_no',0) - 1})
-
-        if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
-            return {}
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
-
-    def action_forward_next(self, cr, uid, ids, context=None):
-        search_obj = self.pool.get('ir.ui.view')
-        surv_name_wiz = self.pool.get('survey.name.wiz')
-        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
-        context.update({'sur_name_id' :wiz_id, 'response_no' : context.get('response_no',0) + 1})
-
-        if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
-            return {}
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
-
-    def action_next(self, cr, uid, ids, context=None):
-        surv_name_wiz = self.pool.get('survey.name.wiz')
-        search_obj = self.pool.get('ir.ui.view')
-        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'next'})
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
-
-    def action_previous(self, cr, uid, ids, context=None):
-        surv_name_wiz = self.pool.get('survey.name.wiz')
-        search_obj = self.pool.get('ir.ui.view')
-        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'previous'})
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
-
-survey_question_wiz()
-
 class res_users(osv.osv):
     _inherit = "res.users"
     _name = "res.users"
diff --git a/addons/survey/wizard/__init__.py b/addons/survey/wizard/__init__.py
index b767a2ced6d..9ff781484e2 100755
--- a/addons/survey/wizard/__init__.py
+++ b/addons/survey/wizard/__init__.py
@@ -25,5 +25,7 @@ import wizard_print_survey
 import survey_print_statistics
 import survey_print_answer
 import survey_browse_answer
+import survey_selection
+import survey_answer
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
new file mode 100644
index 00000000000..66da955430c
--- /dev/null
+++ b/addons/survey/wizard/survey_answer.py
@@ -0,0 +1,1110 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import datetime
+from tools.translate import _
+from lxml import etree
+from tools import to_xml
+from time import strftime
+import tools
+import netsvc
+import os
+
+class survey_question_wiz(osv.osv_memory):
+    _name = 'survey.question.wiz'
+    _columns = {
+        'name': fields.integer('Number'),
+    }
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        survey_obj = self.pool.get('survey')
+        page_obj = self.pool.get('survey.page')
+        que_obj = self.pool.get('survey.question')
+        ans_obj = self.pool.get('survey.answer')
+        sur_response_obj = self.pool.get('survey.response')
+        que_col_head = self.pool.get('survey.question.column.heading')
+        user_obj = self.pool.get('res.users')
+
+        if view_type in ['form']:
+            wiz_id = 0
+            if not context.has_key('sur_name_id'):
+                res_data = {
+                        'survey_id' : context.get('survey_id', False),
+                        'page_no' :-1,
+                        'page':'next',
+                        'transfer' :1,
+                        'response':0
+                }
+                wiz_id = surv_name_wiz.create(cr, uid, res_data)
+                sur_name_rec = surv_name_wiz.read(cr, uid, wiz_id, [])
+                context.update({'sur_name_id' :wiz_id})
+            else:
+                sur_name_rec = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
+
+            if context.has_key('active_id'):
+                context.pop('active_id')
+
+            survey_id = context.get('survey_id', False)
+            sur_rec = survey_obj.read(cr, uid, survey_id, [])
+            p_id = sur_rec['page_ids']
+            total_pages = len(p_id)
+            pre_button = False
+            readonly = 0
+
+            if context.has_key('response_id') and context.get('response_id', False) and int(context['response_id'][0]) > 0:
+                readonly = 1
+
+            if not sur_name_rec['page_no'] + 1 :
+                surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':{}})
+
+            sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
+            page_number = int(sur_name_rec['page_no'])
+            if sur_name_read['transfer'] or not sur_name_rec['page_no'] + 1:
+                surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'transfer':False})
+                flag = False
+                fields = {}
+                if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == -1:
+                    if total_pages > sur_name_rec['page_no'] + 1:
+                        if ((context.has_key('active') and not context.get('active', False)) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1:
+                            if sur_rec['state'] != "open" :
+                                raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
+                            cr.execute('select count(id) from survey_history where user_id=%s\
+                                                    and survey_id=%s' % (uid,survey_id))
+                            res = cr.fetchone()[0]
+                            user_limit = survey_obj.read(cr, uid, survey_id, ['response_user'])['response_user']
+                            if user_limit and res >= user_limit:
+                                raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
+
+                        if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey'] and not sur_name_rec['page_no'] + 1:
+                            survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
+
+                        p_id = p_id[sur_name_rec['page_no'] + 1]
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec['page_no'] + 1})
+                        flag = True
+                        page_number += 1
+                    if sur_name_rec['page_no'] > - 1:
+                        pre_button = True
+                else:
+                    if sur_name_rec['page_no'] != 0:
+                        p_id = p_id[sur_name_rec['page_no'] - 1]
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec['page_no'] - 1})
+                        flag = True
+                        page_number -= 1
+
+                    if sur_name_rec['page_no'] > 1:
+                        pre_button = True
+                if flag:
+                    pag_rec = page_obj.read(cr, uid, p_id)
+                    xml_form = etree.Element('form', {'string': _(tools.ustr(pag_rec['title']))})
+                    xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
+                    if context.has_key('response_id') and context.get('response_id', False)  and int(context.get('response_id',0)[0]) > 0:
+                        xml_group = etree.SubElement(xml_form, 'group', {'col': '40', 'colspan': '4'})
+                        record = sur_response_obj.browse(cr, uid, context['response_id'][context['response_no']])
+                        etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr('Answer Of :- ' + record.user_id.name + ',  Date :- ' + record.date_create.split('.')[0]  )), 'align':"0.0"})
+                        etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(" Response :- " + str(context.get('response_no',0) + 1) +"/" + str(len(context.get('response_id',0))) )), 'align':"0.0"})
+                        if context.get('response_no',0) > 0:
+                            etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_forward_previous",'string': tools.ustr("Previous Answer"),'type':"object"})
+                        if context.get('response_no',0) + 1 < len(context.get('response_id',0)):
+                            etree.SubElement(xml_group, 'button', {'colspan':"1",'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
+
+                    if wiz_id:
+                        fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}}
+                        etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0)})
+
+                    if pag_rec['note']:
+                        xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
+                        for que_test in pag_rec['note'].split('\n'):
+                            etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
+                    que_ids = pag_rec['question_ids']
+                    qu_no = 0
+
+                    for que in que_ids:
+                        qu_no += 1
+                        que_rec = que_obj.read(cr, uid, que)
+                        descriptive_text = ""
+                        separator_string = tools.ustr(qu_no) + "." + tools.ustr(que_rec['question'])
+                        if ((context.has_key('active') and not context.get('active',False)) or not context.has_key('active')) and que_rec['is_require_answer']:
+                            star = '*'
+                        else:
+                            star = ''
+                        xml_group = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '4'})
+
+                        if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
+                            xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
+                            etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
+                            xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
+                            context.update({'question_id' : tools.ustr(que),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer'], 'page_id' : p_id})
+                            etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-edit", 'type' :'object', 'name':"action_edit_question", 'context' : tools.ustr(context)})
+                            etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-delete", 'type' :'object','name':"action_delete_question", 'context' : tools.ustr(context)})
+                        else:
+                            xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
+                            etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '4'})
+
+                        ans_ids = ans_obj.read(cr, uid, que_rec['answer_choice_ids'], [])
+                        xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
+
+                        if que_rec['type'] == 'multiple_choice_only_one_ans':
+                            selection = []
+                            for ans in ans_ids:
+                                selection.append((tools.ustr(ans['id']), ans['answer']))
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
+                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_selection"})
+                            fields[tools.ustr(que) + "_selection"] = {'type':'selection', 'selection' :selection, 'string':"Answer"}
+
+                        elif que_rec['type'] == 'multiple_choice_multiple_ans':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
+                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'boolean', 'string':ans['answer']}
+
+                        elif que_rec['type'] in ['matrix_of_choices_only_one_ans', 'rating_scale']:
+                            if que_rec['comment_column']:
+                                col = "4"
+                                colspan = "4"
+                            else:
+                               col = "2"
+                               colspan = "2"
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': tools.ustr(col), 'colspan': tools.ustr(colspan)})
+                            for row in ans_ids:
+                                etree.SubElement(xml_group, 'newline')
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_selection_" + tools.ustr(row['id']),'string':to_xml(tools.ustr(row['answer']))})
+                                selection = [('','')]
+                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                    selection.append((str(col['id']), col['title']))
+                                fields[tools.ustr(que) + "_selection_" + tools.ustr(row['id'])] = {'type':'selection', 'selection' : selection, 'string': "Answer"}
+                                if que_rec['comment_column']:
+                                   fields[tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id']) + "_field"] = {'type':'char', 'size' : 255, 'string':tools.ustr(que_rec['column_name']), 'views':{}}
+                                   etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id'])+ "_field"})
+
+                        elif que_rec['type'] == 'matrix_of_choices_only_multi_ans':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
+                            etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
+                            for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col['title']),'colspan': '1'})
+                            for row in ans_ids:
+                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row['answer'])) +' :-', 'align': '0.0'})
+                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']), 'nolabel':"1"})
+                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'boolean', 'string': col['title']}
+
+                        elif que_rec['type'] == 'matrix_of_drop_down_menus':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
+                            etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
+                            for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col['title']),'colspan': '1'})
+                            for row in ans_ids:
+                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row['answer']))+' :-', 'align': '0.0'})
+                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                    selection = []
+                                    if col['menu_choice']:
+                                        for item in col['menu_choice'].split('\n'):
+                                            if item and not item.strip() == '': selection.append((item ,item))
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']),'nolabel':'1'})
+                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'selection', 'string': col['title'], 'selection':selection}
+
+                        elif que_rec['type'] == 'multiple_textboxes':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
+                            type = "char"
+                            if que_rec['is_validation_require']:
+                                if que_rec['validation_type'] in ['must_be_whole_number']:
+                                    type = "integer"
+                                elif que_rec['validation_type'] in ['must_be_decimal_number']:
+                                    type = "float"
+                                elif que_rec['validation_type'] in ['must_be_date']:
+                                    type = "date"
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
+                                if type == "char" :
+                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
+                                else:
+                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type': str(type), 'string':ans['answer']}
+
+                        elif que_rec['type'] == 'numerical_textboxes':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"})
+                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"] = {'type':'integer', 'string':ans['answer']}
+
+                        elif que_rec['type'] == 'date':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
+                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'date', 'string':ans['answer']}
+
+                        elif que_rec['type'] == 'date_and_time':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
+                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'datetime', 'string':ans['answer']}
+
+                        elif que_rec['type'] == 'descriptive_text':
+                            for que_test in que_rec['descriptive_text'].split('\n'):
+                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
+
+                        elif que_rec['type'] == 'single_textbox':
+                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_single", 'nolabel':"1" ,'colspan':"4"})
+                            fields[tools.ustr(que) + "_single"] = {'type':'char', 'size' : 255, 'string':"single_textbox", 'views':{}}
+
+                        elif que_rec['type'] == 'comment':
+                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_comment", 'nolabel':"1" ,'colspan':"4"})
+                            fields[tools.ustr(que) + "_comment"] = {'type':'text', 'string':"Comment/Eassy Box", 'views':{}}
+
+                        elif que_rec['type'] == 'table':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids'])), 'colspan': '4'})
+                            for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col['title']),'colspan': '1'})
+                            for row in range(0,que_rec['no_of_rows']):
+                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row), 'nolabel':"1"})
+                                    fields[tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row)] = {'type':'char','size':255,'views':{}}
+
+                        elif que_rec['type'] == 'multiple_textboxes_diff_type':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
+                            for ans in ans_ids:
+                                if ans['type'] == "email" :
+                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'widget':'email','width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
+                                else:
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
+                                    if ans['type'] == "char" :
+                                        fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
+                                    elif ans['type'] in ['integer','float','date','datetime']:
+                                        fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type': str(ans['type']), 'string':ans['answer']}
+                                    else:
+                                        selection = []
+                                        if ans['menu_choice']:
+                                            for item in ans['menu_choice'].split('\n'):
+                                                if item and not item.strip() == '': selection.append((item ,item))
+                                        fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'selection', 'selection' : selection, 'string':ans['answer']}
+
+                        if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale'] and que_rec['is_comment_require']:
+                            if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans'] and que_rec['comment_field_type'] in ['char','text'] and que_rec['make_comment_field']:
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_otherfield", 'colspan':"4"})
+                                fields[tools.ustr(que) + "_otherfield"] = {'type':'boolean', 'string':que_rec['comment_label'], 'views':{}}
+                                if que_rec['comment_field_type'] == 'char':
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que) + "_other"] = {'type': 'char', 'string': '', 'size':255, 'views':{}}
+                                elif que_rec['comment_field_type'] == 'text':
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
+                            else:
+                                if que_rec['comment_field_type'] == 'char':
+                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec['comment_label'])),'colspan':"4"})
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que) + "_other"] = {'type': 'char', 'string': '', 'size':255, 'views':{}}
+                                elif que_rec['comment_field_type'] == 'text':
+                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec['comment_label'])),'colspan':"4"})
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
+
+                    etree.SubElement(xml_form, 'separator', {'colspan': '4'})
+                    xml_group = etree.SubElement(xml_form, 'group', {'col': '6', 'colspan': '4'})
+                    etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
+                    fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
+                    etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
+                    etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
+
+                    if pre_button:
+                        etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
+                    but_string = "Next"
+                    if int(page_number) + 1 == total_pages:
+                        but_string = "Done"
+
+                    if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
+                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
+                    elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
+                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
+                    elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
+                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context)})
+                    else:
+                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context)})
+
+                    if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
+                        etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
+                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer']})
+                        xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
+
+                    root = xml_form.getroottree()
+                    result['arch'] = etree.tostring(root)
+                    result['fields'] = fields
+                    result['context'] = context
+                else:
+                    survey_obj.write(cr, uid, survey_id, {'tot_comp_survey' : sur_rec['tot_comp_survey'] + 1})
+                    sur_response_obj.write(cr, uid, [sur_name_read['response']], {'state' : 'done'})
+
+                    if sur_rec['send_response']:
+                        survey_data = survey_obj.browse(cr, uid, int(survey_id))
+                        response_id = surv_name_wiz.read(cr,uid,context.get('sur_name_id',False))['response']
+                        context.update({'response_id':response_id})
+                        report = self.create_report(cr, uid, [int(survey_id)], 'report.survey.browse.response', survey_data.title,context)
+                        attachments = []
+                        file = open(tools.config['addons_path'] + '/survey/report/' + survey_data.title + ".pdf")
+                        file_data = ""
+                        while 1:
+                            line = file.readline()
+                            file_data += line
+                            if not line:
+                                break
+
+                        attachments.append((survey_data.title + ".pdf",file_data))
+                        file.close()
+                        os.remove(tools.config['addons_path'] + '/survey/report/' + survey_data.title + ".pdf")
+                        user_email = False
+                        resp_email = False
+
+                        if user_obj.browse(cr, uid, uid).address_id.id:
+                            cr.execute("select email from res_partner_address where id =%d" % user_obj.browse(cr, uid, uid).address_id.id)
+                            user_email = cr.fetchone()[0]
+                        resp_id = survey_data.responsible_id.address_id
+
+                        if resp_id:
+                            cr.execute("select email from res_partner_address where id =%d" % resp_id.id)
+                            resp_email = cr.fetchone()[0]
+                        if user_email and resp_email:
+                            mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_obj.browse(cr, uid, uid).name) + " Give Response Of " + survey_data.title + " Survey.\n\n Thanks,"
+                            tools.email_send(user_email, [resp_email], "Survey Response Of " + str(user_obj.browse(cr, uid, uid).name) , mail, attach = attachments)
+
+                    xml_form = etree.Element('form', {'string': _('Complete Survey Response')})
+                    etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
+                    etree.SubElement(xml_form, 'label', {'string': 'Thanks for your response'})
+                    etree.SubElement(xml_form, 'newline')
+                    etree.SubElement(xml_form, 'button', {'icon': "gtk-go-forward", 'special':"cancel",'string':"OK",'colspan':"2"})
+                    root = xml_form.getroottree()
+                    result['arch'] = etree.tostring(root)
+                    result['fields'] = {}
+                    result['context'] = context
+        return result
+
+    def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
+        if not report_name or not res_ids:
+            return (False, Exception('Report name and Resources ids are required !!!'))
+        try:
+            ret_file_name = tools.config['addons_path'] + '/survey/report/' + file_name + '.pdf'
+            service = netsvc.LocalService(report_name);
+            (result, format) = service.create(cr, uid, res_ids, {}, context)
+            fp = open(ret_file_name, 'wb+');
+            fp.write(result);
+            fp.close();
+
+        except Exception,e:
+            print 'Exception in create report:',e
+            return (False, str(e))
+
+        return (True, ret_file_name)
+
+    def default_get(self, cr, uid, fields_list, context=None):
+        value = {}
+        for field in fields_list:
+            if field.split('_')[0] == 'progress':
+                tot_page_id = self.pool.get('survey').browse(cr, uid, context.get('survey_id',False))
+                tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids))
+                value[field] = tot_per
+        response_obj = self.pool.get('survey.response')
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        
+        if context.has_key('response_id') and context.get('response_id') and int(context['response_id'][0]) > 0:
+            data = super(survey_question_wiz, self).default_get(cr, uid, fields_list, context)
+            response_ans = response_obj.browse(cr, uid, context['response_id'][context['response_no']])
+            fields_list.sort()
+
+            for que in response_ans.question_ids:
+                for field in fields_list:
+                    if field.split('_')[0] != "progress" and field.split('_')[0] == str(que.question_id.id):
+                        if que.response_answer_ids and len(field.split('_')) == 4 and field.split('_')[1] == "commentcolumn" and field.split('_')[3] == "field":
+                            for ans in que.response_answer_ids:
+                                if str(field.split('_')[2]) == str(ans.answer_id.id):
+                                    value[field] = ans.comment_field
+
+                        if que.response_table_ids and len(field.split('_')) == 4 and field.split('_')[1] == "table":
+                            for ans in que.response_table_ids:
+                                if str(field.split('_')[2]) == str(ans.column_id.id) and str(field.split('_')[3]) ==  str(ans.name):
+                                    value[field] = ans.value
+
+                        if que.comment and (field.split('_')[1] == "comment" or field.split('_')[1] == "other"):
+                            value[field] = str(que.comment)
+
+                        elif que.single_text and field.split('_')[1] == "single":
+                            value[field] = str(que.single_text)
+
+                        elif que.response_answer_ids and len(field.split('_')) == 3 and field.split('_')[1] == "selection":
+                            for ans in que.response_answer_ids:
+                                if str(field.split('_')[2]) == str( ans.answer_id.id):
+                                    value[field] = str(ans.column_id.id)
+
+                        elif que.response_answer_ids and len(field.split('_')) == 2 and field.split('_')[1] == "selection":
+                            value[field] = str(que.response_answer_ids[0].answer_id.id)
+
+                        elif que.response_answer_ids and len(field.split('_')) == 3 and field.split('_')[2] != "multi" and field.split('_')[2] != "numeric":
+                            for ans in que.response_answer_ids:
+                                if str(field.split('_')[1]) == str( ans.answer_id.id) and str(field.split('_')[2]) == str(ans.column_id.id):
+                                    if ans.value_choice:
+                                        value[field] = ans.value_choice
+                                    else:
+                                        value[field] = True
+
+                        else:
+                            for ans in que.response_answer_ids:
+                                if str(field.split('_')[1]) == str( ans.answer_id.id):
+                                    value[field] = ans.answer
+
+        else:
+            if not context.has_key('sur_name_id'):
+                return value
+            if context.has_key('active') and context.get('active',False):
+                return value
+            
+            sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
+            ans_list = []
+            for key,val in sur_name_read['store_ans'].items():
+                for field in fields_list:
+                    if field in list(val):
+                        value[field] = val[field]
+
+        return value
+
+    def create(self, cr, uid, vals, context=None):
+        if context.has_key('active') and context.get('active',False):
+            return True
+
+        for key,val in vals.items():
+            if key.split('_')[0] == "progress":
+                vals.pop(key)
+            if not context.has_key('sur_name_id') and key.split('_')[0] == "wizardid":
+                context.update({'sur_name_id': int(key.split('_')[1])})
+                vals.pop(key)
+
+        click_state = True
+        click_update = []
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        surv_all_resp_obj = self.pool.get('survey.response')
+        surv_tbl_column_obj = self.pool.get('survey.tbl.column.heading')
+        survey_obj = self.pool.get('survey')
+        resp_obj = self.pool.get('survey.response.line')
+        res_ans_obj = self.pool.get('survey.response.answer')
+        que_obj = self.pool.get('survey.question')
+        sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False), [])
+        response_id =  0
+
+        if not sur_name_read['response']:
+            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context['survey_id']})
+            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'response' : tools.ustr(response_id)})
+        else:
+            response_id = int(sur_name_read['response'])
+
+        if response_id not in surv_all_resp_obj.search(cr, uid, []):
+            response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context.get('survey_id',False)})
+            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'response' : tools.ustr(response_id)})
+
+        #click first time on next button then increemnet on total start suvey
+        if not sur_name_read['store_ans']:
+            his_id = self.pool.get('survey.history').create(cr, uid, {'user_id': uid, \
+                                              'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': sur_name_read['survey_id']})
+            sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
+            survey_obj.write(cr, uid, sur_name_read['survey_id'],  {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
+            if context.has_key('cur_id'):
+                if context.has_key('request') and context.get('request',False):
+                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
+                    self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
+                else:
+                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
+
+        for key,val in sur_name_read['store_ans'].items():
+            for field in vals:
+                if field.split('_')[0] == val['question_id']:
+                    click_state = False
+                    click_update.append(key)
+                    break
+
+        if click_state:
+            que_li = []
+            resp_id_list = []
+            for key, val in vals.items():
+                que_id = key.split('_')[0]
+                if que_id not in que_li:
+                    que_li.append(que_id)
+                    que_rec = que_obj.read(cr, uid, [int(que_id)], [])[0]
+                    res_data =  {
+                        'question_id':que_id, 
+                        'date_create':datetime.datetime.now(),
+                        'state':'done',
+                        'response_id' : response_id
+                    }
+                    resp_id = resp_obj.create(cr, uid, res_data)
+                    resp_id_list.append(resp_id)
+                    sur_name_read['store_ans'].update({resp_id:{'question_id':que_id}})
+                    surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+                    select_count = 0
+                    numeric_sum = 0
+                    selected_value = []
+                    matrix_list = []
+                    comment_field = False
+                    comment_value = False
+                    response_list = []
+
+                    for key1, val1 in vals.items():
+                        if val1 and key1.split('_')[1] == "table" and key1.split('_')[0] == que_id:
+                            surv_tbl_column_obj.create(cr, uid, {'response_table_id' : resp_id,'column_id':key1.split('_')[2], 'name':key1.split('_')[3], 'value' : val1})
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+
+                        elif val1 and key1.split('_')[1] == "otherfield" and key1.split('_')[0] == que_id:
+                            comment_field = True
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+                            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+                            continue
+
+                        elif val1 and key1.split('_')[1] == "selection" and key1.split('_')[0] == que_id:
+                            if len(key1.split('_')) > 2:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'column_id' : val1})
+                                selected_value.append(val1)
+                                response_list.append(str(ans_create_id) + "_" + str(key1.split('_')[-1]))
+                            else:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':val1})
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+
+                        elif key1.split('_')[1] == "other" and key1.split('_')[0] == que_id:
+                            if not val1:
+                                comment_value = True
+                            else:
+                                error = False
+                                if que_rec['is_comment_require'] and que_rec['comment_valid_type'] == 'must_be_specific_length':
+                                    if (not val1 and  que_rec['comment_minimum_no']) or len(val1) <  que_rec['comment_minimum_no'] or len(val1) > que_rec['comment_maximum_no']:
+                                        error = True
+                                elif que_rec['is_comment_require'] and  que_rec['comment_valid_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
+                                    error = False
+                                    try:
+                                        if que_rec['comment_valid_type'] == 'must_be_whole_number':
+                                            value = int(val1)
+                                            if value <  que_rec['comment_minimum_no'] or value > que_rec['comment_maximum_no']:
+                                                error = True
+                                        elif que_rec['comment_valid_type'] == 'must_be_decimal_number':
+                                            value = float(val1)
+                                            if value <  que_rec['comment_minimum_float'] or value > que_rec['comment_maximum_float']:
+                                                error = True
+                                        elif que_rec['comment_valid_type'] == 'must_be_date':
+                                            value = datetime.datetime.strptime(val1, "%Y-%m-%d")
+                                            if value <  datetime.datetime.strptime(que_rec['comment_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['comment_maximum_date'], "%Y-%m-%d"):
+                                                error = True
+                                    except:
+                                        error = True
+                                elif que_rec['is_comment_require'] and  que_rec['comment_valid_type'] == 'must_be_email_address':
+                                    import re
+                                    if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val1) == None:
+                                            error = True
+                                if error:
+                                    for res in resp_id_list:
+                                        sur_name_read['store_ans'].pop(res)
+                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
+
+                                resp_obj.write(cr, uid, resp_id, {'comment':val1})
+                                sur_name_read['store_ans'][resp_id].update({key1:val1})
+
+                        elif val1 and key1.split('_')[1] == "comment" and key1.split('_')[0] == que_id:
+                            resp_obj.write(cr, uid, resp_id, {'comment':val1})
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+
+                        elif val1 and key1.split('_')[0] == que_id and (key1.split('_')[1] == "single"  or (len(key1.split('_')) > 2 and key1.split('_')[2] == 'multi')):
+                            error = False
+                            if que_rec['is_validation_require'] and que_rec['validation_type'] == 'must_be_specific_length':
+                                if (not val1 and  que_rec['validation_minimum_no']) or len(val1) <  que_rec['validation_minimum_no'] or len(val1) > que_rec['validation_maximum_no']:
+                                    error = True
+                            elif que_rec['is_validation_require'] and que_rec['validation_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
+                                error = False
+                                try:
+                                    if que_rec['validation_type'] == 'must_be_whole_number':
+                                        value = int(val1)
+                                        if value <  que_rec['validation_minimum_no'] or value > que_rec['validation_maximum_no']:
+                                            error = True
+                                    elif que_rec['validation_type'] == 'must_be_decimal_number':
+                                        value = float(val1)
+                                        if value <  que_rec['validation_minimum_float'] or value > que_rec['validation_maximum_float']:
+                                            error = True
+                                    elif que_rec['validation_type'] == 'must_be_date':
+                                        value = datetime.datetime.strptime(val1, "%Y-%m-%d")
+                                        if value <  datetime.datetime.strptime(que_rec['validation_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['validation_maximum_date'], "%Y-%m-%d"):
+                                            error = True
+                                except:
+                                    error = True
+                            elif que_rec['is_validation_require'] and que_rec['validation_type'] == 'must_be_email_address':
+                                import re
+                                if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val1) == None:
+                                        error = True
+                            if error:
+                                for res in resp_id_list:
+                                    sur_name_read['store_ans'].pop(res)
+                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
+
+                            if key1.split('_')[1] == "single" :
+                                resp_obj.write(cr, uid, resp_id, {'single_text':val1})
+                            else:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : val1})
+
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+
+                        elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) > 2 and key1.split('_')[2] == 'numeric':
+                            if not val1=="0":
+                                try:
+                                    numeric_sum += int(val1)
+                                    ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : val1})
+                                    sur_name_read['store_ans'][resp_id].update({key1:val1})
+                                    select_count += 1
+                                except:
+                                    for res in resp_id_list:
+                                        sur_name_read['store_ans'].pop(res)
+                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' \nPlease enter an integer value " ))
+
+                        elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 3:
+                            if type(val1) == type('') or type(val1) == type(u''):
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'column_id' : key1.split('_')[2], 'value_choice' : val1})
+                                sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            else:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'column_id' : key1.split('_')[2]})
+                                sur_name_read['store_ans'][resp_id].update({key1:True})
+
+                            matrix_list.append(key1.split('_')[0] + '_' + key1.split('_')[1])
+                            select_count += 1
+
+                        elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 2:
+                            ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'answer' : val1})
+                            sur_name_read['store_ans'][resp_id].update({key1:val1})
+                            select_count += 1
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+
+                    for key,val in vals.items():
+                        if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == que_id:
+                            for res_id in response_list:
+                                if key.split('_')[2] in res_id.split('_')[1]:
+                                    a = res_ans_obj.write(cr, uid, [res_id.split('_')[0]], {'comment_field':val})
+                                    sur_name_read['store_ans'][resp_id].update({key:val})
+
+                    if comment_field and comment_value:
+                        for res in resp_id_list:
+                            sur_name_read['store_ans'].pop(res)
+                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
+
+                    if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
+                        for res in resp_id_list:
+                            sur_name_read['store_ans'].pop(res)
+                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
+
+                    if not select_count:
+                        resp_obj.write(cr, uid, resp_id, {'state':'skip'})
+
+                    if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
+                        for res in resp_id_list:
+                            sur_name_read['store_ans'].pop(res)
+                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
+
+                    if que_rec['type'] in ['multiple_textboxes_diff_type', 'multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
+                        if matrix_list:
+                            if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
+                            (que_rec['required_type'] == 'at least' and len(list(set(matrix_list))) < que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'a range' and (len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):
+                                for res in resp_id_list:
+                                    sur_name_read['store_ans'].pop(res)
+                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
+                        elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
+                            (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'exactly' and select_count != que_rec['req_ans']) or \
+                            (que_rec['required_type'] == 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):
+                            for res in resp_id_list:
+                                sur_name_read['store_ans'].pop(res)
+                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
+                    if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
+                        for res in resp_id_list:
+                            sur_name_read['store_ans'].pop(res)
+                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
+        else:
+            resp_id_list = []
+            for update in click_update:
+                que_rec = que_obj.read(cr, uid , [int(sur_name_read['store_ans'][update]['question_id'])], [])[0]
+                res_ans_obj.unlink(cr, uid,res_ans_obj.search(cr, uid, [('response_id', '=', update)]))
+                surv_tbl_column_obj.unlink(cr, uid,surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', update)]))
+                resp_id_list.append(update)
+                sur_name_read['store_ans'].update({update:{'question_id':sur_name_read['store_ans'][update]['question_id']}})
+                surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+                select_count = 0
+                numeric_sum = 0
+                selected_value = []
+                matrix_list = []
+                comment_field = False
+                comment_value = False
+                response_list = []
+
+                for key, val in vals.items():
+                    ans_id_len = key.split('_')
+                    if ans_id_len[0] == sur_name_read['store_ans'][update]['question_id']:
+                        if val and key.split('_')[1] == "table":
+                            surv_tbl_column_obj.create(cr, uid, {'response_table_id' : update,'column_id':key.split('_')[2], 'name':key.split('_')[3], 'value' : val})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            resp_obj.write(cr, uid, update, {'state': 'done'})
+
+                        elif val and key.split('_')[1] == "otherfield" :
+                            comment_field = True
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+                            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+                            continue
+
+                        elif val and key.split('_')[1] == "selection":
+                            if len(key.split('_')) > 2:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':key.split('_')[-1], 'column_id' : val})
+                                selected_value.append(val)
+                                response_list.append(str(ans_create_id) + "_" + str(key.split('_')[-1]))
+                            else:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id': val})
+                            resp_obj.write(cr, uid, update, {'state': 'done'})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+
+                        elif key.split('_')[1] == "other":
+                            if not val:
+                                comment_value = True
+                            else:
+                                error = False
+                                if que_rec['is_comment_require'] and  que_rec['comment_valid_type'] == 'must_be_specific_length':
+                                    if (not val and  que_rec['comment_minimum_no']) or len(val) <  que_rec['comment_minimum_no'] or len(val) > que_rec['comment_maximum_no']:
+                                        error = True
+                                elif que_rec['is_comment_require'] and  que_rec['comment_valid_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
+                                    try:
+                                        if que_rec['comment_valid_type'] == 'must_be_whole_number':
+                                            value = int(val)
+                                            if value <  que_rec['comment_minimum_no'] or value > que_rec['comment_maximum_no']:
+                                                error = True
+                                        elif que_rec['comment_valid_type'] == 'must_be_decimal_number':
+                                            value = float(val)
+                                            if value <  que_rec['comment_minimum_float'] or value > que_rec['comment_maximum_float']:
+                                                error = True
+                                        elif que_rec['comment_valid_type'] == 'must_be_date':
+                                            value = datetime.datetime.strptime(val, "%Y-%m-%d")
+                                            if value <  datetime.datetime.strptime(que_rec['comment_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['comment_maximum_date'], "%Y-%m-%d"):
+                                                error = True
+                                    except:
+                                        error = True
+                                elif que_rec['is_comment_require'] and  que_rec['comment_valid_type'] == 'must_be_email_address':
+                                    import re
+                                    if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
+                                            error = True
+                                if error:
+                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
+                                resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
+                                sur_name_read['store_ans'][update].update({key:val})
+
+                        elif val and key.split('_')[1] == "comment":
+                            resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+
+                        elif val and (key.split('_')[1] == "single"  or (len(key.split('_')) > 2 and key.split('_')[2] == 'multi')):
+                            error = False
+                            if que_rec['is_validation_require'] and que_rec['validation_type'] == 'must_be_specific_length':
+                                if (not val and  que_rec['validation_minimum_no']) or len(val) <  que_rec['validation_minimum_no'] or len(val) > que_rec['validation_maximum_no']:
+                                    error = True
+                            elif que_rec['is_validation_require'] and que_rec['validation_type'] in ['must_be_whole_number', 'must_be_decimal_number', 'must_be_date']:
+                                error = False
+                                try:
+                                    if que_rec['validation_type'] == 'must_be_whole_number':
+                                        value = int(val)
+                                        if value <  que_rec['validation_minimum_no'] or value > que_rec['validation_maximum_no']:
+                                            error = True
+                                    elif que_rec['validation_type'] == 'must_be_decimal_number':
+                                        value = float(val)
+                                        if value <  que_rec['validation_minimum_float'] or value > que_rec['validation_maximum_float']:
+                                            error = True
+                                    elif que_rec['validation_type'] == 'must_be_date':
+                                        value = datetime.datetime.strptime(val, "%Y-%m-%d")
+                                        if value <  datetime.datetime.strptime(que_rec['validation_minimum_date'], "%Y-%m-%d") or value >  datetime.datetime.strptime(que_rec['validation_maximum_date'], "%Y-%m-%d"):
+                                            error = True
+                                except Exception ,e:
+                                    error = True
+                            elif que_rec['is_validation_require'] and  que_rec['validation_type'] == 'must_be_email_address':
+                                import re
+                                if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
+                                        error = True
+                            if error:
+                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
+                            if key.split('_')[1] == "single" :
+                                resp_obj.write(cr, uid, update, {'single_text':val,'state': 'done'})
+                            else:
+                                resp_obj.write(cr, uid, update, {'state': 'done'})
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : val})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+
+                        elif val and len(key.split('_')) > 2 and key.split('_')[2] == 'numeric':
+                            if not val=="0":
+                                try:
+                                    numeric_sum += int(val)
+                                    resp_obj.write(cr, uid, update, {'state': 'done'})
+                                    ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : val})
+                                    sur_name_read['store_ans'][update].update({key:val})
+                                    select_count += 1
+                                except:
+                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' \n Please enter an integer value " ))
+
+                        elif val and len(key.split('_')) == 3:
+                            resp_obj.write(cr, uid, update, {'state': 'done'})
+                            if type(val) == type('') or type(val) == type(u''):
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'column_id' : ans_id_len[2], 'value_choice' : val})
+                                sur_name_read['store_ans'][update].update({key:val})
+                            else:
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'column_id' : ans_id_len[2]})
+                                sur_name_read['store_ans'][update].update({key:True})
+                            matrix_list.append(key.split('_')[0] + '_' + key.split('_')[1])
+                            select_count += 1
+
+                        elif val and len(key.split('_')) == 2:
+                            resp_obj.write(cr, uid, update, {'state': 'done'})
+                            ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[-1], 'answer' : val})
+                            sur_name_read['store_ans'][update].update({key:val})
+                            select_count += 1
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+
+                for key,val in vals.items():
+                    if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == sur_name_read['store_ans'][update]['question_id']:
+                        for res_id in response_list:
+                            if key.split('_')[2] in res_id.split('_')[1]:
+                                a = res_ans_obj.write(cr, uid, [res_id.split('_')[0]], {'comment_field':val})
+                                sur_name_read['store_ans'][update].update({key:val})
+
+                if comment_field and comment_value:
+                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
+
+                if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
+                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
+
+                if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
+                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
+
+                if not select_count:
+                    resp_obj.write(cr, uid, update, {'state': 'skip'})
+
+                if que_rec['type'] in ['multiple_textboxes_diff_type','multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
+                    if matrix_list:
+                        if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
+                        (que_rec['required_type'] == 'at least' and len(list(set(matrix_list))) < que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'a range' and (len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):
+                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
+                    elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
+                        (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'exactly' and select_count != que_rec['req_ans']) or \
+                        (que_rec['required_type'] == 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):
+                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
+                if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
+                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+
+        return True
+
+    def action_new_question(self,cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),('name','=','survey_question_wizard_test')])
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'view_id': view_id,
+                'context': context
+                }
+
+    def action_new_page(self, cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),('name','=','survey_page_wizard_test')])
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.page',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'view_id': view_id,
+                'context': context
+                }
+
+    def action_edit_page(self,cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),('name','=','survey_page_wizard_test')])
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.page',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'res_id' : int(context.get('page_id',0)),
+                'view_id': view_id,
+                'context': context
+                }
+
+    def action_delete_page(self,cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+
+        self.pool.get('survey.page').unlink(cr, uid, [context.get('page_id',False)])
+        search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',False) })
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+    def action_edit_question(self,cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),('name','=','survey_question_wizard_test')])
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'res_id' : int(context.get('question_id',0)),
+                'view_id': view_id,
+                'context': context
+                }
+
+    def action_delete_question(self,cr, uid, ids, context):
+        for key,val in context.items():
+            if type(key) == type(True):
+                context.pop(key)
+
+        que_obj = self.pool.get('survey.question')
+        que_obj.unlink(cr, uid, [context.get('question_id',False)])
+        search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',0) })
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+    def action_forward_previous(self, cr, uid, ids, context=None):
+        search_obj = self.pool.get('ir.ui.view')
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
+        context.update({'sur_name_id' :wiz_id, 'response_no' : context.get('response_no',0) - 1})
+
+        if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
+            return {}
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+    def action_forward_next(self, cr, uid, ids, context=None):
+        search_obj = self.pool.get('ir.ui.view')
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
+        context.update({'sur_name_id' :wiz_id, 'response_no' : context.get('response_no',0) + 1})
+
+        if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
+            return {}
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+    def action_next(self, cr, uid, ids, context=None):
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        search_obj = self.pool.get('ir.ui.view')
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'next'})
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+    def action_previous(self, cr, uid, ids, context=None):
+        surv_name_wiz = self.pool.get('survey.name.wiz')
+        search_obj = self.pool.get('ir.ui.view')
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'previous'})
+        return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'survey.question.wiz',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'search_view_id':search_id[0],
+                'context': context
+                }
+
+survey_question_wiz()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
new file mode 100644
index 00000000000..edad2ac1add
--- /dev/null
+++ b/addons/survey/wizard/survey_answer.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!--
+			Survey Question Wizard 
+		 -->
+		 
+		<record id="view_survey_question_message" model="ir.ui.view">
+			<field name="name">Survey Question</field>
+			<field name="model">survey.question.wiz</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Your Messages">
+					<field name="name" nolabel="1" colspan="4" />
+				</form>
+			</field>
+		</record>
+
+		<record id="view_survey_question_message1" model="ir.ui.view">
+			<field name="name">Survey Search</field>
+			<field name="model">survey.question.wiz</field>
+			<field name="type">search</field>
+			<field name="arch" type="xml">
+				<search string="Your Messages">
+					<field name="name" nolabel="1" colspan="4" />
+				</search>
+			</field>
+		</record>
+
+		<record id="action_view_survey_question_message"
+			model="ir.actions.act_window">
+			<field name="name">Survey Question</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">survey.question.wiz</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+		</record>
+
+		
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
new file mode 100644
index 00000000000..668ca8b63d9
--- /dev/null
+++ b/addons/survey/wizard/survey_selection.py
@@ -0,0 +1,108 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class survey_name_wiz(osv.osv_memory):
+    _name = 'survey.name.wiz'
+
+    def default_get(self, cr, uid, fields, context={}):
+        if not context:
+            context = {}
+        data = super(survey_name_wiz, self).default_get(cr, uid, fields, context)
+        if context.has_key('survey_id'):
+            data['survey_id'] = context.get('survey_id',False)
+        return data
+
+    def _get_survey(self, cr, uid, context=None):
+        surv_obj = self.pool.get("survey")
+        result = []
+        if context.has_key('survey_id'):
+            for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
+                result.append((sur.id, sur.title))
+            return result
+        group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / Manager')])
+        user_obj = self.pool.get('res.users')
+        user_rec = user_obj.read(cr, uid, uid)
+        for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
+            if sur.state == 'open':
+                if group_id[0]  in user_rec['groups_id']:
+                    result.append((sur.id, sur.title))
+                elif sur.id in user_rec['survey_id']:
+                    result.append((sur.id, sur.title))
+        return result
+
+    _columns = {
+        'survey_id': fields.selection(_get_survey, "Survey", required="1"),
+        'page_no' : fields.integer('Page Number'),
+        'note' : fields.text("Description"),
+        'page' : fields.char('Page Position',size = 12),
+        'transfer' : fields.boolean('Page Transfer'),
+        'store_ans' : fields.text('Store Answer'),
+        'response' : fields.char('Response',size=16)
+    }
+    _defaults = {
+        'page_no' : lambda * a: - 1,
+        'page' : lambda * a: 'next',
+        'transfer' : lambda * a: 1,
+        'response' : lambda * a: 0,
+    }
+
+    def action_next(self, cr, uid, ids, context=None):
+        survey_obj = self.pool.get('survey')
+        search_obj = self.pool.get('ir.ui.view')
+
+        sur_id = self.read(cr, uid, ids, [])[0]
+        survey_id = sur_id['survey_id']
+        context.update({'survey_id' : survey_id, 'sur_name_id' : sur_id['id']})
+        cr.execute('select count(id) from survey_history where user_id=%s\
+                    and survey_id=%s' % (uid,survey_id))
+
+        res = cr.fetchone()[0]
+        user_limit = survey_obj.read(cr, uid, survey_id, ['response_user'])['response_user']
+        if user_limit and res >= user_limit:
+            raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
+        
+        sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id'])
+        if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']:
+            raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
+
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+
+        return {
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'search_view_id':search_id[0],
+            'context' : context
+         }
+
+    def on_change_survey(self, cr, uid, ids, survey_id, context=None):
+        notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note']
+        return {'value': {'note' : notes}}
+
+survey_name_wiz()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/survey_que_wizard.xml b/addons/survey/wizard/survey_selection.xml
similarity index 55%
rename from addons/survey/survey_que_wizard.xml
rename to addons/survey/wizard/survey_selection.xml
index e11ec81866b..d3c039aa5c3 100644
--- a/addons/survey/survey_que_wizard.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -2,42 +2,6 @@
 <openerp>
 	<data>
 	
-		<!--
-			Survey Question Wizard 
-		 -->
-		 
-		<record id="view_survey_question_message" model="ir.ui.view">
-			<field name="name">Survey Question</field>
-			<field name="model">survey.question.wiz</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Your Messages">
-					<field name="name" nolabel="1" colspan="4" />
-				</form>
-			</field>
-		</record>
-
-		<record id="view_survey_question_message1" model="ir.ui.view">
-			<field name="name">Survey Search</field>
-			<field name="model">survey.question.wiz</field>
-			<field name="type">search</field>
-			<field name="arch" type="xml">
-				<search string="Your Messages">
-					<field name="name" nolabel="1" colspan="4" />
-				</search>
-			</field>
-		</record>
-
-		<record id="action_view_survey_question_message"
-			model="ir.actions.act_window">
-			<field name="name">Survey Question</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">survey.question.wiz</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-
 		<!--
 			Display Survey List 
 		 -->
@@ -79,4 +43,4 @@
 		</record>
 		
 	</data>
-</openerp>
+</openerp>
\ No newline at end of file

From bf7b27b4f8b7cfa08f83d251197206b0cf36e0db Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 15:15:56 +0530
Subject: [PATCH 096/248] [REM]: crm:Remove wrong commit changes

bzr revid: ksa@tinyerp.co.in-20100322094556-z321hgds7qgcl48j
---
 addons/crm/crm.py | 358 +++++++++++++++++++++++++++-------------------
 1 file changed, 214 insertions(+), 144 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 80e1b8e246a..a30eb190968 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -30,77 +30,77 @@ import tools
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
-    ('draft', 'Draft'), 
-    ('open', 'Open'), 
-    ('cancel', 'Cancelled'), 
-    ('done', 'Closed'), 
+    ('draft', 'Draft'),
+    ('open', 'Open'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
     ('pending', 'Pending')
 ]
 
 AVAILABLE_PRIORITIES = [
-    ('5', 'Lowest'), 
-    ('4', 'Low'), 
-    ('3', 'Normal'), 
-    ('2', 'High'), 
+    ('5', 'Lowest'),
+    ('4', 'Low'),
+    ('3', 'Normal'),
+    ('2', 'High'),
     ('1', 'Highest')
 ]
 
 icon_lst = {
-    'form': 'STOCK_NEW', 
-    'tree': 'STOCK_JUSTIFY_FILL', 
+    'form': 'STOCK_NEW',
+    'tree': 'STOCK_JUSTIFY_FILL',
     'calendar': 'STOCK_SELECT_COLOR'
 }
 
 class crm_case_section(osv.osv):
     """ Cases Section"""
-    
+
     _name = "crm.case.section"
     _description = "Sales Teams"
     _order = "name"
-    
+
     _columns = {
-        'name': fields.char('Sales Team', size=64, required=True, translate=True), 
-        'code': fields.char('Code', size=8), 
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the sales team without removing it."), 
-        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"), 
-        'user_id': fields.many2one('res.users', 'Responsible User'), 
-        'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"), 
-        'parent_id': fields.many2one('crm.case.section', 'Parent Section'), 
-        'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'), 
+        'name': fields.char('Sales Team', size=64, required=True, translate=True),
+        'code': fields.char('Code', size=8),
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the sales team without removing it."),
+        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
+        'user_id': fields.many2one('res.users', 'Responsible User'),
+        'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
+        'parent_id': fields.many2one('crm.case.section', 'Parent Section'),
+        'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'),
     }
-    
+
     _defaults = {
-        'active': lambda *a: 1, 
-        'allow_unlink': lambda *a: 1, 
+        'active': lambda *a: 1,
+        'allow_unlink': lambda *a: 1,
     }
-    
+
     _sql_constraints = [
         ('code_uniq', 'unique (code)', 'The code of the section must be unique !')
     ]
-    
+
     def _check_recursion(self, cr, uid, ids):
-        """ 
+        """
         Checks for recursion level for sections
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of section ids 
+        @param ids: List of section ids
         """
         level = 100
-        
+
         while len(ids):
             cr.execute('select distinct parent_id from crm_case_section where id =ANY(%s)', (ids,))
             ids = filter(None, map(lambda x: x[0], cr.fetchall()))
             if not level:
                 return False
             level -= 1
-        
+
         return True
-    
+
     _constraints = [
         (_check_recursion, 'Error ! You cannot create recursive sections.', ['parent_id'])
     ]
-    
+
     def name_get(self, cr, uid, ids, context={}):
         """Overrides orm  """
         if not len(ids):
@@ -120,18 +120,30 @@ class crm_case_categ(osv.osv):
     _description = "Category of case"
 
     _columns = {
-        'name': fields.char('Case Category Name', size=64, required=True, translate=True), 
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
-        'object_id': fields.many2one('ir.model', 'Object Name'), 
+<<<<<<< TREE
+        'name': fields.char('Case Category Name', size=64, required=True, translate=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'object_id': fields.many2one('ir.model','Object Name'),
+=======
+        'name': fields.char('Case Category Name', size=64, required=True, translate=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'object_id': fields.many2one('ir.model', 'Object Name'),
+>>>>>>> MERGE-SOURCE
     }
     def _find_object_id(self, cr, uid, context=None):
         object_id = context and context.get('object_id', False) or False
+<<<<<<< TREE
+        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
+        return ids and ids[0]
+    _defaults = {
+=======
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0] 
-    _defaults = {        
+        return ids and ids[0]
+    _defaults = {
+>>>>>>> MERGE-SOURCE
         'object_id' : _find_object_id
     }
-#               
+#
 crm_case_categ()
 
 class crm_case_resource_type(osv.osv):
@@ -139,17 +151,28 @@ class crm_case_resource_type(osv.osv):
     _description = "Resource Type of case"
     _rec_name = "name"
     _columns = {
-        'name': fields.char('Case Resource Type', size=64, required=True, translate=True), 
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
-        'object_id': fields.many2one('ir.model', 'Object Name'), 
+<<<<<<< TREE
+        'name': fields.char('Case Resource Type', size=64, required=True, translate=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'object_id': fields.many2one('ir.model','Object Name'),
+=======
+        'name': fields.char('Case Resource Type', size=64, required=True, translate=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'object_id': fields.many2one('ir.model', 'Object Name'),
+>>>>>>> MERGE-SOURCE
     }
     def _find_object_id(self, cr, uid, context=None):
         object_id = context and context.get('object_id', False) or False
+<<<<<<< TREE
+        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
+        return ids and ids[0]
+=======
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0] 
+        return ids and ids[0]
+>>>>>>> MERGE-SOURCE
     _defaults = {
         'object_id' : _find_object_id
-    }    
+    }
 crm_case_resource_type()
 
 
@@ -159,24 +182,29 @@ class crm_case_stage(osv.osv):
     _rec_name = 'name'
     _order = "sequence"
     _columns = {
-        'name': fields.char('Stage Name', size=64, required=True, translate=True), 
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."), 
-        'object_id': fields.many2one('ir.model', 'Object Name'), 
-        'probability': fields.float('Probability (%)', required=True), 
-        'on_change': fields.boolean('Change Probability Automatically', help="Change Probability on next and previous stages."), 
+        'name': fields.char('Stage Name', size=64, required=True, translate=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
+        'object_id': fields.many2one('ir.model', 'Object Name'),
+        'probability': fields.float('Probability (%)', required=True),
+        'on_change': fields.boolean('Change Probability Automatically', help="Change Probability on next and previous stages."),
         'requirements': fields.text('Requirements')
     }
     def _find_object_id(self, cr, uid, context=None):
         object_id = context and context.get('object_id', False) or False
+<<<<<<< TREE
+        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
+        return ids and ids[0]
+=======
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0]     
+        return ids and ids[0]
+>>>>>>> MERGE-SOURCE
     _defaults = {
-        'sequence': lambda *args: 1, 
-        'probability': lambda *args: 0.0, 
+        'sequence': lambda *args: 1,
+        'probability': lambda *args: 0.0,
         'object_id' : _find_object_id
     }
-    
+
 crm_case_stage()
 
 def _links_get(self, cr, uid, context={}):
@@ -218,41 +246,50 @@ class crm_case(osv.osv):
         if not history_obj:
             return result
         for case in self.browse(cr, uid, ids, context):
+<<<<<<< TREE
+            model_ids = model_obj.search(cr, uid, [('model','=',case._name)])
+            history_ids = history_obj.search(cr, uid, [('model_id','=',model_ids[0]),('res_id','=',case.id)])
+=======
             model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
-            history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]), ('res_id', '=', case.id)])             
+            history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]), ('res_id', '=', case.id)])
+>>>>>>> MERGE-SOURCE
             if history_ids:
                 result[case.id] = {name: history_ids}
             else:
-                result[case.id] = {name: []}         
+<<<<<<< TREE
+                result[case.id] = {name:[]}
+=======
+                result[case.id] = {name: []}
+>>>>>>> MERGE-SOURCE
         return result
 
     _columns = {
-        'id': fields.integer('ID', readonly=True), 
-        'name': fields.char('Description', size=1024, required=True), 
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the case without removing it."), 
-        'description': fields.text('Description'), 
-        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True, help='Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway.'), 
-        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
+        'id': fields.integer('ID', readonly=True),
+        'name': fields.char('Description', size=1024, required=True),
+        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the case without removing it."),
+        'description': fields.text('Description'),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True, help='Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway.'),
+        'email_from': fields.char('Email', size=128, help="These people will receive email."),
         'email_cc': fields.text('Watchers Emails', size=252 , help="These people will receive a copy of the future" \
-                                                                    " communication between partner and users by email"), 
-        'probability': fields.float('Probability'), 
-        'email_last': fields.function(_email_last, method=True, 
-            string='Latest E-Mail', type='text'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"), 
-        'create_date': fields.datetime('Creation Date' , readonly=True), 
-        'write_date': fields.datetime('Update Date' , readonly=True), 
-        'date_deadline': fields.date('Deadline'), 
-        'user_id': fields.many2one('res.users', 'Responsible'), 
-        'history_line': fields.function(_get_log_ids, method=True, type='one2many', multi="history_line", relation="crm.case.history", string="Communication"), 
-        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', multi="log_ids", relation="crm.case.log", string="Logs History"), 
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"), 
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, 
+                                                                    " communication between partner and users by email"),
+        'probability': fields.float('Probability'),
+        'email_last': fields.function(_email_last, method=True,
+            string='Latest E-Mail', type='text'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
+        'create_date': fields.datetime('Creation Date' , readonly=True),
+        'write_date': fields.datetime('Update Date' , readonly=True),
+        'date_deadline': fields.date('Deadline'),
+        'user_id': fields.many2one('res.users', 'Responsible'),
+        'history_line': fields.function(_get_log_ids, method=True, type='one2many', multi="history_line", relation="crm.case.history", string="Communication"),
+        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', multi="log_ids", relation="crm.case.log", string="Logs History"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
-                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
-        'company_id': fields.many2one('res.company', 'Company'), 
+                                  \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
     def _get_default_partner_address(self, cr, uid, context):
         if not context.get('portal', False):
@@ -282,22 +319,22 @@ class crm_case(osv.osv):
        return user.context_section_id.id or False
 
     _defaults = {
-        'active': lambda *a: 1, 
-        'user_id': _get_default_user, 
-        'partner_id': _get_default_partner, 
-        'partner_address_id': _get_default_partner_address, 
-        'email_from': _get_default_email, 
-        'state': lambda *a: 'draft', 
-        'date_deadline': lambda *a: (datetime.today() + timedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S'), 
-        'section_id': _get_section, 
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), 
+        'active': lambda *a: 1,
+        'user_id': _get_default_user,
+        'partner_id': _get_default_partner,
+        'partner_address_id': _get_default_partner_address,
+        'email_from': _get_default_email,
+        'state': lambda *a: 'draft',
+        'date_deadline': lambda *a: (datetime.today() + timedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S'),
+        'section_id': _get_section,
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
     }
     _order = 'date_deadline desc, create_date desc,id desc'
 
     def unlink(self, cr, uid, ids, context={}):
         for case in self.browse(cr, uid, ids, context):
             if (not case.section_id.allow_unlink) and (case.state <> 'draft'):
-                raise osv.except_osv(_('Warning !'), 
+                raise osv.except_osv(_('Warning !'),
                     _('You can not delete this case. You should better cancel it.'))
         return super(crm_case, self).unlink(cr, uid, ids, context)
 
@@ -307,10 +344,10 @@ class crm_case(osv.osv):
             section = (case.section_id.id or False)
             if section in s:
                 st = case.stage_id.id  or False
-                if st in s[section]:                    
+                if st in s[section]:
                     self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
         return True
-    
+
     def get_stage_dict(self, cr, uid, ids, context={}):
         sid = self.pool.get('crm.case.stage').search(cr, uid, [('object_id.model', '=', self._name)], context=context)
         s = {}
@@ -321,7 +358,7 @@ class crm_case(osv.osv):
             s[section][previous.get(section, False)] = stage.id
             previous[section] = stage.id
         return s
-    
+
     def stage_previous(self, cr, uid, ids, context={}):
         s = self.get_stage_dict(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
@@ -347,7 +384,7 @@ class crm_case(osv.osv):
             if case.email_from:
                 value['email_from'] = case.email_from
         return {'value': value}
-    
+
     def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}):
         cases = self.browse(cr, uid, ids, context=context)
         return self.__history(cr, uid, cases, keyword=keyword, \
@@ -355,25 +392,44 @@ class crm_case(osv.osv):
                                context=context)
 
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
-        model_obj = self.pool.get('ir.model')          
+        model_obj = self.pool.get('ir.model')
         for case in cases:
-            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])            
+<<<<<<< TREE
+            model_ids = model_obj.search(cr, uid, [('model','=',case._name)])
+=======
+            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
+>>>>>>> MERGE-SOURCE
             data = {
-                'name': keyword, 
-                'user_id': uid, 
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
-                'model_id' : model_ids and model_ids[0] or False, 
-                'res_id': case.id, 
+<<<<<<< TREE
+                'name': keyword,
+                'user_id': uid,
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'model_id' : model_ids and model_ids[0] or False,
+                'res_id': case.id,
+=======
+                'name': keyword,
+                'user_id': uid,
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'model_id' : model_ids and model_ids[0] or False,
+                'res_id': case.id,
+>>>>>>> MERGE-SOURCE
                 'section_id': case.section_id.id
             }
             obj = self.pool.get('crm.case.log')
             if history:
                 obj = self.pool.get('crm.case.history')
                 data['description'] = details or case.description
+<<<<<<< TREE
+                data['email'] = email or \
+                        (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or False
+            res = obj.create(cr, uid, data, context)
+=======
                 data['email'] = email or False
                 data['email_from'] = (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or tools.config.get('email_from',False)
-            res = obj.create(cr, uid, data, context)            
+            res = obj.create(cr, uid, data, context)
+>>>>>>> MERGE-SOURCE
         return True
     _history = __history
 
@@ -389,34 +445,34 @@ class crm_case(osv.osv):
             if case.email_last:
                 description = email_last
                 self.write(cursor, user, case.id, {
-                    'description': '> ' + description.replace('\n', '\n> '), 
+                    'description': '> ' + description.replace('\n', '\n> '),
                     }, context=context)
         return True
 
     def case_log(self, cr, uid, ids, context={}, email=False, *args):
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Historize'), history=True, email=email)
-        return self.write(cr, uid, ids, {'description': False, 'som': False, 
+        return self.write(cr, uid, ids, {'description': False, 'som': False,
             'canal_id': False})
 
     def case_log_reply(self, cr, uid, ids, context={}, email=False, *args):
         cases = self.browse(cr, uid, ids)
         for case in cases:
             if not case.email_from:
-                raise osv.except_osv(_('Error!'), 
+                raise osv.except_osv(_('Error!'),
                         _('You must put a Partner eMail to use this action!'))
             if not case.user_id:
-                raise osv.except_osv(_('Error!'), 
+                raise osv.except_osv(_('Error!'),
                         _('You must define a responsible user for this case in order to use this action!'))
             if not case.description:
-                raise osv.except_osv(_('Error!'), 
+                raise osv.except_osv(_('Error!'),
                         _('Can not send mail with empty body,you should have description in the body'))
         self.__history(cr, uid, cases, _('Send'), history=True, email=False)
         for case in cases:
             self.write(cr, uid, [case.id], {
-                'description': False, 
-                'som': False, 
-                'canal_id': False, 
+                'description': False,
+                'som': False,
+                'canal_id': False,
                 })
             emails = [case.email_from] + (case.email_cc or '').split(',')
             emails = filter(None, emails)
@@ -426,23 +482,28 @@ class crm_case(osv.osv):
 
             emailfrom = case.user_id.address_id and case.user_id.address_id.email or False
             if not emailfrom:
-                raise osv.except_osv(_('Error!'), 
+                raise osv.except_osv(_('Error!'),
                         _("No E-Mail ID Found for your Company address!"))
 
             tools.email_send(
-                emailfrom, 
-                emails, 
-                '[' + str(case.id) + '] ' + case.name, 
-                self.format_body(body), 
-                reply_to = case.section_id.reply_to, 
+                emailfrom,
+                emails,
+                '[' + str(case.id) + '] ' + case.name,
+                self.format_body(body),
+                reply_to = case.section_id.reply_to,
                 openobject_id = str(case.id)
             )
         return True
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
         if not part:
-            return {'value': {'partner_address_id': False, 
-                            'email_from': False, 
+<<<<<<< TREE
+            return {'value':{'partner_address_id': False,
+                            'email_from': False,
+=======
+            return {'value': {'partner_address_id': False,
+                            'email_from': False,
+>>>>>>> MERGE-SOURCE
                             }}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
         data = {'partner_address_id': addr['contact']}
@@ -481,7 +542,11 @@ class crm_case(osv.osv):
             self.write(cr, uid, ids, data)
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Escalate'))
-        self._action(cr, uid, cases, 'escalate')        
+<<<<<<< TREE
+        self._action(cr,uid, cases, 'escalate')
+=======
+        self._action(cr, uid, cases, 'escalate')
+>>>>>>> MERGE-SOURCE
         return True
 
 
@@ -517,9 +582,15 @@ class crm_case(osv.osv):
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Draft'))
+<<<<<<< TREE
+        self.write(cr, uid, ids, {'state':'draft', 'active':True})
+        self._action(cr,uid, cases, 'draft')
+        return True
+=======
         self.write(cr, uid, ids, {'state': 'draft', 'active': True})
         self._action(cr, uid, cases, 'draft')
-        return True   
+        return True
+>>>>>>> MERGE-SOURCE
 
 crm_case()
 
@@ -529,17 +600,17 @@ class crm_case_log(osv.osv):
     _description = "Case Communication History"
     _order = "id desc"
     _columns = {
-        'name': fields.char('Status', size=64), 
-        'som': fields.many2one('res.partner.som', 'State of Mind'), 
-        'date': fields.datetime('Date'), 
-        'canal_id': fields.many2one('res.partner.canal', 'Channel'), 
-        'section_id': fields.many2one('crm.case.section', 'Section'), 
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
-        'model_id': fields.many2one('ir.model', "Model"), 
-        'res_id': fields.integer('Resource ID'), 
+        'name': fields.char('Status', size=64),
+        'som': fields.many2one('res.partner.som', 'State of Mind'),
+        'date': fields.datetime('Date'),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel'),
+        'section_id': fields.many2one('crm.case.section', 'Section'),
+        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
+        'model_id': fields.many2one('ir.model', "Model"),
+        'res_id': fields.integer('Resource ID'),
     }
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
 crm_case_log()
 
@@ -547,7 +618,7 @@ class crm_case_history(osv.osv):
     _name = "crm.case.history"
     _description = "Case history"
     _order = "id desc"
-    _inherits = {'crm.case.log': "log_id"}    
+    _inherits = {'crm.case.log': "log_id"}
 
     def _note_get(self, cursor, user, ids, name, arg, context=None):
         res = {}
@@ -556,11 +627,11 @@ class crm_case_history(osv.osv):
             res[hist.id] += (hist.description or '')
         return res
     _columns = {
-        'description': fields.text('Description'), 
-        'note': fields.function(_note_get, method=True, string="Description", type="text"), 
-        'email': fields.char('Email', size=84), 
+        'description': fields.text('Description'),
+        'note': fields.function(_note_get, method=True, string="Description", type="text"),
+        'email': fields.char('Email', size=84),
         'email_from' : fields.char('From Email', size=84),
-        'log_id': fields.many2one('crm.case.log', 'Log', ondelete='cascade'), 
+        'log_id': fields.many2one('crm.case.log', 'Log', ondelete='cascade'),
     }
 crm_case_history()
 
@@ -568,11 +639,11 @@ class crm_email_add_cc_wizard(osv.osv_memory):
     _name = "crm.email.add.cc"
     _description = "Email Add CC"
     _columns = {
-        'name': fields.selection([('user', 'User'), ('partner', 'Partner'), ('email', 'Email Address')], 'Send to', required=True), 
-        'user_id': fields.many2one('res.users', "User"), 
-        'partner_id': fields.many2one('res.partner', "Partner"), 
-        'email': fields.char('Email', size=32), 
-        'subject': fields.char('Subject', size=32), 
+        'name': fields.selection([('user', 'User'), ('partner', 'Partner'), ('email', 'Email Address')], 'Send to', required=True),
+        'user_id': fields.many2one('res.users', "User"),
+        'partner_id': fields.many2one('res.partner', "Partner"),
+        'email': fields.char('Email', size=32),
+        'subject': fields.char('Subject', size=32),
     }
 
     def change_email(self, cr, uid, ids, user, partner):
@@ -603,12 +674,12 @@ class crm_email_add_cc_wizard(osv.osv_memory):
         case = model_pool.browse(cr, uid, history_line.log_id.res_id)
         body = history_line.description.replace('\n', '\n> ')
         flag = tools.email_send(
-            case.user_id.address_id.email, 
-            [case.email_from], 
-            subject or '[' + str(case.id) + '] ' + case.name, 
-            model_pool.format_body(body), 
-            email_cc = [email], 
-            openobject_id = str(case.id), 
+            case.user_id.address_id.email,
+            [case.email_from],
+            subject or '[' + str(case.id) + '] ' + case.name,
+            model_pool.format_body(body),
+            email_cc = [email],
+            openobject_id = str(case.id),
             subtype = "html"
         )
         if flag:
@@ -623,15 +694,14 @@ class users(osv.osv):
     _inherit = 'res.users'
     _description = "Users"
     _columns = {
-        'context_section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+        'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
 users()
 
-
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
 
 res_partner()

From 9de897fdb13f7133d875400b1586c94d0ab8cb0c Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 15:22:30 +0530
Subject: [PATCH 097/248] [REM]: crm: Removed wrong commit changes

bzr revid: ksa@tinyerp.co.in-20100322095230-eg71k9wd7nnfzphp
---
 addons/crm/crm.py | 442 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 352 insertions(+), 90 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index a30eb190968..5b3b6b38b82 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -61,10 +61,12 @@ class crm_case_section(osv.osv):
     _columns = {
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
         'code': fields.char('Code', size=8),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the sales team without removing it."),
+        'active': fields.boolean('Active', help="If the active field is set to \
+                        true, it will allow you to hide the sales team without removing it."),
         'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
         'user_id': fields.many2one('res.users', 'Responsible User'),
-        'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
+        'reply_to': fields.char('Reply-To', size=64, help="The email address put \
+                        in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Section'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'),
     }
@@ -102,7 +104,14 @@ class crm_case_section(osv.osv):
     ]
 
     def name_get(self, cr, uid, ids, context={}):
-        """Overrides orm  """
+
+        """Overrides orm
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of section ids
+        """
+
         if not len(ids):
             return []
         reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
@@ -116,60 +125,59 @@ class crm_case_section(osv.osv):
 crm_case_section()
 
 class crm_case_categ(osv.osv):
+    """ Category of Case """
+
     _name = "crm.case.categ"
     _description = "Category of case"
 
     _columns = {
-<<<<<<< TREE
-        'name': fields.char('Case Category Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'object_id': fields.many2one('ir.model','Object Name'),
-=======
         'name': fields.char('Case Category Name', size=64, required=True, translate=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'object_id': fields.many2one('ir.model', 'Object Name'),
->>>>>>> MERGE-SOURCE
     }
     def _find_object_id(self, cr, uid, context=None):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         object_id = context and context.get('object_id', False) or False
-<<<<<<< TREE
-        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0]
-    _defaults = {
-=======
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
     _defaults = {
->>>>>>> MERGE-SOURCE
         'object_id' : _find_object_id
     }
 #
 crm_case_categ()
 
 class crm_case_resource_type(osv.osv):
+    """ Resource Type of case """
+
     _name = "crm.case.resource.type"
     _description = "Resource Type of case"
     _rec_name = "name"
+
     _columns = {
-<<<<<<< TREE
-        'name': fields.char('Case Resource Type', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'object_id': fields.many2one('ir.model','Object Name'),
-=======
         'name': fields.char('Case Resource Type', size=64, required=True, translate=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'object_id': fields.many2one('ir.model', 'Object Name'),
->>>>>>> MERGE-SOURCE
     }
     def _find_object_id(self, cr, uid, context=None):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
+
         object_id = context and context.get('object_id', False) or False
-<<<<<<< TREE
-        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0]
-=======
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
->>>>>>> MERGE-SOURCE
     _defaults = {
         'object_id' : _find_object_id
     }
@@ -177,28 +185,36 @@ crm_case_resource_type()
 
 
 class crm_case_stage(osv.osv):
+    """ Stage of case """
+
     _name = "crm.case.stage"
     _description = "Stage of case"
     _rec_name = 'name'
     _order = "sequence"
+
     _columns = {
         'name': fields.char('Stage Name', size=64, required=True, translate=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order \
+                        when displaying a list of case stages."),
         'object_id': fields.many2one('ir.model', 'Object Name'),
         'probability': fields.float('Probability (%)', required=True),
-        'on_change': fields.boolean('Change Probability Automatically', help="Change Probability on next and previous stages."),
+        'on_change': fields.boolean('Change Probability Automatically',\
+                         help="Change Probability on next and previous stages."),
         'requirements': fields.text('Requirements')
     }
     def _find_object_id(self, cr, uid, context=None):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         object_id = context and context.get('object_id', False) or False
-<<<<<<< TREE
-        ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0]
-=======
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
->>>>>>> MERGE-SOURCE
     _defaults = {
         'sequence': lambda *args: 1,
         'probability': lambda *args: 0.0,
@@ -208,6 +224,15 @@ class crm_case_stage(osv.osv):
 crm_case_stage()
 
 def _links_get(self, cr, uid, context={}):
+
+    """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
+
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
@@ -215,10 +240,22 @@ def _links_get(self, cr, uid, context={}):
 
 
 class crm_case(osv.osv):
+    """ CRM Case """
+
     _name = "crm.case"
     _description = "Case"
 
     def _email_last(self, cursor, user, ids, name, arg, context=None):
+
+        """Return History
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case’s IDs
+        @param context: A standard dictionary for contextual values
+        """
+
+
         res = {}
         for case in self.browse(cursor, user, ids):
             if case.history_line:
@@ -228,12 +265,30 @@ class crm_case(osv.osv):
         return res
 
     def copy(self, cr, uid, id, default=None, context={}):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case’s IDs
+        @param context: A standard dictionary for contextual values
+        """
+
         if not default:
             default = {}
         default.update({'state': 'draft', 'id': False})
         return super(crm_case, self).copy(cr, uid, id, default, context)
 
     def _get_log_ids(self, cr, uid, ids, field_names, arg, context={}):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case log’s IDs
+        @param context: A standard dictionary for contextual values
+        """
+
         result = {}
         history_obj = False
         model_obj = self.pool.get('ir.model')
@@ -246,44 +301,45 @@ class crm_case(osv.osv):
         if not history_obj:
             return result
         for case in self.browse(cr, uid, ids, context):
-<<<<<<< TREE
-            model_ids = model_obj.search(cr, uid, [('model','=',case._name)])
-            history_ids = history_obj.search(cr, uid, [('model_id','=',model_ids[0]),('res_id','=',case.id)])
-=======
             model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
-            history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]), ('res_id', '=', case.id)])
->>>>>>> MERGE-SOURCE
+            history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]),\
+                                         ('res_id', '=', case.id)])
             if history_ids:
                 result[case.id] = {name: history_ids}
             else:
-<<<<<<< TREE
-                result[case.id] = {name:[]}
-=======
                 result[case.id] = {name: []}
->>>>>>> MERGE-SOURCE
         return result
 
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Description', size=1024, required=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the case without removing it."),
+        'active': fields.boolean('Active', help="If the active field is set to\
+                     true, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True, help='Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway.'),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team',\
+                        select=True, help='Sales team to which Case belongs to.\
+                             Define Responsible user and Email account for mail gateway.'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
-        'email_cc': fields.text('Watchers Emails', size=252 , help="These people will receive a copy of the future" \
-                                                                    " communication between partner and users by email"),
+        'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
+                             will receive a copy of the future" \
+                            " communication between partner and users by email"),
         'probability': fields.float('Probability'),
         'email_last': fields.function(_email_last, method=True,
             string='Latest E-Mail', type='text'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact',\
+                                 domain="[('partner_id','=',partner_id)]"),
         'create_date': fields.datetime('Creation Date' , readonly=True),
         'write_date': fields.datetime('Update Date' , readonly=True),
         'date_deadline': fields.date('Deadline'),
         'user_id': fields.many2one('res.users', 'Responsible'),
-        'history_line': fields.function(_get_log_ids, method=True, type='one2many', multi="history_line", relation="crm.case.history", string="Communication"),
-        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', multi="log_ids", relation="crm.case.log", string="Logs History"),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
+        'history_line': fields.function(_get_log_ids, method=True, type='one2many',\
+                         multi="history_line", relation="crm.case.history", string="Communication"),
+        'log_ids': fields.function(_get_log_ids, method=True, type='one2many',\
+                         multi="log_ids", relation="crm.case.log", string="Logs History"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage',\
+                         domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.opportunity')]"),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
@@ -292,31 +348,74 @@ class crm_case(osv.osv):
         'company_id': fields.many2one('res.company', 'Company'),
     }
     def _get_default_partner_address(self, cr, uid, context):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         if not context.get('portal', False):
             return False
         return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
+
     def _get_default_partner(self, cr, uid, context):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         if not context.get('portal', False):
             return False
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         if not user.address_id:
             return False
         return user.address_id.partner_id.id
+
     def _get_default_email(self, cr, uid, context):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         if not context.get('portal', False):
             return False
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         if not user.address_id:
             return False
         return user.address_id.email
+
     def _get_default_user(self, cr, uid, context):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         if context.get('portal', False):
             return False
         return uid
 
     def _get_section(self, cr, uid, context):
-       user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-       return user.context_section_id.id or False
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return user.context_section_id.id or False
 
     _defaults = {
         'active': lambda *a: 1,
@@ -332,6 +431,14 @@ class crm_case(osv.osv):
     _order = 'date_deadline desc, create_date desc,id desc'
 
     def unlink(self, cr, uid, ids, context={}):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case’s IDs
+        @param context: A standard dictionary for contextual values"""
+
         for case in self.browse(cr, uid, ids, context):
             if (not case.section_id.allow_unlink) and (case.state <> 'draft'):
                 raise osv.except_osv(_('Warning !'),
@@ -339,6 +446,14 @@ class crm_case(osv.osv):
         return super(crm_case, self).unlink(cr, uid, ids, context)
 
     def stage_next(self, cr, uid, ids, context={}):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of stage next’s IDs
+        @param context: A standard dictionary for contextual values"""
+
         s = self.get_stage_dict(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
             section = (case.section_id.id or False)
@@ -349,7 +464,16 @@ class crm_case(osv.osv):
         return True
 
     def get_stage_dict(self, cr, uid, ids, context={}):
-        sid = self.pool.get('crm.case.stage').search(cr, uid, [('object_id.model', '=', self._name)], context=context)
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of stage dict’s IDs
+        @param context: A standard dictionary for contextual values"""
+
+        sid = self.pool.get('crm.case.stage').search(cr, uid,\
+                            [('object_id.model', '=', self._name)], context=context)
         s = {}
         previous = {}
         for stage in self.pool.get('crm.case.stage').browse(cr, uid, sid, context=context):
@@ -360,6 +484,14 @@ class crm_case(osv.osv):
         return s
 
     def stage_previous(self, cr, uid, ids, context={}):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of stage previous’s IDs
+        @param context: A standard dictionary for contextual values"""
+
         s = self.get_stage_dict(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
             section = (case.section_id.id or False)
@@ -371,6 +503,16 @@ class crm_case(osv.osv):
         return True
 
     def onchange_case_id(self, cr, uid, ids, case_id, name, partner_id, context={}):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case’s IDs
+        @partner_id: Get Partner Id
+        @param context: A standard dictionary for contextual values
+        """
+
         if not case_id:
             return {}
         case = self.browse(cr, uid, case_id, context=context)
@@ -386,54 +528,61 @@ class crm_case(osv.osv):
         return {'value': value}
 
     def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of History’s IDs
+        @param context: A standard dictionary for contextual values"""
+
         cases = self.browse(cr, uid, ids, context=context)
         return self.__history(cr, uid, cases, keyword=keyword, \
                                history=history, email=email, details=details, \
                                context=context)
 
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of History’s IDs
+        @param context: A standard dictionary for contextual values"""
+
+
         model_obj = self.pool.get('ir.model')
         for case in cases:
-<<<<<<< TREE
-            model_ids = model_obj.search(cr, uid, [('model','=',case._name)])
-=======
             model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
->>>>>>> MERGE-SOURCE
             data = {
-<<<<<<< TREE
                 'name': keyword,
                 'user_id': uid,
                 'date': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'model_id' : model_ids and model_ids[0] or False,
                 'res_id': case.id,
-=======
-                'name': keyword,
-                'user_id': uid,
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'model_id' : model_ids and model_ids[0] or False,
-                'res_id': case.id,
->>>>>>> MERGE-SOURCE
                 'section_id': case.section_id.id
             }
             obj = self.pool.get('crm.case.log')
             if history:
                 obj = self.pool.get('crm.case.history')
                 data['description'] = details or case.description
-<<<<<<< TREE
-                data['email'] = email or \
-                        (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or False
-            res = obj.create(cr, uid, data, context)
-=======
                 data['email'] = email or False
                 data['email_from'] = (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or tools.config.get('email_from',False)
             res = obj.create(cr, uid, data, context)
->>>>>>> MERGE-SOURCE
         return True
     _history = __history
 
     def create(self, cr, uid, *args, **argv):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param *args: Give Tuple Value
+        @Paran **args: Give Dictionay of Keyword Value
+        """
+
         res = super(crm_case, self).create(cr, uid, *args, **argv)
         cases = self.browse(cr, uid, [res])
         cases[0].state # to fill the browse record cache
@@ -441,6 +590,14 @@ class crm_case(osv.osv):
         return res
 
     def add_reply(self, cursor, user, ids, context=None):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
         for case in self.browse(cursor, user, ids, context=context):
             if case.email_last:
                 description = email_last
@@ -450,12 +607,30 @@ class crm_case(osv.osv):
         return True
 
     def case_log(self, cr, uid, ids, context={}, email=False, *args):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        @param *args: Give Tuple Value
+        """
+
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Historize'), history=True, email=email)
         return self.write(cr, uid, ids, {'description': False, 'som': False,
             'canal_id': False})
 
     def case_log_reply(self, cr, uid, ids, context={}, email=False, *args):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        @param *args: Give Tuple Value
+        """
+
         cases = self.browse(cr, uid, ids)
         for case in cases:
             if not case.email_from:
@@ -496,14 +671,16 @@ class crm_case(osv.osv):
         return True
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        """
+
         if not part:
-<<<<<<< TREE
-            return {'value':{'partner_address_id': False,
-                            'email_from': False,
-=======
             return {'value': {'partner_address_id': False,
                             'email_from': False,
->>>>>>> MERGE-SOURCE
                             }}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
         data = {'partner_address_id': addr['contact']}
@@ -511,6 +688,13 @@ class crm_case(osv.osv):
         return {'value': data}
 
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        """
+
         data = {}
         if not add:
             return {'value': {'email_from': False, 'partner_name2': False}}
@@ -519,6 +703,15 @@ class crm_case(osv.osv):
         return {'value': data}
 
     def case_close(self, cr, uid, ids, *args):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Close'))
@@ -530,6 +723,15 @@ class crm_case(osv.osv):
         return True
 
     def case_escalate(self, cr, uid, ids, *args):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
         cases = self.browse(cr, uid, ids)
         for case in cases:
             data = {'active': True, 'user_id': False}
@@ -542,15 +744,20 @@ class crm_case(osv.osv):
             self.write(cr, uid, ids, data)
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Escalate'))
-<<<<<<< TREE
-        self._action(cr,uid, cases, 'escalate')
-=======
         self._action(cr, uid, cases, 'escalate')
->>>>>>> MERGE-SOURCE
         return True
 
 
     def case_open(self, cr, uid, ids, *args):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
         cases = self.browse(cr, uid, ids)
         self.__history(cr, uid, cases, _('Open'))
         for case in cases:
@@ -563,6 +770,15 @@ class crm_case(osv.osv):
 
 
     def case_cancel(self, cr, uid, ids, *args):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Cancel'))
@@ -571,6 +787,15 @@ class crm_case(osv.osv):
         return True
 
     def case_pending(self, cr, uid, ids, *args):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Pending'))
@@ -579,25 +804,30 @@ class crm_case(osv.osv):
         return True
 
     def case_reset(self, cr, uid, ids, *args):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
         cases = self.browse(cr, uid, ids)
         cases[0].state # to fill the browse record cache
         self.__history(cr, uid, cases, _('Draft'))
-<<<<<<< TREE
-        self.write(cr, uid, ids, {'state':'draft', 'active':True})
-        self._action(cr,uid, cases, 'draft')
-        return True
-=======
         self.write(cr, uid, ids, {'state': 'draft', 'active': True})
         self._action(cr, uid, cases, 'draft')
         return True
->>>>>>> MERGE-SOURCE
 
 crm_case()
 
 
 class crm_case_log(osv.osv):
+    """ Case Communication History """
     _name = "crm.case.log"
     _description = "Case Communication History"
+
     _order = "id desc"
     _columns = {
         'name': fields.char('Status', size=64),
@@ -609,18 +839,30 @@ class crm_case_log(osv.osv):
         'model_id': fields.many2one('ir.model', "Model"),
         'res_id': fields.integer('Resource ID'),
     }
+
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
+
 crm_case_log()
 
 class crm_case_history(osv.osv):
+    """Case history"""
+
     _name = "crm.case.history"
     _description = "Case history"
     _order = "id desc"
     _inherits = {'crm.case.log': "log_id"}
 
     def _note_get(self, cursor, user, ids, name, arg, context=None):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of case History’s IDs
+            @param context: A standard dictionary for contextual values
+        """
+
         res = {}
         for hist in self.browse(cursor, user, ids, context or {}):
             res[hist.id] = (hist.email or '/') + ' (' + str(hist.date) + ')\n'
@@ -633,13 +875,18 @@ class crm_case_history(osv.osv):
         'email_from' : fields.char('From Email', size=84),
         'log_id': fields.many2one('crm.case.log', 'Log', ondelete='cascade'),
     }
+
 crm_case_history()
 
 class crm_email_add_cc_wizard(osv.osv_memory):
+    """ Email Add CC"""
+
     _name = "crm.email.add.cc"
     _description = "Email Add CC"
+
     _columns = {
-        'name': fields.selection([('user', 'User'), ('partner', 'Partner'), ('email', 'Email Address')], 'Send to', required=True),
+        'name': fields.selection([('user', 'User'), ('partner', 'Partner'),\
+                         ('email', 'Email Address')], 'Send to', required=True),
         'user_id': fields.many2one('res.users', "User"),
         'partner_id': fields.many2one('res.partner', "Partner"),
         'email': fields.char('Email', size=32),
@@ -647,6 +894,13 @@ class crm_email_add_cc_wizard(osv.osv_memory):
     }
 
     def change_email(self, cr, uid, ids, user, partner):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Mail’s IDs
+        """
+
         if (not partner and not user):
             return {'value': {'email': False}}
         email = False
@@ -662,6 +916,14 @@ class crm_email_add_cc_wizard(osv.osv_memory):
 
 
     def add_cc(self, cr, uid, ids, context={}):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of create menu’s IDs
+            @param context: A standard dictionary for contextual values
+        """
+
         data = self.read(cr, uid, ids[0])
         email = data['email']
         subject = data['subject']
@@ -698,6 +960,7 @@ class users(osv.osv):
     }
 users()
 
+
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
@@ -706,5 +969,4 @@ class res_partner(osv.osv):
 
 res_partner()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e593dc39df66e16bdaf00059976219057d0a8cfd Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 22 Mar 2010 15:26:40 +0530
Subject: [PATCH 098/248] [IMP] crm: crm send wizard

bzr revid: hmo@tinyerp.com-20100322095640-m4ndyih1y96vb4ku
---
 addons/crm/wizard/crm_send_email.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index de189e6f51c..b838774b161 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -210,6 +210,9 @@ class crm_send_new_email(osv.osv_memory):
         mod_obj = self.pool.get(model)
         if context.get('mail') == 'reply':
             return True
+        if tools.config.get('email_from')
+            return True
+
         for case in mod_obj.browse(cr, uid, context.get('active_ids', [])):
             if not case.user_id:
                 raise osv.except_osv(_('Error'), _('You must define a responsible user for this case in order to use this action!'))

From 765b10a0a4a5ab54814dbd35c155451c70494874 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 15:27:54 +0530
Subject: [PATCH 099/248] [IMP]: crm: Converted Partner to Opportunity  wizrd 
 into osv memory wizard

bzr revid: ksa@tinyerp.co.in-20100322095754-dmmcfdjfb7nw1jvr
---
 addons/crm/__terp__.py                        |   1 +
 addons/crm/wizard/__init__.py                 |   1 +
 .../crm/wizard/crm_partner_to_opportunity.py  | 122 ++++++++++++++++++
 .../crm_partner_to_opportunity_view.xml       |  45 +++++++
 4 files changed, 169 insertions(+)
 create mode 100644 addons/crm/wizard/crm_partner_to_opportunity.py
 create mode 100644 addons/crm/wizard/crm_partner_to_opportunity_view.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 5931a056c7b..2dab4b27a88 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -71,6 +71,7 @@ between mails and Open ERP.""",
 
         'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/crm_opportunity_to_phonecall_view.xml',
+        'wizard/crm_partner_to_opportunity_view.xml',
         
         'wizard/crm_send_email_view.xml', 
         'crm_wizard.xml', 
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index e95897a8495..7b4bb5704f6 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -32,6 +32,7 @@ import crm_phonecall_to_phonecall
 import crm_phonecall_to_partner
 import crm_phonecall_to_meeting
 import crm_phonecall_to_opportunity
+import crm_partner_to_opportunity
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
new file mode 100644
index 00000000000..fd27477e0c4
--- /dev/null
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_partner2opportunity(osv.osv_memory):
+    """Converts Partner To Opportunity"""
+
+    _name = 'crm.partner2opportunity'
+    _description = 'Partner To Opportunity'
+
+    _columns = {
+        'name' : fields.char('Opportunity Name', size=64, required=True),
+        'planned_revenue': fields.float('Expected Revenue', digits=(16,2)),
+        'probability': fields.float('Success Probability', digits=(16,2)),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        partner_obj = self.pool.get('res.partner')
+        #data = context and context.get('active_id', False) or False
+        data = context and context.get('active_ids', []) or []
+        res = super(crm_partner2opportunity, self).default_get(cr, uid, fields, context=context)
+
+        for partner in partner_obj.browse(cr, uid, data, []):
+            if 'name' in fields:
+                res.update({'name': partner.name})
+            if 'partner_id' in fields:
+                res.update({'partner_id': data and data[0] or False})
+        return res
+
+    def _select_data(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        part_obj = pool.get('res.partner')
+        part = part_obj.read(cr, uid, data['id' ], ['name'])
+        return {'partner_id' : data['id'], 'name' : part['name'] }
+
+
+    def make_opportunity(self, cr, uid, ids, context):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+
+        data = context and context.get('active_ids', []) or []
+        make_opportunity = self.pool.get('crm.partner2opportunity')
+        for make_opportunity_obj in make_opportunity.browse(cr,uid,ids):
+            data_obj = self.pool.get('ir.model.data')
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+            part_obj = self.pool.get('res.partner')
+            address = part_obj.address_get(cr, uid, data)
+
+
+            categ_obj = self.pool.get('crm.case.categ')
+            categ_ids = categ_obj.search(cr, uid, [('name','ilike','Part%')])
+
+            case_obj = self.pool.get('crm.opportunity')
+            opp_id = case_obj.create(cr, uid, {
+                'name' : make_opportunity_obj.name,
+                'planned_revenue' : make_opportunity_obj.planned_revenue,
+                'probability' : make_opportunity_obj.probability,
+                'partner_id' : make_opportunity_obj.partner_id.id,
+                'partner_address_id' : address['default'],
+                'categ_id' : categ_ids[0],
+                'state' :'draft',
+            })
+            value = {
+                'name' : _('Opportunity'),
+                'view_type' : 'form',
+                'view_mode' : 'form,tree',
+                'res_model' : 'crm.opportunity',
+                'res_id' : opp_id,
+                'view_id' : False,
+                'views' : [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
+                'type' : 'ir.actions.act_window',
+                'search_view_id' : res['res_id']
+            }
+            return value
+
+crm_partner2opportunity()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
new file mode 100644
index 00000000000..41c32a9fa42
--- /dev/null
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -0,0 +1,45 @@
+<openerp>
+  	<data>
+
+		<!-- partner To Opportunity form -->
+
+  		<record id="view_crm_partner2opportunity" model="ir.ui.view">
+	      <field name="name">crm.crm.partner2opportunity</field>
+	      <field name="model">crm.partner2opportunity</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Convert To Opportunity">
+	        <field name="name"/>
+	        <field name="partner_id"/>
+	        <newline/>
+	        <field name="planned_revenue"/>
+	        <field name="probability"/>
+        		<separator string="" colspan="4" />
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+	      			<button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+
+<!-- partner To Opportunity Action -->
+
+	  <record model="ir.actions.act_window" id="action_view_crm_partner2opportunity">
+            <field name="name">Create Opportunity</field>
+            <field name="res_model">crm.partner2opportunity</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+	    <!-- partner To Opportunity wizard -->
+
+	   <act_window id="crm_partner2opportunity"
+    		key2="client_action_multi" name="Create Opportunity"
+    		res_model="crm.partner2opportunity" src_model="res.partner"
+    		view_id="view_crm_lead2partner_create"
+    		view_mode="form" target="new" view_type="form" />
+
+ 	</data>
+</openerp>

From a91dadcc9fab5f09d34d706c88a66a09f0ed6110 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 22 Mar 2010 15:40:34 +0530
Subject: [PATCH 100/248] [IMP]: base_report_creator: Convert old
 base_report_creator_open  wizard into osv_memory wizard report_open and
 report_open_view

bzr revid: atp@tinyerp.co.in-20100322101034-1mtsdi8kc1lgrfwf
---
 addons/base_report_creator/__terp__.py        |  1 +
 .../base_report_creator_view.xml              | 27 ++-----
 .../security/ir.model.access.csv              |  1 +
 addons/base_report_creator/wizard/__init__.py |  3 +-
 .../base_report_creator/wizard/report_open.py | 71 +++++++++++++++++++
 .../wizard/report_open_view.xml               | 34 +++++++++
 6 files changed, 114 insertions(+), 23 deletions(-)
 create mode 100644 addons/base_report_creator/wizard/report_open.py
 create mode 100644 addons/base_report_creator/wizard/report_open_view.xml

diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__terp__.py
index bee7ec57c91..a706f0c9317 100644
--- a/addons/base_report_creator/__terp__.py
+++ b/addons/base_report_creator/__terp__.py
@@ -38,6 +38,7 @@ the "Dashboard" menu.
     'update_xml': [
         'security/ir.model.access.csv',
         'wizard/report_menu_create_view.xml',
+        'wizard/report_open_view.xml',
         'base_report_creator_wizard.xml',
         'base_report_creator_view.xml'
     ],
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index ac3052a7769..f9b4b901067 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -151,26 +151,11 @@
         id="menu_base_report_creator_action"
         action="base_report_creator_action_tree"/>
 
-    <wizard
-        id="wizard_report_open"
-        string="Open Report"
-        name="base_report_creator.report.open"/>
-
-    <record model="ir.values" id="ir_open_report">
-        <field name="key2" eval="'tree_but_open'"/>
-        <field name="model" eval="'base_report_creator.report'"/>
-        <field name="name">Browse Report</field>
-        <field name="value" eval="'ir.actions.wizard,%d'%wizard_report_open"/>
-        <field name="object" eval="True"/>
-    </record>
-    
-    <record model="ir.values" id="ir_open_report_multi">
-        <field name="key2" eval="'client_action_multi'"/>
-        <field name="model" eval="'base_report_creator.report'"/>
-        <field name="name">Browse Report</field>
-        <field name="value" eval="'ir.actions.wizard,%d'%wizard_report_open"/>
-        <field name="object" eval="True"/>
-    </record>
-
+    <act_window id="action_report_open"
+    		key2="client_action_multi" name="Open Report"
+    		res_model="report.open" src_model="base_report_creator.report"
+    		view_mode="form" target="new" view_type="form" />
+    		
+ 
     </data>
 </openerp>
diff --git a/addons/base_report_creator/security/ir.model.access.csv b/addons/base_report_creator/security/ir.model.access.csv
index 932c1a623f6..a22e6935e51 100644
--- a/addons/base_report_creator/security/ir.model.access.csv
+++ b/addons/base_report_creator/security/ir.model.access.csv
@@ -3,3 +3,4 @@
 "access_base_report_creator_report_fields","base_report_creator.report.fields","model_base_report_creator_report_fields","base.group_system",1,1,1,1
 "access_base_report_creator_report_filter","base_report_creator.report.filter","model_base_report_creator_report_filter","base.group_system",1,1,1,1
 "access_report_menu_create","report.menu.create","model_report_menu_create","base.group_system",1,1,1,1
+"access_report_open","report.open","model_report_open","base.group_system",1,1,1,1
diff --git a/addons/base_report_creator/wizard/__init__.py b/addons/base_report_creator/wizard/__init__.py
index 945d42586d1..d2ff1dc5fea 100644
--- a/addons/base_report_creator/wizard/__init__.py
+++ b/addons/base_report_creator/wizard/__init__.py
@@ -20,8 +20,7 @@
 ##############################################################################
 
 import wiz_set_filter_fields
-import base_report_creator_open
 import report_menu_create
-
+import report_open
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_creator/wizard/report_open.py b/addons/base_report_creator/wizard/report_open.py
new file mode 100644
index 00000000000..4476c9d4e93
--- /dev/null
+++ b/addons/base_report_creator/wizard/report_open.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+
+class report_open(osv.osv_memory):
+    """
+    Open report
+    """
+    _name = "report.open"
+    _description = __doc__
+
+    def open_report(self, cr, uid, ids, context=None):
+        """
+        This Function opens base creator report  view
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of report open's IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for base creator report form
+        """
+
+        if not context:
+            context = {}
+            
+        context_id = context and context.get('active_id', False) or False
+        
+        if context.get('report_id', False):
+            raise  osv.except_osv(_('UserError'), _('No Wizards available for this object!'))
+        
+        rep = self.pool.get('base_report_creator.report').browse(cr, uid, context_id, context)
+        view_mode = rep.view_type1
+        
+        if rep.view_type2:
+            view_mode += ',' + rep.view_type2
+        if rep.view_type3:
+            view_mode += ',' + rep.view_type3
+        value = {
+            'name': rep.name, 
+            'view_type': 'form', 
+            'view_mode': view_mode, 
+            'res_model': 'base_report_creator.report', 
+            'context': {'report_id': context_id}, 
+            'view_id': False, 
+            'type': 'ir.actions.act_window'
+        }
+        
+        return value
+
+report_open()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_creator/wizard/report_open_view.xml b/addons/base_report_creator/wizard/report_open_view.xml
new file mode 100644
index 00000000000..7fcd413af00
--- /dev/null
+++ b/addons/base_report_creator/wizard/report_open_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    <!-- Report Open wizard -->
+    
+  		<record id="view_report_open" model="ir.ui.view">
+            <field name="name">report.open.form</field>
+            <field name="model">report.open</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Report open">
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel"
+                    		string="Cancel" />
+                    	<button icon="gtk-open" string="Open Report"
+                    		name="open_report" type="object" />
+                    </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_report_open" model="ir.actions.act_window">
+            <field name="name">Open Report</field>
+            <field name="res_model">report.open</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_report_open"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file

From e189ccd6659d6506a0298dbc5d4d8f71f15aadea Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 16:10:26 +0530
Subject: [PATCH 101/248] [IMP]: crm: Apply doc string + optimization

bzr revid: ksa@tinyerp.co.in-20100322104026-ek83y39e88bx9zrw
---
 addons/crm/crm.py                             |  18 ++
 addons/crm/crm_action_rule.py                 | 116 ++++++--
 addons/crm/crm_claim.py                       |  58 ++--
 addons/crm/crm_claims_menu.xml                |  26 +-
 addons/crm/crm_claims_view.xml                |  49 ++--
 addons/crm/crm_fund_menu.xml                  |  16 +-
 addons/crm/crm_fund_view.xml                  | 159 +++++++----
 addons/crm/crm_fundraising.py                 |  54 ++--
 addons/crm/crm_helpdesk.py                    |  25 +-
 addons/crm/crm_helpdesk_menu.xml              |  17 +-
 addons/crm/crm_helpdesk_view.xml              | 112 +++++---
 addons/crm/crm_lead.py                        |  54 +++-
 addons/crm/crm_lead_menu.xml                  |  11 +-
 addons/crm/crm_lead_view.xml                  | 148 ++++++----
 addons/crm/crm_mailgate.py                    |  70 +++--
 addons/crm/crm_meeting.py                     |  61 ++--
 addons/crm/crm_meeting_menu.xml               |  29 +-
 addons/crm/crm_meeting_view.xml               | 133 ++++++---
 addons/crm/crm_operators.py                   |  13 +-
 addons/crm/crm_opportunity.py                 |  56 +++-
 addons/crm/crm_opportunity_menu.xml           |  66 +----
 addons/crm/crm_opportunity_view.xml           | 166 +++++++----
 addons/crm/crm_opportunity_wizard.xml         |  13 -
 addons/crm/crm_phonecall.py                   |  20 +-
 addons/crm/crm_phonecall_menu.xml             |  24 +-
 addons/crm/crm_phonecall_view.xml             | 104 ++++---
 addons/crm/crm_phonecall_wizard.xml           |  29 --
 addons/crm/crm_report_view.xml                |  85 ++++--
 addons/crm/crm_segmentation.py                |  96 +++++--
 addons/crm/crm_view.xml                       | 258 +++++++++++------
 addons/crm/security/ir.model.access.csv       |   1 +
 .../crm_opportunity_to_phonecall_view.xml     |  13 +-
 addons/crm/wizard/crm_opportunity_wizard.py   | 264 ------------------
 .../crm/wizard/crm_phonecall_to_phonecall.py  |  26 +-
 34 files changed, 1413 insertions(+), 977 deletions(-)
 delete mode 100644 addons/crm/crm_opportunity_wizard.xml
 delete mode 100644 addons/crm/crm_phonecall_wizard.xml
 delete mode 100644 addons/crm/wizard/crm_opportunity_wizard.py

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 5b3b6b38b82..4740c0fdcf1 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -116,6 +116,7 @@ class crm_case_section(osv.osv):
             return []
         reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
         res = []
+
         for record in reads:
             name = record['name']
             if record['parent_id']:
@@ -178,9 +179,11 @@ class crm_case_resource_type(osv.osv):
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
+
     _defaults = {
         'object_id' : _find_object_id
     }
+
 crm_case_resource_type()
 
 
@@ -215,6 +218,7 @@ class crm_case_stage(osv.osv):
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
+
     _defaults = {
         'sequence': lambda *args: 1,
         'probability': lambda *args: 0.0,
@@ -295,11 +299,14 @@ class crm_case(osv.osv):
         if 'history_line' in field_names:
             history_obj = self.pool.get('crm.case.history')
             name = 'history_line'
+
         if 'log_ids' in field_names:
             history_obj = self.pool.get('crm.case.log')
             name = 'log_ids'
+
         if not history_obj:
             return result
+
         for case in self.browse(cr, uid, ids, context):
             model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
             history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]),\
@@ -495,6 +502,7 @@ class crm_case(osv.osv):
         s = self.get_stage_dict(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
             section = (case.section_id.id or False)
+
             if section in s:
                 st = case.stage_id.id  or False
                 s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
@@ -519,8 +527,10 @@ class crm_case(osv.osv):
         value = {}
         if not name:
             value['name'] = case.name
+
         if (not partner_id) and case.partner_id:
             value['partner_id'] = case.partner_id.id
+
             if case.partner_address_id:
                 value['partner_address_id'] = case.partner_address_id.id
             if case.email_from:
@@ -552,6 +562,7 @@ class crm_case(osv.osv):
 
 
         model_obj = self.pool.get('ir.model')
+
         for case in cases:
             model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
             data = {
@@ -562,6 +573,7 @@ class crm_case(osv.osv):
                 'res_id': case.id,
                 'section_id': case.section_id.id
             }
+
             obj = self.pool.get('crm.case.log')
             if history:
                 obj = self.pool.get('crm.case.history')
@@ -636,12 +648,15 @@ class crm_case(osv.osv):
             if not case.email_from:
                 raise osv.except_osv(_('Error!'),
                         _('You must put a Partner eMail to use this action!'))
+
             if not case.user_id:
                 raise osv.except_osv(_('Error!'),
                         _('You must define a responsible user for this case in order to use this action!'))
+
             if not case.description:
                 raise osv.except_osv(_('Error!'),
                         _('Can not send mail with empty body,you should have description in the body'))
+
         self.__history(cr, uid, cases, _('Send'), history=True, email=False)
         for case in cases:
             self.write(cr, uid, [case.id], {
@@ -735,6 +750,7 @@ class crm_case(osv.osv):
         cases = self.browse(cr, uid, ids)
         for case in cases:
             data = {'active': True, 'user_id': False}
+
             if case.section_id.parent_id:
                 data['section_id'] = case.section_id.parent_id.id
                 if case.section_id.parent_id.user_id:
@@ -868,6 +884,7 @@ class crm_case_history(osv.osv):
             res[hist.id] = (hist.email or '/') + ' (' + str(hist.date) + ')\n'
             res[hist.id] += (hist.description or '')
         return res
+
     _columns = {
         'description': fields.text('Description'),
         'note': fields.function(_note_get, method=True, string="Description", type="text"),
@@ -944,6 +961,7 @@ class crm_email_add_cc_wizard(osv.osv_memory):
             openobject_id = str(case.id),
             subtype = "html"
         )
+
         if flag:
             model_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ',' + email or email})
         else:
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 1e7c50588db..f2d5a19997d 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -27,26 +27,47 @@ import tools
 import mx.DateTime
 
 from tools.translate import _
-from osv import fields 
-from osv import osv 
+from osv import fields
+from osv import osv
 from osv import orm
 from osv.orm import except_orm
 
 import crm
 
 class case(osv.osv):
+    """ Case """
+
     _inherit = 'crm.case'
+    _description = 'case'
+
     _columns = {
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
     }
 
     def remind_partner(self, cr, uid, ids, context={}, attach=False):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Remind Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        """
         return self.remind_user(cr, uid, ids, context, attach,
                 destination=False)
 
-    def remind_user(self, cr, uid, ids, context={}, attach=False, 
-            destination=True):
+    def remind_user(self, cr, uid, ids, context={}, attach=False,destination=True):
+
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Remind user's IDs
+        @param context: A standard dictionary for contextual values
+
+        """
         for case in self.browse(cr, uid, ids):
             if not case.section_id.reply_to:
                 raise osv.except_osv(_('Error!'), ("Reply To is not specified in Section"))
@@ -83,34 +104,40 @@ class case(osv.osv):
                     raise osv.except_osv(_('Email!'),("Email Successfully Sent"))
                 else:
                     raise osv.except_osv(_('Email Fail!'),("Email is not sent successfully"))
-        return True    
+        return True
 
     def _check(self, cr, uid, ids=False, context={}):
-        '''
+        """
         Function called by the scheduler to process cases for date actions
         Only works on not done and cancelled cases
-        '''
+
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
         cr.execute('select * from crm_case \
                 where (date_action_last<%s or date_action_last is null) \
                 and (date_action_next<=%s or date_action_next is null) \
                 and state not in (\'cancel\',\'done\')',
                 (time.strftime("%Y-%m-%d %H:%M:%S"),
                     time.strftime('%Y-%m-%d %H:%M:%S')))
-        ids2 = map(lambda x: x[0], cr.fetchall() or [])        
-        cases = self.browse(cr, uid, ids2, context)
-        return self._action(cr, uid, cases, False, context=context)        
 
-    def _action(self, cr, uid, cases, state_to, scrit=None, context={}):     
+        ids2 = map(lambda x: x[0], cr.fetchall() or [])
+        cases = self.browse(cr, uid, ids2, context)
+        return self._action(cr, uid, cases, False, context=context)
+
+    def _action(self, cr, uid, cases, state_to, scrit=None, context={}):
         if not context:
             context = {}
-        context['state_to'] = state_to        
+        context['state_to'] = state_to
         rule_obj = self.pool.get('base.action.rule')
         model_obj = self.pool.get('ir.model')
-        model_ids = model_obj.search(cr, uid, [('model','=',self._name)])        
+        model_ids = model_obj.search(cr, uid, [('model','=',self._name)])
         rule_ids = rule_obj.search(cr, uid, [('name','=',model_ids[0])])
         return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context)
 
-    def format_body(self, body):        
+    def format_body(self, body):
         return self.pool.get('base.action.rule').format_body(body)
 
     def format_mail(self, obj, body):
@@ -118,12 +145,19 @@ class case(osv.osv):
 case()
 
 class base_action_rule(osv.osv):
+    """ Base Action Rule """
     _inherit = 'base.action.rule'
     _description = 'Action Rules'
-    
+
     def do_check(self, cr, uid, action, obj, context={}):
+
+        """ @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values"""
+
         ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context)
-        
+
         if hasattr(obj, 'section_id'):
             ok = ok and (not action.trg_section_id or action.trg_section_id.id==obj.section_id.id)
         if hasattr(obj, 'categ_id'):
@@ -143,13 +177,19 @@ class base_action_rule(osv.osv):
         return ok
 
     def do_action(self, cr, uid, action, model_obj, obj, context={}):
-        res = super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)         
+
+        """ @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values """
+
+        res = super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)
         write = {}
-        
+
         if action.act_section_id:
             obj.section_id = action.act_section_id
-            write['section_id'] = action.act_section_id.id        
-        
+            write['section_id'] = action.act_section_id.id
+
         if hasattr(obj, 'email_cc') and action.act_email_cc:
             if '@' in (obj.email_cc or ''):
                 emails = obj.email_cc.split(",")
@@ -157,9 +197,10 @@ class base_action_rule(osv.osv):
                     write['email_cc'] = obj.email_cc+','+obj.act_email_cc
             else:
                 write['email_cc'] = obj.act_email_cc
-        
+
         model_obj.write(cr, uid, [obj.id], write, context)
         emails = []
+
         if hasattr(obj, 'email_from') and action.act_mail_to_partner:
             emails.append(obj.email_from)
         emails = filter(None, emails)
@@ -167,29 +208,44 @@ class base_action_rule(osv.osv):
             emails = list(set(emails))
             self.email_send(cr, uid, obj, emails, action.act_mail_body)
         return True
-   
-    
+
+
 base_action_rule()
 
 class base_action_rule_line(osv.osv):
+    """ Base Action Rule Line """
     _inherit = 'base.action.rule.line'
+    _description = 'Base Action Rule Line'
 
     def state_get(self, cr, uid, context={}):
-        res = super(base_action_rule_line, self).state_get(cr, uid, context=context)   
+
+        """@param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values """
+
+        res = super(base_action_rule_line, self).state_get(cr, uid, context=context)
         return res + [('escalate','Escalate')] + crm.AVAILABLE_STATES
 
     def priority_get(self, cr, uid, context={}):
-        res = super(base_action_rule_line, self).priority_get(cr, uid, context=context) 
+
+        """@param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values """
+
+        res = super(base_action_rule_line, self).priority_get(cr, uid, context=context)
         return res + crm.AVAILABLE_PRIORITIES
-    
-    _columns = {        
+
+    _columns = {
         'trg_section_id': fields.many2one('crm.case.section', 'Section'),
         'trg_max_history': fields.integer('Maximum Communication History'),
-        'trg_categ_id':  fields.many2one('crm.case.categ', 'Category'),        
+        'trg_categ_id':  fields.many2one('crm.case.categ', 'Category'),
         'regex_history' : fields.char('Regular Expression on Case History', size=128),
-        'act_section_id': fields.many2one('crm.case.section', 'Set section to'),        
+        'act_section_id': fields.many2one('crm.case.section', 'Set section to'),
         'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'),
-        'act_mail_to_partner': fields.boolean('Mail to partner',help="Check this if you want the rule to send an email to the partner."),        
+        'act_mail_to_partner': fields.boolean('Mail to partner',help="Check this \
+                                if you want the rule to send an email to the partner."),
     }
 
 base_action_rule_line()
diff --git a/addons/crm/crm_claim.py b/addons/crm/crm_claim.py
index cbd34af2e52..43ec4fe9895 100755
--- a/addons/crm/crm_claim.py
+++ b/addons/crm/crm_claim.py
@@ -31,31 +31,43 @@ class crm_claim(osv.osv):
     _order = "id desc"
     _inherit = 'crm.case'
     _columns = {
-        'date_closed': fields.datetime('Closed', readonly=True), 
-        'date': fields.datetime('Date'), 
-        'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
-        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 
-        'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \
-                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."), 
-        'planned_revenue': fields.float('Planned Revenue'), 
-        'planned_cost': fields.float('Planned Costs'), 
-        'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
-                                                                       "the partner mentality in relation to our services.The scale has" \
-                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."), 
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"), 
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
-        'type_id': fields.many2one('crm.case.resource.type', 'Claim Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"), 
-        
-        'partner_name': fields.char("Employee's Name", size=64), 
-        'partner_mobile': fields.char('Mobile', size=32), 
-        'partner_phone': fields.char('Phone', size=32), 
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.claim')]"), 
-        'probability': fields.float('Probability (%)'), 
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'date': fields.datetime('Date'),
+        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',\
+                     help="The channels represent the different communication\
+                      modes available with the customer." \
+                     " With each commercial opportunity, you can indicate the\
+                      canall which is this opportunity source."),
+        'planned_revenue': fields.float('Planned Revenue'),
+        'planned_cost': fields.float('Planned Costs'),
+        'som': fields.many2one('res.partner.som', 'State of Mind', \
+                        help="The minds states allow to define a value scale which represents" \
+                              "the partner mentality in relation to our services.The scale has" \
+                              "to be created with a factor for each level from 0 (Very dissatisfied) \
+                              to 10 (Extremely satisfied)."),
+        'categ_id': fields.many2one('crm.case.categ', 'Category',\
+                            domain="[('section_id','=',section_id),\
+                            ('object_id.model', '=', 'crm.claim')]"),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Claim Type',\
+                         domain="[('section_id','=',section_id),\
+                         ('object_id.model', '=', 'crm.claim')]"),
+
+        'partner_name': fields.char("Employee's Name", size=64),
+        'partner_mobile': fields.char('Mobile', size=32),
+        'partner_phone': fields.char('Phone', size=32),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage',\
+                         domain="[('section_id','=',section_id),\
+                         ('object_id.model', '=', 'crm.claim')]"),
+        'probability': fields.float('Probability (%)'),
     }
-    
+
     _defaults = {
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
-    
+
 crm_claim()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml
index 24afc46de58..1eac8e007a3 100755
--- a/addons/crm/crm_claims_menu.xml
+++ b/addons/crm/crm_claims_menu.xml
@@ -2,48 +2,50 @@
 <openerp>
 	<data noupdate="1">
 
-	    <menuitem id="base.menu_aftersale" name="After-Sale Services" parent="base.menu_base_partner" sequence="6"/>
-	
+	    <menuitem id="base.menu_aftersale" name="After-Sale Services"
+	    	parent="base.menu_base_partner" sequence="6" />
+
 	    <!-- Claims Menu -->
-	   
+
 	    <record model="ir.actions.act_window" id="crm_case_categ_claim0">
 	        <field name="name">Claims</field>
 	        <field name="res_model">crm.claim</field>
 	        <field name="view_type">form</field>
 	        <field name="view_mode">tree,calendar,form,graph</field>
-	        <field name="view_id" ref="crm_case_claims_tree_view"/>        
+	        <field name="view_id" ref="crm_case_claims_tree_view"/>
 	        <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
 	    </record>
-	    
+
 	    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="crm_case_claims_tree_view"/>
 	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
 	    </record>
-	    
+
 	    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
 	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">calendar</field>
 	        <field name="view_id" ref="crm_case_claims_calendar_view"/>
 	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
 	    </record>
-	    
+
 	    <record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
 	        <field name="sequence" eval="3"/>
 	        <field name="view_mode">form</field>
 	        <field name="view_id" ref="crm_case_claims_form_view"/>
 	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
 	    </record>
-	    
+
 	    <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
 	        <field name="sequence" eval="4"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
 	        <field name="act_window_id" ref="crm_case_categ_claim0"/>
-	    </record>  
-	
-	    <menuitem name="Claims" id="menu_crm_case_claims"  parent="base.menu_aftersale" action="crm_case_categ_claim0"/>
+	    </record>
 
-    </data>
+	    <menuitem name="Claims" id="menu_crm_case_claims"
+	    	parent="base.menu_aftersale" action="crm_case_categ_claim0" />
+
+	</data>
 </openerp>
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 1af94e62e11..ee2711f2890 100755
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+
     <!-- Claims categories  -->
-   
+
     <record id="crm_claim_categ_action" model="ir.actions.act_window">
         <field name="name">Claim Categories</field>
         <field name="res_model">crm.case.categ</field>
@@ -12,12 +12,12 @@
         <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
-    
+
     <menuitem action="crm_claim_categ_action"
     	id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
 
     <!-- Claim Stages -->
- 
+
     <record id="crm_claim_stage_act" model="ir.actions.act_window">
         <field name="name">Claim Stages</field>
         <field name="res_model">crm.case.stage</field>
@@ -26,7 +26,7 @@
         <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
-        
+
     <menuitem action="crm_claim_stage_act"
         	id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
 
@@ -40,13 +40,13 @@
         <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
         <field name="context">{'object_id':'crm.claim'}</field>
     </record>
-        
+
     <menuitem action="crm_claim_resource_act"
         	id="menu_crm_claim_stage_act"
         	parent="crm.menu_crm_case_resource_type" />
 
         <!-- Claims    -->
-    
+
     <record model="ir.ui.view" id="crm_case_claims_tree_view">
         <field name="name">CRM - Claims Tree</field>
         <field name="model">crm.claim</field>
@@ -115,7 +115,7 @@
                             <field name="stage_id" select="1" nolabel="1"/>
                             <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
-                        <field name="categ_id" select="1" widget="selection"                            
+                        <field name="categ_id" select="1" widget="selection"
                             domain="[('object_id.model', '=', 'crm.claim')]" />
                         <field name="type_id" string="Type of Action" select="1"
                             domain="[('object_id.model', '=', 'crm.claim')]" />
@@ -131,11 +131,21 @@
                     <separator colspan="4" string=""/>
                     <group col="8" colspan="4">
                         <field name="state" select="1"/>
-                        <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                        <button name="case_close" string="Done"
+                        	states="open,draft,pending" type="object"
+                        	icon="gtk-jump-to" />
+                        <button name="case_open" string="Open"
+                        	states="draft,pending" type="object"
+                        	icon="gtk-go-forward" />
+                        <button name="case_cancel" string="Cancel"
+                        	states="draft,open,pending" type="object"
+                        	icon="gtk-cancel" />
+                        <button name="case_pending" string="Pending"
+                        	states="draft,open" type="object"
+                        	icon="gtk-media-pause" />
+                        <button name="case_reset"
+                        	string="Reset to Draft" states="done,cancel"
+                        	type="object" icon="gtk-convert" />
                     </group>
                 </page>
                 <page string="History" groups="base.group_extended">
@@ -263,11 +273,12 @@
 	                   		domain="[('user_id','=', False)]"
 	                   		help="Unassigned Claims" />
                    </field>
-                   <field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
-	                   	<filter icon="terp-crm"
-                           domain="[('section_id','=',context.get('section_id',False))]"
-                           help="My section"
-                           />
+                   <field name="section_id" select="1"
+                   	widget="selection" string="Section"
+                   	default="context.get('section_id', False)">
+                   	<filter icon="terp-crm"
+                   		domain="[('section_id','=',context.get('section_id',False))]"
+                   		help="My section" />
                    </field>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="10" col="20">
@@ -281,6 +292,6 @@
                </search>
            </field>
         </record>
-        
+
      </data>
 </openerp>
diff --git a/addons/crm/crm_fund_menu.xml b/addons/crm/crm_fund_menu.xml
index 5d815c9b95d..babb10f291c 100644
--- a/addons/crm/crm_fund_menu.xml
+++ b/addons/crm/crm_fund_menu.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-    <!-- MENU -->
-    <menuitem id="base.menu_fundrising" name="Fund Raising" parent="base.menu_base_partner" sequence="7"/>
+
+<!-- MENU -->
+
+    <menuitem id="base.menu_fundrising" name="Fund Raising"
+    	parent="base.menu_base_partner" sequence="7" />
+
     <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
         <field name="name">Funds</field>
         <field name="res_model">crm.fundraising</field>
@@ -10,25 +14,31 @@
         <field name="view_id" ref="crm.crm_case_tree_view_fund"/>
         <field name="search_view_id" ref="crm.view_crm_case_fund_filter"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm.crm_case_tree_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all1">
         <field name="sequence" eval="2"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm.crm_case_form_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all1">
         <field name="sequence" eval="3"/>
         <field name="view_mode">graph</field>
         <field name="view_id" ref="crm.crm_case_graph_view_fund"/>
         <field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
     </record>
-    <menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="base.menu_fundrising" action="crm_case_category_act_fund_all1"  sequence="1"/>
+
+    <menuitem name="Fund Raising" id="menu_crm_case_fund_raise"
+    	parent="base.menu_fundrising"
+    	action="crm_case_category_act_fund_all1" sequence="1" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 6d2a76df625..bbe59a53836 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -2,9 +2,8 @@
 <openerp>
 <data>
 
-	# ------------------------------------------------------
-    # Fund Raising Categories
-    # ------------------------------------------------------
+<!-- Fund Raising Categories Form View -->
+
     <record id="crm_fund_categ_action" model="ir.actions.act_window">
         <field name="name">Fundraising Categories</field>
         <field name="res_model">crm.case.categ</field>
@@ -13,10 +12,13 @@
 		<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
 		<field name="context">{'object_id':'crm.fundraising'}</field>
     </record>
-   <menuitem action="crm_fund_categ_action" id="menu_crm_case_fundraising-act" parent="crm.menu_crm_case_categ"/>
-    # ------------------------------------------------------
-    # Fund Stage
-    # ------------------------------------------------------
+
+    <menuitem action="crm_fund_categ_action"
+    	id="menu_crm_case_fundraising-act"
+    	parent="crm.menu_crm_case_categ" />
+
+<!-- Fund Stage Form View -->
+
 	    <record id="crm_fundraising_stage_act" model="ir.actions.act_window">
 	        <field name="name">Fundraising Stages</field>
 	        <field name="res_model">crm.case.stage</field>
@@ -25,11 +27,13 @@
    			<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
    			<field name="context">{'object_id':'crm.fundraising'}</field>
 	    </record>
-	  <menuitem action="crm_fundraising_stage_act" id="menu_crm_fundraising_stage_act" parent="crm.menu_crm_case_stage"/>
 
-    # ------------------------------------------------------
-    #Fund  Resource Type
-    # ------------------------------------------------------
+	    <menuitem action="crm_fundraising_stage_act"
+	    	id="menu_crm_fundraising_stage_act"
+	    	parent="crm.menu_crm_case_stage" />
+
+<!-- Fund  Resource Type Form View -->
+
         <record id="crm_fundraising_resource_act" model="ir.actions.act_window">
             <field name="name">Fundraising Resource Type</field>
             <field name="res_model">crm.case.resource.type</field>
@@ -38,35 +42,51 @@
    			<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
    			<field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
-      <menuitem action="crm_fundraising_resource_act" id="menu_crm_fundraising_resource_act" parent="crm.menu_crm_case_resource_type"/>
+
+        <menuitem action="crm_fundraising_resource_act"
+        	id="menu_crm_fundraising_resource_act"
+        	parent="crm.menu_crm_case_resource_type" />
 
 
-    # ------------------------------------------------------
-    # Fund Raising
-    # ------------------------------------------------------
+<!-- Fund Raising Tree View -->
+
     <record model="ir.ui.view" id="crm_case_tree_view_fund">
         <field name="name">CRM - Funds Tree</field>
         <field name="model">crm.fundraising</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Funds Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="id"/>
-                <field name="name" string="Fund Description"/>
-                <field name="categ_id"/>
-                <field name="type_id" string="Payment Mode"/>
-                <field name="planned_cost" string="Amount"/>
-                <field name="probability"/>
-                <field name="user_id"/>
-                <field name="state"/>
-                <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
-                <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
-                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
+            <tree string="Funds Tree"
+            	colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+            	<field name="id" />
+            	<field name="name" string="Fund Description" />
+            	<field name="categ_id" />
+            	<field name="type_id" string="Payment Mode" />
+            	<field name="planned_cost" string="Amount" />
+            	<field name="probability" />
+            	<field name="user_id" />
+            	<field name="state" />
+            	<button name="case_close" string="Done"
+            		states="open,draft,pending" type="object"
+            		icon="gtk-close" />
+            	<button name="case_open" string="Open"
+            		states="draft,pending" type="object"
+            		icon="gtk-go-forward" />
+            	<button name="case_cancel" string="Cancel"
+            		states="draft,open,pending" type="object"
+            		icon="gtk-cancel" />
+            	<button name="case_pending" string="Pending"
+            		states="draft,open" type="object" icon="gtk-media-pause" />
+            	<button name="case_escalate" string="Escalate"
+            		states="open,draft,pending" type="object"
+            		icon="gtk-go-up" />
+            	<button name="case_reset" string="Reset to Draft"
+            		states="done,cancel" type="object" icon="gtk-convert" />
             </tree>
         </field>
     </record>
+
+<!-- Fund Raising Form View -->
+
     <record model="ir.ui.view" id="crm_case_form_view_fund">
         <field name="name">CRM - Funds Form</field>
         <field name="model">crm.fundraising</field>
@@ -74,7 +94,7 @@
         <field name="arch" type="xml">
             <form string="Funds Form">
                 <group colspan="4" col="4">
-                    <field name="name" select="1" string="Name"/>                    
+                    <field name="name" select="1" string="Name"/>
                     <field name="type_id" string="Payment Mode" select="1" widget="selection"
                     		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                 </group>
@@ -82,8 +102,13 @@
                 <page string="Funds">
                 	<separator colspan="4" string="Communication"/>
                 	<group colspan="4" col="4">
-	                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
-	                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+	                    <field name="partner_id" select="1"
+	                    	on_change="onchange_partner_id(partner_id, email_from)"
+	                    	colspan="2" />
+	                    <field name="partner_address_id"
+	                    	string="Contact"
+	                    	on_change="onchange_partner_address_id(partner_address_id, email_from)"
+	                    	colspan="1" />
 	                    <field name="email_from" colspan="2"/>
                     </group>
                     <separator colspan="4" string="Estimates"/>
@@ -105,12 +130,24 @@
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="2"/>
-                        <button name="case_close" string="Done" states="open,draft,pending" type="object"  icon="gtk-close"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
+                        <button name="case_close" string="Done"
+                        	states="open,draft,pending" type="object"
+                        	icon="gtk-close" />
+                        <button name="case_open" string="Open"
+                        	states="draft,pending" type="object"
+                        	icon="gtk-go-forward" />
+                        <button name="case_cancel" string="Cancel"
+                        	states="draft,open,pending" type="object"
+                        	icon="gtk-cancel" />
+                        <button name="case_pending" string="Pending"
+                        	states="draft,open" type="object"
+                        	icon="gtk-media-pause" />
+                        <button name="case_escalate" string="Escalate"
+                        	states="open,draft,pending" type="object"
+                        	icon="gtk-go-up" />
+                        <button name="case_reset"
+                        	string="Reset to Draft" states="done,cancel"
+                        	type="object" icon="gtk-convert" />
                     </group>
                 </page>
                 <page string="History" groups="base.group_extended">
@@ -177,6 +214,9 @@
             </form>
         </field>
     </record>
+
+<!-- Fund Raising Calendar View -->
+
     <record model="ir.ui.view" id="crm_case_calendar_view_fund">
         <field name="name">CRM - Funds Calendar</field>
         <field name="model">crm.fundraising</field>
@@ -189,6 +229,9 @@
             </calendar>
         </field>
     </record>
+
+<!-- Fund Raising Graph View -->
+
     <record model="ir.ui.view" id="crm_case_graph_view_fund">
         <field name="name">CRM - Funds Graph</field>
         <field name="model">crm.fundraising</field>
@@ -202,6 +245,8 @@
         </field>
     </record>
 
+<!-- Fund Raising Search View -->
+
     <record id="view_crm_case_fund_filter" model="ir.ui.view">
             <field name="name">CRM - Funds Search</field>
             <field name="model">crm.fundraising</field>
@@ -214,20 +259,32 @@
                            separator="1"
                            help="Funds Related to Current User"
                            />
-                       <filter icon="gtk-new" string="Current Funds" domain="[('state','in',('draft', 'open'))]" help="Current Funds" />
-                       <filter icon="gtk-yes" string="Open Funds" domain="[('state','=','open')]" help="Open Funds"/>
-                       <filter icon="gtk-media-pause" string="Pending Funds" domain="[('state','=','pending')]" help="Pending Funds"/>
-                       <separator orientation="vertical"/>
+                       <filter icon="gtk-new" string="Current Funds"
+                       	domain="[('state','in',('draft', 'open'))]"
+                       	help="Current Funds" />
+                       <filter icon="gtk-yes" string="Open Funds"
+                       	domain="[('state','=','open')]"
+                       	help="Open Funds" />
+                       <filter icon="gtk-media-pause"
+                       	string="Pending Funds"
+                       	domain="[('state','=','pending')]"
+                       	help="Pending Funds" />
+                       <separator orientation="vertical" />
                        <field name="state" select="1" />
-                       <field name="name" select='1' string="Fund Description"/>
-                       <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-partner" domain="[('user_id','=', False)]" help="Unassigned" />
+                       <field name="name" select='1'
+                       	string="Fund Description" />
+                       <field name="user_id" select="1"
+                       	widget="selection">
+                       	<filter icon="terp-partner"
+                       		domain="[('user_id','=', False)]"
+                       		help="Unassigned" />
                        </field>
-                       <field name="section_id" select="1" widget="selection" string="Section" default="context.get('section_id', False)">
-                           <filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"
-                               />
+                       <field name="section_id" select="1"
+                       	widget="selection" string="Section"
+                       	default="context.get('section_id', False)">
+                       	<filter icon="terp-crm"
+                       		domain="[('section_id','=',context.get('section_id',False))]"
+                       		help="My section" />
                        </field>
                    </group>
                </search>
diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py
index 9bfbd10a6b8..cc89342df29 100644
--- a/addons/crm/crm_fundraising.py
+++ b/addons/crm/crm_fundraising.py
@@ -23,40 +23,54 @@ from osv import fields,osv,orm
 import crm
 
 class crm_fundraising(osv.osv):
+    """ Fund Raising Cases """
+
     _name = "crm.fundraising"
     _description = "Fund Raising Cases"
     _order = "id desc"
     _inherit ='crm.case'
-    _columns = {        
+
+    _columns = {
             'date_closed': fields.datetime('Closed', readonly=True),
             'date': fields.datetime('Date'),
-            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),            
-            'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"),
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+            'categ_id': fields.many2one('crm.case.categ','Category', \
+                                domain="[('section_id','=',section_id),\
+                                ('object_id.model', '=', 'crm.fundraising')]"),
             'planned_revenue': fields.float('Planned Revenue'),
             'planned_cost': fields.float('Planned Costs'),
-            'probability': fields.float('Probability (%)'),     
+            'probability': fields.float('Probability (%)'),
             'partner_name': fields.char("Employee's Name", size=64),
             'partner_name2': fields.char('Employee Email', size=64),
             'partner_phone': fields.char('Phone', size=32),
-            'partner_mobile': fields.char('Mobile', size=32), 
-            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"),
-            'type_id': fields.many2one('crm.case.resource.type', 'Fundraising Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.fundraising')]"),
+            'partner_mobile': fields.char('Mobile', size=32),
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage',\
+                             domain="[('section_id','=',section_id),\
+                            ('object_id.model', '=', 'crm.fundraising')]"),
+            'type_id': fields.many2one('crm.case.resource.type', 'Fundraising Type',\
+                             domain="[('section_id','=',section_id),\
+                             ('object_id.model', '=', 'crm.fundraising')]"),
             'duration': fields.float('Duration'),
-            'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
-            'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
-                                                                        " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
-            'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
-                                                                       "the partner mentality in relation to our services.The scale has" \
-                                                                       "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
+            'ref': fields.reference('Reference', selection=crm._links_get, size=128),
+            'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
+            'canal_id': fields.many2one('res.partner.canal', 'Channel',\
+                        help="The channels represent the different communication \
+                        modes available with the customer." \
+                       " With each commercial opportunity, you can indicate\
+                     the canall which is this opportunity source."),
+            'som': fields.many2one('res.partner.som', 'State of Mind',\
+                         help="The minds states allow to define a value scale which represents" \
+                              "the partner mentality in relation to our services.The scale has" \
+                            "to be created with a factor for each level from 0 \
+                             (Very dissatisfied) to 10 (Extremely satisfied)."),
         }
-   
+
     _defaults = {
                  'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
-                 'probability':lambda *a:0.0,       
-                 'planned_cost':lambda *a:0.0,    
-                 'planned_revenue':lambda *a:0.0,    
-                       
+                 'probability':lambda *a:0.0,
+                 'planned_cost':lambda *a:0.0,
+                 'planned_revenue':lambda *a:0.0,
+
     }
 
-crm_fundraising()    
+crm_fundraising()
diff --git a/addons/crm/crm_helpdesk.py b/addons/crm/crm_helpdesk.py
index 43f48025572..c9317b52a3b 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm/crm_helpdesk.py
@@ -23,27 +23,38 @@ from osv import fields,osv,orm
 import crm
 
 class crm_helpdesk(osv.osv):
+    """ Helpdesk Cases """
+
     _name = "crm.helpdesk"
     _description = "Helpdesk Cases"
     _order = "id desc"
     _inherit = 'crm.case'
+
     _columns = {
             'date_closed': fields.datetime('Closed', readonly=True),
             'date': fields.datetime('Date'),
             'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
             'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
-            'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
-                                                                            " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+            'canal_id': fields.many2one('res.partner.canal', 'Channel',\
+                            help="The channels represent the different communication \
+                             modes available with the customer." \
+                            " With each commercial opportunity, you can indicate\
+                             the canall which is this opportunity source."),
             'planned_revenue': fields.float('Planned Revenue'),
             'planned_cost': fields.float('Planned Costs'),
             'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
             'probability': fields.float('Probability (%)'),
-            'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
-                                                                   "the partner mentality in relation to our services.The scale has" \
-                                                                   "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
-            'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.helpdesk')]"),
+            'som': fields.many2one('res.partner.som', 'State of Mind', \
+                            help="The minds states allow to define a value scale which represents" \
+                                "the partner mentality in relation to our services.The scale has" \
+                                "to be created with a factor for each level from 0 \
+                                (Very dissatisfied) to 10 (Extremely satisfied)."),
+            'categ_id': fields.many2one('crm.case.categ', 'Category',\
+                            domain="[('section_id','=',section_id),\
+                            ('object_id.model', '=', 'crm.helpdesk')]"),
             'duration': fields.float('Duration'),
     }
+
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
@@ -51,5 +62,5 @@ class crm_helpdesk(osv.osv):
 
 crm_helpdesk()
 
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/crm_helpdesk_menu.xml b/addons/crm/crm_helpdesk_menu.xml
index 29684e5d1de..bd3f0889bd1 100644
--- a/addons/crm/crm_helpdesk_menu.xml
+++ b/addons/crm/crm_helpdesk_menu.xml
@@ -1,36 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    <menuitem id="base.menu_aftersale" name="After-Sale Services" parent="base.menu_base_partner" sequence="6"/>
+    <menuitem id="base.menu_aftersale" name="After-Sale Services"
+    	parent="base.menu_base_partner" sequence="6" />
+
+<!-- Help Desk (menu) -->
 
-    ######################## Help Desk (menu) ###########################
     <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
         <field name="name">Helpdesk Requests</field>
         <field name="res_model">crm.helpdesk</field>
         <field name="view_mode">tree,calendar,form</field>
-        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>        
+        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="search_view_id" ref="crm.view_crm_case_helpdesk_filter"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
         <field name="view_id" ref="crm_case_helpdesk_calendar_view"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_form_view_helpdesk"/>
         <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
     </record>
-    <menuitem name="Helpdesk and Support" id="menu_help_support_main" parent="base.menu_aftersale" action="crm_case_helpdesk_act111"/>    
 
-</data>
+    <menuitem name="Helpdesk and Support" id="menu_help_support_main"
+    	parent="base.menu_aftersale" action="crm_case_helpdesk_act111" />
+
+    </data>
 </openerp>
 
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index c3f95deb253..b94b0e5d499 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -2,9 +2,8 @@
 <openerp>
 <data>
 
-	# ------------------------------------------------------
-    # Helpdesk Support Categories
-    # ------------------------------------------------------
+<!-- Helpdesk Support Categories Form View -->
+
     <record id="crm_helpdesk_categ_action" model="ir.actions.act_window">
         <field name="name">Helpdesk Categories</field>
         <field name="res_model">crm.case.categ</field>
@@ -13,11 +12,11 @@
         <field name="domain">[('object_id.model', '=', 'crm.helpdesk')]</field>
 		<field name="context">{'object_id':'crm.helpdesk'}</field>
     </record>
-	<menuitem action="crm_helpdesk_categ_action" id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ"/>
-    # ------------------------------------------------------
-    # Helpdesk Support
-    # ------------------------------------------------------
 
+    <menuitem action="crm_helpdesk_categ_action"
+    	id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
+
+<!--  Helpdesk Support Form View -->
 
     <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
         <field name="name">CRM - Helpdesk Support Form</field>
@@ -34,11 +33,18 @@
                     <page string="General">
                     	<separator colspan="4" string="Communication"/>
                         <group col="7" colspan="4">
-                            <field  name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
-                            <field  name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
+                            <field name="partner_id"
+                            	on_change="onchange_partner_id(partner_id, email_from)"
+                            	select="1" />
+                            <field name="partner_address_id"
+                            	on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                            	select="2" />
 
-                            <field  name="email_from" select="2"/>
-                            <button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
+                            <field name="email_from" select="2" />
+                            <button name="remind_partner"
+                            	states="open,pending"
+                            	string="Send Reminder" type="object"
+                            	icon="gtk-go-forward" />
 
                         </group>
                         <separator colspan="4" string="Categorization"/>
@@ -46,7 +52,10 @@
                             <field name="priority"/>
                             <field name="section_id" widget="selection"/>
                             <field name="user_id" select="1"/>
-                            <button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
+                            <button name="remind_user"
+                            	states="open,pending"
+                            	string="Send Reminder" type="object"
+                            	icon="gtk-go-forward" />
                         </group>
 
                         <separator colspan="4" string="Details"/>
@@ -55,12 +64,26 @@
                         <separator colspan="4"/>
                         <group col="8" colspan="4">
                             <field name="state" select="1"/>
-                            <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-close"/>
-                            <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward"/>
-                            <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-                            <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause"/>
-                            <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up"/>
-                            <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
+                            <button name="case_close"
+                            	states="open,draft,pending" string="Close"
+                            	type="object" icon="gtk-close" />
+                            <button name="case_open"
+                            	states="draft,pending" string="Open"
+                            	type="object" icon="gtk-go-forward" />
+                            <button name="case_cancel"
+                            	states="draft,open,pending" string="Cancel"
+                            	type="object" icon="gtk-cancel" />
+                            <button name="case_pending"
+                            	states="draft,open" string="Pending"
+                            	type="object" icon="gtk-media-pause" />
+                            <button name="case_escalate"
+                            	states="open,draft,pending"
+                            	string="Escalate" type="object"
+                            	icon="gtk-go-up" />
+                            <button name="case_reset"
+                            	states="done,cancel"
+                            	string="Reset to Draft" type="object"
+                            	icon="gtk-convert" />
                         </group>
                     </page>
                     <page string="History" groups="base.group_extended">
@@ -125,6 +148,9 @@
             </form>
         </field>
     </record>
+
+<!-- Helpdesk Support Tree View  -->
+
     <record model="ir.ui.view" id="crm_case_tree_view_helpdesk">
         <field name="name">CRM - Helpdesk Support Tree</field>
         <field name="model">crm.helpdesk</field>
@@ -140,16 +166,29 @@
                 <field name="user_id"/>
                 <field name="section_id" string="Section" />
                 <field name="state"/>
-                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-close"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
-                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                <button name="case_close" string="Done"
+                	states="open,draft,pending" type="object"
+                	icon="gtk-close" />
+                <button name="case_open" string="Open"
+                	states="draft,pending" type="object"
+                	icon="gtk-go-forward" />
+                <button name="case_cancel" string="Cancel"
+                	states="draft,open,pending" type="object"
+                	icon="gtk-cancel" />
+                <button name="case_pending" string="Pending"
+                	states="draft,open" type="object"
+                	icon="gtk-media-pause" />
+                <button name="case_escalate" string="Escalate"
+                	states="open,draft,pending" type="object"
+                	icon="gtk-go-up" />
+                <button name="case_reset" string="Reset to Draft"
+                	states="done,cancel" type="object" icon="gtk-convert" />
             </tree>
         </field>
     </record>
 
+<!--  Helpdesk Support Calendar View -->
+
     <record model="ir.ui.view" id="crm_case_helpdesk_calendar_view">
         <field name="name">CRM - Helpdesk Support Calendar</field>
         <field name="model">crm.helpdesk</field>
@@ -164,6 +203,8 @@
         </field>
     </record>
 
+<!-- Helpdesk Support Search View  -->
+
     <record id="view_crm_case_helpdesk_filter" model="ir.ui.view">
         <field name="name">CRM - Helpdesk Search</field>
         <field name="model">crm.helpdesk</field>
@@ -184,18 +225,25 @@
                 <field name="name" select='1' string="Query"/>
                 <field name="partner_id" />
                 <field name="user_id" select="1" widget="selection">
-                    <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Helpdesk Requests" default="1"/>
+                    <filter icon="terp-partner"
+                    	domain="[('user_id','=',uid)]"
+                    	help="My Helpdesk Requests" default="1" />
                 </field>
-                <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
-                    <filter icon="terp-crm"
-                        domain="[('section_id','=',context.get('section_id',False))]"
-                        help="My section"/>
+                <field name="section_id"
+                	default="context.get('section_id', False)" select="1"
+                	widget="selection" string="Section">
+                	<filter icon="terp-crm"
+                		domain="[('section_id','=',context.get('section_id',False))]"
+                		help="My section" />
                 </field>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="12" col="20">
-                    <filter string="Customer" icon="terp-crm" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="State" icon="terp-crm" domain="[]"  context="{'group_by':'state'}"/>
-                    <filter string="Priority" icon="terp-crm" domain="[]"  context="{'group_by':'priority'}"/>
+                    <filter string="Customer" icon="terp-crm"
+                    	domain="[]" context="{'group_by':'partner_id'}" />
+                    <filter string="State" icon="terp-crm" domain="[]"
+                    	context="{'group_by':'state'}" />
+                    <filter string="Priority" icon="terp-crm"
+                    	domain="[]" context="{'group_by':'priority'}" />
                 </group>
             </search>
         </field>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index ae1e6c66d48..a8a76d6de5f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -25,12 +25,23 @@ import crm
 import math
 
 class crm_lead(osv.osv):
+    """ CRm Lead Case """
+
     _name = "crm.lead"
     _description = "Leads Cases"
     _order = "priority desc, id desc"
     _inherit = ['res.partner.address', 'crm.case']
 
     def _compute_openday(self, cr, uid, ids, name, args, context={}):
+
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Openday’s IDs
+        @return: difference between current date and log date
+        @param context: A standard dictionary for contextual values
+        """
+
         result = {}
         for r in self.browse(cr, uid, ids , context):
             result[r.id] = 0
@@ -51,9 +62,19 @@ class crm_lead(osv.osv):
         return result
 
     def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of closeday’s IDs
+        @return: difference between current date and closed date
+        @param context: A standard dictionary for contextual values
+        """
+
         result = {}
         for r in self.browse(cr, uid, ids , context):
             result[r.id] = 0
+
             if r.date_closed:
                 date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
                 date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
@@ -63,27 +84,36 @@ class crm_lead(osv.osv):
         return result
 
     _columns = {
-        'categ_id': fields.many2one('crm.case.categ', 'Lead Source', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"), 
-        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), 
-        'partner_name': fields.char("Contact Name", size=64), 
 
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
-        'date_closed': fields.datetime('Closed', readonly=True), 
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), 
-        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'), 
+        'categ_id': fields.many2one('crm.case.categ', 'Lead Source', \
+                        domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.opportunity')]"),
+        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type',\
+                         domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.lead')]"),
+        'partner_name': fields.char("Contact Name", size=64),
 
-        'user_id': fields.many2one('res.users', 'Salesman'), 
-        'referred': fields.char('Referred By', size=32), 
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'stage_id': fields.many2one('crm.case.stage', 'Stage',\
+                            domain="[('section_id','=',section_id),\
+                            ('object_id.model', '=', 'crm.lead')]"),
+        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
+
+        'user_id': fields.many2one('res.users', 'Salesman'),
+        'referred': fields.char('Referred By', size=32),
         'day_open': fields.function(_compute_openday, string='Days to Open', \
-                                method=True, type="integer", store=True), 
+                                method=True, type="integer", store=True),
         'day_close': fields.function(_compute_closeday, string='Days to Close', \
-                                method=True, type="integer", store=True), 
+                                method=True, type="integer", store=True),
         'function_name' : fields.char('Function', size=64),
         }
 
     _defaults = {
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
 crm_lead()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 96aaed7ecd9..c78d25b6738 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-<!--    <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>-->
-
-<!--        MENU        -->
 
     <record model="ir.actions.act_window" id="crm_case_category_act_leads_all">
         <field name="name">Leads</field>
@@ -24,8 +21,12 @@
         <field name="view_id" ref="crm_case_form_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
-    <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
-	<menuitem parent="base.menu_sales" name="Leads" id="menu_crm_case_categ0_act_leads" action="crm_case_category_act_leads_all" sequence="1"/>
+
+    <menuitem id="base.menu_sales" name="Sales"
+    	parent="base.menu_base_partner" sequence="1" />
+    <menuitem parent="base.menu_sales" name="Leads"
+    	id="menu_crm_case_categ0_act_leads"
+    	action="crm_case_category_act_leads_all" sequence="1" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 51243f3e271..dc379ddacfb 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,11 +2,8 @@
 <openerp>
 <data>
 
+<!--Lead Stage Form view -->
 
-
-    # ------------------------------------------------------
-    # Stage
-    # ------------------------------------------------------
     <record id="crm_lead_stage_act" model="ir.actions.act_window">
         <field name="name">Lead Stages</field>
         <field name="res_model">crm.case.stage</field>
@@ -15,11 +12,11 @@
         <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
         <field name="context">{'object_id':'crm.lead'}</field>
     </record>
-    <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" parent="crm.menu_crm_case_stage"/>
-    
-    # ------------------------------------------------------
-      Resource Type
-    # ------------------------------------------------------
+    <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act"
+    	parent="crm.menu_crm_case_stage" />
+
+    <!--  Resource Type Form View -->
+
         <record id="crm_lead_resource_act" model="ir.actions.act_window">
             <field name="name">Lead Resource Type</field>
             <field name="res_model">crm.case.resource.type</field>
@@ -28,14 +25,13 @@
     	    <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
 	        <field name="context">{'object_id':'crm.lead'}</field>
         </record>
-      <menuitem action="crm_lead_resource_act" id="menu_crm_lead_resource_act" parent="crm.menu_crm_case_resource_type"/>
+        <menuitem action="crm_lead_resource_act"
+        	id="menu_crm_lead_resource_act"
+        	parent="crm.menu_crm_case_resource_type" />
 
+<!-- CRM Lead Form View  -->
 
-    # ------------------------------------------------------
-    # Leads
-    # ------------------------------------------------------
-
-    <record model="ir.ui.view" id="crm_case_form_view_leads">
+        <record model="ir.ui.view" id="crm_case_form_view_leads">
         <field name="name">CRM - Leads Form</field>
         <field name="model">crm.lead</field>
         <field name="type">form</field>
@@ -46,19 +42,26 @@
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
-                            name="%(wizard_crm_lead_opportunity_set)d" 
+                            name="%(wizard_crm_lead_opportunity_set)d"
                             string="Convert"
                             help="Convert into Opportunity"
-                            icon="gtk-index" 
+                            icon="gtk-index"
                             type="action"
                             attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
-                    <newline/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="user_id"/>
-                    <field name="stage_id" widget="selection" readonly="1" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                    <newline />
+                    <field name="section_id" colspan="1"
+                    	widget="selection" />
+                    <field name="user_id" />
+                    <field name="stage_id" widget="selection"
+                    	readonly="1"
+                    	domain="[('object_id.model', '=', 'crm.lead')]" />
                     <group col="2" colspan="1">
-                        <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
-                        <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
+                    	<button name="stage_previous" string="Previous"
+                    		states="open,pending" type="object"
+                    		icon="gtk-go-back" />
+                    	<button name="stage_next" string="Next"
+                    		states="open,pending" type="object"
+                    		icon="gtk-go-forward" />
                     </group>
                 </group>
                 <notebook colspan="4">
@@ -89,23 +92,35 @@
                         <separator string="Links" colspan="4" col="3"/>
                         <field name="partner_id"/>
                         <button
-                            name="%(action_crm_lead2partner)d" 
+                            name="%(action_crm_lead2partner)d"
                             icon="gtk-index" type="action"
                             string="Create"
                             attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                        <field name="opportunity_id"/>                        
+                        <field name="opportunity_id"/>
                     </group>
                     <separator colspan="4" string="Notes"/>
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="2"/>
-                        <button name="case_close" string="Close" states="open,draft,pending" type="object"  icon="gtk-close"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object"  icon="gtk-media-pause"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
+                        <button name="case_close" string="Close"
+                        	states="open,draft,pending" type="object"
+                        	icon="gtk-close" />
+                        <button name="case_open" string="Open"
+                        	states="draft,pending" type="object"
+                        	icon="gtk-go-forward" />
+                        <button name="case_cancel" string="Cancel"
+                        	states="draft,open,pending" type="object"
+                        	icon="gtk-cancel" />
+                        <button name="case_pending" string="Pending"
+                        	states="draft,open" type="object"
+                        	icon="gtk-media-pause" />
+                        <button name="case_escalate" string="Escalate"
+                        	states="open,draft,pending" type="object"
+                        	icon="gtk-go-up" />
+                        <button name="case_reset"
+                        	string="Reset to Draft" states="done,cancel"
+                        	type="object" icon="gtk-convert" />
                     </group>
                  </page>
                  <page string="Emails" groups="base.group_extended">
@@ -146,7 +161,9 @@
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
                         <separator string="Categories" colspan="2" col="2"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="2"/>
+                        <field name="company_id"
+                        	groups="base.group_multi_company"
+                        	widget="selection" colspan="2" />
                         <field name="categ_id"
                             widget="selection"
                             domain="[('object_id.model', '=', 'crm.opportunity')]" />
@@ -170,6 +187,8 @@
         </field>
     </record>
 
+<!-- CRM Lead Tree View -->
+
     <record model="ir.ui.view" id="crm_case_tree_view_leads">
         <field name="name">CRM - Leads Tree</field>
         <field name="model">crm.lead</field>
@@ -187,33 +206,54 @@
                 <field name="referred" invisible="1"/>
 
                 <field name="stage_id"/>
-                <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
-                <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
-                <field name="section_id" invisible="context.get('invisible_section', True)"/>
-                <field name="user_id"/>
-                <field name="state"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
-                <button name="case_close" string="Close" states="open,draft,pending" type="object"  icon="gtk-close"/>
-                <button string="Convert to Opportunity" name="%(action_crm_lead2opportunity)d" states="draft,open,pending" icon="gtk-index" type="action"/>
-                <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                <button name="stage_previous" string="Previous"
+                	states="open,pending" type="object" icon="gtk-go-back" />
+                <button name="stage_next" string="Next"
+                	states="open,pending" type="object"
+                	icon="gtk-go-forward" />
+                <field name="section_id"
+                	invisible="context.get('invisible_section', True)" />
+                <field name="user_id" />
+                <field name="state" />
+                <button name="case_open" string="Open"
+                	states="draft,pending" type="object"
+                	icon="gtk-go-forward" />
+                <button name="case_close" string="Close"
+                	states="open,draft,pending" type="object"
+                	icon="gtk-close" />
+                <button string="Convert to Opportunity"
+                	name="%(action_crm_lead2opportunity)d"
+                	states="draft,open,pending" icon="gtk-index"
+                	type="action" />
+                <button name="case_escalate" string="Escalate"
+                	states="open,draft,pending" type="object"
+                	icon="gtk-go-up" />
+                <button name="case_cancel" string="Cancel"
+                	states="draft,open,pending" type="object"
+                	icon="gtk-cancel" />
             </tree>
         </field>
     </record>
+
+<!-- CRM Lead Calendar View -->
+
     <record model="ir.ui.view" id="crm_case_calendar_view_leads">
         <field name="name">CRM - Leads Calendar</field>
         <field name="model">crm.lead</field>
         <field name="type">calendar</field>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
-            <calendar string="Meeting For Leads Generation" date_start="create_date" color="user_id" date_delay="duration">
-                <field name="name"/>
-                <field name="partner_name"/>
-                <field name="partner_contact"/>
+            <calendar string="Meeting For Leads Generation"
+            	date_start="create_date" color="user_id"
+            	date_delay="duration">
+            	<field name="name" />
+            	<field name="partner_name" />
+            	<field name="partner_contact" />
             </calendar>
         </field>
     </record>
 
+<!-- CRM Lead Search View -->
 
     <record id="view_crm_case_leads_filter" model="ir.ui.view">
         <field name="name">CRM - Leads Search</field>
@@ -234,12 +274,13 @@
 
                 <separator orientation="vertical"/>
                 <filter icon="gtk-home" string="Today"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
-                    help="Todays' Opportunities"
-                />
+                	domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), \
+                			('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
+                	help="Todays' Opportunities" />
                 <filter icon="gtk-media-rewind" string="7 Days"
                     help="Opportunities during last 7 days"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
+                     ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                 />
                 <separator orientation="vertical"/>
                 <field name="partner_name"/>
@@ -265,14 +306,15 @@
                 <group expand="1" string="Group By..." colspan="14">
                     <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Source" icon="terp-crm" domain="[]"  context="{'group_by':'categ_id'}"/>
-                    <filter string="Type" icon="terp-crm" domain="[]"  context="{'group_by':'type'}"/>
+                    <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
+                    <filter string="Type" icon="terp-crm" domain="[]" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Team" icon="terp-crm" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Salesman" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Referrer" icon="terp-crm" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Creation" icon="terp-project" domain="[]" context="{'group_by':'create_date'}"/>
+                    <filter string="Creation" icon="terp-project"
+                    	domain="[]" context="{'group_by':'create_date'}" />
                 </group>
            </search>
         </field>
diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py
index 8b2f3bdef88..3b7121e76fd 100644
--- a/addons/crm/crm_mailgate.py
+++ b/addons/crm/crm_mailgate.py
@@ -33,43 +33,57 @@ from osv import fields,osv,orm
 from osv.orm import except_orm
 
 class crm_cases(osv.osv):
+    """ crm cases """
+
     _name = "crm.case"
     _inherit = "crm.case"
 
-    def msg_new(self, cr, uid, msg):                
+    def msg_new(self, cr, uid, msg):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks
+        """
+
         mailgate_obj = self.pool.get('mail.gateway')
         msg_body = mailgate_obj.msg_body_get(msg)
-        data = {   
-            'name': msg['Subject'],         
+        data = {
+            'name': msg['Subject'],
             'email_from': msg['From'],
-            'email_cc': msg['Cc'],            
+            'email_cc': msg['Cc'],
             'user_id': False,
-            'description': msg_body['body'],            
+            'description': msg_body['body'],
         }
         res = mailgate_obj.partner_get(cr, uid, msg['From'])
         if res:
             data.update(res)
-        res = self.create(cr, uid, data)        
-        cases = self.browse(cr, uid, [res])       
+        res = self.create(cr, uid, data)
+        cases = self.browse(cr, uid, [res])
         self._history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])
         return res
-    
+
     def msg_update(self, cr, uid, ids, msg, data={}, default_act='pending'):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of update mail’s IDs """
+
         if isinstance(ids, (str, int, long)):
             select = [ids]
         else:
-            select = ids        
+            select = ids
         mailgate_obj = self.pool.get('mail.gateway')
-        msg_actions, body_data = mailgate_obj.msg_act_get(msg)           
+        msg_actions, body_data = mailgate_obj.msg_act_get(msg)
         data.update({
-            'description': body_data,            
+            'description': body_data,
         })
         act = 'case_'+default_act
         if 'state' in msg_actions:
             if msg_actions['state'] in ['draft','close','cancel','open','pending']:
                 act = 'case_' + msg_actions['state']
-        
-        for k1,k2 in [('cost','planned_cost'),('revenue','planned_revenue'),('probability','probability')]:            
+
+        for k1,k2 in [('cost','planned_cost'),('revenue','planned_revenue'),('probability','probability')]:
             if k1 in msg_actions:
                 data[k2] = float(msg_actions[k1])
 
@@ -78,15 +92,24 @@ class crm_cases(osv.osv):
                 data['priority'] = msg_actions['priority']
 
         if 'partner' in msg_actions:
-            data['email_from'] = msg_actions['partner'][:128]        
+            data['email_from'] = msg_actions['partner'][:128]
 
         res = self.write(cr, uid, select, data)
-        cases = self.browse(cr, uid, select)       
-        self._history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])        
+        cases = self.browse(cr, uid, select)
+        self._history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])
         getattr(self,act)(cr, uid, select)
         return res
 
-    def emails_get(self, cr, uid, ids, context={}):         
+    def emails_get(self, cr, uid, ids, context={}):
+
+        """ Get Emails
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of email’s IDs
+            @param context: A standard dictionary for contextual values
+
+        """
         res = []
         if isinstance(ids, (str, int, long)):
             select = [ids]
@@ -96,10 +119,19 @@ class crm_cases(osv.osv):
             user_email = (case.user_id and case.user_id.address_id and case.user_id.address_id.email) or False
             res += [(user_email, case.email_from, case.email_cc, getattr(case,'priority') and case.priority or False)]
         if isinstance(ids, (str, int, long)):
-            return len(res) and res[0] or False        
+            return len(res) and res[0] or False
         return res
 
     def msg_send(self, cr, uid, id, *args, **argv):
-        return True 
+
+        """ Send The Message
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of email’s IDs
+            @param *args: Return Tuple Value
+            @param **args: Return Dictionary of Keyword Value
+        """
+        return True
 
 crm_cases()
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index de0f1f01c33..9e3297704b1 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -26,63 +26,84 @@ from datetime import datetime, timedelta
 
 class crm_opportunity(osv.osv):
     _name = 'crm.opportunity'
-crm_opportunity()    
+crm_opportunity()
 
 
 class crm_phonecall(osv.osv):
+    """ CRM Phonecall """
+
     _name = 'crm.phonecall'
+
 crm_phonecall()
 
 
 class crm_meeting(osv.osv):
+    """ CRM Meeting Cases """
+
     _name = 'crm.meeting'
     _description = "Meeting Cases"
     _order = "id desc"
-    _inherit = ["crm.case", "calendar.event"]   
+    _inherit = ["crm.case", "calendar.event"]
 
-    _columns = { 
+    _columns = {
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
                         domain="[('object_id.model', '=', 'crm.meeting')]", \
-            ), 
-        'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'), 
-        'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'), 
-        'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', 'event_id', 'attendee_id', 'Attendees'), 
-        'date_closed': fields.datetime('Closed', readonly=True), 
-        'date_deadline': fields.datetime('Deadline'), 
-        'state': fields.selection([('open', 'Confirmed'), 
-                                    ('draft', 'Unconfirmed'), 
-                                    ('cancel', 'Cancelled'), 
+            ),
+        'phonecall_id': fields.many2one ('crm.phonecall', 'Phonecall'),
+        'opportunity_id': fields.many2one ('crm.opportunity', 'Opportunity'),
+        'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel',\
+                                 'event_id', 'attendee_id', 'Attendees'),
+        'date_closed': fields.datetime('Closed', readonly=True),
+        'date_deadline': fields.datetime('Deadline'),
+        'state': fields.selection([('open', 'Confirmed'),
+                                    ('draft', 'Unconfirmed'),
+                                    ('cancel', 'Cancelled'),
                                     ('done', 'Done')], 'State', \
                                     size=16, readonly=True)
     }
-    
+
     _defaults = {
         'state': lambda *a: 'draft',
     }
-    
+
 crm_meeting()
 
 class calendar_attendee(osv.osv):
+    """ Calendar Attendee """
+
     _inherit = 'calendar.attendee'
+    _description = 'Calendar Attendee'
 
-    def _compute_data(self, cr, uid, ids, name, arg, context):        
-        name = name[0]
-        result = super(calendar_attendee, self)._compute_data(cr, uid, ids, name, arg, context)
+    def _compute_data(self, cr, uid, ids, name, arg, context):
 
-        for attdata in self.browse(cr, uid, ids, context=context):
+       """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of compute data’s IDs
+        @param context: A standard dictionary for contextual values
+
+        """
+
+       name = name[0]
+       result = super(calendar_attendee, self)._compute_data(cr, uid, ids, name, arg, context)
+
+       for attdata in self.browse(cr, uid, ids, context=context):
             id = attdata.id
             result[id] = {}
             if name == 'categ_id':
                 if attdata.ref:
-                    result[id][name] = (attdata.ref.categ_id.id,attdata.ref.categ_id.name,)
+                    result[id][name] = (attdata.ref.categ_id.id, attdata.ref.categ_id.name,)
                 else:
                     result[id][name] = False
-        return result
+       return result
+
     _columns = {
         'categ_id': fields.function(_compute_data, method=True, \
                         string='Event Type', type="many2one", \
                         relation="crm.case.categ", multi='categ_id'),
     }
+
 calendar_attendee()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 895c842574b..3f680b61f15 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -85,7 +85,7 @@
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="search_view_id" ref="view_crm_case_meetings_filter"/>        
+        <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
         <field name="sequence" eval="1"/>
@@ -111,13 +111,15 @@
         <field name="view_id" ref="crm_case_gantt_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
     </record>
-<!--    <menuitem parent="crm.menu_crm" name="Calendar" id="menu_crm_case_category_act_meetings"/>-->
 
-    <!--
-        ALL MEETINGS
-    -->
-    <menuitem name="Meetings" id="menu_meeting_sale" parent="base.menu_base_partner" sequence="3"/>
-    <menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>    
+<!-- ALL MEETINGS -->
+
+    <menuitem name="Meetings" id="menu_meeting_sale"
+    	parent="base.menu_base_partner" sequence="3" />
+
+    <menuitem name="Meetings" id="menu_crm_case_categ_meet"
+    	action="crm_case_categ_meet" parent="menu_meeting_sale"
+    	sequence="1" />
 
     <record id="action_view_attendee_form" model="ir.actions.act_window">
 	 	<field name="name">Meeting Invitations</field>
@@ -125,15 +127,15 @@
 	 	<field name="res_model">calendar.attendee</field>
 	 	<field name="view_type">form</field>
 	 	<field name="view_mode">tree,form</field>
-	 	<field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />	 	
+	 	<field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
         <field name="domain">[('ref','like','crm.meeting,')]</field>
 	 	<field name="context">{'default_sent_by_uid': uid}</field>
 	 </record>
 
     <menuitem id="menu_attendee_invitations"
 			name="Meeting Invitations" parent="crm.menu_meeting_sale"
-			sequence="10" action="action_view_attendee_form" /> 
-    
+			sequence="10" action="action_view_attendee_form" />
+
 
     <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
         <field name="name">Next Meetings</field>
@@ -141,26 +143,31 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="domain" eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]"/>
+        <field name="domain"
+        	eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]" />
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall3">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view_meet"/>
         <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall3">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
     </record>
+
 	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_view_meetall3">
         <field name="sequence" eval="2"/>
         <field name="view_mode">gantt</field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a469a722e11..7f30024235b 100755
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    # ------------------------------------------------------
-    # Meetings Categories
-    # ------------------------------------------------------
+
+<!-- CRM Meetings Categories Form View -->
 
     <record id="crm_meeting_categ_action" model="ir.actions.act_window">
         <field name="name">Meeting Categories</field>
@@ -13,11 +12,11 @@
         <field name="domain">[('object_id.model', '=', 'crm.meeting')]</field>
         <field name="context">{'object_id':'crm.meeting'}</field>
     </record>
-     <menuitem action="crm_meeting_categ_action" id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ"/>
 
-    # ------------------------------------------------------
-    # Meetings
-    # ------------------------------------------------------
+    <menuitem action="crm_meeting_categ_action"
+    	id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ" />
+
+<!-- CRM Meetings Form View -->
 
     <record model="ir.ui.view" id="crm_case_form_view_meet">
         <field name="name">CRM - Meetings Form</field>
@@ -28,18 +27,28 @@
                 <group col="6" colspan="4">
                     <field name="name" select="1" string="Summary"
                         colspan="4" />
-                    <field name="categ_id" widget="selection" string="Meeting Type" domain="[('object_id.model', '=', 'crm.meeting')]"/>
-                    <field name="date" string="Start Date" required="1" on_change="onchange_dates(date,duration,False)"/>
-                    <field name="duration" widget="float_time" on_change="onchange_dates(date,duration,False)"/>
-                    <field name="date_deadline" string="End Date" required="1" on_change="onchange_dates(date,False,date_deadline)"/>
+                    <field name="categ_id" widget="selection"
+                    	string="Meeting Type"
+                    	domain="[('object_id.model', '=', 'crm.meeting')]" />
+                    <field name="date" string="Start Date" required="1"
+                    	on_change="onchange_dates(date,duration,False)" />
+                    <field name="duration" widget="float_time"
+                    	on_change="onchange_dates(date,duration,False)" />
+                    <field name="date_deadline" string="End Date"
+                    	required="1"
+                    	on_change="onchange_dates(date,False,date_deadline)" />
                     <field name="location" />
-                    <field name="alarm_id" string="Reminder" widget="selection" />
+                    <field name="alarm_id" string="Reminder"
+                    	widget="selection" />
                     <group colspan="2" col="4" >
                            <field name="rrule_type" string="Recurrency"
                                 colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-                            <button string="Edit All" help="Edit all Ourrences of recurrent Meeting" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                            name="%(base_calendar.action_calendar_event_edit_all)d" icon="gtk-edit"
-                            type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
+                           <button string="Edit All"
+                           	help="Edit all Ourrences of recurrent Meeting"
+                           	attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
+                           	name="%(base_calendar.action_calendar_event_edit_all)d"
+                           	icon="gtk-edit" type="action"
+                           	context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
                     </group>
 
                 </group>
@@ -151,19 +160,29 @@
                                         <separator colspan="4" string="" />
                                         <group col="6" colspan="4">
                                             <field name="state" select="2" />
-                                            <button name="do_tentative" states="needs-action,declined,accepted"
-                                                string="Uncertain" type="object"
-                                                icon="terp-crm" />
-                                            <button name="do_accept" string="Accept" states="needs-action,tentative,declined"
-                                                type="object" icon="gtk-apply" />
-                                            <button name="do_decline" string="Decline"  states="needs-action,tentative,accepted"
-                                                type="object" icon="gtk-cancel" />
+                                            <button name="do_tentative"
+                                            	states="needs-action,declined,accepted"
+                                            	string="Uncertain"
+                                            	type="object"
+                                            	icon="terp-crm" />
+                                            <button name="do_accept"
+                                            	string="Accept"
+                                            	states="needs-action,tentative,declined"
+                                            	type="object"
+                                            	icon="gtk-apply" />
+                                            <button name="do_decline"
+                                            	string="Decline"
+                                            	states="needs-action,tentative,accepted"
+                                            	type="object"
+                                            	icon="gtk-cancel" />
                                             <button
-                                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                                string="Delegate" type="action"
-                                                icon="gtk-sort-descending" states="needs-action,tentative,declined,accepted"
-                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                                    </group>
+                                            	name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                            	string="Delegate"
+                                            	type="action"
+                                            	icon="gtk-sort-descending"
+                                            	states="needs-action,tentative,declined,accepted"
+                                            	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                        </group>
                                     </page>
                                     <page string="Other">
                                         <field name="user_id"/>
@@ -179,23 +198,29 @@
         </field>
     </record>
 
+<!-- CRM Meeting Tree View  -->
+
     <record model="ir.ui.view" id="crm_case_tree_view_meet">
         <field name="name">CRM - Meetings Tree</field>
         <field name="model">crm.meeting</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Meetings"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="id" widget="char"/>
-                <field name="name" string="Subject"/>
-                <field name="partner_id" string="Partner"/>
-                <field name="section_id" />
-                <field name="date" string="Meeting Date"/>
-                <field name="categ_id"/>
-                <field name="user_id"/>
-                <field name="state"/>
+            <tree string="Meetings"
+            	colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+            	<field name="id" widget="char" />
+            	<field name="name" string="Subject" />
+            	<field name="partner_id" string="Partner" />
+            	<field name="section_id" />
+            	<field name="date" string="Meeting Date" />
+            	<field name="categ_id" />
+            	<field name="user_id" />
+            	<field name="state" />
             </tree>
         </field>
     </record>
+
+<!-- CRM Meeting Calendar -->
+
     <record model="ir.ui.view" id="crm_case_calendar_view_meet">
         <field name="name">CRM - Meetings Calendar</field>
         <field name="model">crm.meeting</field>
@@ -210,6 +235,8 @@
         </field>
     </record>
 
+<!-- CRM Meeting Gantt  -->
+
     <record id="crm_case_gantt_view_meet" model="ir.ui.view">
         <field name="name">CRM - Meetings Gantt</field>
         <field name="model">crm.meeting</field>
@@ -223,6 +250,9 @@
             </gantt>
         </field>
     </record>
+
+<!-- CRM Meeting Search View  -->
+
     <record id="view_crm_case_meetings_filter" model="ir.ui.view">
         <field name="name">CRM - Meetings Search</field>
         <field name="model">crm.meeting</field>
@@ -230,24 +260,33 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group col="12" colspan="4">
-                           <filter icon="terp-crm" string="My Meetings" domain="[('user_id','=',uid)]" help="My Meetings"/>
-                           <filter icon="terp-crm" string="Current" domain="[('state','in',('draft', 'open'))]" default="1" help="Current Meetings"/>
-                        <filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" help="Confirmed Meetings"/>
+                           <filter icon="terp-crm" string="My Meetings"
+                           	domain="[('user_id','=',uid)]"
+                           	help="My Meetings" />
+                           <filter icon="terp-crm" string="Current"
+                           	domain="[('state','in',('draft', 'open'))]"
+                           	default="1" help="Current Meetings" />
+                           <filter icon="terp-crm" string="Confirmed"
+                           	domain="[('state','=','done')]"
+                           	help="Confirmed Meetings" />
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
-                           <field name="partner_id" select="1"/>
-                           <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection">
-                            <filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"
-                           />
-                         </field>
+                           <field name="partner_id" select="1" />
+                           <field name="section_id"
+                           	default="context.get('section_id', False)"
+                           	select="1" widget="selection">
+                           	<filter icon="terp-crm"
+                           		domain="[('section_id','=',context.get('section_id',False))]"
+                           		help="My section" />
+                           </field>
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
                 </search>
             </field>
         </record>
 
+<!-- Calendar Attendee Form View -->
+
         <record id="attendee_form_view_inherit" model="ir.ui.view">
                 <field name="name">calendar.attendee.form.inherit</field>
                 <field name="model">calendar.attendee</field>
@@ -260,6 +299,8 @@
                 </field>
         </record>
 
+<!-- Calendar Attendee Tree View -->
+
         <record id="attendee_tree_view_inherit" model="ir.ui.view">
                 <field name="name">calendar.attendee.tree.inherit</field>
                 <field name="model">calendar.attendee</field>
diff --git a/addons/crm/crm_operators.py b/addons/crm/crm_operators.py
index ac918de7c00..b58b9111e6c 100644
--- a/addons/crm/crm_operators.py
+++ b/addons/crm/crm_operators.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,18 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import time
 
 def som(cr, uid, partner_id, args):
+    """
+    @param cr: the current row, from the database cursor,
+    @param uid: the current user’s ID for security checks
+    """
+
     result = args['som_interval_default']
     max = args['som_interval_max'] or 4
     factor = args['som_interval_decrease']
@@ -32,8 +37,8 @@ def som(cr, uid, partner_id, args):
              '''
              select s.factor from res_partner_event e
              left join res_partner_som s
-             on (e.som=s.id) where partner_id=%s and date>=%s and date<%s''', 
-             (partner_id, 
+             on (e.som=s.id) where partner_id=%s and date>=%s and date<%s''',
+             (partner_id,
               time.strftime('%Y-%m-%d', time.gmtime(date_start)),
               time.strftime('%Y-%m-%d', time.gmtime(next_date))))
 
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index da5a1c719a7..58c3c551638 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -32,12 +32,22 @@ AVAILABLE_STATES = [
 ]
 
 class crm_opportunity(osv.osv):
+    """ Opportunity Cases """
+
     _name = "crm.opportunity"
     _description = "Opportunity Cases"
     _order = "id desc"
     _inherit = 'crm.case'
 
     def _compute_openday(self, cr, uid, ids, name, args, context={}):
+
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Openday’s IDs
+        @return: difference between current date and log date
+        @param context: A standard dictionary for contextual values
+        """
         result = {}
         for r in self.browse(cr, uid, ids , context):
             result[r.id] = 0
@@ -58,9 +68,18 @@ class crm_opportunity(osv.osv):
         return result
 
     def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of closeday’s IDs
+        @return: difference between current date and closed date
+        @param context: A standard dictionary for contextual values
+        """
         result = {}
         for r in self.browse(cr, uid, ids , context):
             result[r.id] = 0
+
             if r.date_closed:
                 date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
                 date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
@@ -70,14 +89,19 @@ class crm_opportunity(osv.osv):
         return result
 
     _columns = {
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Resource Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
+                     domain="[('section_id','=',section_id),\
+                    ('object_id.model', '=', 'crm.opportunity')]"),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+                     domain="[('section_id','=',section_id), \
+                    ('object_id.model', '=', 'crm.opportunity')]"),
+        'type_id': fields.many2one('crm.case.resource.type', 'Resource Type',\
+                    domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'probability': fields.float('Probability (%)'),
         'planned_revenue': fields.float('Expected Revenue'),
-        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+        'ref': fields.reference('Reference', selection=crm._links_get, size=128),
+        'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
         'date_closed': fields.datetime('Closed', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesman'),
         'phone': fields.char("Phone", size=64),
@@ -94,14 +118,29 @@ class crm_opportunity(osv.osv):
        }
 
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of stage’s IDs
+            @stage_id: change state id on run time """
+
         if not stage_id:
             return {'value':{}}
+
         stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
         if not stage.on_change:
             return {'value':{}}
         return {'value':{'probability':stage.probability}}
 
     def stage_next(self, cr, uid, ids, context={}):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of stage next’s IDs
+            @param context: A standard dictionary for contextual values """
+
         res = super(crm_opportunity, self).stage_next(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
             if case.stage_id and case.stage_id.on_change:
@@ -109,6 +148,13 @@ class crm_opportunity(osv.osv):
         return res
 
     def stage_previous(self, cr, uid, ids, context={}):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of stage previous’s IDs
+            @param context: A standard dictionary for contextual values """
+
         res = super(crm_opportunity, self).stage_previous(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
             if case.stage_id and case.stage_id.on_change:
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 49d0452167b..3bcdbc7bb9f 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
-<!--    <menuitem id="menu_presale" name="Sales" parent="crm.menu_crm" sequence="4"/>-->
-	 
+
 	 <act_window
             id="act_crm_opportunity_crm_meeting_new"
             name="Meetings"
@@ -21,8 +20,8 @@
             view_mode="calendar,tree,form"
             context="{'default_duration': 1.0}"
             domain="[('user_id','=',uid)]"
-            view_type="form"/>            
-            
+            view_type="form"/>
+
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">Opportunities</field>
           <field name="res_model">crm.opportunity</field>
@@ -48,58 +47,11 @@
           <field name="view_id" ref="crm_case_graph_view_opportunity"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
-     <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>   
-     <menuitem name="Opportunities" id="menu_crm_case_opp" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="2"/><!--
+     <menuitem id="base.menu_sales" name="Sales"
+     	parent="base.menu_base_partner" sequence="1" />
+     <menuitem name="Opportunities" id="menu_crm_case_opp"
+     	parent="base.menu_sales" action="crm_case_category_act_oppor11"
+     	sequence="2" />
 
-          MENU
-
-          REPORTS
-     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_user">
-          <field name="res_model">report.crm.case.user</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">graph,tree</field>
-          <field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support3)+')]'"/>
-          <field name="context" eval="{'default_state':'open'}"/>
-     </record>
-
-	<menuitem id="next_id_64" name="Reporting" parent="crm.menu_crm" sequence="50"/>
-
-     <menuitem name="Opportunity" parent="next_id_64" id="menu_action_report_crm_case_oppor"/>
-
-     <menuitem name="Cases by Opportunities and User" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_user" id="menu_action_report_crm_case_oppor_user"/>
-
-     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ">
-          <field name="res_model">report.crm.case.section.categ2</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">graph,tree</field>
-          <field name="context" eval="{'default_state':'open'}"/>
-     </record>
-     <menuitem name="Cases by Opportunities and Type"  parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ" id="menu_action_report_crm_case_oppor_categ"/>
-
-     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_stage">
-          <field name="res_model">report.crm.case.section.stage</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">graph,tree</field>
-          <field name="context" eval="{'default_state':'open'}"/>
-     </record>
-     <menuitem name="Cases by Opportunities and Stage" parent="menu_action_report_crm_case_oppor"  action="action_report_crm_case_oppor_stage" id="menu_action_report_crm_case_oppor_stage"/>
-
-     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_stage">
-          <field name="res_model">report.crm.case.section.categ.stage</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">tree</field>
-          <field name="context" eval="{'default_state':'open'}"/>
-     </record>
-     <menuitem name="Cases by Opportunities, Category and Stage" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_stage" id="menu_action_report_crm_case_oppor_categ_stage"/>
-
-     <record model="ir.actions.act_window" id="action_report_crm_case_oppor_categ_categ2">
-          <field name="res_model">report.crm.case.section.categ.categ2</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">tree</field>
-          <field name="context" eval="{'default_state':'open'}"/>
-     </record>
-     <menuitem name="Cases by Opportunities, Category and Type" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_categ2" id="menu_action_report_crm_case_oppor_categ_categ2"/>
-
-
---></data>
+</data>
 </openerp>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 17dc6ee393a..a3c90d17954 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -2,9 +2,7 @@
 <openerp>
 <data>
 
-    # ------------------------------------------------------
-    # Opportunity Categories
-    # ------------------------------------------------------
+<!-- Opportunity Categories Form View -->
 
     <record id="crm_opportunity_categ_action" model="ir.actions.act_window">
         <field name="name">Opportunity Categories</field>
@@ -14,10 +12,13 @@
         <field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
         <field name="context">{'object_id':'crm.opportunity'}</field>
     </record>
-     <menuitem action="crm_opportunity_categ_action" id="menu_crm_case_opportunity-act" parent="crm.menu_crm_case_categ"/>
-        # ------------------------------------------------------
-        # Stage
-        # ------------------------------------------------------
+
+    <menuitem action="crm_opportunity_categ_action"
+    	id="menu_crm_case_opportunity-act"
+    	parent="crm.menu_crm_case_categ" />
+
+<!-- Opportunity Stages Form View-->
+
         <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
             <field name="name">Opportunity Stages</field>
             <field name="res_model">crm.case.stage</field>
@@ -26,11 +27,13 @@
             <field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
              <field name="context">{'object_id':'crm.opportunity'}</field>
         </record>
-      <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" parent="crm.menu_crm_case_stage"/>
-    
-    # ------------------------------------------------------
-      Resource Type
-    # ------------------------------------------------------
+
+        <menuitem action="crm_opportunity_stage_act"
+        	id="menu_crm_opportunity_stage_act"
+        	parent="crm.menu_crm_case_stage" />
+
+<!-- Opportunity Resource Type Form View -->
+
         <record id="crm_opportunity_resource_act" model="ir.actions.act_window">
             <field name="name">Opportunity Resource Type</field>
             <field name="res_model">crm.case.resource.type</field>
@@ -39,14 +42,13 @@
             <field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
              <field name="context">{'object_id':'crm.opportunity'}</field>
         </record>
-      <menuitem action="crm_opportunity_resource_act" id="menu_crm_opportunity_resource_act" parent="crm.menu_crm_case_resource_type"/>
 
-      
-    # ------------------------------------------------------
-    # Opportunities
-    # ------------------------------------------------------
+        <menuitem action="crm_opportunity_resource_act"
+        	id="menu_crm_opportunity_resource_act"
+        	parent="crm.menu_crm_case_resource_type" />
 
 
+<!-- Opportunities Form View -->
 
     <record model="ir.ui.view" id="crm_case_form_view_oppor">
         <field name="name">Opportunities</field>
@@ -58,9 +60,15 @@
                     <field name="name" string="Opportunity"/>
                     <label string="Stage:" align="1.0"/>
                     <group colspan="1" col="4">
-                        <field name="stage_id" nolabel="1" on_change="onchange_stage_id(stage_id)" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-                        <button name="stage_previous" states="open,pending" type="object" icon="gtk-go-back" string=""/>
-                        <button name="stage_next" states="open,pending" type="object" icon="gtk-go-forward" string=""/>
+                        <field name="stage_id" nolabel="1"
+                        	on_change="onchange_stage_id(stage_id)"
+                        	widget="selection"
+                        	domain="[('object_id.model', '=', 'crm.opportunity')]" />
+                        <button name="stage_previous"
+                        	states="open,pending" type="object"
+                        	icon="gtk-go-back" string="" />
+                        <button name="stage_next" states="open,pending"
+                        	type="object" icon="gtk-go-forward" string="" />
                     </group>
                     <field name="user_id"/>
                     <button string="Schedule Meeting"
@@ -75,9 +83,14 @@
                 <page string="Opportunity">
                     <group col="3" colspan="2">
                         <separator colspan="3" string="Contacts"/>
-                        <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
-                        <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                        <field name="email_from" string="Email"/>
+                        <field name="partner_id" select="1"
+                        	on_change="onchange_partner_id(partner_id, email_from)"
+                        	colspan="2" />
+                        <field name="partner_address_id"
+                        	string="Contact"
+                        	on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                        	colspan="1" />
+                        <field name="email_from" string="Email" />
                         <field name="phone"/>
                     </group>
                     <group col="2" colspan="2">
@@ -85,7 +98,9 @@
                         <field name="type_id" select="1" string="Campaign"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="priority" string="Priority"/>
-                        <field name="categ_id" select="1" string="Category" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
+                        <field name="categ_id" select="1"
+                        	string="Category" widget="selection"
+                        	domain="[('object_id.model', '=', 'crm.opportunity')]" />
                     </group>
 
                     <separator colspan="4" string="Details"/>
@@ -94,12 +109,24 @@
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
                         <field name="state" select="2"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                        <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                        <button name="case_close" string="Mark Won" states="open,draft,pending" type="object" icon="gtk-close"/>
-                        <button name="case_cancel" string="Mark Lost" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
-                        <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
+                        <button name="case_open" string="Open"
+                        	states="draft,pending" type="object"
+                        	icon="gtk-go-forward" />
+                        <button name="case_escalate" string="Escalate"
+                        	states="open,draft,pending" type="object"
+                        	icon="gtk-go-up" />
+                        <button name="case_pending" string="Pending"
+                        	states="draft,open" type="object"
+                        	icon="gtk-media-pause" />
+                        <button name="case_close" string="Mark Won"
+                        	states="open,draft,pending" type="object"
+                        	icon="gtk-close" />
+                        <button name="case_cancel" string="Mark Lost"
+                        	states="draft,open,pending" type="object"
+                        	icon="gtk-cancel" />
+                        <button name="case_reset" string="Reset to New"
+                        	states="done,cancel" type="object"
+                        	icon="gtk-convert" />
                     </group>
                 </page>
 
@@ -169,6 +196,9 @@
             </form>
         </field>
     </record>
+
+<!-- Opportunities Tree View -->
+
     <record model="ir.ui.view" id="crm_case_tree_view_oppor">
         <field name="name">Opportunities Tree</field>
         <field name="model">crm.opportunity</field>
@@ -181,21 +211,35 @@
                 <field name="stage_id"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="type_id" invisible="1"/>
-                <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
-                <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
+                <button name="stage_previous" string="Previous"
+                	states="open,pending" type="object" icon="gtk-go-back" />
+                <button name="stage_next" string="Next"
+                	states="open,pending" type="object"
+                	icon="gtk-go-forward" />
                 <field name="planned_revenue" sum="Total of Planned Revenue"/>
                 <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
                 <field name="date_deadline" string="Excepted Closing"/>
                 <field name="section_id"/>
                 <field name="user_id"/>
                 <field name="state"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_close" string="Won" states="open,draft,pending" type="object" icon="gtk-close"/>
-                <button name="case_pending" string="Pending" states="open,draft" type="object" icon="gtk-media-pause"/>
-                <button name="case_cancel" string="Lost" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
+                <button name="case_open" string="Open"
+                	states="draft,pending" type="object"
+                	icon="gtk-go-forward" />
+                <button name="case_close" string="Won"
+                	states="open,draft,pending" type="object"
+                	icon="gtk-close" />
+                <button name="case_pending" string="Pending"
+                	states="open,draft" type="object"
+                	icon="gtk-media-pause" />
+                <button name="case_cancel" string="Lost"
+                	states="draft,open,pending" type="object"
+                	icon="gtk-cancel" />
             </tree>
         </field>
     </record>
+
+<!-- Opportunities Graph View -->
+
     <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
         <field name="name">CRM - Opportunity Graph</field>
         <field name="model">crm.opportunity</field>
@@ -209,6 +253,8 @@
         </field>
     </record>
 
+<!-- Opportunities Search View -->
+
     <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
         <field name="name">CRM - Opportunities Search</field>
         <field name="model">crm.opportunity</field>
@@ -217,11 +263,12 @@
             <search string="Search Opportunities">
                 <filter icon="gtk-home" string="Today"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
-                    help="Todays' Opportunities"
-                />
+                    help="Todays' Opportunities" />
+
                 <filter icon="gtk-media-rewind" string="7 Days"
                     help="Opportunities during last 7 days"
-                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
+                    	 ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                 />
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity"/>
@@ -232,10 +279,12 @@
                         help="My Opportunities" default="1"
                     />
                 </field>
-                <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection">
-                    <filter icon="terp-crm"
-                        domain="[('section_id','=',context.get('section_id',False))]"
-                        help="My section"/>
+                <field name="section_id"
+                	default="context.get('section_id', False)" select="1"
+                	widget="selection">
+                	<filter icon="terp-crm"
+                		domain="[('section_id','=',context.get('section_id',False))]"
+                		help="My section" />
                 </field>
                 <field name="state">
                     <filter icon="gtk-media-rewind"
@@ -245,15 +294,28 @@
                 </field>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="4">
-                    <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Category" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
-                    <filter string="Campaign" icon="terp-crm" domain="[]" context="{'group_by':'type_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>                    
-                    <filter string="Salesman" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>                    
-                    <separator orientation="vertical"/>
-                    <filter string="Creation" icon="terp-project" domain="[]" context="{'group_by':'create_date'}"/>
-                    <filter string="Exp.Closing" icon="terp-project" domain="[]" context="{'group_by':'date_deadline'}"/>
+                    <filter string="Stage" icon="terp-crm" domain="[]"
+                    	context="{'group_by':'stage_id'}" />
+
+                    <filter string="Category" icon="terp-crm"
+                    	domain="[]" context="{'group_by':'categ_id'}" />
+
+                    <filter string="Campaign" icon="terp-crm"
+                    	domain="[]" context="{'group_by':'type_id'}" />
+
+                    <separator orientation="vertical" />
+                    <filter string="Partner" icon="terp-crm" domain="[]"
+                    	context="{'group_by':'partner_id'}" />
+
+                    <filter string="Salesman" icon="terp-crm"
+                    	domain="[]" context="{'group_by':'user_id'}" />
+
+                    <separator orientation="vertical" />
+                    <filter string="Creation" icon="terp-project"
+                    	domain="[]" context="{'group_by':'create_date'}" />
+
+                    <filter string="Exp.Closing" icon="terp-project"
+                    	domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
            </search>
         </field>
diff --git a/addons/crm/crm_opportunity_wizard.xml b/addons/crm/crm_opportunity_wizard.xml
deleted file mode 100644
index 24ee8257911..00000000000
--- a/addons/crm/crm_opportunity_wizard.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>        
-       <wizard
-          id="wizard_partner_create_opportunity"
-            keyword="client_action_multi"
-            model="res.partner"
-            name="crm.case.opportunity.partner_opportunity"
-            menu="False"
-            string="Create Opportunity"/>
-
-    </data>
-</openerp>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 52af836d5b7..962a3883d62 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -24,26 +24,38 @@ import crm
 import time
 
 class crm_phonecall(osv.osv):
+    """ Phonecall Cases """
+
     _name = "crm.phonecall"
     _description = "Phonecall Cases"
     _order = "id desc"
     _inherit = 'crm.case'
+
     _columns = {
         'duration': fields.float('Duration'),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+                        domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.phonecall')]"),
         'partner_phone': fields.char('Phone', size=32),
-        'partner_contact': fields.related('partner_address_id', 'name', type="char", string="Contact", size=128),
+        'partner_contact': fields.related('partner_address_id', 'name',\
+                                 type="char", string="Contact", size=128),
         'partner_mobile': fields.char('Mobile', size=32),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
-                                                                " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel',\
+                        help="The channels represent the different communication\
+                         modes available with the customer." \
+                        " With each commercial opportunity, you can indicate\
+                         the canall which is this opportunity source."),
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),
     }
+
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
+
 crm_phonecall()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 07554c794b5..9f1f2f946fc 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -12,8 +12,8 @@
         domain="[('partner_id', '=', active_id)]"
         />
 
+<!-- PHONE CALLS (menu)  -->
 
-    ######################## PHONE CALLS (menu) ###########################
     <record model="ir.actions.act_window" id="crm_case_categ_phone0">
         <field name="name">Phone Calls</field>
         <field name="res_model">crm.phonecall</field>
@@ -22,26 +22,30 @@
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone0"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
         <field name="view_id" ref="crm_case_phone_calendar_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone0"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone0"/>
     </record>
-    <menuitem name="Phone Calls" id="menu_crm_case_phone"  parent="base.menu_base_partner" sequence="5"/>
 
+    <menuitem name="Phone Calls" id="menu_crm_case_phone"
+    	parent="base.menu_base_partner" sequence="5" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
         <field name="name">Inbound</field>
@@ -53,25 +57,32 @@
         <field name="context">{'set_editable':True,'default_state':'open'}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
         <field name="view_id" ref="crm_case_phone_calendar_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
-    <menuitem name="Inbound" id="menu_crm_case_phone_inbound"  parent="crm.menu_crm_case_phone" action="crm_case_categ_phone_incoming0"/>
+
+    <menuitem name="Inbound" id="menu_crm_case_phone_inbound"
+    	parent="crm.menu_crm_case_phone"
+    	action="crm_case_categ_phone_incoming0" />
+
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
         <field name="name">Outbound</field>
         <field name="res_model">crm.phonecall</field>
@@ -82,18 +93,21 @@
         <field name="context">{'default_state':'open'}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_outgoing0">
         <field name="sequence" eval="2"/>
         <field name="view_mode">calendar</field>
         <field name="view_id" ref="crm_case_phone_calendar_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_outgoing0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -101,7 +115,9 @@
         <field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
     </record>
 
-    <menuitem name="Outbound" id="menu_crm_case_phone_outbound"  parent="crm.menu_crm_case_phone" action="crm_case_categ_phone_outgoing0"/>
+    <menuitem name="Outbound" id="menu_crm_case_phone_outbound"
+    	parent="crm.menu_crm_case_phone"
+    	action="crm_case_categ_phone_outgoing0" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 64be1683d74..c75799c6ec5 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -2,9 +2,7 @@
 <openerp>
     <data>
 
-    # ------------------------------------------------------
-    # Phonecall Categories
-    # ------------------------------------------------------
+<!--  Phonecall Categories Form View  -->
 
     <record id="crm_phonecall_categ_action" model="ir.actions.act_window">
         <field name="name">Phonecall Categories</field>
@@ -15,12 +13,12 @@
         <field name="context">{'object_id':'crm.phonecall'}</field>
     </record>
 
-   <menuitem action="crm_phonecall_categ_action" id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ"/>
+    <menuitem action="crm_phonecall_categ_action"
+    	id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ" />
 
-    # ------------------------------------------------------
-      Resource Type
-    # ------------------------------------------------------
-        <record id="crm_phonecall_resource_act" model="ir.actions.act_window">
+<!-- ResourceType Form View -->
+
+    <record id="crm_phonecall_resource_act" model="ir.actions.act_window">
             <field name="name">Phonecall Resource Type</field>
             <field name="res_model">crm.case.resource.type</field>
             <field name="view_type">form</field>
@@ -28,27 +26,28 @@
 	        <field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
 	        <field name="context">{'object_id':'crm.phonecall'}</field>
         </record>
-      <menuitem action="crm_phonecall_resource_act" id="menu_crm_phonecall_resource_act" parent="crm.menu_crm_case_resource_type"/>
+
+    <menuitem action="crm_phonecall_resource_act"
+    	id="menu_crm_phonecall_resource_act"
+    	parent="crm.menu_crm_case_resource_type" />
 
 
-    # ------------------------------------------------------
-    # Phone Calls
-    # ------------------------------------------------------
-
+<!--  PhoneCalls Tree View -->
 
     <record model="ir.ui.view" id="crm_case_phone_tree_view">
         <field name="name">CRM - Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
+
             <tree string="Phone Calls" colors="grey:state in ('cancel','done');blue:state in ('pending',)">
                 <field name="date" string="Date"/>
                 <field name="name" string="Call Summary"/>
                 <field name="partner_id" string="Partner"/>
                 <field name="partner_contact"/>
-                <field name="partner_phone"/>                
+                <field name="partner_phone"/>
                 <field name="user_id"/>
-                <button string="Opportunity" 
+                <button string="Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
@@ -64,6 +63,8 @@
         </field>
     </record>
 
+<!-- Phonecalls Form View -->
+
     <record model="ir.ui.view" id="crm_case_phone_form_view">
         <field name="name">CRM - Phone Call Form</field>
         <field name="model">crm.phonecall</field>
@@ -85,12 +86,12 @@
                         name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-					<label colspan="6"  string=""/>                                 
-	                <button string="Schedule Other Call" 
+					<label colspan="6"  string=""/>
+	                <button string="Schedule Other Call"
 	                 icon="gtk-redo"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
- 					               
+
                 </group>
                 <group col="3" colspan="2">
                     <separator colspan="3" string="Contacts" />
@@ -115,16 +116,27 @@
                 <separator colspan="4" />
                 <group col="8" colspan="4">
                     <field name="state" select="1" />
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                    <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
-                    <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                    <button name="case_cancel" string="Cancel"
+                    	states="draft,open,pending" type="object"
+                    	icon="gtk-cancel" />
+                    <button name="case_open" string="Open"
+                    	states="draft,pending" type="object"
+                    	icon="gtk-go-forward" />
+                    <button name="case_pending" string="Not Held"
+                    	states="open" type="object" icon="gtk-undo" />
+                    <button name="case_close" string="Held"
+                    	states="open,draft,pending" type="object"
+                    	icon="gtk-jump-to" />
+                    <button name="case_reset" string="Reset to Draft"
+                    	states="done,cancel" type="object"
+                    	icon="gtk-convert" />
                 </group>
             </form>
         </field>
     </record>
 
+<!-- Phonecalls Calendar View -->
+
     <record model="ir.ui.view" id="crm_case_phone_calendar_view">
         <field name="name">CRM - Phone Calls Calendar</field>
         <field name="model">crm.phonecall</field>
@@ -133,11 +145,13 @@
         <field name="arch" type="xml">
             <calendar string="Phone Calls" date_start="date" color="user_id" date_delay="duration">
                 <field name="name"/>
-                <field name="partner_id"/>                
+                <field name="partner_id"/>
             </calendar>
         </field>
     </record>
 
+<!-- Phonecalls Search View  -->
+
     <record id="view_crm_case_phonecalls_filter" model="ir.ui.view">
         <field name="name">CRM - Phone Calls Search</field>
         <field name="model">crm.phonecall</field>
@@ -145,36 +159,50 @@
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
                <filter icon="gtk-home" string="Today"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),\
+                    ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
                    help="Todays's Phonecalls"
                />
                <filter icon="gtk-media-rewind"
                    string="7 Days"
                    help="Phonecalls during last 7 days"
-                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                   domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')),\
+                    ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                />
                <separator orientation="vertical"/>
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
                <field name="user_id" widget="selection">
-                   <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Phonecalls" default="1"/>
-                   <filter icon="terp-partner" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
+                   <filter icon="terp-partner"
+                   	domain="[('user_id','=',uid)]" help="My Phonecalls"
+                   	default="1" />
+                   <filter icon="terp-partner"
+                   	domain="[('user_id','=',False)]"
+                   	help="Unassigned Phonecalls" />
                </field>
                <field name="state">
-                   <filter icon="gtk-index" domain="[('state','in',('open','draft' ))]" help="Current" default="1"/>
+                   <filter icon="gtk-index"
+                   	domain="[('state','in',('open','draft' ))]"
+                   	help="Current" default="1" />
                </field>
-               <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
-                   <filter icon="terp-crm"
-                       domain="[('section_id','=',context.get('section_id',False))]"
-                       help="My section"/>
+               <field name="section_id"
+               	default="context.get('section_id', False)" select="1"
+               	widget="selection" string="Section">
+               	<filter icon="terp-crm"
+               		domain="[('section_id','=',context.get('section_id',False))]"
+               		help="My section" />
                </field>
                <newline/>
                <group expand="1" string="Group By..." colspan="4">
-                   <filter string="Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
-                   <filter string="Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
-                   <separator orientation="vertical"/>
-                   <filter string="Creation" icon="terp-project" domain="[]" context="{'group_by':'create_date'}"/>
-                   <filter string="Date" icon="terp-project" domain="[]" context="{'group_by':'date'}"/>
+                   <filter string="Partner" icon="terp-crm" domain="[]"
+                   	context="{'group_by':'partner_id'}" />
+                   <filter string="Responsible" icon="terp-crm"
+                   	domain="[]" context="{'group_by':'user_id'}" />
+                   <separator orientation="vertical" />
+                   <filter string="Creation" icon="terp-project"
+                   	domain="[]" context="{'group_by':'create_date'}" />
+                   <filter string="Date" icon="terp-project" domain="[]"
+                   	context="{'group_by':'date'}" />
                </group>
            </search>
         </field>
diff --git a/addons/crm/crm_phonecall_wizard.xml b/addons/crm/crm_phonecall_wizard.xml
deleted file mode 100644
index fa24e1a3f84..00000000000
--- a/addons/crm/crm_phonecall_wizard.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <wizard
-            id="wizard_crm_phonecall_meeting_set"
-            keyword="client_action_multi"
-            model="crm.phonecall"
-            name="crm.phonecall.meeting_set"
-            multi="True"
-            string="Schedule Meeting"/>
-
-        <wizard
-            id="wizard_crm_phonecall_partner_create"
-            keyword="client_action_multi"
-            model="crm.phonecall"
-            name="crm.phonecall.partner_create"
-            multi="True"
-            string="Create Partner"/>
-
-        <wizard
-            id="wizard_crm_phonecall_opportunity_set"
-            keyword="client_action_multi"
-            model="crm.phonecall"
-            name="crm.phonecall.opportunity_set"
-            multi="True"
-            string="Convert To Opportunity"/>
-    </data>
-</openerp>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index b7722ac8443..7b8b08dd7c9 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -2,9 +2,7 @@
 <openerp>
 <data>
 
-    #
-    # Cases by section and category2 of case
-    #
+<!--  Cases by section and category2 of case Tree View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_tree">
         <field name="name">CRM Report - Sections and Type(Tree)</field>
@@ -25,6 +23,9 @@
             </tree>
         </field>
     </record>
+
+<!--  Cases by section and category2 of case Form View -->
+
     <record model="ir.ui.view" id="view_crm_case_section_categ_form">
         <field name="name">CRM Report - Sections and Type(Form)</field>
         <field name="model">report.crm.case.section.categ2</field>
@@ -44,6 +45,9 @@
             </form>
         </field>
     </record>
+
+<!--  Cases by section and category2 of case Graph View -->
+
     <record model="ir.ui.view" id="view_crm_case_section_categ_graph">
         <field name="name">CRM Report - Sections and Type(Graph)</field>
         <field name="model">report.crm.case.section.categ2</field>
@@ -57,6 +61,8 @@
         </field>
     </record>
 
+<!--  Cases by section and category2 of case Search View -->
+
     <record id="view_crm_case_section_categ_filter" model="ir.ui.view">
             <field name="name">CRM Report - Sections and Type(Select)</field>
             <field name="model">report.crm.case.section.categ2</field>
@@ -64,11 +70,17 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section and Type">
                    <group col="10" colspan="4">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section and Type for this year"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by Section and Type for this month"/>
-						<separator orientation="vertical"/>
-						<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection"/>
-                		<field name="category2_id" select="1"/>
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"
+                   			help="Cases by Section and Type for this year" />
+                   		<filter string="This Month" icon="terp-hr"
+                   			domain="[('month','=',time.localtime()[1])]"
+                   			help="Cases by Section and Type for this month" />
+                   		<separator orientation="vertical"/>
+                   		<field name="section_id"
+                   			default="context.get('section_id', False)"
+                   			select="1" widget="selection" />
+                   		<field name="category2_id" select="1"/>
                 		<field name="nbr" select="1"/>
                 		<field name="state" select="1"/>
                    </group>
@@ -76,17 +88,16 @@
             </field>
         </record>
 
+<!--  Cases by section and category2 of case Action -->
+
     <record model="ir.actions.act_window" id="action_report_crm_case_section_categ_tree">
         <field name="res_model">report.crm.case.section.categ2</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
         <field name="search_view_id" ref="view_crm_case_section_categ_filter"/>
     </record>
-<!--    <menuitem parent="next_id_64" name="Cases by Section and Type" action="action_report_crm_case_section_categ_tree" id="menu_crm_case_section_categ_tree"/>-->
 
-    #
-    # Cases by section and stage
-    #
+<!-- Cases by section and stage Tree View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_stage_tree">
         <field name="name">CRM Report - Sections and Stage(Tree)</field>
@@ -106,6 +117,9 @@
             </tree>
         </field>
     </record>
+
+<!-- Cases by section and stage Form View -->
+
     <record model="ir.ui.view" id="view_crm_case_section_stage_form">
         <field name="name">CRM Report - Sections and Stage(Form)</field>
         <field name="model">report.crm.case.section.stage</field>
@@ -124,6 +138,9 @@
             </form>
         </field>
     </record>
+
+<!-- Cases by section and stage Graph View -->
+
     <record model="ir.ui.view" id="view_crm_case_section_stage_graph">
         <field name="name">CRM Report - Sections and Stage(Graph)</field>
         <field name="model">report.crm.case.section.stage</field>
@@ -136,6 +153,9 @@
             </graph>
         </field>
     </record>
+
+<!-- Cases by section and stage Search View -->
+
 	<record id="view_crm_case_section_stage_filter" model="ir.ui.view">
             <field name="name">CRM Report - Sections and Stage(Select)</field>
             <field name="model">report.crm.case.section.stage</field>
@@ -143,9 +163,13 @@
             <field name="arch" type="xml">
                 <search string="Cases by Section and Stage">
                    <group col="8" colspan="4">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" help="Cases by Section and Stage for this year"/>
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" help="Cases by Section and Stage for this month"/>
-						<separator orientation="vertical"/>
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"
+                   			help="Cases by Section and Stage for this year" />
+                   		<filter string="This Month" icon="terp-hr"
+                   			domain="[('month','=',time.localtime()[1])]"
+                   			help="Cases by Section and Stage for this month" />
+                   		<separator orientation="vertical"/>
 						<field name="section_id" select="1" widget="selection"/>
                 		<field name="nbr" select="1"/>
                 		<field name="state" select="1"/>
@@ -154,6 +178,8 @@
             </field>
         </record>
 
+<!-- Cases by section and stage Action -->
+
     <record model="ir.actions.act_window" id="action_report_crm_case_section_stage_tree">
         <field name="res_model">report.crm.case.section.stage</field>
         <field name="view_type">form</field>
@@ -161,9 +187,7 @@
         <field name="search_view_id" ref="view_crm_case_section_stage_filter"/>
     </record>
 
-    #
-    # Cases by section, category and stage
-    #
+<!-- Cases by section, category and stage Tree View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_stage_tree">
         <field name="name">CRM Report - Section, Category and Stage(Tree)</field>
@@ -183,6 +207,9 @@
             </tree>
         </field>
     </record>
+
+<!-- Cases by section, category and stage Form View -->
+
     <record model="ir.ui.view" id="view_crm_case_section_categ_stage_form">
         <field name="name">CRM Report - Section, Category and Stage(Form)</field>
         <field name="model">report.crm.case.section.categ.stage</field>
@@ -202,6 +229,8 @@
         </field>
     </record>
 
+<!-- Cases by section, category and stage Search View -->
+
     <record id="view_crm_case_section_categ_stage_filter" model="ir.ui.view">
             <field name="name">CRM Report - Section, Category and Stage(Select)</field>
             <field name="model">report.crm.case.section.categ.stage</field>
@@ -224,6 +253,9 @@
                </search>
             </field>
         </record>
+
+<!-- Cases by section, category and stage Graph View -->
+
 	<record model="ir.ui.view" id="view_crm_case_section_categ_stage_graph">
         <field name="name">CRM Report - Section, Category and Stage(Select)</field>
         <field name="model">report.crm.case.section.categ.stage</field>
@@ -236,6 +268,9 @@
             </graph>
         </field>
     </record>
+
+<!-- Cases by section, category and stage Action -->
+
     <record model="ir.actions.act_window" id="action_report_crm_case_section_categ_stage_tree">
         <field name="res_model">report.crm.case.section.categ.stage</field>
         <field name="view_type">form</field>
@@ -243,9 +278,7 @@
         <field name="search_view_id" ref="view_crm_case_section_categ_stage_filter"/>
     </record>
 
-    #
-    # Cases by section, category and category2
-    #
+<!--  Cases by section, category and category2 Tree View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_categ2_tree">
         <field name="name">CRM Report - Section, Category and Type(Tree)</field>
@@ -266,6 +299,9 @@
             </tree>
         </field>
     </record>
+
+<!--  Cases by section, category and category2 Form View -->
+
     <record model="ir.ui.view" id="view_crm_case_section_categ_categ2_form">
         <field name="name">CRM Report - Section, Category and Type(Form)</field>
         <field name="model">report.crm.case.section.categ.categ2</field>
@@ -286,6 +322,8 @@
         </field>
     </record>
 
+<!--  Cases by section, category and category2 Search View -->
+
 	<record id="view_crm_case_section_categ_categ2_filter" model="ir.ui.view">
             <field name="name">CRM Report - Section, Category and Type(Select)</field>
             <field name="model">report.crm.case.section.categ.categ2</field>
@@ -308,6 +346,8 @@
             </field>
     </record>
 
+<!--  Cases by section, category and category2 Graph View -->
+
     <record model="ir.ui.view" id="view_crm_case_section_categ_categ2_graph">
         <field name="name">CRM Report - Section, Category and Type(Select)</field>
         <field name="model">report.crm.case.section.categ.categ2</field>
@@ -320,6 +360,9 @@
             </graph>
         </field>
     </record>
+
+<!--  Cases by section, category and category2 Action -->
+
     <record model="ir.actions.act_window" id="action_report_crm_case_section_categ_categ2_tree">
         <field name="res_model">report.crm.case.section.categ.categ2</field>
         <field name="view_type">form</field>
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index 2f0e2a1c650..516873d484f 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,19 +31,45 @@ class crm_segmentation(osv.osv):
     '''
     _name = "crm.segmentation"
     _description = "Partner Segmentation"
+
     _columns = {
         'name': fields.char('Name', size=64, required=True, help='The name of the segmentation.'),
         'description': fields.text('Description'),
-        'categ_id': fields.many2one('res.partner.category', 'Partner Category', required=True, help='The partner category that will be added to partners that match the segmentation criterions after computation.'),
-        'exclusif': fields.boolean('Exclusive', help='Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn\'t match segmentation criterions'),
-        'state': fields.selection([('not running','Not Running'),('running','Running')], 'Execution Status', readonly=True),
+        'categ_id': fields.many2one('res.partner.category', 'Partner Category',\
+                         required=True, help='The partner category that will be \
+                         added to partners that match the segmentation criterions after computation.'),
+        'exclusif': fields.boolean('Exclusive', help='Check if the category is \
+                        limited to partners that match the segmentation criterions.\
+                        If checked, remove the category from partners that doesn\'t \
+                        match segmentation criterions'),
+        'state': fields.selection([('not running','Not Running'),\
+                    ('running','Running')], 'Execution Status', readonly=True),
         'partner_id': fields.integer('Max Partner ID processed'),
-        'segmentation_line': fields.one2many('crm.segmentation.line', 'segmentation_id', 'Criteria', required=True),
-        'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation. It's mainly used to detect if a partner has not purchased or buy for a too long time, so we suppose that his state of mind has decreased because he probably bought goods to another supplier. Use this functionality for recurring businesses."),
-        'som_interval_max': fields.integer('Max Interval', help="The computation is made on all events that occured during this interval, the past X periods."),
-        'som_interval_decrease': fields.float('Decrease (0>1)', help="If the partner has not purchased (or bought) during a period, decrease the state of mind by this factor. It\'s a multiplication"),
-        'som_interval_default': fields.float('Default (0=None)', help="Default state of mind for period preceeding the 'Max Interval' computation. This is the starting state of mind by default if the partner has no event."),
-        'sales_purchase_active': fields.boolean('Use The Sales Purchase Rules', help='Check if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored')
+        'segmentation_line': fields.one2many('crm.segmentation.line', \
+                            'segmentation_id', 'Criteria', required=True),
+        'som_interval': fields.integer('Days per Periode', help="A period is the \
+                        average number of days between two cycle of sale or\
+                        purchase for this segmentation. It's mainly used to\
+                        detect if a partner has not purchased or buy for a too \
+                        long time, so we suppose that his state of mind has \
+                        decreased because he probably bought goods to another \
+                        supplier. Use this functionality for recurring businesses."),
+        'som_interval_max': fields.integer('Max Interval', help="The computation \
+                            is made on all events that occured during this \
+                            interval, the past X periods."),
+        'som_interval_decrease': fields.float('Decrease (0>1)', help="If the \
+                                     partner has not purchased (or bought) \
+                                     during a period, decrease the state of \
+                                     mind by this factor. It\'s a multiplication"),
+        'som_interval_default': fields.float('Default (0=None)', help="Default \
+                                     state of mind for period preceeding the \
+                                     'Max Interval' computation. This is the \
+                                     starting state of mind by default if the \
+                                     partner has no event."),
+        'sales_purchase_active': fields.boolean('Use The Sales Purchase Rules',\
+                                     help='Check if you want to use this tab as\
+                                    part of the segmentation rule. If not \
+                                    checked, the criteria beneath will be ignored')
     }
     _defaults = {
         'partner_id': lambda *a: 0,
@@ -54,11 +80,19 @@ class crm_segmentation(osv.osv):
     }
 
     def process_continue(self, cr, uid, ids, start=False):
-        categs = self.read(cr,uid,ids,['categ_id','exclusif','partner_id', 'sales_purchase_active', 'profiling_active'])
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Process continue’s IDs"""
+
+        categs = self.read(cr, uid, ids, ['categ_id', 'exclusif', 'partner_id',\
+                                 'sales_purchase_active', 'profiling_active'])
         for categ in categs:
             if start:
                 if categ['exclusif']:
-                    cr.execute('delete from res_partner_category_rel where category_id=%s', (categ['categ_id'][0],))
+                    cr.execute('delete from res_partner_category_rel \
+                            where category_id=%s', (categ['categ_id'][0],))
 
             id = categ['id']
 
@@ -77,7 +111,8 @@ class crm_segmentation(osv.osv):
                     partners.remove(pid)
 
             for partner_id in partners:
-                cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
+                cr.execute('insert into res_partner_category_rel (category_id,partner_id) \
+                        values (%s,%s)', (categ['categ_id'][0], partner_id))
             cr.commit()
 
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
@@ -85,23 +120,39 @@ class crm_segmentation(osv.osv):
         return True
 
     def process_stop(self, cr, uid, ids, *args):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Process stop’s IDs"""
+
         return self.write(cr, uid, ids, {'state':'not running', 'partner_id':0})
 
     def process_start(self, cr, uid, ids, *args):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Process start’s IDs """
+
         self.write(cr, uid, ids, {'state':'running', 'partner_id':0})
         return self.process_continue(cr, uid, ids, start=True)
 crm_segmentation()
 
 class crm_segmentation_line(osv.osv):
+    """ Segmentation line """
     _name = "crm.segmentation.line"
     _description = "Segmentation line"
+
     _columns = {
         'name': fields.char('Rule Name', size=64, required=True),
         'segmentation_id': fields.many2one('crm.segmentation', 'Segmentation'),
-        'expr_name': fields.selection([('sale','Sale Amount'),('som','State of Mind'),('purchase','Purchase Amount')], 'Control Variable', size=64, required=True),
+        'expr_name': fields.selection([('sale','Sale Amount'),('som','State of Mind'),\
+                        ('purchase','Purchase Amount')], 'Control Variable', size=64, required=True),
         'expr_operator': fields.selection([('<','<'),('=','='),('>','>')], 'Operator', required=True),
         'expr_value': fields.float('Value', required=True),
-        'operator': fields.selection([('and','Mandatory Expression'),('or','Optional Expression')],'Mandatory / Optional', required=True),
+        'operator': fields.selection([('and','Mandatory Expression'),\
+                        ('or','Optional Expression')],'Mandatory / Optional', required=True),
     }
     _defaults = {
         'expr_name': lambda *a: 'sale',
@@ -109,6 +160,12 @@ class crm_segmentation_line(osv.osv):
         'operator': lambda *a: 'and'
     }
     def test(self, cr, uid, ids, partner_id):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Test’s IDs """
+
         expression = {'<': lambda x,y: x<y, '=':lambda x,y:x==y, '>':lambda x,y:x>y}
         ok = False
         lst = self.read(cr, uid, ids)
@@ -117,7 +174,8 @@ class crm_segmentation_line(osv.osv):
             if cr.fetchone():
                 if l['expr_name']=='som':
                     datas = self.pool.get('crm.segmentation').read(cr, uid, [l['segmentation_id'][0]],
-                            ['som','som_interval','som_interval_max','som_interval_default', 'som_interval_decrease'])
+                            ['som','som_interval','som_interval_max',\
+                             'som_interval_default', 'som_interval_decrease'])
                     value = crm_operators.som(cr, uid, partner_id, datas[0])
                 elif l['expr_name']=='sale':
                     cr.execute('SELECT SUM(l.price_unit * l.quantity) ' \
@@ -155,10 +213,8 @@ class crm_segmentation_line(osv.osv):
                 if res:
                     return True
         return True
+
 crm_segmentation_line()
 
-
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a970701b735..16abc70f8b8 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-<!--        <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>-->
         <menuitem id="menu_crm_configuration" name="Cases" parent="base.menu_base_config" sequence="0"/>
 
-        <!-- Case Sections -->
+<!-- Case Sections Form View -->
+
         <record id="crm_case_section_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.form</field>
             <field name="model">crm.case.section</field>
@@ -25,6 +25,9 @@
                 </form>
             </field>
         </record>
+
+<!-- Case Sections Tree View -->
+
         <record id="crm_case_section_view_tree" model="ir.ui.view">
             <field name="name">crm.case.section.tree</field>
             <field name="model">crm.case.section</field>
@@ -38,6 +41,9 @@
                 </tree>
             </field>
         </record>
+
+<!-- Case Sections Action -->
+
         <record id="crm_case_section_act" model="ir.actions.act_window">
             <field name="name">Sections</field>
             <field name="res_model">crm.case.section</field>
@@ -45,9 +51,8 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 
-        # ------------------------------------------------------
-        # Stage
-        # ------------------------------------------------------
+<!-- CRM Stage Tree View -->
+
         <record model="ir.ui.view" id="crm_case_stage_tree">
             <field name="name">crm.case.stage.tree</field>
             <field name="model">crm.case.stage</field>
@@ -62,6 +67,9 @@
                 </tree>
             </field>
         </record>
+
+<!-- CRM Stage Form View -->
+
         <record model="ir.ui.view" id="crm_case_stage_form">
             <field name="name">crm.case.stage.form</field>
             <field name="model">crm.case.stage</field>
@@ -80,16 +88,21 @@
                 </form>
             </field>
         </record>
+
+<!-- CRM Stage Action -->
+
         <record id="crm_case_stage_act" model="ir.actions.act_window">
             <field name="name">Stages</field>
             <field name="res_model">crm.case.stage</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_stage_tree"/>
         </record>
+
         <menuitem  id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
 
 
-        <!-- Case Categories -->
+<!-- Case Categories Form View -->
+
         <record id="crm_case_categ-view" model="ir.ui.view">
             <field name="name">crm.case.categ.form</field>
             <field name="model">crm.case.categ</field>
@@ -102,6 +115,9 @@
                 </form>
             </field>
         </record>
+
+<!-- Case Categories Tree View -->
+
         <record id="crm_case_categ_tree-view" model="ir.ui.view">
             <field name="name">crm.case.categ.tree</field>
             <field name="model">crm.case.categ</field>
@@ -114,6 +130,8 @@
             </field>
         </record>
 
+<!-- Case Categories Action -->
+
         <record id="crm_case_categ-act" model="ir.actions.act_window">
             <field name="name">Categories</field>
             <field name="res_model">crm.case.categ</field>
@@ -122,12 +140,13 @@
         </record>
         <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration"/>
 
-        <menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="crm.menu_crm_configuration"/>
+        <menuitem action="crm_case_section_act"
+        	id="menu_crm_case_section_act"
+        	parent="crm.menu_crm_configuration" />
 
 
-        # ------------------------------------------------------
-        # Resource Type of case
-        # ------------------------------------------------------
+<!-- Resource Type of case Tree View -->
+
         <record model="ir.ui.view" id="crm_case_resource_type_tree">
             <field name="name">crm.case.resource.type.tree</field>
             <field name="model">crm.case.resource.type</field>
@@ -140,6 +159,9 @@
                 </tree>
             </field>
         </record>
+
+<!-- Resource Type of case Form View -->
+
         <record model="ir.ui.view" id="crm_case_resource_type_form">
             <field name="name">crm.case.resource.type.form</field>
             <field name="model">crm.case.resource.type</field>
@@ -153,18 +175,17 @@
             </field>
         </record>
 
+<!-- Resource Type of case Action -->
+
         <record id="crm_case_resource_type_act" model="ir.actions.act_window">
             <field name="name">Resource Type</field>
             <field name="res_model">crm.case.resource.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
-        <menuitem  id="menu_crm_case_resource_type" name="Resource Type" parent="crm.menu_crm_configuration"/>
+        <menuitem id="menu_crm_case_resource_type" name="Resource Type"
+        	parent="crm.menu_crm_configuration" />
 
-        <!--<menuitem action="crm_case_resource_type_act" id="menu_crm_case_resource_act" parent="menu_crm_case_resource_type"/>-->
-
-
-<!--        <menuitem id="next_id_52" name="All Cases" parent="crm.menu_crm" sequence="1"/>-->
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
             <field name="res_model">crm.case.section</field>
@@ -172,8 +193,8 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
-<!--        <menuitem action="crm_case_section_act_tree" id="menu_crm_case_section_act_tree" parent="next_id_52"/>-->
 
+<!-- CRM Email Add CC Form View  -->
 
        <record id="view_crm_email_add_cc_wizard" model="ir.ui.view">
             <field name="name">Add CC</field>
@@ -197,6 +218,8 @@
             </field>
         </record>
 
+<!-- CRM Email Add CC Action  -->
+
         <record id="action_view_crm_email_add_cc_wizard" model="ir.actions.act_window">
             <field name="name">Add CC</field>
             <field name="type">ir.actions.act_window</field>
@@ -206,9 +229,8 @@
             <field name="target">new</field>
         </record>
 
+<!-- Cases Tree View  -->
 
-
-        <!-- Cases -->
         <record id="crm_case_log_tree-view" model="ir.ui.view">
             <field name="name">crm.case.log.tree</field>
             <field name="model">crm.case.log</field>
@@ -225,6 +247,7 @@
             </field>
         </record>
 
+<!--Case History Tree View  -->
 
         <record id="crm_case_history_tree-view" model="ir.ui.view">
             <field name="name">crm.case.history.tree</field>
@@ -241,19 +264,24 @@
             </field>
         </record>
 
+<!-- Case Calendar View  -->
+
         <record id="crm_case_calendar-view" model="ir.ui.view">
             <field name="name">crm.case.calendar</field>
             <field name="model">crm.case</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
-                <calendar color="user_id" date_start="create_date" date_stop="date_deadline" day_length="12" string="Cases">
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="state"/>
+                <calendar color="user_id" date_start="create_date"
+                	date_stop="date_deadline" day_length="12"
+                	string="Cases">
+                	<field name="name" />
+                	<field name="partner_id" />
+                	<field name="state" />
                 </calendar>
             </field>
         </record>
 
+<!-- Case Tree View  -->
 
         <record id="crm_case_tree-view" model="ir.ui.view">
             <field name="name">crm.case.tree</field>
@@ -269,16 +297,29 @@
                     <field name="partner_id"/>
                     <field name="user_id"/>
                     <field name="state"/>
-                    <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-close"/>
-                    <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward"/>
-                    <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-                    <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause"/>
-                    <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up"/>
-                    <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
+                    <button name="case_close"
+                    	states="open,draft,pending" string="Close"
+                    	type="object" icon="gtk-close" />
+                    <button name="case_open" states="draft,pending"
+                    	string="Open" type="object" icon="gtk-go-forward" />
+                    <button name="case_cancel"
+                    	states="draft,open,pending" string="Cancel"
+                    	type="object" icon="gtk-cancel" />
+                    <button name="case_pending" states="draft,open"
+                    	string="Pending" type="object"
+                    	icon="gtk-media-pause" />
+                    <button name="case_escalate"
+                    	states="open,draft,pending" string="Escalate"
+                    	type="object" icon="gtk-go-up" />
+                    <button name="case_reset" states="done,cancel"
+                    	string="Reset to Draft" type="object"
+                    	icon="gtk-convert" />
                 </tree>
             </field>
         </record>
 
+<!-- Case Form View  -->
+
         <record id="crm_case-view" model="ir.ui.view">
             <field name="name">crm.case.form</field>
             <field name="model">crm.case</field>
@@ -294,25 +335,53 @@
                     <notebook colspan="4">
                         <page string="General">
                             <group col="8" colspan="4">
-                                <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
-                                <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
-                                <newline/>
-                                <field colspan="3" name="email_from" select="2"/>
-                                <button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
-                                <field name="user_id" select="1"/>
-                                <button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
+                                <field colspan="4" name="partner_id"
+                                	on_change="onchange_partner_id(partner_id, email_from)"
+                                	select="1" />
+                                <field colspan="3"
+                                	name="partner_address_id"
+                                	on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                	select="2" />
+                                <newline />
+                                <field colspan="3" name="email_from"
+                                	select="2" />
+                                <button name="remind_partner"
+                                	states="open,pending"
+                                	string="Send Reminder" type="object"
+                                	icon="gtk-go-forward" />
+                                <field name="user_id" select="1" />
+                                <button name="remind_user"
+                                	states="open,pending"
+                                	string="Send Reminder" type="object"
+                                	icon="gtk-go-forward" />
                             </group>
                             <separator colspan="4" string="Description"/>
                             <field name="description" colspan="4" nolabel="1"/>
                             <separator colspan="4"/>
                             <group col="8" colspan="4">
                                 <field name="state" select="1"/>
-                                <button name="case_close" states="open,draft,pending" string="Close" type="object" icon="gtk-close"/>
-                                <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward"/>
-                                <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-                                <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause"/>
-                                <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up"/>
-                                <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
+                                <button name="case_close"
+                                	states="open,draft,pending"
+                                	string="Close" type="object"
+                                	icon="gtk-close" />
+                                <button name="case_open"
+                                	states="draft,pending" string="Open"
+                                	type="object" icon="gtk-go-forward" />
+                                <button name="case_cancel"
+                                	states="draft,open,pending"
+                                	string="Cancel" type="object"
+                                	icon="gtk-cancel" />
+                                <button name="case_pending"
+                                	states="draft,open" string="Pending"
+                                	type="object" icon="gtk-media-pause" />
+                                <button name="case_escalate"
+                                	states="open,draft,pending"
+                                	string="Escalate" type="object"
+                                	icon="gtk-go-up" />
+                                <button name="case_reset"
+                                	states="done,cancel"
+                                	string="Reset to Draft" type="object"
+                                	icon="gtk-convert" />
                             </group>
                         </page>
                         <page string="History" groups="base.group_extended">
@@ -370,28 +439,37 @@
             </field>
         </record>
 
+<!-- Case Search View  -->
+
         <record id="view_crm_case_filter" model="ir.ui.view">
             <field name="name">crm.case.select</field>
             <field name="model">crm.case</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Case">
-                   <group col='6' colspan='4'>
-                       <filter icon="terp-partner" string="My Cases"
-                           domain="[('user_id','=',uid)]" separator="1"
-                           default="1" help="Cases Related to Current User"
-                       />
-                       <field name="state" select="1">
-                           <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Cases"/>
-                           <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Cases"/>
-                           <filter icon="gtk-media-pause" domain="[('state','=','pending')]" help="Pending Cases"/>
-                       </field>
-                       <separator orientation="vertical"/>
-                       <field name="name" select='1'/>
-                       <field name="user_id" select="1" widget="selection"/>
-                   </group>
-                     <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section"/>
-               </search>
+                	<group col='6' colspan='4'>
+                		<filter icon="terp-partner" string="My Cases"
+                			domain="[('user_id','=',uid)]" separator="1"
+                			default="1" help="Cases Related to Current User" />
+                		<field name="state" select="1">
+                			<filter icon="gtk-new"
+                				domain="[('state','in',('draft', 'open'))]"
+                				help="Current Cases" />
+                			<filter icon="gtk-yes"
+                				domain="[('state','=','open')]" help="Open Cases" />
+                			<filter icon="gtk-media-pause"
+                				domain="[('state','=','pending')]"
+                				help="Pending Cases" />
+                		</field>
+                		<separator orientation="vertical" />
+                		<field name="name" select='1' />
+                		<field name="user_id" select="1"
+                			widget="selection" />
+                	</group>
+                	<field name="section_id"
+                		default="context.get('section_id', False)" select="1"
+                		widget="selection" string="Section" />
+                </search>
             </field>
         </record>
 
@@ -402,13 +480,14 @@
             <field name="view_id" ref="crm_case_tree-view"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
-<!--        <menuitem action="crm_case_categ0-act" id="menu_crm_case_categ0-act" parent="crm.next_id_52"/>-->
 
         <record id="crm_case_categ0-act_open" model="ir.actions.act_window">
             <field name="name">Open Cases</field>
             <field name="res_model">crm.case</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]</field>
+            <field name="domain">
+            	[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]
+            </field>
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
 
@@ -427,6 +506,8 @@
             <field eval="True" name="object"/>
         </record>
 
+<!--Case History Form View  -->
+
         <record id="crm_case_history-view" model="ir.ui.view">
             <field name="name">crm.case.history.form</field>
             <field name="model">crm.case.history</field>
@@ -445,23 +526,32 @@
                 </form>
             </field>
         </record>
+
+<!--Case History Search View  -->
+
         <record id="crm_case_history_search" model="ir.ui.view">
         <field name="name">crm.case.history.select</field>
         <field name="model">crm.case.history</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
                 <search string="Search Histories">
-                       <filter icon="terp-crm" string="My Histories" domain="[('user_id','=',uid)]" help="My Histories"/>
+                       <filter icon="terp-crm" string="My Histories"
+                       	domain="[('user_id','=',uid)]"
+                       	help="My Histories" />
                        <separator orientation="vertical"/>
                      <group col="6" colspan="2">
                        <field name="date" select="1"/>
                     <field name="user_id" select="1" widget="selection"/>
-                     <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section"/>
-                    </group>
+                    <field name="section_id"
+                    	default="context.get('section_id', False)"
+                    	select="1" widget="selection" string="Section" />
+                     </group>
                 </search>
             </field>
         </record>
 
+<!--Case History Action -->
+
         <record id="crm_case_history-act" model="ir.actions.act_window">
             <field name="name">Histories</field>
             <field name="res_model">crm.case.history</field>
@@ -470,7 +560,8 @@
             <field name="view_id" ref="crm_case_history_tree-view"/>
             <field name="search_view_id" ref="crm_case_history_search"/>
         </record>
-<!--        <menuitem action="crm_case_history-act" id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/>-->
+
+<!-- Segmentation line Tree View  -->
 
         <record id="crm_segmentation_line_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.tree</field>
@@ -487,6 +578,8 @@
             </field>
         </record>
 
+<!-- Segmentation line Form View  -->
+
         <record id="crm_segmentation_line-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.form</field>
             <field name="model">crm.segmentation.line</field>
@@ -505,6 +598,8 @@
             </field>
         </record>
 
+<!-- CRM Segmentation  Form View  -->
+
         <record id="crm_segmentation-view" model="ir.ui.view">
             <field name="name">crm.segmentation.form</field>
             <field name="model">crm.segmentation</field>
@@ -533,13 +628,23 @@
                     </notebook>
                     <field name="state"/>
                     <group col="3" colspan="2">
-                        <button name="process_start" states="not running" string="Compute Segmentation" type="object" icon="gtk-execute"/>
-                        <button name="process_stop" states="running" string="Stop Process" type="object" icon="gtk-cancel"/>
-                        <button name="process_continue" states="running" string="Continue Process" type="object" icon="gtk-go-forward"/>
+                        <button name="process_start"
+                        	states="not running"
+                        	string="Compute Segmentation" type="object"
+                        	icon="gtk-execute" />
+                        <button name="process_stop" states="running"
+                        	string="Stop Process" type="object"
+                        	icon="gtk-cancel" />
+                        <button name="process_continue" states="running"
+                        	string="Continue Process" type="object"
+                        	icon="gtk-go-forward" />
                     </group>
                 </form>
             </field>
         </record>
+
+<!-- CRM Segmentation  Tree View  -->
+
         <record id="crm_segmentation_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.tree</field>
             <field name="model">crm.segmentation</field>
@@ -566,18 +671,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="crm_segmentation_tree-act" id="menu_crm_segmentation-act" parent="crm.menu_crm_configuration"/>
-<!---->
-<!--        <act_window domain="[('section_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_section_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.section" view_mode="tree,form,calendar" view_type="form"/>-->
-<!---->
-<!--        <act_window domain="[('categ_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_crm_case_categ_crm_case_opened" name="Open cases" res_model="crm.case" src_model="crm.case.categ" view_mode="tree,form,calendar" view_type="form"/>-->
-<!---->
-<!--        <act_window domain="[('partner_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner" view_mode="tree,form,calendar" view_type="form"/>-->
-<!---->
-<!--        <act_window domain="[('canal_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_partner_canal_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.partner.canal" view_mode="tree,form,calendar" view_type="form"/>-->
-<!---->
-<!--        <act_window domain="[('user_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_users_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.users" view_mode="tree,form,calendar" view_type="form"/>-->
-
+        <menuitem action="crm_segmentation_tree-act"
+        	id="menu_crm_segmentation-act"
+        	parent="crm.menu_crm_configuration" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
@@ -586,7 +682,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <page string="Current Activity" position="inside">
-                    <field name="context_section_id" completion="1" widget="selection" context="{'user_prefence':True}"/>
+                    <field name="context_section_id" completion="1"
+                    	widget="selection"
+                    	context="{'user_prefence':True}" />
                 </page>
             </field>
         </record>
@@ -604,6 +702,8 @@
                 </field>
         </record>
 
+<!-- Inherit View From Partner  -->
+
 		<record id="view_partners_form_crm1" model="ir.ui.view">
                 <field name="name">view.res.partner.form.crm.inherited1</field>
                 <field name="model">res.partner</field>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index ea6b704f5d8..53a8fd84347 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -42,3 +42,4 @@
 "access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,1,1,1
 "access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
 "access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1
+"access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index ae07471e07c..827ee867169 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    	
+
     	<!-- Opportunity to Phonecall view -->
-    	
+
         <record model="ir.ui.view" id="opportunity2phonecall_view">
             <field name="name">crm.opportunity2phonecall.form</field>
             <field name="model">crm.opportunity2phonecall</field>
@@ -25,9 +25,9 @@
                 </form>
             </field>
         </record>
-		
+
 		<!-- Opportunity to Phonecall action -->
-		
+
  		<record model="ir.actions.act_window" id="opportunity2phonecall_act">
             <field name="name">Schedule Call</field>
             <field name="res_model">crm.opportunity2phonecall</field>
@@ -35,8 +35,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="opportunity2phonecall_view"/>
             <field name="target">new</field>
-         	<field name="context">{'record_id' : active_id}</field>
         </record>
-        
+
     </data>
-</openerp>   
\ No newline at end of file
+</openerp>
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_opportunity_wizard.py b/addons/crm/wizard/crm_opportunity_wizard.py
deleted file mode 100644
index d7ec0b72cb6..00000000000
--- a/addons/crm/wizard/crm_opportunity_wizard.py
+++ /dev/null
@@ -1,264 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-import time
-
-from tools.translate import _
-
-class opportunity2phonecall(wizard.interface):
-    case_form = """<?xml version="1.0"?>
-                <form string="Schedule Phone Call">
-                    <separator string="Phone Call Description" colspan="4" />
-                    <newline />
-                    <field name='user_id' />
-                    <field name='deadline' />
-                    <newline />
-                    <field name='note' colspan="4"/>
-                    <newline />
-                    <field name='section_id' />    
-                    <field name='category_id' domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.phonecall')]"/>
-                </form>"""
-
-    case_fields = {
-        'user_id' : {'string' : 'Assign To', 'type' : 'many2one', 'relation' : 'res.users'},
-        'deadline' : {'string' : 'Planned Date', 'type' : 'datetime' ,'required' :True},
-        'note' : {'string' : 'Goals', 'type' : 'text'},
-        'category_id' : {'string' : 'Category', 'type' : 'many2one', 'relation' : 'crm.case.categ', 'required' :True},
-        'section_id' : {'string' : 'Section', 'type' : 'many2one', 'relation' : 'crm.case.section'},
-        
-    }
-    def _default_values(self, cr, uid, data, context):
-        case_obj = pooler.get_pool(cr.dbname).get('crm.opportunity')        
-        categ_id = pooler.get_pool(cr.dbname).get('crm.case.categ').search(cr, uid, [('name','=','Outbound')])            
-        case = case_obj.browse(cr, uid, data['id'])
-        if case.state != 'open':
-            raise wizard.except_wizard(_('Warning !'),
-                _('Opportunity should be in \'Open\' state before converting to Phone Call.'))
-            return {}
-        return {
-                'user_id' : case.user_id and case.user_id.id,
-                'category_id' : categ_id and categ_id[0] or case.categ_id and case.categ_id.id,
-                'section_id' : case.section_id and case.section_id.id or False,
-                'note' : case.description
-               }
-
-    def _doIt(self, cr, uid, data, context):
-        form = data['form']
-        pool = pooler.get_pool(cr.dbname)
-        mod_obj = pool.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        phonecall_case_obj = pool.get('crm.phonecall')
-        opportunity_case_obj = pool.get('crm.opportunity') 
-        # Select the view
-        
-        data_obj = pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-        opportunites = opportunity_case_obj.browse(cr, uid, data['ids'])
-        for opportunity in opportunites:            
-            new_case = phonecall_case_obj.create(cr, uid, {
-                    'name' : opportunity.name,
-                    'case_id' : opportunity.id,
-                    'user_id' : form['user_id'],
-                    'categ_id' : form['category_id'],
-                    'description' : form['note'],
-                    'date' : form['deadline'], 
-                    'section_id' : form['section_id'],
-                    'partner_id': opportunity.partner_id and opportunity.partner_id.id or False,
-                    'partner_address_id':opportunity.partner_address_id and opportunity.partner_address_id.id or False,
-                    'description': data['form']['note'] or opportunity.description,
-                    'partner_phone' : opportunity.phone or (opportunity.partner_address_id and opportunity.partner_address_id.phone or False),
-                    'partner_mobile' : opportunity.partner_address_id and opportunity.partner_address_id.mobile or False,
-                    'priority': opportunity.priority,
-                    'opportunity_id':opportunity.id
-            }, context=context)
-            vals = {}
-
-            phonecall_case_obj.case_open(cr, uid, [new_case])        
-            
-        value = {            
-            'name': _('Phone Call'),
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'crm.phonecall',
-            'res_id' : new_case,
-            'views': [(id3,'form'),(id2,'tree'),(False,'calendar'),(False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id']
-        }
-        return value
-
-    states = {
-        'init': {
-            'actions': [_default_values],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel','gtk-cancel'),('order', 'Schedule Phone Call','gtk-go-forward')]}
-        },
-        'order': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _doIt, 'state': 'end'}
-        }
-    }
-
-opportunity2phonecall('crm.opportunity.reschedule_phone_call')
-
-class opportunity2meeting(wizard.interface):
-
-    def _makeMeeting(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        opportunity_case_obj = pool.get('crm.opportunity')                
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-        id = data_obj.read(cr, uid, result, ['res_id'])
-        id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-        if id1:
-            id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        opportunity = opportunity_case_obj.browse(cr, uid, data['id'], context=context)
-        partner_id = opportunity.partner_id and opportunity.partner_id.id or False
-        name = opportunity.name
-        email = opportunity.email_from
-        section_id = opportunity.section_id and opportunity.section_id.id or False        
-        return {            
-            'name': _('Meetings'),
-            'domain' : "[('user_id','=',%s)]"%(uid),  
-            'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},
-            'view_type': 'form',
-            'view_mode': 'calendar,form,tree',
-            'res_model': 'crm.meeting',
-            'view_id': False,
-            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']
-            }
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
-        },
-        'order': {
-            'actions': [],
-            'result': {'type': 'state', 'state': 'end'}
-        }
-    }
-opportunity2meeting('crm.opportunity.meeting_set')
-
-class partner_opportunity(wizard.interface):
-
-    case_form = """<?xml version="1.0"?>
-                <form string="Create Opportunity">
-                    <field name="name"/>
-                    <field name="partner_id" readonly="1"/>
-                    <newline/>
-                    <field name="planned_revenue"/>
-                    <field name="probability"/>
-                </form>"""
-
-    case_fields = {
-        'name' : {'type' :'char', 'size' :64, 'string' :'Opportunity Name', 'required' :True}, 
-        'planned_revenue' : {'type' :'float', 'digits' :(16, 2), 'string' : 'Expected Revenue'}, 
-        'probability' : {'type' :'float', 'digits' :(16, 2), 'string' : 'Success Probability'}, 
-        'partner_id' : {'type' :'many2one', 'relation' :'res.partner', 'string' :'Partner'}, 
-    }
-
-    def _select_data(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        part_obj = pool.get('res.partner')
-        part = part_obj.read(cr, uid, data['id' ], ['name'])
-        return {'partner_id' : data['id'], 'name' : part['name'] }
-
-    def _make_opportunity(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        res = data_obj.read(cr, uid, result, ['res_id'])        
-
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        
-        part_obj = pool.get('res.partner')
-        address = part_obj.address_get(cr, uid, data['ids' ])
-        
-        
-        categ_obj = pool.get('crm.case.categ')
-        categ_ids = categ_obj.search(cr, uid, [('name','ilike','Part%')])
-
-        case_obj = pool.get('crm.opportunity')
-        opp_id = case_obj.create(cr, uid, {            
-            'name' : data['form']['name'], 
-            'planned_revenue' : data['form']['planned_revenue'], 
-            'probability' : data['form']['probability'], 
-            'partner_id' : data['form']['partner_id'], 
-            'partner_address_id' : address['default'],
-            'categ_id' : categ_ids[0],            
-            'state' :'draft', 
-        })
-        value = {            
-            'name' : _('Opportunity'), 
-            'view_type' : 'form', 
-            'view_mode' : 'form,tree', 
-            'res_model' : 'crm.opportunity', 
-            'res_id' : opp_id, 
-            'view_id' : False, 
-            'views' : [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')], 
-            'type' : 'ir.actions.act_window', 
-            'search_view_id' : res['res_id'] 
-        }
-        return value
-
-    states = {
-        'init' : {
-            'actions' : [_select_data], 
-            'result' : {'type' : 'form', 'arch' : case_form, 'fields' : case_fields, 
-                'state' : [('end', 'Cancel', 'gtk-cancel'), ('confirm', 'Create Opportunity', 'gtk-go-forward')]}
-        }, 
-        'confirm' : {
-            'actions' : [], 
-            'result' : {'type' : 'action', 'action' : _make_opportunity, 'state' : 'end'}
-        }
-    }
-
-partner_opportunity('crm.case.opportunity.partner_opportunity')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index e925d9ef330..fd62b3a21ca 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -56,7 +56,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
 
         if record_id:
             data_obj = self.pool.get('ir.model.data')
-            
+
             # Get Phonecall views
             result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
             res = data_obj.read(cr, uid, result, ['res_id'])
@@ -71,16 +71,16 @@ class crm_phonecall2phonecall(osv.osv_memory):
 
             for this in self.browse(cr, uid, ids, context=context):
                 values = {
-                        'name': this.name, 
-                        'user_id': this.user_id and this.user_id.id, 
-                        'categ_id': phonecall.categ_id and phonecall.categ_id.id or False, 
-                        'section_id': phonecall.section_id and phonecall.section_id.id, 
-                        'description': phonecall.description or '', 
-                        'partner_id': phonecall.partner_id.id, 
-                        'partner_address_id': phonecall.partner_address_id.id, 
-                        'partner_mobile': phonecall.partner_mobile or False, 
-                        'priority': phonecall.priority, 
-                        'partner_phone': phonecall.partner_phone or False, 
+                        'name': this.name,
+                        'user_id': this.user_id and this.user_id.id,
+                        'categ_id': phonecall.categ_id and phonecall.categ_id.id or False,
+                        'section_id': phonecall.section_id and phonecall.section_id.id,
+                        'description': phonecall.description or '',
+                        'partner_id': phonecall.partner_id.id,
+                        'partner_address_id': phonecall.partner_address_id.id,
+                        'partner_mobile': phonecall.partner_mobile or False,
+                        'priority': phonecall.priority,
+                        'partner_phone': phonecall.partner_phone or False,
                         'date': this.date
                           }
                 phonecall_id = phonecall_obj.create(cr, uid, values, context=context)
@@ -103,7 +103,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
                 'date': fields.datetime('Date'),
                 'section_id':fields.many2one('crm.case.section','Sales Team'),
                 }
-    
+
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
@@ -117,8 +117,10 @@ class crm_phonecall2phonecall(osv.osv_memory):
         """
         res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
+
         if record_id:
             phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
+
             if 'name' in fields:
                 res.update({'name': phonecall.name})
             if 'user_id' in fields:

From cba4252584a46f8d8ab2ee72a51b8157765c2c39 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 22 Mar 2010 16:13:05 +0530
Subject: [PATCH 102/248] [IMP]: base_report_creator:  Minor Improvments

bzr revid: atp@tinyerp.co.in-20100322104305-qde3uo9qvua1d7aj
---
 addons/base_report_creator/wizard/report_open_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base_report_creator/wizard/report_open_view.xml b/addons/base_report_creator/wizard/report_open_view.xml
index 7fcd413af00..337aa988ca5 100644
--- a/addons/base_report_creator/wizard/report_open_view.xml
+++ b/addons/base_report_creator/wizard/report_open_view.xml
@@ -17,7 +17,7 @@
                     	<button icon="gtk-open" string="Open Report"
                     		name="open_report" type="object" />
                     </group>
-               </form>
+                </form>
             </field>
   		</record>
   		
@@ -26,8 +26,8 @@
             <field name="res_model">report.open</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_report_open"/> 
-           <field name="target">new</field>
+            <field name="view_id" ref="view_report_open"/> 
+            <field name="target">new</field>
         </record>
         
     </data>

From 8c03506d577ba03899f9f386d07441ef04adb4ad Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 22 Mar 2010 16:32:51 +0530
Subject: [PATCH 103/248] [ADD]: partner_crm: Added new module that adds more
 information in the partner form

bzr revid: rpa@tinyerp.com-20100322110251-pe13fro4qsl2o3ch
---
 addons/partner_crm/__init__.py                | 25 +++++++++
 addons/partner_crm/__terp__.py                | 55 +++++++++++++++++++
 addons/partner_crm/partner_crm.py             | 40 ++++++++++++++
 addons/partner_crm/partner_crm_view.xml       | 35 ++++++++++++
 .../partner_crm/security/ir.model.access.csv  | 10 ++++
 5 files changed, 165 insertions(+)
 create mode 100644 addons/partner_crm/__init__.py
 create mode 100644 addons/partner_crm/__terp__.py
 create mode 100644 addons/partner_crm/partner_crm.py
 create mode 100644 addons/partner_crm/partner_crm_view.xml
 create mode 100644 addons/partner_crm/security/ir.model.access.csv

diff --git a/addons/partner_crm/__init__.py b/addons/partner_crm/__init__.py
new file mode 100644
index 00000000000..4dd1f496527
--- /dev/null
+++ b/addons/partner_crm/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import partner_crm
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/partner_crm/__terp__.py b/addons/partner_crm/__terp__.py
new file mode 100644
index 00000000000..3c6dc358dbf
--- /dev/null
+++ b/addons/partner_crm/__terp__.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+
+{
+    'name': 'Detailed info on partner form', 
+    'version': '1.0', 
+    'category': 'Generic Modules/Base', 
+    'description': """
+This module adds the following one2many fields on the bottom partner form:
+
+    * Opportunities
+    * Meetings
+    * Phone Calls
+    * Invoices (=invoice.line )
+       - group by product_id
+    * Contracts (= analytic.account)
+    * Timesheets (= partner_id of the analytic account linked to this timesheet)
+        - group by date
+
+It allows a salesman to have a direct overlook at all events related to this partner directly from the partner form.
+Take care of security rules, add security (read, not write/create/delete) on the group that give access to partners for the objects defined above.
+    """, 
+    'author': 'Tiny', 
+    'website': 'http://www.openerp.com', 
+    'depends': ['crm', 'account_analytic_analysis'], 
+    'init_xml': [], 
+    'update_xml': [
+                   'security/ir.model.access.csv', 
+                   'partner_crm_view.xml'
+                   ], 
+    'demo_xml': [], 
+    'installable': True, 
+    'active': False, 
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/partner_crm/partner_crm.py b/addons/partner_crm/partner_crm.py
new file mode 100644
index 00000000000..4b73acd8b5e
--- /dev/null
+++ b/addons/partner_crm/partner_crm.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv, fields
+
+class res_partner(osv.osv):
+    """ Inherits partner and adds more information in the partner form """
+    _inherit = 'res.partner'
+    
+    _columns = {
+                'opportunity_ids': fields.one2many('crm.opportunity', 'partner_id', 'Opportunities'), 
+                'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
+                                                     'Meetings'), 
+                'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
+                'invoice_ids': fields.one2many('account.invoice', 'partner_id', 'Invoices'), 
+                'contract_ids': fields.one2many('account.analytic.account', \
+                                                    'partner_id', 'Contracts'), 
+                }
+
+res_partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/partner_crm/partner_crm_view.xml b/addons/partner_crm/partner_crm_view.xml
new file mode 100644
index 00000000000..fa07abdb877
--- /dev/null
+++ b/addons/partner_crm/partner_crm_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<record id="view_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.form.info.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                	<page string="Other Info">
+                		<group col="2" colspan="4">
+							<separator colspan="4" string="Opportunities" />
+							<field name="opportunity_ids" colspan="4" nolabel="1" />
+							<separator colspan="4" string="Meetings" />
+							<field name="meeting_ids" colspan="4" nolabel="1" />
+							<separator colspan="4" string="Phonecalls" />
+							<field name="phonecall_ids" colspan="4" nolabel="1" />
+                		</group>
+                		<group col="2" colspan="4">
+							<separator colspan="4" string="Invoices"/>
+							<field name="invoice_ids" colspan="4" nolabel="1" />
+						</group>
+						<group col="2" colspan="4">
+							<separator colspan="4" string="Contracts"/>
+							<field name="contract_ids" colspan="4" nolabel="1" />
+						</group>
+					</page>
+                </notebook>
+            </field>
+        </record>
+
+	</data>
+</openerp>
diff --git a/addons/partner_crm/security/ir.model.access.csv b/addons/partner_crm/security/ir.model.access.csv
new file mode 100644
index 00000000000..3278d468265
--- /dev/null
+++ b/addons/partner_crm/security/ir.model.access.csv
@@ -0,0 +1,10 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_crm_opportunity_partner","crm.opportunity","crm.model_crm_opportunity","base.group_user",1,0,0,0
+"access_crm_meeting_partner_manager","crm.meeting","crm.model_crm_meeting","base.group_partner_manager",1,0,0,0
+"access_crm_meeting_user","crm.meeting","crm.model_crm_meeting","base.group_user",1,0,0,0
+"access_crm_phonecall_partner_manager","crm.phonecall","crm.model_crm_phonecall","base.group_partner_manager",1,0,0,0
+"access_crm_phonecall_user","crm.phonecall","crm.model_crm_phonecall","base.group_user",1,0,0,0
+"access_invoice_partner_manager","account.invoice","account.model_account_invoice","base.group_partner_manager",1,0,0,0
+"access_invoice_user","account.invoice","account.model_account_invoice","base.group_user",1,0,0,0
+"access_analytic_account_partner_manager","account.analytic.account","account_analytic_analysis.model_account_analytic_account","base.group_partner_manager",1,0,0,0
+"access_analytic_account_user","account.analytic.account","account_analytic_analysis.model_account_analytic_account","base.group_user",1,0,0,0

From 4b4b4476ed975af9a360bd41b61a2691f6909dfa Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 16:38:02 +0530
Subject: [PATCH 104/248] [IMP] survey :- convert simple wizard(survey_print)
 to osv_memory wizard, and add comment.

bzr revid: ysa@tinyerp.co.in-20100322110802-u42cr2vuqcewe7z2
---
 addons/survey/__terp__.py                     |   3 +-
 addons/survey/survey_view.xml                 |   2 -
 addons/survey/survey_wizard.xml               |   3 -
 addons/survey/wizard/__init__.py              |   2 +-
 addons/survey/wizard/survey_answer.py         | 146 +++++++++++++++++-
 addons/survey/wizard/survey_browse_answer.py  |  19 ++-
 addons/survey/wizard/survey_print.py          |  68 ++++++++
 addons/survey/wizard/survey_print.xml         |  43 ++++++
 addons/survey/wizard/survey_print_answer.py   |  10 ++
 .../survey/wizard/survey_print_statistics.py  |  10 ++
 addons/survey/wizard/survey_selection.py      |  40 +++++
 addons/survey/wizard/wizard_print_survey.py   |  72 ---------
 12 files changed, 336 insertions(+), 82 deletions(-)
 create mode 100644 addons/survey/wizard/survey_print.py
 create mode 100644 addons/survey/wizard/survey_print.xml
 delete mode 100644 addons/survey/wizard/wizard_print_survey.py

diff --git a/addons/survey/__terp__.py b/addons/survey/__terp__.py
index 1074d429f62..a06216b362d 100644
--- a/addons/survey/__terp__.py
+++ b/addons/survey/__terp__.py
@@ -41,7 +41,8 @@
                    'security/ir.model.access.csv',
                    'wizard/survey_print_statistics.xml',
                    'wizard/survey_print_answer.xml',
-                   'wizard/survey_browse_answer.xml'],
+                   'wizard/survey_browse_answer.xml',
+                   'wizard/survey_print.xml'],
     'demo_xml': ['survey_demo.xml'],
     'installable': True,
     'active': False,
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 0f0a482604f..2032ed8ffe4 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -243,8 +243,6 @@
                         string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
 					<button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                         string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
-					<button name="%(wizard_print_survey)d" states="open,draft,close,cancel"
-                                	string="Print Survey" type="action" icon="gtk-print" context="{'active':True,'survey_id': active_id}"/>
 					<button name="%(survey_browse_response)d" states="open,draft,close,cancel"
                                 	string="Print Answer" type="action" icon="gtk-print"/>
                 </tree>
diff --git a/addons/survey/survey_wizard.xml b/addons/survey/survey_wizard.xml
index 2bc7b7d1910..1654a426b46 100644
--- a/addons/survey/survey_wizard.xml
+++ b/addons/survey/survey_wizard.xml
@@ -5,8 +5,5 @@
 		<wizard string="Send Invitation" id="wizard_send_invitation"
 			model="survey" name="wizard.send.invitation"/>
 
-		<wizard string="Print Survey" id="wizard_print_survey"
-			model="survey" name="wizard.print.survey"/>
-
 	</data>
 </openerp>
diff --git a/addons/survey/wizard/__init__.py b/addons/survey/wizard/__init__.py
index 9ff781484e2..5221f26db0e 100755
--- a/addons/survey/wizard/__init__.py
+++ b/addons/survey/wizard/__init__.py
@@ -21,11 +21,11 @@
 ##############################################################################
 
 import wizard_survey
-import wizard_print_survey
 import survey_print_statistics
 import survey_print_answer
 import survey_browse_answer
 import survey_selection
 import survey_answer
+import survey_print
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 66da955430c..b8a1ce93266 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -36,6 +36,17 @@ class survey_question_wiz(osv.osv_memory):
         'name': fields.integer('Number'),
     }
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+        """
+            Fields View Get method :- generate the new view and display the survey pages of selected survey. 
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param view_id : view id of the current object.
+            @param view_type : which type of view is create. like :- form, tree ,search etc...
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for created view of particular survey pages.
+        """
         result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
         surv_name_wiz = self.pool.get('survey.name.wiz')
         survey_obj = self.pool.get('survey')
@@ -401,6 +412,18 @@ class survey_question_wiz(osv.osv_memory):
         return result
 
     def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
+        """
+           If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Response' set True in survey  then send mail on responsible person of this survey and attach survey answer report in pdf format.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param res_ids: List of survey answer IDs,
+            @param report_name: name of the report,
+            @param file_name: To give file name of the report,
+            @param context: A standard dictionary for contextual values,
+            @return : Dictionary value for created report with file name.
+        """
         if not report_name or not res_ids:
             return (False, Exception('Report name and Resources ids are required !!!'))
         try:
@@ -418,6 +441,16 @@ class survey_question_wiz(osv.osv_memory):
         return (True, ret_file_name)
 
     def default_get(self, cr, uid, fields_list, context=None):
+        """
+            Assign Default value in particular field. If Browse Answers wizard run then read the value into database and Assigne to a particular fields.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param fields_list: List of fields of current view,
+            @param context: A standard dictionary for contextual values,
+            @return : Dictionary value for fields list with value.
+        """
         value = {}
         for field in fields_list:
             if field.split('_')[0] == 'progress':
@@ -488,6 +521,16 @@ class survey_question_wiz(osv.osv_memory):
         return value
 
     def create(self, cr, uid, vals, context=None):
+        """
+            Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param vals: Values,
+            @param context: A standard dictionary for contextual values
+            @return : True.
+        """
         if context.has_key('active') and context.get('active',False):
             return True
 
@@ -719,7 +762,7 @@ class survey_question_wiz(osv.osv_memory):
                     if not select_count:
                         resp_obj.write(cr, uid, resp_id, {'state':'skip'})
 
-                    if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
+                    if que_rec[also'numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
@@ -936,6 +979,16 @@ class survey_question_wiz(osv.osv_memory):
         return True
 
     def action_new_question(self,cr, uid, ids, context):
+        """
+            New survey.Question form.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.question.wiz IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for Open new survey.Qestion form.
+        """
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -951,6 +1004,16 @@ class survey_question_wiz(osv.osv_memory):
                 }
 
     def action_new_page(self, cr, uid, ids, context):
+        """
+            New survey.Page form.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.question.wiz IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for Open new survey.page form.
+        """
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -966,6 +1029,16 @@ class survey_question_wiz(osv.osv_memory):
                 }
 
     def action_edit_page(self,cr, uid, ids, context):
+        """
+            Edit survey.page.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.question.wiz IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for Open Edit survey.page form.
+        """
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -982,6 +1055,16 @@ class survey_question_wiz(osv.osv_memory):
                 }
 
     def action_delete_page(self,cr, uid, ids, context):
+        """
+            Delete survey.page.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.question.wiz IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for Open next survey.page form, but delete the selected page.
+        """
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -1001,6 +1084,16 @@ class survey_question_wiz(osv.osv_memory):
                 }
 
     def action_edit_question(self,cr, uid, ids, context):
+        """
+            Edit survey.question.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.question.wiz IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for Open Edit survey.question form.
+        """
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -1017,6 +1110,16 @@ class survey_question_wiz(osv.osv_memory):
                 }
 
     def action_delete_question(self,cr, uid, ids, context):
+        """
+            Edit survey.question.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.question.wiz IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for Open same survey.page form, but delete the selected survey.question in current survey.page.
+        """
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -1037,6 +1140,16 @@ class survey_question_wiz(osv.osv_memory):
                 }
 
     def action_forward_previous(self, cr, uid, ids, context=None):
+        """
+            Goes to previous Survey Answer.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.question.wiz IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for Open Previous Answer form.
+        """
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
@@ -1056,6 +1169,16 @@ class survey_question_wiz(osv.osv_memory):
                 }
 
     def action_forward_next(self, cr, uid, ids, context=None):
+        """
+            Goes to Next Survey Answer.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.question.wiz IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for Open Next Answer form.
+        """
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
@@ -1075,6 +1198,16 @@ class survey_question_wiz(osv.osv_memory):
                 }
 
     def action_next(self, cr, uid, ids, context=None):
+        """
+            Goes to Next page.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.question.wiz IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for Open Next survey.page form.
+        """
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
@@ -1090,6 +1223,16 @@ class survey_question_wiz(osv.osv_memory):
                 }
 
     def action_previous(self, cr, uid, ids, context=None):
+        """
+            Goes to previous page.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.question.wiz IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for Open Previous survey.page form.
+        """
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
@@ -1106,5 +1249,4 @@ class survey_question_wiz(osv.osv_memory):
 
 survey_question_wiz()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index 120585c72a4..ba467bcea9a 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -26,8 +26,15 @@ from tools.translate import _
 
 class survey_browse_answer(osv.osv_memory):
     _name = 'survey.browse.answer'
-
     def _get_survey(self, cr, uid, context=None):
+        """
+            Set the value in survey_id field,
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param context: A standard dictionary for contextual values,
+            @return : Tuple in list with values.
+        """        
         surv_obj = self.pool.get("survey")
         surv_resp_obj = self.pool.get("survey.response")
         result = []
@@ -42,6 +49,16 @@ class survey_browse_answer(osv.osv_memory):
     }
 
     def action_next(self, cr, uid, ids, context=None):
+        """
+            Open Browse Response wizard. if you select only survey_id then this wizard open with all response_ids and if you select survey_id and response_id then open the particular response of the survey.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of survey.browse.answer IDs,
+            @param context: A standard dictionary for contextual values,
+            @return : Dictionary value for Open the browse answer wizard.
+        """
         record = self.read(cr, uid, ids, [])
         record = record and record[0] or {} 
         if record['response_id']:
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
new file mode 100644
index 00000000000..b4fb91441a1
--- /dev/null
+++ b/addons/survey/wizard/survey_print.py
@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class survey_print(osv.osv_memory):
+    _name = 'survey.print'
+    _columns = {
+        'orientation' : fields.selection([('vertical','Portrait(Vertical)'),('horizontal','Landscape(Horizontal)')], 'Orientation'),
+        'paper_size' : fields.selection([('letter','Letter (8.5" x 11")'),('legal','Legal (8.5" x 14")'),('a4','A4 (210mm x 297mm)')], 'Paper Size'),
+        'survey_title' : fields.boolean('Include Survey Title'),
+        'page_number' : fields.boolean('Include Page Numvers'),
+        'without_pagebreak' : fields.boolean('Print Without Page Breaks'),
+    }
+
+    _defaults = {
+            'orientation': lambda *a:'vertical',
+            'paper_size': lambda *a:'letter',
+            'survey_title':lambda *a: 0,
+            'page_number':lambda *a: 0,
+            'without_pagebreak':lambda *a: 0
+    }
+
+    def action_next(self, cr, uid, ids, context=None):
+        """
+           Print Survey Form(print template of the survey).
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Survey IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for print survey form.
+        """
+        datas = {'ids' : context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size', 'page_number', 'without_pagebreak'], context)
+        res = res and res[0] or {}  
+        datas['form'] = res
+        datas['model'] = 'survey.print'
+        return { 
+                    'type':'ir.actions.report.xml',
+                    'report_name':'survey.form',
+                    'datas':datas,               
+               }
+
+survey_print()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
new file mode 100644
index 00000000000..e5a42e17103
--- /dev/null
+++ b/addons/survey/wizard/survey_print.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!-- Survey Print Form View -->
+				 
+		<record id="view_survey_print" model="ir.ui.view">
+			<field name="name">Survey Print</field>
+			<field name="model">survey.print</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Survey Print">
+				    <separator string="Print Option" colspan="4"/>
+				    <field name="orientation" colspan="4"/>
+				    <field name="paper_size" colspan="4"/>
+				    <field name="survey_title" colspan="4"/>
+				    <field name="page_number" colspan="4"/>
+				    <field name="without_pagebreak" colspan="4"/>
+					<separator colspan="4" />
+					<label align="0.0" colspan="2" string="" />
+					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+					<button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
+				</form>
+			</field>
+		</record>
+
+		<!-- Survey Print action -->
+
+		<record id="action_view_survey_print" model="ir.actions.act_window">
+			<field name="name">Print Survey</field>
+			<field name="res_model">survey.print</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+		</record>
+
+    	<act_window id="action_act_view_survey_print"
+    		key2="client_action_multi" name="Print Survey"
+    		res_model="survey.print" src_model="survey"
+    		view_mode="form" target="new" view_type="form" />
+
+	</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
index 3057836d559..ee4243ab2d5 100644
--- a/addons/survey/wizard/survey_print_answer.py
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -41,6 +41,16 @@ class survey_print_answer(osv.osv_memory):
     }
 
     def action_next(self, cr, uid, ids, context=None):
+        """
+           Print Survey Answer in pdf format.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of print answer IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for created survey answer report
+        """
         datas = {'ids' : context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size', 'page_number', 'without_pagebreak'], context)
         res = res and res[0] or {}  
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index 078f94878b0..55da0a99bfd 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -30,6 +30,16 @@ class survey_print_statistics(osv.osv_memory):
     }
 
     def action_next(self, cr, uid, ids, context=None):
+        """
+           Print Survey Statistics in pdf format.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Survey statistics IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for created survey statistics report
+        """
         datas = {'ids' : context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['survey_ids'], context)
         res = res and res[0] or {}  
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 668ca8b63d9..5282eae794b 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -27,6 +27,16 @@ class survey_name_wiz(osv.osv_memory):
     _name = 'survey.name.wiz'
 
     def default_get(self, cr, uid, fields, context={}):
+        """
+            Set the default value in survey_id field. if open this wizard in survey form then set the default value in survey_id = active survey id.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param fields: List of Survey statistics IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for created survey statistics report
+        """
         if not context:
             context = {}
         data = super(survey_name_wiz, self).default_get(cr, uid, fields, context)
@@ -35,6 +45,16 @@ class survey_name_wiz(osv.osv_memory):
         return data
 
     def _get_survey(self, cr, uid, context=None):
+        """
+            Set the value In survey_id field. 
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Survey statistics IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for created survey statistics report
+        """
         surv_obj = self.pool.get("survey")
         result = []
         if context.has_key('survey_id'):
@@ -69,6 +89,16 @@ class survey_name_wiz(osv.osv_memory):
     }
 
     def action_next(self, cr, uid, ids, context=None):
+        """
+            Start the survey, Increment in started survey field but if set the max_response_limit of survey then check the current user how many times start this survey. if current user max_response_limit is reach then this user can not start this survey(Raise Exception).
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Survey IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary value for open survey question wizard.
+        """
         survey_obj = self.pool.get('survey')
         search_obj = self.pool.get('ir.ui.view')
 
@@ -100,6 +130,16 @@ class survey_name_wiz(osv.osv_memory):
          }
 
     def on_change_survey(self, cr, uid, ids, survey_id, context=None):
+        """
+            on change event of survey_id field, if note is available in selected survey then display this note in note fields.
+           
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Survey IDs
+            @param context: A standard dictionary for contextual values
+            @return : Dictionary values of notes fields.
+        """
         notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note']
         return {'value': {'note' : notes}}
 
diff --git a/addons/survey/wizard/wizard_print_survey.py b/addons/survey/wizard/wizard_print_survey.py
deleted file mode 100644
index ec63726e3ef..00000000000
--- a/addons/survey/wizard/wizard_print_survey.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import time
-import pooler
-from random import choice
-import string
-import tools
-from tools.translate import _
-
-_survey_form = '''<?xml version="1.0"?>
-<form string="Print Survey">
-    <separator string="Print Option" colspan="4"/>
-    <field name="orientation" colspan="4"/>
-    <field name="paper_size" colspan="4"/>
-    <field name="survey_title" colspan="4"/>
-    <field name="page_number" colspan="4"/>
-    <field name="without_pagebreak" colspan="4"/>
-</form>'''
-
-_survey_fields = {
-    'orientation':{
-        'string':"Orientation",
-        'type':'selection',
-        'selection':[('vertical','Portrait(Vertical)'),
-                     ('horizontal','Landscape(Horizontal)')],
-        'default': lambda *a:'vertical'},
-    'paper_size':{
-        'string':"Paper Size",
-        'type':'selection',
-        'selection':[('letter','Letter (8.5" x 11")'),
-                     ('legal','Legal (8.5" x 14")'),
-                     ('a4','A4 (210mm x 297mm)')],
-        'default': lambda *a:'letter'},
-    'survey_title': {'string':'Include Survey Title', 'type':'boolean', 'default':lambda *a: 0},
-    'page_number': {'string':'Include Page Numbers', 'type':'boolean', 'default':lambda *a: 0},
-    'without_pagebreak': {'string':'Print Without Page Breaks', 'type':'boolean', 'default':lambda *a: 0},
-    }
-
-class print_survey_wizard(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form', 'arch' :_survey_form, 'fields' :_survey_fields,\
-                             'state' : [('end', 'Cancel', 'gtk-cancel'), ('print', 'Print', 'gtk-print')]}
-                },
-        'print': {
-            'actions': [],
-            'result': {'type':'print', 'report':'survey.form', 'state':'end'}
-        }
-    }
-print_survey_wizard('wizard.print.survey')

From 387f1834ac8a731593464f3897dad0eb280620e1 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 22 Mar 2010 16:45:53 +0530
Subject: [PATCH 105/248] [IMP]: partner_crm: Improved description

bzr revid: rpa@tinyerp.com-20100322111553-l168ijndtbpclsz1
---
 addons/partner_crm/__terp__.py          | 13 ++++++-------
 addons/partner_crm/partner_crm_view.xml |  4 +++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/partner_crm/__terp__.py b/addons/partner_crm/__terp__.py
index 3c6dc358dbf..d5bc49b1e5c 100644
--- a/addons/partner_crm/__terp__.py
+++ b/addons/partner_crm/__terp__.py
@@ -25,19 +25,18 @@
     'version': '1.0', 
     'category': 'Generic Modules/Base', 
     'description': """
-This module adds the following one2many fields on the bottom partner form:
+This module allows a salesman to have a direct overlook at all events related to this partner directly from the partner form.
+
+It adds the following fields on the partner form:
 
     * Opportunities
     * Meetings
     * Phone Calls
-    * Invoices (=invoice.line )
+    * Invoices
        - group by product_id
-    * Contracts (= analytic.account)
-    * Timesheets (= partner_id of the analytic account linked to this timesheet)
-        - group by date
+    * Contracts
+    * Timesheets
 
-It allows a salesman to have a direct overlook at all events related to this partner directly from the partner form.
-Take care of security rules, add security (read, not write/create/delete) on the group that give access to partners for the objects defined above.
     """, 
     'author': 'Tiny', 
     'website': 'http://www.openerp.com', 
diff --git a/addons/partner_crm/partner_crm_view.xml b/addons/partner_crm/partner_crm_view.xml
index fa07abdb877..a614617382f 100644
--- a/addons/partner_crm/partner_crm_view.xml
+++ b/addons/partner_crm/partner_crm_view.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
+		<!--  Partners inherited form -->
+
 		<record id="view_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.form.info.inherit</field>
             <field name="model">res.partner</field>

From e5db1aa21b0e9b3962f740be40ec364db04a8279 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 22 Mar 2010 17:06:32 +0530
Subject: [PATCH 106/248] [IMP]: partner_crm: Added group by for product in
 invoice on partner

bzr revid: rpa@tinyerp.com-20100322113632-dio9uuql2zezxlvb
---
 addons/partner_crm/partner_crm.py       | 2 +-
 addons/partner_crm/partner_crm_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/partner_crm/partner_crm.py b/addons/partner_crm/partner_crm.py
index 4b73acd8b5e..2162f850115 100644
--- a/addons/partner_crm/partner_crm.py
+++ b/addons/partner_crm/partner_crm.py
@@ -30,7 +30,7 @@ class res_partner(osv.osv):
                 'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
                                                      'Meetings'), 
                 'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
-                'invoice_ids': fields.one2many('account.invoice', 'partner_id', 'Invoices'), 
+                'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'), 
                 'contract_ids': fields.one2many('account.analytic.account', \
                                                     'partner_id', 'Contracts'), 
                 }
diff --git a/addons/partner_crm/partner_crm_view.xml b/addons/partner_crm/partner_crm_view.xml
index a614617382f..1df3abedf62 100644
--- a/addons/partner_crm/partner_crm_view.xml
+++ b/addons/partner_crm/partner_crm_view.xml
@@ -22,7 +22,7 @@
                 		</group>
                 		<group col="2" colspan="4">
 							<separator colspan="4" string="Invoices"/>
-							<field name="invoice_ids" colspan="4" nolabel="1" />
+							<field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
 						</group>
 						<group col="2" colspan="4">
 							<separator colspan="4" string="Contracts"/>

From e2c90a5eee7edfae7c24ff13daf35dda6b3da8de Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Mon, 22 Mar 2010 17:47:16 +0530
Subject: [PATCH 107/248] [REVIEW]: code review

bzr revid: mga@mga-20100322121716-uf3u13102vwcqps0
---
 addons/survey/wizard/survey_answer.py | 50 ++++++++++++++++-----------
 addons/survey/wizard/survey_print.py  | 42 +++++++++++-----------
 2 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index b8a1ce93266..4f8849079b0 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -1,3 +1,5 @@
+
+
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
@@ -19,16 +21,17 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-from osv import fields, osv
+import os
 import datetime
-from tools.translate import _
 from lxml import etree
-from tools import to_xml
 from time import strftime
+
 import tools
 import netsvc
-import os
+from osv import osv
+from osv import fields
+from tools import to_xml
+from tools.translate import _
 
 class survey_question_wiz(osv.osv_memory):
     _name = 'survey.question.wiz'
@@ -37,17 +40,19 @@ class survey_question_wiz(osv.osv_memory):
     }
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
         """
-            Fields View Get method :- generate the new view and display the survey pages of selected survey. 
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param view_id : view id of the current object.
-            @param view_type : which type of view is create. like :- form, tree ,search etc...
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for created view of particular survey pages.
+        Fields View Get method :- generate the new view and display the survey pages of selected survey. 
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param view_id : view id of the current object.
+        @param view_type : which type of view is create. like :- form, tree ,search etc...
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for created view of particular survey pages.
         """
+        
         result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
+        
         surv_name_wiz = self.pool.get('survey.name.wiz')
         survey_obj = self.pool.get('survey')
         page_obj = self.pool.get('survey.page')
@@ -61,22 +66,25 @@ class survey_question_wiz(osv.osv_memory):
             wiz_id = 0
             if not context.has_key('sur_name_id'):
                 res_data = {
-                        'survey_id' : context.get('survey_id', False),
-                        'page_no' :-1,
-                        'page':'next',
-                        'transfer' :1,
-                        'response':0
+                    'survey_id' : context.get('survey_id', False),
+                    'page_no' :-1,
+                    'page':'next',
+                    'transfer' :1,
+                    'response':0
                 }
                 wiz_id = surv_name_wiz.create(cr, uid, res_data)
+                #TODO: change to the browse, use read if only need to read few columns values
                 sur_name_rec = surv_name_wiz.read(cr, uid, wiz_id, [])
                 context.update({'sur_name_id' :wiz_id})
             else:
-                sur_name_rec = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
+                sur_name_rec = surv_name_wiz.read(cr, uid, context.get('sur_name_id', False))
 
             if context.has_key('active_id'):
                 context.pop('active_id')
 
             survey_id = context.get('survey_id', False)
+            #TODO: change to the browse, use read if only need to read few columns values
+            # this will fire select * from quary 
             sur_rec = survey_obj.read(cr, uid, survey_id, [])
             p_id = sur_rec['page_ids']
             total_pages = len(p_id)
@@ -1249,4 +1257,4 @@ class survey_question_wiz(osv.osv_memory):
 
 survey_question_wiz()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index b4fb91441a1..ef82e1eaf87 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -1,3 +1,4 @@
+
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
@@ -20,7 +21,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
+from osv import fields
 from tools.translate import _
 
 class survey_print(osv.osv_memory):
@@ -34,35 +36,35 @@ class survey_print(osv.osv_memory):
     }
 
     _defaults = {
-            'orientation': lambda *a:'vertical',
-            'paper_size': lambda *a:'letter',
-            'survey_title':lambda *a: 0,
-            'page_number':lambda *a: 0,
-            'without_pagebreak':lambda *a: 0
+        'orientation': lambda *a:'vertical',
+        'paper_size': lambda *a:'letter',
+        'survey_title':lambda *a: 0,
+        'page_number':lambda *a: 0,
+        'without_pagebreak':lambda *a: 0
     }
 
     def action_next(self, cr, uid, ids, context=None):
         """
-           Print Survey Form(print template of the survey).
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of Survey IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for print survey form.
+        Print Survey Form(print template of the survey).
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Survey IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for print survey form.
         """
+        
         datas = {'ids' : context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size', 'page_number', 'without_pagebreak'], context)
         res = res and res[0] or {}  
         datas['form'] = res
         datas['model'] = 'survey.print'
         return { 
-                    'type':'ir.actions.report.xml',
-                    'report_name':'survey.form',
-                    'datas':datas,               
-               }
-
+            'type':'ir.actions.report.xml',
+            'report_name':'survey.form',
+            'datas':datas,               
+        }
 survey_print()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From c68024b10b1468973d00470dc08659c4d183bb02 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Mon, 22 Mar 2010 18:06:17 +0530
Subject: [PATCH 108/248] [REVIEW]: code review

bzr revid: mga@mga-20100322123617-7eys0ixcdl0b7qir
---
 addons/survey/wizard/survey_answer.py         | 377 +++++++++---------
 addons/survey/wizard/survey_browse_answer.py  |  32 +-
 addons/survey/wizard/survey_print_answer.py   |  27 +-
 .../survey/wizard/survey_print_statistics.py  |  26 +-
 addons/survey/wizard/survey_selection.py      |  52 +--
 5 files changed, 260 insertions(+), 254 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 4f8849079b0..5a1ce7b9b33 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -378,7 +378,7 @@ class survey_question_wiz(osv.osv_memory):
 
                     if sur_rec['send_response']:
                         survey_data = survey_obj.browse(cr, uid, int(survey_id))
-                        response_id = surv_name_wiz.read(cr,uid,context.get('sur_name_id',False))['response']
+                        response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']
                         context.update({'response_id':response_id})
                         report = self.create_report(cr, uid, [int(survey_id)], 'report.survey.browse.response', survey_data.title,context)
                         attachments = []
@@ -395,9 +395,10 @@ class survey_question_wiz(osv.osv_memory):
                         os.remove(tools.config['addons_path'] + '/survey/report/' + survey_data.title + ".pdf")
                         user_email = False
                         resp_email = False
-
-                        if user_obj.browse(cr, uid, uid).address_id.id:
-                            cr.execute("select email from res_partner_address where id =%d" % user_obj.browse(cr, uid, uid).address_id.id)
+                        
+                        address_id = user_obj.browse(cr, uid, uid).address_id.id
+                        if address_id:
+                            cr.execute("select email from res_partner_address where id =%d" % address_id)
                             user_email = cr.fetchone()[0]
                         resp_id = survey_data.responsible_id.address_id
 
@@ -405,8 +406,9 @@ class survey_question_wiz(osv.osv_memory):
                             cr.execute("select email from res_partner_address where id =%d" % resp_id.id)
                             resp_email = cr.fetchone()[0]
                         if user_email and resp_email:
-                            mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_obj.browse(cr, uid, uid).name) + " Give Response Of " + survey_data.title + " Survey.\n\n Thanks,"
-                            tools.email_send(user_email, [resp_email], "Survey Response Of " + str(user_obj.browse(cr, uid, uid).name) , mail, attach = attachments)
+                            user_name = user_obj.browse(cr, uid, uid).name
+                            mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " Give Response Of " + survey_data.title + " Survey.\n\n Thanks,"
+                            tools.email_send(user_email, [resp_email], "Survey Response Of " + str(user_name) , mail, attach = attachments)
 
                     xml_form = etree.Element('form', {'string': _('Complete Survey Response')})
                     etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
@@ -421,16 +423,16 @@ class survey_question_wiz(osv.osv_memory):
 
     def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
         """
-           If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Response' set True in survey  then send mail on responsible person of this survey and attach survey answer report in pdf format.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param res_ids: List of survey answer IDs,
-            @param report_name: name of the report,
-            @param file_name: To give file name of the report,
-            @param context: A standard dictionary for contextual values,
-            @return : Dictionary value for created report with file name.
+        If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Response' set True in survey  then send mail on responsible person of this survey and attach survey answer report in pdf format.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param res_ids: List of survey answer IDs,
+        @param report_name: name of the report,
+        @param file_name: To give file name of the report,
+        @param context: A standard dictionary for contextual values,
+        @return : Dictionary value for created report with file nameself.
         """
         if not report_name or not res_ids:
             return (False, Exception('Report name and Resources ids are required !!!'))
@@ -450,14 +452,14 @@ class survey_question_wiz(osv.osv_memory):
 
     def default_get(self, cr, uid, fields_list, context=None):
         """
-            Assign Default value in particular field. If Browse Answers wizard run then read the value into database and Assigne to a particular fields.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param fields_list: List of fields of current view,
-            @param context: A standard dictionary for contextual values,
-            @return : Dictionary value for fields list with value.
+        Assign Default value in particular field. If Browse Answers wizard run then read the value into database and Assigne to a particular fields.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields_list: List of fields of current view,
+        @param context: A standard dictionary for contextual values,
+        @return : Dictionary value for fields list with value.
         """
         value = {}
         for field in fields_list:
@@ -465,7 +467,8 @@ class survey_question_wiz(osv.osv_memory):
                 tot_page_id = self.pool.get('survey').browse(cr, uid, context.get('survey_id',False))
                 tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids))
                 value[field] = tot_per
-        response_obj = self.pool.get('survey.response')
+        r
+        esponse_obj = self.pool.get('survey.response')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         
         if context.has_key('response_id') and context.get('response_id') and int(context['response_id'][0]) > 0:
@@ -530,14 +533,14 @@ class survey_question_wiz(osv.osv_memory):
 
     def create(self, cr, uid, vals, context=None):
         """
-            Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param vals: Values,
-            @param context: A standard dictionary for contextual values
-            @return : True.
+        Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param vals: Values,
+        @param context: A standard dictionary for contextual values
+        @return : True.
         """
         if context.has_key('active') and context.get('active',False):
             return True
@@ -988,90 +991,90 @@ class survey_question_wiz(osv.osv_memory):
 
     def action_new_question(self,cr, uid, ids, context):
         """
-            New survey.Question form.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.question.wiz IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for Open new survey.Qestion form.
+        New survey.Question form.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.question.wiz IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Open new survey.Qestion form.
         """
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
         view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),('name','=','survey_question_wizard_test')])
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'view_id': view_id,
-                'context': context
-                }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.question',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'view_id': view_id,
+            'context': context
+        }
 
     def action_new_page(self, cr, uid, ids, context):
         """
-            New survey.Page form.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.question.wiz IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for Open new survey.page form.
+        New survey.Page form.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.question.wiz IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Open new survey.page form.
         """
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
         view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),('name','=','survey_page_wizard_test')])
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.page',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'view_id': view_id,
-                'context': context
-                }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.page',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'view_id': view_id,
+            'context': context
+        }
 
     def action_edit_page(self,cr, uid, ids, context):
         """
-            Edit survey.page.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.question.wiz IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for Open Edit survey.page form.
+        Edit survey.page.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.question.wiz IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Open Edit survey.page form.
         """
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
         view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),('name','=','survey_page_wizard_test')])
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.page',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'res_id' : int(context.get('page_id',0)),
-                'view_id': view_id,
-                'context': context
-                }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.page',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'res_id' : int(context.get('page_id',0)),
+            'view_id': view_id,
+            'context': context
+        }
 
     def action_delete_page(self,cr, uid, ids, context):
         """
-            Delete survey.page.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.question.wiz IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for Open next survey.page form, but delete the selected page.
+        Delete survey.page.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.question.wiz IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Open next survey.page form, but delete the selected page.
         """
         for key,val in context.items():
             if type(key) == type(True):
@@ -1082,51 +1085,51 @@ class survey_question_wiz(osv.osv_memory):
         surv_name_wiz = self.pool.get('survey.name.wiz')
         surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',False) })
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'search_view_id':search_id[0],
+            'context': context
+        }
 
     def action_edit_question(self,cr, uid, ids, context):
         """
-            Edit survey.question.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.question.wiz IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for Open Edit survey.question form.
+        Edit survey.question.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.question.wiz IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Open Edit survey.question form.
         """
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
         view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),('name','=','survey_question_wizard_test')])
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'res_id' : int(context.get('question_id',0)),
-                'view_id': view_id,
-                'context': context
-                }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.question',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'res_id' : int(context.get('question_id',0)),
+            'view_id': view_id,
+            'context': context
+        }
 
     def action_delete_question(self,cr, uid, ids, context):
         """
-            Edit survey.question.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.question.wiz IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for Open same survey.page form, but delete the selected survey.question in current survey.page.
+        Delete survey.question.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.question.wiz IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Open same survey.page form, but delete the selected survey.question in current survey.page.
         """
         for key,val in context.items():
             if type(key) == type(True):
@@ -1149,14 +1152,14 @@ class survey_question_wiz(osv.osv_memory):
 
     def action_forward_previous(self, cr, uid, ids, context=None):
         """
-            Goes to previous Survey Answer.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.question.wiz IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for Open Previous Answer form.
+        Goes to previous Survey Answer.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.question.wiz IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Open Previous Answer form.
         """
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
@@ -1167,25 +1170,25 @@ class survey_question_wiz(osv.osv_memory):
         if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
             return {}
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'search_view_id':search_id[0],
+            'context': context
+        }
 
     def action_forward_next(self, cr, uid, ids, context=None):
         """
-            Goes to Next Survey Answer.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.question.wiz IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for Open Next Answer form.
+        Goes to Next Survey Answer.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.question.wiz IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Open Next Answer form.
         """
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
@@ -1196,64 +1199,64 @@ class survey_question_wiz(osv.osv_memory):
         if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
             return {}
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'search_view_id':search_id[0],
+            'context': context
+        }
 
     def action_next(self, cr, uid, ids, context=None):
         """
-            Goes to Next page.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.question.wiz IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for Open Next survey.page form.
+        Goes to Next page.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.question.wiz IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Open Next survey.page form.
         """
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'next'})
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'search_view_id':search_id[0],
+            'context': context
+        }
 
     def action_previous(self, cr, uid, ids, context=None):
         """
-            Goes to previous page.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.question.wiz IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for Open Previous survey.page form.
+        Goes to previous page.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.question.wiz IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for Open Previous survey.page form.
         """
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'previous'})
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id':search_id[0],
-                'context': context
-                }
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'search_view_id':search_id[0],
+            'context': context
+        }
 
 survey_question_wiz()
 
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index ba467bcea9a..bb3954ac74d 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -26,14 +26,15 @@ from tools.translate import _
 
 class survey_browse_answer(osv.osv_memory):
     _name = 'survey.browse.answer'
+    
     def _get_survey(self, cr, uid, context=None):
         """
-            Set the value in survey_id field,
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param context: A standard dictionary for contextual values,
-            @return : Tuple in list with values.
+        Set the value in survey_id field,
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param context: A standard dictionary for contextual values,
+        @return : Tuple in list with values.
         """        
         surv_obj = self.pool.get("survey")
         surv_resp_obj = self.pool.get("survey.response")
@@ -50,14 +51,15 @@ class survey_browse_answer(osv.osv_memory):
 
     def action_next(self, cr, uid, ids, context=None):
         """
-            Open Browse Response wizard. if you select only survey_id then this wizard open with all response_ids and if you select survey_id and response_id then open the particular response of the survey.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of survey.browse.answer IDs,
-            @param context: A standard dictionary for contextual values,
-            @return : Dictionary value for Open the browse answer wizard.
+        Open Browse Response wizard. if you select only survey_id then this wizard open with all response_ids and 
+        if you select survey_id and response_id then open the particular response of the survey.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of survey.browse.answer IDs,
+        @param context: A standard dictionary for contextual values,
+        @return : Dictionary value for Open the browse answer wizard.
         """
         record = self.read(cr, uid, ids, [])
         record = record and record[0] or {} 
@@ -81,4 +83,4 @@ class survey_browse_answer(osv.osv_memory):
 
 survey_browse_answer()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
index ee4243ab2d5..c07acadcb35 100644
--- a/addons/survey/wizard/survey_print_answer.py
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -42,14 +42,14 @@ class survey_print_answer(osv.osv_memory):
 
     def action_next(self, cr, uid, ids, context=None):
         """
-           Print Survey Answer in pdf format.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of print answer IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for created survey answer report
+        Print Survey Answer in pdf format.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of print answer IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for created survey answer report
         """
         datas = {'ids' : context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size', 'page_number', 'without_pagebreak'], context)
@@ -57,11 +57,10 @@ class survey_print_answer(osv.osv_memory):
         datas['form'] = res
         datas['model'] = 'survey.print.answer'
         return { 
-                    'type':'ir.actions.report.xml',
-                    'report_name':'survey.browse.response',
-                    'datas':datas,               
-               }
-
+            'type':'ir.actions.report.xml',
+            'report_name':'survey.browse.response',
+            'datas':datas,               
+        }
 survey_print_answer()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index 55da0a99bfd..cd145c59008 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -31,14 +31,14 @@ class survey_print_statistics(osv.osv_memory):
 
     def action_next(self, cr, uid, ids, context=None):
         """
-           Print Survey Statistics in pdf format.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of Survey statistics IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for created survey statistics report
+        Print Survey Statistics in pdf format.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Survey statistics IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for created survey statistics report
         """
         datas = {'ids' : context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['survey_ids'], context)
@@ -46,11 +46,11 @@ class survey_print_statistics(osv.osv_memory):
         datas['form'] = res
         datas['model'] = 'survey.print.statistics'
         return { 
-                    'type':'ir.actions.report.xml',
-                    'report_name':'survey.analysis',
-                    'datas':datas,               
-               }
+            'type':'ir.actions.report.xml',
+            'report_name':'survey.analysis',
+            'datas':datas,               
+        }
 
 survey_print_statistics()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 5282eae794b..eda521b9734 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -28,14 +28,14 @@ class survey_name_wiz(osv.osv_memory):
 
     def default_get(self, cr, uid, fields, context={}):
         """
-            Set the default value in survey_id field. if open this wizard in survey form then set the default value in survey_id = active survey id.
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param fields: List of Survey statistics IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for created survey statistics report
+        Set the default value in survey_id field. if open this wizard in survey form then set the default value in survey_id = active survey id.
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of Survey statistics IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for created survey statistics report
         """
         if not context:
             context = {}
@@ -46,14 +46,14 @@ class survey_name_wiz(osv.osv_memory):
 
     def _get_survey(self, cr, uid, context=None):
         """
-            Set the value In survey_id field. 
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of Survey statistics IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for created survey statistics report
+        Set the value In survey_id field. 
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Survey statistics IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for created survey statistics report
         """
         surv_obj = self.pool.get("survey")
         result = []
@@ -90,14 +90,16 @@ class survey_name_wiz(osv.osv_memory):
 
     def action_next(self, cr, uid, ids, context=None):
         """
-            Start the survey, Increment in started survey field but if set the max_response_limit of survey then check the current user how many times start this survey. if current user max_response_limit is reach then this user can not start this survey(Raise Exception).
-           
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of Survey IDs
-            @param context: A standard dictionary for contextual values
-            @return : Dictionary value for open survey question wizard.
+        Start the survey, Increment in started survey field but if set the max_response_limit of 
+        survey then check the current user how many times start this survey. if current user max_response_limit 
+        is reach then this user can not start this survey(Raise Exception).
+       
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Survey IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for open survey question wizard.
         """
         survey_obj = self.pool.get('survey')
         search_obj = self.pool.get('ir.ui.view')
@@ -145,4 +147,4 @@ class survey_name_wiz(osv.osv_memory):
 
 survey_name_wiz()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 1702cda182e4f318d91f180169a63cf78555e692 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Mon, 22 Mar 2010 18:22:48 +0530
Subject: [PATCH 109/248] [REVIEW]: code review

bzr revid: mga@mga-20100322125248-hqfs70h3v9qsojqe
---
 addons/crm/wizard/crm_send_email.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 3adf7694527..d25c93650f7 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -31,15 +31,15 @@ class crm_send_new_email(osv.osv_memory):
     _description = "Case Send new email"
 
     _columns = {
-                'to' : fields.char('To', size=64, required=True),
-                'cc' : fields.char('CC', size=128),
-                'subject': fields.char('Subject', size=128, required=True),
-                'text': fields.text('Message', required=True),
-                'state': fields.selection([('done', 'Done'), ('pending', 'Pending'), ('unchanged', 'Unchanged')], string='State', required=True),
-                'doc1': fields.binary("Attachment1"),
-                'doc2': fields.binary("Attachment2"),
-                'doc3': fields.binary("Attachment3"),
-                }
+        'to' : fields.char('To', size=64, required=True),
+        'cc' : fields.char('CC', size=128),
+        'subject': fields.char('Subject', size=128, required=True),
+        'text': fields.text('Message', required=True),
+        'state': fields.selection([('done', 'Done'), ('pending', 'Pending'), ('unchanged', 'Unchanged')], string='State', required=True),
+        'doc1': fields.binary("Attachment1"),
+        'doc2': fields.binary("Attachment2"),
+        'doc3': fields.binary("Attachment3"),
+    }
 
     def action_cancel(self, cr, uid, ids, context=None):
         """
@@ -60,6 +60,9 @@ class crm_send_new_email(osv.osv_memory):
         @param ids: List of Phonecall to Opportunity's IDs
         @param context: A standard dictionary for contextual values
         """
+        
+        hist_obj = self.pool.get('crm.case.history')
+        
         if not context:
             context = {}
 
@@ -77,7 +80,6 @@ class crm_send_new_email(osv.osv_memory):
             if context.get('mail', 'new') == 'new':
                 case = case_pool.browse(cr, uid, res_id)
             else:
-                hist_obj = self.pool.get('crm.case.history')
                 hist = hist_obj.browse(cr, uid, res_id)
                 model = hist.log_id.model_id.model
                 model_pool = self.pool.get(model)

From 7fabf72b8be30b83d755a17bf615b339afe1a1d1 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Mon, 22 Mar 2010 18:38:05 +0530
Subject: [PATCH 110/248] [REVIEW]: code review

bzr revid: mga@mga-20100322130805-gvqgd1fqk1fdrq4n
---
 addons/crm/crm.py                            | 32 +++++++++++++-------
 addons/crm/crm_helpdesk.py                   |  6 +++-
 addons/survey/wizard/survey_browse_answer.py |  4 +--
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 80e1b8e246a..82faafb8c7b 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -19,14 +19,14 @@
 #
 ##############################################################################
 
+import time
 from datetime import datetime
 from datetime import timedelta
+
+import tools
 from osv import fields
 from osv import osv
 from tools.translate import _
-import time
-import tools
-
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
@@ -102,7 +102,7 @@ class crm_case_section(osv.osv):
     ]
     
     def name_get(self, cr, uid, ids, context={}):
-        """Overrides orm  """
+        """Overrides orm"""
         if not len(ids):
             return []
         reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
@@ -124,32 +124,36 @@ class crm_case_categ(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
         'object_id': fields.many2one('ir.model', 'Object Name'), 
     }
+    
     def _find_object_id(self, cr, uid, context=None):
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0] 
+        return ids and ids[0]
+        
     _defaults = {        
         'object_id' : _find_object_id
-    }
-#               
+    }   
 crm_case_categ()
 
 class crm_case_resource_type(osv.osv):
     _name = "crm.case.resource.type"
     _description = "Resource Type of case"
     _rec_name = "name"
+    
     _columns = {
         'name': fields.char('Case Resource Type', size=64, required=True, translate=True), 
         'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
         'object_id': fields.many2one('ir.model', 'Object Name'), 
     }
+    
     def _find_object_id(self, cr, uid, context=None):
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0] 
+    
     _defaults = {
         'object_id' : _find_object_id
-    }    
+    }
 crm_case_resource_type()
 
 
@@ -158,6 +162,7 @@ class crm_case_stage(osv.osv):
     _description = "Stage of case"
     _rec_name = 'name'
     _order = "sequence"
+    
     _columns = {
         'name': fields.char('Stage Name', size=64, required=True, translate=True), 
         'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
@@ -167,10 +172,12 @@ class crm_case_stage(osv.osv):
         'on_change': fields.boolean('Change Probability Automatically', help="Change Probability on next and previous stages."), 
         'requirements': fields.text('Requirements')
     }
+    
     def _find_object_id(self, cr, uid, context=None):
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
-        return ids and ids[0]     
+        return ids and ids[0]
+        
     _defaults = {
         'sequence': lambda *args: 1, 
         'probability': lambda *args: 0.0, 
@@ -185,7 +192,6 @@ def _links_get(self, cr, uid, context={}):
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
     return [(r['object'], r['name']) for r in res]
 
-
 class crm_case(osv.osv):
     _name = "crm.case"
     _description = "Case"
@@ -254,10 +260,12 @@ class crm_case(osv.osv):
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
         'company_id': fields.many2one('res.company', 'Company'), 
     }
+    
     def _get_default_partner_address(self, cr, uid, context):
         if not context.get('portal', False):
             return False
         return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
+        
     def _get_default_partner(self, cr, uid, context):
         if not context.get('portal', False):
             return False
@@ -265,6 +273,7 @@ class crm_case(osv.osv):
         if not user.address_id:
             return False
         return user.address_id.partner_id.id
+        
     def _get_default_email(self, cr, uid, context):
         if not context.get('portal', False):
             return False
@@ -272,6 +281,7 @@ class crm_case(osv.osv):
         if not user.address_id:
             return False
         return user.address_id.email
+        
     def _get_default_user(self, cr, uid, context):
         if context.get('portal', False):
             return False
@@ -555,6 +565,7 @@ class crm_case_history(osv.osv):
             res[hist.id] = (hist.email or '/') + ' (' + str(hist.date) + ')\n'
             res[hist.id] += (hist.description or '')
         return res
+        
     _columns = {
         'description': fields.text('Description'), 
         'note': fields.function(_note_get, method=True, string="Description", type="text"), 
@@ -633,7 +644,6 @@ class res_partner(osv.osv):
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
     }
-
 res_partner()
 
 
diff --git a/addons/crm/crm_helpdesk.py b/addons/crm/crm_helpdesk.py
index 43f48025572..9712d9b7a7d 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm/crm_helpdesk.py
@@ -19,7 +19,11 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
+
+from osv import orm
+from osv import osv
+from osv import fields
+
 import crm
 
 class crm_helpdesk(osv.osv):
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index bb3954ac74d..a401a07709d 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -20,10 +20,10 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
+from osv import fields
 from tools.translate import _
 
-
 class survey_browse_answer(osv.osv_memory):
     _name = 'survey.browse.answer'
     

From 85a68faf65412decfe80c7a44f956f8c0e6fddc7 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 18:38:14 +0530
Subject: [PATCH 111/248] [IMP] Survey :- convert simple wizard(send
 invitation) to osv_memory wizard.

bzr revid: ysa@tinyerp.co.in-20100322130814-ska7shqv4yh1vbng
---
 addons/survey/__terp__.py                     |   4 +-
 addons/survey/survey_wizard.xml               |   9 -
 addons/survey/wizard/__init__.py              |   2 +-
 addons/survey/wizard/survey_answer.py         |   5 +-
 .../survey/wizard/survey_send_invitation.py   | 213 ++++++++++++++++++
 .../survey/wizard/survey_send_invitation.xml  |  77 +++++++
 6 files changed, 294 insertions(+), 16 deletions(-)
 delete mode 100644 addons/survey/survey_wizard.xml
 create mode 100644 addons/survey/wizard/survey_send_invitation.py
 create mode 100644 addons/survey/wizard/survey_send_invitation.xml

diff --git a/addons/survey/__terp__.py b/addons/survey/__terp__.py
index a06216b362d..367e6af5b8d 100644
--- a/addons/survey/__terp__.py
+++ b/addons/survey/__terp__.py
@@ -34,7 +34,6 @@
     'depends': ['base'],
     'update_xml': ['survey_report.xml',
                    'survey_data.xml',
-                   'survey_wizard.xml',
                    'wizard/survey_selection.xml',
                    'wizard/survey_answer.xml',
                    'survey_view.xml',
@@ -42,7 +41,8 @@
                    'wizard/survey_print_statistics.xml',
                    'wizard/survey_print_answer.xml',
                    'wizard/survey_browse_answer.xml',
-                   'wizard/survey_print.xml'],
+                   'wizard/survey_print.xml',
+                   'wizard/survey_send_invitation.xml'],
     'demo_xml': ['survey_demo.xml'],
     'installable': True,
     'active': False,
diff --git a/addons/survey/survey_wizard.xml b/addons/survey/survey_wizard.xml
deleted file mode 100644
index 1654a426b46..00000000000
--- a/addons/survey/survey_wizard.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data>
-
-		<wizard string="Send Invitation" id="wizard_send_invitation"
-			model="survey" name="wizard.send.invitation"/>
-
-	</data>
-</openerp>
diff --git a/addons/survey/wizard/__init__.py b/addons/survey/wizard/__init__.py
index 5221f26db0e..33ba7445f9e 100755
--- a/addons/survey/wizard/__init__.py
+++ b/addons/survey/wizard/__init__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-import wizard_survey
+import survey_send_invitation
 import survey_print_statistics
 import survey_print_answer
 import survey_browse_answer
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 5a1ce7b9b33..5482438d4a3 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -1,5 +1,3 @@
-
-
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
@@ -467,7 +465,6 @@ class survey_question_wiz(osv.osv_memory):
                 tot_page_id = self.pool.get('survey').browse(cr, uid, context.get('survey_id',False))
                 tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids))
                 value[field] = tot_per
-        r
         esponse_obj = self.pool.get('survey.response')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         
@@ -773,7 +770,7 @@ class survey_question_wiz(osv.osv_memory):
                     if not select_count:
                         resp_obj.write(cr, uid, resp_id, {'state':'skip'})
 
-                    if que_rec[also'numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
+                    if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
new file mode 100644
index 00000000000..7286a017560
--- /dev/null
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -0,0 +1,213 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+from random import choice
+import string
+import os
+import datetime
+import socket
+
+from osv import fields
+from osv import osv
+import tools
+from tools.translate import _
+import netsvc
+
+
+class survey_send_invitation(osv.osv_memory):
+    _name = 'survey.send.invitation'
+    _columns = {
+        'partner_ids' : fields.many2many('res.partner','survey_res_partner','partner_id','survey_id', "Response", required=1),
+        'send_mail' : fields.boolean('Send mail for new user'),
+        'send_mail_existing' : fields.boolean('Send reminder for existing user'),
+        'mail_subject' : fields.char('Subject', size=256, required=1),
+        'mail_subject_existing' : fields.char('Subject', size=256, required=1),
+        'mail_from' : fields.char('From', size=256, required=1),
+        'mail' : fields.text('Body')
+    }
+
+    _defaults = {
+        'send_mail' : lambda *a: 1,
+        'send_mail_existing' : lambda *a: 1,
+        'mail_subject' : lambda *a: "New user account.",
+        'mail_subject_existing' : lambda *a: "User account info.",
+        'mail_from' : lambda *a: tools.config['email_from']
+    }
+
+    def genpasswd(self):
+        chars = string.letters + string.digits
+        return ''.join([choice(chars) for i in range(6)])
+    
+    def default_get(self, cr, uid, fields_list, context=None):
+        data = super(survey_send_invitation, self).default_get(cr, uid, fields_list, context)
+        survey_obj = self.pool.get('survey')
+        msg = ""
+        name = ""
+        for sur in survey_obj.browse(cr, uid, context.get('active_ids', [])):
+            name += "\t --> " + sur.title + "\n"
+            if sur.state != 'open':
+                msg +=  sur.title + "\n"
+        if msg:
+            raise osv.except_osv(_('Error !'), _('%sSurvey is not in open state') % msg)
+        data['mail'] = '''Hello %(name)s, \n\n We are inviting you for following survey. \
+                    \n  ''' + name + '''\n Your login ID: %(login)s, Your password: %(passwd)s
+                    \n link :- http://'''+ str(socket.gethostname()) + ''':8080 \n\n Thanks,''' 
+        return data
+
+    def create_report(self, cr, uid, res_ids, report_name=False, file_name=False):
+        if not report_name or not res_ids:
+            return (False, Exception('Report name and Resources ids are required !!!'))
+        try:
+            ret_file_name = tools.config['addons_path'] + '/survey/report/' + file_name + '.pdf'
+            service = netsvc.LocalService(report_name);
+            (result, format) = service.create(cr, uid, res_ids, {}, {})
+            fp = open(ret_file_name, 'wb+');
+            fp.write(result);
+            fp.close();
+        except Exception,e:
+            print 'Exception in create report:',e
+            return (False, str(e))
+        return (True, ret_file_name)
+
+
+    def action_send(self, cr, uid, ids, context=None):
+        record = self.read(cr, uid, ids, [])
+        survey_ids =  context.get('active_ids', [])
+        record = record and record[0]  
+        partner_ids = record['partner_ids']
+        user_ref= self.pool.get('res.users')
+        survey_ref= self.pool.get('survey')
+
+        model_data_obj = self.pool.get('ir.model.data')
+        group_id = model_data_obj._get_id(cr, uid, 'survey', 'group_survey_user')
+        group_id = model_data_obj.browse(cr, uid, group_id, context=context).res_id        
+
+        act_id = self.pool.get('ir.actions.act_window')
+        act_id = act_id.search(cr, uid, [('res_model', '=' , 'survey.name.wiz'), ('view_type', '=', 'form')])
+        out="login,password\n"
+        skipped= 0
+        existing= ""
+        created= ""
+        error= ""
+        res_user = ""
+        user_exists = False
+        attachments = []
+        for id in survey_ref.browse(cr, uid, survey_ids):
+            report = self.create_report(cr, uid, [id.id], 'report.survey.form', id.title)
+            file = open(tools.config['addons_path'] + '/survey/report/' + id.title +".pdf")
+            file_data = ""
+            while 1:
+                line = file.readline()
+                file_data += line
+                if not line:
+                    break
+            attachments.append((id.title +".pdf",file_data))
+            file.close()
+            os.remove(tools.config['addons_path'] + '/survey/report/' + id.title + ".pdf")
+    
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
+            for addr in partner.address:
+                if not addr.email:
+                    skipped+= 1
+                    continue
+                user = user_ref.search(cr, uid, [('login', "=", addr.email)])
+                if user:
+                    user = user_ref.browse(cr, uid, user[0])
+                    user_ref.write(cr, uid, user.id, {'survey_id':[[6, 0, survey_ids]]})
+                    mail= record['mail']%{'login':addr.email, 'passwd':user.password, \
+                                                'name' : addr.name}
+                    if record['send_mail_existing']:
+                        tools.email_send(record['mail_from'], [addr.email] , \
+                                         record['mail_subject_existing'] , mail)
+                        existing+= "- %s (Login: %s,  Password: %s)\n" % (user.name, addr.email, \
+                                                                          user.password)
+                    continue
+                user_id =user_ref.search(cr, uid, [('address_id', '=', addr.id)])
+                if user_id:
+                    for user_email in user_ref.browse(cr, uid, user_id):
+                        mail= record['mail']%{'login':user_email.login, \
+                                                        'passwd':user_email.password, 'name' : addr.name}
+                        if record['send_mail_existing']:
+                            tools.email_send(record['mail_from'], [addr.email],\
+                                                  record['mail_subject_existing'], mail)
+                            res_user+= "- %s (Login: %s,  Password: %s)\n" % \
+                                 (user_email.name, user_email.login, user_email.password)
+                    continue
+                passwd= self.genpasswd()
+                out+= addr.email + ',' + passwd + '\n'
+                mail= record['mail'] % {'login' : addr.email, 'passwd' : passwd, 'name' : addr.name}
+                if record['send_mail']:
+                    ans = tools.email_send(record['mail_from'], [addr.email], \
+                                           record['mail_subject'], mail,attach = attachments)
+    
+                    if ans:
+                        res_data = {'name' : addr.name or 'Unknown', 
+                                    'login' : addr.email, 
+                                    'password' : passwd, 
+                                    'address_id' : addr.id, 
+                                    'groups_id' : [[6, 0, [group_id]]], 
+                                    'action_id' : act_id[0], 
+                                    'survey_id' : [[6, 0, survey_ids]]
+                                   }
+                        user = user_ref.create(cr, uid, res_data)
+                        created+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
+                                                                          addr.email, passwd)
+                    else:
+                        error+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
+                                                                        addr.email, passwd)
+        note= ""
+        if created:
+            note += 'Created users:\n%s\n\n' % (created)
+        if existing:
+            note +='Already existing users:\n%s\n\n' % (existing)
+        if skipped:
+            note += "%d contacts where ignored (an email address is missing).\n\n" % (skipped)
+        if error:
+            note += 'E-Mail not send successfully:\n====================\n%s\n' % (error)
+        if res_user:
+            note += 'E-mail ID used the following user:\n====================\n%s\n' % (res_user)
+        context.update({'note' : note})
+        return {
+            'view_type': 'form',
+            "view_mode": 'form',
+            'res_model': 'survey.send.invitation.log',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context
+        }
+survey_send_invitation()
+
+class survey_send_invitation_log(osv.osv_memory):
+    _name = 'survey.send.invitation.log'
+    _columns = {
+        'note' : fields.text('Log', readonly=1)
+    }
+    
+    def default_get(self, cr, uid, fields_list, context=None):
+        data = super(survey_send_invitation_log, self).default_get(cr, uid, fields_list, context)
+        data['note'] = context.get('note','')
+        return data
+
+survey_send_invitation_log()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
new file mode 100644
index 00000000000..3762475e420
--- /dev/null
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+	
+		<!-- Survey send invitation Form View -->
+				 
+		<record id="view_survey_send_invitation" model="ir.ui.view">
+			<field name="name">Send Invitation</field>
+			<field name="model">survey.send.invitation</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Send Invitation">
+				    <separator string="Select Partner" colspan="4"/>
+				    <field name="partner_ids" nolabel="1"  colspan="4"/> 
+				    <separator colspan="4" string="Send mail for new user"/>
+			        <field name="send_mail" nolabel="1"/>
+			        <field name="mail_subject" colspan="3"/>
+			        <separator colspan="4" string="Send reminder for existing user"/>
+			        <field name="send_mail_existing" nolabel="1"/>
+			        <field name="mail_subject_existing" colspan="3"/>    
+				    <separator colspan="4"/>
+			        <field name="mail_from" colspan="4"/>
+				    <separator string="Message" colspan="4"/>
+				    <field name="mail" nolabel="1" colspan="4"/>
+					<separator colspan="4" />
+					<label align="0.0" colspan="2" string="" />
+					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+					<button colspan="1" icon="gtk-go-forward" name="action_send" string="Send" type="object"/>
+				</form>
+			</field>
+		</record>
+
+		<!-- Survey send invitation action -->
+
+		<record id="action_view_survey_send_invitation" model="ir.actions.act_window">
+			<field name="name">Send Invitation</field>
+			<field name="res_model">survey.send.invitation</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+		</record>
+
+    	<act_window id="action_act_view_survey_send_invitation"
+    		key2="client_action_multi" name="Send Invitation"
+    		res_model="survey.send.invitation" src_model="survey"
+    		view_mode="form" target="new" view_type="form" />
+
+		<!-- Survey send invitation Display Log Form View -->
+				 
+		<record id="view_survey_send_invitation_log" model="ir.ui.view">
+			<field name="name">survey send invitation log</field>
+			<field name="model">survey.send.invitation.log</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="User creation">
+				    <separator string="Results :" colspan="4"/>
+    				<field name="note" colspan="4" nolabel="1" width="300"/>
+    				<separator string="" colspan="4"/>
+    				<group col="4" colspan="4">
+						<label align="0.0" colspan="3" string="" />
+						<button colspan="1" icon="gtk-ok" special="cancel" string="Ok"/>
+					</group>
+				</form>
+			</field>
+		</record>
+
+		<!-- Survey send invitation action -->
+
+		<record id="action_view_survey_send_invitation_log" model="ir.actions.act_window">
+			<field name="name">survey.send.invitation.log</field>
+			<field name="res_model">survey.send.invitation.log</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+		</record>
+	</data>
+</openerp>
\ No newline at end of file

From 04c7318e6d4f38f0950482e38a3c78abe52ea841 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 22 Mar 2010 19:13:13 +0530
Subject: [PATCH 112/248] [IMP] survey :- improve code

bzr revid: ysa@tinyerp.co.in-20100322134313-hxomxzvv6gd2cxrr
---
 addons/survey/wizard/survey_answer.py | 46 +++++++++++++--------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 5482438d4a3..1b837ecd394 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -71,11 +71,10 @@ class survey_question_wiz(osv.osv_memory):
                     'response':0
                 }
                 wiz_id = surv_name_wiz.create(cr, uid, res_data)
-                #TODO: change to the browse, use read if only need to read few columns values
-                sur_name_rec = surv_name_wiz.read(cr, uid, wiz_id, [])
+                sur_name_rec = surv_name_wiz.browse(cr, uid, wiz_id)
                 context.update({'sur_name_id' :wiz_id})
             else:
-                sur_name_rec = surv_name_wiz.read(cr, uid, context.get('sur_name_id', False))
+                sur_name_rec = surv_name_wiz.browse(cr, uid, context.get('sur_name_id', False))
 
             if context.has_key('active_id'):
                 context.pop('active_id')
@@ -83,7 +82,7 @@ class survey_question_wiz(osv.osv_memory):
             survey_id = context.get('survey_id', False)
             #TODO: change to the browse, use read if only need to read few columns values
             # this will fire select * from quary 
-            sur_rec = survey_obj.read(cr, uid, survey_id, [])
+            sur_rec = survey_obj.read(cr, uid, survey_id, ['page_ids', 'max_response_limit', 'state', 'tot_start_survey', 'tot_comp_survey', 'send_response'])
             p_id = sur_rec['page_ids']
             total_pages = len(p_id)
             pre_button = False
@@ -92,44 +91,45 @@ class survey_question_wiz(osv.osv_memory):
             if context.has_key('response_id') and context.get('response_id', False) and int(context['response_id'][0]) > 0:
                 readonly = 1
 
-            if not sur_name_rec['page_no'] + 1 :
+            if not sur_name_rec.page_no + 1 :
                 surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':{}})
 
-            sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
-            page_number = int(sur_name_rec['page_no'])
-            if sur_name_read['transfer'] or not sur_name_rec['page_no'] + 1:
+            sur_name_read = surv_name_wiz.browse(cr, uid, context.get('sur_name_id',False))
+            page_number = int(sur_name_rec.page_no)
+            if sur_name_read.transfer or not sur_name_rec.page_no + 1:
                 surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'transfer':False})
                 flag = False
                 fields = {}
-                if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == -1:
-                    if total_pages > sur_name_rec['page_no'] + 1:
-                        if ((context.has_key('active') and not context.get('active', False)) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1:
+                if sur_name_read.page == "next" or sur_name_rec.page_no == -1:
+                    if total_pages > sur_name_rec.page_no + 1:
+                        if ((context.has_key('active') and not context.get('active', False)) or not context.has_key('active')) and not sur_name_rec.page_no + 1:
                             if sur_rec['state'] != "open" :
                                 raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
                             cr.execute('select count(id) from survey_history where user_id=%s\
                                                     and survey_id=%s' % (uid,survey_id))
                             res = cr.fetchone()[0]
-                            user_limit = survey_obj.read(cr, uid, survey_id, ['response_user'])['response_user']
+                            user_limit = survey_obj.browse(cr, uid, survey_id)
+                            user_limit = user_limit.response_user
                             if user_limit and res >= user_limit:
                                 raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
 
-                        if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey'] and not sur_name_rec['page_no'] + 1:
+                        if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey'] and not sur_name_rec.page_no + 1:
                             survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
 
-                        p_id = p_id[sur_name_rec['page_no'] + 1]
-                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec['page_no'] + 1})
+                        p_id = p_id[sur_name_rec.page_no + 1]
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec.page_no + 1})
                         flag = True
                         page_number += 1
-                    if sur_name_rec['page_no'] > - 1:
+                    if sur_name_rec.page_no > - 1:
                         pre_button = True
                 else:
-                    if sur_name_rec['page_no'] != 0:
-                        p_id = p_id[sur_name_rec['page_no'] - 1]
-                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec['page_no'] - 1})
+                    if sur_name_rec.page_no != 0:
+                        p_id = p_id[sur_name_rec.page_no - 1]
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec.page_no - 1})
                         flag = True
                         page_number -= 1
 
-                    if sur_name_rec['page_no'] > 1:
+                    if sur_name_rec.page_no > 1:
                         pre_button = True
                 if flag:
                     pag_rec = page_obj.read(cr, uid, p_id)
@@ -171,7 +171,7 @@ class survey_question_wiz(osv.osv_memory):
                             xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
                             etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
                             xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
-                            context.update({'question_id' : tools.ustr(que),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer'], 'page_id' : p_id})
+                            context.update({'question_id' : tools.ustr(que),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer, 'page_id' : p_id})
                             etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-edit", 'type' :'object', 'name':"action_edit_question", 'context' : tools.ustr(context)})
                             etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-delete", 'type' :'object','name':"action_delete_question", 'context' : tools.ustr(context)})
                         else:
@@ -359,7 +359,7 @@ class survey_question_wiz(osv.osv_memory):
 
                     if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
                         etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
-                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec['page_no'] , 'transfer' : sur_name_read['transfer']})
+                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
                         xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
                         etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
                         etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
@@ -372,7 +372,7 @@ class survey_question_wiz(osv.osv_memory):
                     result['context'] = context
                 else:
                     survey_obj.write(cr, uid, survey_id, {'tot_comp_survey' : sur_rec['tot_comp_survey'] + 1})
-                    sur_response_obj.write(cr, uid, [sur_name_read['response']], {'state' : 'done'})
+                    sur_response_obj.write(cr, uid, [sur_name_read.response], {'state' : 'done'})
 
                     if sur_rec['send_response']:
                         survey_data = survey_obj.browse(cr, uid, int(survey_id))

From a5aaf0cc047a8c55dad2454849890c4bc17e33c9 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Mon, 22 Mar 2010 19:44:00 +0530
Subject: [PATCH 113/248] [REVIEW]: code review

bzr revid: mga@mga-20100322141400-2er9nd4q5bg7izwx
---
 addons/crm/wizard/crm_opportunity_to_meeting.py | 16 ++++++++--------
 addons/project_issue/project_issue.py           | 11 +++++------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_meeting.py b/addons/crm/wizard/crm_opportunity_to_meeting.py
index a2f94a5a96f..3d2d59babe6 100644
--- a/addons/crm/wizard/crm_opportunity_to_meeting.py
+++ b/addons/crm/wizard/crm_opportunity_to_meeting.py
@@ -128,13 +128,13 @@ class crm_opportunity2meeting(osv.osv_memory):
 
             opp = opp_obj.browse(cr, uid, record_id, context=context)
             context = {
-                        'default_opportunity_id': opp.id, 
-                        'default_partner_id': opp.partner_id and opp.partner_id.id or False, 
-                        'default_section_id': opp.section_id and opp.section_id.id or False, 
-                        'default_email_from': opp.email_from, 
-                        'default_state': 'open', 
-                        'default_name': opp.name
-                    }
+                'default_opportunity_id': opp.id, 
+                'default_partner_id': opp.partner_id and opp.partner_id.id or False, 
+                'default_section_id': opp.section_id and opp.section_id.id or False, 
+                'default_email_from': opp.email_from, 
+                'default_state': 'open', 
+                'default_name': opp.name
+            }
                     
             value = {
                 'name': _('Meetings'), 
@@ -147,7 +147,7 @@ class crm_opportunity2meeting(osv.osv_memory):
                 'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')], 
                 'type': 'ir.actions.act_window', 
                 'search_view_id': res['res_id']
-                }
+            }
 
         return value
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index e4494c48565..03ecfdcc778 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -19,18 +19,17 @@
 #
 ##############################################################################
 
-from crm import crm
-from datetime import datetime, timedelta
-from osv import fields,osv,orm
-from osv.orm import except_orm
-from tools.translate import _
 import base64
 import os
 import re
 import time
 import time
 import tools
-
+from crm import crm
+from datetime import datetime, timedelta
+from osv import fields,osv,orm
+from osv.orm import except_orm
+from tools.translate import _
 
 class project_issue(osv.osv):
     _name = "project.issue"

From e0145b53cdbc66fa805798b8fe80e6d44f6adcbd Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Tue, 23 Mar 2010 10:53:09 +0530
Subject: [PATCH 114/248] [IMP] survey :- improve code.

bzr revid: ysa@tinyerp.co.in-20100323052309-4w8ny7fryoaaicjy
---
 addons/survey/survey.py                       |  12 +-
 addons/survey/wizard/survey_answer.py         |  14 +-
 addons/survey/wizard/survey_print_answer.py   |   3 +-
 .../survey/wizard/survey_print_statistics.py  |   3 +-
 addons/survey/wizard/survey_selection.py      |   3 +-
 addons/survey/wizard/wizard_survey.py         | 221 ------------------
 6 files changed, 20 insertions(+), 236 deletions(-)
 delete mode 100755 addons/survey/wizard/wizard_survey.py

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 0e548cb1a30..b1680ef5009 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -20,14 +20,16 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
+from osv import fields
+import tools
+import netsvc
+from tools.translate import _
+
 from time import strftime
 import datetime
 import copy
-from tools.translate import _
-import tools
 from mx.DateTime import *
-import netsvc
 import os
 
 class survey_type(osv.osv):
@@ -590,7 +592,7 @@ class survey_response_answer(osv.osv):
     _rec_name = 'response_id'
     _columns = {
         'response_id' : fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
-        'answer_id' : fields.many2one('survey.answer', 'Answer', required=1),
+        'answer_id' : fields.many2one('survey.answer', 'Answer', required=1, ondelete='cascade'),
         'column_id' : fields.many2one('survey.question.column.heading','Column'),
         'answer' : fields.char('Value', size =255),
         'value_choice' : fields.char('Value Choice', size =255),
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 1b837ecd394..630b0a30c01 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -82,8 +82,8 @@ class survey_question_wiz(osv.osv_memory):
             survey_id = context.get('survey_id', False)
             #TODO: change to the browse, use read if only need to read few columns values
             # this will fire select * from quary 
-            sur_rec = survey_obj.read(cr, uid, survey_id, ['page_ids', 'max_response_limit', 'state', 'tot_start_survey', 'tot_comp_survey', 'send_response'])
-            p_id = sur_rec['page_ids']
+            sur_rec = survey_obj.browse(cr, uid, survey_id)
+            p_id = map(lambda x:x.id, sur_rec.page_ids)
             total_pages = len(p_id)
             pre_button = False
             readonly = 0
@@ -103,7 +103,7 @@ class survey_question_wiz(osv.osv_memory):
                 if sur_name_read.page == "next" or sur_name_rec.page_no == -1:
                     if total_pages > sur_name_rec.page_no + 1:
                         if ((context.has_key('active') and not context.get('active', False)) or not context.has_key('active')) and not sur_name_rec.page_no + 1:
-                            if sur_rec['state'] != "open" :
+                            if sur_rec.state != "open" :
                                 raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
                             cr.execute('select count(id) from survey_history where user_id=%s\
                                                     and survey_id=%s' % (uid,survey_id))
@@ -113,7 +113,7 @@ class survey_question_wiz(osv.osv_memory):
                             if user_limit and res >= user_limit:
                                 raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
 
-                        if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey'] and not sur_name_rec.page_no + 1:
+                        if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey and not sur_name_rec.page_no + 1:
                             survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
 
                         p_id = p_id[sur_name_rec.page_no + 1]
@@ -371,10 +371,10 @@ class survey_question_wiz(osv.osv_memory):
                     result['fields'] = fields
                     result['context'] = context
                 else:
-                    survey_obj.write(cr, uid, survey_id, {'tot_comp_survey' : sur_rec['tot_comp_survey'] + 1})
+                    survey_obj.write(cr, uid, survey_id, {'tot_comp_survey' : sur_rec.tot_comp_survey + 1})
                     sur_response_obj.write(cr, uid, [sur_name_read.response], {'state' : 'done'})
 
-                    if sur_rec['send_response']:
+                    if sur_rec.send_response:
                         survey_data = survey_obj.browse(cr, uid, int(survey_id))
                         response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']
                         context.update({'response_id':response_id})
@@ -465,7 +465,7 @@ class survey_question_wiz(osv.osv_memory):
                 tot_page_id = self.pool.get('survey').browse(cr, uid, context.get('survey_id',False))
                 tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids))
                 value[field] = tot_per
-        esponse_obj = self.pool.get('survey.response')
+        response_obj = self.pool.get('survey.response')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         
         if context.has_key('response_id') and context.get('response_id') and int(context['response_id'][0]) > 0:
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
index c07acadcb35..2074a88c02f 100644
--- a/addons/survey/wizard/survey_print_answer.py
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -20,7 +20,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
+from osv import fields
 from tools.translate import _
 
 class survey_print_answer(osv.osv_memory):
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index cd145c59008..00c4598bfb1 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -20,7 +20,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
+from osv import fields
 from tools.translate import _
 
 class survey_print_statistics(osv.osv_memory):
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index eda521b9734..1dab4b9c909 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -20,7 +20,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
+from osv import fields
 from tools.translate import _
 
 class survey_name_wiz(osv.osv_memory):
diff --git a/addons/survey/wizard/wizard_survey.py b/addons/survey/wizard/wizard_survey.py
deleted file mode 100755
index 0b3d546e6d7..00000000000
--- a/addons/survey/wizard/wizard_survey.py
+++ /dev/null
@@ -1,221 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import time
-import pooler
-from random import choice
-import string
-import tools
-from tools.translate import _
-import tools
-import os
-import datetime
-import netsvc
-import socket
-
-_survey_form = '''<?xml version="1.0"?>
-<form string="Send Invitation">
-    <separator string="Select Partner" colspan="4"/>
-    <field name="partner_ids" nolabel="1"  colspan="4"/> /> 
-    <separator colspan="4" string="Send mail for new user"/>
-    <group cols="2" colspan="4">
-        <field name="send_mail" nolabel="1"/>
-        <field name="mail_subject"/>
-        <newline/>
-        <separator colspan="4" string="Send reminder for existing user"/>
-        <field name="send_mail_existing" nolabel="1"/>
-        <field name="mail_subject_existing"/>    
-        <newline/>
-    </group>
-    <separator colspan="4"/>
-    <group cols="2" colspan="4">
-        <field name="mail_from" colspan="4"/>
-    </group>
-    <newline/>
-    <separator string="Message" colspan="4"/>
-    <field name="mail" nolabel="1" colspan="4"/>
-</form>'''
-
-
-_survey_fields = {
-    'partner_ids': {'string':'Partner', 'type':'many2many', 'relation':'res.partner', 'required' : '1'}, 
-    'send_mail': {'string':'Send mail for new user', 'type':'boolean', 'default':lambda *a: 1}, 
-    'send_mail_existing': {'string':'Send reminder for existing user', 'type':'boolean', 'default':lambda *a: 1}, 
-    'mail_subject': {'string':'Subject', 'type':'char', 'default':lambda *a: "New user account.", "size":256}, 
-    'mail_subject_existing': {'string':'Subject', 'type':'char', 'default':lambda *a: "User account info.", "size":256}, 
-    'mail_from': {'string':'From', 'type':'char', "size":256, 'required':True, 'default':lambda *a: tools.config['email_from']  },
-    'mail': {'string':'Body', 'type':'text'}, 
-    }
-
-second_form = '''<?xml version="1.0"?>
-<form string="User creation">
-    <separator string="Results :" colspan="4"/>
-    <field name="note" colspan="4" nolabel="1" width="300"/>
-</form>'''
-second_fields = {
-    'note' : {'string':'Log', 'type':'text', 'readonly':1}
-    }
-def genpasswd():
-    chars = string.letters + string.digits
-    return ''.join([choice(chars) for i in range(6)])
-
-def check_survey(self, cr, uid, data, context):
-    pool= pooler.get_pool(cr.dbname)
-    survey_obj = pool.get('survey')
-    msg = ""
-    name = ""
-    for sur in survey_obj.browse(cr, uid, data['ids']):
-        name += "\t --> " + sur.title + "\n"
-        if sur.state != 'open':
-            msg +=  sur.title + "\n"
-    if msg:
-        raise  wizard.except_wizard(_('Attention!'), _('%sSurvey is not in open state') % msg)
-    data['form']['mail'] = '''Hello %(name)s, \n\n We are inviting you for following survey. \
-                \n  ''' + name + '''\n Your login ID: %(login)s, Your password: %(passwd)s
-    \n link :- http://'''+ str(socket.gethostname()) + ''':8080 \n\n Thanks,''' 
-    return data['form']
-
-def send_mail(self, cr, uid, data, context):
-    partner_ids = data['form']['partner_ids'][0][2]
-    pool= pooler.get_pool(cr.dbname)
-    user_ref= pool.get('res.users')
-    survey_ref= pool.get('survey')
-    group_id= pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / User')])
-    act_id = pool.get('ir.actions.act_window')
-    act_id = act_id.search(cr, uid, [('name', '=', 'Give Survey Response'), \
-                                     ('res_model', '=' , 'survey.name.wiz'), ('view_type', '=', 'form')])
-    out="login,password\n"
-    skipped= 0
-    existing= ""
-    created= ""
-    error= ""
-    res_user = ""
-    user_exists = False
-    attachments = []
-    for id in survey_ref.browse(cr, uid, data['ids']):
-        report = create_report(cr, uid, [id.id], 'report.survey.form', id.title)
-        file = open(tools.config['addons_path'] + '/survey/report/' + id.title +".pdf")
-        file_data = ""
-        while 1:
-            line = file.readline()
-            file_data += line
-            if not line:
-                break
-        attachments.append((id.title +".pdf",file_data))
-        file.close()
-        os.remove(tools.config['addons_path'] + '/survey/report/' + id.title + ".pdf")
-
-    for partner in pool.get('res.partner').browse(cr, uid, partner_ids):
-        for addr in partner.address:
-            if not addr.email:
-                skipped+= 1
-                continue
-            user = user_ref.search(cr, uid, [('login', "=", addr.email)])
-            if user:
-                user = user_ref.browse(cr, uid, user[0])
-                user_ref.write(cr, uid, user.id, {'survey_id':[[6, 0, data['ids']]]})
-                mail= data['form']['mail']%{'login':addr.email, 'passwd':user.password, \
-                                            'name' : addr.name}
-                if data['form']['send_mail_existing']:
-                    tools.email_send(data['form']['mail_from'], [addr.email] , \
-                                     data['form']['mail_subject_existing'] , mail)
-                    existing+= "- %s (Login: %s,  Password: %s)\n" % (user.name, addr.email, \
-                                                                      user.password)
-                continue
-            user_id =user_ref.search(cr, uid, [('address_id', '=', addr.id)])
-            if user_id:
-                for user_email in user_ref.browse(cr, uid, user_id):
-                    mail= data['form']['mail']%{'login':user_email.login, \
-                                                    'passwd':user_email.password, 'name' : addr.name}
-                    if data['form']['send_mail_existing']:
-                        tools.email_send(data['form']['mail_from'], [addr.email],\
-                                              data['form']['mail_subject_existing'], mail)
-                        res_user+= "- %s (Login: %s,  Password: %s)\n" % \
-                             (user_email.name, user_email.login, user_email.password)
-                continue
-            passwd= genpasswd()
-            out+= addr.email + ',' + passwd + '\n'
-            mail= data['form']['mail'] % {'login' : addr.email, 'passwd' : passwd, 'name' : addr.name}
-            if data['form']['send_mail']:
-                
-                ans = tools.email_send(data['form']['mail_from'], [addr.email], \
-                                       data['form']['mail_subject'], mail,attach = attachments)
-
-                if ans:
-                    user = user_ref.create(cr, uid, {'name' : addr.name or 'Unknown', 
-                                        'login' : addr.email, 
-                                        'password' : passwd, 
-                                        'address_id' : addr.id, 
-                                        'groups_id' : [[6, 0, group_id]], 
-                                        'action_id' : act_id[0], 
-                                        'survey_id' :[[6, 0, data['ids']]]
-                                       })
-                    created+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
-                                                                      addr.email, passwd)
-                else:
-                    error+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
-                                                                    addr.email, passwd)
-    note= ""
-    if created:
-        note += 'Created users:\n%s\n\n' % (created)
-    if existing:
-        note +='Already existing users:\n%s\n\n' % (existing)
-    if skipped:
-        note += "%d contacts where ignored (an email address is missing).\n\n" % (skipped)
-    if error:
-        note += 'E-Mail not send successfully:\n====================\n%s\n' % (error)
-    if res_user:
-        note += 'E-mail ID used the following user:\n====================\n%s\n' % (res_user)
-    return {'note': note}
-
-
-def create_report(cr, uid, res_ids, report_name=False, file_name=False):
-    if not report_name or not res_ids:
-        return (False, Exception('Report name and Resources ids are required !!!'))
-    try:
-        ret_file_name = tools.config['addons_path'] + '/survey/report/' + file_name + '.pdf'
-        service = netsvc.LocalService(report_name);
-        (result, format) = service.create(cr, uid, res_ids, {}, {})
-        fp = open(ret_file_name, 'wb+');
-        fp.write(result);
-        fp.close();
-    except Exception,e:
-        print 'Exception in create report:',e
-        return (False, str(e))
-    return (True, ret_file_name)
-
-class send_mail_wizard(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [check_survey], 
-            'result' : {'type' : 'form', 'arch' :_survey_form, 'fields' :_survey_fields,\
-                             'state' : [('end', 'Cancel', 'gtk-cancel'), ('send', 'Send', 'gtk-go-forward')]}
-                }, 
-        'send' : {'actions' : [send_mail], 
-               'result' : {'type' : 'form', 
-                          'arch' : second_form, 
-                          'fields' : second_fields, 
-                          'state' : [('end', '_Ok')]}
-               }, 
-    }
-send_mail_wizard('wizard.send.invitation')

From 39796180244630490dc4e95589a3a7679d5fce40 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 23 Mar 2010 11:25:46 +0530
Subject: [PATCH 115/248] [IMP]: crm: Minor code improvements

bzr revid: rpa@tinyerp.com-20100323055546-f0589lfdc4kipfhk
---
 .../wizard/report_open_view.xml               |  4 +-
 addons/crm/crm.py                             | 66 +++++++++----------
 addons/crm/crm_fundraising.py                 | 57 ++++++++--------
 addons/crm/crm_helpdesk.py                    | 29 ++++----
 addons/crm/crm_lead.py                        |  2 +-
 5 files changed, 80 insertions(+), 78 deletions(-)

diff --git a/addons/base_report_creator/wizard/report_open_view.xml b/addons/base_report_creator/wizard/report_open_view.xml
index 337aa988ca5..941bcf73b6e 100644
--- a/addons/base_report_creator/wizard/report_open_view.xml
+++ b/addons/base_report_creator/wizard/report_open_view.xml
@@ -10,7 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Report open">
-                       	<separator string="" colspan="4" />
+                   	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel"
                     		string="Cancel" />
@@ -31,4 +31,4 @@
         </record>
         
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4740c0fdcf1..a3eb8437546 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -51,6 +51,7 @@ icon_lst = {
     'calendar': 'STOCK_SELECT_COLOR'
 }
 
+
 class crm_case_section(osv.osv):
     """ Cases Section"""
 
@@ -104,8 +105,7 @@ class crm_case_section(osv.osv):
     ]
 
     def name_get(self, cr, uid, ids, context={}):
-
-        """Overrides orm
+        """Overrides orm name_get method
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -125,6 +125,7 @@ class crm_case_section(osv.osv):
         return res
 crm_case_section()
 
+
 class crm_case_categ(osv.osv):
     """ Category of Case """
 
@@ -136,6 +137,7 @@ class crm_case_categ(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'object_id': fields.many2one('ir.model', 'Object Name'),
     }
+    
     def _find_object_id(self, cr, uid, context=None):
 
         """
@@ -148,12 +150,14 @@ class crm_case_categ(osv.osv):
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
-    _defaults = {
+        
+    _defaults = {        
         'object_id' : _find_object_id
     }
 #
 crm_case_categ()
 
+
 class crm_case_resource_type(osv.osv):
     """ Resource Type of case """
 
@@ -166,8 +170,8 @@ class crm_case_resource_type(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'object_id': fields.many2one('ir.model', 'Object Name'),
     }
+    
     def _find_object_id(self, cr, uid, context=None):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -206,6 +210,7 @@ class crm_case_stage(osv.osv):
                          help="Change Probability on next and previous stages."),
         'requirements': fields.text('Requirements')
     }
+    
     def _find_object_id(self, cr, uid, context=None):
 
         """
@@ -228,7 +233,6 @@ class crm_case_stage(osv.osv):
 crm_case_stage()
 
 def _links_get(self, cr, uid, context={}):
-
     """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -296,6 +300,7 @@ class crm_case(osv.osv):
         result = {}
         history_obj = False
         model_obj = self.pool.get('ir.model')
+
         if 'history_line' in field_names:
             history_obj = self.pool.get('crm.case.history')
             name = 'history_line'
@@ -315,6 +320,7 @@ class crm_case(osv.osv):
                 result[case.id] = {name: history_ids}
             else:
                 result[case.id] = {name: []}
+
         return result
 
     _columns = {
@@ -354,6 +360,7 @@ class crm_case(osv.osv):
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
+    
     def _get_default_partner_address(self, cr, uid, context):
 
         """
@@ -400,7 +407,6 @@ class crm_case(osv.osv):
         return user.address_id.email
 
     def _get_default_user(self, cr, uid, context):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -413,7 +419,6 @@ class crm_case(osv.osv):
         return uid
 
     def _get_section(self, cr, uid, context):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -435,6 +440,7 @@ class crm_case(osv.osv):
         'section_id': _get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
     }
+
     _order = 'date_deadline desc, create_date desc,id desc'
 
     def unlink(self, cr, uid, ids, context={}):
@@ -453,7 +459,6 @@ class crm_case(osv.osv):
         return super(crm_case, self).unlink(cr, uid, ids, context)
 
     def stage_next(self, cr, uid, ids, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -471,7 +476,6 @@ class crm_case(osv.osv):
         return True
 
     def get_stage_dict(self, cr, uid, ids, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -491,7 +495,6 @@ class crm_case(osv.osv):
         return s
 
     def stage_previous(self, cr, uid, ids, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -511,7 +514,6 @@ class crm_case(osv.osv):
         return True
 
     def onchange_case_id(self, cr, uid, ids, case_id, name, partner_id, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -538,7 +540,6 @@ class crm_case(osv.osv):
         return {'value': value}
 
     def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -552,7 +553,6 @@ class crm_case(osv.osv):
                                context=context)
 
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -660,9 +660,9 @@ class crm_case(osv.osv):
         self.__history(cr, uid, cases, _('Send'), history=True, email=False)
         for case in cases:
             self.write(cr, uid, [case.id], {
-                'description': False,
-                'som': False,
-                'canal_id': False,
+                'description': False, 
+                'som': False, 
+                'canal_id': False, 
                 })
             emails = [case.email_from] + (case.email_cc or '').split(',')
             emails = filter(None, emails)
@@ -676,11 +676,11 @@ class crm_case(osv.osv):
                         _("No E-Mail ID Found for your Company address!"))
 
             tools.email_send(
-                emailfrom,
-                emails,
-                '[' + str(case.id) + '] ' + case.name,
-                self.format_body(body),
-                reply_to = case.section_id.reply_to,
+                emailfrom, 
+                emails, 
+                '[' + str(case.id) + '] ' + case.name, 
+                self.format_body(body), 
+                reply_to = case.section_id.reply_to, 
                 openobject_id = str(case.id)
             )
         return True
@@ -846,14 +846,14 @@ class crm_case_log(osv.osv):
 
     _order = "id desc"
     _columns = {
-        'name': fields.char('Status', size=64),
-        'som': fields.many2one('res.partner.som', 'State of Mind'),
-        'date': fields.datetime('Date'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel'),
-        'section_id': fields.many2one('crm.case.section', 'Section'),
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
-        'model_id': fields.many2one('ir.model', "Model"),
-        'res_id': fields.integer('Resource ID'),
+        'name': fields.char('Status', size=64), 
+        'som': fields.many2one('res.partner.som', 'State of Mind'), 
+        'date': fields.datetime('Date'), 
+        'canal_id': fields.many2one('res.partner.canal', 'Channel'), 
+        'section_id': fields.many2one('crm.case.section', 'Section'), 
+        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
+        'model_id': fields.many2one('ir.model', "Model"), 
+        'res_id': fields.integer('Resource ID'), 
     }
 
     _defaults = {
@@ -886,11 +886,11 @@ class crm_case_history(osv.osv):
         return res
 
     _columns = {
-        'description': fields.text('Description'),
-        'note': fields.function(_note_get, method=True, string="Description", type="text"),
-        'email': fields.char('Email', size=84),
+        'description': fields.text('Description'), 
+        'note': fields.function(_note_get, method=True, string="Description", type="text"), 
+        'email': fields.char('Email', size=84), 
         'email_from' : fields.char('From Email', size=84),
-        'log_id': fields.many2one('crm.case.log', 'Log', ondelete='cascade'),
+        'log_id': fields.many2one('crm.case.log', 'Log', ondelete='cascade'), 
     }
 
 crm_case_history()
diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py
index cc89342df29..927a3d05915 100644
--- a/addons/crm/crm_fundraising.py
+++ b/addons/crm/crm_fundraising.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
+from osv import fields, osv, orm
 import crm
 
 class crm_fundraising(osv.osv):
@@ -31,46 +31,45 @@ class crm_fundraising(osv.osv):
     _inherit ='crm.case'
 
     _columns = {
-            'date_closed': fields.datetime('Closed', readonly=True),
-            'date': fields.datetime('Date'),
-            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-            'categ_id': fields.many2one('crm.case.categ','Category', \
+            'date_closed': fields.datetime('Closed', readonly=True), 
+            'date': fields.datetime('Date'), 
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+            'categ_id': fields.many2one('crm.case.categ', 'Category', \
                                 domain="[('section_id','=',section_id),\
-                                ('object_id.model', '=', 'crm.fundraising')]"),
-            'planned_revenue': fields.float('Planned Revenue'),
-            'planned_cost': fields.float('Planned Costs'),
-            'probability': fields.float('Probability (%)'),
-            'partner_name': fields.char("Employee's Name", size=64),
-            'partner_name2': fields.char('Employee Email', size=64),
-            'partner_phone': fields.char('Phone', size=32),
-            'partner_mobile': fields.char('Mobile', size=32),
-            'stage_id': fields.many2one ('crm.case.stage', 'Stage',\
+                                ('object_id.model', '=', 'crm.fundraising')]"), 
+            'planned_revenue': fields.float('Planned Revenue'), 
+            'planned_cost': fields.float('Planned Costs'), 
+            'probability': fields.float('Probability (%)'), 
+            'partner_name': fields.char("Employee's Name", size=64), 
+            'partner_name2': fields.char('Employee Email', size=64), 
+            'partner_phone': fields.char('Phone', size=32), 
+            'partner_mobile': fields.char('Mobile', size=32), 
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
                              domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.fundraising')]"),
-            'type_id': fields.many2one('crm.case.resource.type', 'Fundraising Type',\
+                            ('object_id.model', '=', 'crm.fundraising')]"), 
+            'type_id': fields.many2one('crm.case.resource.type', 'Fundraising Type', \
                              domain="[('section_id','=',section_id),\
-                             ('object_id.model', '=', 'crm.fundraising')]"),
-            'duration': fields.float('Duration'),
-            'ref': fields.reference('Reference', selection=crm._links_get, size=128),
-            'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
-            'canal_id': fields.many2one('res.partner.canal', 'Channel',\
+                             ('object_id.model', '=', 'crm.fundraising')]"), 
+            'duration': fields.float('Duration'), 
+            'ref': fields.reference('Reference', selection=crm._links_get, size=128), 
+            'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 
+            'canal_id': fields.many2one('res.partner.canal', 'Channel', \
                         help="The channels represent the different communication \
                         modes available with the customer." \
                        " With each commercial opportunity, you can indicate\
-                     the canall which is this opportunity source."),
-            'som': fields.many2one('res.partner.som', 'State of Mind',\
+                     the canall which is this opportunity source."), 
+            'som': fields.many2one('res.partner.som', 'State of Mind', \
                          help="The minds states allow to define a value scale which represents" \
                               "the partner mentality in relation to our services.The scale has" \
                             "to be created with a factor for each level from 0 \
-                             (Very dissatisfied) to 10 (Extremely satisfied)."),
+                             (Very dissatisfied) to 10 (Extremely satisfied)."), 
         }
 
     _defaults = {
-                 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
-                 'probability':lambda *a:0.0,
-                 'planned_cost':lambda *a:0.0,
-                 'planned_revenue':lambda *a:0.0,
-
+                 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
+                 'probability':lambda *a:0.0, 
+                 'planned_cost':lambda *a:0.0, 
+                 'planned_revenue':lambda *a:0.0, 
     }
 
 crm_fundraising()
diff --git a/addons/crm/crm_helpdesk.py b/addons/crm/crm_helpdesk.py
index c9317b52a3b..9090ef25b5f 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm/crm_helpdesk.py
@@ -19,7 +19,10 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
+from osv import orm
+from osv import osv
+from osv import fields
+
 import crm
 
 class crm_helpdesk(osv.osv):
@@ -31,25 +34,25 @@ class crm_helpdesk(osv.osv):
     _inherit = 'crm.case'
 
     _columns = {
-            'date_closed': fields.datetime('Closed', readonly=True),
-            'date': fields.datetime('Date'),
-            'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
-            'canal_id': fields.many2one('res.partner.canal', 'Channel',\
+            'date_closed': fields.datetime('Closed', readonly=True), 
+            'date': fields.datetime('Date'), 
+            'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
+            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 
+            'canal_id': fields.many2one('res.partner.canal', 'Channel', \
                             help="The channels represent the different communication \
                              modes available with the customer." \
                             " With each commercial opportunity, you can indicate\
-                             the canall which is this opportunity source."),
-            'planned_revenue': fields.float('Planned Revenue'),
-            'planned_cost': fields.float('Planned Costs'),
-            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-            'probability': fields.float('Probability (%)'),
+                             the canall which is this opportunity source."), 
+            'planned_revenue': fields.float('Planned Revenue'), 
+            'planned_cost': fields.float('Planned Costs'), 
+            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+            'probability': fields.float('Probability (%)'), 
             'som': fields.many2one('res.partner.som', 'State of Mind', \
                             help="The minds states allow to define a value scale which represents" \
                                 "the partner mentality in relation to our services.The scale has" \
                                 "to be created with a factor for each level from 0 \
-                                (Very dissatisfied) to 10 (Extremely satisfied)."),
-            'categ_id': fields.many2one('crm.case.categ', 'Category',\
+                                (Very dissatisfied) to 10 (Extremely satisfied)."), 
+            'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.helpdesk')]"),
             'duration': fields.float('Duration'),
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index a8a76d6de5f..00cebd4dcbf 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -110,7 +110,7 @@ class crm_lead(osv.osv):
         }
 
     _defaults = {
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 

From 815b27682669850715945ec4858cb1e68225dedc Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 23 Mar 2010 11:48:25 +0530
Subject: [PATCH 116/248] [IMP]: mailgateway script: Improvement for
 attachment, [IMP]: crm: Improvement in lead to opportunity wizard for leads
 history lines

bzr revid: rpa@tinyerp.com-20100323061825-fw7np8dhnzvi0t93
---
 .../openerp_mailgate/openerp_mailgate.py      | 27 ++++++++++++++++---
 addons/crm/wizard/crm_lead_to_opportunity.py  | 25 ++++++++++++++---
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 9db7e24acee..377804e5e2a 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -182,8 +182,7 @@ class email_parser(object):
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
                 e = '\n\nThe Specified user does not have an access to the CRM case.'
             print e
-        attachments = message['attachment']
-
+        attachments = message['attachment']        
         for attach in attachments or []:
             data_attach = {
                 'name': str(attach), 
@@ -266,7 +265,7 @@ class email_parser(object):
         data = {
 #            'description': body['body'],
         }
-        act = 'case_pending'
+        act = 'case_open'
         if 'state' in actions:
             if actions['state'] in ['draft', 'close', 'cancel', 'open', 'pending']:
                 act = 'case_' + actions['state']
@@ -291,6 +290,17 @@ class email_parser(object):
 
         self.rpc(self.model, act, [id])
         self.rpc(self.model, 'write', [id], data)
+        attachments = body['attachment']        
+        for attach in attachments or []:
+            data_attach = {
+                'name': str(attach), 
+                'datas': binascii.b2a_base64(str(attachments[attach])), 
+                'datas_fname': str(attach), 
+                'description': 'Mail attachment', 
+                'res_model': self.model, 
+                'res_id': id
+            }
+            self.rpc('ir.attachment', 'create', data_attach)
         self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], body['body'])
         return id
 
@@ -323,6 +333,17 @@ class email_parser(object):
         #    'description':body, 
         #}
         #self.rpc(self.model, 'write', [id], data)
+        attachments = message['attachment']        
+        for attach in attachments or []:
+            data_attach = {
+                'name': str(attach), 
+                'datas': binascii.b2a_base64(str(attachments[attach])), 
+                'datas_fname': str(attach), 
+                'description': 'Mail attachment', 
+                'res_model': self.model, 
+                'res_id': id
+            }
+            self.rpc('ir.attachment', 'create', data_attach)
         self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
         return id
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 152df5d732f..a5f97b1abd6 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -227,8 +227,10 @@ class lead2opportunity(partner_create):
             id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
         lead_case_obj = pool.get('crm.lead')
-        opportunity_case_obj = pool.get('crm.opportunity')        
-        for lead in lead_case_obj.browse(cr, uid, data['ids']):
+        history_obj = pool.get('crm.case.history')
+        opportunity_case_obj = pool.get('crm.opportunity')
+        model_obj = pool.get('ir.model')        
+        for lead in lead_case_obj.browse(cr, uid, data['ids']):             
             new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
                 'name': data['form']['name'],
                 'planned_revenue': data['form']['planned_revenue'],
@@ -240,11 +242,15 @@ class lead2opportunity(partner_create):
                 'partner_address_id':lead.partner_address_id.id, 
                 'priority': lead.priority,
                 'phone': lead.phone,                
-                'email_from': lead.email_from
+                'email_from': lead.email_from,                
             })       
             
             new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
-            
+            model_ids = model_obj.search(cr, uid, [('model','=','crm.opportunity')])
+
+            for his_id in lead.history_line:
+                history_ids = history_obj.copy(cr, uid, his_id.id, {'model_id' : model_ids[0], 'res_id':new_opportunity})    
+
             vals = {
                 'partner_id': data['form']['partner_id'],                
                 }
@@ -332,6 +338,8 @@ class crm_lead2opportunity(osv.osv_memory):
             lead_obj = self.pool.get('crm.lead')
             opp_obj = self. pool.get('crm.opportunity')
             data_obj = self.pool.get('ir.model.data')
+            history_obj = pool.get('crm.case.history')
+            model_obj = pool.get('ir.model')
 
             # Get Opportunity views
             result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
@@ -344,6 +352,8 @@ class crm_lead2opportunity(osv.osv_memory):
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
             lead = lead_obj.browse(cr, uid, record_id, context=context)
+            model_ids = model_obj.search(cr, uid, [('model','=','crm.opportunity')])
+
 
             for this in self.browse(cr, uid, ids, context=context):
                 new_opportunity_id = opp_obj.create(cr, uid, {
@@ -370,6 +380,13 @@ class crm_lead2opportunity(osv.osv_memory):
 
                 lead_obj.write(cr, uid, [lead.id], vals)
                 lead_obj.case_close(cr, uid, [lead.id])
+                
+                # Copy lead history to opportunity
+                for his_id in lead.history_line:
+                    history_ids = history_obj.copy(cr, uid, his_id.id, \
+                                                {'model_id': model_ids[0], \
+                                                'res_id': new_opportunity_id})
+
                 opp_obj.case_open(cr, uid, [new_opportunity_id])
 
             value = {

From a57bd96beabbbf00d87e683f0f83bb1aa339a9ba Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Tue, 23 Mar 2010 12:14:59 +0530
Subject: [PATCH 117/248] [IMP] survey :- Improve code of survey_answer.py file
 and fixed data['id'](report) problem in base_calendar.py

bzr revid: ysa@tinyerp.co.in-20100323064459-10fqwqh35uixsikm
---
 addons/base_calendar/base_calendar.py         |   3 +-
 .../survey/report/survey_browse_response.py   |   2 +-
 addons/survey/wizard/survey_answer.py         | 214 +++++++++---------
 3 files changed, 109 insertions(+), 110 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4aa274a0a68..febd11a7747 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1419,7 +1419,8 @@ class virtual_report_spool(web_services.report_spool):
         new_ids = []
         for id in ids:
             new_ids.append(base_calendar_id2real_id(id))
-        datas['id'] = base_calendar_id2real_id(datas['id'])        
+        if datas.get('id',False):   
+            datas['id'] = base_calendar_id2real_id(datas['id'])
         return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
 
 virtual_report_spool()
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 41c38ceef4d..48d56126a8f 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -445,7 +445,7 @@ class survey_browse_response(report_rml):
                                         matrix_ans.append((col.id, col.title))
                                 len_matrix = len(matrix_ans)
                                 if que.type in ['matrix_of_choices_only_one_ans', 'rating_scale'] and que.comment_column:
-                                    matrix_ans.append(que.column_name)
+                                    matrix_ans.append((0,que.column_name))
                                 rml += """<blockTable colWidths=" """ + colWidths + """ " style="simple_table"><tr>"""
 
                                 for mat_col in range(0, len(matrix_ans)):
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 630b0a30c01..e6790427cb9 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -80,8 +80,6 @@ class survey_question_wiz(osv.osv_memory):
                 context.pop('active_id')
 
             survey_id = context.get('survey_id', False)
-            #TODO: change to the browse, use read if only need to read few columns values
-            # this will fire select * from quary 
             sur_rec = survey_obj.browse(cr, uid, survey_id)
             p_id = map(lambda x:x.id, sur_rec.page_ids)
             total_pages = len(p_id)
@@ -132,8 +130,8 @@ class survey_question_wiz(osv.osv_memory):
                     if sur_name_rec.page_no > 1:
                         pre_button = True
                 if flag:
-                    pag_rec = page_obj.read(cr, uid, p_id)
-                    xml_form = etree.Element('form', {'string': _(tools.ustr(pag_rec['title']))})
+                    pag_rec = page_obj.browse(cr, uid, p_id)
+                    xml_form = etree.Element('form', {'string': _(tools.ustr(pag_rec.title))})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                     if context.has_key('response_id') and context.get('response_id', False)  and int(context.get('response_id',0)[0]) > 0:
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '40', 'colspan': '4'})
@@ -149,19 +147,19 @@ class survey_question_wiz(osv.osv_memory):
                         fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}}
                         etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0)})
 
-                    if pag_rec['note']:
+                    if pag_rec.note:
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-                        for que_test in pag_rec['note'].split('\n'):
+                        for que_test in pag_rec.note.split('\n'):
                             etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
-                    que_ids = pag_rec['question_ids']
+                    que_ids = pag_rec.question_ids
                     qu_no = 0
 
                     for que in que_ids:
                         qu_no += 1
-                        que_rec = que_obj.read(cr, uid, que)
+                        que_rec = que_obj.browse(cr, uid, que.id)
                         descriptive_text = ""
-                        separator_string = tools.ustr(qu_no) + "." + tools.ustr(que_rec['question'])
-                        if ((context.has_key('active') and not context.get('active',False)) or not context.has_key('active')) and que_rec['is_require_answer']:
+                        separator_string = tools.ustr(qu_no) + "." + tools.ustr(que_rec.question)
+                        if ((context.has_key('active') and not context.get('active',False)) or not context.has_key('active')) and que_rec.is_require_answer:
                             star = '*'
                         else:
                             star = ''
@@ -178,25 +176,25 @@ class survey_question_wiz(osv.osv_memory):
                             xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '4'})
 
-                        ans_ids = ans_obj.read(cr, uid, que_rec['answer_choice_ids'], [])
+                        ans_ids = que_rec.answer_choice_ids
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
 
-                        if que_rec['type'] == 'multiple_choice_only_one_ans':
+                        if que_rec.type == 'multiple_choice_only_one_ans':
                             selection = []
                             for ans in ans_ids:
-                                selection.append((tools.ustr(ans['id']), ans['answer']))
+                                selection.append((tools.ustr(ans.id), ans.answer))
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
-                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_selection"})
-                            fields[tools.ustr(que) + "_selection"] = {'type':'selection', 'selection' :selection, 'string':"Answer"}
+                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_selection"})
+                            fields[tools.ustr(que.id) + "_selection"] = {'type':'selection', 'selection' :selection, 'string':"Answer"}
 
-                        elif que_rec['type'] == 'multiple_choice_multiple_ans':
+                        elif que_rec.type == 'multiple_choice_multiple_ans':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
-                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'boolean', 'string':ans['answer']}
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_" + tools.ustr(ans.id)})
+                                fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id)] = {'type':'boolean', 'string':ans.answer}
 
-                        elif que_rec['type'] in ['matrix_of_choices_only_one_ans', 'rating_scale']:
-                            if que_rec['comment_column']:
+                        elif que_rec.type in ['matrix_of_choices_only_one_ans', 'rating_scale']:
+                            if que_rec.comment_column:
                                 col = "4"
                                 colspan = "4"
                             else:
@@ -205,135 +203,135 @@ class survey_question_wiz(osv.osv_memory):
                             xml_group = etree.SubElement(xml_group, 'group', {'col': tools.ustr(col), 'colspan': tools.ustr(colspan)})
                             for row in ans_ids:
                                 etree.SubElement(xml_group, 'newline')
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_selection_" + tools.ustr(row['id']),'string':to_xml(tools.ustr(row['answer']))})
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_selection_" + tools.ustr(row.id),'string':to_xml(tools.ustr(row.answer))})
                                 selection = [('','')]
-                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                    selection.append((str(col['id']), col['title']))
-                                fields[tools.ustr(que) + "_selection_" + tools.ustr(row['id'])] = {'type':'selection', 'selection' : selection, 'string': "Answer"}
-                                if que_rec['comment_column']:
-                                   fields[tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id']) + "_field"] = {'type':'char', 'size' : 255, 'string':tools.ustr(que_rec['column_name']), 'views':{}}
-                                   etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id'])+ "_field"})
+                                for col in que_rec.column_heading_ids:
+                                    selection.append((str(col.id), col.title))
+                                fields[tools.ustr(que.id) + "_selection_" + tools.ustr(row.id)] = {'type':'selection', 'selection' : selection, 'string': "Answer"}
+                                if que_rec.comment_column:
+                                   fields[tools.ustr(que.id) + "_commentcolumn_"+tools.ustr(row.id) + "_field"] = {'type':'char', 'size' : 255, 'string':tools.ustr(que_rec.column_name), 'views':{}}
+                                   etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_commentcolumn_"+tools.ustr(row.id)+ "_field"})
 
-                        elif que_rec['type'] == 'matrix_of_choices_only_multi_ans':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
+                        elif que_rec.type == 'matrix_of_choices_only_multi_ans':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec.column_heading_ids) + 1), 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
-                            for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col['title']),'colspan': '1'})
+                            for col in que_rec.column_heading_ids:
+                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col.title),'colspan': '1'})
                             for row in ans_ids:
-                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row['answer'])) +' :-', 'align': '0.0'})
-                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']), 'nolabel':"1"})
-                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'boolean', 'string': col['title']}
+                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row.answer)) +' :-', 'align': '0.0'})
+                                for col in que_col_head.read(cr, uid, que_rec.column_heading_ids):
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_" + tools.ustr(row.id) + "_" + tools.ustr(col.id), 'nolabel':"1"})
+                                    fields[tools.ustr(que.id) + "_" + tools.ustr(row.id)  + "_" + tools.ustr(col.id)] = {'type':'boolean', 'string': col.title}
 
-                        elif que_rec['type'] == 'matrix_of_drop_down_menus':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
+                        elif que_rec.type == 'matrix_of_drop_down_menus':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec.column_heading_ids) + 1), 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
-                            for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col['title']),'colspan': '1'})
+                            for col in que_rec.column_heading_ids:
+                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col.title),'colspan': '1'})
                             for row in ans_ids:
-                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row['answer']))+' :-', 'align': '0.0'})
-                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
+                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row.answer))+' :-', 'align': '0.0'})
+                                for col in que_rec.column_heading_ids:
                                     selection = []
-                                    if col['menu_choice']:
-                                        for item in col['menu_choice'].split('\n'):
+                                    if col.menu_choice:
+                                        for item in col.menu_choice.split('\n'):
                                             if item and not item.strip() == '': selection.append((item ,item))
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']),'nolabel':'1'})
-                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'selection', 'string': col['title'], 'selection':selection}
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_" + tools.ustr(row.id) + "_" + tools.ustr(col.id),'nolabel':'1'})
+                                    fields[tools.ustr(que.id) + "_" + tools.ustr(row.id)  + "_" + tools.ustr(col.id)] = {'type':'selection', 'string': col.title, 'selection':selection}
 
-                        elif que_rec['type'] == 'multiple_textboxes':
+                        elif que_rec.type == 'multiple_textboxes':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             type = "char"
-                            if que_rec['is_validation_require']:
-                                if que_rec['validation_type'] in ['must_be_whole_number']:
+                            if que_rec.is_validation_require:
+                                if que_rec.validation_type in ['must_be_whole_number']:
                                     type = "integer"
-                                elif que_rec['validation_type'] in ['must_be_decimal_number']:
+                                elif que_rec.validation_type in ['must_be_decimal_number']:
                                     type = "float"
-                                elif que_rec['validation_type'] in ['must_be_date']:
+                                elif que_rec.validation_type in ['must_be_date']:
                                     type = "date"
                             for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"})
                                 if type == "char" :
-                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
+                                    fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"] = {'type':'char', 'size':255, 'string':ans.answer}
                                 else:
-                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type': str(type), 'string':ans['answer']}
+                                    fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"] = {'type': str(type), 'string':ans.answer}
 
-                        elif que_rec['type'] == 'numerical_textboxes':
+                        elif que_rec.type == 'numerical_textboxes':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"})
-                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_numeric"] = {'type':'integer', 'string':ans['answer']}
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_numeric"})
+                                fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_numeric"] = {'type':'integer', 'string':ans.answer}
 
-                        elif que_rec['type'] == 'date':
+                        elif que_rec.type == 'date':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
-                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'date', 'string':ans['answer']}
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id)})
+                                fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id)] = {'type':'date', 'string':ans.answer}
 
-                        elif que_rec['type'] == 'date_and_time':
+                        elif que_rec.type == 'date_and_time':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id'])})
-                                fields[tools.ustr(que) + "_" + tools.ustr(ans['id'])] = {'type':'datetime', 'string':ans['answer']}
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id)})
+                                fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id)] = {'type':'datetime', 'string':ans.answer}
 
-                        elif que_rec['type'] == 'descriptive_text':
-                            for que_test in que_rec['descriptive_text'].split('\n'):
+                        elif que_rec.type == 'descriptive_text':
+                            for que_test in que_rec.descriptive_text.split('\n'):
                                 etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
 
-                        elif que_rec['type'] == 'single_textbox':
-                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_single", 'nolabel':"1" ,'colspan':"4"})
-                            fields[tools.ustr(que) + "_single"] = {'type':'char', 'size' : 255, 'string':"single_textbox", 'views':{}}
+                        elif que_rec.type == 'single_textbox':
+                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_single", 'nolabel':"1" ,'colspan':"4"})
+                            fields[tools.ustr(que.id) + "_single"] = {'type':'char', 'size' : 255, 'string':"single_textbox", 'views':{}}
 
-                        elif que_rec['type'] == 'comment':
-                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_comment", 'nolabel':"1" ,'colspan':"4"})
-                            fields[tools.ustr(que) + "_comment"] = {'type':'text', 'string':"Comment/Eassy Box", 'views':{}}
+                        elif que_rec.type == 'comment':
+                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_comment", 'nolabel':"1" ,'colspan':"4"})
+                            fields[tools.ustr(que.id) + "_comment"] = {'type':'text', 'string':"Comment/Eassy Box", 'views':{}}
 
-                        elif que_rec['type'] == 'table':
-                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids'])), 'colspan': '4'})
-                            for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col['title']),'colspan': '1'})
-                            for row in range(0,que_rec['no_of_rows']):
-                                for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row), 'nolabel':"1"})
-                                    fields[tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row)] = {'type':'char','size':255,'views':{}}
+                        elif que_rec.type == 'table':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec.column_heading_ids)), 'colspan': '4'})
+                            for col in que_rec.column_heading_ids:
+                                etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col.title),'colspan': '1'})
+                            for row in range(0,que_rec.no_of_rows):
+                                for col in que_rec.column_heading_ids:
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_table_" + tools.ustr(col.id) +"_"+ tools.ustr(row), 'nolabel':"1"})
+                                    fields[tools.ustr(que.id) + "_table_" + tools.ustr(col.id) +"_"+ tools.ustr(row)] = {'type':'char','size':255,'views':{}}
 
-                        elif que_rec['type'] == 'multiple_textboxes_diff_type':
+                        elif que_rec.type == 'multiple_textboxes_diff_type':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
-                                if ans['type'] == "email" :
-                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'widget':'email','width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
+                                if ans.type == "email" :
+                                    fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"] = {'type':'char', 'size':255, 'string':ans.answer}
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'widget':'email','width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"})
                                 else:
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
-                                    if ans['type'] == "char" :
-                                        fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
-                                    elif ans['type'] in ['integer','float','date','datetime']:
-                                        fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type': str(ans['type']), 'string':ans['answer']}
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"})
+                                    if ans.type == "char" :
+                                        fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"] = {'type':'char', 'size':255, 'string':ans.answer}
+                                    elif ans.type in ['integer','float','date','datetime']:
+                                        fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"] = {'type': str(ans.type), 'string':ans.answer}
                                     else:
                                         selection = []
-                                        if ans['menu_choice']:
-                                            for item in ans['menu_choice'].split('\n'):
+                                        if ans.menu_choice:
+                                            for item in ans.menu_choice.split('\n'):
                                                 if item and not item.strip() == '': selection.append((item ,item))
-                                        fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'selection', 'selection' : selection, 'string':ans['answer']}
+                                        fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"] = {'type':'selection', 'selection' : selection, 'string':ans.answer}
 
-                        if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale'] and que_rec['is_comment_require']:
-                            if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans'] and que_rec['comment_field_type'] in ['char','text'] and que_rec['make_comment_field']:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_otherfield", 'colspan':"4"})
-                                fields[tools.ustr(que) + "_otherfield"] = {'type':'boolean', 'string':que_rec['comment_label'], 'views':{}}
-                                if que_rec['comment_field_type'] == 'char':
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
-                                    fields[tools.ustr(que) + "_other"] = {'type': 'char', 'string': '', 'size':255, 'views':{}}
-                                elif que_rec['comment_field_type'] == 'text':
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
-                                    fields[tools.ustr(que) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
+                        if que_rec.type in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale'] and que_rec.is_comment_require:
+                            if que_rec.type in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans'] and que_rec.comment_field_type in ['char','text'] and que_rec.make_comment_field:
+                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_otherfield", 'colspan':"4"})
+                                fields[tools.ustr(que.id) + "_otherfield"] = {'type':'boolean', 'string':que_rec.comment_label, 'views':{}}
+                                if que_rec.comment_field_type == 'char':
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que.id) + "_other"] = {'type': 'char', 'string': '', 'size':255, 'views':{}}
+                                elif que_rec.comment_field_type == 'text':
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que.id) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
                             else:
-                                if que_rec['comment_field_type'] == 'char':
-                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec['comment_label'])),'colspan':"4"})
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
-                                    fields[tools.ustr(que) + "_other"] = {'type': 'char', 'string': '', 'size':255, 'views':{}}
-                                elif que_rec['comment_field_type'] == 'text':
-                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec['comment_label'])),'colspan':"4"})
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que) + "_other", 'nolabel':"1" ,'colspan':"4"})
-                                    fields[tools.ustr(que) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
+                                if que_rec.comment_field_type == 'char':
+                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec.comment_label)),'colspan':"4"})
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que.id) + "_other"] = {'type': 'char', 'string': '', 'size':255, 'views':{}}
+                                elif que_rec.comment_field_type == 'text':
+                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_rec.comment_label)),'colspan':"4"})
+                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_other", 'nolabel':"1" ,'colspan':"4"})
+                                    fields[tools.ustr(que.id) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
 
                     etree.SubElement(xml_form, 'separator', {'colspan': '4'})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '6', 'colspan': '4'})

From c184f21599567db7cefe5664d68808f522e95d07 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 23 Mar 2010 17:14:55 +0530
Subject: [PATCH 118/248] [REF]: crm: Separated osv_memory wizard for add cc
 from crm.py into wizard folder

bzr revid: rpa@tinyerp.com-20100323114455-hdla4728nv6cyx69
---
 addons/crm/__terp__.py                      |   1 +
 addons/crm/crm.py                           |  74 --------------
 addons/crm/crm_view.xml                     |  35 -------
 addons/crm/wizard/__init__.py               |   3 +-
 addons/crm/wizard/crm_email_add_cc.py       | 106 ++++++++++++++++++++
 addons/crm/wizard/crm_email_add_cc_view.xml |  52 ++++++++++
 6 files changed, 160 insertions(+), 111 deletions(-)
 create mode 100644 addons/crm/wizard/crm_email_add_cc.py
 create mode 100644 addons/crm/wizard/crm_email_add_cc_view.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 2dab4b27a88..90d2a63e09a 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -74,6 +74,7 @@ between mails and Open ERP.""",
         'wizard/crm_partner_to_opportunity_view.xml',
         
         'wizard/crm_send_email_view.xml', 
+        'wizard/crm_email_add_cc_view.xml',  
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 0d2654aa9aa..612a128b32b 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -894,80 +894,6 @@ class crm_case_history(osv.osv):
 
 crm_case_history()
 
-class crm_email_add_cc_wizard(osv.osv_memory):
-    """ Email Add CC"""
-
-    _name = "crm.email.add.cc"
-    _description = "Email Add CC"
-
-    _columns = {
-        'name': fields.selection([('user', 'User'), ('partner', 'Partner'),\
-                         ('email', 'Email Address')], 'Send to', required=True),
-        'user_id': fields.many2one('res.users', "User"),
-        'partner_id': fields.many2one('res.partner', "Partner"),
-        'email': fields.char('Email', size=32),
-        'subject': fields.char('Subject', size=32),
-    }
-
-    def change_email(self, cr, uid, ids, user, partner):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of Mail’s IDs
-        """
-
-        if (not partner and not user):
-            return {'value': {'email': False}}
-        email = False
-        if partner:
-            addr = self.pool.get('res.partner').address_get(cr, uid, [partner], ['contact'])
-            if addr:
-                email = self.pool.get('res.partner.address').read(cr, uid, addr['contact'] , ['email'])['email']
-        elif user:
-            addr = self.pool.get('res.users').read(cr, uid, user, ['address_id'])['address_id']
-            if addr:
-                email = self.pool.get('res.partner.address').read(cr, uid, addr[0] , ['email'])['email']
-        return {'value': {'email': email}}
-
-
-    def add_cc(self, cr, uid, ids, context={}):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of create menu’s IDs
-            @param context: A standard dictionary for contextual values
-        """
-
-        data = self.read(cr, uid, ids[0])
-        email = data['email']
-        subject = data['subject']
-
-        if not context:
-            return {}
-        history_line = self.pool.get('crm.case.history').browse(cr, uid, context['active_id'])
-        model = history_line.log_id.model_id.model
-        model_pool = self.pool.get(model)
-        case = model_pool.browse(cr, uid, history_line.log_id.res_id)
-        body = history_line.description.replace('\n', '\n> ')
-        flag = tools.email_send(
-            case.user_id.address_id.email,
-            [case.email_from],
-            subject or '[' + str(case.id) + '] ' + case.name,
-            model_pool.format_body(body),
-            email_cc = [email],
-            openobject_id = str(case.id),
-            subtype = "html"
-        )
-
-        if flag:
-            model_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ',' + email or email})
-        else:
-            raise osv.except_osv(_('Email Fail!'), ("Lastest Email is not sent successfully"))
-        return {}
-
-crm_email_add_cc_wizard()
 
 class users(osv.osv):
     _inherit = 'res.users'
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 16abc70f8b8..1112c63f072 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -194,41 +194,6 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 
-<!-- CRM Email Add CC Form View  -->
-
-       <record id="view_crm_email_add_cc_wizard" model="ir.ui.view">
-            <field name="name">Add CC</field>
-            <field name="model">crm.email.add.cc</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Add CC">
-                    <field name="name"/>
-                    <field name="subject"/>
-                    <separator string="" colspan="4"/>
-                    <newline/>
-                    <field name="user_id"
-                        attrs="{ 'required' : [('name','=','user')]}"
-                        on_change="change_email(user_id, partner_id)"/>
-                    <field name="partner_id"
-                        attrs="{'required' : [('name','=','partner')]}"
-                        on_change="change_email(user_id, partner_id)"/>
-                    <field name="email"/>
-                    <button name="add_cc" string="Ok" type="object" icon="gtk-go-forward"/>
-                </form>
-            </field>
-        </record>
-
-<!-- CRM Email Add CC Action  -->
-
-        <record id="action_view_crm_email_add_cc_wizard" model="ir.actions.act_window">
-            <field name="name">Add CC</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">crm.email.add.cc</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
 <!-- Cases Tree View  -->
 
         <record id="crm_case_log_tree-view" model="ir.ui.view">
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 7b4bb5704f6..927467dfb54 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import crm_send_email
-import wizard_history_event
+import crm_email_add_cc
 
 import crm_lead_to_partner
 import crm_lead_to_opportunity
@@ -34,6 +34,5 @@ import crm_phonecall_to_meeting
 import crm_phonecall_to_opportunity
 import crm_partner_to_opportunity
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/crm_email_add_cc.py b/addons/crm/wizard/crm_email_add_cc.py
new file mode 100644
index 00000000000..9af1b5eda5d
--- /dev/null
+++ b/addons/crm/wizard/crm_email_add_cc.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+import tools
+
+class crm_email_add_cc_wizard(osv.osv_memory):
+    """ Email Add CC"""
+
+    _name = "crm.email.add.cc"
+    _description = "Email Add CC"
+
+    _columns = {
+        'name': fields.selection([('user', 'User'), ('partner', 'Partner'), \
+                         ('email', 'Email Address')], 'Send to', required=True), 
+        'user_id': fields.many2one('res.users', "User"), 
+        'partner_id': fields.many2one('res.partner', "Partner"), 
+        'email': fields.char('Email', size=32), 
+        'subject': fields.char('Subject', size=32), 
+    }
+
+    def on_change_email(self, cr, uid, ids, user, partner):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Mail’s IDs
+        """
+
+        if (not partner and not user):
+            return {'value': {'email': False}}
+        email = False
+        if partner:
+            addr = self.pool.get('res.partner').address_get(cr, uid, [partner], ['contact'])
+            if addr:
+                email = self.pool.get('res.partner.address').read(cr, uid, addr['contact'] , ['email'])['email']
+        elif user:
+            addr = self.pool.get('res.users').read(cr, uid, user, ['address_id'])['address_id']
+            if addr:
+                email = self.pool.get('res.partner.address').read(cr, uid, addr[0] , ['email'])['email']
+        return {'value': {'email': email}}
+
+
+    def add_cc(self, cr, uid, ids, context={}):
+        """
+        Adds CC value in case 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of create menu’s IDs
+        @param context: A standard dictionary for contextual values
+        """
+
+        data = self.read(cr, uid, ids[0])
+        email = data['email']
+        subject = data['subject']
+
+        if not context:
+            return {}
+        history_line = self.pool.get('crm.case.history').browse(cr, uid, context['active_id'])
+        model = history_line.log_id.model_id.model
+        model_pool = self.pool.get(model)
+        case = model_pool.browse(cr, uid, history_line.log_id.res_id)
+        body = history_line.description.replace('\n', '\n> ')
+        if not case.email_from:
+            raise osv.except_osv(_('Warning!'), ('No email Address defined for this case..'))
+        if not email:
+            raise osv.except_osv(_('Warning!'), ('Please Specify email address..'))
+        flag = tools.email_send(
+            case.user_id.address_id.email, 
+            [case.email_from], 
+            subject or '[' + str(case.id) + '] ' + case.name, 
+            model_pool.format_body(body), 
+            email_cc = [email], 
+            openobject_id = str(case.id), 
+            subtype = "html"
+        )
+
+        if flag:
+            model_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ',' + email or email})
+        else:
+            raise osv.except_osv(_('Email Fail!'), ("Lastest Email is not sent successfully"))
+        return {}
+
+crm_email_add_cc_wizard()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_email_add_cc_view.xml b/addons/crm/wizard/crm_email_add_cc_view.xml
new file mode 100644
index 00000000000..45ae389ba72
--- /dev/null
+++ b/addons/crm/wizard/crm_email_add_cc_view.xml
@@ -0,0 +1,52 @@
+<openerp>
+	<data>
+
+		<!-- CRM Email Add CC Form View  -->
+
+		<record id="view_crm_email_add_cc_wizard" model="ir.ui.view">
+            <field name="name">Add CC</field>
+            <field name="model">crm.email.add.cc</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Add CC">
+            		<field name="name" width="200" />
+            		<field name="subject" width="200" />
+            		<separator colspan="4" string="" />
+            		<group col="2" colspan="2" attrs="{ 'invisible' : [('name','!=','user')]}">
+            			<field name="user_id"
+            				attrs="{ 'required' : [('name','=','user')]}"
+            				on_change="on_change_email(user_id, partner_id)" />
+            		</group>
+            		<newline />
+            		<group col="2" colspan="2"
+            			attrs="{ 'invisible' : [('name','!=','partner')]}">
+            			<field name="partner_id"
+            				attrs="{'required' : [('name','=','partner')]}"
+            				on_change="on_change_email(user_id, partner_id)" />
+            		</group>
+            		<newline />
+            		<field name="email" attrs="{ 'required' : [('name','=','email')]}" />
+            		<newline />
+            		<separator colspan="4" string="" />
+            		<group col="2" colspan="4">
+            			<label string="" />
+            			<button name="add_cc" string="_Add"
+            				type="object" icon="gtk-ok" />
+            		</group>
+            	</form>
+            </field>
+        </record>
+
+		<!-- CRM Email Add CC Action  -->
+
+        <record id="action_view_crm_email_add_cc_wizard" model="ir.actions.act_window">
+            <field name="name">Add CC</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">crm.email.add.cc</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+     </data>
+</openerp>

From 6aafa589c98855c830c27084adab850d1f75bb25 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 23 Mar 2010 17:56:31 +0530
Subject: [PATCH 119/248] [REF]: base_calendar: Separated osv_memory wizard for
 invite attendee into wizard folder + Added search view for invitation

bzr revid: rpa@tinyerp.com-20100323122631-n1aar2o4w6jhiy15
---
 addons/base_calendar/__terp__.py            |   3 +-
 addons/base_calendar/base_calendar.py       | 144 +-------------------
 addons/base_calendar/base_calendar_view.xml |  83 ++++-------
 addons/base_calendar/wizard/__init__.py     |   1 +
 4 files changed, 31 insertions(+), 200 deletions(-)

diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__terp__.py
index ce65e1166c5..273efaf89d5 100755
--- a/addons/base_calendar/__terp__.py
+++ b/addons/base_calendar/__terp__.py
@@ -41,7 +41,8 @@
     "demo_xml" : [], 
     "update_xml" : [
                     'security/ir.model.access.csv',
-                    'wizard/calendar_event_edit_all_view.xml',
+                    'wizard/calendar_event_edit_all_view.xml', 
+                    'wizard/base_calendar_invite_attendee_view.xml', 
                     'base_calendar_view.xml'
                     ], 
     "installable" : True, 
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index febd11a7747..22949f9138a 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -91,7 +91,7 @@ def _links_get(self, cr, uid, context={}):
     """
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [])
-    res = obj.read(cr, uid, ids, ['object', 'name'], context)
+    res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
     return [(r['object'], r['name']) for r in res]
 
 html_invitation = """
@@ -200,142 +200,6 @@ html_invitation = """
 </html>
 """
 
-class invite_attendee_wizard(osv.osv_memory):
-    """
-    Invite attendee.
-    """
-    
-    _name = "base_calendar.invite.attendee"
-    _description = "Invite Attendees"
-
-    _columns = {
-        'type': fields.selection([('internal', 'Internal User'), \
-              ('external', 'External Email'), \
-              ('partner', 'Partner Contacts')], 'Type', required=True), 
-        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
-                                  'invite_id', 'user_id', 'Users'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
-        'email': fields.char('Email', size=124), 
-        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
-                                  'invite_id', 'contact_id', 'Contacts'), 
-        'send_mail': fields.boolean('Send mail?', help='Check this if you want\
- to send an Email to Invited Person')
-              }
-
-    _defaults = {
-                 'type': lambda *x: 'internal'
-                 }
-
-    def do_invite(self, cr, uid, ids, context={}):
-        """
-        Invite attendee for meeting..
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of base calendar invite attendee’s IDs.
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary of {}.
-        """
-        for datas in self.read(cr, uid, ids):
-            
-            model = False
-            model_field = False
-            context_id = context and context.get('active_id', False) or False
-            if not context or not context.get('model'):
-                return {}
-            else:
-                model = context.get('model')
-            model_field = context.get('attendee_field', False)
-            
-            obj = self.pool.get(model)
-            res_obj = obj.browse(cr, uid, context_id)
-            type = datas.get('type')
-            att_obj = self.pool.get('calendar.attendee')
-            vals = []
-            mail_to = []
-            attendees = []
-            ref = {}
-
-            if not model == 'calendar.attendee':
-                if context_id:
-                    ref = {'ref': '%s,%s' % (model, base_calendar_id2real_id(context_id))}
-                else: 
-                    return {}
-            if type == 'internal':
-                user_obj = self.pool.get('res.users')
-                if not datas.get('user_ids'):
-                    raise osv.except_osv(_('Error!'), ("Please select any User"))
-                for user_id in datas.get('user_ids'):
-                    user = user_obj.browse(cr, uid, user_id)
-                    res = {
-                           'user_id': user_id, 
-                           'email': user.address_id.email
-                           }
-                    res.update(ref)
-                    vals.append(res)
-                    if user.address_id.email:
-                        mail_to.append(user.address_id.email)
-
-            elif  type == 'external' and datas.get('email'):
-                res = {'email': datas['email']}
-                res.update(ref)
-                vals.append(res)
-                mail_to.append(datas['email'])
-
-            elif  type == 'partner':
-                add_obj = self.pool.get('res.partner.address')
-                for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
-                    res = {
-                           'partner_address_id': contact.id, 
-                           'email': contact.email
-                           }
-                    res.update(ref)
-                    vals.append(res)
-                    if contact.email:
-                        mail_to.append(contact.email)
-
-            att = att_obj.browse(cr, uid, context_id)
-           
-            for att_val in vals:
-                if model == 'calendar.attendee':
-                    if ref:
-                        att_val.update({
-                            'parent_ids': [(4, att.id)], 
-                            'ref': att.ref._name + ',' +str(att.ref.id)
-                            })
-                attendees.append(att_obj.create(cr, uid, att_val))
-            if model_field:
-                for attendee in attendees:
-                    obj.write(cr, uid, res_obj.id, {model_field: [(4, attendee)]})
-
-            if datas.get('send_mail'):
-                if not mail_to:
-                    name =  map(lambda x: x[1], filter(lambda x: type==x[0], \
-                                       self._columns['type'].selection))
-                    raise osv.except_osv(_('Error!'), ("%s must have an email \
-    Address to send mail") % (name[0]))
-                att_obj._send_mail(cr, uid, attendees, mail_to, \
-                       email_from=tools.config.get('email_from', False))
-
-        return {}
-
-
-    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
-        """
-        Make entry on contact_ids on change of partner_id field.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of base calendar invite attendee’s IDs.
-        @return: dictionary of value.
-        """
-        if not partner_id:
-            return {'value': {'contact_ids': []}}
-        cr.execute('select id from res_partner_address \
-                         where partner_id=%s' % (partner_id))
-        contacts = map(lambda x: x[0], cr.fetchall())
-        return {'value': {'contact_ids': contacts}}
-
-invite_attendee_wizard()
-
 class calendar_attendee(osv.osv):
     """
     Calendar Attendee Information
@@ -412,7 +276,7 @@ class calendar_attendee(osv.osv):
                     result[id][name] = uid
             if name == 'language':
                 user_obj = self.pool.get('res.users')
-                lang = user_obj.read(cr, uid, uid, ['context_lang'])['context_lang']
+                lang = user_obj.read(cr, uid, uid, ['context_lang'], context=context)['context_lang']
                 result[id][name] = lang.replace('_', '-')
         return result
 
@@ -426,7 +290,7 @@ class calendar_attendee(osv.osv):
         """
         obj = self.pool.get('res.request.link')
         ids = obj.search(cr, uid, [])
-        res = obj.read(cr, uid, ids, ['object', 'name'], context)
+        res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
         return [(r['object'], r['name']) for r in res]
 
     def _lang_get(self, cr, uid, context={}):
@@ -439,7 +303,7 @@ class calendar_attendee(osv.osv):
         """
         obj = self.pool.get('res.lang')
         ids = obj.search(cr, uid, [])
-        res = obj.read(cr, uid, ids, ['code', 'name'], context)
+        res = obj.read(cr, uid, ids, ['code', 'name'], context=context)
         res = [((r['code']).replace('_', '-'), r['name']) for r in res]
         return res
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 90518021f81..5ccee1777f4 100755
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -2,61 +2,6 @@
 <openerp>
     <data>
     
-<!--    Attendee invite wizard-->
-
-		<record id="view_calendar_invite_attendee_wizard" model="ir.ui.view">
-            <field name="name">Invite Attendees</field>
-            <field name="model">base_calendar.invite.attendee</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Invite People">
-                	<field name="type" />
-                	<field name="send_mail" />
-                	<newline/>
-                	<group col="1" colspan="4"
-                		attrs="{'invisible': [('type', '!=', 'external')]}">
-                		<field name="email" colspan="4"
-                			attrs="{'required': [('type', '=', 'external')]}" />
-                	</group>
-                	<group col="1" colspan="4"
-                		attrs="{'invisible': [('type', '!=', 'internal')]}">
-                		<separator string="Users" colspan="4" />
-                		<field name="user_ids" select="1" colspan="4"
-                			nolabel="1" />
-                		<newline />
-                	</group>
-                	<group col="2" colspan="4"
-                		attrs="{'invisible': [('type', '!=', 'partner')]}">
-                		<field name="partner_id" colspan="2"
-                			on_change="onchange_partner_id(partner_id)"
-                			attrs="{'required': [('type', '=', 'partner')]}" />
-                		<newline />
-                		<separator string="Partner Contacts"
-                			colspan="4" />
-                		<field name="contact_ids" select="1" colspan="4"
-                			nolabel="1" domain="[('partner_id', '=', partner_id)]"
-                			attrs="{'readonly': [('type', '!=', 'partner')]}" />
-                	</group>
-                	<newline/>
-                	<separator string="" colspan="6" />
-                	<label string="" colspan="2" />
-                	<button icon='gtk-cancel' special="cancel"
-                		string="Cancel" />
-                	<button name="do_invite" string="Invite"
-                		type="object" icon="gtk-ok" />
-                </form>
-            </field>
-        </record>
-
-        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
-            <field name="name">Invite Attendees</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base_calendar.invite.attendee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
         <record id="base_calendar_attendee_form_view" model="ir.ui.view">
             <field name="name">calendar.attendee.form</field>
             <field name="model">calendar.attendee</field>
@@ -64,7 +9,7 @@
             <field name="arch" type="xml">
             	<form string="Invitation details">
             		<field name="email" string="Invitation To"/> 
-                    <field name="sent_by_uid" string="Invitation From"/>
+                    <field name="sent_by_uid" string="Invitation From" />
             		<notebook colspan="4">
             			<page string="Invitation">
                             <separator string="Invitation Detail" colspan="4" />
@@ -97,7 +42,7 @@
             			</page>
             		</notebook>
             		<group col="6" colspan="4">
-	                        <field name="state" select="2" />
+	                        <field name="state" />
 	                        <button name="do_tentative"
 	                        	states="needs-action,declined,accepted"
 	                        	string="Uncertain" type="object"
@@ -134,8 +79,28 @@
             </field>
         </record>	 
 
-	 
-	 
+	 	<record id="base_calendar_attendee_search_view" model="ir.ui.view">
+            <field name="name">calendar.attendee.search</field>
+            <field name="model">calendar.attendee</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            	<search string="Search Invitations">
+                   <filter icon="gtk-apply" string="Accepted"
+                       domain="[('state','=', 'accepted')]"
+                       separator="1" help="Accepted Invitations" />
+                   <filter icon="gtk-close" string="Declined"
+                       domain="[('state','=', 'declined')]"
+                       separator="1" help="Declined Invitations" />
+                   <separator orientation="vertical"/>
+                   <field name="email" select='1'/>
+                   <field name="sent_by_uid" select="1" widget="selection"/>
+                   <separator orientation="vertical"/>
+                   <field name="cutype" string="Invitation type" select="1"/>
+                   <field name="event_date" select="1"/>
+               </search>
+            </field>
+        </record>	 
+	 	
         <record id="res_alarm_form_view" model="ir.ui.view">
             <field name="name">res.alarm.form</field>
             <field name="model">res.alarm</field>
diff --git a/addons/base_calendar/wizard/__init__.py b/addons/base_calendar/wizard/__init__.py
index 38f790bcd42..27614aacd88 100755
--- a/addons/base_calendar/wizard/__init__.py
+++ b/addons/base_calendar/wizard/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import calendar_event_edit_all
+import base_calendar_invite_attendee
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 70e4f3e6f48b8d691dbff01383ad75e48dc2887a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 23 Mar 2010 19:42:01 +0530
Subject: [PATCH 120/248] [IMP]: crm: Implemented type=choice for lead to
 opportunity wizard, removed old wizard

bzr revid: rpa@tinyerp.com-20100323141201-8ral0ueq1r8uzy69
---
 addons/crm/crm_lead.py                        |  81 +++-
 addons/crm/crm_lead_view.xml                  |   6 +-
 addons/crm/wizard/crm_lead_to_opportunity.py  | 380 +++++-------------
 .../wizard/crm_lead_to_opportunity_view.xml   |  32 +-
 addons/crm/wizard/crm_lead_to_partner.py      |   3 +-
 5 files changed, 184 insertions(+), 318 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 00cebd4dcbf..49a8f47e0a2 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -23,9 +23,10 @@ from osv import fields, osv, orm
 from datetime import datetime, timedelta
 import crm
 import math
+from tools.translate import _
 
 class crm_lead(osv.osv):
-    """ CRm Lead Case """
+    """ CRM Lead Case """
 
     _name = "crm.lead"
     _description = "Leads Cases"
@@ -67,8 +68,8 @@ class crm_lead(osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of closeday’s IDs
-        @return: difference between current date and closed date
         @param context: A standard dictionary for contextual values
+        @return: difference between current date and closed date
         """
 
         result = {}
@@ -87,33 +88,77 @@ class crm_lead(osv.osv):
 
         'categ_id': fields.many2one('crm.case.categ', 'Lead Source', \
                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.opportunity')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type',\
+                        ('object_id.model', '=', 'crm.opportunity')]"), 
+        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', \
                          domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.lead')]"),
-        'partner_name': fields.char("Contact Name", size=64),
+                        ('object_id.model', '=', 'crm.lead')]"), 
+        'partner_name': fields.char("Contact Name", size=64), 
 
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage',\
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', \
                             domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.lead')]"),
-        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
+                            ('object_id.model', '=', 'crm.lead')]"), 
+        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'), 
 
-        'user_id': fields.many2one('res.users', 'Salesman'),
-        'referred': fields.char('Referred By', size=32),
+        'user_id': fields.many2one('res.users', 'Salesman'), 
+        'referred': fields.char('Referred By', size=32), 
         'day_open': fields.function(_compute_openday, string='Days to Open', \
-                                method=True, type="integer", store=True),
+                                method=True, type="integer", store=True), 
         'day_close': fields.function(_compute_closeday, string='Days to Close', \
-                                method=True, type="integer", store=True),
-        'function_name' : fields.char('Function', size=64),
+                                method=True, type="integer", store=True), 
+        'function_name' : fields.char('Function', size=64), 
         }
 
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
     }
 
+
+    def convert_opportunity(self, cr, uid, ids, context=None):
+        """ Precomputation for converting lead to opportunity
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of closeday’s IDs
+        @param context: A standard dictionary for contextual values
+        @return: Value of action in dict
+        """
+        if not context:
+            context = {}
+        context.update({'active_ids': ids})
+
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_create')
+        value = {}
+
+        view_id = False
+        if data_id:
+            view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+        for case in self.browse(cr, uid, ids):
+            context.update({'opportunity_id': case.id})
+            context.update({'active_id': case.id})
+            if not case.partner_id:
+                data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_partner')
+                view_id = False
+                if data_id:
+                    view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+                break
+            
+        value = {            
+            'name': _('Create Opportunity'), 
+            'view_type': 'form', 
+            'view_mode': 'form,tree', 
+            'res_model': 'crm.lead2opportunity', 
+            'view_id': False, 
+            'context': context,  
+            'views': [(view_id, 'form')], 
+            'type': 'ir.actions.act_window', 
+            'target': 'new', 
+            'destroy': False
+        }
+        return value
+
 crm_lead()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dc379ddacfb..3f9c9c6c376 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -42,11 +42,11 @@
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
-                            name="%(wizard_crm_lead_opportunity_set)d"
+                            name="convert_opportunity"
                             string="Convert"
                             help="Convert into Opportunity"
-                            icon="gtk-index"
-                            type="action"
+                            icon="gtk-index"   
+                            type="object"                         
                             attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                     <newline />
                     <field name="section_id" colspan="1"
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index a5f97b1abd6..f1cf92e512d 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -22,293 +22,11 @@
 from mx.DateTime import now
 from osv import osv, fields
 from tools.translate import _
-import ir
-import netsvc
-import pooler
-import wizard
-
-#===============================================================================
-# Put original wizard because of type=choice in init
-# Remove it after solution for type=choice
-#===============================================================================
-
-class partner_create(wizard.interface):
-
-    case_form = """<?xml version="1.0"?>
-    <form string="Create a Partner">
-        <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        <label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        <!--field name="close"/-->
-    </form>"""
-
-    case_fields = {
-        'close': {'type':'boolean', 'string':'Close Lead'}
-    }
-
-    partner_form = """<?xml version="1.0"?>
-    <form string="Create a Partner">
-        <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        <label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        <newline />
-        <field name="action"/>
-        <group attrs="{'invisible':[('action','!=','exist')]}">
-            <field name="partner_id"/>
-        </group>
-    </form>"""
-
-    partner_fields = {
-        'action': {'type':'selection',
-                'selection':[('exist','Link to an existing partner'),('create','Create a new partner')],
-                'string':'Action', 'required':True, 'default': lambda *a:'exist'},
-        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
-    }
-    
-    def _selectPartner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        partner_obj = pool.get('res.partner')
-        contact_obj = pool.get('res.partner.address')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.partner_id:
-                raise wizard.except_wizard(_('Warning !'),
-                    _('A partner is already defined on this lead.'))
-           
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])            
-            if not partner_ids and case.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-
-            partner_id = partner_ids and partner_ids[0] or False
-        vals = {'partner_id': partner_id}
-        if not partner_id:
-            vals['action'] = 'create'            
-        return vals
-
-    def _create_partner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)        
-        case_obj = pool.get('crm.lead')
-        partner_obj = pool.get('res.partner')
-        contact_obj = pool.get('res.partner.address')
-        partner_ids = []
-        partner_id = False
-        contact_id = False
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if data['form']['action'] == 'create':
-                partner_id = partner_obj.create(cr, uid, {
-                    'name': case.partner_name or case.name,
-                    'user_id': case.user_id.id,
-                    'comment': case.description,
-                })
-                contact_id = contact_obj.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'name': case.name,
-                    'phone': case.phone,
-                    'mobile': case.mobile,
-                    'email': case.email_from,
-                    'fax': case.fax,
-                    'title': case.title,
-                    'function': case.function and case.function.id or False,
-                    'street': case.street,
-                    'street2': case.street2,
-                    'zip': case.zip,
-                    'city': case.city,
-                    'country_id': case.country_id and case.country_id.id or False,
-                    'state_id': case.state_id and case.state_id.id or False,
-                })
-
-            else:
-                if data['form']['partner_id']:
-                    partner = partner_obj.browse(cr,uid,data['form']['partner_id'])
-                    partner_id = partner.id
-                    contact_id = partner.address and partner.address[0].id
-
-            partner_ids.append(partner_id)
-            vals = {}
-            if partner_id:
-                vals.update({'partner_id': partner_id})
-            if contact_id:
-                vals.update({'partner_address_id': contact_id})
-            case_obj.write(cr, uid, [case.id], vals)   
-        return partner_ids
-
-    def _make_partner(self, cr, uid, data, context): 
-        pool = pooler.get_pool(cr.dbname)             
-        partner_ids = self._create_partner(cr, uid, data, context)
-        mod_obj = pool.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        value = {
-            'domain': "[]",
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'res.partner',
-            'res_id': partner_ids and int(partner_ids[0]) or False,
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-
-    states = {
-        'init': {
-            'actions': [_selectPartner],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('create_partner', 'Create Partner', 'gtk-go-forward')]}
-        },
-        'create_partner': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': partner_form, 'fields': partner_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('create', 'Continue', 'gtk-go-forward')]}
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _make_partner, 'state': 'end'}
-        }
-    }
-
-partner_create('crm.lead.partner_create')
-
-
-class lead2opportunity(partner_create):
-
-    case_form = """<?xml version="1.0"?>
-    <form string="Convert To Opportunity">
-        <field name="name"/>
-        <field name="partner_id"/>
-        <newline/>
-        <field name="planned_revenue"/>
-        <field name="probability"/>
-    </form>"""
-
-    case_fields = {
-        'name': {'type':'char', 'size':64, 'string':'Opportunity Summary', 'required':True},
-        'planned_revenue': {'type':'float', 'digits':(16,2), 'string': 'Expected Revenue'},
-        'probability': {'type':'float', 'digits':(16,2), 'string': 'Success Probability'},
-        'partner_id' : {'type':'many2one', 'relation':'res.partner', 'string':'Partner'},
-    }
-    
-    def _check_state(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if case.state != 'open':
-                raise wizard.except_wizard(_('Warning !'),
-                    _('Lead should be in \'Open\' state before converting to Opportunity.'))
-        return {}
-
-    def _selectopportunity(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        case = case_obj.browse(cr, uid, data['id'])
-        return {'name': case.name, 'partner_id':case.partner_id and case.partner_id.id or False}
-
-    def _selectChoice(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        case_obj = pool.get('crm.lead')
-        for case in case_obj.browse(cr, uid, data['ids']):
-            if not case.partner_id:
-                return 'create_partner'
-        return 'opportunity'
-
-    def _makeOrder(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        res = data_obj.read(cr, uid, result, ['res_id'])
-        
-
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-        lead_case_obj = pool.get('crm.lead')
-        history_obj = pool.get('crm.case.history')
-        opportunity_case_obj = pool.get('crm.opportunity')
-        model_obj = pool.get('ir.model')        
-        for lead in lead_case_obj.browse(cr, uid, data['ids']):             
-            new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
-                'name': data['form']['name'],
-                'planned_revenue': data['form']['planned_revenue'],
-                'probability': data['form']['probability'],
-                'partner_id': data['form']['partner_id'],
-                'section_id':lead.section_id.id,
-                'description':lead.description,
-                'date_deadline': lead.date_deadline,
-                'partner_address_id':lead.partner_address_id.id, 
-                'priority': lead.priority,
-                'phone': lead.phone,                
-                'email_from': lead.email_from,                
-            })       
-            
-            new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
-            model_ids = model_obj.search(cr, uid, [('model','=','crm.opportunity')])
-
-            for his_id in lead.history_line:
-                history_ids = history_obj.copy(cr, uid, his_id.id, {'model_id' : model_ids[0], 'res_id':new_opportunity})    
-
-            vals = {
-                'partner_id': data['form']['partner_id'],                
-                }
-            if not lead.opportunity_id:
-                vals.update({'opportunity_id' : new_opportunity.id})
-
-            lead_case_obj.write(cr, uid, [lead.id], vals)
-            lead_case_obj.case_close(cr, uid, [lead.id])
-            opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
-        
-        value = {            
-            'name': _('Opportunity'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.opportunity',
-            'res_id': int(new_opportunity_id),
-            'view_id': False,
-            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'] 
-        }
-        return value
-
-    def _makePartner(self, cr, uid, data, context):
-        partner_ids = self._create_partner(cr, uid, data, context)
-        return {}
-
-    states = {
-        'init': {
-            'actions': [_check_state],
-            'result': {'type':'choice','next_state':_selectChoice}
-        },
-        'create_partner': {
-            'actions': [partner_create._selectPartner],
-            'result': {'type': 'form', 'arch': partner_create.partner_form, 'fields': partner_create.partner_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('opportunity', 'Skip', 'gtk-goto-last'), ('create', 'Continue', 'gtk-go-forward')]}
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makePartner, 'state':'opportunity' }
-        },
-        'opportunity': {
-            'actions': [_selectopportunity],
-            'result': {'type': 'form', 'arch': case_form, 'fields': case_fields,
-                'state' : [('end', 'Cancel', 'gtk-cancel'),('confirm', 'Create Opportunity', 'gtk-go-forward')]}
-        },
-        'confirm': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeOrder, 'state': 'end'}
-        }
-    }
-
-lead2opportunity('crm.lead.opportunity_set')
-
 class crm_lead2opportunity(osv.osv_memory):
     _name = 'crm.lead2opportunity'
     _description = 'Lead To Opportunity'
-
+    _inherit = 'crm.lead2partner'
+    
     def action_cancel(self, cr, uid, ids, context=None):
         """
         Closes Lead To Opportunity form
@@ -320,6 +38,26 @@ class crm_lead2opportunity(osv.osv_memory):
 
         """
         return {'type': 'ir.actions.act_window_close'}
+    
+    def make_partner(self, cr, uid, ids, context=None):
+        """
+        This function Makes partner based on action.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Partner form.
+        """
+        if not context:
+            context = {}
+
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        return self.action_apply(cr, uid, ids, context)
 
     def action_apply(self, cr, uid, ids, context=None):
         """
@@ -338,8 +76,8 @@ class crm_lead2opportunity(osv.osv_memory):
             lead_obj = self.pool.get('crm.lead')
             opp_obj = self. pool.get('crm.opportunity')
             data_obj = self.pool.get('ir.model.data')
-            history_obj = pool.get('crm.case.history')
-            model_obj = pool.get('ir.model')
+            history_obj = self.pool.get('crm.case.history')
+            model_obj = self.pool.get('ir.model')
 
             # Get Opportunity views
             result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
@@ -407,7 +145,75 @@ class crm_lead2opportunity(osv.osv_memory):
         'probability': fields.float('Success Probability'),
         'planned_revenue': fields.float('Expected Revenue'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
+        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action'),
+        
     }
+    
+    def _select_partner(self, cr, uid, context=None):
+        """
+        This function Searches for Partner from selected lead.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : Partner id if any for selected lead.
+        """
+        if not context:
+            context = {}
+        
+        lead_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('active_ids', [])
+        partner_id = False
+
+        for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
+            if not partner_ids and lead.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+            partner_id = partner_ids and partner_ids[0] or False
+        return partner_id
+    
+    _defaults = {
+        'action': lambda *a:'exist',
+        'partner_id': _select_partner
+        }
+    
+    def action_skip(self, cr, uid, ids, context=None):
+        """
+        This skips partner creation
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Opportunity IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for Opportunity form
+        """
+        value = {}
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_create')
+        view_id = False
+        if data_id:
+            view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+            
+        value = {            
+            'name': _('Create Opportunity'), 
+            'view_type': 'form', 
+            'view_mode': 'form,tree', 
+            'res_model': 'crm.lead2opportunity', 
+            'view_id': False, 
+            'context': context,  
+            'views': [(view_id, 'form')], 
+            'type': 'ir.actions.act_window', 
+            'target': 'new', 
+        }
+        return value
 
     def view_init(self, cr, uid, fields, context=None):
         """
@@ -448,8 +254,6 @@ Leads Could not convert into Opportunity"))
         for lead in lead_obj.browse(cr, uid, data, []):
             if 'name' in fields:
                 res.update({'name': lead.partner_name})
-            if 'partner_id' in fields:
-                res.update({'partner_id': lead.partner_id and lead.partner_id.id or False})
         return res
 
 crm_lead2opportunity()
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index f76b54a91b9..7634354087e 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,14 +1,6 @@
 <openerp>
   	<data>
 
-	<wizard
-            id="wizard_crm_lead_opportunity_set"
-            keyword="client_action_multi"
-            model="crm.lead"
-            name="crm.lead.opportunity_set"
-            multi="True" menu="False"
-            string="Convert To Opportunity"/>
-            
 		<!-- Lead to Opportunity confirmation view -->
 
         <record model="ir.ui.view" id="lead_to_opportunity_pre_view">
@@ -60,5 +52,29 @@
 	      <field name="target">new</field>
 	   </record>
 
+
+        <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
+	      <field name="name">crm.lead2opportunity.partner</field>
+	      <field name="model">crm.lead2opportunity</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	 <form string="Create a Partner">
+                <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+                <label string="You may have to verify that this partner does not exist already." colspan="4"/>
+                <newline />
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+		        </group>
+		        <separator string="" colspan="4" />
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button special="cancel" name="action_skip" string="_Skip" type="object" icon="gtk-goto-last"/>
+	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+            </form>
+	      </field>
+	   </record> 
+
  	</data>
 </openerp>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index aa47a3a808c..2cd0ab541fe 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -71,7 +71,8 @@ class crm_lead2partner(osv.osv_memory):
         partner_obj = self.pool.get('res.partner')
         contact_obj = self.pool.get('res.partner.address')
         rec_ids = context and context.get('active_ids', [])
-        value={}
+        partner_id = False
+
         for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
             partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
             if not partner_ids and lead.email_from:

From c51d845b93d559e6ec7868b55406ada53b534489 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 23 Mar 2010 20:12:41 +0530
Subject: [PATCH 121/248] [ADD] base_calendar: invite attendee wizard

bzr revid: rpa@tinyerp.com-20100323144241-0zqnbrg6x3ywbjeo
---
 .../wizard/base_calendar_invite_attendee.py   | 164 ++++++++++++++++++
 .../base_calendar_invite_attendee_view.xml    |  63 +++++++
 2 files changed, 227 insertions(+)
 create mode 100755 addons/base_calendar/wizard/base_calendar_invite_attendee.py
 create mode 100644 addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml

diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
new file mode 100755
index 00000000000..995b721df08
--- /dev/null
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -0,0 +1,164 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from base_calendar import base_calendar
+from osv import fields, osv
+
+class base_calendar_invite_attendee(osv.osv_memory):
+    """
+    Invite attendee.
+    """
+    
+    _name = "base_calendar.invite.attendee"
+    _description = "Invite Attendees"
+
+    _columns = {
+        'type': fields.selection([('internal', 'Internal User'), \
+              ('external', 'External Email'), \
+              ('partner', 'Partner Contacts')], 'Type', required=True), 
+        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
+                                  'invite_id', 'user_id', 'Users'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'email': fields.char('Email', size=124), 
+        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
+                                  'invite_id', 'contact_id', 'Contacts'), 
+        'send_mail': fields.boolean('Send mail?', help='Check this if you want\
+ to send an Email to Invited Person')
+              }
+
+    _defaults = {
+                 'type': lambda *x: 'internal'
+                 }
+
+    def do_invite(self, cr, uid, ids, context=None):
+        """
+        Invites attendee for meeting..
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of base calendar invite attendee’s IDs.
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary of {}.
+        """
+        if not context:
+            context = {}
+        for datas in self.read(cr, uid, ids, context=context):
+            
+            model = False
+            model_field = False
+            context_id = context and context.get('active_id', False) or False
+            if not context or not context.get('model'):
+                return {}
+            else:
+                model = context.get('model')
+            model_field = context.get('attendee_field', False)
+            
+            obj = self.pool.get(model)
+            res_obj = obj.browse(cr, uid, context_id)
+            type = datas.get('type')
+            att_obj = self.pool.get('calendar.attendee')
+            vals = []
+            mail_to = []
+            attendees = []
+            ref = {}
+
+            if not model == 'calendar.attendee':
+                if context_id:
+                    ref = {'ref': '%s,%s' % (model, base_calendar.base_calendar_id2real_id(context_id))}
+                else: 
+                    return {}
+            if type == 'internal':
+                user_obj = self.pool.get('res.users')
+                if not datas.get('user_ids'):
+                    raise osv.except_osv(_('Error!'), ("Please select any User"))
+                for user_id in datas.get('user_ids'):
+                    user = user_obj.browse(cr, uid, user_id)
+                    res = {
+                           'user_id': user_id, 
+                           'email': user.address_id.email
+                           }
+                    res.update(ref)
+                    vals.append(res)
+                    if user.address_id.email:
+                        mail_to.append(user.address_id.email)
+
+            elif  type == 'external' and datas.get('email'):
+                res = {'email': datas['email']}
+                res.update(ref)
+                vals.append(res)
+                mail_to.append(datas['email'])
+
+            elif  type == 'partner':
+                add_obj = self.pool.get('res.partner.address')
+                for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
+                    res = {
+                           'partner_address_id': contact.id, 
+                           'email': contact.email
+                           }
+                    res.update(ref)
+                    vals.append(res)
+                    if contact.email:
+                        mail_to.append(contact.email)
+
+            att = att_obj.browse(cr, uid, context_id)
+           
+            for att_val in vals:
+                if model == 'calendar.attendee':
+                    if ref:
+                        att_val.update({
+                            'parent_ids': [(4, att.id)], 
+                            'ref': att.ref._name + ',' +str(att.ref.id)
+                            })
+                attendees.append(att_obj.create(cr, uid, att_val))
+            if model_field:
+                for attendee in attendees:
+                    obj.write(cr, uid, res_obj.id, {model_field: [(4, attendee)]})
+
+            if datas.get('send_mail'):
+                if not mail_to:
+                    name =  map(lambda x: x[1], filter(lambda x: type==x[0], \
+                                       self._columns['type'].selection))
+                    raise osv.except_osv(_('Error!'), ("%s must have an email \
+    Address to send mail") % (name[0]))
+                att_obj._send_mail(cr, uid, attendees, mail_to, \
+                       email_from=tools.config.get('email_from', False))
+
+        return {}
+
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
+        """
+        Make entry on contact_ids on change of partner_id field.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of base calendar invite attendee’s IDs.
+        @param partner_id: id of Partner 
+        @return: dictionary of value.
+        """
+        if not partner_id:
+            return {'value': {'contact_ids': []}}
+        cr.execute('select id from res_partner_address \
+                         where partner_id=%s' % (partner_id))
+        contacts = map(lambda x: x[0], cr.fetchall())
+        return {'value': {'contact_ids': contacts}}
+
+base_calendar_invite_attendee()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
new file mode 100644
index 00000000000..945dc2bc20d
--- /dev/null
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<!--    Attendee invite wizard-->
+
+		<record id="view_calendar_invite_attendee_wizard" model="ir.ui.view">
+            <field name="name">Invite Attendees</field>
+            <field name="model">base_calendar.invite.attendee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Invite People">
+                	<field name="type" />
+                	<field name="send_mail" />
+                	<newline/>
+                	<group col="1" colspan="4"
+                		attrs="{'invisible': [('type', '!=', 'external')]}">
+                		<field name="email" colspan="4"
+                			attrs="{'required': [('type', '=', 'external')]}" />
+                	</group>
+                	<group col="1" colspan="4"
+                		attrs="{'invisible': [('type', '!=', 'internal')]}">
+                		<separator string="Users" colspan="4" />
+                		<field name="user_ids" select="1" colspan="4"
+                			nolabel="1" />
+                		<newline />
+                	</group>
+                	<group col="2" colspan="4"
+                		attrs="{'invisible': [('type', '!=', 'partner')]}">
+                		<field name="partner_id" colspan="2"
+                			on_change="onchange_partner_id(partner_id)"
+                			attrs="{'required': [('type', '=', 'partner')]}" />
+                		<newline />
+                		<separator string="Partner Contacts"
+                			colspan="4" />
+                		<field name="contact_ids" select="1" colspan="4"
+                			nolabel="1" domain="[('partner_id', '=', partner_id)]"
+                			attrs="{'readonly': [('type', '!=', 'partner')]}" />
+                	</group>
+                	<newline/>
+                	<separator string="" colspan="6" />
+                	<label string="" colspan="2" />
+                	<button icon='gtk-cancel' special="cancel"
+                		string="Cancel" />
+                	<button name="do_invite" string="Invite"
+                		type="object" icon="gtk-ok" />
+                </form>
+            </field>
+        </record>
+	
+	
+	<!--    Attendee invite action-->
+	
+        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
+            <field name="name">Invite Attendees</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base_calendar.invite.attendee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>

From 2535f44d2bb1cdca49935c1b2b19b9317c2b22f6 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Wed, 24 Mar 2010 21:27:18 +0530
Subject: [PATCH 122/248] [REVIEW]: code review

bzr revid: mga@mga-20100324155718-25uh10n09j6j3gty
---
 addons/base_calendar/__terp__.py              |  29 ++--
 addons/base_calendar/base_calendar_view.xml   | 139 +++++++++---------
 .../wizard/base_calendar_invite_attendee.py   |  32 ++--
 .../wizard/calendar_event_edit_all.py         |  22 +--
 .../wizard/calendar_event_edit_all_view.xml   |   6 +-
 5 files changed, 111 insertions(+), 117 deletions(-)

diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__terp__.py
index 273efaf89d5..e8b528db1a3 100755
--- a/addons/base_calendar/__terp__.py
+++ b/addons/base_calendar/__terp__.py
@@ -19,32 +19,27 @@
 #
 ##############################################################################
 
-
 {
     "name" : "Basic Calendar Functionality", 
     "version" : "1.0", 
-    "depends" : [
-                    "base", 
-                ], 
-     'description': """
- Full featured calendar system that support:
-  - Alerts (create requests)
-  - Recurring events (*)
-  - Invitations to others people
-""", 
+    "depends" : ["base"], 
+    'description': """Full featured calendar system that support:
+    - Alerts (create requests)
+    - Recurring events (*)
+    - Invitations to others people""", 
     "author" : "Tiny", 
     'category': 'Generic Modules/Others', 
     'website': 'http://www.openerp.com', 
     "init_xml" : [
-                   'base_calendar_data.xml'
-                   ], 
+        'base_calendar_data.xml'
+    ], 
     "demo_xml" : [], 
     "update_xml" : [
-                    'security/ir.model.access.csv',
-                    'wizard/calendar_event_edit_all_view.xml', 
-                    'wizard/base_calendar_invite_attendee_view.xml', 
-                    'base_calendar_view.xml'
-                    ], 
+        'security/ir.model.access.csv',
+        'wizard/calendar_event_edit_all_view.xml', 
+        'wizard/base_calendar_invite_attendee_view.xml', 
+        'base_calendar_view.xml'
+    ], 
     "installable" : True, 
     "active" : False, 
 }
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 5ccee1777f4..7b3b4a036b8 100755
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -7,19 +7,19 @@
             <field name="model">calendar.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string="Invitation details">
-            		<field name="email" string="Invitation To"/> 
+                <form string="Invitation details">
+                    <field name="email" string="Invitation To"/> 
                     <field name="sent_by_uid" string="Invitation From" />
-            		<notebook colspan="4">
-            			<page string="Invitation">
+                    <notebook colspan="4">
+                        <page string="Invitation">
                             <separator string="Invitation Detail" colspan="4" />
                             <group colspan="4" col="4">
                                 <field name="user_id" string="Invited User"/>
                                 <newline/>
                                 <field name="partner_address_id"
-                                	string="Partner Contact" />
+                                    string="Partner Contact" />
                                 <field name="partner_id"
-                                	string="Partner" readonly="1" />
+                                    string="Partner" readonly="1" />
                                 <field name="role" string="Role" />
                                 <field name="cutype" string="Invitation type" />
                                 <field name="rsvp" /> 
@@ -31,60 +31,60 @@
                                 <field name="language"/>
                                 <field name="ref" colspan="4" readonly="1"/>
                             </group>
-            			</page>
-            			<page string="Delegation Info">
-            				<separator string="Delegated From" colspan="4" />
-            				<field name="parent_ids" nolabel="1"
-            					colspan="4" readonly="1" />
-            				<separator string="Delegated To" colspan="4" />
-            				<field name="child_ids" nolabel="1"
-            					colspan="4" readonly="1" />
-            			</page>
-            		</notebook>
-            		<group col="6" colspan="4">
-	                        <field name="state" />
-	                        <button name="do_tentative"
-	                        	states="needs-action,declined,accepted"
-	                        	string="Uncertain" type="object"
-	                        	icon="terp-crm" />
-	                        <button name="do_accept" string="Accept"
-	                        	states="needs-action,tentative,declined"
-	                        	type="object" icon="gtk-apply" />
-	                        <button name="do_decline" string="Decline"
-	                        	states="needs-action,tentative,accepted"
-	                        	type="object" icon="gtk-cancel" />
-	                        <button
-	                        	name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-	                        	string="Delegate" type="action"
-	                        	icon="gtk-sort-descending"
-	                        	states="needs-action,tentative,declined,accepted"
-	                        	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-            		</group>
-            	</form>
+                        </page>
+                        <page string="Delegation Info">
+                            <separator string="Delegated From" colspan="4" />
+                            <field name="parent_ids" nolabel="1"
+                                colspan="4" readonly="1" />
+                            <separator string="Delegated To" colspan="4" />
+                            <field name="child_ids" nolabel="1"
+                                colspan="4" readonly="1" />
+                        </page>
+                    </notebook>
+                    <group col="6" colspan="4">
+                            <field name="state" />
+                            <button name="do_tentative"
+                                states="needs-action,declined,accepted"
+                                string="Uncertain" type="object"
+                                icon="terp-crm" />
+                            <button name="do_accept" string="Accept"
+                                states="needs-action,tentative,declined"
+                                type="object" icon="gtk-apply" />
+                            <button name="do_decline" string="Decline"
+                                states="needs-action,tentative,accepted"
+                                type="object" icon="gtk-cancel" />
+                            <button
+                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                string="Delegate" type="action"
+                                icon="gtk-sort-descending"
+                                states="needs-action,tentative,declined,accepted"
+                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                    </group>
+                </form>
             </field>
         </record>
 
-	    <record id="base_calendar_attendee_tree_view" model="ir.ui.view">
+        <record id="base_calendar_attendee_tree_view" model="ir.ui.view">
             <field name="name">calendar.attendee.tree</field>
             <field name="model">calendar.attendee</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Invitation details">
-            		<field name="email" string="Invitation To"/>
+                <tree string="Invitation details">
+                    <field name="email" string="Invitation To"/>
                     <field name="partner_id" string="Partner" />
                     <field name="partner_address_id" string="Contact" />
-            		<field name="role" />            		
-            		<field name="state" />
-            	</tree>
+                    <field name="role" />
+                    <field name="state" />
+                </tree>
             </field>
-        </record>	 
+        </record>
 
-	 	<record id="base_calendar_attendee_search_view" model="ir.ui.view">
+        <record id="base_calendar_attendee_search_view" model="ir.ui.view">
             <field name="name">calendar.attendee.search</field>
             <field name="model">calendar.attendee</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Search Invitations">
+                <search string="Search Invitations">
                    <filter icon="gtk-apply" string="Accepted"
                        domain="[('state','=', 'accepted')]"
                        separator="1" help="Accepted Invitations" />
@@ -99,14 +99,14 @@
                    <field name="event_date" select="1"/>
                </search>
             </field>
-        </record>	 
-	 	
+        </record>
+
         <record id="res_alarm_form_view" model="ir.ui.view">
             <field name="name">res.alarm.form</field>
             <field name="model">res.alarm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string="Reminder details">
+                <form string="Reminder details">
                     <field name="name" />
                     <field name="active" />
                     <separator string="Reminder Details" colspan="4" />
@@ -117,7 +117,7 @@
                     <separator string="" colspan="4" />
                     <field name="duration" />
                     <field name="repeat" />
-            	</form>
+                </form>
             </field>
         </record>
 
@@ -126,33 +126,30 @@
                 <field name="model">res.alarm</field>
                 <field name="type">tree</field>
                 <field name="arch" type="xml">                    
-                	<tree string="Reminder details">
-			            <field name="name" select="1"/>                        			    
-			            <field name="trigger_interval" select="1"/>
-			            <field name="trigger_duration" select="1"/>
-			            <field name="trigger_occurs" select="1"/>			            
-			            <field name="trigger_related" select="1"/>
-		            </tree>
+                    <tree string="Reminder details">
+                        <field name="name" select="1"/>
+                        <field name="trigger_interval" select="1"/>
+                        <field name="trigger_duration" select="1"/>
+                        <field name="trigger_occurs" select="1"/>
+                        <field name="trigger_related" select="1"/>
+                    </tree>
                 </field>
             </record>
-
          <record id="action_res_alarm_view" model="ir.actions.act_window">
-         	<field name="name">Available Alarms</field>
-         	<field name="type">ir.actions.act_window</field>
-         	<field name="res_model">res.alarm</field>
-         	<field name="view_type">form</field>
-         	<field name="view_mode">tree,form</field>
+            <field name="name">Available Alarms</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.alarm</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
          </record>
-
         
-        <!--	Available alarms-->
-    <menuitem id="base.menu_calendar_configuration" name="Calendar"
-			parent="base.menu_base_config" sequence="10" />
+        <!--Available alarms-->
+        <menuitem id="base.menu_calendar_configuration" name="Calendar"
+            parent="base.menu_base_config" sequence="10" />
+
+        <menuitem name="Available Alarms" id="menu_crm_meeting_avail_alarm"
+            action="base_calendar.action_res_alarm_view"
+            parent="base.menu_calendar_configuration" />
 
-	<menuitem name="Available Alarms" id="menu_crm_meeting_avail_alarm"
-		action="base_calendar.action_res_alarm_view"
-		parent="base.menu_calendar_configuration" />
-		
-		
     </data>
 </openerp>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 995b721df08..c5662e59100 100755
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -40,13 +40,12 @@ class base_calendar_invite_attendee(osv.osv_memory):
         'email': fields.char('Email', size=124), 
         'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
                                   'invite_id', 'contact_id', 'Contacts'), 
-        'send_mail': fields.boolean('Send mail?', help='Check this if you want\
- to send an Email to Invited Person')
-              }
+        'send_mail': fields.boolean('Send mail?', help='Check this if you want to send an Email to Invited Person')
+    }
 
     _defaults = {
-                 'type': lambda *x: 'internal'
-                 }
+        'type': lambda *x: 'internal'
+    }
 
     def do_invite(self, cr, uid, ids, context=None):
         """
@@ -57,19 +56,22 @@ class base_calendar_invite_attendee(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return: Dictionary of {}.
         """
+        
         if not context:
             context = {}
+        
+        model = False
+        model_field = False
+        
+        context_id = context and context.get('active_id', False) or False
+        if not context or not context.get('model'):
+            return {}
+        else:
+            model = context.get('model')
+        model_field = context.get('attendee_field', False)
+            
         for datas in self.read(cr, uid, ids, context=context):
-            
-            model = False
-            model_field = False
-            context_id = context and context.get('active_id', False) or False
-            if not context or not context.get('model'):
-                return {}
-            else:
-                model = context.get('model')
-            model_field = context.get('attendee_field', False)
-            
+
             obj = self.pool.get(model)
             res_obj = obj.browse(cr, uid, context_id)
             type = datas.get('type')
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
index 8b929ce55c5..3c992e4de32 100755
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -19,7 +19,8 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
+from osv import fields
 
 class calendar_event_edit_all(osv.osv_memory):
     
@@ -73,17 +74,16 @@ class calendar_event_edit_all(osv.osv_memory):
     _name = "calendar.event.edit.all"
     _description = "Calendar Edit all event"
     _columns = {
-              'name': fields.char('Title', size=64, required=True), 
-              'date': fields.datetime('Start Date', required=True), 
-              'date_deadline': fields.datetime('End Date', required=True), 
-              'location': fields.char('Location', size=124), 
-              'alarm_id': fields.many2one('res.alarm', 'Reminder'), 
-               }
+        'name': fields.char('Title', size=64, required=True), 
+        'date': fields.datetime('Start Date', required=True), 
+        'date_deadline': fields.datetime('End Date', required=True), 
+        'location': fields.char('Location', size=124), 
+        'alarm_id': fields.many2one('res.alarm', 'Reminder'), 
+    }
     _defaults = {
-                 'date': _default_values, 
-                 'date_deadline': _default_deadline
-             }
-    
+        'date': _default_values, 
+        'date_deadline': _default_deadline
+    }    
 calendar_event_edit_all()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
index 8e406c4d8b0..9d8798e9669 100755
--- a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
+++ b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-  		<record id="view_calendar_event_edit_all" model="ir.ui.view">
+        <record id="view_calendar_event_edit_all" model="ir.ui.view">
             <field name="name">calendar.event.edit.all.form</field>
             <field name="model">calendar.event.edit.all</field>
             <field name="type">form</field>
@@ -26,8 +26,8 @@
                    </group>
                </form>
             </field>
-  		</record>
-  		
+        </record>
+
         <record id="action_calendar_event_edit_all" model="ir.actions.act_window">
             <field name="name">Edit all events</field>
             <field name="res_model">calendar.event.edit.all</field>

From 75da3ff765f2fcb2927ca4a30fb347f5f0d6888f Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Thu, 25 Mar 2010 11:16:02 +0530
Subject: [PATCH 123/248] [IMP] survey :- improve survey module.

bzr revid: ysa@tinyerp.co.in-20100325054602-qi5bxwk88eibyus4
---
 addons/survey/survey_demo.xml         | 2 ++
 addons/survey/wizard/survey_answer.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 3a41881fd2b..1e7f7fc5080 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -23,6 +23,7 @@
 	        <field name="type" ref="survey_type2"/>
 	        <field name="state">open</field>
 	        <field name="tot_comp_survey">1</field>
+	        <field name="tot_start_survey">1</field>
    		</record>
 
         <record id="survey_page_who_are_you" model="survey.page">
@@ -496,6 +497,7 @@
 	        <field name="type" ref="survey_type2"/>
 	        <field name="state">open</field>
 	        <field name="tot_comp_survey">1</field>
+	        <field name="tot_start_survey">1</field>
    		</record>
 
         <record id="survey_page_odoo_who_are_you" model="survey.page">
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index e6790427cb9..adbde6f9941 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -137,7 +137,7 @@ class survey_question_wiz(osv.osv_memory):
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '40', 'colspan': '4'})
                         record = sur_response_obj.browse(cr, uid, context['response_id'][context['response_no']])
                         etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr('Answer Of :- ' + record.user_id.name + ',  Date :- ' + record.date_create.split('.')[0]  )), 'align':"0.0"})
-                        etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(" Response :- " + str(context.get('response_no',0) + 1) +"/" + str(len(context.get('response_id',0))) )), 'align':"0.0"})
+                        etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(" Answer :- " + str(context.get('response_no',0) + 1) +"/" + str(len(context.get('response_id',0))) )), 'align':"0.0"})
                         if context.get('response_no',0) > 0:
                             etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_forward_previous",'string': tools.ustr("Previous Answer"),'type':"object"})
                         if context.get('response_no',0) + 1 < len(context.get('response_id',0)):
@@ -169,7 +169,7 @@ class survey_question_wiz(osv.osv_memory):
                             xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
                             etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
                             xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
-                            context.update({'question_id' : tools.ustr(que),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer, 'page_id' : p_id})
+                            context.update({'question_id' : tools.ustr(que.id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer, 'page_id' : p_id})
                             etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-edit", 'type' :'object', 'name':"action_edit_question", 'context' : tools.ustr(context)})
                             etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-delete", 'type' :'object','name':"action_delete_question", 'context' : tools.ustr(context)})
                         else:

From a0e644c1d918f8d3c434d3921fb2c6cac2503025 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 25 Mar 2010 11:49:40 +0530
Subject: [PATCH 124/248] [IMP]: crm: Improvement for lead to opportunity
 wizard

bzr revid: rpa@tinyerp.com-20100325061940-1jqy6b08r48upmck
---
 addons/crm/crm_lead.py                       |  2 +-
 addons/crm/wizard/crm_lead_to_opportunity.py | 58 +++++++-------------
 2 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 49a8f47e0a2..ad60586e1b8 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -155,7 +155,7 @@ class crm_lead(osv.osv):
             'views': [(view_id, 'form')], 
             'type': 'ir.actions.act_window', 
             'target': 'new', 
-            'destroy': False
+            'nodestroy': True
         }
         return value
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index f1cf92e512d..f5d3376b992 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -22,6 +22,8 @@
 from mx.DateTime import now
 from osv import osv, fields
 from tools.translate import _
+
+
 class crm_lead2opportunity(osv.osv_memory):
     _name = 'crm.lead2opportunity'
     _description = 'Lead To Opportunity'
@@ -57,7 +59,7 @@ class crm_lead2opportunity(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
         res = mod_obj.read(cr, uid, result, ['res_id'])
-        return self.action_apply(cr, uid, ids, context)
+        return self.action_skip(cr, uid, ids, context)
 
     def action_apply(self, cr, uid, ids, context=None):
         """
@@ -149,41 +151,6 @@ class crm_lead2opportunity(osv.osv_memory):
         
     }
     
-    def _select_partner(self, cr, uid, context=None):
-        """
-        This function Searches for Partner from selected lead.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        @return : Partner id if any for selected lead.
-        """
-        if not context:
-            context = {}
-        
-        lead_obj = self.pool.get('crm.lead')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        rec_ids = context and context.get('active_ids', [])
-        partner_id = False
-
-        for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
-            if not partner_ids and lead.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-            partner_id = partner_ids and partner_ids[0] or False
-        return partner_id
-    
-    _defaults = {
-        'action': lambda *a:'exist',
-        'partner_id': _select_partner
-        }
-    
     def action_skip(self, cr, uid, ids, context=None):
         """
         This skips partner creation
@@ -248,12 +215,29 @@ Leads Could not convert into Opportunity"))
         @return : default values of fields.
         """
         lead_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('active_ids', [])
+        partner_id = False
+
         data = context and context.get('active_ids', []) or []
         res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
 
-        for lead in lead_obj.browse(cr, uid, data, []):
+        for lead in lead_obj.browse(cr, uid, data, context=context):
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
+            if not partner_ids and lead.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+            partner_id = partner_ids and partner_ids[0] or False
+
             if 'name' in fields:
                 res.update({'name': lead.partner_name})
+            if 'partner_id' in fields:
+                res.update({'partner_id': partner_id})
+            if 'action' in fields:
+                res.update({'action': partner_id and 'exist' or 'create'})
         return res
 
 crm_lead2opportunity()

From 7f9d81e3f008cfa97eeb156e7f9b8be9d76d79d4 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Thu, 25 Mar 2010 14:15:29 +0530
Subject: [PATCH 125/248] [IMP] partner_crm: improve view

bzr revid: hmo@tinyerp.com-20100325084529-mywhtk8kdsxt8kre
---
 addons/partner_crm/partner_crm_view.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/addons/partner_crm/partner_crm_view.xml b/addons/partner_crm/partner_crm_view.xml
index 1df3abedf62..ab75f5c58ed 100644
--- a/addons/partner_crm/partner_crm_view.xml
+++ b/addons/partner_crm/partner_crm_view.xml
@@ -12,20 +12,15 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                 	<page string="Other Info">
-                		<group col="2" colspan="4">
-							<separator colspan="4" string="Opportunities" />
-							<field name="opportunity_ids" colspan="4" nolabel="1" />
-							<separator colspan="4" string="Meetings" />
-							<field name="meeting_ids" colspan="4" nolabel="1" />
-							<separator colspan="4" string="Phonecalls" />
+                		<group col="2" colspan="4">							
+							<field name="opportunity_ids" colspan="4" nolabel="1" />							
+							<field name="meeting_ids" colspan="4" nolabel="1" />							
 							<field name="phonecall_ids" colspan="4" nolabel="1" />
                 		</group>
-                		<group col="2" colspan="4">
-							<separator colspan="4" string="Invoices"/>
+                		<group col="2" colspan="4">							
 							<field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
 						</group>
-						<group col="2" colspan="4">
-							<separator colspan="4" string="Contracts"/>
+						<group col="2" colspan="4">							
 							<field name="contract_ids" colspan="4" nolabel="1" />
 						</group>
 					</page>

From 58fddb6132a7a61ab3e44918dae0a8a7700bd059 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 25 Mar 2010 17:23:54 +0530
Subject: [PATCH 126/248] [FIX]: base_calendar: Fixed some problems for
 attendee invitation

bzr revid: rpa@tinyerp.com-20100325115354-x8lfkcchw9k9zg3t
---
 addons/base_calendar/base_calendar.py                       | 6 ++----
 .../base_calendar/wizard/base_calendar_invite_attendee.py   | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 22949f9138a..8c7aa0ba6b9 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -404,11 +404,9 @@ request was delegated to"),
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
             sign = '<br>'.join(sign and sign.split('\n') or [])
             res_obj = att.ref
-            if res_obj and len(res_obj):
-                res_obj = res_obj[0]
             sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
             att_infos = []
-            other_invitaion_ids = self.search(cr, uid, [('ref', '=', att.ref)])
+            other_invitaion_ids = self.search(cr, uid, [('ref','=', att.ref._name + ',' + str(att.ref.id))])
             for att2 in self.browse(cr, uid, other_invitaion_ids):
                 att_infos.append(((att2.user_id and att2.user_id.name) or \
                              (att2.partner_id and att2.partner_id.name) or \
@@ -869,7 +867,7 @@ rule or repeating pattern for anexception to a recurrence set"),
             defaults.update({'table': self._table})
     
             qry = "UPDATE %(table)s set name = '%(name)s', \
-                            date = '% (date)s',  date_deadline = '% (date_deadline)s'"
+                            date = '%(date)s',  date_deadline = '%(date_deadline)s'"
             if defaults.get('alarm_id'):
                 qry += ", alarm_id = %(alarm_id)s"
             if defaults.get('location'):
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index c5662e59100..ad5c2066714 100755
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -21,6 +21,7 @@
 
 from base_calendar import base_calendar
 from osv import fields, osv
+import tools
 
 class base_calendar_invite_attendee(osv.osv_memory):
     """

From 0eb05a2c5d88c361fb5f3fa54a41ac29c98fccb8 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 25 Mar 2010 17:37:00 +0530
Subject: [PATCH 127/248] [IMP]: base_calendar caldav crm_caldav: Apply Doc
 String + quality check

bzr revid: ksa@tinyerp.co.in-20100325120700-qin0rom78ex3vima
---
 addons/base_calendar/base_calendar.py         | 557 ++++++++++++------
 addons/base_calendar/base_calendar_view.xml   |  14 +-
 .../wizard/base_calendar_invite_attendee.py   |  42 +-
 .../base_calendar_invite_attendee_view.xml    | 117 ++--
 .../wizard/calendar_event_edit_all.py         |  35 +-
 .../wizard/calendar_event_edit_all_view.xml   |  16 +-
 addons/caldav/DAV/BufferingHTTPServer.py      |  10 +-
 addons/caldav/DAV/WebDAVServer.py             | 206 +++----
 addons/caldav/DAV/davcmd.py                   | 105 ++--
 addons/caldav/DAV/davcopy.py                  |  53 +-
 addons/caldav/DAV/davmove.py                  |  35 +-
 addons/caldav/DAV/delete.py                   |  17 +-
 addons/caldav/DAV/errors.py                   |  21 +-
 addons/caldav/DAV/iface.py                    | 111 ++--
 addons/caldav/DAV/propfind.py                 | 167 +++---
 addons/caldav/DAV/utils.py                    |  81 +--
 addons/caldav/__init__.py                     |   4 +-
 addons/caldav/caldav.py                       | 385 +++++++++---
 addons/caldav/caldav_cache.py                 |  33 +-
 addons/caldav/caldav_fs.py                    | 112 ++--
 addons/caldav/caldav_node.py                  |  42 +-
 addons/caldav/caldav_view.xml                 |   2 +-
 addons/caldav/webdav_server.py                |  31 +-
 addons/caldav/wizard/calendar_event_export.py |  19 +-
 addons/caldav/wizard/calendar_event_import.py |  13 +-
 .../caldav/wizard/calendar_event_subscribe.py |  14 +-
 addons/crm_caldav/crm_caldav.py               |  19 +-
 27 files changed, 1362 insertions(+), 899 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 8c7aa0ba6b9..27434f2cc9e 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,9 +15,10 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from datetime import datetime, timedelta
 from dateutil import parser
 from dateutil import rrule
@@ -38,6 +39,7 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None):
     """
     Get recurrent dates
     """
+
     def todate(date):
         val = parser.parse(''.join((re.compile('\d')).findall(date)))
         return val
@@ -56,6 +58,7 @@ def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
     Convert base calendar id into real id.
     @return: base calendar id
     """
+
     if base_calendar_id and isinstance(base_calendar_id, (str, unicode)):
         res = base_calendar_id.split('-')
         if len(res) >= 2:
@@ -74,6 +77,7 @@ def real_id2base_calendar_id(real_id, recurrent_date):
     Convert  real id into base_calendar_id.
     @return: real id with recurrent date.
     """
+
     if real_id and recurrent_date:
         recurrent_date = time.strftime("%Y%m%d%H%M%S", \
                          time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
@@ -89,6 +93,7 @@ def _links_get(self, cr, uid, context={}):
     @param context: A standard dictionary for contextual values
     @return: list of dictionary which contain object and name and id.
     """
+
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
@@ -288,6 +293,7 @@ class calendar_attendee(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: list of dictionary which contain object and name and id.
         """
+
         obj = self.pool.get('res.request.link')
         ids = obj.search(cr, uid, [])
         res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
@@ -311,59 +317,76 @@ class calendar_attendee(osv.osv):
         'cutype': fields.selection([('individual', 'Individual'), \
                     ('group', 'Group'), ('resource', 'Resource'), \
                     ('room', 'Room'), ('unknown', '') ], \
-                    'Invite Type', help="Specify the type of Invitation"), 
-        'member': fields.char('Member', size=124, 
-                    help="Indicate the groups that the attendee belongs to"), 
+                    'Invite Type', help="Specify the type of Invitation"),
+        'member': fields.char('Member', size=124,
+                    help="Indicate the groups that the attendee belongs to"),
         'role': fields.selection([('req-participant', 'Participation required'), \
                     ('chair', 'Chair Person'), \
                     ('opt-participant', 'Optional Participation'), \
                     ('non-participant', 'For information Purpose')], 'Role', \
-                    help='Participation role for the calendar user'), 
-        'state': fields.selection([('tentative', 'Tentative'), 
-                        ('needs-action', 'Needs Action'), 
-                        ('accepted', 'Accepted'), 
-                        ('declined', 'Declined'), 
-                        ('delegated', 'Delegated')], 'State', readonly=True, 
-                        help="Status of the attendee's participation"), 
-        'rsvp':  fields.boolean('Required Reply?', 
-                    help="Indicats whether the favor of a reply is requested"), 
+                    help='Participation role for the calendar user'),
+        'state': fields.selection([('tentative', 'Tentative'),
+                        ('needs-action', 'Needs Action'),
+                        ('accepted', 'Accepted'),
+                        ('declined', 'Declined'),
+                        ('delegated', 'Delegated')], 'State', readonly=True,\
+                        help="Status of the attendee's participation"),
+        'rsvp':  fields.boolean('Required Reply?',
+                    help="Indicats whether the favor of a reply is requested"),
         'delegated_to': fields.function(_compute_data, method=True, \
                 string='Delegated To', type="char", size=124, store=True, \
                 multi='delegated_to', help="The users that the original \
-request was delegated to"), 
+request was delegated to"),
         'delegated_from': fields.function(_compute_data, method=True, string=\
-            'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 
-        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated From'), 
-        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated To'), 
-        'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
-        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), 
-        'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
-        'dir': fields.char('URI Reference', size=124, help="Reference to the URI that points to the directory information corresponding to the attendee."), 
-        'language':  fields.function(_compute_data, method=True, string='Language', type="selection", selection=_lang_get, multi='language', store=True, help="To specify the language for text values in a property or property parameter."), 
-        'user_id': fields.many2one('res.users', 'User'), 
-        'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
-        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner', help="Partner related to contact"), 
-        'email': fields.char('Email', size=124, help="Email of Invited Person"), 
-        'event_date': fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'), 
-        'event_end_date': fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'), 
-        'ref': fields.reference('Event Ref', selection=_links_get, size=128), 
-        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"), 
+            'Delegated From', type="char", store=True, size=124, multi='delegated_from'),
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel',\
+                                       'attendee_id', 'parent_id', 'Delegrated From'),
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel',\
+                                      'attendee_id', 'child_id', 'Delegrated To'),
+        'sent_by': fields.function(_compute_data, method=True, string='Sent By',\
+                         type="char", multi='sent_by', store=True, size=124,\
+                         help="Specify the user that is acting on behalf of the calendar user"),
+        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User',\
+                             type="many2one", relation="res.users", multi='sent_by_uid'),
+        'cn': fields.function(_compute_data, method=True, string='Common name',\
+                             type="char", size=124, multi='cn', store=True),
+        'dir': fields.char('URI Reference', size=124, help="Reference to the URI\
+                     that points to the directory information corresponding to the attendee."),
+        'language':  fields.function(_compute_data, method=True, string='Language',\
+                     type="selection", selection=_lang_get, multi='language',\
+                     store=True, help="To specify the language for text values in a\
+                      property or property parameter."),
+        'user_id': fields.many2one('res.users', 'User'),
+        'partner_address_id': fields.many2one('res.partner.address', 'Contact'),
+        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one',\
+                        relation='res.partner', string='Partner', help="Partner related to contact"),
+        'email': fields.char('Email', size=124, help="Email of Invited Person"),
+        'event_date': fields.function(_compute_data, method=True, string='Event Date',\
+                             type="datetime", multi='event_date'),
+        'event_end_date': fields.function(_compute_data, method=True, string='Event End Date',\
+                                 type="datetime", multi='event_end_date'),
+        'ref': fields.reference('Event Ref', selection=_links_get, size=128),
+        'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"),
      }
     _defaults = {
-        'state':  lambda *x: 'needs-action', 
+        'state':  lambda *x: 'needs-action',
     }
-    
+
     response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
-    
-    def msg_new(self, cr, uid, msg):        
+
+    def msg_new(self, cr, uid, msg):
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks, """
         return False
-        
+
     def msg_act_get(self, msg):
         """
         Get Message.
+        @param self: The object pointer
         @return: dictionary of actions which contain state field value.
         """
-        
+
         mailgate_obj = self.pool.get('mail.gateway')
         body = mailgate_obj.msg_body_get(msg)
         actions = {}
@@ -399,6 +422,7 @@ request was delegated to"),
         @param context: A standard dictionary for contextual values
         @return: True
         """
+
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
         for att in self.browse(cr, uid, ids, context=context):
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
@@ -411,26 +435,26 @@ request was delegated to"),
                 att_infos.append(((att2.user_id and att2.user_id.name) or \
                              (att2.partner_id and att2.partner_id.name) or \
                                 att2.email) +  ' - Status: ' + att2.state.title())
-            body_vals = {'name': res_obj.name, 
-                        'start_date': res_obj.date, 
-                        'end_date': res_obj.date_deadline or False, 
-                        'description': res_obj.description or '-', 
-                        'location': res_obj.location or '-', 
-                        'attendees': '<br>'.join(att_infos), 
-                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
-                        'sign': sign, 
+            body_vals = {'name': res_obj.name,
+                        'start_date': res_obj.date,
+                        'end_date': res_obj.date_deadline or False,
+                        'description': res_obj.description or '-',
+                        'location': res_obj.location or '-',
+                        'attendees': '<br>'.join(att_infos),
+                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User',
+                        'sign': sign,
                         'company': company
             }
             body = html_invitation % body_vals
             if mail_to and email_from:
                 tools.email_send(
-                        email_from, 
-                        mail_to, 
-                        sub, 
-                        body, 
-                        subtype='html', 
+                        email_from,
+                        mail_to,
+                        sub,
+                        body,
+                        subtype='html',
                         reply_to=email_from
-                    ) 
+                    )
             return True
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
         """
@@ -441,6 +465,7 @@ request was delegated to"),
         @param user_id: User id
         @return: dictionary of value. which put value in email and availability fields.
         """
+
         if not user_id:
             return {'value': {'email': ''}}
         usr_obj = self.pool.get('res.users')
@@ -448,6 +473,13 @@ request was delegated to"),
         return {'value': {'email': user.address_id.email, 'availability':user.availability}}
 
     def do_tentative(self, cr, uid, ids, context=None, *args):
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of calendar attendee’s IDs
+            @param *args: Get Tupple value
+            @param context: A standard dictionary for contextual values """
+
         self.write(cr, uid, ids, {'state': 'tentative'}, context)
 
     def do_accept(self, cr, uid, ids, context=None, *args):
@@ -458,6 +490,7 @@ request was delegated to"),
         @param ids: List of calendar attendee’s IDs.
         @return: True
         """
+
         if not context:
             context = {}
 
@@ -475,9 +508,21 @@ request was delegated to"),
         return True
 
     def do_decline(self, cr, uid, ids, context=None, *args):
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of calendar attendee’s IDs
+            @param *args: Get Tupple value
+            @param context: A standard dictionary for contextual values """
+
         self.write(cr, uid, ids, {'state': 'declined'}, context)
 
     def create(self, cr, uid, vals, context=None):
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param vals: Get Values
+            @param context: A standard dictionary for contextual values """
 
         if not context:
             context = {}
@@ -488,34 +533,35 @@ request was delegated to"),
             vals['cn'] = vals.get("cn")
         res = super(calendar_attendee, self).create(cr, uid, vals, context)
         return res
-    
+
 calendar_attendee()
 
 class res_alarm(osv.osv):
     _name = 'res.alarm'
     _description = 'Basic Alarm Information'
     _columns = {
-        'name':fields.char('Name', size=256, required=True), 
+        'name':fields.char('Name', size=256, required=True),
         'trigger_occurs': fields.selection([('before', 'Before'), ('after', 'After')], \
-                                        'Triggers', required=True), 
+                                        'Triggers', required=True),
         'trigger_interval': fields.selection([('minutes', 'Minutes'), ('hours', 'Hours'), \
-                ('days', 'Days')], 'Interval', required=True), 
-        'trigger_duration':  fields.integer('Duration', required=True), 
+                ('days', 'Days')], 'Interval', required=True),
+        'trigger_duration':  fields.integer('Duration', required=True),
         'trigger_related':  fields.selection([('start', 'The event starts'), ('end', \
-                                       'The event ends')], 'Related to', required=True), 
+                                       'The event ends')], 'Related to', required=True),
         'duration': fields.integer('Duration', help="""Duration' and 'Repeat' \
-are both optional, but if one occurs, so MUST the other"""), 
-        'repeat': fields.integer('Repeat'), 
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the event alarm information without removing it."), 
+are both optional, but if one occurs, so MUST the other"""),
+        'repeat': fields.integer('Repeat'),
+        'active': fields.boolean('Active', help="If the active field is set to \
+                    true, it will allow you to hide the event alarm information without removing it."),
 
 
     }
     _defaults = {
-        'trigger_interval':  lambda *x: 'minutes', 
-        'trigger_duration': lambda *x: 5, 
-        'trigger_occurs': lambda *x: 'before', 
-        'trigger_related': lambda *x: 'start', 
-        'active': lambda *x: 1, 
+        'trigger_interval':  lambda *x: 'minutes',
+        'trigger_duration': lambda *x: 5,
+        'trigger_occurs': lambda *x: 'before',
+        'trigger_related': lambda *x: 'start',
+        'active': lambda *x: 1,
     }
 
     def do_alarm_create(self, cr, uid, ids, model, date, context={}):
@@ -528,13 +574,14 @@ are both optional, but if one occurs, so MUST the other"""),
         @param context: A standard dictionary for contextual values
         @return: True
         """
+
         alarm_obj = self.pool.get('calendar.alarm')
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
-       
+
         model_obj = self.pool.get(model)
         for data in model_obj.browse(cr, uid, ids):
-            
+
             basic_alarm = data.alarm_id
             if not context.get('alarm_id'):
                 self.do_alarm_unlink(cr, uid, [data.id], model)
@@ -542,20 +589,20 @@ are both optional, but if one occurs, so MUST the other"""),
             self.do_alarm_unlink(cr, uid, [data.id], model)
             if basic_alarm:
                 vals = {
-                    'action': 'display', 
-                    'description': data.description, 
-                    'name': data.name, 
-                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))], 
-                    'trigger_related': basic_alarm.trigger_related, 
-                    'trigger_duration': basic_alarm.trigger_duration, 
-                    'trigger_occurs': basic_alarm.trigger_occurs, 
-                    'trigger_interval': basic_alarm.trigger_interval, 
-                    'duration': basic_alarm.duration, 
-                    'repeat': basic_alarm.repeat, 
-                    'state': 'run', 
-                    'event_date': data[date], 
-                    'res_id': data.id, 
-                    'model_id': model_id, 
+                    'action': 'display',
+                    'description': data.description,
+                    'name': data.name,
+                    'attendee_ids': [(6, 0, map(lambda x:x.id, data.attendee_ids))],
+                    'trigger_related': basic_alarm.trigger_related,
+                    'trigger_duration': basic_alarm.trigger_duration,
+                    'trigger_occurs': basic_alarm.trigger_occurs,
+                    'trigger_interval': basic_alarm.trigger_interval,
+                    'duration': basic_alarm.duration,
+                    'repeat': basic_alarm.repeat,
+                    'state': 'run',
+                    'event_date': data[date],
+                    'res_id': data.id,
+                    'model_id': model_id,
                     'user_id': uid
                  }
                 alarm_id = alarm_obj.create(cr, uid, vals)
@@ -567,13 +614,14 @@ are both optional, but if one occurs, so MUST the other"""),
 
     def do_alarm_unlink(self, cr, uid, ids, model, context={}):
         """
-        Delete alarm specified in ids 
+        Delete alarm specified in ids
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of res alarm’s IDs.
         @param model: Model name.
         @return: True
         """
+
         alarm_obj = self.pool.get('calendar.alarm')
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
@@ -596,35 +644,40 @@ class calendar_alarm(osv.osv):
     __attribute__ = {}
 
     _columns = {
-            'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'), 
-            'name': fields.char('Summary', size=124, help="""Contains the text to be used as the message subject for email
-or contains the text to be used for display"""), 
+            'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'),
+            'name': fields.char('Summary', size=124, help="""Contains the text to be \
+                         used as the message subject for email \
+                         or contains the text to be used for display"""),
             'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
                     ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
-                    required=True, help="Defines the action to be invoked when an alarm is triggered"), 
-            'description': fields.text('Description', help='Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property'), 
+                    required=True, help="Defines the action to be invoked when an alarm is triggered"),
+            'description': fields.text('Description', help='Provides a more complete \
+                                description of the calendar component, than that \
+                                provided by the "SUMMARY" property'),
             'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
-                                          'alarm_id', 'attendee_id', 'Attendees', readonly=True), 
-            'attach': fields.binary('Attachment', help="""* Points to a sound resource, which is rendered when the alarm is triggered for audio,
-* File which is intended to be sent as message attachments for email,
-* Points to a procedure resource, which is invoked when the alarm is triggered for procedure."""), 
-            'res_id': fields.integer('Resource ID'), 
-            'model_id': fields.many2one('ir.model', 'Model'), 
-            'user_id': fields.many2one('res.users', 'Owner'), 
-            'event_date': fields.datetime('Event Date'), 
-            'event_end_date': fields.datetime('Event End Date'), 
-            'trigger_date': fields.datetime('Trigger Date', readonly="True"), 
+                                          'alarm_id', 'attendee_id', 'Attendees', readonly=True),
+            'attach': fields.binary('Attachment', help="""* Points to a sound resource,\
+                         which is rendered when the alarm is triggered for audio,
+                        * File which is intended to be sent as message attachments for email,
+                        * Points to a procedure resource, which is invoked when\
+                          the alarm is triggered for procedure."""),
+            'res_id': fields.integer('Resource ID'),
+            'model_id': fields.many2one('ir.model', 'Model'),
+            'user_id': fields.many2one('res.users', 'Owner'),
+            'event_date': fields.datetime('Event Date'),
+            'event_end_date': fields.datetime('Event End Date'),
+            'trigger_date': fields.datetime('Trigger Date', readonly="True"),
             'state':fields.selection([
-                        ('draft', 'Draft'), 
-                        ('run', 'Run'), 
-                        ('stop', 'Stop'), 
-                        ('done', 'Done'), 
-                    ], 'State', select=True, readonly=True), 
+                        ('draft', 'Draft'),
+                        ('run', 'Run'),
+                        ('stop', 'Stop'),
+                        ('done', 'Done'),
+                    ], 'State', select=True, readonly=True),
      }
 
     _defaults = {
-        'action':  lambda *x: 'email', 
-        'state': lambda *x: 'run', 
+        'action':  lambda *x: 'email',
+        'state': lambda *x: 'run',
      }
 
     def create(self, cr, uid, vals, context={}):
@@ -636,6 +689,7 @@ or contains the text to be used for display"""),
         @param context: A standard dictionary for contextual values
         @return: new record id for calendar_alarm.
         """
+
         event_date = vals.get('event_date', False)
         if event_date:
             dtstart = datetime.strptime(vals['event_date'], "%Y-%m-%d %H:%M:%S")
@@ -652,6 +706,15 @@ or contains the text to be used for display"""),
 
     def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, \
                        context=None):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of calendar alarm’s IDs.
+            @param use_new_cursor: False or the dbname
+            @param context: A standard dictionary for contextual values
+        """
+
 
         if not context:
             context = {}
@@ -667,11 +730,11 @@ or contains the text to be used for display"""),
         for alarm in self.browse(cr, uid, alarm_ids):
             if alarm.action == 'display':
                 value = {
-                   'name': alarm.name, 
-                   'act_from': alarm.user_id.id, 
-                   'act_to': alarm.user_id.id, 
-                   'body': alarm.description, 
-                   'trigger_date': alarm.trigger_date, 
+                   'name': alarm.name,
+                   'act_from': alarm.user_id.id,
+                   'act_to': alarm.user_id.id,
+                   'body': alarm.description,
+                   'trigger_date': alarm.trigger_date,
                    'ref_doc1':  '%s,%s'  % (alarm.model_id.model, alarm.res_id)
                 }
                 request_id = request_obj.create(cr, uid, value)
@@ -701,9 +764,9 @@ or contains the text to be used for display"""),
                     mail_to.append(att.user_id.address_id.email)
                 if mail_to:
                     tools.email_send(
-                        tools.config.get('email_from', False), 
-                        mail_to, 
-                        sub, 
+                        tools.config.get('email_from', False),
+                        mail_to,
+                        sub,
                         body
                     )
             self.write(cr, uid, [alarm.id], {'state':'done'})
@@ -716,12 +779,23 @@ class calendar_event(osv.osv):
     _name = "calendar.event"
     _description = "Calendar Event"
     __attribute__ = {}
-    
+
     def _tz_get(self, cr, uid, context={}):
         return [(x.lower(), x) for x in pytz.all_timezones]
 
-    
+
     def onchange_dates(self, cr, uid, ids, start_date, duration=False, end_date=False, context={}):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar event’s IDs.
+        @param start_date: Get starting date
+        @param duration: Get Duration between start date and end date or False
+        @param end_date: Get Ending Date or False
+        @param context: A standard dictionary for contextual values
+
+        """
         if not start_date:
             return {}
         value = {}
@@ -744,13 +818,13 @@ class calendar_event(osv.osv):
         Get rule string.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
-        @param id: List of  calendar event's ids. 
+        @param id: List of  calendar event's ids.
         @param context: A standard dictionary for contextual values
         @return: dictionary of rrule value.
         """
         result = {}
         for event in ids:
-            
+
             datas = self.read(cr, uid, event)
             if datas.get('rrule_type'):
                 if datas.get('rrule_type') == 'none':
@@ -762,39 +836,41 @@ class calendar_event(osv.osv):
                     result[event] = self.compute_rule_string(cr, uid, {'freq':\
                                         datas.get('rrule_type').upper(), \
                                       'interval': 1}, context=context)
-       
+
         return result
 
     _columns = {
-        'id': fields.integer('ID'), 
-        'sequence': fields.integer('Sequence'), 
-        'name': fields.char('Description', size=64, required=True), 
-        'date': fields.datetime('Date'), 
-        'date_deadline': fields.datetime('Deadline'), 
-        'create_date': fields.datetime('Created', readonly=True), 
-        'duration': fields.float('Duration'), 
-        'description': fields.text('Your action'), 
+        'id': fields.integer('ID'),
+        'sequence': fields.integer('Sequence'),
+        'name': fields.char('Description', size=64, required=True),
+        'date': fields.datetime('Date'),
+        'date_deadline': fields.datetime('Deadline'),
+        'create_date': fields.datetime('Created', readonly=True),
+        'duration': fields.float('Duration'),
+        'description': fields.text('Your action'),
         'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
-                 ('confidential', 'Confidential')], 'Mark as'), 
-        'location': fields.char('Location', size=264, help="Location of Event"), 
+                 ('confidential', 'Confidential')], 'Mark as'),
+        'location': fields.char('Location', size=264, help="Location of Event"),
         'show_as': fields.selection([('free', 'Free'), \
-                                  ('busy', 'Busy')], 
-                                   'Show as'), 
-        'base_calendar_url': fields.char('Caldav URL', size=264), 
+                                  ('busy', 'Busy')],
+                                   'Show as'),
+        'base_calendar_url': fields.char('Caldav URL', size=264),
         'exdate': fields.text('Exception Date/Times', help="This property \
-defines the list of date/time exceptions for arecurring calendar component."), 
+                    defines the list of date/time exceptions for arecurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="defines a \
-rule or repeating pattern for anexception to a recurrence set"), 
-        'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, string='Recurrent Rule', store=True), 
+                    rule or repeating pattern for anexception to a recurrence set"),
+        'rrule': fields.function(_get_rulestring, type='char', size=124, method=True,\
+                     string='Recurrent Rule', store=True),
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
                             ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'), 
-        'alarm_id': fields.many2one('res.alarm', 'Alarm'), 
-        'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
-        'recurrent_uid': fields.integer('Recurrent ID'), 
-        'recurrent_id': fields.datetime('Recurrent ID date'), 
-        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, string='Timezone', store=True), 
-        'user_id': fields.many2one('res.users', 'Responsible'), 
+                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'),
+        'alarm_id': fields.many2one('res.alarm', 'Alarm'),
+        'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
+        'recurrent_uid': fields.integer('Recurrent ID'),
+        'recurrent_id': fields.datetime('Recurrent ID date'),
+        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24,\
+                         string='Timezone', store=True),
+        'user_id': fields.many2one('res.users', 'Responsible'),
         'freq': fields.selection([('None', 'No Repeat'), \
                             ('secondly', 'Secondly'), \
                             ('minutely', 'Minutely'), \
@@ -802,46 +878,56 @@ rule or repeating pattern for anexception to a recurrence set"),
                             ('daily', 'Daily'), \
                             ('weekly', 'Weekly'), \
                             ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly')], 'Frequency'), 
-        'interval': fields.integer('Interval'), 
-        'count': fields.integer('Count'), 
-        'mo': fields.boolean('Mon'), 
-        'tu': fields.boolean('Tue'), 
-        'we': fields.boolean('Wed'), 
-        'th': fields.boolean('Thu'), 
-        'fr': fields.boolean('Fri'), 
-        'sa': fields.boolean('Sat'), 
-        'su': fields.boolean('Sun'), 
+                            ('yearly', 'Yearly')], 'Frequency'),
+        'interval': fields.integer('Interval'),
+        'count': fields.integer('Count'),
+        'mo': fields.boolean('Mon'),
+        'tu': fields.boolean('Tue'),
+        'we': fields.boolean('Wed'),
+        'th': fields.boolean('Thu'),
+        'fr': fields.boolean('Fri'),
+        'sa': fields.boolean('Sat'),
+        'su': fields.boolean('Sun'),
         'select1': fields.selection([('date', 'Date of month'), \
-                            ('day', 'Day of month')], 'Option'), 
-        'day': fields.integer('Date of month'), 
+                            ('day', 'Day of month')], 'Option'),
+        'day': fields.integer('Date of month'),
         'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
                                    ('WE', 'Wednesday'), ('TH', 'Thursday'), \
                                    ('FR', 'Friday'), ('SA', 'Saturday'), \
-                                   ('SU', 'Sunday')], 'Weekday'), 
+                                   ('SU', 'Sunday')], 'Weekday'),
         'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
                                    ('3', 'Third'), ('4', 'Fourth'), \
-                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'), 
-        'month_list': fields.selection(months.items(), 'Month'), 
+                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'),
+        'month_list': fields.selection(months.items(), 'Month'),
         'end_date': fields.date('Repeat Until')
     }
 
     _defaults = {
-         'class': lambda *a: 'public', 
-         'show_as': lambda *a: 'busy', 
-         'freq':  lambda *x: 'None', 
-         'select1':  lambda *x: 'date', 
-         'interval':  lambda *x: 1, 
+         'class': lambda *a: 'public',
+         'show_as': lambda *a: 'busy',
+         'freq':  lambda *x: 'None',
+         'select1':  lambda *x: 'date',
+         'interval':  lambda *x: 1,
     }
-    
+
     def modify_this(self, cr, uid, event_id, defaults, real_date, context=None, *args):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param event_id: Get Event_id
+        @param real_date: Get Real Date
+        @param context: A standard dictionary for contextual values
+        @param *args: Get Tuppel Value
+
+        """
 
         event_id = base_calendar_id2real_id(event_id)
         datas = self.read(cr, uid, event_id, context=context)
         defaults.update({
-               'recurrent_uid': base_calendar_id2real_id(datas['id']), 
-               'recurrent_id': defaults.get('date') or real_date, 
-               'rrule_type': 'none', 
+               'recurrent_uid': base_calendar_id2real_id(datas['id']),
+               'recurrent_id': defaults.get('date') or real_date,
+               'rrule_type': 'none',
                'rrule': ''
                     })
         exdate = datas['exdate'] and datas['exdate'].split(',') or []
@@ -862,10 +948,10 @@ rule or repeating pattern for anexception to a recurrence set"),
         #start Loop
         for event_id in event_ids:
             event_id = base_calendar_id2real_id(event_id)
-            
+
             defaults.pop('id')
             defaults.update({'table': self._table})
-    
+
             qry = "UPDATE %(table)s set name = '%(name)s', \
                             date = '%(date)s',  date_deadline = '%(date_deadline)s'"
             if defaults.get('alarm_id'):
@@ -878,6 +964,14 @@ rule or repeating pattern for anexception to a recurrence set"),
         return True
 
     def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param base_start_date: Get Start Date
+        @param base_until_date: Get End Date
+        @param limit: The Number of Results to Return """
+
         if not limit:
             limit = 100
         if isinstance(select, (str, int, long)):
@@ -909,7 +1003,7 @@ rule or repeating pattern for anexception to a recurrence set"),
                     result.append(idval)
                     count += 1
                 else:
-                    exdate = data['exdate'] and data['exdate'].split(',') or []                    
+                    exdate = data['exdate'] and data['exdate'].split(',') or []
                     rrule_str = data['rrule']
                     new_rrule_str = []
                     rrule_until_date = False
@@ -956,9 +1050,9 @@ rule or repeating pattern for anexception to a recurrence set"),
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param datas: dictionary of freq and interval value.
-        @return: string value which compute  FREQILY;INTERVAL 
+        @return: string value which compute  FREQILY;INTERVAL
         """
-        
+
         weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
         weekstring = ''
         monthstring = ''
@@ -1002,14 +1096,16 @@ rule or repeating pattern for anexception to a recurrence set"),
 #        End logic
         return rrule_string
 
-    def search(self, cr, uid, args, offset=0, limit=100, order=None, 
+    def search(self, cr, uid, args, offset=0, limit=100, order=None,
             context=None, count=False):
         """
         Overrides  orm search method.
         @param cr: the current row, from the database cursor,
         @param user: the current user’s ID for security checks,
         @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
-        @return: List of id 
+        @param offset: The Number of Results to Pass
+        @param limit: The Number of Results to Return
+        @return: List of id
         """
         args_without_date = []
         start_date = False
@@ -1064,7 +1160,7 @@ rule or repeating pattern for anexception to a recurrence set"),
             context.update({'alarm_id': vals.get('alarm_id')})
             alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', \
                                             context=context)
-        
+
         return res
 
     def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
@@ -1085,7 +1181,7 @@ rule or repeating pattern for anexception to a recurrence set"),
                                                     list_class, fields_process)
         if isinstance(ids, (str, int, long)):
             return res and res[0] or False
-        
+
         return res
 
     def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
@@ -1130,7 +1226,7 @@ rule or repeating pattern for anexception to a recurrence set"),
         res = super(calendar_event, self).copy(cr, uid, base_calendar_id2real_id(id), default, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date')
-        
+
         return res
 
     def unlink(self, cr, uid, ids, context=None):
@@ -1182,17 +1278,38 @@ rule or repeating pattern for anexception to a recurrence set"),
 calendar_event()
 
 class calendar_todo(osv.osv):
+    """ Calendar Task """
+
     _name = "calendar.todo"
     _inherit = "calendar.event"
     _description = "Calendar Task"
 
     def _get_date(self, cr, uid, ids, name, arg, context):
+        """ Get Date
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of calendar todo's IDs.
+            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+            @param context: A standard dictionary for contextual values
+        """
+
         res = {}
         for event in self.browse(cr, uid, ids, context=context):
             res[event.id] = event.date_start
         return res
 
     def _set_date(self, cr, uid, id, name, value, arg, context):
+        """ Set Date
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param id: calendar's ID.
+            @param value: Get Value
+            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+            @param context: A standard dictionary for contextual values
+        """
+
         event = self.browse(cr, uid, id, context=context)
         cr.execute("UPDATE %s set date_start='%s' where id=%s"  \
                            % (self._table, value, id))
@@ -1200,33 +1317,50 @@ class calendar_todo(osv.osv):
 
     _columns = {
         'date': fields.function(_get_date, method=True, fnct_inv=_set_date, \
-                            string='Duration', store=True, type='datetime'), 
-        'duration': fields.integer('Duration'), 
+                            string='Duration', store=True, type='datetime'),
+        'duration': fields.integer('Duration'),
     }
-    
+
     __attribute__ = {}
-    
-    
+
+
 calendar_todo()
- 
+
 class ir_attachment(osv.osv):
     _name = 'ir.attachment'
     _inherit = 'ir.attachment'
 
     def search_count(self, cr, user, args, context=None):
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user’s ID for security checks,
+            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+            @param context: A standard dictionary for contextual values
+        """
+
         args1 = []
         for arg in args:
             args1.append(map(lambda x:str(x).split('-')[0], arg))
         return super(ir_attachment, self).search_count(cr, user, args1, context)
 
-    def search(self, cr, uid, args, offset=0, limit=None, order=None, 
+    def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
+
+        """ @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+            @param offset: The Number of Results to pass,
+            @param limit: The Number of Results to Return,
+            @param context: A standard dictionary for contextual values
+        """
+
         new_args = args
         for i, arg in enumerate(new_args):
             if arg[0] == 'res_id':
                 new_args[i] = (arg[0], arg[1], base_calendar_id2real_id(arg[2]))
-        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset, 
-                            limit=limit, order=order, 
+        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
+                            limit=limit, order=order,
                             context=context, count=False)
 ir_attachment()
 
@@ -1235,6 +1369,13 @@ class ir_values(osv.osv):
 
     def set(self, cr, uid, key, key2, name, models, value, replace=True, \
             isobject=False, meta=False, preserve_user=False, company=False):
+
+        """ set IR Values
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param model: Get The Model """
+
         new_model = []
         for data in models:
             if type(data) in (list, tuple):
@@ -1246,6 +1387,13 @@ class ir_values(osv.osv):
 
     def get(self, cr, uid, key, key2, models, meta=False, context={}, \
              res_id_req=False, without_user=True, key2_req=True):
+
+        """ Get IR Values
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param model: Get The Model """
+
         new_model = []
         for data in models:
             if type(data) in (list, tuple):
@@ -1261,8 +1409,17 @@ class ir_model(osv.osv):
 
     _inherit = 'ir.model'
 
-    def read(self, cr, uid, ids, fields=None, context={}, 
+    def read(self, cr, uid, ids, fields=None, context={},
             load='_classic_read'):
+
+        """ Read IR Model
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of IR Model’s IDs.
+            @param context: A standard dictionary for contextual values """
+
+
         data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
                         context=context, load=load)
         if data:
@@ -1275,13 +1432,21 @@ ir_model()
 class virtual_report_spool(web_services.report_spool):
 
     def exp_report(self, db, uid, object, ids, datas=None, context=None):
+
+        """ Export Report
+            @param self: The object pointer
+            @param db: get the current database,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
+
         if object == 'printscreen.list':
             return super(virtual_report_spool, self).exp_report(db, uid, \
                             object, ids, datas, context)
         new_ids = []
         for id in ids:
             new_ids.append(base_calendar_id2real_id(id))
-        if datas.get('id',False):   
+        if datas.get('id', False):
             datas['id'] = base_calendar_id2real_id(datas['id'])
         return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
 
@@ -1291,11 +1456,19 @@ class res_users(osv.osv):
     _inherit = 'res.users'
 
     def _get_user_avail(self, cr, uid, ids, context=None):
+
+        """ Get USer Availability
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of res user’s IDs.
+            @param context: A standard dictionary for contextual values """
+
         current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         res = {}
         attendee_obj = self.pool.get('calendar.attendee')
         attendee_ids = attendee_obj.search(cr, uid, [
-                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime), 
+                    ('event_date', '<=', current_datetime), ('event_end_date', '<=', current_datetime),
                     ('state', '=', 'accepted'), ('user_id', 'in', ids)
                     ])
 
@@ -1305,7 +1478,7 @@ class res_users(osv.osv):
             status = 'busy'
             res.update({user_id:status})
 
-        #TOCHECK: Delegated Event        
+        #TOCHECK: Delegated Event
         for user_id in ids:
             if user_id not in res:
                 res[user_id] = 'free'
@@ -1313,12 +1486,20 @@ class res_users(osv.osv):
         return res
 
     def _get_user_avail_fun(self, cr, uid, ids, name, args, context=None):
+
+        """ Get USer Availability Function
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of res user’s IDs.
+            @param context: A standard dictionary for contextual values """
+
         return self._get_user_avail(cr, uid, ids, context=context)
 
     _columns = {
             'availability': fields.function(_get_user_avail_fun, type='selection', \
                     selection=[('free', 'Free'), ('busy', 'Busy')], \
-                    string='Free/Busy', method=True), 
+                    string='Free/Busy', method=True),
     }
 res_users()
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 7b3b4a036b8..0a60fa2e575 100755
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
         <record id="base_calendar_attendee_form_view" model="ir.ui.view">
             <field name="name">calendar.attendee.form</field>
             <field name="model">calendar.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invitation details">
-                    <field name="email" string="Invitation To"/> 
+					<field name="email" string="Invitation To"/>
                     <field name="sent_by_uid" string="Invitation From" />
                     <notebook colspan="4">
                         <page string="Invitation">
@@ -22,7 +22,7 @@
                                     string="Partner" readonly="1" />
                                 <field name="role" string="Role" />
                                 <field name="cutype" string="Invitation type" />
-                                <field name="rsvp" /> 
+                                <field name="rsvp" />
                             </group>
                             <separator string="Event Detail" colspan="4" />
                             <group colspan="4" col="4">
@@ -70,7 +70,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Invitation details">
-                    <field name="email" string="Invitation To"/>
+					<field name="email" string="Invitation To"/>
                     <field name="partner_id" string="Partner" />
                     <field name="partner_address_id" string="Contact" />
                     <field name="role" />
@@ -125,7 +125,7 @@
                 <field name="name">res.alarm.tree</field>
                 <field name="model">res.alarm</field>
                 <field name="type">tree</field>
-                <field name="arch" type="xml">                    
+                <field name="arch" type="xml">
                     <tree string="Reminder details">
                         <field name="name" select="1"/>
                         <field name="trigger_interval" select="1"/>
@@ -136,13 +136,13 @@
                 </field>
             </record>
          <record id="action_res_alarm_view" model="ir.actions.act_window">
-            <field name="name">Available Alarms</field>
+			<field name="name">Available Alarms</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.alarm</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
          </record>
-        
+
         <!--Available alarms-->
         <menuitem id="base.menu_calendar_configuration" name="Calendar"
             parent="base.menu_base_config" sequence="10" />
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index ad5c2066714..f04be4fba43 100755
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -27,21 +27,22 @@ class base_calendar_invite_attendee(osv.osv_memory):
     """
     Invite attendee.
     """
-    
+
     _name = "base_calendar.invite.attendee"
     _description = "Invite Attendees"
 
     _columns = {
         'type': fields.selection([('internal', 'Internal User'), \
               ('external', 'External Email'), \
-              ('partner', 'Partner Contacts')], 'Type', required=True), 
-        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
-                                  'invite_id', 'user_id', 'Users'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
-        'email': fields.char('Email', size=124), 
-        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
-                                  'invite_id', 'contact_id', 'Contacts'), 
-        'send_mail': fields.boolean('Send mail?', help='Check this if you want to send an Email to Invited Person')
+              ('partner', 'Partner Contacts')], 'Type', required=True),
+        'user_ids': fields.many2many('res.users', 'invite_user_rel',
+                                  'invite_id', 'user_id', 'Users'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'email': fields.char('Email', size=124),
+        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel',
+                                  'invite_id', 'contact_id', 'Contacts'),
+        'send_mail': fields.boolean('Send mail?', help='Check this if you want to \
+                        send an Email to Invited Person')
     }
 
     _defaults = {
@@ -57,20 +58,20 @@ class base_calendar_invite_attendee(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return: Dictionary of {}.
         """
-        
+
         if not context:
             context = {}
-        
+
         model = False
         model_field = False
-        
+
         context_id = context and context.get('active_id', False) or False
         if not context or not context.get('model'):
             return {}
         else:
             model = context.get('model')
         model_field = context.get('attendee_field', False)
-            
+
         for datas in self.read(cr, uid, ids, context=context):
 
             obj = self.pool.get(model)
@@ -85,7 +86,7 @@ class base_calendar_invite_attendee(osv.osv_memory):
             if not model == 'calendar.attendee':
                 if context_id:
                     ref = {'ref': '%s,%s' % (model, base_calendar.base_calendar_id2real_id(context_id))}
-                else: 
+                else:
                     return {}
             if type == 'internal':
                 user_obj = self.pool.get('res.users')
@@ -94,7 +95,7 @@ class base_calendar_invite_attendee(osv.osv_memory):
                 for user_id in datas.get('user_ids'):
                     user = user_obj.browse(cr, uid, user_id)
                     res = {
-                           'user_id': user_id, 
+                           'user_id': user_id,
                            'email': user.address_id.email
                            }
                     res.update(ref)
@@ -112,7 +113,7 @@ class base_calendar_invite_attendee(osv.osv_memory):
                 add_obj = self.pool.get('res.partner.address')
                 for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
                     res = {
-                           'partner_address_id': contact.id, 
+                           'partner_address_id': contact.id,
                            'email': contact.email
                            }
                     res.update(ref)
@@ -121,12 +122,12 @@ class base_calendar_invite_attendee(osv.osv_memory):
                         mail_to.append(contact.email)
 
             att = att_obj.browse(cr, uid, context_id)
-           
+
             for att_val in vals:
                 if model == 'calendar.attendee':
                     if ref:
                         att_val.update({
-                            'parent_ids': [(4, att.id)], 
+                            'parent_ids': [(4, att.id)],
                             'ref': att.ref._name + ',' +str(att.ref.id)
                             })
                 attendees.append(att_obj.create(cr, uid, att_val))
@@ -141,7 +142,7 @@ class base_calendar_invite_attendee(osv.osv_memory):
                     raise osv.except_osv(_('Error!'), ("%s must have an email \
     Address to send mail") % (name[0]))
                 att_obj._send_mail(cr, uid, attendees, mail_to, \
-                       email_from=tools.config.get('email_from', False))
+                       email_from= tools.config.get('email_from', False))
 
         return {}
 
@@ -152,9 +153,10 @@ class base_calendar_invite_attendee(osv.osv_memory):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of base calendar invite attendee’s IDs.
-        @param partner_id: id of Partner 
+        @param partner_id: id of Partner
         @return: dictionary of value.
         """
+
         if not partner_id:
             return {'value': {'contact_ids': []}}
         cr.execute('select id from res_partner_address \
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index 945dc2bc20d..4fe55998e59 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -1,63 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-  		<!--    Attendee invite wizard-->
+	<data>
+		<!--    Attendee invite wizard-->
 
-		<record id="view_calendar_invite_attendee_wizard" model="ir.ui.view">
-            <field name="name">Invite Attendees</field>
-            <field name="model">base_calendar.invite.attendee</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Invite People">
-                	<field name="type" />
-                	<field name="send_mail" />
-                	<newline/>
-                	<group col="1" colspan="4"
-                		attrs="{'invisible': [('type', '!=', 'external')]}">
-                		<field name="email" colspan="4"
-                			attrs="{'required': [('type', '=', 'external')]}" />
-                	</group>
-                	<group col="1" colspan="4"
-                		attrs="{'invisible': [('type', '!=', 'internal')]}">
-                		<separator string="Users" colspan="4" />
-                		<field name="user_ids" select="1" colspan="4"
-                			nolabel="1" />
-                		<newline />
-                	</group>
-                	<group col="2" colspan="4"
-                		attrs="{'invisible': [('type', '!=', 'partner')]}">
-                		<field name="partner_id" colspan="2"
-                			on_change="onchange_partner_id(partner_id)"
-                			attrs="{'required': [('type', '=', 'partner')]}" />
-                		<newline />
-                		<separator string="Partner Contacts"
-                			colspan="4" />
-                		<field name="contact_ids" select="1" colspan="4"
-                			nolabel="1" domain="[('partner_id', '=', partner_id)]"
-                			attrs="{'readonly': [('type', '!=', 'partner')]}" />
-                	</group>
-                	<newline/>
-                	<separator string="" colspan="6" />
-                	<label string="" colspan="2" />
-                	<button icon='gtk-cancel' special="cancel"
-                		string="Cancel" />
-                	<button name="do_invite" string="Invite"
-                		type="object" icon="gtk-ok" />
-                </form>
-            </field>
-        </record>
-	
-	
-	<!--    Attendee invite action-->
-	
-        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
-            <field name="name">Invite Attendees</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base_calendar.invite.attendee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
+		<record id="view_calendar_invite_attendee_wizard"
+			model="ir.ui.view">
+			<field name="name">Invite Attendees</field>
+			<field name="model">base_calendar.invite.attendee</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Invite People">
+					<field name="type" />
+					<field name="send_mail" />
+					<newline />
+					<group col="1" colspan="4"
+						attrs="{'invisible': [('type', '!=', 'external')]}">
+						<field name="email" colspan="4"
+							attrs="{'required': [('type', '=', 'external')]}" />
+					</group>
+					<group col="1" colspan="4"
+						attrs="{'invisible': [('type', '!=', 'internal')]}">
+						<separator string="Users" colspan="4" />
+						<field name="user_ids" select="1" colspan="4"
+							nolabel="1" />
+						<newline />
+					</group>
+					<group col="2" colspan="4"
+						attrs="{'invisible': [('type', '!=', 'partner')]}">
+						<field name="partner_id" colspan="2"
+							on_change="onchange_partner_id(partner_id)"
+							attrs="{'required': [('type', '=', 'partner')]}" />
+						<newline />
+						<separator string="Partner Contacts"
+							colspan="4" />
+						<field name="contact_ids" select="1" colspan="4"
+							nolabel="1" domain="[('partner_id', '=', partner_id)]"
+							attrs="{'readonly': [('type', '!=', 'partner')]}" />
+					</group>
+					<newline />
+					<separator string="" colspan="6" />
+					<label string="" colspan="2" />
+					<button icon='gtk-cancel' special="cancel"
+						string="Cancel" />
+					<button name="do_invite" string="Invite"
+						type="object" icon="gtk-ok" />
+				</form>
+			</field>
+		</record>
 
-    </data>
+
+		<!--    Attendee invite action-->
+
+		<record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
+			<field name="name">Invite Attendees</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">base_calendar.invite.attendee</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form</field>
+			<field name="target">new</field>
+		</record>
+
+	</data>
 </openerp>
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
index 3c992e4de32..d99e864a148 100755
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -23,9 +23,13 @@ from osv import osv
 from osv import fields
 
 class calendar_event_edit_all(osv.osv_memory):
-    
+
     def _default_values(self, cr, uid, context={}):
-        """
+        """ Get Default value for Start Date
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
         @Return: Get Default value for Start Date
         """
         context_id = context and context.get('active_id', False) or False
@@ -36,12 +40,17 @@ class calendar_event_edit_all(osv.osv_memory):
                 model = context.get('model', False)
                 model_obj = self.pool.get(model)
                 event = model_obj.read(cr, uid, context_id, ['name', 'location', 'alarm_id'])
-                return event['date']    
-        
+                return event['date']
+
     def _default_deadline(self, cr, uid, context={}):
-        """
+        """ Get Default value for End Date
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
         @return: Get Default value for End Date
         """
+
         context_id = context and context.get('active_id', False) or False
         if context_id:
             if context.get('date_deadline'):
@@ -62,7 +71,7 @@ class calendar_event_edit_all(osv.osv_memory):
         """
         if not context:
             context = {}
-            
+
         context_id = context and context.get('active_id', False) or False
         if context_id:
             for datas in self.read(cr, uid, ids):
@@ -74,16 +83,16 @@ class calendar_event_edit_all(osv.osv_memory):
     _name = "calendar.event.edit.all"
     _description = "Calendar Edit all event"
     _columns = {
-        'name': fields.char('Title', size=64, required=True), 
-        'date': fields.datetime('Start Date', required=True), 
-        'date_deadline': fields.datetime('End Date', required=True), 
-        'location': fields.char('Location', size=124), 
-        'alarm_id': fields.many2one('res.alarm', 'Reminder'), 
+        'name': fields.char('Title', size=64, required=True),
+        'date': fields.datetime('Start Date', required=True),
+        'date_deadline': fields.datetime('End Date', required=True),
+        'location': fields.char('Location', size=124),
+        'alarm_id': fields.many2one('res.alarm', 'Reminder'),
     }
     _defaults = {
-        'date': _default_values, 
+        'date': _default_values,
         'date_deadline': _default_deadline
-    }    
+    }
 calendar_event_edit_all()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
index 9d8798e9669..82f403e9254 100755
--- a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
+++ b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_calendar_event_edit_all" model="ir.ui.view">
+		<record id="view_calendar_event_edit_all" model="ir.ui.view">
             <field name="name">calendar.event.edit.all.form</field>
             <field name="model">calendar.event.edit.all</field>
             <field name="type">form</field>
@@ -17,25 +17,25 @@
               			 <field name='date' />
               			 <field name='date_deadline' />
               			 <newline />
-              			 <field name='alarm_id'/>  
+              			 <field name='alarm_id'/>
                     </group>
-                       	<separator string="" colspan="4" />
+                       	 <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-save" string="_Save" name="modify_this" type="object"/>
+                    	 <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	 <button  icon="gtk-save" string="_Save" name="modify_this" type="object"/>
                    </group>
                </form>
             </field>
-        </record>
+		</record>
 
         <record id="action_calendar_event_edit_all" model="ir.actions.act_window">
             <field name="name">Edit all events</field>
             <field name="res_model">calendar.event.edit.all</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_calendar_event_edit_all"/> 
+           <field name="view_id" ref="view_calendar_event_edit_all"/>
            <field name="target">new</field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/caldav/DAV/BufferingHTTPServer.py b/addons/caldav/DAV/BufferingHTTPServer.py
index 37520421432..bf2e9e59800 100644
--- a/addons/caldav/DAV/BufferingHTTPServer.py
+++ b/addons/caldav/DAV/BufferingHTTPServer.py
@@ -27,6 +27,7 @@ __author__  = AUTHOR
 
 from BaseHTTPServer import BaseHTTPRequestHandler
 import os
+
 class BufferedHTTPRequestHandler(BaseHTTPRequestHandler):
     """
     Buffering HTTP Request Handler
@@ -47,12 +48,12 @@ class BufferedHTTPRequestHandler(BaseHTTPRequestHandler):
         If you override the handle() method remember to call
         this (see below)
         """
-        self.__buffer=""
-        self.__outfp=os.tmpfile()
+        self.__buffer = ""
+        self.__outfp = os.tmpfile()
 
     def _append(self,s):
         """ append a string to the buffer """
-        self.__buffer=self.__buffer+s
+        self.__buffer = self.__buffer+s
 
     def _flush(self):
         """ flush the buffer to wfile """
@@ -60,7 +61,7 @@ class BufferedHTTPRequestHandler(BaseHTTPRequestHandler):
         self.__outfp.write(self.__buffer)
         self.__outfp.flush()
         self.wfile.flush()
-        self.__buffer=""
+        self.__buffer = ""
 
     def handle(self):
         """ Handle a HTTP request """
@@ -97,3 +98,4 @@ class BufferedHTTPRequestHandler(BaseHTTPRequestHandler):
 
     protocol_version="HTTP/1.1"
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/DAV/WebDAVServer.py b/addons/caldav/DAV/WebDAVServer.py
index 5f409773c18..fa30aa6b82b 100644
--- a/addons/caldav/DAV/WebDAVServer.py
+++ b/addons/caldav/DAV/WebDAVServer.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 """
     Python WebDAV Server.
     Copyright (C) 1999 Christian Scholz (ruebe@aachen.heimat.de)
@@ -23,12 +25,20 @@ Subclass this class and specify an IFACE_CLASS. See example.
 
 """
 
-DEBUG=None
+DEBUG = None
 
 from utils import VERSION, AUTHOR
 __version__ = VERSION
 __author__  = AUTHOR
 
+from propfind import PROPFIND
+from delete import DELETE
+from davcopy import COPY
+from davmove import MOVE
+
+from string import atoi, split
+from status import STATUS_CODES
+from errors import *
 
 import os
 import sys
@@ -39,16 +49,6 @@ import posixpath
 import base64
 import urlparse
 import urllib
-
-from propfind import PROPFIND
-from delete import DELETE
-from davcopy import COPY
-from davmove import MOVE
-
-from string import atoi,split
-from status import STATUS_CODES
-from errors import *
-
 import BaseHTTPServer
 
 class DAVRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
@@ -74,21 +74,21 @@ class DAVRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     def _log(self, message):
         pass
 
-    def _append(self,s):
+    def _append(self, s):
         """ write the string to wfile """
         self.wfile.write(s)
 
-    def send_body(self,DATA,code,msg,desc,ctype='application/octet-stream',headers=None):
+    def send_body(self, DATA, code, msg, desc, ctype='application/octet-stream', headers=None):
         """ send a body in one part """
 
         if not headers:
             headers = {}
-        self.send_response(code,message=msg)
+        self.send_response(code, message=msg)
         self.send_header("Connection", "keep-alive")
         self.send_header("Accept-Ranges", "bytes")
 
-        for a,v in headers.items():
-            self.send_header(a,v)
+        for a, v in headers.items():
+            self.send_header(a, v)
 
         if DATA:
             self.send_header("Content-Length", str(len(DATA)))
@@ -100,11 +100,11 @@ class DAVRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         if DATA:
             self._append(DATA)
 
-    def send_body_chunks(self,DATA,code,msg,desc,ctype='text/xml; encoding="utf-8"'):
+    def send_body_chunks(self, DATA, code, msg, desc, ctype='text/xml; encoding="utf-8"'):
         """ send a body in chunks """
 
-        self.responses[207]=(msg,desc)
-        self.send_response(code,message=msg)
+        self.responses[207]=(msg, desc)
+        self.send_response(code, message=msg)
         self.send_header("Content-type", ctype)
         self.send_header("Connection", "keep-alive")
         self.send_header("Transfer-Encoding", "chunked")
@@ -128,12 +128,12 @@ class DAVRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
     def do_PROPFIND(self):
 
-        dc=self.IFACE_CLASS
+        dc = self.IFACE_CLASS
         # read the body
-        body=None
+        body = None
         if self.headers.has_key("Content-Length"):
-            l=self.headers['Content-Length']
-            body=self.rfile.read(atoi(l))
+            l = self.headers['Content-Length']
+            body = self.rfile.read(atoi(l))
         alt_body = """<?xml version="1.0" encoding="utf-8"?>
                     <propfind xmlns="DAV:"><prop>
                     <getcontentlength xmlns="DAV:"/>
@@ -149,26 +149,26 @@ class DAVRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
         # which Depth?
         if self.headers.has_key('Depth'):
-            d=self.headers['Depth']
+            d = self.headers['Depth']
         else:
-            d="infinity"
+            d = "infinity"
 
-        uri=self.geturi()
-        pf=PROPFIND(uri,dc,d)
+        uri = self.geturi()
+        pf = PROPFIND(uri, dc, d)
 
         if body:
             pf.read_propfind(body)
 
         try:
-            DATA=pf.createResponse()
-            DATA=DATA+"\n"
+            DATA = pf.createResponse()
+            DATA = DATA+"\n"
             # print "Data:", DATA
-        except DAV_NotFound,(ec,dd):
+        except DAV_NotFound, (ec, dd):
             return self.send_notFound(dd, uri)
-        except DAV_Error, (ec,dd):
-            return self.send_error(ec,dd)
+        except DAV_Error, (ec, dd):
+            return self.send_error(ec, dd)
 
-        self.send_body_chunks(DATA,207,"Multi-Status","Multiple responses")
+        self.send_body_chunks(DATA, 207, "Multi-Status", "Multiple responses")
 
     def geturi(self):
         buri = self.IFACE_CLASS.baseuri
@@ -179,110 +179,110 @@ class DAVRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
     def do_GET(self):
         """Serve a GET request."""
-        dc=self.IFACE_CLASS
-        uri=self.geturi()
+        dc = self.IFACE_CLASS
+        uri = self.geturi()
 
         # get the last modified date
         try:
-            lm=dc.get_prop(uri,"DAV:","getlastmodified")
+            lm = dc.get_prop(uri, "DAV:", "getlastmodified")
         except:
-            lm="Sun, 01 Dec 2014 00:00:00 GMT"  # dummy!
-        headers={"Last-Modified":lm , "Connection": "keep-alive"}
+            lm = "Sun, 01 Dec 2014 00:00:00 GMT"  # dummy!
+        headers = {"Last-Modified":lm , "Connection": "keep-alive"}
 
         # get the content type
         try:
-            ct=dc.get_prop(uri,"DAV:","getcontenttype")
+            ct = dc.get_prop(uri, "DAV:", "getcontenttype")
         except:
-            ct="application/octet-stream"
+            ct = "application/octet-stream"
 
         # get the data
         try:
-            data=dc.get_data(uri)
-        except DAV_Error, (ec,dd):
+            data = dc.get_data(uri)
+        except DAV_Error, (ec, dd):
             self.send_status(ec)
             return
 
         # send the data
-        self.send_body(data,200,"OK","OK",ct,headers)
+        self.send_body(data, 200, "OK", "OK", ct, headers)
 
     def do_HEAD(self):
         """ Send a HEAD response """
-        dc=self.IFACE_CLASS
-        uri=self.geturi()
-    
+        dc = self.IFACE_CLASS
+        uri = self.geturi()
+
         # get the last modified date
         try:
-            lm=dc.get_prop(uri,"DAV:","getlastmodified")
+            lm = dc.get_prop(uri, "DAV:", "getlastmodified")
         except:
-            lm="Sun, 01 Dec 2014 00:00:00 GMT"  # dummy!
+            lm = "Sun, 01 Dec 2014 00:00:00 GMT"  # dummy!
 
-        headers={"Last-Modified":lm, "Connection": "keep-alive"}
+        headers = {"Last-Modified":lm, "Connection": "keep-alive"}
 
         # get the content type
         try:
-            ct=dc.get_prop(uri,"DAV:","getcontenttype")
+            ct = dc.get_prop(uri, "DAV:", "getcontenttype")
         except:
-            ct="application/octet-stream"
+            ct = "application/octet-stream"
 
         try:
-            data=dc.get_data(uri)
-            headers["Content-Length"]=str(len(data))
+            data = dc.get_data(uri)
+            headers["Content-Length"] = str(len(data))
         except DAV_NotFound:
-            self.send_body(None,404,"Not Found","")
+            self.send_body(None, 404, "Not Found", "")
             return
 
-        self.send_body(None,200,"OK","OK",ct,headers)
+        self.send_body(None, 200, "OK", "OK", ct, headers)
 
     def do_POST(self):
-        self.send_error(404,"File not found")
+        self.send_error(404, "File not found")
 
     def do_MKCOL(self):
         """ create a new collection """
 
-        dc=self.IFACE_CLASS
-        uri=self.geturi()
+        dc = self.IFACE_CLASS
+        uri = self.geturi()
         try:
             res = dc.mkcol(uri)
             if res:
-                self.send_body(None,201,"Created",'')
+                self.send_body(None, 201, "Created", '')
             else:
-                self.send_body(None,415,"Cannot create",'')
+                self.send_body(None, 415, "Cannot create", '')
             #self.send_header("Connection", "keep-alive")
             # Todo: some content, too
-        except DAV_Error, (ec,dd):
-            self.send_body(None,int(ec),dd,dd)
+        except DAV_Error, (ec, dd):
+            self.send_body(None, int(ec), dd, dd)
 
     def do_DELETE(self):
         """ delete an resource """
-        dc=self.IFACE_CLASS
-        uri=self.geturi()
-        dl=DELETE(uri,dc)
+        dc = self.IFACE_CLASS
+        uri = self.geturi()
+        dl = DELETE(uri, dc)
         if dc.is_collection(uri):
-            res=dl.delcol()
+            res = dl.delcol()
         else:
-            res=dl.delone()
+            res = dl.delone()
 
         if res:
-            self.send_status(207,body=res)
+            self.send_status(207, body=res)
         else:
             self.send_status(204)
 
     def do_PUT(self):
-        dc=self.IFACE_CLASS
+        dc = self.IFACE_CLASS
 
         # read the body
-        body=None
+        body = None
         if self.headers.has_key("Content-Length"):
-            l=self.headers['Content-Length']
-            body=self.rfile.read(atoi(l))
-        uri=self.geturi()
+            l = self.headers['Content-Length']
+            body = self.rfile.read(atoi(l))
+        uri = self.geturi()
 
-        ct=None
+        ct = None
         if self.headers.has_key("Content-Type"):
-            ct=self.headers['Content-Type']
+            ct = self.headers['Content-Type']
         try:
-            dc.put(uri,body,ct)
-        except DAV_Error, (ec,dd):
+            dc.put(uri, body, ct)
+        except DAV_Error, (ec, dd):
             self.send_status(ec)
             return
         self.send_status(201)
@@ -291,84 +291,84 @@ class DAVRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         """ copy one resource to another """
         try:
             self.copymove(COPY)
-        except DAV_Error, (ec,dd):
+        except DAV_Error, (ec, dd):
             self.send_status(ec)
 
     def do_MOVE(self):
         """ move one resource to another """
         try:
             self.copymove(MOVE)
-        except DAV_Error, (ec,dd):
+        except DAV_Error, (ec, dd):
             self.send_status(ec)
 
-    def copymove(self,CLASS):
+    def copymove(self, CLASS):
         """ common method for copying or moving objects """
-        dc=self.IFACE_CLASS
+        dc = self.IFACE_CLASS
 
         # get the source URI
-        source_uri=self.geturi()
+        source_uri = self.geturi()
 
         # get the destination URI
-        dest_uri=self.headers['Destination']
-        dest_uri=urllib.unquote(dest_uri)
+        dest_uri = self.headers['Destination']
+        dest_uri = urllib.unquote(dest_uri)
 
         # Overwrite?
-        overwrite=1
-        result_code=204
+        overwrite = 1
+        result_code = 204
         if self.headers.has_key("Overwrite"):
             if self.headers['Overwrite']=="F":
                 overwrite=None
                 result_code=201
 
         # instanciate ACTION class
-        cp=CLASS(dc,source_uri,dest_uri,overwrite)
+        cp = CLASS(dc, source_uri, dest_uri, overwrite)
 
         # Depth?
-        d="infinity"
+        d = "infinity"
         if self.headers.has_key("Depth"):
-            d=self.headers['Depth']
+            d = self.headers['Depth']
 
             if d!="0" and d!="infinity":
                 self.send_status(400)
                 return
 
             if d=="0":
-                res=cp.single_action()
+                res = cp.single_action()
                 self.send_status(res)
                 return
 
         # now it only can be "infinity" but we nevertheless check for a collection
         if dc.is_collection(source_uri):
             try:
-                res=cp.tree_action()
-            except DAV_Error, (ec,dd):
+                res = cp.tree_action()
+            except DAV_Error, (ec, dd):
                 self.send_status(ec)
                 return
         else:
             try:
-                res=cp.single_action()
-            except DAV_Error, (ec,dd):
+                res = cp.single_action()
+            except DAV_Error, (ec, dd):
                 self.send_status(ec)
                 return
 
         if res:
-            self.send_body_chunks(res,207,STATUS_CODES[207],STATUS_CODES[207],
+            self.send_body_chunks(res, 207, STATUS_CODES[207], STATUS_CODES[207],
                             ctype='text/xml; charset="utf-8"')
         else:
             self.send_status(result_code)
 
-    def get_userinfo(self,user,pw):
+    def get_userinfo(self, user, pw):
         """ Dummy method which lets all users in """
 
         return 1
 
-    def send_status(self,code=200,mediatype='text/xml;  charset="utf-8"', \
-                                msg=None,body=None):
+    def send_status(self, code=200, mediatype='text/xml;  charset="utf-8"', \
+                                msg=None, body=None):
 
-        if not msg: msg=STATUS_CODES[code]
-        self.send_body(body,code,STATUS_CODES[code],msg,mediatype)
+        if not msg: msg = STATUS_CODES[code]
+        self.send_body(body, code, STATUS_CODES[code], msg, mediatype)
 
-    def send_notFound(self,descr,uri):
+    def send_notFound(self, descr, uri):
         body = """<?xml version="1.0" encoding="utf-8" ?>
         <D:response xmlns:D="DAV:">
             <D:href>%s</D:href>
@@ -376,4 +376,6 @@ class DAVRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             <D:responsedescription>%s</D:responsedescription>
         </D:response>
         """
-        return self.send_status(404,descr, body=body % (uri,descr))
+        return self.send_status(404, descr, body=body % (uri, descr))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/DAV/davcmd.py b/addons/caldav/DAV/davcmd.py
index 5c6be3ff9f7..34c061d77ab 100644
--- a/addons/caldav/DAV/davcmd.py
+++ b/addons/caldav/DAV/davcmd.py
@@ -14,8 +14,8 @@ import urlparse
 from utils import create_treelist, is_prefix
 from errors import *
 
-def deltree(dc,uri,exclude={}):
-    """ delete a tree of resources 
+def deltree(dc, uri, exclude={}):
+    """ delete a tree of resources
 
     dc  -- dataclass to use
     uri -- root uri to delete
@@ -30,43 +30,43 @@ def deltree(dc,uri,exclude={}):
 
     """
 
-    tlist=create_treelist(dc,uri)
-    result={}
+    tlist = create_treelist(dc,uri)
+    result = {}
 
     for i in range(len(tlist),0,-1):
-        problem_uris=result.keys()
-        element=tlist[i-1]
-    
+        problem_uris = result.keys()
+        element = tlist[i-1]
+
     # test here, if an element is a prefix of an uri which
     # generated an error before.
     # note that we walk here from childs to parents, thus
     # we cannot delete a parent if a child made a problem.
     # (see example in 8.6.2.1)
-    ok=1
+    ok = 1
     for p in problem_uris:
         if is_prefix(element,p):
-            ok=None
+            ok = None
             break
-    
-        if not ok: continue 
-    
+
+        if not ok: continue
+
     # here we test for the exclude list which is the other way round!
     for p in exclude.keys():
         if is_prefix(p,element):
-            ok=None
+            ok = None
             break
-        
-        if not ok: continue 
-    
+
+        if not ok: continue
+
     # now delete stuff
     try:
         delone(dc,element)
-    except DAV_Error, (ec,dd):  
-        result[element]=ec
-    
+    except DAV_Error, (ec,dd):
+        result[element] = ec
+
     return result
 
-def delone(dc,uri):
+def delone(dc, uri):
     """ delete a single object """
     if dc.is_collection(uri):
         dc.rmcol(uri)   # should be empty
@@ -79,12 +79,12 @@ def delone(dc,uri):
 
 # helper function
 
-def copy(dc,src,dst):
-    """ only copy the element 
+def copy(dc, src, dst):
+    """ only copy the element
 
     This is just a helper method factored out from copy and
     copytree. It will not handle the overwrite or depth header.
-    
+
     """
 
     # destination should have been deleted before
@@ -101,28 +101,28 @@ def copy(dc,src,dst):
 
 # the main functions
 
-def copyone(dc,src,dst,overwrite=None):
+def copyone(dc, src, dst, overwrite=None):
     """ copy one resource to a new destination """
 
     if overwrite and dc.exists(dst):
-        delres=deltree(dc,dst)
+        delres = deltree(dc,dst)
     else:
-        delres={}
+        delres = {}
 
     # if we cannot delete everything, then do not copy!
     if delres: return delres
-    
+
     try:
         copy(dc,src,dst)    # pass thru exceptions
     except DAV_Error, (ec,dd):
         return ec
 
-def copytree(dc,src,dst,overwrite=None):
+def copytree(dc, src, dst, overwrite=None):
     """ copy a tree of resources to another location
 
     dc  -- dataclass to use
     src -- src uri from where to copy
-    dst -- dst uri 
+    dst -- dst uri
     overwrite -- if 1 then delete dst uri before
 
     returns dict of uri:error_code tuples from which
@@ -133,59 +133,59 @@ def copytree(dc,src,dst,overwrite=None):
 
     # first delete the destination resource
     if overwrite and dc.exists(dst):
-        delres=deltree(dc,dst)
+        delres = deltree(dc,dst)
     else:
-        delres={}
+        delres = {}
 
     # if we cannot delete everything, then do not copy!
     if delres: return delres
 
     # get the tree we have to copy
-    tlist=create_treelist(dc,src)
-    result={}
+    tlist = create_treelist(dc,src)
+    result = {}
 
     # prepare destination URIs (get the prefix)
-    dpath=urlparse.urlparse(dst)[2]
+    dpath = urlparse.urlparse(dst)[2]
 
     for element in tlist:
-        problem_uris=result.keys()
-    
+        problem_uris = result.keys()
+
     # now URIs get longer and longer thus we have
     # to test if we had a parent URI which we were not
     # able to copy in problem_uris which is the prefix
     # of the actual element. If it is, then we cannot
     # copy this as well but do not generate another error.
-    ok=1
+    ok = 1
     for p in problem_uris:
         if is_prefix(p,element):
-            ok=None
+            ok = None
             break
-    
-        if not ok: continue 
+
+        if not ok: continue
 
     # now create the destination URI which corresponds to
     # the actual source URI. -> actual_dst
     # ("subtract" the base src from the URI and prepend the
     # dst prefix to it.)
-    esrc=replace(element,src,"")
-    actual_dst=dpath+esrc
+    esrc = replace(element,src,"")
+    actual_dst = dpath+esrc
 
     # now copy stuff
     try:
         copy(dc,element,actual_dst)
-    except DAV_Error, (ec,dd):  
-        result[element]=ec
+    except DAV_Error, (ec,dd):
+        result[element] = ec
 
     return result
-        
-        
+
+
 
 ###
 ### MOVE
 ###
 
 
-def moveone(dc,src,dst,overwrite=None):
+def moveone(dc, src, dst, overwrite=None):
     """ move a single resource
 
     This is done by first copying it and then deleting
@@ -197,8 +197,8 @@ def moveone(dc,src,dst,overwrite=None):
 
     # then delete it
     dc.rm(src)
-      
-def movetree(dc,src,dst,overwrite=None):
+
+def movetree(dc, src, dst, overwrite=None):
     """ move a collection
 
     This is done by first copying it and then deleting
@@ -209,10 +209,11 @@ def movetree(dc,src,dst,overwrite=None):
     """
 
     # first copy it
-    res=copytree(dc,src,dst,overwrite)
+    res = copytree(dc,src,dst,overwrite)
 
     # then delete it
-    res=deltree(dc,src,exclude=res)
+    res = deltree(dc,src,exclude=res)
 
     return res
-      
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/DAV/davcopy.py b/addons/caldav/DAV/davcopy.py
index ec44931b107..6333aececf6 100755
--- a/addons/caldav/DAV/davcopy.py
+++ b/addons/caldav/DAV/davcopy.py
@@ -47,11 +47,11 @@ class COPY:
     """
 
 
-    def __init__(self,dataclass,src_uri,dst_uri,overwrite):
-        self.__dataclass=dataclass
-        self.__src=src_uri
-        self.__dst=dst_uri
-        self.__overwrite=overwrite
+    def __init__(self, dataclass, src_uri, dst_uri, overwrite):
+        self.__dataclass = dataclass
+        self.__src = src_uri
+        self.__dst = dst_uri
+        self.__overwrite = overwrite
 
 
     def single_action(self):
@@ -62,16 +62,16 @@ class COPY:
 
         """
 
-        dc=self.__dataclass
-        base=self.__src
+        dc = self.__dataclass
+        base = self.__src
 
         ### some basic tests
         # test if dest exists and overwrite is false
         if dc.exists(self.__dst) and not self.__overwrite: raise DAV_Error, 412
         # test if src and dst are the same
         # (we assume that both uris are on the same server!)
-        ps=urlparse.urlparse(self.__src)[2]
-        pd=urlparse.urlparse(self.__dst)[2]
+        ps = urlparse.urlparse(self.__src)[2]
+        pd = urlparse.urlparse(self.__dst)[2]
         if ps==pd: raise DAV_Error, 403
 
         return dc.copyone(self.__src,self.__dst,self.__overwrite)
@@ -84,20 +84,20 @@ class COPY:
         Here we return a multistatus xml element.
 
         """
-        dc=self.__dataclass
-        base=self.__src
+        dc = self.__dataclass
+        base = self.__src
 
         ### some basic tests
         # test if dest exists and overwrite is false
         if dc.exists(self.__dst) and not self.__overwrite: raise DAV_Error, 412
         # test if src and dst are the same
         # (we assume that both uris are on the same server!)
-        ps=urlparse.urlparse(self.__src)[2]
-        pd=urlparse.urlparse(self.__dst)[2]
+        ps = urlparse.urlparse(self.__src)[2]
+        pd = urlparse.urlparse(self.__dst)[2]
         if ps==pd: raise DAV_Error, 403
-        
-        
-        result=dc.copytree(self.__src,self.__dst,self.__overwrite)
+
+
+        result = dc.copytree(self.__src,self.__dst,self.__overwrite)
         #result=copytree(dc,self.__src,self.__dst,self.__overwrite)
 
         if not result: return None
@@ -109,25 +109,26 @@ class COPY:
         ###
 
         doc = Document(None)
-        ms=doc.createElement("D:multistatus")
+        ms = doc.createElement("D:multistatus")
         ms.setAttribute("xmlns:D","DAV:")
         doc.appendChild(ms)
 
         for el,ec in result.items():
-                re=doc.createElement("D:response")
-                hr=doc.createElement("D:href")
-                st=doc.createElement("D:status")
-                huri=doc.createTextNode(quote_uri(el))
-                t=doc.createTextNode(gen_estring(ec))
+                re = doc.createElement("D:response")
+                hr = doc.createElement("D:href")
+                st = doc.createElement("D:status")
+                huri = doc.createTextNode(quote_uri(el))
+                t = doc.createTextNode(gen_estring(ec))
                 st.appendChild(t)
                 hr.appendChild(huri)
                 re.appendChild(hr)
                 re.appendChild(st)
                 ms.appendChild(re)
- 
-        sfile=StringIO()
-        ext.PrettyPrint(doc,stream=sfile)
-        s=sfile.getvalue()
+
+        sfile = StringIO()
+        ext.PrettyPrint(doc,stream = sfile)
+        s = sfile.getvalue()
         sfile.close()
         return s
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/DAV/davmove.py b/addons/caldav/DAV/davmove.py
index 78c1e649389..3404f947469 100755
--- a/addons/caldav/DAV/davmove.py
+++ b/addons/caldav/DAV/davmove.py
@@ -39,19 +39,19 @@ class MOVE:
     """ move resources and eventually create multistatus responses
 
     This module implements the MOVE class which is responsible for
-    moving resources. 
+    moving resources.
 
     MOVE is implemented by a COPY followed by a DELETE of the old
-    resource. 
+    resource.
 
     """
 
 
-    def __init__(self,dataclass,src_uri,dst_uri,overwrite):
-        self.__dataclass=dataclass
-        self.__src=src_uri
-        self.__dst=dst_uri
-        self.__overwrite=overwrite
+    def __init__(self, dataclass, src_uri, dst_uri, overwrite):
+        self.__dataclass = dataclass
+        self.__src = src_uri
+        self.__dst = dst_uri
+        self.__overwrite = overwrite
 
 
     def single_action(self):
@@ -62,16 +62,16 @@ class MOVE:
 
         """
 
-        dc=self.__dataclass
-        base=self.__src
+        dc = self.__dataclass
+        base = self.__src
 
         ### some basic tests
         # test if dest exists and overwrite is false
         if dc.exists(self.__dst) and not self.__overwrite: raise DAV_Error, 412
         # test if src and dst are the same
         # (we assume that both uris are on the same server!)
-        ps=urlparse.urlparse(self.__src)[2]
-        pd=urlparse.urlparse(self.__dst)[2]
+        ps = urlparse.urlparse(self.__src)[2]
+        pd = urlparse.urlparse(self.__dst)[2]
         if ps==pd: raise DAV_Error, 403
 
         return dc.moveone(self.__src,self.__dst,self.__overwrite)
@@ -82,21 +82,22 @@ class MOVE:
         Here we return a multistatus xml element.
 
         """
-        dc=self.__dataclass
-        base=self.__src
+        dc = self.__dataclass
+        base = self.__src
 
         ### some basic tests
         # test if dest exists and overwrite is false
         if dc.exists(self.__dst) and not self.__overwrite: raise DAV_Error,  412
         # test if src and dst are the same
         # (we assume that both uris are on the same server!)
-        ps=urlparse.urlparse(self.__src)[2]
-        pd=urlparse.urlparse(self.__dst)[2]
+        ps = urlparse.urlparse(self.__src)[2]
+        pd = urlparse.urlparse(self.__dst)[2]
         if ps==pd: raise DAV_Error,  403
-        
-        result=dc.movetree(self.__src,self.__dst,self.__overwrite)
+
+        result = dc.movetree(self.__src,self.__dst,self.__overwrite)
         if not result: return None
 
         # create the multistatus XML element
         return make_xmlresponse(result)
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/DAV/delete.py b/addons/caldav/DAV/delete.py
index ed017e53b6d..3e75066f30e 100755
--- a/addons/caldav/DAV/delete.py
+++ b/addons/caldav/DAV/delete.py
@@ -32,15 +32,15 @@ from davcmd import deltree
 
 class DELETE:
 
-    def __init__(self,uri,dataclass):
-        self.__dataclass=dataclass
-        self.__uri=uri
+    def __init__(self, uri, dataclass):
+        self.__dataclass = dataclass
+        self.__uri = uri
 
     def delcol(self):
         """ delete a collection """
 
-        dc=self.__dataclass
-        result=dc.deltree(self.__uri)
+        dc = self.__dataclass
+        result = dc.deltree(self.__uri)
 
         if not len(result.items()):
             return None # everything ok
@@ -51,9 +51,9 @@ class DELETE:
     def delone(self):
         """ delete a resource """
 
-        dc=self.__dataclass
-        result=dc.delone(self.__uri)
-        
+        dc = self.__dataclass
+        result = dc.delone(self.__uri)
+
         if not result: return None
         if not len(result.items()):
             return None # everything ok
@@ -61,3 +61,4 @@ class DELETE:
         # create the result element
         return make_xmlresponse(result)
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/DAV/errors.py b/addons/caldav/DAV/errors.py
index 9c0e7667913..58d1d3be1d2 100755
--- a/addons/caldav/DAV/errors.py
+++ b/addons/caldav/DAV/errors.py
@@ -12,15 +12,15 @@ class DAV_Error(Exception):
 	2. the error result element, e.g. a <multistatus> element
     """
 
-    def __init__(self,*args):
+    def __init__(self, *args):
         if len(args)==1:
-            self.args=(args[0],"")
+            self.args = (args[0],"")
         else:
-            self.args=args
-    
+            self.args = args
+
 class DAV_Secret(DAV_Error):
     """ the user is not allowed to know anything about it
-    
+
     returning this for a property value means to exclude it
     from the response xml element.
     """
@@ -31,10 +31,10 @@ class DAV_Secret(DAV_Error):
 
 class DAV_NotFound(DAV_Error):
     """ a requested property was not found for a resource """
-    
-    def __init__(self,*args):
+
+    def __init__(self, *args):
         if len(args):
-	    if isinstance(args[0],list):
+	    if isinstance(args[0], list):
 		stre = "Path %s not found!"%('/'.join(args[0]))
 	    else:
 	        stre = args[0]
@@ -46,11 +46,12 @@ class DAV_NotFound(DAV_Error):
 
 class DAV_Forbidden(DAV_Error):
     """ a method on a resource is not allowed """
-    
-    def __init__(self,*args):
+
+    def __init__(self, *args):
         if len(args):
             DAV_Error.__init__(self,403,args[0])
         else:
             DAV_Error.__init__(self,403)
         pass
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/DAV/iface.py b/addons/caldav/DAV/iface.py
index c8f5fe2594d..a723fb9f696 100644
--- a/addons/caldav/DAV/iface.py
+++ b/addons/caldav/DAV/iface.py
@@ -18,16 +18,16 @@ class dav_interface:
     ### defined properties (modify this but let the DAV stuff there!)
     ### the format is namespace: [list of properties]
 
-    PROPS={"DAV:" : ('creationdate', 
-                     'displayname', 
-                     'getcontentlanguage', 
-                     'getcontentlength', 
-                     'getcontenttype', 
-                     'getetag', 
-                     'getlastmodified', 
-                     'lockdiscovery', 
-                     'resourcetype', 
-                     'source', 
+    PROPS={"DAV:" : ('creationdate',
+                     'displayname',
+                     'getcontentlanguage',
+                     'getcontentlength',
+                     'getcontenttype',
+                     'getetag',
+                     'getlastmodified',
+                     'lockdiscovery',
+                     'resourcetype',
+                     'source',
                      'supportedlock'),
            "NS2" : ("p1","p2")
            }
@@ -36,28 +36,28 @@ class dav_interface:
     # the first item is the namespace URI and the second one
     # the method prefix
     # e.g. for DAV:getcontenttype we call dav_getcontenttype()
-    M_NS={"DAV:" : "_get_dav",
+    M_NS = {"DAV:" : "_get_dav",
           "NS2"  : "ns2" }
 
-    def get_propnames(self,uri):
-        """ return the property names allowed for the given URI 
+    def get_propnames(self, uri):
+        """ return the property names allowed for the given URI
 
         In this method we simply return the above defined properties
-        assuming that they are valid for any resource. 
+        assuming that they are valid for any resource.
         You can override this in order to return a different set
         of property names for each resource.
-        
+
         """
         return self.PROPS
 
-    def get_prop2(self,uri,ns,pname):
-        """ return the value of a property 
+    def get_prop2(self, uri, ns, pname):
+        """ return the value of a property
         """
         if lower(ns)=="dav:": return self.get_dav(uri,pname)
 
         raise DAV_NotFound
 
-    def get_prop(self,uri,ns,propname):
+    def get_prop(self, uri, ns, propname):
         """ return the value of a given property
 
         uri        -- uri of the object to get the property of
@@ -65,17 +65,17 @@ class dav_interface:
         pname        -- name of the property
         """
         if self.M_NS.has_key(ns):
-            prefix=self.M_NS[ns]
+            prefix = self.M_NS[ns]
         else:
             print "No namespace:",ns, "( for prop:", propname,")"
             raise DAV_NotFound
-        mname=prefix+"_"+propname
+        mname = prefix+"_"+propname
         if not hasattr(self,mname):
             raise DAV_NotFound
 
         try:
-            m=getattr(self,mname)
-            r=m(uri)
+            m = getattr(self,mname)
+            r = m(uri)
             return r
         except AttributeError, e:
             print 'Property %s not supported' % propname
@@ -86,16 +86,16 @@ class dav_interface:
     ### DATA methods (for GET and PUT)
     ###
 
-    def get_data(self,uri):
-        """ return the content of an object 
+    def get_data(self, uri):
+        """ return the content of an object
 
         return data or raise an exception
-        
+
         """
         raise DAV_NotFound
 
-    def put(self,uri,data):
-        """ write an object to the repository 
+    def put(self, uri, data):
+        """ write an object to the repository
 
         return a result code or raise an exception
         """
@@ -106,17 +106,17 @@ class dav_interface:
     ### Methods for DAV properties
     ###
 
-    def _get_dav_creationdate(self,uri):
+    def _get_dav_creationdate(self, uri):
         """ return the creationdate of a resource """
-        d=self.get_creationdate(uri)
+        d = self.get_creationdate(uri)
         # format it
         if isinstance(d, int) or isinstance(d, float):
             d = time.localtimetime(d)
         return time.strftime("%Y-%m-%dT%H:%M:%S%Z",d)
 
-    def _get_dav_getlastmodified(self,uri):
+    def _get_dav_getlastmodified(self, uri):
         """ return the last modified date of a resource """
-        d=self.get_lastmodified(uri)
+        d = self.get_lastmodified(uri)
         if isinstance(d, int) or isinstance(d, float):
             d = time.localtime(d)
         # format it
@@ -127,37 +127,37 @@ class dav_interface:
     ### OVERRIDE THESE!
     ###
 
-    def get_creationdate(self,uri):
+    def get_creationdate(self, uri):
         """ return the creationdate of the resource """
         return time.time()
 
-    def get_lastmodified(self,uri):
+    def get_lastmodified(self, uri):
         """ return the last modification date of the resource """
         return time.time()
 
-    
+
     ###
     ### COPY MOVE DELETE
     ###
 
     ### methods for deleting a resource
 
-    def rmcol(self,uri):
-        """ delete a collection 
+    def rmcol(self, uri):
+        """ delete a collection
 
         This should not delete any children! This is automatically done
         before by the DELETE class in DAV/delete.py
 
         return a success code or raise an exception
-        
+
         """
         raise DAV_NotFound
 
-    def rm(self,uri):
-        """ delete a single resource 
+    def rm(self, uri):
+        """ delete a single resource
 
         return a success code or raise an exception
-        
+
         """
         raise DAV_NotFound
 
@@ -182,7 +182,7 @@ class dav_interface:
         1. to handle the action directly (e.g. cp or mv on filesystems)
         2. to let it handle via the copy/move methods in davcmd.
 
-    ad 1) The first approach can be used when we know that no error can 
+    ad 1) The first approach can be used when we know that no error can
           happen inside a tree or when the action can exactly tell which
           element made which error. We have to collect these and return
           it in a dict of the form {uri: error_code, ...}
@@ -210,28 +210,28 @@ class dav_interface:
 
     ### MOVE handlers
 
-    def moveone(self,src,dst,overwrite):
+    def moveone(self, src, dst, overwrite):
         """ move one resource with Depth=0 """
-        return moveone(self,src,dst,overwrite)
+        return moveone(self, src, dst, overwrite)
 
-    def movetree(self,src,dst,overwrite):
+    def movetree(self, src, dst, overwrite):
         """ move a collection with Depth=infinity """
-        return movetree(self,src,dst,overwrite)
+        return movetree(self, src, dst, overwrite)
 
     ### COPY handlers
 
-    def copyone(self,src,dst,overwrite):
+    def copyone(self, src, dst, overwrite):
         """ copy one resource with Depth=0 """
-        return copyone(self,src,dst,overwrite)
+        return copyone(self, src, dst, overwrite)
 
-    def copytree(self,src,dst,overwrite):
+    def copytree(self, src, dst, overwrite):
         """ copy a collection with Depth=infinity """
-        return copytree(self,src,dst,overwrite)
+        return copytree(self, src, dst, overwrite)
 
 
     ### low level copy methods (you only need these for method 2)
-    def copy(self,src,dst):
-        """ copy a resource with depth==0 
+    def copy(self, src, dst):
+        """ copy a resource with depth==0
 
         You don't need to bother about overwrite or not.
         This has been done already.
@@ -241,8 +241,8 @@ class dav_interface:
         return 201
 
 
-    def copycol(self,src,dst):
-        """ copy a resource with depth==infinity 
+    def copycol(self, src, dst):
+        """ copy a resource with depth==infinity
 
         You don't need to bother about overwrite or not.
         This has been done already.
@@ -253,11 +253,12 @@ class dav_interface:
 
     ### some utility functions you need to implement
 
-    def exists(self,uri):
+    def exists(self, uri):
         """ return 1 or None depending on if a resource exists """
         return None # no
 
-    def is_collection(self,uri):
+    def is_collection(self, uri):
         """ return 1 or None depending on if a resource is a collection """
         return None # no
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/DAV/propfind.py b/addons/caldav/DAV/propfind.py
index 0fb9c229c03..4d009e7912e 100755
--- a/addons/caldav/DAV/propfind.py
+++ b/addons/caldav/DAV/propfind.py
@@ -18,8 +18,8 @@
     License along with this library; if not, write to the Free
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-"""
 
+"""
 
 from xml.dom import ext
 from xml.dom.Document import Document
@@ -45,9 +45,9 @@ class PROPFIND:
 
     It will set the following instance vars:
 
-    request_class   : ALLPROP | PROPNAME | PROP
-    proplist    : list of properties
-    nsmap       : map of namespaces
+    request_class: ALLPROP | PROPNAME | PROP
+    proplist: list of properties
+    nsmap: map of namespaces
 
     The list of properties will contain tuples of the form
     (element name, ns_prefix, ns_uri)
@@ -55,21 +55,20 @@ class PROPFIND:
 
     """
 
+    def __init__(self, uri, dataclass, depth):
+        self.request_type = None
+        self.nsmap = {}
+        self.proplist = {}
+        self.default_ns = None
+        self.__dataclass = dataclass
+        self.__depth = str(depth)
+        self.__uri = uri
+        self.use_full_urls = True
+        self.__has_body = None    # did we parse a body?
 
-    def __init__(self,uri,dataclass,depth):
-        self.request_type=None
-        self.nsmap={}
-        self.proplist={}
-        self.default_ns=None
-        self.__dataclass=dataclass
-        self.__depth=str(depth)
-        self.__uri=uri
-        self.use_full_urls=True
-        self.__has_body=None    # did we parse a body?
+    def read_propfind(self, xml_doc):
+        self.request_type,self.proplist,self.namespaces = utils.parse_propfind(xml_doc)
 
-    def read_propfind(self,xml_doc):
-        self.request_type,self.proplist,self.namespaces=utils.parse_propfind(xml_doc)
-	
 	# a violation of the expected logic: client (korganizer) will ask for DAV:resourcetype
 	# but we also have to return the http://groupdav.org/:resourcetype property!
 	if self.proplist.has_key('DAV:') and 'resourcetype' in self.proplist['DAV:']:
@@ -91,7 +90,7 @@ class PROPFIND:
 
         If we get an ALLPROP we first get the list of properties and then
         we do the same as with a PROP method.
-	
+
 	If the uri doesn't exist, return an xml response with a 404 status
 
         """
@@ -114,41 +113,41 @@ class PROPFIND:
     def create_propname(self):
         """ create a multistatus response for the prop names """
 
-        dc=self.__dataclass
+        dc = self.__dataclass
         # create the document generator
         doc = Document(None)
-        ms=doc.createElement("D:multistatus")
+        ms = doc.createElement("D:multistatus")
         ms.setAttribute("xmlns:D","DAV:")
         doc.appendChild(ms)
 
         if self.__depth=="0":
-            pnames=dc.get_propnames(self.__uri)
-            re=self.mk_propname_response(self.__uri,pnames,doc)
+            pnames = dc.get_propnames(self.__uri)
+            re = self.mk_propname_response(self.__uri,pnames,doc)
             ms.appendChild(re)
 
         elif self.__depth=="1":
-            pnames=dc.get_propnames(self.__uri)
-            re=self.mk_propname_response(self.__uri,pnames,doc)
+            pnames = dc.get_propnames(self.__uri)
+            re = self.mk_propname_response(self.__uri,pnames,doc)
             ms.appendChild(re)
 
         for newuri in dc.get_childs(self.__uri):
-            pnames=dc.get_propnames(newuri)
-            re=self.mk_propname_response(newuri,pnames,doc)
+            pnames = dc.get_propnames(newuri)
+            re = self.mk_propname_response(newuri,pnames,doc)
             ms.appendChild(re)
         # *** depth=="infinity"
 
-        sfile=StringIO()
-        ext.PrettyPrint(doc,stream=sfile)
-        s=sfile.getvalue()
+        sfile = StringIO()
+        ext.PrettyPrint(doc,stream = sfile)
+        s = sfile.getvalue()
         sfile.close()
         return s
 
     def create_allprop(self):
         """ return a list of all properties """
-        self.proplist={}
-        self.namespaces=[]
+        self.proplist = {}
+        self.namespaces = []
         for ns,plist in self.__dataclass.get_propnames(self.__uri).items():
-            self.proplist[ns]=plist
+            self.proplist[ns] = plist
             self.namespaces.append(ns)
 
         return self.create_prop()
@@ -178,32 +177,32 @@ class PROPFIND:
 
         # create the document generator
         doc = Document(None)
-        ms=doc.createElement("D:multistatus")
+        ms = doc.createElement("D:multistatus")
         ms.setAttribute("xmlns:D","DAV:")
         doc.appendChild(ms)
 
         if self.__depth=="0":
-            gp,bp=self.get_propvalues(self.__uri)
-            res=self.mk_prop_response(self.__uri,gp,bp,doc)
+            gp,bp = self.get_propvalues(self.__uri)
+            res = self.mk_prop_response(self.__uri,gp,bp,doc)
             ms.appendChild(res)
 
         elif self.__depth=="1":
-            gp,bp=self.get_propvalues(self.__uri)
-            res=self.mk_prop_response(self.__uri,gp,bp,doc)
+            gp,bp = self.get_propvalues(self.__uri)
+            res = self.mk_prop_response(self.__uri,gp,bp,doc)
             ms.appendChild(res)
 
 	    try:
 		for newuri in self.__dataclass.get_childs(self.__uri):
-			gp,bp=self.get_propvalues(newuri)
-			res=self.mk_prop_response(newuri,gp,bp,doc)
+			gp,bp = self.get_propvalues(newuri)
+			res = self.mk_prop_response(newuri,gp,bp,doc)
 			ms.appendChild(res)
 	    except DAV_NotFound:
 		# If no children, never mind.
 		pass
 
-        sfile=StringIO()
-        ext.PrettyPrint(doc,stream=sfile)
-        s=sfile.getvalue()
+        sfile = StringIO()
+        ext.PrettyPrint(doc,stream = sfile)
+        s = sfile.getvalue()
         sfile.close()
         return s
 
@@ -215,32 +214,32 @@ class PROPFIND:
         propnames should have the format {NS1 : [prop1, prop2, ...], NS2: ...}
 
         """
-        re=doc.createElement("D:response")
+        re = doc.createElement("D:response")
 
         # write href information
-        href=doc.createElement("D:href")
+        href = doc.createElement("D:href")
         if self.use_full_urls:
-            huri=doc.createTextNode(uri)
+            huri = doc.createTextNode(uri)
         else:
-            uparts=urlparse.urlparse(uri)
-            fileloc=uparts[2]
-            huri=doc.createTextNode(urllib.quote(fileloc.encode('utf8')))
+            uparts = urlparse.urlparse(uri)
+            fileloc = uparts[2]
+            huri = doc.createTextNode(urllib.quote(fileloc.encode('utf8')))
         href.appendChild(huri)
         re.appendChild(href)
 
-        ps=doc.createElement("D:propstat")
-        nsnum=0
+        ps = doc.createElement("D:propstat")
+        nsnum = 0
 
         for ns,plist in propnames.items():
             # write prop element
-            pr=doc.createElement("D:prop")
-            nsp="ns"+str(nsnum)
+            pr = doc.createElement("D:prop")
+            nsp = "ns"+str(nsnum)
             pr.setAttribute("xmlns:"+nsp,ns)
-            nsnum=nsnum+1
+            nsnum = nsnum+1
 
             # write propertynames
             for p in plist:
-                pe=doc.createElement(nsp+":"+p)
+                pe = doc.createElement(nsp+":"+p)
                 pr.appendChild(pe)
 
             ps.appendChild(pr)
@@ -257,33 +256,33 @@ class PROPFIND:
         one, that means).
 
         """
-        re=doc.createElement("D:response")
+        re = doc.createElement("D:response")
         # append namespaces to response
-        nsnum=0
+        nsnum = 0
         for nsname in self.namespaces:
             re.setAttribute("xmlns:ns"+str(nsnum),nsname)
-            nsnum=nsnum+1
+            nsnum = nsnum+1
 
         # write href information
-        href=doc.createElement("D:href")
+        href = doc.createElement("D:href")
         if self.use_full_urls:
-            huri=doc.createTextNode(uri)
+            huri = doc.createTextNode(uri)
         else:
-            uparts=urlparse.urlparse(uri)
-            fileloc=uparts[2]
-            huri=doc.createTextNode(urllib.quote(fileloc.encode('utf8')))
+            uparts = urlparse.urlparse(uri)
+            fileloc = uparts[2]
+            huri = doc.createTextNode(urllib.quote(fileloc.encode('utf8')))
         href.appendChild(huri)
         re.appendChild(href)
 
         # write good properties
         if good_props and len(good_props.items()):
-            ps=doc.createElement("D:propstat")
+            ps = doc.createElement("D:propstat")
 
-            gp=doc.createElement("D:prop")
+            gp = doc.createElement("D:prop")
             for ns in good_props.keys():
                 ns_prefix="ns"+str(self.namespaces.index(ns))+":"
                 for p,v in good_props[ns].items():
-                    pe=doc.createElement(ns_prefix+str(p))
+                    pe = doc.createElement(ns_prefix+str(p))
                     if v == None:
                         pass
                     elif ns=='DAV:' and p=="resourcetype":
@@ -294,15 +293,15 @@ class PROPFIND:
                         ve=doc.createElement(ns_prefix+v[0])
                         pe.appendChild(ve)
                     else:
-                        ve=doc.createTextNode(utf8str(v))
+                        ve = doc.createTextNode(utf8str(v))
                         pe.appendChild(ve)
 
                     gp.appendChild(pe)
             if gp.hasChildNodes():
 		re.appendChild(ps)
 		ps.appendChild(gp)
-		s=doc.createElement("D:status")
-		t=doc.createTextNode("HTTP/1.1 200 OK")
+		s = doc.createElement("D:status")
+		t = doc.createTextNode("HTTP/1.1 200 OK")
 		s.appendChild(t)
 		ps.appendChild(s)
 		re.appendChild(ps)
@@ -312,20 +311,20 @@ class PROPFIND:
 
             # write a propstat for each error code
             for ecode in bad_props.keys():
-                ps=doc.createElement("D:propstat")
+                ps = doc.createElement("D:propstat")
                 re.appendChild(ps)
-                bp=doc.createElement("D:prop")
+                bp = doc.createElement("D:prop")
                 ps.appendChild(bp)
 
                 for ns in bad_props[ecode].keys():
-                    ns_prefix="ns"+str(self.namespaces.index(ns))+":"
+                    ns_prefix = "ns"+str(self.namespaces.index(ns))+":"
 
                 for p in bad_props[ecode][ns]:
-                    pe=doc.createElement(ns_prefix+str(p))
+                    pe = doc.createElement(ns_prefix+str(p))
                     bp.appendChild(pe)
 
-                s=doc.createElement("D:status")
-                t=doc.createTextNode(utils.gen_estring(ecode))
+                s = doc.createElement("D:status")
+                t = doc.createTextNode(utils.gen_estring(ecode))
                 s.appendChild(t)
                 ps.appendChild(s)
                 re.appendChild(ps)
@@ -342,20 +341,20 @@ class PROPFIND:
         found or the user is not allowed to read them.
 
         """
-        good_props={}
-        bad_props={}
+        good_props = {}
+        bad_props = {}
 
         for (ns,plist) in self.proplist.items():
-            good_props[ns]={}
-            bad_props={}
+            good_props[ns] = {}
+            bad_props = {}
             ec = 0
             for prop in plist:
                 try:
                     ec = 0
-                    r=self.__dataclass.get_prop(uri,ns,prop)
-                    good_props[ns][prop]=r
+                    r = self.__dataclass.get_prop(uri,ns,prop)
+                    good_props[ns][prop] = r
                 except DAV_Error, error_code:
-                    ec=error_code[0]
+                    ec = error_code[0]
 
                 # ignore props with error_code if 0 (invisible)
                 if ec==0: continue
@@ -364,9 +363,11 @@ class PROPFIND:
                     if bad_props[ec].has_key(ns):
                         bad_props[ec][ns].append(prop)
                     else:
-                        bad_props[ec][ns]=[prop]
+                        bad_props[ec][ns] = [prop]
                 else:
-                    bad_props[ec]={ns:[prop]}
+                    bad_props[ec] = {ns:[prop]}
 
         return good_props, bad_props
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/DAV/utils.py b/addons/caldav/DAV/utils.py
index c4bb4d1a4c0..a4010f27a77 100755
--- a/addons/caldav/DAV/utils.py
+++ b/addons/caldav/DAV/utils.py
@@ -27,7 +27,7 @@ AUTHOR  = 'Simon Pamies <s.pamies@banality.de>'
 
 def gen_estring(ecode):
     """ generate an error string from the given code """
-    ec=atoi(str(ecode))
+    ec = atoi(str(ecode))
     if STATUS_CODES.has_key(ec):
         return "HTTP/1.1 %s %s" %(ec,STATUS_CODES[ec])
     else:
@@ -46,20 +46,20 @@ def parse_propfind(xml_doc):
     doc = PyExpat.Reader().fromString(xml_doc)
     snit = doc.createNodeIterator(doc, NodeFilter.NodeFilter.SHOW_ELEMENT, None, None)
 
-    request_type=None
-    props={}
-    namespaces=[]
+    request_type = None
+    props = {}
+    namespaces = []
 
     while 1:
         curr_elem = snit.nextNode()
         if not curr_elem: break
-        ename=fname=lower(curr_elem.nodeName)
+        ename=fname = lower(curr_elem.nodeName)
         if ":" in fname:
-            ename=split(fname,":")[1]
-        if ename=="prop": request_type=RT_PROP; continue
+            ename = split(fname,":")[1]
+        if ename=="prop": request_type = RT_PROP; continue
         if ename=="propfind": continue
-        if ename=="allprop": request_type=RT_ALLPROP; continue
-        if ename=="propname": request_type=RT_PROPNAME; continue
+        if ename=="allprop": request_type = RT_ALLPROP; continue
+        if ename=="propname": request_type = RT_PROPNAME; continue
 
         # rest should be names of attributes
 
@@ -67,13 +67,13 @@ def parse_propfind(xml_doc):
         if props.has_key(ns):
             props[ns].append(ename)
         else:
-            props[ns]=[ename]
+            props[ns] = [ename]
             namespaces.append(ns)
 
     return request_type,props,namespaces
 
 
-def create_treelist(dataclass,uri):
+def create_treelist(dataclass, uri):
     """ create a list of resources out of a tree
 
     This function is used for the COPY, MOVE and DELETE methods
@@ -83,23 +83,23 @@ def create_treelist(dataclass,uri):
     It will return the flattened tree as list
 
     """
-    queue=[uri]
-    list=[uri]
+    queue = [uri]
+    list = [uri]
     while len(queue):
-        element=queue[-1]
+        element = queue[-1]
         if dataclass.is_collection(element):
-            childs=dataclass.get_childs(element)
+            childs = dataclass.get_childs(element)
         else:
-            childs=[]
+            childs = []
         if len(childs):
-            list=list+childs
+            list = list+childs
         # update queue
         del queue[-1]
         if len(childs):
-            queue=queue+childs
+            queue = queue+childs
     return list
 
-def is_prefix(uri1,uri2):
+def is_prefix(uri1, uri2):
     """ returns 1 of uri1 is a prefix of uri2 """
     if uri2[:len(uri1)]==uri1:
         return 1
@@ -111,50 +111,51 @@ def quote_uri(uri):
     import urlparse
     import urllib
 
-    up=urlparse.urlparse(uri)
-    np=urllib.quote(up[2])
-    return urlparse.urlunparse((up[0],up[1],np,up[3],up[4],up[5]))
+    up = urlparse.urlparse(uri)
+    np = urllib.quote(up[2])
+    return urlparse.urlunparse((up[0], up[1], np, up[3], up[4], up[5]))
 
 def get_uriparentpath(uri):
     """ extract the uri path and remove the last element """
-    up=urlparse.urlparse(uri)
-    return joinfields(split(up[2],"/")[:-1],"/")
+    up = urlparse.urlparse(uri)
+    return joinfields(split(up[2], "/")[:-1], "/")
 
 def get_urifilename(uri):
     """ extract the uri path and return the last element """
-    up=urlparse.urlparse(uri)
-    return split(up[2],"/")[-1]
+    up = urlparse.urlparse(uri)
+    return split(up[2], "/")[-1]
 
 def get_parenturi(uri):
     """ return the parent of the given resource"""
-    up=urlparse.urlparse(uri)
-    np=joinfields(split(up[2],"/")[:-1],"/")
-    return urlparse.urlunparse((up[0],up[1],np,up[3],up[4],up[5]))
+    up = urlparse.urlparse(uri)
+    np = joinfields(split(up[2], "/")[:-1], "/")
+    return urlparse.urlunparse((up[0], up[1], np, up[3], up[4], up[5]))
 
 ### XML utilities
 
 def make_xmlresponse(result):
     """ construct a response from a dict of uri:error_code elements """
     doc = Document(None)
-    ms=doc.createElement("D:multistatus")
-    ms.setAttribute("xmlns:D","DAV:")
+    ms = doc.createElement("D:multistatus")
+    ms.setAttribute("xmlns:D", "DAV:")
     doc.appendChild(ms)
 
-    for el,ec in result.items():
-        re=doc.createElement("D:response")
-        hr=doc.createElement("D:href")
-        st=doc.createElement("D:status")
-        huri=doc.createTextNode(quote_uri(el))
-        t=doc.createTextNode(gen_estring(ec))
+    for el, ec in result.items():
+        re = doc.createElement("D:response")
+        hr = doc.createElement("D:href")
+        st = doc.createElement("D:status")
+        huri = doc.createTextNode(quote_uri(el))
+        t = doc.createTextNode(gen_estring(ec))
         st.appendChild(t)
         hr.appendChild(huri)
         re.appendChild(hr)
         re.appendChild(st)
         ms.appendChild(re)
 
-    sfile=StringIO()
-    ext.PrettyPrint(doc,stream=sfile)
-    s=sfile.getvalue()
+    sfile = StringIO()
+    ext.PrettyPrint(doc, stream = sfile)
+    s = sfile.getvalue()
     sfile.close()
     return s
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/__init__.py b/addons/caldav/__init__.py
index 19f11301420..9e222cf99a8 100644
--- a/addons/caldav/__init__.py
+++ b/addons/caldav/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 91491dd1688..c5534afa649 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -36,14 +36,21 @@ import time
 try:
     import vobject
 except ImportError:
-    raise osv.except_osv('vobject Import Error!','Please install python-vobject from http://vobject.skyhouseconsulting.com/')
- 
+    raise osv.except_osv('vobject Import Error!','Please install python-vobject \
+                     from http://vobject.skyhouseconsulting.com/')
+
 # O-1  Optional and can come only once
 # O-n  Optional and can come more than once
 # R-1  Required and can come only once
 # R-n  Required and can come more than once
 
 def uid2openobjectid(cr, uidval, oomodel, rdate):
+    """ UID To Open Object Id
+        @param cr: the current row, from the database cursor,
+        @param uidval: Get USerId vale
+        @oomodel: Open Object ModelName
+        @param rdate: Get Recurrent Date
+    """
     __rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$')
     wematch = __rege.match(uidval.encode('utf8'))
     if not wematch:
@@ -60,17 +67,28 @@ def uid2openobjectid(cr, uidval, oomodel, rdate):
             r_id = cr.fetchone()
             if r_id:
                 return (id, r_id[0])
-        cr.execute(qry)        
+        cr.execute(qry)
         ids = map(lambda x: str(x[0]), cr.fetchall())
         if id in ids:
             return (id, None)
         return (False, None)
 
 def openobjectid2uid(cr, uidval, oomodel):
+    """ Open Object Id To UId
+        @param cr: the current row, from the database cursor,
+        @param uidval: Get USerId vale
+        @oomodel: Open Object ModelName """
+
     value = 'OpenObject-%s_%s@%s' % (oomodel, uidval, cr.dbname)
     return value
 
 def get_attribute_mapping(cr, uid, calname, context={}):
+    """ Attribute Mapping with Basic calendar fields and lines
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param calname: Get Calendar name
+        @param context: A standard dictionary for contextual values """
+
     if not context:
         context = {}
     pool = pooler.get_pool(cr.dbname)
@@ -100,6 +118,10 @@ def get_attribute_mapping(cr, uid, calname, context={}):
     return res
 
 def map_data(cr, uid, obj):
+    """ Map Data
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,"""
+
     vals = {}
     for map_dict in obj.__attribute__:
         map_val = obj.ical_get(map_dict, 'value')
@@ -146,14 +168,26 @@ def map_data(cr, uid, obj):
 class CalDAV(object):
     __attribute__ = {}
 
-    
+
 
     def ical_set(self, name, value, type):
+        """ set calendar Attribute
+         @param self: The object pointer,
+         @param name: Get Attribute Name
+         @param value: Get Attribute Value
+         @param type: Get Attribute Type
+        """
         if name in self.__attribute__ and self.__attribute__[name]:
             self.__attribute__[name][type] = value
         return True
 
     def ical_get(self, name, type):
+        """ Get calendar Attribute
+         @param self: The object pointer,
+         @param name: Get Attribute Name
+         @param type: Get Attribute Type
+        """
+
         if self.__attribute__.get(name):
             val = self.__attribute__.get(name).get(type, None)
             valtype =  self.__attribute__.get(name).get('type', None)
@@ -168,12 +202,23 @@ class CalDAV(object):
             return  self.__attribute__.get(name, None)
 
     def ical_reset(self, type):
+        """ Reset Calendar Attribute
+         @param self: The object pointer,
+         @param type: Get Attribute Type
+        """
+
         for name in self.__attribute__:
             if self.__attribute__[name]:
                 self.__attribute__[name][type] = None
         return True
-    
+
     def parse_ics(self, cr, uid, child, cal_children=None, context=None):
+        """ parse calendaring and scheduling information
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values """
+
         att_data = []
         for cal_data in child.getChildren():
             if cal_data.name.lower() == 'attendee':
@@ -197,7 +242,7 @@ class CalDAV(object):
                 self.ical_set(cal_data.name.lower(), ','.join(exval), 'value')
                 continue
             if cal_data.name.lower() in self.__attribute__:
-                
+
                 if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'):
                     self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value')
                 self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
@@ -205,6 +250,12 @@ class CalDAV(object):
         return vals
 
     def create_ics(self, cr, uid, datas, name, ical, context=None):
+        """ create calendaring and scheduling information
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values """
+
         if not datas:
             return
         timezones = []
@@ -223,10 +274,10 @@ class CalDAV(object):
                         model_obj = self.pool.get(model)
                         r_ids = []
                         if model_obj._columns.get('recurrent_uid', None):
-                            cr.execute('select id from %s  where recurrent_uid=%s' 
+                            cr.execute('select id from %s  where recurrent_uid=%s'
                                            % (model_obj._table, data[map_field]))
                             r_ids = map(lambda x: x[0], cr.fetchall())
-                        if r_ids: 
+                        if r_ids:
                             rdata = self.pool.get(model).read(cr, uid, r_ids)
                             event_obj = self.pool.get('basic.calendar.event')
                             rcal = event_obj.export_cal(cr, uid, rdata, context=context)
@@ -258,7 +309,7 @@ class CalDAV(object):
                             if field in ('exdate'):
                                 vevent.add(field).value = map(parser.parse, (data[map_field]).split(','))
                             else:
-                                vevent.add(field).value = tools.ustr(data[map_field]) 
+                                vevent.add(field).value = tools.ustr(data[map_field])
                         elif map_type in ('datetime', 'date') and data[map_field]:
                             dtfield = vevent.add(field)
                             dtfield.value = parser.parse(data[map_field])
@@ -278,8 +329,16 @@ class CalDAV(object):
                                     if val1 == data[map_field]:
                                         vevent.add(field).value = key1
         return vevent
-    
+
     def check_import(self, cr, uid, vals, context={}):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param vals: Get Values
+            @param context: A standard dictionary for contextual values
+        """
+
         ids = []
         model_obj = self.pool.get(context.get('model'))
         recur_pool = {}
@@ -311,6 +370,14 @@ class CalDAV(object):
         return ids
 
     def export_cal(self, cr, uid, datas, vobj=None, context={}):
+        """ Export Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param datas: Get Data's for caldav
+            @param context: A standard dictionary for contextual values
+        """
+
         try:
             self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
             ical = vobject.iCalendar()
@@ -320,6 +387,14 @@ class CalDAV(object):
             raise osv.except_osv(('Error !'), (str(e)))
 
     def import_cal(self, cr, uid, content, data_id=None, context=None):
+        """ Import Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param data_id: Get Data’s ID or False
+            @param context: A standard dictionary for contextual values
+        """
+
         ical_data = base64.decodestring(content)
         self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
         parsedCal = vobject.readOne(ical_data)
@@ -335,6 +410,7 @@ class CalDAV(object):
             self.ical_reset('value')
         return res
 
+
 class Calendar(CalDAV, osv.osv):
     _name = 'basic.calendar'
     _description = 'Calendar'
@@ -354,27 +430,35 @@ class Calendar(CalDAV, osv.osv):
         'vtimezone': None, # Use: O-n, Type: Collection of Timezone class
     }
     _columns = {
-            'name': fields.char("Name", size=64), 
-            'line_ids': fields.one2many('basic.calendar.lines', 'calendar_id', 'Calendar Lines'), 
-            'active': fields.boolean('Active'), 
-            'create_date': fields.datetime('Created Date'), 
-            'write_date': fields.datetime('Modifided Date'), 
+            'name': fields.char("Name", size=64),
+            'line_ids': fields.one2many('basic.calendar.lines', 'calendar_id', 'Calendar Lines'),
+            'active': fields.boolean('Active'),
+            'create_date': fields.datetime('Created Date'),
+            'write_date': fields.datetime('Modifided Date'),
     }
 
     _defaults = {
-                'active': lambda *a: True, 
+                'active': lambda *a: True,
                  }
 
     def export_cal(self, cr, uid, ids, vobj='vevent', context={}):
+        """ Export Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of calendar’s IDs
+            @param context: A standard dictionary for contextual values
+        """
+
         cal = self.browse(cr, uid, ids[0])
-        ical = vobject.iCalendar()        
+        ical = vobject.iCalendar()
         for line in cal.line_ids:
             if line.name in ('valarm', 'attendee'):
                 continue
             mod_obj = self.pool.get(line.object_id.model)
             data_ids = mod_obj.search(cr, uid, eval(line.domain), context=context)
             datas = mod_obj.read(cr, uid, data_ids, context=context)
-            context.update({'model': line.object_id.model, 
+            context.update({'model': line.object_id.model,
                                     'calendar_id': cal.id
                                     })
             self.__attribute__ = get_attribute_mapping(cr, uid, line.name, context)
@@ -382,6 +466,14 @@ class Calendar(CalDAV, osv.osv):
         return ical.serialize()
 
     def import_cal(self, cr, uid, content, data_id=None, context=None):
+        """ Import Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param data_id: Get Data’s ID or False
+            @param context: A standard dictionary for contextual values
+        """
+
         if not context:
             context = {}
         vals = []
@@ -396,7 +488,7 @@ class Calendar(CalDAV, osv.osv):
             cal_children[line.name] = line.object_id.model
         for child in parsedCal.getChildren():
             if child.name.lower() in cal_children:
-                context.update({'model': cal_children[child.name.lower()], 
+                context.update({'model': cal_children[child.name.lower()],
                                 'calendar_id': cal.id
                                 })
                 self.__attribute__ = get_attribute_mapping(cr, uid, child.name.lower(), context=context)
@@ -409,27 +501,39 @@ class Calendar(CalDAV, osv.osv):
             self.check_import(cr, uid, vals, context=context)
         return {}
 Calendar()
-    
+
+
 class basic_calendar_line(osv.osv):
+    """ Calendar Lines """
+
     _name = 'basic.calendar.lines'
     _description = 'Calendar Lines'
+
     _columns = {
             'name': fields.selection([('vevent', 'Event'), ('vtodo', 'TODO'), \
                                     ('valarm', 'Alarm'), \
                                     ('attendee', 'Attendee')], \
-                                    string="Type", size=64), 
-            'object_id': fields.many2one('ir.model', 'Object'), 
+                                    string="Type", size=64),
+            'object_id': fields.many2one('ir.model', 'Object'),
             'calendar_id': fields.many2one('basic.calendar', 'Calendar', \
-                                       required=True, ondelete='cascade'), 
-            'domain': fields.char('Domain', size=124), 
+                                       required=True, ondelete='cascade'),
+            'domain': fields.char('Domain', size=124),
             'mapping_ids': fields.one2many('basic.calendar.fields', 'type_id', 'Fields Mapping')
-    }   
+    }
 
     _defaults = {
-        'domain': lambda *a: '[]', 
+        'domain': lambda *a: '[]',
     }
-    
+
     def create(self, cr, uid, vals, context={}):
+        """ create calendar's line
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param vals: Get the Values
+            @param context: A standard dictionary for contextual values
+        """
+
         cr.execute("Select count(id) from basic_calendar_lines \
                                 where name='%s' and calendar_id=%s" % (vals.get('name'), vals.get('calendar_id')))
         res = cr.fetchone()
@@ -441,41 +545,52 @@ line "%s" more than once' % (vals.get('name'))))
 
 basic_calendar_line()
 
+
 class basic_calendar_attribute(osv.osv):
     _name = 'basic.calendar.attributes'
     _description = 'Calendar attributes'
-    _columns = {        
-        'name': fields.char("Name", size=64, required=True), 
+    _columns = {
+        'name': fields.char("Name", size=64, required=True),
         'type': fields.selection([('vevent', 'Event'), ('vtodo', 'TODO'), \
                                     ('alarm', 'Alarm'), \
                                     ('attendee', 'Attendee')], \
-                                    string="Type", size=64, required=True), 
+                                    string="Type", size=64, required=True),
     }
 
 basic_calendar_attribute()
 
+
 class basic_calendar_fields(osv.osv):
+    """ Calendar fields """
+
     _name = 'basic.calendar.fields'
     _description = 'Calendar fields'
 
     _columns = {
-        'field_id': fields.many2one('ir.model.fields', 'OpenObject Field'), 
-        'name': fields.many2one('basic.calendar.attributes', 'Name', required=True), 
+        'field_id': fields.many2one('ir.model.fields', 'OpenObject Field'),
+        'name': fields.many2one('basic.calendar.attributes', 'Name', required=True),
         'type_id': fields.many2one('basic.calendar.lines', 'Type', \
-                                   required=True, ondelete='cascade'), 
-        'expr': fields.char("Expression", size=64), 
-        'fn': fields.selection([('field', 'Use the field'), 
-                        ('const', 'Expression as constant'), 
-                        ('hours', 'Interval in hours'), 
-                        ], 'Function'), 
-        'mapping': fields.text('Mapping'), 
+                                   required=True, ondelete='cascade'),
+        'expr': fields.char("Expression", size=64),
+        'fn': fields.selection([('field', 'Use the field'),
+                        ('const', 'Expression as constant'),
+                        ('hours', 'Interval in hours'),
+                        ], 'Function'),
+        'mapping': fields.text('Mapping'),
     }
 
     _defaults = {
-        'fn': lambda *a: 'field', 
+        'fn': lambda *a: 'field',
     }
-   
+
     def check_line(self, cr, uid, vals, name, context=None):
+        """ check calendar's line
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param vals: Get Values
+            @param context: A standard dictionary for contextual values
+        """
         f_obj = self.pool.get('ir.model.fields')
         field = f_obj.browse(cr, uid, vals['field_id'], context=context)
         relation = field.relation
@@ -487,8 +602,16 @@ class basic_calendar_fields(osv.osv):
             if (relation != 'NULL') and (not relation == line_rel):
                 raise osv.except_osv(_('Warning !'), _('Please provide proper configuration of "%s" in Calendar Lines' % (name)))
         return True
-    
+
     def create(self, cr, uid, vals, context={}):
+        """ Create Calendar's fields
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param vals: Get Values
+            @param context: A standard dictionary for contextual values
+        """
+
         cr.execute('select name from basic_calendar_attributes \
                             where id=%s' % (vals.get('name')))
         name = cr.fetchone()
@@ -502,8 +625,16 @@ class basic_calendar_fields(osv.osv):
             if res[0] > 0:
                 raise osv.except_osv(_('Warning !'), _('Can not map the field more than once'))
         return super(basic_calendar_fields, self).create(cr, uid, vals, context=context)
-    
+
     def write(self, cr, uid, ids, vals, context=None):
+        """ write Calendar's fields
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param vals: Get Values
+            @param context: A standard dictionary for contextual values
+        """
+
         if not vals:
             return
         for id in ids:
@@ -522,6 +653,7 @@ class basic_calendar_fields(osv.osv):
 
 basic_calendar_fields()
 
+
 class Event(CalDAV, osv.osv_memory):
     _name = 'basic.calendar.event'
     _calname = 'vevent'
@@ -542,7 +674,7 @@ class Event(CalDAV, osv.osv_memory):
         'transp': None, # Use: O-1, Type: TEXT, Defines whether an event is transparent or not to busy time searches.
         'uid': None, # Use: O-1, Type: TEXT, Defines the persistent, globally unique identifier for the calendar component.
         'url': None, # Use: O-1, Type: URL, Defines a Uniform Resource Locator (URL) associated with the iCalendar object.
-        'recurid': None, 
+        'recurid': None,
         'attach': None, # Use: O-n, Type: BINARY, Provides the capability to associate a document object with a calendar component.
         'attendee': None, # Use: O-n, Type: CAL-ADDRESS, Defines an "Attendee" within a calendar component.
         'categories': None, # Use: O-n, Type: TEXT, Defines the categories for a calendar component.
@@ -550,69 +682,89 @@ class Event(CalDAV, osv.osv_memory):
         'contact': None, # Use: O-n, Type: TEXT, Used to represent contact information or alternately a  reference to contact information associated with the calendar component.
         'exdate': None, # Use: O-n, Type: DATE-TIME, Defines the list of date/time exceptions for a recurring calendar component.
         'exrule': None, # Use: O-n, Type: RECUR, Defines a rule or repeating pattern for an exception to a recurrence set.
-        'rstatus': None, 
+        'rstatus': None,
         'related': None, # Use: O-n, Specify the relationship of the alarm trigger with respect to the start or end of the calendar component.
                                 #  like A trigger set 5 minutes after the end of the event or to-do.---> TRIGGER;related=END:PT5M
         'resources': None, # Use: O-n, Type: TEXT, Defines the equipment or resources anticipated for an activity specified by a calendar entity like RESOURCES:EASEL,PROJECTOR,VCR, LANGUAGE=fr:1 raton-laveur
         'rdate': None, # Use: O-n, Type: DATE-TIME, Defines the list of date/times for a recurrence set.
         'rrule': None, # Use: O-n, Type: RECUR, Defines a rule or repeating pattern for recurring events, to-dos, or time zone definitions.
-        'x-prop': None, 
+        'x-prop': None,
         'duration': None, # Use: O-1, Type: DURATION, Specifies a positive duration of time.
         'dtend': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that a calendar component ends.
     }
+
     def export_cal(self, cr, uid, datas, vobj='vevent', context={}):
+        """ Export calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param datas: Get datas
+            @param context: A standard dictionary for contextual values
+        """
+
         return super(Event, self).export_cal(cr, uid, datas, 'vevent', context=context)
 
 Event()
 
+
 class ToDo(CalDAV, osv.osv_memory):
     _name = 'basic.calendar.todo'
     _calname = 'vtodo'
 
     __attribute__ = {
-                'class': None, 
-                'completed': None, 
-                'created': None, 
-                'description': None, 
-                'dtstamp': None, 
-                'dtstart': None, 
-                'duration': None, 
-                'due': None, 
-                'geo': None, 
-                'last-mod ': None, 
-                'location': None, 
-                'organizer': None, 
-                'percent': None, 
-                'priority': None, 
-                'recurid': None, 
-                'seq': None, 
-                'status': None, 
-                'summary': None, 
-                'uid': None, 
-                'url': None, 
-                'attach': None, 
-                'attendee': None, 
-                'categories': None, 
-                'comment': None, 
-                'contact': None, 
-                'exdate': None, 
-                'exrule': None, 
-                'rstatus': None, 
-                'related': None, 
-                'resources': None, 
-                'rdate': None, 
-                'rrule': None, 
+                'class': None,
+                'completed': None,
+                'created': None,
+                'description': None,
+                'dtstamp': None,
+                'dtstart': None,
+                'duration': None,
+                'due': None,
+                'geo': None,
+                'last-mod ': None,
+                'location': None,
+                'organizer': None,
+                'percent': None,
+                'priority': None,
+                'recurid': None,
+                'seq': None,
+                'status': None,
+                'summary': None,
+                'uid': None,
+                'url': None,
+                'attach': None,
+                'attendee': None,
+                'categories': None,
+                'comment': None,
+                'contact': None,
+                'exdate': None,
+                'exrule': None,
+                'rstatus': None,
+                'related': None,
+                'resources': None,
+                'rdate': None,
+                'rrule': None,
             }
 
     def export_cal(self, cr, uid, datas, vobj='vevent', context={}):
+        """ Export Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param datas: Get datas
+            @param context: A standard dictionary for contextual values
+        """
+
         return super(ToDo, self).export_cal(cr, uid, datas, 'vtodo', context=context)
 
 ToDo()
 
+
 class Journal(CalDAV):
     __attribute__ = {
     }
 
+
 class FreeBusy(CalDAV):
     __attribute__ = {
     'contact': None, # Use: O-1, Type: Text, Represent contact information or alternately a  reference to contact information associated with the calendar component.
@@ -626,15 +778,15 @@ class FreeBusy(CalDAV):
     'attendee': None, # Use: O-n, Type: CAL-ADDRESS, Defines an "Attendee" within a calendar component.
     'comment': None, # Use: O-n, Type: TEXT, Specifies non-processing information intended to provide a comment to the calendar user.
     'freebusy': None, # Use: O-n, Type: PERIOD, Defines one or more free or busy time intervals.
-    'rstatus': None, 
-    'X-prop': None, 
+    'rstatus': None,
+    'X-prop': None,
     }
 
 
 class Timezone(CalDAV, osv.osv_memory):
     _name = 'basic.calendar.timezone'
     _calname = 'vtimezone'
-    
+
     __attribute__ = {
     'tzid': {'field': 'tzid'}, # Use: R-1, Type: Text, Specifies the text value that uniquely identifies the "VTIMEZONE" calendar component.
     'last-mod': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that the information associated with the calendar component was last revised in the calendar store.
@@ -643,8 +795,15 @@ class Timezone(CalDAV, osv.osv_memory):
     'daylightc': {'tzprop': None}, # Use: R-1,
     'x-prop': None, # Use: O-n, Type: Text,
     }
-    
+
     def get_name_offset(self, cr, uid, tzid, context={}):
+        """ Get Name Offset value
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values
+        """
+
         mytz = pytz.timezone(tzid.title())
         mydt = datetime.now(tz=mytz)
         offset = mydt.utcoffset()
@@ -655,6 +814,14 @@ class Timezone(CalDAV, osv.osv_memory):
         return (mydt.tzname(), realoffset)
 
     def export_cal(self, cr, uid, model, tzid, ical, context={}):
+        """ Export Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param model: Get Model's name
+            @param context: A standard dictionary for contextual values
+        """
+
         ctx = context.copy()
         ctx.update({'model': model})
         cal_tz = ical.add('vtimezone')
@@ -666,8 +833,16 @@ class Timezone(CalDAV, osv.osv_memory):
         tz_std.add("DTSTART").value = datetime.now() # TODO
         tz_std.add("TZNAME").value = tzname
         return ical
-    
+
     def import_cal(self, cr, uid, ical_data, context=None):
+        """ Import Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ical_data: Get calendar's data
+            @param context: A standard dictionary for contextual values
+        """
+
         for child in ical_data.getChildren():
             if child.name.lower() == 'tzid':
                 tzname = child.value
@@ -675,7 +850,7 @@ class Timezone(CalDAV, osv.osv_memory):
         vals = map_data(cr, uid, self)
         return vals
 
-Timezone()   
+Timezone()
 
 
 class Alarm(CalDAV, osv.osv_memory):
@@ -691,10 +866,19 @@ class Alarm(CalDAV, osv.osv_memory):
     'duration': None, #           Type: DURATION, Duration' and 'repeat' are both optional, and MUST NOT occur more than once each, but if one occurs, so MUST the other. Use:- 0-1 for AUDIO, EMAIL and PROCEDURE, Use:- 0-n for DISPLAY
     'repeat': None, #           Type: INTEGER, Duration' and 'repeat' are both optional, and MUST NOT occur more than once each, but if one occurs, so MUST the other. Use:- 0-1 for AUDIO, EMAIL and PROCEDURE, Use:- 0-n for DISPLAY
     'attach': None, # Use:- O-n: which MUST point to a sound resource, which is rendered when the alarm is triggered for AUDIO, Use:- O-n: which are intended to be sent as message attachments for EMAIL, Use:- R-1:which MUST point to a procedure resource, which is invoked when the alarm is triggered for PROCEDURE.
-    'x-prop': None, 
+    'x-prop': None,
     }
 
     def export_cal(self, cr, uid, model, alarm_id, vevent, context={}):
+        """ Export Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param model: Get Model's name
+            @param alarm_id: Get Alarm's Id
+            @param context: A standard dictionary for contextual values
+        """
+
         valarm = vevent.add('valarm')
         alarm_object = self.pool.get(model)
         alarm_data = alarm_object.read(cr, uid, alarm_id, [])
@@ -721,6 +905,14 @@ class Alarm(CalDAV, osv.osv_memory):
         return vevent
 
     def import_cal(self, cr, uid, ical_data, context=None):
+        """ Import Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ical_data: Get calendar's Data
+            @param context: A standard dictionary for contextual values
+        """
+
         ctx = context.copy()
         ctx.update({'model': context.get('model', None)})
         self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, ctx)
@@ -755,6 +947,7 @@ class Alarm(CalDAV, osv.osv_memory):
 
 Alarm()
 
+
 class Attendee(CalDAV, osv.osv_memory):
     _name = 'basic.calendar.attendee'
     _calname = 'attendee'
@@ -774,6 +967,14 @@ class Attendee(CalDAV, osv.osv_memory):
     }
 
     def import_cal(self, cr, uid, ical_data, context=None):
+        """ Import Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ical_data: Get calendar's Data
+            @param context: A standard dictionary for contextual values
+        """
+
         ctx = context.copy()
         ctx.update({'model': context.get('model', None)})
         self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, ctx)
@@ -789,6 +990,15 @@ class Attendee(CalDAV, osv.osv_memory):
         return vals
 
     def export_cal(self, cr, uid, model, attendee_ids, vevent, context={}):
+        """ Export Calendar
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param model: Get model's name
+            @param attendee_ids: Get Attendee's Id
+            @param context: A standard dictionary for contextual values
+        """
+
         attendee_object = self.pool.get(model)
         ctx = context.copy()
         ctx.update({'model': model})
@@ -814,5 +1024,4 @@ class Attendee(CalDAV, osv.osv_memory):
 
 Attendee()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/caldav_cache.py b/addons/caldav/caldav_cache.py
index 7f03aa6da13..4e5768c3445 100644
--- a/addons/caldav/caldav_cache.py
+++ b/addons/caldav/caldav_cache.py
@@ -1,3 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 import time
 import heapq
 
@@ -10,8 +31,8 @@ def memoize(maxsize):
         def wrapper(*args):
             key = repr(args)
             # performance crap
-            _cache=cache
-            _heap=heap
+            _cache = cache
+            _heap = heap
             _heappop = heapq.heappop
             _heappush = heapq.heappush
             _time = time.time
@@ -20,13 +41,13 @@ def memoize(maxsize):
             if not _cache.has_key(key):
                 if _cursize == _maxsize:
                     # pop oldest element
-                    (_,oldkey) = _heappop(_heap)
+                    (_, oldkey) = _heappop(_heap)
                     _cache.pop(oldkey)
                 else:
                     _cursize += 1
                 # insert this element
                 _cache[key] = f(*args)
-                _heappush(_heap,(_time(),key))
+                _heappush(_heap, (_time(), key))
                 wrapper.misses += 1
             else:
                 wrapper.hits += 1
@@ -34,6 +55,8 @@ def memoize(maxsize):
         wrapper.__doc__ = f.__doc__
         wrapper.__name__ = f.__name__
         wrapper.hits = wrapper.misses = 0
-        return wrapper 
+        return wrapper
     return decorating_function
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/caldav_fs.py b/addons/caldav/caldav_fs.py
index 28424acedf8..a768b3d54ca 100644
--- a/addons/caldav/caldav_fs.py
+++ b/addons/caldav/caldav_fs.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -50,10 +50,10 @@ class tinydav_handler(dav_interface):
     """
     PROPS={'DAV:': dav_interface.PROPS['DAV:'], }
 
-    M_NS={ "DAV:" : dav_interface.M_NS['DAV:'], }
+    M_NS={ "DAV:": dav_interface.M_NS['DAV:'], }
 
     def __init__(self,  parent, verbose=False):
-        self.db_name = False        
+        self.db_name = False
         self.parent = parent
         self.baseuri = parent.baseuri
 
@@ -65,7 +65,7 @@ class tinydav_handler(dav_interface):
         if not dbname:
             cr.close()
             return props
-        node = self.uri2object(cr,uid,pool, uri2)
+        node = self.uri2object(cr, uid, pool, uri2)
         if node:
             props.update(node.get_dav_props(cr))
         cr.close()
@@ -79,18 +79,18 @@ class tinydav_handler(dav_interface):
             pname        -- name of the property
          """
         if self.M_NS.has_key(ns):
-           return dav_interface.get_prop(self,uri,ns,propname)
+           return dav_interface.get_prop(self, uri, ns, propname)
 
-        if uri[-1]=='/':uri=uri[:-1]
+        if uri[-1]=='/':uri = uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             cr.close()
             raise DAV_NotFound
-        node = self.uri2object(cr,uid,pool, uri2)
+        node = self.uri2object(cr, uid, pool, uri2)
         if not node:
             cr.close()
             raise DAV_NotFound
-        res = node.get_dav_eprop(cr,ns,propname)
+        res = node.get_dav_eprop(cr, ns, propname)
         cr.close()
         return res
 
@@ -98,21 +98,21 @@ class tinydav_handler(dav_interface):
         """ Return the base URI of this request, or even join it with the
             ajoin path elements
         """
-        return self.baseuri+ '/'.join(ajoin)        
+        return self.baseuri+ '/'.join(ajoin)
 
     def uri2local(self, uri):
-        uparts=urlparse.urlparse(uri)
-        reluri=uparts[2]
+        uparts = urlparse.urlparse(uri)
+        reluri = uparts[2]
         if reluri and reluri[-1]=="/":
-            reluri=reluri[:-1]
+            reluri = reluri[:-1]
         return reluri
 
     #
     # pos: -1 to get the parent of the uri
     #
-    def get_cr(self, uri):        
+    def get_cr(self, uri):
         pdb = self.parent.auth_proxy.last_auth
-        reluri = self.uri2local(uri)        
+        reluri = self.uri2local(uri)
         try:
             dbname = reluri.split('/')[2]
         except:
@@ -122,7 +122,7 @@ class tinydav_handler(dav_interface):
         if not pdb and dbname:
             # if dbname was in our uri, we should have authenticated
             # against that.
-            raise Exception("Programming error")        
+            raise Exception("Programming error")
         assert pdb == dbname, " %s != %s" %(pdb, dbname)
         user, passwd, dbn2, uid = self.parent.auth_proxy.auth_creds[pdb]
         db,pool = pooler.get_db_and_pool(dbname)
@@ -135,29 +135,29 @@ class tinydav_handler(dav_interface):
             return None
         return pool.get('basic.calendar').get_calendar_object(cr, uid, uri)
 
-    def get_data(self,uri):
+    def get_data(self, uri):
         self.parent.log_message('GET: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         try:
             if not dbname:
                 raise DAV_Error, 409
-            node = self.uri2object(cr,uid,pool, uri2)
+            node = self.uri2object(cr, uid, pool, uri2)
             if not node:
                 raise DAV_NotFound(uri2)
-            try:                
+            try:
                 datas = node.get_data(cr, uid)
-            except TypeError,e:
+            except TypeError, e:
                 import traceback
                 self.parent.log_error("GET typeError: %s", str(e))
-                self.parent.log_message("Exc: %s",traceback.format_exc())
+                self.parent.log_message("Exc: %s", traceback.format_exc())
                 raise DAV_Forbidden
-            except IndexError,e :
+            except IndexError, e :
                 self.parent.log_error("GET IndexError: %s", str(e))
                 raise DAV_NotFound(uri2)
-            except Exception,e:
+            except Exception, e:
                 import traceback
-                self.parent.log_error("GET exception: %s",str(e))
+                self.parent.log_error("GET exception: %s", str(e))
                 self.parent.log_message("Exc: %s", traceback.format_exc())
                 raise DAV_Error, 409
             return datas
@@ -165,7 +165,7 @@ class tinydav_handler(dav_interface):
             cr.close()
 
     @memoize(CACHE_SIZE)
-    def _get_dav_resourcetype(self,uri):
+    def _get_dav_resourcetype(self, uri):
         """ return type of object """
         self.parent.log_message('get RT: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
@@ -173,21 +173,21 @@ class tinydav_handler(dav_interface):
         try:
             if not dbname:
                 return COLLECTION
-            node = self.uri2object(cr,uid,pool, uri2)
+            node = self.uri2object(cr, uid, pool, uri2)
             if not node:
-                raise DAV_NotFound(uri2)            
+                raise DAV_NotFound(uri2)
             return OBJECT
         finally:
             cr.close()
 
-    def _get_dav_displayname(self,uri):
+    def _get_dav_displayname(self, uri):
         self.parent.log_message('get DN: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             cr.close()
             return COLLECTION
-        node = self.uri2object(cr,uid,pool, uri2)
+        node = self.uri2object(cr, uid, pool, uri2)
         if not node:
             cr.close()
             raise DAV_NotFound(uri2)
@@ -195,7 +195,7 @@ class tinydav_handler(dav_interface):
         return node.displayname
 
     @memoize(CACHE_SIZE)
-    def _get_dav_getcontentlength(self,uri):
+    def _get_dav_getcontentlength(self, uri):
         """ return the content length of an object """
         self.parent.log_message('get length: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
@@ -213,7 +213,7 @@ class tinydav_handler(dav_interface):
         return str(result)
 
     @memoize(CACHE_SIZE)
-    def _get_dav_getetag(self,uri):
+    def _get_dav_getetag(self, uri):
         """ return the ETag of an object """
         self.parent.log_message('get etag: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
@@ -231,7 +231,7 @@ class tinydav_handler(dav_interface):
         return str(result)
 
     @memoize(CACHE_SIZE)
-    def get_lastmodified(self,uri):
+    def get_lastmodified(self, uri):
         """ return the last modified date of the object """
         if uri[-1]=='/':uri=uri[:-1]
         today = time.time()
@@ -239,18 +239,18 @@ class tinydav_handler(dav_interface):
         try:
             if not dbname:
                 return today
-            node = self.uri2object(cr,uid,pool, uri2)
+            node = self.uri2object(cr, uid, pool, uri2)
             if not node:
                 raise DAV_NotFound(uri2)
             if node.write_date:
-                return time.mktime(time.strptime(node.write_date,'%Y-%m-%d %H:%M:%S'))
+                return time.mktime(time.strptime(node.write_date, '%Y-%m-%d %H:%M:%S'))
             else:
                 return today
         finally:
             cr.close()
 
     @memoize(CACHE_SIZE)
-    def get_creationdate(self,uri):
+    def get_creationdate(self, uri):
         """ return the last modified date of the object """
 
         if uri[-1]=='/':uri=uri[:-1]
@@ -258,11 +258,11 @@ class tinydav_handler(dav_interface):
         try:
             if not dbname:
                 raise DAV_Error, 409
-            node = self.uri2object(cr,uid,pool, uri2)
+            node = self.uri2object(cr, uid, pool, uri2)
             if not node:
                 raise DAV_NotFound(uri2)
             if node.create_date:
-                result = time.strptime(node.create_date,'%Y-%m-%d %H:%M:%S')
+                result = time.strptime(node.create_date, '%Y-%m-%d %H:%M:%S')
             else:
                 result = time.gmtime()
             return result
@@ -270,14 +270,14 @@ class tinydav_handler(dav_interface):
             cr.close()
 
     @memoize(CACHE_SIZE)
-    def _get_dav_getcontenttype(self,uri):
+    def _get_dav_getcontenttype(self, uri):
         self.parent.log_message('get contenttype: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         try:
             if not dbname:
                 return 'httpd/unix-directory'
-            node = self.uri2object(cr,uid,pool, uri2)
+            node = self.uri2object(cr, uid, pool, uri2)
             if not node:
                 raise DAV_NotFound(uri2)
             result = node.mimetype
@@ -286,50 +286,50 @@ class tinydav_handler(dav_interface):
         finally:
             cr.close()
 
-    
+
 
     def put(self, uri, data, content_type=None):
         """ put the object into the filesystem """
-        self.parent.log_message('Putting %s (%d), %s'%( misc.ustr(uri), len(data), content_type))
+        self.parent.log_message('Putting %s (%d), %s'%(misc.ustr(uri), len(data), content_type))
         parent='/'.join(uri.split('/')[:-1])
-        cr, uid, pool,dbname, uri2 = self.get_cr(uri)        
+        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             raise DAV_Forbidden
         try:
-            node = self.uri2object(cr,uid,pool, uri2[:])
+            node = self.uri2object(cr, uid, pool, uri2[:])
         except:
-            node = False        
+            node = False
 
         if not node:
             raise DAV_Forbidden
         else:
             try:
-                node.set_data(cr, uid, data)                
-            except Exception,e:
-                import traceback                
+                node.set_data(cr, uid, data)
+            except Exception, e:
+                import traceback
                 self.parent.log_error("Cannot save :%s", str(e))
-                self.parent.log_message("Exc: %s",traceback.format_exc())
+                self.parent.log_message("Exc: %s", traceback.format_exc())
                 raise DAV_Forbidden
-            
+
         cr.commit()
         cr.close()
         return 201
 
-    
-
-
-    def exists(self,uri):
+    def exists(self, uri):
         """ test if a resource exists """
         result = False
-        cr, uid, pool,dbname, uri2 = self.get_cr(uri)
+        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         if not dbname:
             cr.close()
             return True
         try:
-            node = self.uri2object(cr,uid,pool, uri2)
+            node = self.uri2object(cr, uid, pool, uri2)
             if node:
                 result = True
         except:
             pass
         cr.close()
-        return result   
+        return result
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 1f5a2352b5f..fd17b52f478 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,45 +26,47 @@ import tools
 import time
 import base64
 
-class node_calendar(object):    
+
+class node_calendar(object):
     def __init__(self, path, context, calendar):
         self.path = path
         self.context = context
-        self.calendar_id =  calendar.id  
-        self.mimetype = 'ics'        
+        self.calendar_id =  calendar.id
+        self.mimetype = 'ics'
         self.create_date = calendar.create_date
         self.write_date = calendar.write_date or calendar.create_date
         self.content_length = 0
         self.displayname = calendar.name
-        
-    
-    def get_data(self, cr, uid):        
+
+
+    def get_data(self, cr, uid):
         calendar_obj = pooler.get_pool(cr.dbname).get('basic.calendar')
-        return calendar_obj.export_cal(cr, uid, [self.calendar_id])               
-        
-    def get_data_len(self, cr):        
+        return calendar_obj.export_cal(cr, uid, [self.calendar_id])
+
+    def get_data_len(self, cr):
         return self.content_length
 
-    def set_data(self, cr, uid, data):        
-        calendar_obj = pooler.get_pool(cr.dbname).get('basic.calendar')        
+    def set_data(self, cr, uid, data):
+        calendar_obj = pooler.get_pool(cr.dbname).get('basic.calendar')
         return calendar_obj.import_cal(cr, uid, base64.encodestring(data), self.calendar_id)
 
-    def get_etag(self,cr):
+    def get_etag(self, cr):
         """ Get a tag, unique per object + modification.
-    
+
             see. http://tools.ietf.org/html/rfc2616#section-13.3.3 """
         return self._get_ttag(cr) + ':' + self._get_wtag(cr)
 
-    def _get_wtag(self,cr):
+    def _get_wtag(self, cr):
         """ Return the modification time as a unique, compact string """
         if self.write_date:
-            wtime = time.mktime(time.strptime(self.write_date,'%Y-%m-%d %H:%M:%S'))
+            wtime = time.mktime(time.strptime(self.write_date, '%Y-%m-%d %H:%M:%S'))
         else: wtime = time.time()
         return str(wtime)
 
-    def _get_ttag(self,cr):
+    def _get_ttag(self, cr):
         return 'calendar-%d' % self.calendar_id
 
+
 class Calendar(osv.osv):
     _inherit = 'basic.calendar'
 
@@ -79,5 +81,7 @@ class Calendar(osv.osv):
             return None
         calendar_id, calendar_name = res[0]
         calendar = self.browse(cr, uid, calendar_id)
-        return node_calendar(uri, context, calendar) 
+        return node_calendar(uri, context, calendar)
 Calendar()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4
\ No newline at end of file
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index a578ad560bd..f43328ecc3e 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -31,7 +31,7 @@
 							        <separator string="Value Mapping" colspan="4" />
 							        <field name="mapping" select="1" colspan="4" nolabel="1" />
 						        </form>
-					        </field>
+					       </field>
 				        </form>
                         <tree string="Attributes Mapping" editable="bottom">
 					        <field name="name" select="1" />
diff --git a/addons/caldav/webdav_server.py b/addons/caldav/webdav_server.py
index fe26d881963..40519ee19a2 100644
--- a/addons/caldav/webdav_server.py
+++ b/addons/caldav/webdav_server.py
@@ -1,9 +1,7 @@
 # -*- encoding: utf-8 -*-
-
 #
 # Copyright P. Christeas <p_christ@hol.gr> 2008,2009
 #
-#
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
 # consequences resulting from its eventual inadequacies and bugs
@@ -33,15 +31,16 @@ from tools.config import config
 from DAV.WebDAVServer import DAVRequestHandler
 from service.websrv_lib import HTTPDir,FixSendError
 
-class DAVHandler(FixSendError,DAVRequestHandler):
+
+class DAVHandler(FixSendError, DAVRequestHandler):
     verbose = False
-    
-    def get_userinfo(self,user,pw):        
+
+    def get_userinfo(self, user, pw):
         return False
 
     def _log(self, message):
-        netsvc.Logger().notifyChannel("webdav",netsvc.LOG_DEBUG,message)
-    
+        netsvc.Logger().notifyChannel("webdav", netsvc.LOG_DEBUG, message)
+
     def handle(self):
         pass
 
@@ -50,30 +49,30 @@ class DAVHandler(FixSendError,DAVRequestHandler):
 
     def setup(self):
         davpath = '/calendar/'
-        self.baseuri = "http://%s:%d%s"% (self.server.server_name,self.server.server_port,davpath)
+        self.baseuri = "http://%s:%d%s"% (self.server.server_name, self.server.server_port, davpath)
         self.IFACE_CLASS  = tinydav_handler(self)
         pass
 
     def log_message(self, format, *args):
-        netsvc.Logger().notifyChannel('webdav',netsvc.LOG_DEBUG_RPC,format % args)
+        netsvc.Logger().notifyChannel('webdav', netsvc.LOG_DEBUG_RPC, format % args)
 
     def log_error(self, format, *args):
-        netsvc.Logger().notifyChannel('webdav',netsvc.LOG_WARNING,format % args)
+        netsvc.Logger().notifyChannel('webdav', netsvc.LOG_WARNING, format % args)
 
 
 try:
-    from service.http_server import reg_http_service,OpenERPAuthProvider
+    from service.http_server import reg_http_service, OpenERPAuthProvider
     davpath = '/calendar/'
     handler = DAVHandler
-    handler.verbose = config.get_misc('webdav','verbose',True)
-    handler.debug = config.get_misc('webdav','debug',True)
-    reg_http_service(HTTPDir(davpath,DAVHandler,OpenERPAuthProvider()))
-    netsvc.Logger().notifyChannel('webdav',netsvc.LOG_INFO,"WebDAV service registered at path: %s/ "% davpath)
+    handler.verbose = config.get_misc('webdav', 'verbose', True)
+    handler.debug = config.get_misc('webdav', 'debug', True)
+    reg_http_service(HTTPDir(davpath, DAVHandler, OpenERPAuthProvider()))
+    netsvc.Logger().notifyChannel('webdav', netsvc.LOG_INFO, "WebDAV service registered at path: %s/ "% davpath)
 except Exception, e:
     logger = netsvc.Logger()
     logger.notifyChannel('webdav', netsvc.LOG_ERROR, 'Cannot launch webdav: %s' % e)
 
-#eof
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4
 
 
 
diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
index 3bee5a5089f..042d3bc75b6 100644
--- a/addons/caldav/wizard/calendar_event_export.py
+++ b/addons/caldav/wizard/calendar_event_export.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -41,7 +41,7 @@ class calendar_event_export(osv.osv_memory):
         calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
         #TODO: check why returns wrong value
         return base64.encodestring(calendar)
-                            
+
     def _process_export_ics_name(self, cr, uid, context):
         """
         Get Default value for Name field.
@@ -50,19 +50,20 @@ class calendar_event_export(osv.osv_memory):
         model_obj = self.pool.get(model)
         calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
         return  'OpenERP %s.ics' % (model_obj._description)
-    
+
     _name = "calendar.event.export"
     _description = "Event Export"
+
     _columns = {
               'file_path':fields.binary('Save ICS file', filters='*.ics', required=True),
               'name':fields.char('File name', size=34, required=True, help='Save in .ics format')
                }
-    
-    _defaults={
-               'name':_process_export_ics_name,
-               'file_path':_process_export_ics
+
+    _defaults = {
+               'name': _process_export_ics_name,
+               'file_path': _process_export_ics
                }
-    
+
 calendar_event_export()
 
 
diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py
index 1a8a0a771f0..64a1990f00d 100644
--- a/addons/caldav/wizard/calendar_event_import.py
+++ b/addons/caldav/wizard/calendar_event_import.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -42,6 +42,7 @@ class calendar_event_import(osv.osv_memory):
         @param ids: List of calendar event import’s IDs
         @return: dictionary of calendar evet import  window with Import successful msg.
         """
+
         for data in self.read(cr, uid, ids):
             model = data.get('model', 'basic.calendar')
             model_obj = self.pool.get(model)
@@ -63,17 +64,19 @@ class calendar_event_import(osv.osv_memory):
                 'target': 'new'
             }
             return value
-    
+
     _name = "calendar.event.import"
     _description = "Event Import"
+
     _columns = {
                   'file_path': fields.binary('Select ICS file', filters='*.ics', required=True),
                   'msg': fields.text('', readonly=True),
                }
-    _defaults={
+
+    _defaults = {
                'msg':lambda *a:'Import Sucessful'
                }
-    
+
 calendar_event_import()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_subscribe.py b/addons/caldav/wizard/calendar_event_subscribe.py
index 3893e2a1c09..de673b5d7c0 100644
--- a/addons/caldav/wizard/calendar_event_subscribe.py
+++ b/addons/caldav/wizard/calendar_event_subscribe.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -63,7 +63,7 @@ class calendar_event_subscribe(osv.osv_memory):
             id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_subscribe_display')
             if id2:
                  id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-          
+
             value = {
                 'view_type': 'form',
                 'view_mode': 'form',
@@ -73,17 +73,19 @@ class calendar_event_subscribe(osv.osv_memory):
                 'target': 'new'
             }
             return value
-    
+
     _name = "calendar.event.subscribe"
     _description = "Event subscribe"
+
     _columns = {
                 'url_path': fields.char('Provide path for remote calendar', size=124, required=True),
                 'msg': fields.text('', readonly=True),
+
                }
-    _defaults={
+    _defaults = {
                'msg':lambda *a:'Import Sucessful.'
                }
-    
+
 calendar_event_subscribe()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_caldav.py b/addons/crm_caldav/crm_caldav.py
index ee947aaf82f..a3a1054a1ee 100644
--- a/addons/crm_caldav/crm_caldav.py
+++ b/addons/crm_caldav/crm_caldav.py
@@ -24,10 +24,18 @@ from crm import crm
 from caldav import caldav
 from base_calendar import base_calendar
 
-class crm_meeting(osv.osv):   
+class crm_meeting(osv.osv):
     _inherit = 'crm.meeting'
 
     def export_cal(self, cr, uid, ids, context={}):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of CRM Meeting’s IDs
+            @param context: A standard dictionary for contextual values
+        """
+
         ids = map(lambda x: base_calendar.base_calendar_id2real_id(x), ids)
         event_data = self.read(cr, uid, ids)
         event_obj = self.pool.get('basic.calendar.event')
@@ -35,6 +43,15 @@ class crm_meeting(osv.osv):
         return ical.serialize()
 
     def import_cal(self, cr, uid, data, data_id=None, context={}):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param data: Get Data of CRM Meetings
+            @param data_id: calendar's Id
+            @param context: A standard dictionary for contextual values
+        """
+
         event_obj = self.pool.get('basic.calendar.event')
         vals = event_obj.import_cal(cr, uid, data, context=context)
         return self.check_import(cr, uid, vals, context=context)

From 59a46cb75dfe0908f0152b69b7c893976abebaf9 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 25 Mar 2010 17:48:35 +0530
Subject: [PATCH 128/248] [IMP]: crm: Improvement in lead to opportunity wizard
 for partner id

bzr revid: rpa@tinyerp.com-20100325121835-5ocfd3p3p5gbeelg
---
 addons/crm/crm_lead.py                        |  42 +--
 addons/crm/wizard/crm_lead_to_opportunity.py  | 248 ++++++++++++------
 .../wizard/crm_lead_to_opportunity_view.xml   |  23 +-
 3 files changed, 190 insertions(+), 123 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index ad60586e1b8..0119b5ce1ac 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -140,23 +140,35 @@ class crm_lead(osv.osv):
             context.update({'active_id': case.id})
             if not case.partner_id:
                 data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_partner')
-                view_id = False
+                view_id1 = False
                 if data_id:
-                    view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+                    view_id1 = data_obj.browse(cr, uid, data_id, context=context).res_id
+                value = {
+                        'name': _('Create Partner'), 
+                        'view_type': 'form', 
+                        'view_mode': 'form,tree', 
+                        'res_model': 'crm.lead2opportunity.partner', 
+                        'view_id': False, 
+                        'context': context,  
+                        'views': [(view_id1, 'form')], 
+                        'type': 'ir.actions.act_window', 
+                        'target': 'new', 
+                        'nodestroy': True
+                        }
                 break
-            
-        value = {            
-            'name': _('Create Opportunity'), 
-            'view_type': 'form', 
-            'view_mode': 'form,tree', 
-            'res_model': 'crm.lead2opportunity', 
-            'view_id': False, 
-            'context': context,  
-            'views': [(view_id, 'form')], 
-            'type': 'ir.actions.act_window', 
-            'target': 'new', 
-            'nodestroy': True
-        }
+            else:
+                value = {
+                        'name': _('Create Opportunity'), 
+                        'view_type': 'form', 
+                        'view_mode': 'form,tree', 
+                        'res_model': 'crm.lead2opportunity', 
+                        'view_id': False, 
+                        'context': context,  
+                        'views': [(view_id, 'form')], 
+                        'type': 'ir.actions.act_window', 
+                        'target': 'new', 
+                        'nodestroy': True
+                        }
         return value
 
 crm_lead()
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index f5d3376b992..6d96016b8ae 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -27,7 +27,6 @@ from tools.translate import _
 class crm_lead2opportunity(osv.osv_memory):
     _name = 'crm.lead2opportunity'
     _description = 'Lead To Opportunity'
-    _inherit = 'crm.lead2partner'
     
     def action_cancel(self, cr, uid, ids, context=None):
         """
@@ -41,26 +40,6 @@ class crm_lead2opportunity(osv.osv_memory):
         """
         return {'type': 'ir.actions.act_window_close'}
     
-    def make_partner(self, cr, uid, ids, context=None):
-        """
-        This function Makes partner based on action.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Lead to Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Partner form.
-        """
-        if not context:
-            context = {}
-
-        partner_ids = self._create_partner(cr, uid, ids, context)
-        mod_obj = self.pool.get('ir.model.data')
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-        return self.action_skip(cr, uid, ids, context)
-
     def action_apply(self, cr, uid, ids, context=None):
         """
         This converts lead to opportunity and opens Opportunity view
@@ -92,28 +71,28 @@ class crm_lead2opportunity(osv.osv_memory):
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
             lead = lead_obj.browse(cr, uid, record_id, context=context)
-            model_ids = model_obj.search(cr, uid, [('model','=','crm.opportunity')])
+            model_ids = model_obj.search(cr, uid, [('model', '=', 'crm.opportunity')])
 
 
             for this in self.browse(cr, uid, ids, context=context):
                 new_opportunity_id = opp_obj.create(cr, uid, {
-                        'name': this.name,
-                        'planned_revenue': this.planned_revenue,
-                        'probability': this.probability,
-                        'partner_id': lead.partner_id and lead.partner_id.id or False ,
-                        'section_id': lead.section_id and lead.section_id.id or False,
-                        'description': lead.description or False,
-                        'date_deadline': lead.date_deadline or False,
+                        'name': this.name, 
+                        'planned_revenue': this.planned_revenue, 
+                        'probability': this.probability, 
+                        'partner_id': lead.partner_id and lead.partner_id.id or False , 
+                        'section_id': lead.section_id and lead.section_id.id or False, 
+                        'description': lead.description or False, 
+                        'date_deadline': lead.date_deadline or False, 
                         'partner_address_id': lead.partner_address_id and \
-                                        lead.partner_address_id.id or False ,
-                        'priority': lead.priority,
-                        'phone': lead.phone,
+                                        lead.partner_address_id.id or False , 
+                        'priority': lead.priority, 
+                        'phone': lead.phone, 
                         'email_from': lead.email_from
                     })
 
                 new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
                 vals = {
-                        'partner_id': this.partner_id and this.partner_id.id or False,
+                        'partner_id': this.partner_id and this.partner_id.id or False, 
                         }
                 if not lead.opportunity_id:
                         vals.update({'opportunity_id' : new_opportunity.id})
@@ -130,27 +109,156 @@ class crm_lead2opportunity(osv.osv_memory):
                 opp_obj.case_open(cr, uid, [new_opportunity_id])
 
             value = {
-                    'name': _('Opportunity'),
-                    'view_type': 'form',
-                    'view_mode': 'form,tree',
-                    'res_model': 'crm.opportunity',
-                    'res_id': int(new_opportunity_id),
-                    'view_id': False,
-                    'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
-                    'type': 'ir.actions.act_window',
+                    'name': _('Opportunity'), 
+                    'view_type': 'form', 
+                    'view_mode': 'form,tree', 
+                    'res_model': 'crm.opportunity', 
+                    'res_id': int(new_opportunity_id), 
+                    'view_id': False, 
+                    'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')], 
+                    'type': 'ir.actions.act_window', 
                     'search_view_id': res['res_id']
                     }
         return value
 
     _columns = {
-        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
-        'probability': fields.float('Success Probability'),
-        'planned_revenue': fields.float('Expected Revenue'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action'),
-        
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1), 
+        'probability': fields.float('Success Probability'), 
+        'planned_revenue': fields.float('Expected Revenue'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
     }
     
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        lead_obj = self.pool.get('crm.lead')
+
+        for lead in lead_obj.browse(cr, uid, context.get('active_ids', [])):
+            if lead.state in ['done', 'cancel']:
+                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
+Leads Could not convert into Opportunity"))
+            if lead.state != 'open':
+                raise osv.except_osv(_('Warning !'), _('Lead should be in \
+\'Open\' state before converting to Opportunity.'))
+        return False
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        lead_obj = self.pool.get('crm.lead')
+        rec_ids = context and context.get('active_ids', [])
+        partner_id = context.get('partner_id', False)
+        data = context and context.get('active_ids', []) or []
+        res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
+        for lead in lead_obj.browse(cr, uid, data, context=context):
+            if 'name' in fields:
+                res.update({'name': lead.partner_name})
+            if 'partner_id' in fields:
+                res.update({'partner_id': partner_id and partner_id[0] or False})
+        return res
+
+crm_lead2opportunity()
+
+
+class crm_lead2opportunity_partner(osv.osv_memory):
+    _name = 'crm.lead2opportunity.partner'
+    _description = 'Lead To Opportunity Partner'
+    _inherit = 'crm.lead2partner'
+
+    _columns = {
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'action': fields.selection([('exist', 'Link to an existing partner'), ('create', 'Create a new partner')], 'Action'), 
+    }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        lead_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('active_ids', [])
+        partner_id = False
+
+        data = context and context.get('active_ids', []) or []
+        res = super(crm_lead2opportunity_partner, self).default_get(cr, uid, fields, context=context)
+
+        for lead in lead_obj.browse(cr, uid, data, context=context):
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
+            if not partner_ids and lead.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+            partner_id = partner_ids and partner_ids[0] or False
+
+            if 'partner_id' in fields:
+                res.update({'partner_id': partner_id})
+            if 'action' in fields:
+                res.update({'action': partner_id and 'exist' or 'create'})
+        return res
+    
+    def make_partner(self, cr, uid, ids, context=None):
+        """
+        This function Makes partner based on action.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Lead to Partner's IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Partner form.
+        """
+        if not context:
+            context = {}
+        
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        value = {}
+        data_obj = self.pool.get('ir.model.data')
+        data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_create')
+        view_id = False
+        if data_id:
+            view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
+        
+        context.update({'partner_id': partner_ids})
+        value = {            
+            'name': _('Create Opportunity'), 
+            'view_type': 'form', 
+            'view_mode': 'form,tree', 
+            'res_model': 'crm.lead2opportunity', 
+            'view_id': False, 
+            'context': context, 
+            'views': [(view_id, 'form')], 
+            'type': 'ir.actions.act_window', 
+            'target': 'new', 
+        }
+        return value
+
     def action_skip(self, cr, uid, ids, context=None):
         """
         This skips partner creation
@@ -168,19 +276,21 @@ class crm_lead2opportunity(osv.osv_memory):
         view_id = False
         if data_id:
             view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
-            
+        
+        context.update({'partner_id': False})
         value = {            
             'name': _('Create Opportunity'), 
             'view_type': 'form', 
             'view_mode': 'form,tree', 
             'res_model': 'crm.lead2opportunity', 
             'view_id': False, 
-            'context': context,  
+            'context': context, 
             'views': [(view_id, 'form')], 
             'type': 'ir.actions.act_window', 
             'target': 'new', 
         }
         return value
+    
 
     def view_init(self, cr, uid, fields, context=None):
         """
@@ -201,45 +311,9 @@ Leads Could not convert into Opportunity"))
             if lead.state != 'open':
                 raise osv.except_osv(_('Warning !'), _('Lead should be in \
 \'Open\' state before converting to Opportunity.'))
-        return True
+        return False
 
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
+crm_lead2opportunity_partner()
 
-        @return : default values of fields.
-        """
-        lead_obj = self.pool.get('crm.lead')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        rec_ids = context and context.get('active_ids', [])
-        partner_id = False
-
-        data = context and context.get('active_ids', []) or []
-        res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
-
-        for lead in lead_obj.browse(cr, uid, data, context=context):
-            partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name or lead.name)])
-            if not partner_ids and lead.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', lead.email_from)])
-                if address_ids:
-                    addresses = contact_obj.browse(cr, uid, address_ids)
-                    partner_ids = addresses and [addresses[0].partner_id.id] or False
-            partner_id = partner_ids and partner_ids[0] or False
-
-            if 'name' in fields:
-                res.update({'name': lead.partner_name})
-            if 'partner_id' in fields:
-                res.update({'partner_id': partner_id})
-            if 'action' in fields:
-                res.update({'action': partner_id and 'exist' or 'create'})
-        return res
-
-crm_lead2opportunity()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 7634354087e..eefd438c368 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,25 +1,6 @@
 <openerp>
   	<data>
 
-		<!-- Lead to Opportunity confirmation view -->
-
-        <record model="ir.ui.view" id="lead_to_opportunity_pre_view">
-            <field name="name">crm.opportunity2meeting.form</field>
-            <field name="model">crm.opportunity2meeting</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Convert To Meeting">
-                	<label string="Are you sure to schedule a meeting for this Opportunity?" colspan="4"/>
-                	<newline/>
-                	<separator colspan="4" string=""/>
-                	<button name="action_cancel" string="_Cancel"
-                		icon="gtk-cancel" special="cancel" />
-                	<button name="action_makeMeeting" type="object"
-                		string="_Schedule" icon="gtk-go-forward" />
-                </form>
-            </field>
-        </record>
-        
 		<!-- Lead to Opportunity view -->
 
   		<record id="view_crm_lead2opportunity_create" model="ir.ui.view">
@@ -54,8 +35,8 @@
 
 
         <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
-	      <field name="name">crm.lead2opportunity.partner</field>
-	      <field name="model">crm.lead2opportunity</field>
+	      <field name="name">crm.lead2opportunity.partner.form</field>
+	      <field name="model">crm.lead2opportunity.partner</field>
 	      <field name="type">form</field>
 	      <field name="arch" type="xml">
 	      	 <form string="Create a Partner">

From ddbd753d896f49b02eb902914c9192a3104e2dc0 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 25 Mar 2010 18:35:11 +0530
Subject: [PATCH 129/248] [FIX]: base_calendar crm: fixed minor problem in
 base_calendar and base calendar invite attendee wizard , added onchange
 partner_id in crm phonecall

bzr revid: atp@tinyerp.co.in-20100325130511-9vmg5yd4jofetwcm
---
 addons/base_calendar/base_calendar.py                    | 9 +++++----
 .../wizard/base_calendar_invite_attendee.py              | 5 +++--
 addons/crm/crm_phonecall_view.xml                        | 6 ++++--
 addons/crm/wizard/crm_phonecall_to_phonecall.py          | 2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 27434f2cc9e..c9104f00ae6 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -287,7 +287,7 @@ class calendar_attendee(osv.osv):
 
     def _links_get(self, cr, uid, context={}):
         """
-        Get request link and put in ref field.
+        Get request link for ref field in calendar attendee.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
@@ -415,7 +415,7 @@ request was delegated to"),
 
     def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context={}):
         """
-        send mail.
+        Send mail for calendar attendee.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of calendar attendee’s IDs.
@@ -566,7 +566,7 @@ are both optional, but if one occurs, so MUST the other"""),
 
     def do_alarm_create(self, cr, uid, ids, model, date, context={}):
         """
-        Create Alarm
+        Create Alarm for meeting.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of res alarm’s IDs.
@@ -959,7 +959,7 @@ class calendar_event(osv.osv):
             if defaults.get('location'):
                 qry += ", location = '%(location)s'"
             qry += "WHERE id = %s" % (event_id)
-            cr.execute(qry % (defaults))
+            cr.execute(qry %(defaults))
             #End Loop
         return True
 
@@ -1063,6 +1063,7 @@ class calendar_event(osv.osv):
             return ''
 
         if freq == 'weekly':
+            
             byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
             if byday:
                 weekstring = ';BYDAY=' + ','.join(byday)
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index f04be4fba43..0e91447eebf 100755
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -21,8 +21,10 @@
 
 from base_calendar import base_calendar
 from osv import fields, osv
+from tools.translate import _
 import tools
 
+
 class base_calendar_invite_attendee(osv.osv_memory):
     """
     Invite attendee.
@@ -139,8 +141,7 @@ class base_calendar_invite_attendee(osv.osv_memory):
                 if not mail_to:
                     name =  map(lambda x: x[1], filter(lambda x: type==x[0], \
                                        self._columns['type'].selection))
-                    raise osv.except_osv(_('Error!'), ("%s must have an email \
-    Address to send mail") % (name[0]))
+                    raise osv.except_osv(_('Error!'), ("%s must have an email  Address to send mail") %(name[0]))
                 att_obj._send_mail(cr, uid, attendees, mail_to, \
                        email_from= tools.config.get('email_from', False))
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index c75799c6ec5..7e1e51349a9 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -95,14 +95,16 @@
                 </group>
                 <group col="3" colspan="2">
                     <separator colspan="3" string="Contacts" />
-                    <field name="partner_id" />
+                    <field name="partner_id"
+                    	on_change="onchange_partner_id(partner_id, email_from)" />
                     <button string="Create a Partner"
                         icon="terp-crm"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
                     <newline/>
-                    <field name="partner_address_id" string="Contact" />
+                    <field name="partner_address_id" string="Contact"
+                    	on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                     <newline/>
                     <field name="partner_mobile" />
                 </group>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index fd62b3a21ca..9eb243603e9 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -84,7 +84,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
                         'date': this.date
                           }
                 phonecall_id = phonecall_obj.create(cr, uid, values, context=context)
-            print phonecall_id
+            
             res = {
                 'name': _('Phone Call'),
                 'view_type': 'form',

From 8b353184d4d6139cf269af55a17c7ee81929e49e Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 25 Mar 2010 19:13:25 +0530
Subject: [PATCH 130/248] [IMP]: base_action_rule: Apply Doc String + quality
 check

bzr revid: ksa@tinyerp.co.in-20100325134325-xc427hcsrutqlgqz
---
 addons/base_action_rule/base_action_rule.py   | 190 +++++++++++++-----
 .../base_action_rule_view.xml                 |  21 +-
 2 files changed, 154 insertions(+), 57 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 020d2740d4d..f4129998bcc 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -29,61 +29,86 @@ from osv.orm import except_orm
 from tools.translate import _
 
 class base_action_rule(osv.osv):
+    """ Base Action Rules """
+
     _name = 'base.action.rule'
-    _description = 'Action Rules'  
-    
-    
+    _description = 'Action Rules'
+
     _columns = {
         'name': fields.many2one('ir.model', 'Model', required=True),
-        'max_level': fields.integer('Max Level', help='Specifies maximum level.'),        
+        'max_level': fields.integer('Max Level', help='Specifies maximum level.'),
         'rule_lines': fields.one2many('base.action.rule.line','rule_id','Rule Lines'),
         'create_date': fields.datetime('Create Date', readonly=1),
         'active': fields.boolean('Active')
     }
-    
+
     _defaults = {
         'active': lambda *a: True,
         'max_level': lambda *a: 15,
     }
 
     def format_body(self, body):
+        """ Foramat Action rule's body
+            @param self: The object pointer """
+
         return body and tools.ustr(body) or ''
 
     def format_mail(self, obj, body):
+        """ Foramat Mail
+            @param self: The object pointer """
+
         data = {
             'object_id': obj.id,
             'object_subject': hasattr(obj, 'name') and obj.name or False,
             'object_date': hasattr(obj, 'date') and obj.date or False,
             'object_description': hasattr(obj, 'description') and obj.description or False,
             'object_user': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.name) or '/',
-            'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.address_id and obj.user_id.address_id.email) or '/',
-            'object_user_phone': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.address_id and obj.user_id.address_id.phone) or '/',        
+            'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and \
+                                    obj.user_id.address_id and obj.user_id.address_id.email) or '/',
+            'object_user_phone': hasattr(obj, 'user_id') and (obj.user_id and\
+                                     obj.user_id.address_id and obj.user_id.address_id.phone) or '/',
             'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/',
-            'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and obj.partner_address_id.email) or '/',
+            'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and\
+                                         obj.partner_address_id.email) or '/',
         }
         return self.format_body(body % data)
 
     def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from',False), context={}):
+        """ send email
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param email: pass the emails
+            @param emailfrom: Pass name the email From else False
+            @param context: A standard dictionary for contextual values """
+
         body = self.format_mail(obj, body)
         if not emailfrom:
-            if hasattr(obj, 'user_id')  and obj.user_id and obj.user_id.address_id and obj.user_id.address_id.email:
+            if hasattr(obj, 'user_id')  and obj.user_id and obj.user_id.address_id and\
+                        obj.user_id.address_id.email:
                 emailfrom = obj.user_id.address_id.email
-            
+
         name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
         emailfrom = tools.ustr(emailfrom)
-        reply_to = emailfrom        
+        reply_to = emailfrom
         if not emailfrom:
             raise osv.except_osv(_('Error!'),
                     _("No E-Mail ID Found for your Company address!"))
         return tools.email_send(emailfrom, emails, name, body, reply_to=reply_to, openobject_id=str(obj.id))
 
-    
+
     def do_check(self, cr, uid, action, obj, context={}):
-        ok = True          
-        if hasattr(obj, 'user_id'):          
+        """ check Action
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
+        ok = True
+        if hasattr(obj, 'user_id'):
             ok = ok and (not action.trg_user_id.id or action.trg_user_id.id==obj.user_id.id)
         if hasattr(obj, 'partner_id'):
-            ok = ok and (not action.trg_partner_id.id or action.trg_partner_id.id==obj.partner_id.id)                    
+            ok = ok and (not action.trg_partner_id.id or action.trg_partner_id.id==obj.partner_id.id)
             ok = ok and (
                 not action.trg_partner_categ_id.id or
                 (
@@ -113,14 +138,22 @@ class base_action_rule(osv.osv):
         return ok
 
     def do_action(self, cr, uid, action, model_obj, obj, context={}):
+        """ Do Action
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param action: pass action
+            @param model_obj: pass Model object
+            @param context: A standard dictionary for contextual values """
+
         if action.server_action_id:
             context.update({'active_id':obj.id,'active_ids':[obj.id]})
             self.pool.get('ir.actions.server').run(cr, uid, [action.server_action_id.id], context)
-        write = {}                        
+        write = {}
         if hasattr(obj, 'user_id') and action.act_user_id:
             obj.user_id = action.act_user_id
             write['user_id'] = action.act_user_id.id
-        if hasattr(obj, 'date_action_last'):                        
+        if hasattr(obj, 'date_action_last'):
             write['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S')
         if hasattr(obj, 'state') and action.act_state:
             obj.state = action.act_state
@@ -135,7 +168,7 @@ class base_action_rule(osv.osv):
             write['priority'] = action.act_priority
 
         model_obj.write(cr, uid, [obj.id], write, context)
-        
+
         if hasattr(model_obj, 'remind_user') and action.act_remind_user:
             model_obj.remind_user(cr, uid, [obj.id], context, attach=action.act_remind_attach)
         if hasattr(model_obj, 'remind_partner') and action.act_remind_partner:
@@ -146,7 +179,7 @@ class base_action_rule(osv.osv):
         if hasattr(obj, 'user_id') and action.act_mail_to_user:
             if obj.user_id and obj.user_id.address_id:
                 emails.append(obj.user_id.address_id.email)
-        
+
         if action.act_mail_to_watchers:
             emails += (action.act_email_cc or '').split(',')
         if action.act_mail_to_email:
@@ -158,11 +191,19 @@ class base_action_rule(osv.osv):
         return True
 
     def _action(self, cr, uid, ids, objects, scrit=None, context={}):
+        """ Do Action
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Basic Action Rule’s IDs,
+            @param objects: pass objects
+            @param context: A standard dictionary for contextual values """
+
         if not scrit:
             scrit = []
         rule_line_obj = self.pool.get('base.action.rule.line')
-        for rule in self.browse(cr, uid, ids):    
-            level = rule.max_level            
+        for rule in self.browse(cr, uid, ids):
+            level = rule.max_level
             if not level:
                 break
             newactions = []
@@ -184,7 +225,8 @@ class base_action_rule(osv.osv):
                             base = mx.DateTime.strptime(obj.date_action_last, '%Y-%m-%d %H:%M:%S')
                         else:
                             base = mx.DateTime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S')
-                    elif hasattr(obj, 'date_deadline') and action.trg_date_type=='deadline' and obj.date_deadline:
+                    elif hasattr(obj, 'date_deadline') and action.trg_date_type=='deadline' \
+                                    and obj.date_deadline:
                         base = mx.DateTime.strptime(obj.date_deadline, '%Y-%m-%d %H:%M:%S')
                     elif hasattr(obj, 'date') and action.trg_date_type=='date' and obj.date:
                         base = mx.DateTime.strptime(obj.date, '%Y-%m-%d %H:%M:%S')
@@ -212,7 +254,7 @@ class base_action_rule(osv.osv):
 
                     if ok:
                         self.do_action(cr, uid, action, model_obj, obj, context)
-                        break            
+                        break
             level -= 1
         return True
 base_action_rule()
@@ -222,20 +264,46 @@ class base_action_rule_line(osv.osv):
     _description = 'Action Rule Lines'
 
     def _state_get(self, cr, uid, context={}):
+        """ Get State
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         return self.state_get(cr, uid, context=context)
     def _priority_get(self, cr, uid, context={}):
+        """ Get Priority
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         return self.priority_get(cr, uid, context=context)
 
     def state_get(self, cr, uid, context={}):
+        """ Get State
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         return [('','')]
     def priority_get(self, cr, uid, context={}):
+        """ Get Priority
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param context: A standard dictionary for contextual values """
+
         return [('','')]
 
     _columns = {
         'name': fields.char('Rule Name',size=64, required=True),
         'rule_id': fields.many2one('base.action.rule','Rule'),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the rule without removing it."),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of rules."),
+        'active': fields.boolean('Active', help="If the active field is set to true,\
+                     it will allow you to hide the rule without removing it."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when\
+                     displaying a list of rules."),
 
         'trg_date_type':  fields.selection([
             ('none','None'),
@@ -243,11 +311,13 @@ class base_action_rule_line(osv.osv):
             ('action_last','Last Action Date'),
             ('date','Date'),
             ], 'Trigger Date', size=16),
-        'trg_date_range': fields.integer('Delay after trigger date',help="Delay After Trigger Date, specifies you can put a negative number " \
-                                                             "if you need a delay before the trigger date, like sending a reminder 15 minutes before a meeting."),
-        'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),('day','Days'),('month','Months')], 'Delay type'),
+        'trg_date_range': fields.integer('Delay after trigger date',help="Delay After Trigger Date,\
+                             specifies you can put a negative number " \
+                             "if you need a delay before the trigger date, like sending a reminder 15 minutes before a meeting."),
+        'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),\
+                                ('day','Days'),('month','Months')], 'Delay type'),
+
 
-        
         'trg_user_id':  fields.many2one('res.users', 'Responsible'),
 
         'trg_partner_id': fields.many2one('res.partner', 'Partner'),
@@ -255,42 +325,59 @@ class base_action_rule_line(osv.osv):
         'trg_state_from': fields.selection(_state_get, 'State', size=16),
         'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16),
         'trg_priority_from': fields.selection(_priority_get, 'Minimum Priority'),
-        'trg_priority_to': fields.selection(_priority_get, 'Maximum Priority'),       
-        
-        'act_method': fields.char('Call Object Method', size=64),        
-        'act_user_id': fields.many2one('res.users', 'Set responsible to'),  
+        'trg_priority_to': fields.selection(_priority_get, 'Maximum Priority'),
+
+        'act_method': fields.char('Call Object Method', size=64),
+        'act_user_id': fields.many2one('res.users', 'Set responsible to'),
         'act_state': fields.selection(_state_get, 'Set state to', size=16),
-        'act_priority': fields.selection(_priority_get, 'Set priority to'),      
-        'act_email_cc': fields.char('Add watchers (Cc)', size=250, help="These people will receive a copy of the future communication between partner and users by email"),
+        'act_priority': fields.selection(_priority_get, 'Set priority to'),
+        'act_email_cc': fields.char('Add watchers (Cc)', size=250, help="These people\
+                         will receive a copy of the future communication between partner and users by email"),
 
-        'act_remind_partner': fields.boolean('Remind Partner', help="Check this if you want the rule to send a reminder by email to the partner."),
-        'act_remind_user': fields.boolean('Remind responsible', help="Check this if you want the rule to send a reminder by email to the user."),
+        'act_remind_partner': fields.boolean('Remind Partner', help="Check this if\
+                         you want the rule to send a reminder by email to the partner."),
+        'act_remind_user': fields.boolean('Remind responsible', help="Check this if \
+                        you want the rule to send a reminder by email to the user."),
         'act_reply_to': fields.char('Reply-To', size=64),
-        'act_remind_attach': fields.boolean('Remind with attachment', help="Check this if you want that all documents attached to the object be attached to the reminder email sent."),
+        'act_remind_attach': fields.boolean('Remind with attachment', help="Check this if\
+                         you want that all documents attached to the object be attached \
+                        to the reminder email sent."),
 
-        'act_mail_to_user': fields.boolean('Mail to responsible',help="Check this if you want the rule to send an email to the responsible person."),        
-        'act_mail_to_watchers': fields.boolean('Mail to watchers (CC)',help="Check this if you want the rule to mark CC(mail to any other person defined in actions)."),
-        'act_mail_to_email': fields.char('Mail to these emails', size=128,help="Email-id of the persons whom mail is to be sent"),
+        'act_mail_to_user': fields.boolean('Mail to responsible',help="Check this if \
+                            you want the rule to send an email to the responsible person."),
+        'act_mail_to_watchers': fields.boolean('Mail to watchers (CC)',help="Check this\
+                                 if you want the rule to mark CC(mail to any other person\
+                                  defined in actions)."),
+        'act_mail_to_email': fields.char('Mail to these emails', size=128,help="Email-id \
+                                of the persons whom mail is to be sent"),
         'act_mail_body': fields.text('Mail body',help="Content of mail"),
         'regex_name': fields.char('Regular Expression on Model Name', size=128),
-        'server_action_id': fields.many2one('ir.actions.server','Server Action',help="Describes the action name." \
-                                                    "eg:on which object which action to be taken on basis of which condition"),
+        'server_action_id': fields.many2one('ir.actions.server','Server Action',help="Describes the\
+                                 action name." \
+                                "eg:on which object which action to be taken on basis of which condition"),
     }
-    
+
     _defaults = {
         'active': lambda *a: 1,
         'trg_date_type': lambda *a: 'none',
         'trg_date_range_type': lambda *a: 'day',
         'act_mail_to_user': lambda *a: 0,
         'act_remind_partner': lambda *a: 0,
-        'act_remind_user': lambda *a: 0,        
+        'act_remind_user': lambda *a: 0,
         'act_mail_to_watchers': lambda *a: 0,
     }
-    
-    _order = 'sequence'   
-    
-    
+
+    _order = 'sequence'
+
+
     def _check_mail(self, cr, uid, ids, context=None):
+        """ Check Mail
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Action Rule’s IDs
+            @param context: A standard dictionary for contextual values """
+
         empty = orm.browse_null()
         rule_obj = self.pool.get('base.action.rule')
         for rule in self.browse(cr, uid, ids):
@@ -300,10 +387,11 @@ class base_action_rule_line(osv.osv):
                 except (ValueError, KeyError, TypeError):
                     return False
         return True
-    
+
     _constraints = [
         (_check_mail, 'Error: The mail is not well formated', ['act_mail_body']),
     ]
-    
+
 base_action_rule_line()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 9892886c675..06837e2c2da 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<menuitem id="menu_base_action_rule" name="Action Rule" parent="base.menu_base_config" sequence="0"/>
+    	<menuitem id="menu_base_action_rule" name="Action Rule"
+    		parent="base.menu_base_config" sequence="0" />
 
-		<!--
-			Action Rule
+    	<!--
+			Action Rule Form View
 		-->
    		<record id="view_base_action_rule_form" model="ir.ui.view">
    			<field name="name">base.action.rule.form</field>
@@ -21,6 +22,8 @@
             </field>
    		</record>
 
+<!-- Action Rule Tree View -->
+
    		<record id="view_base_action_rule_tree" model="ir.ui.view">
    			<field name="name">base.action.rule.tree</field>
             <field name="model">base.action.rule</field>
@@ -34,6 +37,8 @@
             </field>
    		</record>
 
+<!-- Action Rule Action -->
+
    		<record id="base_action_rule_act" model="ir.actions.act_window">
             <field name="name">Action Rules</field>
             <field name="res_model">base.action.rule</field>
@@ -42,10 +47,11 @@
             <field name="view_id" ref="view_base_action_rule_tree"/>
         </record>
 
-        <menuitem id="menu_base_action_rule_form" parent="menu_base_action_rule" action="base_action_rule_act"/>
+   		<menuitem id="menu_base_action_rule_form"
+   			parent="menu_base_action_rule" action="base_action_rule_act" />
 
-        <!--
-        	Action Rule Lines
+   		<!--
+        	Action Rule Lines Form View
         -->
         <record id="view_base_action_rule_line_form" model="ir.ui.view">
             <field name="name">base.action.rule.line.form</field>
@@ -127,6 +133,9 @@
                 </form>
             </field>
         </record>
+
+<!-- Action Rule Lines Tree View -->
+
         <record id="view_base_action_rule_line_tree" model="ir.ui.view">
             <field name="name">base.action.rule.line.tree</field>
             <field name="model">base.action.rule.line</field>

From 40b917c419c22c40fb049936f5eaae8f7a0497ac Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Fri, 26 Mar 2010 14:44:34 +0530
Subject: [PATCH 131/248] [IMP] survey :- improve view.

bzr revid: ysa@tinyerp.co.in-20100326091434-na6i7l65703mrzhe
---
 addons/survey/survey_view.xml | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2032ed8ffe4..29a1952c151 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -495,10 +495,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Question">
-                    <field name="question" colspan="4" select="1"/>
-                    <field name="page_id" select="1"/>
+                    <field name="question" colspan="4"/>
+                    <field name="page_id"/>
                     <field name="sequence"/>
-                    <field name="tot_resp" select="2"/>
+                    <field name="tot_resp"/>
                     <field name="type" on_change="on_change_type(type)"/>
                     <field name="in_visible_rating_weight" invisible="1"/>
                     <field name="in_visible_menu_choice" invisible="1"/>
@@ -635,20 +635,35 @@
             <field name="arch" type="xml">
                 <tree string="Survey Question">
 					<field name="sequence" string="Seq"/>
-                    <field name="question" colspan="4" select="1"/>
-                    <field name="page_id" select="1"/>
-                    <field name="survey" select="1"/>
-                    <field name="type" select="2" />
+                    <field name="question"/>
+                    <field name="page_id"/>
+                    <field name="survey"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
 
+       <record id="survey_question_search" model="ir.ui.view">
+            <field name="name">survey_question_search</field>
+            <field name="model">survey.question</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Question">
+                    <field name="question"/>
+                    <field name="page_id"/>
+                    <field name="survey" widget="selection"/>
+                    <field name="type"/>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.actions.act_window" id="action_survey_question_form">
             <field name="name">Survey Questions</field>
             <field name="res_model">survey.question</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="survey_question_tree"></field>
+             <field name="search_view_id" ref="survey_question_search"/>
         </record>
 
         <!--menuitem name="Survey Question" id="menu_survey_question_form1"
@@ -661,9 +676,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Question">
-                    <field name="question" colspan="4" select="1"/>
+                    <field name="question" colspan="4"/>
                     <field name="sequence"/>
-                    <field name="tot_resp" select="2"/>
+                    <field name="tot_resp"/>
                     <field name="type" on_change="on_change_type(type)"/>
                     <field name="in_visible_rating_weight" invisible="1"/>
                     <field name="in_visible_menu_choice" invisible="1"/>

From a522cd9d635502121b3e4c6118fda6fcfcf104d4 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Fri, 26 Mar 2010 17:39:08 +0530
Subject: [PATCH 132/248] [IMP]: crm: open crm Meeting form in edit all button
 using function in place of calendar edit all wizard.

bzr revid: atp@tinyerp.co.in-20100326120908-47h3pyawkp2bp5fx
---
 addons/crm/crm_meeting.py       | 42 +++++++++++++++++++++++++++++++++
 addons/crm/crm_meeting_view.xml |  6 ++---
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 9e3297704b1..d76a31136ae 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -23,6 +23,8 @@ from osv import fields, osv
 import crm
 from datetime import datetime, timedelta
 from datetime import datetime, timedelta
+from tools.translate import _
+from base_calendar import base_calendar
 
 class crm_opportunity(osv.osv):
     _name = 'crm.opportunity'
@@ -65,6 +67,46 @@ class crm_meeting(osv.osv):
     _defaults = {
         'state': lambda *a: 'draft',
     }
+    
+    def open_meeting(self, cr, uid, ids, context=None):
+        """
+        Open Crm Meeting Form for Crm Meeting.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of crm meeting’s IDs
+        @param context: A standard dictionary for contextual values
+        @return: Dictionary value which open Crm Meeting form.
+        """
+        if not context:
+            context = {}
+            
+        data_obj = self.pool.get('ir.model.data')
+        
+        value = {}
+        
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+        id4 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        if id4:
+            id4 = data_obj.browse(cr, uid, id4, context=context).res_id
+        for id in ids:
+            value = {
+                    'name': _('Meeting'), 
+                    'view_type': 'form', 
+                    'view_mode': 'form,tree', 
+                    'res_model': 'crm.meeting', 
+                    'view_id': False, 
+                    'views': [(id2, 'form'), (id3, 'tree'), (id4, 'calendar')],
+                    'type': 'ir.actions.act_window', 
+                    'res_id': base_calendar.base_calendar_id2real_id(id), 
+                    'nodestroy': True
+                    }
+        
+        return value
 
 crm_meeting()
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 7f30024235b..5fb6653eb6a 100755
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -46,11 +46,9 @@
                            <button string="Edit All"
                            	help="Edit all Ourrences of recurrent Meeting"
                            	attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                           	name="%(base_calendar.action_calendar_event_edit_all)d"
-                           	icon="gtk-edit" type="action"
-                           	context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
+                           	name="open_meeting" icon="gtk-edit"
+                           	type="object" />
                     </group>
-
                 </group>
                 <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
                     <separator string="Select data for Custom Rule" colspan="8"/>

From b018800e409a33b2e9b8e4a31b1b953003abf96f Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Fri, 26 Mar 2010 18:42:15 +0530
Subject: [PATCH 133/248] [REVIEW]: code review

bzr revid: mga@mga-20100326131215-ybcfyjshzb9zb2s5
---
 addons/auction/auction.py                  |  1 +
 addons/point_of_sale/wizard/pos_payment.py | 63 +++++++++++-----------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 1687980c029..854c917ee68 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -95,6 +95,7 @@ class auction_dates(osv.osv):
         RETURN: True
         """
         # objects vendus mais non factures
+        #TODO: convert this query to tiny API
         cr.execute('select count(*) as c from auction_lots where auction_id =ANY(%s) and state=%s and obj_price>0', (ids,'draft',))
         nbr = cr.fetchone()[0]
         ach_uids = {}
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 585e5426d67..f875c093984 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -45,15 +45,15 @@ class pos_make_payment(osv.osv_memory):
         res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id',False)  
         j_obj = self.pool.get('account.journal')
-        c = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
-        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', c)])
+        company_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
+        journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
+        
         if journal:
             journal = journal[0]
         else:
             journal = None
         wf_service = netsvc.LocalService("workflow")
 
-    
         order = self.pool.get('pos.order').browse(cr, uid, record_id, context)
         #get amount to pay
         amount = order.amount_total - order.amount_paid
@@ -79,6 +79,7 @@ class pos_make_payment(osv.osv_memory):
         if 'payment_name'  in fields: 
             res.update({'payment_name':'Payment'})    
         return res
+        
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
         record_id = context and context.get('active_id', False) or False        
@@ -101,20 +102,18 @@ class pos_make_payment(osv.osv_memory):
         """
         record_id = context and context.get('record_id', False) or False        
         res = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        print "::::::::record_idrecord_id:::::::",context
         if record_id:
             order = self.pool.get('pos.order').browse(cr, uid, record_id)
             amount = order.amount_total - order.amount_paid
             if amount==0.0:
                 res['arch'] = """ <form string="Make Payment" colspan="4">
-                                <group col="2" colspan="2">
-                                    <label string="Do you want to print the Receipt?" colspan="4"/>
-                                    <separator colspan="4"/>
-                                    <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
-                                    <button name="print_report" string="Print Receipt" type="object" icon="gtk-ok"/>
-                                </group>
-                            </form>                             
-                        """
+                    <group col="2" colspan="2">
+                        <label string="Do you want to print the Receipt?" colspan="4"/>
+                        <separator colspan="4"/>
+                        <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
+                        <button name="print_report" string="Print Receipt" type="object" icon="gtk-ok"/>
+                    </group>
+                </form>"""
         return res
 
     def check(self, cr, uid, ids, context=None):
@@ -129,7 +128,7 @@ class pos_make_payment(osv.osv_memory):
         order = order_obj.browse(cr, uid, record_id, context)
         amount = order.amount_total - order.amount_paid
         data =  self.read(cr, uid, ids)[0]
-        print "::::::::",data
+
         # Todo need to check ...
         if amount !=0.0:
             invoice_wanted = data['invoice_wanted']
@@ -166,21 +165,21 @@ class pos_make_payment(osv.osv_memory):
         if not context:
             context={}
         """ 
-             @summary: To get the date and print the report           
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             @return : retrun report
+         @summary: To get the date and print the report           
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return : retrun report
         """        
         datas = {'ids' : context.get('active_ids',[])}
         res =  {}        
         datas['form'] = res
         return { 
-                'type' : 'ir.actions.report.xml',
-                'report_name':'pos.receipt',
-                'datas' : datas,               
-       }        
+            'type' : 'ir.actions.report.xml',
+            'report_name':'pos.receipt',
+            'datas' : datas,               
+        }        
     
     def trigger_wkf(self, cr, uid, data, context):
         record_id = context and context.get('active_id',False)              
@@ -189,15 +188,15 @@ class pos_make_payment(osv.osv_memory):
         return {}
         
     _columns = {
-                'journal':fields.selection(pos_box_entries.get_journal, "Journal",required=True),
-                'product_id': fields.many2one('product.product', "Acompte"),
-                'amount':fields.float('Amount', digits=(16,2) ,required= True),
-                'payment_name': fields.char('Payment name', size=32, required=True),
-                'payment_date': fields.date('Payment date', required=True),
-                'is_acc': fields.boolean('Accompte'),
-                'invoice_wanted': fields.boolean('Invoice'),
-                'num_sale':fields.char('Num.File', size=32),
-    }  
+        'journal':fields.selection(pos_box_entries.get_journal, "Journal",required=True),
+        'product_id': fields.many2one('product.product', "Acompte"),
+        'amount':fields.float('Amount', digits=(16,2) ,required= True),
+        'payment_name': fields.char('Payment name', size=32, required=True),
+        'payment_date': fields.date('Payment date', required=True),
+        'is_acc': fields.boolean('Accompte'),
+        'invoice_wanted': fields.boolean('Invoice'),
+        'num_sale':fields.char('Num.File', size=32),
+    }
     
 pos_make_payment()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 834ed9b185f467b1364bea7db1ee3aa727ad0342 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 26 Mar 2010 18:57:16 +0530
Subject: [PATCH 134/248] [IMP] Apply doc string + quality check in
 base_contact,board,crm_profiling, document_ics,survey

bzr revid: ksa@tinyerp.co.in-20100326132716-tc37ehpvzegozo1o
---
 addons/base_contact/base_contact.py           | 172 ++++++---
 addons/base_contact/base_contact_view.xml     |  71 ++--
 addons/board/board.py                         |  45 ++-
 addons/board/board_view.xml                   |  31 +-
 addons/board/wizard/board_menu_create.py      |   6 +-
 addons/crm_profiling/crm_profiling.py         | 100 ++++-
 addons/crm_profiling/crm_profiling_view.xml   |  81 ++--
 addons/document_ics/document_ics.py           | 117 ++++--
 .../document_ics_config_wizard.py             |  45 ++-
 addons/document_ics/document_view.xml         |  18 +-
 addons/survey/survey.py                       | 360 ++++++++++--------
 addons/survey/wizard/survey_answer.py         | 166 ++++----
 addons/survey/wizard/survey_print.py          |  23 +-
 addons/survey/wizard/survey_print_answer.py   |  36 +-
 .../survey/wizard/survey_print_statistics.py  |  19 +-
 addons/survey/wizard/survey_selection.py      |  46 +--
 .../survey/wizard/survey_send_invitation.py   |  76 ++--
 17 files changed, 829 insertions(+), 583 deletions(-)

diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 2c55567a0d6..d4fc8b2b007 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,16 +23,19 @@ import netsvc
 from osv import fields, osv
 
 class res_partner_contact(osv.osv):
+    """ Partner Contact """
+
     _name = "res.partner.contact"
     _description = "res.partner.contact"
-#    def init(self, cr):
-#        address_obj = self.pool.get('res.partner.address')
-#        job_obj = self.pool.get('res.partner.job')
-#        address_ids = address_obj.search(cr, 1, [])
-#        for address in address_obj.browse(cr, 1, address_ids):
-#            contact_id = self.create(cr, 1, {'name': address.name or 't'})
 
     def _title_get(self,cr, user, context={}):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user,
+            @param context: A standard dictionary for contextual values
+        """
+
         obj = self.pool.get('res.partner.title')
         ids = obj.search(cr, user, [])
         res = obj.read(cr, user, ids, ['shortcut', 'name','domain'], context)
@@ -40,6 +43,16 @@ class res_partner_contact(osv.osv):
         return res
 
     def _main_job(self, cr, uid, ids, fields, arg, context=None):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of partner contact’s IDs
+            @fields: Get Fields
+            @param context: A standard dictionary for contextual values
+            @param arg: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...]. """
+
+
         res = dict.fromkeys(ids, False)
         for contact in self.browse(cr, uid, ids, context):
             if contact.job_ids:
@@ -49,30 +62,43 @@ class res_partner_contact(osv.osv):
     _columns = {
         'name': fields.char('Last Name', size=30,required=True),
         'first_name': fields.char('First Name', size=30),
-        'mobile':fields.char('Mobile',size=30),
+        'mobile': fields.char('Mobile',size=30),
         'title': fields.selection(_title_get, 'Title'),
-        'website':fields.char('Website',size=120),
-        'lang_id':fields.many2one('res.lang','Language'),
-        'job_ids':fields.one2many('res.partner.job','contact_id','Functions and Addresses'),
-        'country_id':fields.many2one('res.country','Nationality'),
-        'birthdate':fields.date('Birth Date'),
-        'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the partner contact without removing it."),
-        'partner_id':fields.related('job_ids','address_id','partner_id',type='many2one', relation='res.partner', string='Main Employer'),
-        'function_id':fields.related('job_ids','function_id',type='many2one', relation='res.partner.function', string='Main Function'),
-        'job_id': fields.function(_main_job, method=True, type='many2one', relation='res.partner.job', string='Main Job'),
+        'website': fields.char('Website',size=120),
+        'lang_id': fields.many2one('res.lang','Language'),
+        'job_ids': fields.one2many('res.partner.job','contact_id','Functions and Addresses'),
+        'country_id': fields.many2one('res.country','Nationality'),
+        'birthdate': fields.date('Birth Date'),
+        'active': fields.boolean('Active', help="If the active field is set to true,\
+                 it will allow you to hide the partner contact without removing it."),
+        'partner_id': fields.related('job_ids','address_id','partner_id',type='many2one',\
+                         relation='res.partner', string='Main Employer'),
+        'function_id': fields.related('job_ids','function_id',type='many2one', \
+                            relation='res.partner.function', string='Main Function'),
+        'job_id': fields.function(_main_job, method=True, type='many2one',\
+                                 relation='res.partner.job', string='Main Job'),
         'email': fields.char('E-Mail', size=240),
-        'comment' : fields.text('Notes', translate=True),
-        'photo' : fields.binary('Image'),
-        
+        'comment': fields.text('Notes', translate=True),
+        'photo': fields.binary('Image'),
+
     }
     _defaults = {
         'active' : lambda *a: True,
     }
-    
+
     _order = "name,first_name"
-        
+
     def name_get(self, cr, user, ids, context={}):
-        #will return name and first_name.......
+
+        """ will return name and first_name.......
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user’s ID for security checks,
+            @param ids: List of create menu’s IDs
+            @return: name and first_name
+            @param context: A standard dictionary for contextual values
+        """
+
         if not len(ids):
             return []
         res = []
@@ -84,60 +110,93 @@ class res_partner_contact(osv.osv):
             addr += (r.get('first_name', '') or '')
             res.append((r['id'], addr))
         return res
+
 res_partner_contact()
 
+
 class res_partner_address(osv.osv):
 
     def search(self, cr, user, args, offset=0, limit=None, order=None,
             context=None, count=False):
+        """ search parnter address
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user
+            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+            @param offset: The Number of Results to Pass
+            @param limit: The Number of Results to Return
+            @param context: A standard dictionary for contextual values
+        """
+
         if context and context.has_key('address_partner_id' ) and context['address_partner_id']:
             args.append(('partner_id', '=', context['address_partner_id']))
         return super(res_partner_address, self).search(cr, user, args, offset, limit, order, context, count)
 
     #overriding of the name_get defined in base in order to remove the old contact name
     def name_get(self, cr, user, ids, context={}):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user,
+            @param ids: List of partner address’s IDs
+            @param context: A standard dictionary for contextual values
+        """
+
         if not len(ids):
             return []
         res = []
-        for r in self.read(cr, user, ids, ['zip','city','partner_id', 'street']):
+        for r in self.read(cr, user, ids, ['zip', 'city', 'partner_id', 'street']):
             if context.get('contact_display', 'contact')=='partner' and r['partner_id']:
                 res.append((r['id'], r['partner_id'][1]))
             else:
                 addr = str('')
-                addr += "%s %s %s" % ( r.get('street', '') or '', r.get('zip', '') or '', r.get('city', '') or '' )
+                addr += "%s %s %s" % (r.get('street', '') or '', r.get('zip', '') \
+                                    or '', r.get('city', '') or '')
                 res.append((r['id'], addr.strip() or '/'))
         return res
 
     _name = 'res.partner.address'
-    _inherit='res.partner.address'
+    _inherit = 'res.partner.address'
     _description ='Partner Address'
+
     _columns = {
-        'job_id':fields.related('job_ids','contact_id','job_id',type='many2one', relation='res.partner.job', string='Main Job'),
-        'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
+        'job_id': fields.related('job_ids','contact_id','job_id',type='many2one',\
+                         relation='res.partner.job', string='Main Job'),
+        'job_ids': fields.one2many('res.partner.job', 'address_id', 'Contacts'),
     }
 res_partner_address()
 
 class res_partner_job(osv.osv):
-#    def init(self, cr):
-#        address_obj = self.pool.get('res.partner.address')
-#        contact_obj = self.pool.get('res.partner.contact')
-#        address_ids = address_obj.search(cr, 1, [])
-#        for address in address_obj.browse(cr, 1, address_ids):
-#            contact_id = contact_obj.search(cr, 1, [('name','=', address.name)])
-#            if contact_id:
-#                contact_id = contact_id[0]
-#                self.create(cr, 1, {'address_id': address.id, 'contact_id': contact_id})
 
     def name_get(self, cr, uid, ids, context={}):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user,
+            @param ids: List of partner address’s IDs
+            @param context: A standard dictionary for contextual values
+        """
+
         if not len(ids):
             return []
         res = []
         for r in self.browse(cr, uid, ids):
             funct = r.function_id and (", " + r.function_id.name) or ""
-            res.append((r.id, self.pool.get('res.partner.contact').name_get(cr, uid, [r.contact_id.id])[0][1] + funct))
+            res.append((r.id, self.pool.get('res.partner.contact').name_get(cr, uid, \
+                                    [r.contact_id.id])[0][1] + funct))
         return res
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        """ search parnter job
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param user: the current user
+            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+            @param offset: The Number of Results to Pass
+            @param limit: The Number of Results to Return
+            @param context: A standard dictionary for contextual values
+        """
+
         job_ids = []
         for arg in args:
             if arg[0] == 'address_id':
@@ -147,12 +206,14 @@ class res_partner_job(osv.osv):
 
                 contact_obj = self.pool.get('res.partner.contact')
                 search_arg = ['|', ('first_name', 'ilike', arg[2]), ('name', 'ilike', arg[2])]
-                contact_ids = contact_obj.search(cr, user, search_arg, offset=offset, limit=limit, order=order, context=context, count=count)
+                contact_ids = contact_obj.search(cr, user, search_arg, offset=offset, \
+                                    limit=limit, order=order, context=context, count=count)
                 contacts = contact_obj.browse(cr, user, contact_ids, context=context)
                 for contact in contacts:
                     job_ids.extend([item.id for item in contact.job_ids])
 
-        res = super(res_partner_job,self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
+        res = super(res_partner_job,self).search(cr, user, args, offset=offset,\
+                    limit=limit, order=order, context=context, count=count)
         if job_ids:
             res = list(set(res + job_ids))
 
@@ -161,27 +222,36 @@ class res_partner_job(osv.osv):
     _name = 'res.partner.job'
     _description ='Contact Partner Function'
     _order = 'sequence_contact'
+
     _columns = {
-        'name': fields.related('address_id','partner_id', type='many2one', relation='res.partner', string='Partner', help="You may enter Address first,Partner will be linked automatically if any."),
-        'address_id':fields.many2one('res.partner.address','Address', help='Address which is linked to the Partner'),
-        'contact_id':fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
-        'function_id': fields.many2one('res.partner.function','Partner Function', help="Function of this contact with this partner"),
-        'sequence_contact':fields.integer('Contact Seq.',help='Order of importance of this address in the list of addresses of the linked contact'),
-        'sequence_partner':fields.integer('Partner Seq.',help='Order of importance of this job title in the list of job title of the linked partner'),
+        'name': fields.related('address_id','partner_id', type='many2one',\
+                     relation='res.partner', string='Partner', help="You may\
+                     enter Address first,Partner will be linked automatically if any."),
+        'address_id': fields.many2one('res.partner.address','Address', \
+                        help='Address which is linked to the Partner'),
+        'contact_id': fields.many2one('res.partner.contact','Contact', required=True, ondelete='cascade'),
+        'function_id': fields.many2one('res.partner.function','Partner Function', \
+                            help="Function of this contact with this partner"),
+        'sequence_contact': fields.integer('Contact Seq.',help='Order of\
+                     importance of this address in the list of addresses of the linked contact'),
+        'sequence_partner': fields.integer('Partner Seq.',help='Order of importance\
+                 of this job title in the list of job title of the linked partner'),
         'email': fields.char('E-Mail', size=240, help="Job E-Mail"),
         'phone': fields.char('Phone', size=64, help="Job Phone no."),
         'fax': fields.char('Fax', size=64, help="Job FAX no."),
         'extension': fields.char('Extension', size=64, help='Internal/External extension phone number'),
         'other': fields.char('Other', size=64, help='Additional phone field'),
-        'date_start' : fields.date('Date Start',help="Start date of job(Joining Date)"),
-        'date_stop' : fields.date('Date Stop', help="Last date of job"),
-        'state' : fields.selection([('past', 'Past'),('current', 'Current')], 'State', required=True, help="Status of Address"),
+        'date_start': fields.date('Date Start',help="Start date of job(Joining Date)"),
+        'date_stop': fields.date('Date Stop', help="Last date of job"),
+        'state': fields.selection([('past', 'Past'),('current', 'Current')], \
+                                'State', required=True, help="Status of Address"),
     }
 
     _defaults = {
         'sequence_contact' : lambda *a: 0,
-        'state' : lambda *a: 'current',
+        'state': lambda *a: 'current',
     }
+
 res_partner_job()
 
 
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 74c31c4203f..dbadbbaf6f3 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -2,7 +2,8 @@
 <openerp>
 <data>
 
-    <!-- Views for Contacts -->
+    <!-- Views for Contacts Tree View -->
+
     <record model="ir.ui.view" id="view_partner_contact_tree">
         <field name="name">res.partner.contact.tree</field>
         <field name="model">res.partner.contact</field>
@@ -20,6 +21,8 @@
         </field>
     </record>
 
+<!-- Views for Contacts Form View -->
+
     <record model="ir.ui.view" id="view_partner_contact_form">
         <field name="name">res.partner.contact.form</field>
         <field name="model">res.partner.contact</field>
@@ -93,6 +96,8 @@
         </field>
     </record>
 
+<!-- Views for Contacts Search View -->
+
     <record model="ir.ui.view" id="view_partner_contact_search">
         <field name="name">res.partner.contact.search</field>
         <field name="model">res.partner.contact</field>
@@ -106,6 +111,8 @@
         </field>
     </record>
 
+<!-- Views for Contacts Action -->
+
     <record model="ir.actions.act_window" id="action_partner_contact_form">
         <field name="name">Contacts</field>
         <field name="res_model">res.partner.contact</field>
@@ -116,7 +123,7 @@
     </record>
     <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
 
-    <!-- Views for Partners -->
+    <!-- Views for Partners Form View -->
 
     <record model="ir.ui.view" id="view_partner_form_inherit">
         <field name="name">Partner form inherited</field>
@@ -186,6 +193,7 @@
 
 
 <!-- don't display the categories, since it is displayed in an other tab-->
+
         <record model="ir.ui.view" id="view_partner_form_inherit2">
             <field name="name">res.partner.form</field>
             <field name="type">form</field>
@@ -198,6 +206,7 @@
         </record>
 
 <!-- don't display the categories label-->
+
         <record model="ir.ui.view" id="view_partner_form_inherit2bis">
             <field name="name">res.partner.form</field>
             <field name="type">form</field>
@@ -225,6 +234,7 @@
 
 
     <!-- Views for Addresses -->
+
     <record model="ir.ui.view" id="view_partner_address_tree_inherited1">
         <field name="name">Partner addresses inherited</field>
         <field name="model">res.partner.address</field>
@@ -306,39 +316,6 @@
         </field>
     </record>
 
-
-    <!--
-    <record id='view_partner_address_form_inherited5' model='ir.ui.view'>
-        <field name='name'>res.partner.address.form.inherited5</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <group string="Communication" colspan="2" col="2" position="after">
-            <newline/>
-                <field name="job_ids" mode="tree,form" colspan="4">
-                    <tree string="Contacts" editable="top">
-                        <field name="contact_id"/>
-                        <field name="function_id"/>
-                        <field name="phone"/>
-                        <field name="fax"/>
-                        <field name="extension"/>
-                        <field name="email"/>
-                    </tree>
-                    <form string="Contacts">
-                        <field name="contact_id"/>
-                        <field name="function_id"/>
-                        <field name="phone"/>
-                        <field name="fax"/>
-                        <field name="extension"/>
-                        <field name="email" widget="email"/>
-                    </form>
-                </field>
-            </group>
-        </field>
-    </record>
-    -->
-
     <record id="view_res_partner_address_filter" model="ir.ui.view">
         <field name="name">res.partner.address.select</field>
         <field name="model">res.partner.address</field>
@@ -351,8 +328,8 @@
         </field>
     </record>
 
+    <!-- Views for partner job Tree view  -->
 
-    <!-- Views for res.partner.job -->
     <record model="ir.ui.view" id="view_partner_job_tree">
         <field name="name">res.partner.job.tree</field>
         <field name="model">res.partner.job</field>
@@ -372,6 +349,8 @@
         </field>
     </record>
 
+<!-- Views for partner job Form view  -->
+
     <record model="ir.ui.view" id="view_partner_job_form">
         <field name="name">res.partner.job.form</field>
         <field name="model">res.partner.job</field>
@@ -400,19 +379,14 @@
     </record>
 
     <!-- Menuitem for res.partner.job -->
+
     <record model="ir.actions.act_window" id="action_res_partner_job">
         <field name="name">Contact's Jobs</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">res.partner.job</field>
         <field name="view_type">form</field>
     </record>
-<!--    <menuitem-->
-<!--        name="Partners/Contact's Jobs"-->
-<!--        action="action_res_partner_job"-->
-<!--        id="menu_action_res_partner_job"-->
-<!--        groups="base.group_extended"/>-->
 
-    <!-- Act window defining a shorcut on partners to open all his contacts -->
     <act_window domain="[('name', '=', active_id)]"
         id="act_res_partner_jobs" name="Partner Contacts"
         res_model="res.partner.job"
@@ -420,6 +394,7 @@
         />
 
 	<!-- Act window defining a shorcut on partner address to open all his jobs -->
+
     <act_window
         id="act_res_partner_jobs" name="Open Jobs"
         domain="[('address_id', '=', active_id)]"
@@ -427,9 +402,13 @@
         src_model="res.partner.address"
         />
 
-    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management" sequence="7"/>
-    <menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
-            parent="base.menu_purchase_root" sequence="3"/>
-    <menuitem name="Contacts" id="menu_partner_contact_supplier_form" action="action_partner_contact_form" parent = "base.menu_procurement_management_supplier" sequence="2"/>
+    <menuitem icon="terp-purchase" id="base.menu_purchase_root"
+    	name="Procurement Management" sequence="7" />
+    <menuitem id="base.menu_procurement_management_supplier"
+    	name="Suppliers" parent="base.menu_purchase_root" sequence="3" />
+    <menuitem name="Contacts" id="menu_partner_contact_supplier_form"
+    	action="action_partner_contact_form"
+    	parent="base.menu_procurement_management_supplier" sequence="2" />
+
 </data>
 </openerp>
diff --git a/addons/board/board.py b/addons/board/board.py
index 4fcdad8c517..32c5772566f 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -28,7 +28,7 @@ class board_board(osv.osv):
     """
     _name = 'board.board'
     _description = "Board"
-    
+
     def create_view(self, cr, uid, ids, context=None):
         """
         Create  view
@@ -66,17 +66,17 @@ class board_board(osv.osv):
                 </child2>
             </hpaned>
             </form>""" % ('\n'.join(left), '\n'.join(right))
-        
+
         return arch
 
     def write(self, cr, uid, ids, vals, context = {}):
-        
+
         """
         Writes values in one or several fields.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Board's IDs
-        @param vals: dictionary with values to update. 
+        @param vals: dictionary with values to update.
                      dictionary must be with the form: {‘name_of_the_field’: value, ...}.
         @return: True
         """
@@ -99,10 +99,10 @@ class board_board(osv.osv):
                       dictionary must use this form: {‘name_of_the_field’: value, ...}
         @return: id of new created record of board.board.
         """
-        
+
         if not context:
             context = {}
-            
+
         if not 'name' in vals:
             return False
         id = super(board_board, self).create(cr, user, vals, context)
@@ -115,21 +115,25 @@ class board_board(osv.osv):
         })
 
         super(board_board, self).write(cr, user, [id], {'view_id': view_id}, context)
-        
+
         return id
 
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None,\
+                         toolbar=False, submenu=False):
         """
         Overrides orm field_view_get.
         @return: Dictionary of Fields, arch and toolbar.
         """
+
         if not context:
             context = {}
-            
-        res = {}
-        res = super(board_board, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
 
-        vids = self.pool.get('ir.ui.view.custom').search(cr, user, [('user_id', '=', user), ('ref_id' ,'=', view_id)])
+        res = {}
+        res = super(board_board, self).fields_view_get(cr, user, view_id, view_type,\
+                                 context, toolbar=toolbar, submenu=submenu)
+
+        vids = self.pool.get('ir.ui.view.custom').search(cr, user,\
+                     [('user_id', '=', user), ('ref_id' ,'=', view_id)])
         if vids:
             view_id = vids[0]
             arch = self.pool.get('ir.ui.view.custom').browse(cr, user, view_id)
@@ -139,14 +143,14 @@ class board_board(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Dashboard', size=64, required=True), 
-        'view_id': fields.many2one('ir.ui.view', 'Board View'), 
+        'name': fields.char('Dashboard', size=64, required=True),
+        'view_id': fields.many2one('ir.ui.view', 'Board View'),
         'line_ids': fields.one2many('board.board.line', 'board_id', 'Action Views')
     }
 
     # the following lines added to let the button on dashboard work.
     _defaults = {
-        'name':  lambda *args:  'Dashboard'
+        'name':lambda *args:  'Dashboard'
     }
 
 board_board()
@@ -161,7 +165,8 @@ class board_line(osv.osv):
     _order = 'position,sequence'
     _columns = {
         'name': fields.char('Title', size=64, required=True),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of board lines."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order\
+                         when displaying a list of board lines."),
         'height': fields.integer('Height'),
         'width': fields.integer('Width'),
         'board_id': fields.many2one('board.board', 'Dashboard', required=True, ondelete='cascade'),
@@ -172,6 +177,7 @@ class board_line(osv.osv):
     _defaults = {
         'position': lambda *args: 'left'
     }
+
 board_line()
 
 
@@ -181,9 +187,11 @@ class board_note_type(osv.osv):
     """
     _name = 'board.note.type'
     _description = "NOte Type"
+
     _columns = {
         'name': fields.char('Note Type', size=64, required=True),
     }
+
 board_note_type()
 
 def _type_get(self, cr, uid, context={}):
@@ -211,9 +219,10 @@ class board_note(osv.osv):
         'type': fields.selection(_type_get, 'Note type', size=64),
     }
     _defaults = {
-        'user_id': lambda object, cr, uid, context: uid, 
-        'date': lambda object, cr, uid, context: time.strftime('%Y-%m-%d'), 
+        'user_id': lambda object, cr, uid, context: uid,
+        'date': lambda object, cr, uid, context: time.strftime('%Y-%m-%d'),
     }
+
 board_note()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 6bfafa9cee7..5c07de36472 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -3,7 +3,8 @@
     <data>
         <menuitem icon="terp-graph" id="base.reporting_menu"
         	name="Reporting" sequence="8" />
-        <!--		<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>-->
+
+ <!--Board Note Tree View  -->
 
         <record id="view_board_note_tree" model="ir.ui.view">
             <field name="name">board.note.tree</field>
@@ -15,9 +16,9 @@
                 </tree>
             </field>
         </record>
-        
-        <!--Board Note form  -->
-        
+
+<!--Board Note Form View  -->
+
         <record id="view_board_note_form" model="ir.ui.view">
             <field name="name">board.note.form</field>
             <field name="model">board.note</field>
@@ -32,9 +33,9 @@
                 </form>
             </field>
         </record>
-   
-<!-- Action for Publish note Form -->        
-   
+
+<!-- Action for Publish note Form -->
+
         <record id="action_view_board_note_form" model="ir.actions.act_window">
             <field name="name">Publish a note</field>
             <field name="res_model">board.note</field>
@@ -42,7 +43,7 @@
             <field name="view_mode">form,tree</field>
         </record>
 
-        <!-- <wizard id="wizard_board_create_menu" model="board.board" multi="True" name="board.board.menu.create" string="Create Board Menu" /> -->
+<!--  Board Tree View  -->
 
         <record id="view_board_tree" model="ir.ui.view">
             <field name="name">board.board.tree</field>
@@ -54,9 +55,9 @@
                 </tree>
             </field>
         </record>
-        
-<!-- Dashboard Definition form -->        
-        
+
+<!-- Dashboard Definition Form View  -->
+
         <record id="view_board_form" model="ir.ui.view">
             <field name="name">board.board.form</field>
             <field name="model">board.board</field>
@@ -89,16 +90,16 @@
                 </form>
             </field>
         </record>
-    
+
     <!-- Action for DashBoard Definition form -->
-        
+
         <record id="action_view_board_list_form" model="ir.actions.act_window">
             <field name="name">Dashboard Definition</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
+
         <menuitem
             id="base.next_id_50"
             name="Configuration"
@@ -109,9 +110,11 @@
             action="action_view_board_list_form"
             id="menu_view_board_form"
             parent="base.next_id_50" sequence="1"/>
+
         <menuitem action="action_view_board_note_form"
         	id="menu_view_board_note_form" parent="base.next_id_50"
         	sequence="3" groups="base.group_system" />
+
         <act_window context="{'view': active_id}" id="dashboard_open"
         	multi="True" name="Open Dashboard" res_model="board.board"
         	src_model="board.board" />
diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index 9697d00a2d3..e986ac7bb3c 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -53,7 +53,7 @@ class board_menu_create(osv.osv_memory):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Board Menu Create's IDs
-        @return : Dictionary {}.
+        @return: Dictionary {}.
         """
         if not context:
             context = {}
@@ -63,8 +63,8 @@ class board_menu_create(osv.osv_memory):
             board = self.pool.get('board.board').browse(cr, uid, context_id)
             action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
                 'name': board.name,
-                'view_type':'form',
-                'view_mode':'form',
+                'view_type': 'form',
+                'view_mode': 'form',
                 'res_model': 'board.board',
                 'view_id': board.view_id.id,
                 })
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 7e70df3dc4a..a4dfc6e1f6d 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -25,12 +25,17 @@ from osv import orm
 from tools.translate import _
 
 def _get_answers(cr, uid, ids):
+    """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of crm profiling’s IDs """
+
     query = """
     select distinct(answer)
     from profile_question_yes_rel
     where profile=ANY(%s)"""
 
-    cr.execute(query,(ids,))
+    cr.execute(query, (ids,))
     ans_yes = [x[0] for x in cr.fetchall()]
 
     query = """
@@ -38,13 +43,19 @@ def _get_answers(cr, uid, ids):
     from profile_question_no_rel
     where profile=ANY(%s)"""
 
-    cr.execute(query,(ids,))
+    cr.execute(query, (ids,))
     ans_no = [x[0] for x in cr.fetchall()]
 
     return [ans_yes, ans_no]
 
 
 def _get_parents(cr, uid, ids):
+    """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of crm profiling’s IDs
+        @return: Get parents's Id """
+
     ids_to_check = ids
     cr.execute("""
      select distinct(parent_id)
@@ -67,7 +78,15 @@ def _get_parents(cr, uid, ids):
 
 
 def test_prof(cr, uid, seg_id, pid, answers_ids = []):
-#return True if the partner pid fetch the segmentation rule seg_id
+
+    """ return True if the partner pid fetch the segmentation rule seg_id
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param seg_id: Segmentaion's ID
+        @param pid: partner's ID
+        @param answers_ids: Answers's IDs
+    """
+
     ids_to_check = _get_parents(cr, uid, [seg_id])
     [yes_answers, no_answers] = _get_answers(cr, uid, ids_to_check)
     temp = True
@@ -86,6 +105,14 @@ def test_prof(cr, uid, seg_id, pid, answers_ids = []):
 
 
 def _recompute_categ(self, cr, uid, pid, answers_ids):
+    """ Recompute category
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param pid: partner's ID
+        @param answers_ids: Answers's IDs
+    """
+
     ok =  []
     cr.execute('''
         select r.category_id
@@ -113,8 +140,11 @@ def _recompute_categ(self, cr, uid, pid, answers_ids):
 
 
 class question(osv.osv):
+    """ Question """
+
     _name="crm_profiling.question"
     _description= "Question"
+
     _columns={
         'name': fields.char("Question",size=128, required=True),
         'answers_ids': fields.one2many("crm_profiling.answer","question_id","Avalaible answers",),
@@ -124,10 +154,19 @@ question()
 
 
 class questionnaire(osv.osv):
+    """ Questionnaire """
+
     _name="crm_profiling.questionnaire"
     _description= "Questionnaire"
 
     def build_form(self, cr, uid, data, context):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param data: Get Data
+            @param context: A standard dictionary for contextual values """
+
         query = """
         select name, id
         from crm_profiling_question
@@ -139,14 +178,16 @@ class questionnaire(osv.osv):
             <form string="%s">''' % _('Questionnaire')
         for name, oid in result:
             quest_form = quest_form + '<field name="quest_form%d"/><newline/>' % (oid,)
-            quest_fields['quest_form%d' % (oid,)] = {'string': name, 'type': 'many2one', 'relation': 'crm_profiling.answer', 'domain': [('question_id','=',oid)] }
+            quest_fields['quest_form%d' % (oid,)] = {'string': name, 'type': 'many2one', \
+                        'relation': 'crm_profiling.answer', 'domain': [('question_id','=',oid)] }
         quest_form = quest_form + '''</form>'''
         return quest_form, quest_fields
 
     _columns = {
         'name': fields.char("Questionnaire",size=128, required=True),
         'description':fields.text("Description", required=True),
-        'questions_ids': fields.many2many('crm_profiling.question','profile_questionnaire_quest_rel','questionnaire', 'question', "Questions"),
+        'questions_ids': fields.many2many('crm_profiling.question','profile_questionnaire_quest_rel',\
+                                'questionnaire', 'question', "Questions"),
     }
 
 questionnaire()
@@ -165,10 +206,18 @@ answer()
 class partner(osv.osv):
     _inherit="res.partner"
     _columns={
-        "answers_ids": fields.many2many("crm_profiling.answer","partner_question_rel","partner","answer","Answers"),
+        "answers_ids": fields.many2many("crm_profiling.answer","partner_question_rel",\
+                                "partner","answer","Answers"),
         }
 
     def _questionnaire_compute(self, cr, uid, data, context):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param data: Get Data
+            @param context: A standard dictionary for contextual values """
+
         temp = []
         for x in data['form']:
             if x.startswith("quest_form") and data['form'][x] != 0 :
@@ -179,11 +228,18 @@ class partner(osv.osv):
         for x in cr.fetchall():
             temp.append(x[0])
 
-        self.write(cr, uid, [data['id']],{'answers_ids':[[6,0,temp]]}, context)
+        self.write(cr, uid, [data['id']], {'answers_ids':[[6, 0, temp]]}, context)
         return {}
 
 
     def write(self, cr, uid, ids, vals, context=None):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of crm profiling’s IDs
+            @param context: A standard dictionary for contextual values """
+
         if not context:
             context={}
         if 'answers_ids' in vals:
@@ -194,24 +250,39 @@ partner()
 
 
 class crm_segmentation(osv.osv):
+    """ CRM Segmentation """
+
     _inherit="crm.segmentation"
     _columns={
-        "answer_yes": fields.many2many("crm_profiling.answer","profile_question_yes_rel","profile","answer","Included Answers"),
-        "answer_no": fields.many2many("crm_profiling.answer","profile_question_no_rel","profile","answer","Excluded Answers"),
+        "answer_yes": fields.many2many("crm_profiling.answer","profile_question_yes_rel",\
+                            "profile","answer","Included Answers"),
+        "answer_no": fields.many2many("crm_profiling.answer","profile_question_no_rel",\
+                            "profile","answer","Excluded Answers"),
         'parent_id': fields.many2one('crm.segmentation', 'Parent Profile'),
         'child_ids': fields.one2many('crm.segmentation', 'parent_id', 'Child Profiles'),
-        'profiling_active': fields.boolean('Use The Profiling Rules', help='Check this box if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored')
+        'profiling_active': fields.boolean('Use The Profiling Rules', help='Check\
+                             this box if you want to use this tab as part of the \
+                             segmentation rule. If not checked, the criteria beneath will be ignored')
         }
+
     _constraints = [
         (orm.orm.check_recursion, 'Error ! You can not create recursive profiles.', ['parent_id'])
     ]
 
     def process_continue(self, cr, uid, ids, start=False):
-        categs = self.read(cr,uid,ids,['categ_id','exclusif','partner_id', 'sales_purchase_active', 'profiling_active'])
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of crm segmentation’s IDs """
+
+        categs = self.read(cr,uid,ids,['categ_id','exclusif','partner_id', \
+                            'sales_purchase_active', 'profiling_active'])
         for categ in categs:
             if start:
                 if categ['exclusif']:
-                    cr.execute('delete from res_partner_category_rel where category_id=%s', (categ['categ_id'][0],))
+                    cr.execute('delete from res_partner_category_rel where \
+                            category_id=%s', (categ['categ_id'][0],))
 
             id = categ['id']
 
@@ -230,7 +301,7 @@ class crm_segmentation(osv.osv):
                     partners.remove(pid)
 
             if categ['profiling_active']:
-                to_remove_list=[]
+                to_remove_list = []
                 for pid in partners:
 
                     cr.execute('select distinct(answer) from partner_question_rel where partner=%s',(pid,))
@@ -242,7 +313,7 @@ class crm_segmentation(osv.osv):
                     partners.remove(pid)
 
             for partner_id in partners:
-                cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
+                cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0], partner_id))
             cr.commit()
 
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
@@ -250,5 +321,6 @@ class crm_segmentation(osv.osv):
         return True
 
 crm_segmentation()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 592797ada84..48810240199 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-<!--		<wizard
-			string="Select partners"
-			model="crm.segmentation"
-			name="open_partner"
-			menu="False"
-			id="wizard_open_partner"/>
--->
 
 		<wizard
 			string="Using a questionnaire"
@@ -35,15 +28,8 @@
 		<menuitem parent="crm.menu_crm_configuration" id="menu_segm_answer"
 				  action="open_questions" />
 
-<!--		<record model="ir.actions.act_window" id="open_crm_segmentations">
-		  <field name="name">Profiles</field>
-		  <field name="res_model">crm.segmentation</field>
-		  <field name="view_type">form</field>
-		  <field name="view_mode">tree,form</field>
-		</record>
-		<menuitem name="Partners/Configuration/Profiling/Profiles" id="menu_segm_crm_segmentation"
-				  action="open_crm_segmentations" />
--->
+<!-- Profiling Questionnaire Tree view  -->
+
 	<record model="ir.ui.view" id="view_questionnaire_tree">
 		<field name="name">Questionnaires</field>
 		<field name="model">crm_profiling.questionnaire</field>
@@ -57,6 +43,8 @@
 		</field>
 	</record>
 
+<!-- Profiling Questionnaire Form view  -->
+
 	<record model="ir.ui.view" id="view_questionnaire_form">
 		<field name="name">Questionnaires</field>
 		<field name="model">crm_profiling.questionnaire</field>
@@ -74,6 +62,8 @@
 		</field>
 	</record>
 
+<!-- Profiling Answer Tree view  -->
+
 	<record model="ir.ui.view" id="view_answer">
 		<field name="name">Answers</field>
 		<field name="model">crm_profiling.answer</field>
@@ -86,6 +76,8 @@
 		</field>
 	</record>
 
+<!-- Profiling Answer Form view  -->
+
 	<record model="ir.ui.view" id="view_answer_form">
 		<field name="name">Answers</field>
 		<field name="model">crm_profiling.answer</field>
@@ -98,6 +90,8 @@
 		</field>
 	</record>
 
+<!-- Profiling Questions Tree view  -->
+
 	<record model="ir.ui.view" id="view_question_tree">
 		<field name="name">Questions</field>
 		<field name="model">crm_profiling.question</field>
@@ -110,6 +104,8 @@
 		</field>
 	</record>
 
+<!-- Profiling Questions Form view  -->
+
 	<record model="ir.ui.view" id="view_question_form">
 		<field name="name">Questions</field>
 		<field name="model">crm_profiling.question</field>
@@ -141,7 +137,9 @@
 		<field name="arch" type="xml">
 			<notebook position="inside">
 				<page string="Profiling">
-				  <button string="Use a questionnaire" name="%(wizard_open_questionnaire)d" type="action" colspan="1" icon="gtk-justify-fill"/>
+				  <button string="Use a questionnaire"
+				  	name="%(wizard_open_questionnaire)d" type="action" colspan="1"
+				  	icon="gtk-justify-fill" />
 				  <newline/>
 				  <field name="answers_ids" colspan="4" nolabel="1"/>
 				</page>
@@ -149,6 +147,8 @@
 		</field>
 	</record>
 
+<!-- CRM Segmentation Form view  -->
+
 	<record model="ir.ui.view" id="crm.crm_segmentation-view">
 		<field name="name">crm.segmentation.form</field>
 		<field name="model">crm.segmentation</field>
@@ -166,9 +166,13 @@
 					<field name="description" select="2" colspan="4"/>
 					<field name="state"/>
 					<group col="3" colspan="2">
-						<button name="process_start" states="not running" string="Compute Segmentation" type="object" icon="gtk-apply"/>
-						<button name="process_stop" states="running" string="Stop Process" type="object" icon="gtk-stop"/>
-						<button name="process_continue" states="running" string="Continue Process" type="object" icon="gtk-go-forward"/>
+						<button name="process_start"
+							states="not running" string="Compute Segmentation" type="object"
+							icon="gtk-apply" />
+						<button name="process_stop" states="running"
+							string="Stop Process" type="object" icon="gtk-stop" />
+						<button name="process_continue" states="running"
+							string="Continue Process" type="object" icon="gtk-go-forward" />
 					</group>
 				</page>
 				<page string="Sales Purchase">
@@ -195,18 +199,10 @@
 		</field>
 	</record>
 
-	<record model="ir.ui.view" id="view_partner_crm_segmentation_tree">
-	<!--	<field name="name">crm.segmentation.tree</field>
-		<field name="model">crm.segmentation</field>
-		<field name="type">tree</field>
-		<field name="field_parent">child_ids</field>
-		<field name="arch" type="xml">
-			<tree string="Partner Profiles">
-				<field name="name"/>
+<!-- CRM Segmentation Tree view  -->
 
-			</tree>
-		</field>
--->		<field name="name">crm.segmentation.tree</field>
+	<record model="ir.ui.view" id="view_partner_crm_segmentation_tree">
+		<field name="name">crm.segmentation.tree</field>
 		<field name="model">crm.segmentation</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
@@ -218,28 +214,5 @@
 		</field>
 	</record>
 
-<!--	<record model="ir.actions.act_window" id="action_partner_crm_segmentation">
-		<field name="name">Partner profile</field>
-		<field name="type">ir.actions.act_window</field>
-		<field name="res_model">crm.segmentation</field>
-		<field name="view_type">tree</field>
-		<field name="view_id" ref="view_partner_crm_segmentation_tree"/>
-		<field name="domain">[('parent_id','=',False)]</field>
-	</record>
--->
-<!--	<menuitem
-		name="Partners/Partners by Profile"
-		sequence="1"
-		action="action_partner_crm_segmentation"
-		id="menu_partner_crm_segmentation_main"/>
--->
-<!--	<record model="ir.values" id="ir_action_partner_by_crm_segmentation">
-		<field name="key2" eval="'tree_but_open'"/>
-		<field name="model" eval="'crm.segmentation'"/>
-		<field name="name">Open partners</field>
-		<field name="value" eval="'ir.actions.wizard,%d'%wizard_open_partner"/>
-		<field name="object" eval="True"/>
-	</record>
--->
 	</data>
 </openerp>
diff --git a/addons/document_ics/document_ics.py b/addons/document_ics/document_ics.py
index acda761b279..9056b3250b4 100644
--- a/addons/document_ics/document_ics.py
+++ b/addons/document_ics/document_ics.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -36,18 +36,18 @@ from document.nodes import node_content
 from tools.safe_eval import safe_eval
 
 ICS_TAGS = {
-    'summary':'normal',
-    'uid':'normal' ,
-    'dtstart':'date' ,
-    'dtend':'date' ,
-    'created':'date' ,
-    'dtstamp':'date' ,
-    'last-modified':'normal' ,
-    'url':'normal' ,
-    'attendee':'multiple',
-    'location':'normal',
+    'summary': 'normal',
+    'uid': 'normal' ,
+    'dtstart': 'date' ,
+    'dtend': 'date' ,
+    'created': 'date' ,
+    'dtstamp': 'date' ,
+    'last-modified': 'normal' ,
+    'url': 'normal',
+    'attendee': 'multiple',
+    'location': 'normal',
     'categories': 'normal',
-    'description':'normal',
+    'description': 'normal',
 
     # TODO: handle the 'duration' property
 }
@@ -59,34 +59,52 @@ ICS_FUNCTIONS = [
     ]
 
 class document_directory_ics_fields(osv.osv):
+    """ Document Directory ICS Fields """
     _name = 'document.directory.ics.fields'
+    _description = 'Document Directory ICS Fields'
     _columns = {
         'field_id': fields.many2one('ir.model.fields', 'Open ERP Field'),
         'name': fields.selection(map(lambda x: (x, x), ICS_TAGS.keys()), 'ICS Value', required=True),
-        'content_id': fields.many2one('document.directory.content', 'Content', required=True, ondelete='cascade'),
+        'content_id': fields.many2one('document.directory.content', 'Content',\
+                             required=True, ondelete='cascade'),
         'expr': fields.char("Expression", size=64),
-        'fn': fields.selection(ICS_FUNCTIONS,'Function',help="Alternate method of calculating the value", required=True)
+        'fn': fields.selection(ICS_FUNCTIONS, 'Function', help="Alternate method \
+                of calculating the value", required=True)
     }
     _defaults = {
         'fn': lambda *a: 'field',
     }
-   
+
 document_directory_ics_fields()
 
 class document_directory_content(osv.osv):
+    """ Document Directory Content """
     _inherit = 'document.directory.content'
+    _description = 'Document Directory Content'
     __rege = re.compile(r'OpenERP-([\w|\.]+)_([0-9]+)@(\w+)$')
+
     _columns = {
         'object_id': fields.many2one('ir.model', 'Object', oldname= 'ics_object_id'),
-        'obj_iterate': fields.boolean('Iterate object',help="If set, a separate instance will be created for each record of Object"),
-        'fname_field': fields.char("Filename field",size=16,help="The field of the object used in the filename. Has to be a unique identifier."),
+        'obj_iterate': fields.boolean('Iterate object',help="If set, a separate \
+                        instance will be created for each record of Object"),
+        'fname_field': fields.char("Filename field",size=16,help="The field of the \
+                        object used in the filename. Has to be a unique identifier."),
         'ics_domain': fields.char('Domain', size=64),
         'ics_field_ids': fields.one2many('document.directory.ics.fields', 'content_id', 'Fields Mapping')
     }
     _defaults = {
         'ics_domain': lambda *args: '[]'
     }
+
     def _file_get(self, cr, node, nodename, content, context=None):
+        """  Get the file
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param node: pass the node
+            @param nodename: pass the nodename
+            @param context: A standard dictionary for contextual values
+        """
+
         if not content.obj_iterate:
             return super(document_directory_content, self)._file_get(cr, node, nodename, content)
         else:
@@ -95,7 +113,7 @@ class document_directory_content(osv.osv):
             mod = self.pool.get(content.object_id.model)
             uid = node.context.uid
             fname_fld = content.fname_field or 'id'
-            where = []            
+            where = []
             if node.domain:
                 where += eval(node.domain)
             if nodename:
@@ -112,7 +130,7 @@ class document_directory_content(osv.osv):
             resids = mod.search(cr, uid, where, context=context)
             if not resids:
                 return False
-        
+
             res2 = []
             for ro in mod.read(cr,uid,resids,['id', fname_fld]):
                 tname = (content.prefix or '') + str(ro[fname_fld])
@@ -126,10 +144,19 @@ class document_directory_content(osv.osv):
             return res2
 
     def process_write(self, cr, uid, node, data, context=None):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param node: pass the node
+            @param data: pass the data
+            @param context: A standard dictionary for contextual values
+        """
+
         if node.extension != '.ics':
                 return super(document_directory_content, self).process_write(cr, uid, node, data, context)
         import vobject
-        parsedCal = vobject.readOne(data)        
+        parsedCal = vobject.readOne(data)
         fields = {}
         funcs = {}
         fexprs = {}
@@ -156,7 +183,7 @@ class document_directory_content(osv.osv):
         for child in parsedCal.getChildren():
             result = {}
             uuid = None
-            
+
             for event in child.getChildren():
                 enl = event.name.lower()
                 if enl =='uid':
@@ -169,7 +196,7 @@ class document_directory_content(osv.osv):
                         result[fields[enl]] = event.value.encode('utf8')
                     elif ICS_TAGS[enl]=='date':
                         result[fields[enl]] = event.value.strftime('%Y-%m-%d %H:%M:%S')
-        
+
                     # print "Field ",enl,  result[fields[enl]]
                 elif fields[enl] and funcs[enl] == 'hours':
                     ntag = fexprs[enl] or 'dtstart'
@@ -186,7 +213,7 @@ class document_directory_content(osv.osv):
                 else:
                     # print "Unhandled tag in ICS:", enl
                     pass
-            # end for 
+            # end for
 
             if not uuid:
                 print "Skipping cal", child
@@ -213,7 +240,7 @@ class document_directory_content(osv.osv):
                     pass
 
                 wexpr = [ ( 'id', '=', wematch.group(2) ) ]
-                
+
             # print "Looking at ", cmodel, " for ", wexpr
             # print "domain=", idomain
 
@@ -223,20 +250,28 @@ class document_directory_content(osv.osv):
                 id = False
             else:
                 id = fobj.search(cr, uid, wexpr, context=context)
-        
+
             if isinstance(id, list):
                 if len(id) > 1:
                     raise Exception("Multiple matches found for ICS")
-            if id:                
+            if id:
                 fobj.write(cr, uid, id, result, context=context)
             else:
                 r = idomain.copy()
-                r.update(result)                
+                r.update(result)
                 fobj.create(cr, uid, r, context=context)
 
         return True
 
     def process_read(self, cr, uid, node, context=None):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param node: pass the node
+            @param context: A standard dictionary for contextual values
+        """
+
         def ics_datetime(idate, short=False):
             if short:
                 return datetime.date.fromtimestamp(time.mktime(time.strptime(idate, '%Y-%m-%d')))
@@ -263,7 +298,7 @@ class document_directory_content(osv.osv):
             domain.append(('id','=',node.act_id))
         # print "process read clause:",domain
         ids = obj_class.search(cr, uid, domain, context=ctx)
-        cal = vobject.iCalendar()        
+        cal = vobject.iCalendar()
         for obj in obj_class.browse(cr, uid, ids):
             event = cal.add('vevent')
             # Fix dtstamp et last-modified with create and write date on the object line
@@ -293,7 +328,7 @@ class document_directory_content(osv.osv):
                     else:
                         value = ics_datetime(value)
                     event.add(field.name).value = value
-        s = cal.serialize()        
+        s = cal.serialize()
         return s
 document_directory_content()
 
@@ -301,7 +336,8 @@ class crm_case(osv.osv):
     _inherit = 'crm.case'
     _columns = {
         'code': fields.char('Calendar Code', size=64),
-        'date_deadline': fields.datetime('Deadline', help="Deadline Date is automatically computed from Start Date + Duration"),
+        'date_deadline': fields.datetime('Deadline', help="Deadline Date is automatically\
+                         computed from Start Date + Duration"),
     }
 
     _defaults = {
@@ -310,14 +346,29 @@ class crm_case(osv.osv):
 
     def copy(self, cr, uid, id, default=None, context=None):
         """
-        code field must be unique in ICS file
+            code field must be unique in ICS file
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param id: crm case's ID
+            @param context: A standard dictionary for contextual values
         """
+
         if not default: default = {}
         if not context: context = {}
         default.update({'code': self.pool.get('ir.sequence').get(cr, uid, 'crm.case'), 'id': False})
         return super(crm_case, self).copy(cr, uid, id, default, context)
 
     def on_change_duration(self, cr, uid, id, date, duration):
+        """ Change Duration
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param id: crm case's ID,
+            @param date: Pass the Date,
+            @param duration: Pass the duration,
+        """
+
         if not date:
             return {}
         start_date = datetime.datetime.fromtimestamp(time.mktime(time.strptime(date, "%Y-%m-%d %H:%M:%S")))
@@ -327,7 +378,7 @@ class crm_case(osv.osv):
             raise osv.except_osv(_('Warning !'),
                     _('You can not set negative Duration.'))
 
-        res = {'value' : {'date_deadline' : end.strftime('%Y-%m-%d %H:%M:%S')}}
+        res = {'value': {'date_deadline' : end.strftime('%Y-%m-%d %H:%M:%S')}}
         return res
 
 crm_case()
diff --git a/addons/document_ics/document_ics_config_wizard.py b/addons/document_ics/document_ics_config_wizard.py
index 8c35b973c1c..1e4b73c825d 100644
--- a/addons/document_ics/document_ics_config_wizard.py
+++ b/addons/document_ics/document_ics_config_wizard.py
@@ -54,16 +54,25 @@ class document_ics_crm_wizard(osv.osv_memory):
 
     _columns = {
         'name':fields.char('Name', size=64),
-        'meeting' : fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
-        'lead' : fields.boolean('Leads', help="Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."),
-        'opportunity' : fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
-        'jobs' : fields.boolean('Jobs Hiring Process', help="Helps you to organise the jobs hiring process: evaluation, meetings, email integration..."),
-        'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
-        'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on software"),
+        'meeting': fields.boolean('Calendar of Meetings', help="Manages the calendar \
+                     of meetings of the users."),
+        'lead': fields.boolean('Leads', help="Allows you to track and manage leads \
+                    which are pre-sales requests or contacts, the very first contact with a customer request."),
+        'opportunity': fields.boolean('Business Opportunities', help="Tracks identified \
+                         business opportunities for your sales pipeline."),
+        'jobs': fields.boolean('Jobs Hiring Process', help="Helps you to organise the jobs\
+                     hiring process: evaluation, meetings, email integration..."),
+        'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise \
+                        your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
+        'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and \
+                     support requests on software"),
         'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
-        'fund' : fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."),
-        'claims' : fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
-        'phonecall' : fields.boolean('Phone Calls', help="Helps you to encode the result of a phone call or to plan a list of phone calls to process."),
+        'fund': fields.boolean('Fund Raising Operations', help="This may help associations in \
+                    their fund raising process and tracking."),
+        'claims': fields.boolean('Claims', help="Manages the supplier and customers claims,\
+                     including your corrective or preventive actions."),
+        'phonecall': fields.boolean('Phone Calls', help="Helps you to encode the result of \
+                        a phone call or to plan a list of phone calls to process."),
     }
     _defaults = {
         'meeting': lambda *args: True,
@@ -72,6 +81,13 @@ class document_ics_crm_wizard(osv.osv_memory):
     }
 
     def execute(self, cr, uid, ids, context=None):
+        """
+            @param self: The object pointer
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of Document CRM wizard’s IDs
+            @param context: A standard dictionary for contextual values """
+
         data=self.read(cr, uid, ids, [])[0]
         dir_obj = self.pool.get('document.directory')
         dir_cont_obj = self.pool.get('document.directory.content')
@@ -80,9 +96,11 @@ class document_ics_crm_wizard(osv.osv_memory):
             dir_id = dir_id[0]
         else:
             dir_id = dir_obj.create(cr, uid, {'name': 'Calendars' ,'user_id' : uid, 'type': 'directory'})
-        for section in ['meeting', 'lead', 'opportunity', 'jobs', 'bugs', 'fund', 'helpdesk', 'claims', 'phonecall']:
+        for section in ['meeting', 'lead', 'opportunity', 'jobs', 'bugs', 'fund', \
+                            'helpdesk', 'claims', 'phonecall']:
             if data[section]:
-                section_id=self.pool.get('crm.case.section').search(cr, uid, [('name', '=', SECTION_NAME[section])])
+                section_id=self.pool.get('crm.case.section').search(cr, uid, \
+                            [('name', '=', SECTION_NAME[section])])
                 if section_id:
                     object_id=self.pool.get('ir.model').search(cr, uid, [('name', '=', 'Case')])[0]
 
@@ -101,13 +119,16 @@ class document_ics_crm_wizard(osv.osv_memory):
 
                     ics_obj=self.pool.get('document.directory.ics.fields')
                     for tag in ['description', 'url', 'summary', 'dtstart', 'dtend', 'uid']:
-                        field_id =  self.pool.get('ir.model.fields').search(cr, uid, [('model_id.name', '=', 'Case'), ('field_description', '=', ICS_TAGS[tag])])[0]
+                        field_id =  self.pool.get('ir.model.fields').search(cr, uid,\
+                                    [('model_id.name', '=', 'Case'),\
+                                    ('field_description', '=', ICS_TAGS[tag])])[0]
                         vals_ics = {
                             'field_id':  field_id ,
                             'name':  tag ,
                             'content_id': content_id ,
                             }
                         ics_obj.create(cr, uid, vals_ics)
+
 document_ics_crm_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ics/document_view.xml b/addons/document_ics/document_view.xml
index 6e468bcb0bd..ac99f3723db 100644
--- a/addons/document_ics/document_view.xml
+++ b/addons/document_ics/document_view.xml
@@ -1,6 +1,8 @@
 <openerp>
 <data>
 
+<!-- Document Directory Form View  -->
+
     <record model="ir.ui.view" id="view_document_directory_form_1">
         <field name="name">document.directory</field>
         <field name="model">document.directory</field>
@@ -36,7 +38,7 @@
             </field>
         </field>
     </record>
-	
+
 	 <record model="ir.ui.view" id="view_case_inherit_form">
         <field name="name">crm.case.code.form</field>
         <field name="model">crm.case</field>
@@ -48,7 +50,9 @@
             </field>
         </field>
     </record>
-    
+
+<!-- CRM Case Form View  -->
+
     <record model="ir.ui.view" id="view_case_inherit_form1">
         <field name="name">crm.case.inherit.form1</field>
         <field name="model">crm.case</field>
@@ -56,11 +60,15 @@
         <field name="inherit_id" ref="crm.crm_case-view"/>
         <field name="arch" type="xml">
             <field name="date" position="replace">
-           		<field name="date" on_change="on_change_duration(date, duration)" required="1"/>
-                <field name="duration" string="Duration(In Hour)" on_change="on_change_duration(date, duration)" widget="float_time"/>
+           		<field name="date"
+           			on_change="on_change_duration(date, duration)"
+           			required="1" />
+           		<field name="duration" string="Duration(In Hour)"
+           			on_change="on_change_duration(date, duration)"
+           			widget="float_time" />
             </field>
         </field>
     </record>
-    
+
 </data>
 </openerp>
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index b1680ef5009..a6432ddcb79 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -36,8 +36,8 @@ class survey_type(osv.osv):
     _name = 'survey.type'
     _description = 'Survey Type'
     _columns = {
-        'name' : fields.char("Name", size=128, required=1),
-        'code' : fields.char("Code", size=64),
+        'name': fields.char("Name", size=128, required=1),
+        'code': fields.char("Code", size=64),
     }
 survey_type()
 
@@ -51,64 +51,64 @@ class survey(osv.osv):
         return data
 
     _columns = {
-        'title' : fields.char('Survey Title', size=128, required=1),
-        'page_ids' : fields.one2many('survey.page', 'survey_id', 'Page'),
-        'date_open' : fields.datetime('Survey Open Date', readonly=1),
-        'date_close' : fields.datetime('Survey Close Date', readonly=1),
-        'max_response_limit' : fields.integer('Maximum Response Limit'),
-        'response_user' : fields.integer('Maximum Response per User',
+        'title': fields.char('Survey Title', size=128, required=1),
+        'page_ids': fields.one2many('survey.page', 'survey_id', 'Page'),
+        'date_open': fields.datetime('Survey Open Date', readonly=1),
+        'date_close': fields.datetime('Survey Close Date', readonly=1),
+        'max_response_limit': fields.integer('Maximum Response Limit'),
+        'response_user': fields.integer('Maximum Response per User',
                      help="Set to one if  you require only one response per user"),
-        'state' : fields.selection([('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
-        'responsible_id' : fields.many2one('res.users', 'Responsible'),
-        'tot_start_survey' : fields.integer("Total Started Survey", readonly=1),
-        'tot_comp_survey' : fields.integer("Total Completed Survey", readonly=1),
-        'note' : fields.text('Description', size=128),
-        'history' : fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True),
+        'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
+        'responsible_id': fields.many2one('res.users', 'Responsible'),
+        'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
+        'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1),
+        'note': fields.text('Description', size=128),
+        'history': fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True),
         'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
-        'send_response' : fields.boolean('E-mail Notification on Response'),
-        'type' : fields.many2one('survey.type', 'Type'),
+        'send_response': fields.boolean('E-mail Notification on Response'),
+        'type': fields.many2one('survey.type', 'Type'),
     }
     _defaults = {
-        'state' : lambda * a: "draft",
-        'tot_start_survey' : lambda * a: 0,
-        'tot_comp_survey' : lambda * a: 0,
-        'send_response' : lambda * a: 1,
-        'response_user' : lambda * a:1,
+        'state': lambda * a: "draft",
+        'tot_start_survey': lambda * a: 0,
+        'tot_comp_survey': lambda * a: 0,
+        'send_response': lambda * a: 1,
+        'response_user': lambda * a:1,
     }
 
     def survey_draft(self, cr, uid, ids, arg):
-        self.write(cr, uid, ids, { 'state' : 'draft'})
+        self.write(cr, uid, ids, {'state': 'draft'})
         return True
 
     def survey_open(self, cr, uid, ids, arg):
-        self.write(cr, uid, ids, { 'state' : 'open', 'date_open':strftime("%Y-%m-%d %H:%M:%S")})
+        self.write(cr, uid, ids, {'state': 'open', 'date_open': strftime("%Y-%m-%d %H:%M:%S")})
         return True
 
     def survey_close(self, cr, uid, ids, arg):
-        self.write(cr, uid, ids, { 'state' : 'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S") })
+        self.write(cr, uid, ids, {'state': 'close', 'date_close': strftime("%Y-%m-%d %H:%M:%S") })
         return True
 
     def survey_cancel(self, cr, uid, ids, arg):
-        self.write(cr, uid, ids, { 'state' : 'cancel' })
+        self.write(cr, uid, ids, {'state': 'cancel' })
         return True
 
     def copy(self, cr, uid, id, default=None,context={}):
         raise osv.except_osv(_('Error !'),_('You cannot duplicate the resource!'))
 
-
 survey()
 
+
 class survey_history(osv.osv):
     _name = 'survey.history'
     _description = 'Survey History'
     _rec_name = 'date'
     _columns = {
-        'survey_id' : fields.many2one('survey', 'Survey'),
-        'user_id' : fields.many2one('res.users', 'User', readonly=True),
-        'date' : fields.datetime('Date started', readonly=1),
+        'survey_id': fields.many2one('survey', 'Survey'),
+        'user_id': fields.many2one('res.users', 'User', readonly=True),
+        'date': fields.datetime('Date started', readonly=1),
     }
     _defaults = {
-         'date' : lambda * a: datetime.datetime.now()
+         'date': lambda * a: datetime.datetime.now()
     }
 
 survey_history()
@@ -119,14 +119,14 @@ class survey_page(osv.osv):
     _rec_name = 'title'
     _order = 'sequence'
     _columns = {
-        'title' : fields.char('Page Title', size=128, required=1),
-        'survey_id' : fields.many2one('survey', 'Survey', ondelete='cascade'),
-        'question_ids' : fields.one2many('survey.question', 'page_id', 'Question'),
-        'sequence' : fields.integer('Page Nr'),
-        'note' : fields.text('Description'),
+        'title': fields.char('Page Title', size=128, required=1),
+        'survey_id': fields.many2one('survey', 'Survey', ondelete='cascade'),
+        'question_ids': fields.one2many('survey.question', 'page_id', 'Question'),
+        'sequence': fields.integer('Page Nr'),
+        'note': fields.text('Description'),
     }
     _defaults = {
-        'sequence' : lambda * a: 1
+        'sequence': lambda * a: 1
     }
 
     def default_get(self, cr, uid, fields, context={}):
@@ -149,11 +149,11 @@ class survey_page(osv.osv):
                 'res_model': 'survey.question.wiz',
                 'type': 'ir.actions.act_window',
                 'target': 'new',
-                'search_view_id':search_id[0],
+                'search_view_id': search_id[0],
                 'context': context
                 }
 
-    def copy(self, cr, uid, id, default=None,context={}):
+    def copy(self, cr, uid, id, default=None, context={}):
         raise osv.except_osv(_('Error !'),_('You cannot duplicate the resource!'))
 
 survey_page()
@@ -168,7 +168,9 @@ class survey_question(osv.osv):
         if len(ids) == 0:
             return {}
         val = {}
-        cr.execute("select question_id, count(id) as Total_response from survey_response_line where state='done' and question_id in (%s) group by question_id" % ",".join(map(str, map(int, ids))))
+        cr.execute("select question_id, count(id) as Total_response from \
+                survey_response_line where state='done' and question_id in (%s)\
+                 group by question_id" % ",".join(map(str, map(int, ids))))
         ids1 = copy.deepcopy(ids)
         for rec in  cr.fetchall():
             ids1.remove(rec[0])
@@ -178,23 +180,23 @@ class survey_question(osv.osv):
         return val
 
     _columns = {
-        'page_id' : fields.many2one('survey.page', 'Survey Page', ondelete='cascade', required=1),
-        'question' :  fields.char('Question', size=128, required=1),
-        'answer_choice_ids' : fields.one2many('survey.answer', 'question_id', 'Answer'),
-        'response_ids' : fields.one2many('survey.response.line', 'question_id', 'Response', readonly=1),
-        'is_require_answer' : fields.boolean('Require Answer to Question (optional)'),
-        'required_type' : fields.selection([('all','All'), ('at least','At Least'), ('at most','At Most'), ('exactly','Exactly'), ('a range','A Range')], 'Respondent must answer'),
-        'req_ans' : fields.integer('#Required Answer'),
-        'maximum_req_ans' : fields.integer('Maximum Required Answer'),
-        'minimum_req_ans' : fields.integer('Minimum Required Answer'),
-        'req_error_msg' : fields.text('Error Message'),
-        'allow_comment' : fields.boolean('Allow Comment Field'),
-        'sequence' : fields.integer('Sequence'),
-        'tot_resp' : fields.function(_calc_response, method=True, string="Total Response"),
-        'survey' : fields.related('page_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
-        'descriptive_text' : fields.text('Descriptive Text', size=255),
-        'column_heading_ids' : fields.one2many('survey.question.column.heading', 'question_id',' Column heading'),
-        'type' : fields.selection([('multiple_choice_only_one_ans','Multiple Choice (Only One Answer)'),
+        'page_id': fields.many2one('survey.page', 'Survey Page', ondelete='cascade', required=1),
+        'question':  fields.char('Question', size=128, required=1),
+        'answer_choice_ids': fields.one2many('survey.answer', 'question_id', 'Answer'),
+        'response_ids': fields.one2many('survey.response.line', 'question_id', 'Response', readonly=1),
+        'is_require_answer': fields.boolean('Require Answer to Question (optional)'),
+        'required_type': fields.selection([('all','All'), ('at least','At Least'), ('at most','At Most'), ('exactly','Exactly'), ('a range','A Range')], 'Respondent must answer'),
+        'req_ans': fields.integer('#Required Answer'),
+        'maximum_req_ans': fields.integer('Maximum Required Answer'),
+        'minimum_req_ans': fields.integer('Minimum Required Answer'),
+        'req_error_msg': fields.text('Error Message'),
+        'allow_comment': fields.boolean('Allow Comment Field'),
+        'sequence': fields.integer('Sequence'),
+        'tot_resp': fields.function(_calc_response, method=True, string="Total Response"),
+        'survey': fields.related('page_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
+        'descriptive_text': fields.text('Descriptive Text', size=255),
+        'column_heading_ids': fields.one2many('survey.question.column.heading', 'question_id',' Column heading'),
+        'type': fields.selection([('multiple_choice_only_one_ans','Multiple Choice (Only One Answer)'),
                                      ('multiple_choice_multiple_ans','Multiple Choice (Multiple Answer)'),
                                      ('matrix_of_choices_only_one_ans','Matrix of Choices (Only One Answers Per Row)'),
                                      ('matrix_of_choices_only_multi_ans','Matrix of Choices (Multiple Answers Per Row)'),
@@ -207,65 +209,65 @@ class survey_question(osv.osv):
                                      ('date_and_time','Date and Time'),('descriptive_text','Descriptive Text'),
                                      ('table','Table'),
                                     ], 'Question Type',  required=1,),
-        'is_comment_require' : fields.boolean('Add Comment Field (optional)'),
-        'comment_label' : fields.char('Field Label', size = 255),
-        'comment_field_type' : fields.selection([('char', 'Single Line Of Text'), ('text', 'Paragraph of Text')], 'Comment Field Type'),
-        'comment_valid_type' : fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''),
+        'is_comment_require': fields.boolean('Add Comment Field (optional)'),
+        'comment_label': fields.char('Field Label', size = 255),
+        'comment_field_type': fields.selection([('char', 'Single Line Of Text'), ('text', 'Paragraph of Text')], 'Comment Field Type'),
+        'comment_valid_type': fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''),
                                                  ('must_be_specific_length', 'Must Be Specific Length'),
                                                  ('must_be_whole_number', 'Must Be A Whole Number'),
                                                  ('must_be_decimal_number', 'Must Be A Decimal Number'),
                                                  ('must_be_date', 'Must Be A Date'),
                                                  ('must_be_email_address', 'Must Be An Email Address'),
                                                  ], 'Text Validation'),
-        'comment_minimum_no' : fields.integer('Minimum number'),
-        'comment_maximum_no' : fields.integer('Maximum number'),
-        'comment_minimum_float' : fields.float('Minimum decimal number'),
-        'comment_maximum_float' : fields.float('Maximum decimal number'),
-        'comment_minimum_date' : fields.date('Minimum date'),
-        'comment_maximum_date' : fields.date('Maximum date'),
-        'comment_valid_err_msg' : fields.text('Error message'),
-        'make_comment_field' : fields.boolean('Make Comment Field an Answer Choice'),
-        'make_comment_field_err_msg' : fields.text('Error message'),
-        'is_validation_require' : fields.boolean('Validate Text (optional)'),
-        'validation_type' : fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''),\
+        'comment_minimum_no': fields.integer('Minimum number'),
+        'comment_maximum_no': fields.integer('Maximum number'),
+        'comment_minimum_float': fields.float('Minimum decimal number'),
+        'comment_maximum_float': fields.float('Maximum decimal number'),
+        'comment_minimum_date': fields.date('Minimum date'),
+        'comment_maximum_date': fields.date('Maximum date'),
+        'comment_valid_err_msg': fields.text('Error message'),
+        'make_comment_field': fields.boolean('Make Comment Field an Answer Choice'),
+        'make_comment_field_err_msg': fields.text('Error message'),
+        'is_validation_require': fields.boolean('Validate Text (optional)'),
+        'validation_type': fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''),\
                                                  ('must_be_specific_length', 'Must Be Specific Length'),\
                                                  ('must_be_whole_number', 'Must Be A Whole Number'),\
                                                  ('must_be_decimal_number', 'Must Be A Decimal Number'),\
                                                  ('must_be_date', 'Must Be A Date'),\
                                                  ('must_be_email_address', 'Must Be An Email Address')\
                                                  ], 'Text Validation'),
-        'validation_minimum_no' : fields.integer('Minimum number'),
-        'validation_maximum_no' : fields.integer('Maximum number'),
-        'validation_minimum_float' : fields.float('Minimum decimal number'),
-        'validation_maximum_float' : fields.float('Maximum decimal number'),
-        'validation_minimum_date' : fields.date('Minimum date'),
-        'validation_maximum_date' : fields.date('Maximum date'),
-        'validation_valid_err_msg' : fields.text('Error message'),
-        'numeric_required_sum' : fields.integer('Sum of all choices'),
-        'numeric_required_sum_err_msg' : fields.text('Error message'),
-        'rating_allow_one_column_require' : fields.boolean('Allow Only One Response per Column (Forced Ranking)'),
-        'in_visible_rating_weight':fields.boolean('Is Rating Scale Invisible?'),
-        'in_visible_menu_choice':fields.boolean('Is Menu Choice Invisible?'),
-        'in_visible_answer_type':fields.boolean('Is Answer Type Invisible?'),
-        'comment_column':fields.boolean('Add comment column in matrix'),
-        'column_name':fields.char('Column Name',size=256),
-        'no_of_rows' : fields.integer('No of Rows'),
+        'validation_minimum_no': fields.integer('Minimum number'),
+        'validation_maximum_no': fields.integer('Maximum number'),
+        'validation_minimum_float': fields.float('Minimum decimal number'),
+        'validation_maximum_float': fields.float('Maximum decimal number'),
+        'validation_minimum_date': fields.date('Minimum date'),
+        'validation_maximum_date': fields.date('Maximum date'),
+        'validation_valid_err_msg': fields.text('Error message'),
+        'numeric_required_sum': fields.integer('Sum of all choices'),
+        'numeric_required_sum_err_msg': fields.text('Error message'),
+        'rating_allow_one_column_require': fields.boolean('Allow Only One Response per Column (Forced Ranking)'),
+        'in_visible_rating_weight': fields.boolean('Is Rating Scale Invisible?'),
+        'in_visible_menu_choice': fields.boolean('Is Menu Choice Invisible?'),
+        'in_visible_answer_type': fields.boolean('Is Answer Type Invisible?'),
+        'comment_column': fields.boolean('Add comment column in matrix'),
+        'column_name': fields.char('Column Name',size=256),
+        'no_of_rows': fields.integer('No of Rows'),
     }
     _defaults = {
-         'sequence' : lambda * a: 1,
-         'type' : lambda * a: 'multiple_choice_multiple_ans',
-         'req_error_msg' : lambda * a: 'This question requires an answer.',
-         'required_type' : lambda * a: 'at least',
-         'req_ans' : lambda * a: 1,
-         'comment_field_type' : lambda * a: 'char',
-         'comment_label' : lambda * a: 'Other (please specify)',
-         'comment_valid_type' : lambda * a: 'do_not_validate',
-         'comment_valid_err_msg' : lambda * a : 'The comment you entered is in an invalid format.',
-         'validation_type' : lambda * a: 'do_not_validate',
-         'validation_valid_err_msg' : lambda * a : 'The comment you entered is in an invalid format.',
-         'numeric_required_sum_err_msg' : lambda * a :'The choices need to add up to [enter sum here].',
-         'make_comment_field_err_msg' : lambda * a : 'Please enter a comment.',
-         'in_visible_answer_type' : lambda * a: 1
+         'sequence': lambda * a: 1,
+         'type': lambda * a: 'multiple_choice_multiple_ans',
+         'req_error_msg': lambda * a: 'This question requires an answer.',
+         'required_type': lambda * a: 'at least',
+         'req_ans': lambda * a: 1,
+         'comment_field_type': lambda * a: 'char',
+         'comment_label': lambda * a: 'Other (please specify)',
+         'comment_valid_type': lambda * a: 'do_not_validate',
+         'comment_valid_err_msg': lambda * a : 'The comment you entered is in an invalid format.',
+         'validation_type': lambda * a: 'do_not_validate',
+         'validation_valid_err_msg': lambda * a : 'The comment you entered is in an invalid format.',
+         'numeric_required_sum_err_msg': lambda * a :'The choices need to add up to [enter sum here].',
+         'make_comment_field_err_msg': lambda * a : 'Please enter a comment.',
+         'in_visible_answer_type': lambda * a: 1
     }
 
     def on_change_type(self, cr, uid, ids, type, context=None):
@@ -280,23 +282,25 @@ class survey_question(osv.osv):
             return {'value': val}
 
         if type in ['rating_scale']:
-            val.update({'in_visible_rating_weight':False,'in_visible_menu_choice':True})
+            val.update({'in_visible_rating_weight':False, 'in_visible_menu_choice':True})
             return {'value': val}
 
         elif type in ['matrix_of_drop_down_menus']:
-            val.update({'in_visible_rating_weight':True,'in_visible_menu_choice':False})
+            val.update({'in_visible_rating_weight':True, 'in_visible_menu_choice':False})
             return {'value': val}
 
         elif type in ['single_textbox']:
-            val.update({'in_visible_rating_weight':True,'in_visible_menu_choice':True})
+            val.update({'in_visible_rating_weight':True, 'in_visible_menu_choice':True})
             return {'value': val}
 
         else:
-            val.update({'in_visible_rating_weight':True,'in_visible_menu_choice':True,'in_visible_answer_type':True})
+            val.update({'in_visible_rating_weight':True, 'in_visible_menu_choice':True,\
+                         'in_visible_answer_type':True})
             return {'value': val}
 
     def write(self, cr, uid, ids, vals, context=None):
-        questions = self.read(cr,uid, ids, ['answer_choice_ids', 'type', 'required_type','req_ans', 'minimum_req_ans', 'maximum_req_ans', 'column_heading_ids'])
+        questions = self.read(cr,uid, ids, ['answer_choice_ids', 'type', 'required_type',\
+                        'req_ans', 'minimum_req_ans', 'maximum_req_ans', 'column_heading_ids'])
         for question in questions:
             col_len = len(question['column_heading_ids'])
             if vals.has_key('column_heading_ids'):
@@ -311,7 +315,8 @@ class survey_question(osv.osv):
             else:
                 que_type = question['type']
 
-            if que_type in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale']:
+            if que_type in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans',\
+                             'matrix_of_drop_down_menus', 'rating_scale']:
                 if not col_len:
                     raise osv.except_osv(_('Error !'),_("You must enter one or more column heading."))
             ans_len = len(question['answer_choice_ids'])
@@ -333,14 +338,20 @@ class survey_question(osv.osv):
             else:
                 req_type = question['required_type']
 
-            if que_type in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time']:
+            if que_type in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans', \
+                        'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus',\
+                         'rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time']:
                 if req_type in ['at least', 'at most', 'exactly']:
                     if vals.has_key('req_ans'):
                         if not vals['req_ans'] or  vals['req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                            raise osv.except_osv(_('Error !'),_("#Required Answer you entered \
+                                    is greater than the number of answer. \
+                                    Please use a number that is smaller than %d.") % (ans_len + 1))
                     else:
                         if not question['req_ans'] or  question['req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                            raise osv.except_osv(_('Error !'),_("#Required Answer you entered is \
+                                    greater than the number of answer.\
+                                    Please use a number that is smaller than %d.") % (ans_len + 1))
 
                 if req_type == 'a range':
                     minimum_ans = 0
@@ -348,28 +359,40 @@ class survey_question(osv.osv):
                     if vals.has_key('minimum_req_ans'):
                         minimum_ans = vals['minimum_req_ans']
                         if not vals['minimum_req_ans'] or  vals['minimum_req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                            raise osv.except_osv(_('Error !'),_("Minimum Required Answer\
+                                     you entered is greater than the number of answer.\
+                                    Please use a number that is smaller than %d.") % (ans_len + 1))
                     else:
                         minimum_ans = question['minimum_req_ans']
                         if not question['minimum_req_ans'] or  question['minimum_req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                            raise osv.except_osv(_('Error !'),_("Minimum Required Answer you\
+                                     entered is greater than the number of answer. \
+                                     Please use a number that is smaller than %d.") % (ans_len + 1))
                     if vals.has_key('maximum_req_ans'):
                         maximum_ans = vals['maximum_req_ans']
                         if not vals['maximum_req_ans'] or vals['maximum_req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                            raise osv.except_osv(_('Error !'),_("Maximum Required Answer you \
+                                    entered for your maximum is greater than the number of answer.\
+                                     Please use a number that is smaller than %d.") % (ans_len + 1))
                     else:
                         maximum_ans = question['maximum_req_ans']
                         if not question['maximum_req_ans'] or question['maximum_req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (ans_len + 1))
+                            raise osv.except_osv(_('Error !'),_("Maximum Required Answer you\
+                                     entered for your maximum is greater than the number of answer.\
+                                      Please use a number that is smaller than %d.") % (ans_len + 1))
                     if maximum_ans <= minimum_ans:
-                        raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
+                        raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater \
+                                    than Minimum Required Answer"))
 
             if question['type'] ==  'matrix_of_drop_down_menus' and vals.has_key('column_heading_ids'):
                 for col in vals['column_heading_ids']:
                     if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
-                        raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading"))
-                    elif not col[2] or not col[2].has_key('menu_choice') or col[2]['menu_choice'].strip() == '':
-                        raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
+                        raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices\
+                                 in column heading"))
+                    elif not col[2] or not col[2].has_key('menu_choice') or\
+                             col[2]['menu_choice'].strip() == '':
+                        raise osv.except_osv(_('Error !'),_("You must enter one or more menu \
+                                choices in column heading (white spaces not allowed)"))
 
         return super(survey_question, self).write(cr, uid, ids, vals, context=context)
 
@@ -420,7 +443,7 @@ class survey_question(osv.osv):
                 'res_model': 'survey.question.wiz',
                 'type': 'ir.actions.act_window',
                 'target': 'new',
-                'search_view_id':search_id[0],
+                'search_view_id': search_id[0],
                 'context': context
                 }
 
@@ -452,16 +475,16 @@ class survey_question_column_heading(osv.osv):
         return False
 
     _columns = {
-        'title' : fields.char('Column Heading', size=128, required=1),
-        'menu_choice' : fields.text('Menu Choice'),
-        'rating_weight' : fields.integer('Weight'),
-        'question_id' : fields.many2one('survey.question', 'Question', ondelete='cascade'),
-        'in_visible_rating_weight':fields.boolean('Is Rating Scale Invisible ??'),
-        'in_visible_menu_choice':fields.boolean('Is Menu Choice Invisible??')
+        'title': fields.char('Column Heading', size=128, required=1),
+        'menu_choice': fields.text('Menu Choice'),
+        'rating_weight': fields.integer('Weight'),
+        'question_id': fields.many2one('survey.question', 'Question', ondelete='cascade'),
+        'in_visible_rating_weight': fields.boolean('Is Rating Scale Invisible ??'),
+        'in_visible_menu_choice': fields.boolean('Is Menu Choice Invisible??')
     }
     _defaults={
-       'in_visible_rating_weight':_get_in_visible_rating_weight,
-       'in_visible_menu_choice':_get_in_visible_menu_choice,
+       'in_visible_rating_weight': _get_in_visible_rating_weight,
+       'in_visible_menu_choice': _get_in_visible_menu_choice,
     }
 
 survey_question_column_heading()
@@ -498,14 +521,16 @@ class survey_answer(osv.osv):
         return False
 
     _columns = {
-        'question_id' : fields.many2one('survey.question', 'Question', ondelete='cascade'),
-        'answer' : fields.char('Answer', size=128, required=1),
-        'sequence' : fields.integer('Sequence'),
-        'response' : fields.function(_calc_response_avg, method=True, string="#Response", multi='sums'),
-        'average' : fields.function(_calc_response_avg, method=True, string="#Avg", multi='sums'),
-        'type' : fields.selection([('char','Character'),('date','Date'),('datetime','Date & Time'),('integer','Integer'),('float','Float'),('selection','Selection'),('email','Email')], "Type of Answer",required=1),
-        'menu_choice' : fields.text('Menu Choices'),
-        'in_visible_answer_type':fields.boolean('Is Answer Type Invisible??')
+        'question_id': fields.many2one('survey.question', 'Question', ondelete='cascade'),
+        'answer': fields.char('Answer', size=128, required=1),
+        'sequence': fields.integer('Sequence'),
+        'response': fields.function(_calc_response_avg, method=True, string="#Response", multi='sums'),
+        'average': fields.function(_calc_response_avg, method=True, string="#Avg", multi='sums'),
+        'type': fields.selection([('char','Character'),('date','Date'),('datetime','Date & Time'),\
+                    ('integer','Integer'),('float','Float'),('selection','Selection'),\
+                    ('email','Email')], "Type of Answer",required=1),
+        'menu_choice': fields.text('Menu Choices'),
+        'in_visible_answer_type': fields.boolean('Is Answer Type Invisible??')
     }
     _defaults = {
          'sequence' : lambda * a: 1,
@@ -529,9 +554,11 @@ class survey_response(osv.osv):
         'survey_id' : fields.many2one('survey', 'Survey', required=1, ondelete='cascade'),
         'date_create' : fields.datetime('Create Date', required=1),
         'user_id' : fields.many2one('res.users', 'User'),
-        'response_type' : fields.selection([('manually', 'Manually'), ('link', 'Link')], 'Response Type', required=1, readonly=1),
+        'response_type' : fields.selection([('manually', 'Manually'), ('link', 'Link')], \
+                                    'Response Type', required=1, readonly=1),
         'question_ids' : fields.one2many('survey.response.line', 'response_id', 'Response Answer'),
-        'state' : fields.selection([('done', 'Finished '),('skip', 'Not Finished')], 'Status', readonly=True),
+        'state' : fields.selection([('done', 'Finished '),('skip', 'Not Finished')], \
+                            'Status', readonly=True),
     }
     _defaults = {
         'state' : lambda * a: "skip",
@@ -558,15 +585,18 @@ class survey_response_line(osv.osv):
     _description = 'Survey Response Line'
     _rec_name = 'date_create'
     _columns = {
-        'response_id' : fields.many2one('survey.response', 'Response', ondelete='cascade'),
-        'date_create' : fields.datetime('Create Date', required=1),
-        'state' : fields.selection([('draft', 'Draft'), ('done', 'Answered'),('skip', 'Skiped')], 'Status', readonly=True),
-        'question_id' : fields.many2one('survey.question', 'Question'),
-        'page_id' : fields.related('question_id', 'page_id', type='many2one', relation='survey.page', string='Page'),
-        'response_answer_ids' : fields.one2many('survey.response.answer', 'response_id', 'Response Answer'),
-        'response_table_ids' : fields.one2many('survey.tbl.column.heading', 'response_table_id', 'Response Answer'),
-        'comment' : fields.text('Notes'),
-        'single_text' : fields.char('Text', size=255),
+        'response_id': fields.many2one('survey.response', 'Response', ondelete='cascade'),
+        'date_create': fields.datetime('Create Date', required=1),
+        'state': fields.selection([('draft', 'Draft'), ('done', 'Answered'),('skip', 'Skiped')],\
+                                   'Status', readonly=True),
+        'question_id': fields.many2one('survey.question', 'Question'),
+        'page_id': fields.related('question_id', 'page_id', type='many2one', \
+                                  relation='survey.page', string='Page'),
+        'response_answer_ids': fields.one2many('survey.response.answer', 'response_id', 'Response Answer'),
+        'response_table_ids': fields.one2many('survey.tbl.column.heading', \
+                                    'response_table_id', 'Response Answer'),
+        'comment': fields.text('Notes'),
+        'single_text': fields.char('Text', size=255),
     }
     _defaults = {
         'state' : lambda * a: "draft",
@@ -578,10 +608,10 @@ class survey_tbl_column_heading(osv.osv):
     _name = 'survey.tbl.column.heading'
     _order = 'name'
     _columns = {
-        'name' : fields.integer('Row Number'),
-        'column_id' : fields.many2one('survey.question.column.heading', 'Column'),
-        'value' : fields.char('Value', size = 255),
-        'response_table_id' : fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
+        'name': fields.integer('Row Number'),
+        'column_id': fields.many2one('survey.question.column.heading', 'Column'),
+        'value': fields.char('Value', size = 255),
+        'response_table_id': fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
     }
 
 survey_tbl_column_heading()
@@ -591,13 +621,13 @@ class survey_response_answer(osv.osv):
     _description = 'Survey Response Answer'
     _rec_name = 'response_id'
     _columns = {
-        'response_id' : fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
-        'answer_id' : fields.many2one('survey.answer', 'Answer', required=1, ondelete='cascade'),
-        'column_id' : fields.many2one('survey.question.column.heading','Column'),
-        'answer' : fields.char('Value', size =255),
-        'value_choice' : fields.char('Value Choice', size =255),
-        'comment' : fields.text('Notes'),
-        'comment_field' : fields.char('Comment', size = 255)
+        'response_id': fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
+        'answer_id': fields.many2one('survey.answer', 'Answer', required=1, ondelete='cascade'),
+        'column_id': fields.many2one('survey.question.column.heading','Column'),
+        'answer': fields.char('Value', size =255),
+        'value_choice': fields.char('Value Choice', size =255),
+        'comment': fields.text('Notes'),
+        'comment_field': fields.char('Comment', size = 255)
     }
 
 survey_response_answer()
@@ -616,16 +646,16 @@ class survey_request(osv.osv):
     _order = 'date_deadline'
     _rec_name = 'date_deadline'
     _columns = {
-        'date_deadline' : fields.date("Deadline date"),
-        'user_id' : fields.many2one("res.users", "User"),
-        'email' : fields.char("E-mail", size=64),
-        'survey_id' : fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
-        'response' : fields.many2one('survey.response', 'Answer'),
-        'state' : fields.selection([('draft','Draft'),('waiting_answer', 'Wating Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
+        'date_deadline': fields.date("Deadline date"),
+        'user_id': fields.many2one("res.users", "User"),
+        'email': fields.char("E-mail", size=64),
+        'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
+        'response': fields.many2one('survey.response', 'Answer'),
+        'state': fields.selection([('draft','Draft'),('waiting_answer', 'Wating Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
     }
     _defaults = {
-        'state' : lambda * a: 'draft',
-        'date_deadline' : lambda * a :  (now() + RelativeDateTime(months=+1)).strftime("%Y-%m-%d %H:%M:%S")
+        'state': lambda * a: 'draft',
+        'date_deadline': lambda * a :  (now() + RelativeDateTime(months=+1)).strftime("%Y-%m-%d %H:%M:%S")
     }
     def survey_req_waiting_answer(self, cr, uid, ids, arg):
         self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index adbde6f9941..3037ae2417e 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -36,10 +36,11 @@ class survey_question_wiz(osv.osv_memory):
     _columns = {
         'name': fields.integer('Number'),
     }
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
-        Fields View Get method :- generate the new view and display the survey pages of selected survey. 
-       
+        Fields View Get method :- generate the new view and display the survey pages of selected survey.
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -48,9 +49,10 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for created view of particular survey pages.
         """
-        
-        result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
-        
+
+        result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, \
+                                        view_type, context, toolbar,submenu)
+
         surv_name_wiz = self.pool.get('survey.name.wiz')
         survey_obj = self.pool.get('survey')
         page_obj = self.pool.get('survey.page')
@@ -64,11 +66,11 @@ class survey_question_wiz(osv.osv_memory):
             wiz_id = 0
             if not context.has_key('sur_name_id'):
                 res_data = {
-                    'survey_id' : context.get('survey_id', False),
-                    'page_no' :-1,
-                    'page':'next',
-                    'transfer' :1,
-                    'response':0
+                    'survey_id': context.get('survey_id', False),
+                    'page_no': -1,
+                    'page': 'next',
+                    'transfer': 1,
+                    'response': 0
                 }
                 wiz_id = surv_name_wiz.create(cr, uid, res_data)
                 sur_name_rec = surv_name_wiz.browse(cr, uid, wiz_id)
@@ -86,7 +88,8 @@ class survey_question_wiz(osv.osv_memory):
             pre_button = False
             readonly = 0
 
-            if context.has_key('response_id') and context.get('response_id', False) and int(context['response_id'][0]) > 0:
+            if context.has_key('response_id') and context.get('response_id', False) \
+                            and int(context['response_id'][0]) > 0:
                 readonly = 1
 
             if not sur_name_rec.page_no + 1 :
@@ -100,7 +103,8 @@ class survey_question_wiz(osv.osv_memory):
                 fields = {}
                 if sur_name_read.page == "next" or sur_name_rec.page_no == -1:
                     if total_pages > sur_name_rec.page_no + 1:
-                        if ((context.has_key('active') and not context.get('active', False)) or not context.has_key('active')) and not sur_name_rec.page_no + 1:
+                        if ((context.has_key('active') and not context.get('active', False)) \
+                                    or not context.has_key('active')) and not sur_name_rec.page_no + 1:
                             if sur_rec.state != "open" :
                                 raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
                             cr.execute('select count(id) from survey_history where user_id=%s\
@@ -123,7 +127,8 @@ class survey_question_wiz(osv.osv_memory):
                 else:
                     if sur_name_rec.page_no != 0:
                         p_id = p_id[sur_name_rec.page_no - 1]
-                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'page_no' : sur_name_rec.page_no - 1})
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)],\
+                                             {'page_no' : sur_name_rec.page_no - 1})
                         flag = True
                         page_number -= 1
 
@@ -133,7 +138,8 @@ class survey_question_wiz(osv.osv_memory):
                     pag_rec = page_obj.browse(cr, uid, p_id)
                     xml_form = etree.Element('form', {'string': _(tools.ustr(pag_rec.title))})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-                    if context.has_key('response_id') and context.get('response_id', False)  and int(context.get('response_id',0)[0]) > 0:
+                    if context.has_key('response_id') and context.get('response_id', False) \
+                         and int(context.get('response_id',0)[0]) > 0:
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '40', 'colspan': '4'})
                         record = sur_response_obj.browse(cr, uid, context['response_id'][context['response_no']])
                         etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr('Answer Of :- ' + record.user_id.name + ',  Date :- ' + record.date_create.split('.')[0]  )), 'align':"0.0"})
@@ -165,13 +171,14 @@ class survey_question_wiz(osv.osv_memory):
                             star = ''
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '4'})
 
-                        if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
+                        if context.has_key('active') and context.get('active',False) and \
+                                    context.has_key('edit'):
                             xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
                             etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
                             xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
-                            context.update({'question_id' : tools.ustr(que.id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer, 'page_id' : p_id})
-                            etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-edit", 'type' :'object', 'name':"action_edit_question", 'context' : tools.ustr(context)})
-                            etree.SubElement(xml_group1, 'button', {'string' :'','icon': "gtk-delete", 'type' :'object','name':"action_delete_question", 'context' : tools.ustr(context)})
+                            context.update({'question_id' : tools.ustr(que.id),'page_number': sur_name_rec.page_no , 'transfer' : sur_name_read.transfer, 'page_id' : p_id})
+                            etree.SubElement(xml_group1, 'button', {'string':'','icon': "gtk-edit", 'type' :'object', 'name':"action_edit_question", 'context' : tools.ustr(context)})
+                            etree.SubElement(xml_group1, 'button', {'string':'','icon': "gtk-delete", 'type' :'object','name':"action_delete_question", 'context' : tools.ustr(context)})
                         else:
                             xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '4'})
@@ -184,13 +191,13 @@ class survey_question_wiz(osv.osv_memory):
                             for ans in ans_ids:
                                 selection.append((tools.ustr(ans.id), ans.answer))
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '2', 'colspan': '2'})
-                            etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_selection"})
+                            etree.SubElement(xml_group, 'field', {'readonly':str(readonly), 'name': tools.ustr(que.id) + "_selection"})
                             fields[tools.ustr(que.id) + "_selection"] = {'type':'selection', 'selection' :selection, 'string':"Answer"}
 
                         elif que_rec.type == 'multiple_choice_multiple_ans':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_" + tools.ustr(ans.id)})
+                                etree.SubElement(xml_group, 'field', {'readonly':str(readonly), 'name': tools.ustr(que.id) + "_" + tools.ustr(ans.id)})
                                 fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id)] = {'type':'boolean', 'string':ans.answer}
 
                         elif que_rec.type in ['matrix_of_choices_only_one_ans', 'rating_scale']:
@@ -203,7 +210,7 @@ class survey_question_wiz(osv.osv_memory):
                             xml_group = etree.SubElement(xml_group, 'group', {'col': tools.ustr(col), 'colspan': tools.ustr(colspan)})
                             for row in ans_ids:
                                 etree.SubElement(xml_group, 'newline')
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_selection_" + tools.ustr(row.id),'string':to_xml(tools.ustr(row.answer))})
+                                etree.SubElement(xml_group, 'field', {'readonly': str(readonly), 'name': tools.ustr(que.id) + "_selection_" + tools.ustr(row.id),'string':to_xml(tools.ustr(row.answer))})
                                 selection = [('','')]
                                 for col in que_rec.column_heading_ids:
                                     selection.append((str(col.id), col.title))
@@ -249,7 +256,7 @@ class survey_question_wiz(osv.osv_memory):
                                 elif que_rec.validation_type in ['must_be_date']:
                                     type = "date"
                             for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"})
+                                etree.SubElement(xml_group, 'field', {'readonly': str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"})
                                 if type == "char" :
                                     fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"] = {'type':'char', 'size':255, 'string':ans.answer}
                                 else:
@@ -258,19 +265,19 @@ class survey_question_wiz(osv.osv_memory):
                         elif que_rec.type == 'numerical_textboxes':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_numeric"})
+                                etree.SubElement(xml_group, 'field', {'readonly': str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_numeric"})
                                 fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_numeric"] = {'type':'integer', 'string':ans.answer}
 
                         elif que_rec.type == 'date':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id)})
+                                etree.SubElement(xml_group, 'field', {'readonly': str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id)})
                                 fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id)] = {'type':'date', 'string':ans.answer}
 
                         elif que_rec.type == 'date_and_time':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '4', 'colspan': '4'})
                             for ans in ans_ids:
-                                etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id)})
+                                etree.SubElement(xml_group, 'field', {'readonly': str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id)})
                                 fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id)] = {'type':'datetime', 'string':ans.answer}
 
                         elif que_rec.type == 'descriptive_text':
@@ -279,7 +286,7 @@ class survey_question_wiz(osv.osv_memory):
 
                         elif que_rec.type == 'single_textbox':
                             etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_single", 'nolabel':"1" ,'colspan':"4"})
-                            fields[tools.ustr(que.id) + "_single"] = {'type':'char', 'size' : 255, 'string':"single_textbox", 'views':{}}
+                            fields[tools.ustr(que.id) + "_single"] = {'type':'char', 'size': 255, 'string':"single_textbox", 'views':{}}
 
                         elif que_rec.type == 'comment':
                             etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_comment", 'nolabel':"1" ,'colspan':"4"})
@@ -299,9 +306,9 @@ class survey_question_wiz(osv.osv_memory):
                             for ans in ans_ids:
                                 if ans.type == "email" :
                                     fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"] = {'type':'char', 'size':255, 'string':ans.answer}
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'widget':'email','width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"})
+                                    etree.SubElement(xml_group, 'field', {'readonly': str(readonly), 'widget':'email','width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"})
                                 else:
-                                    etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"})
+                                    etree.SubElement(xml_group, 'field', {'readonly': str(readonly), 'width':"300",'colspan': '1','name': tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"})
                                     if ans.type == "char" :
                                         fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id) + "_multi"] = {'type':'char', 'size':255, 'string':ans.answer}
                                     elif ans.type in ['integer','float','date','datetime']:
@@ -391,7 +398,7 @@ class survey_question_wiz(osv.osv_memory):
                         os.remove(tools.config['addons_path'] + '/survey/report/' + survey_data.title + ".pdf")
                         user_email = False
                         resp_email = False
-                        
+
                         address_id = user_obj.browse(cr, uid, uid).address_id.id
                         if address_id:
                             cr.execute("select email from res_partner_address where id =%d" % address_id)
@@ -420,7 +427,7 @@ class survey_question_wiz(osv.osv_memory):
     def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
         """
         If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Response' set True in survey  then send mail on responsible person of this survey and attach survey answer report in pdf format.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -449,7 +456,7 @@ class survey_question_wiz(osv.osv_memory):
     def default_get(self, cr, uid, fields_list, context=None):
         """
         Assign Default value in particular field. If Browse Answers wizard run then read the value into database and Assigne to a particular fields.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -465,7 +472,7 @@ class survey_question_wiz(osv.osv_memory):
                 value[field] = tot_per
         response_obj = self.pool.get('survey.response')
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        
+
         if context.has_key('response_id') and context.get('response_id') and int(context['response_id'][0]) > 0:
             data = super(survey_question_wiz, self).default_get(cr, uid, fields_list, context)
             response_ans = response_obj.browse(cr, uid, context['response_id'][context['response_no']])
@@ -516,7 +523,7 @@ class survey_question_wiz(osv.osv_memory):
                 return value
             if context.has_key('active') and context.get('active',False):
                 return value
-            
+
             sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
             ans_list = []
             for key,val in sur_name_read['store_ans'].items():
@@ -529,7 +536,7 @@ class survey_question_wiz(osv.osv_memory):
     def create(self, cr, uid, vals, context=None):
         """
         Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -561,7 +568,7 @@ class survey_question_wiz(osv.osv_memory):
 
         if not sur_name_read['response']:
             response_id = surv_all_resp_obj.create(cr, uid, {'response_type':'link', 'user_id':uid, 'date_create':datetime.datetime.now(), 'survey_id' : context['survey_id']})
-            surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'response' : tools.ustr(response_id)})
+            surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'response' : tools.ustr(response_id)})
         else:
             response_id = int(sur_name_read['response'])
 
@@ -598,10 +605,10 @@ class survey_question_wiz(osv.osv_memory):
                     que_li.append(que_id)
                     que_rec = que_obj.read(cr, uid, [int(que_id)], [])[0]
                     res_data =  {
-                        'question_id':que_id, 
-                        'date_create':datetime.datetime.now(),
-                        'state':'done',
-                        'response_id' : response_id
+                        'question_id': que_id,
+                        'date_create': datetime.datetime.now(),
+                        'state': 'done',
+                        'response_id': response_id
                     }
                     resp_id = resp_obj.create(cr, uid, res_data)
                     resp_id_list.append(resp_id)
@@ -920,7 +927,7 @@ class survey_question_wiz(osv.osv_memory):
                                 try:
                                     numeric_sum += int(val)
                                     resp_obj.write(cr, uid, update, {'state': 'done'})
-                                    ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : val})
+                                    ans_create_id = res_ans_obj.create(cr, uid, {'response_id': update, 'answer_id':ans_id_len[1], 'answer' : val})
                                     sur_name_read['store_ans'][update].update({key:val})
                                     select_count += 1
                                 except:
@@ -929,20 +936,20 @@ class survey_question_wiz(osv.osv_memory):
                         elif val and len(key.split('_')) == 3:
                             resp_obj.write(cr, uid, update, {'state': 'done'})
                             if type(val) == type('') or type(val) == type(u''):
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'column_id' : ans_id_len[2], 'value_choice' : val})
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id': update, 'answer_id':ans_id_len[1], 'column_id' : ans_id_len[2], 'value_choice' : val})
                                 sur_name_read['store_ans'][update].update({key:val})
                             else:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'column_id' : ans_id_len[2]})
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id': update, 'answer_id':ans_id_len[1], 'column_id' : ans_id_len[2]})
                                 sur_name_read['store_ans'][update].update({key:True})
                             matrix_list.append(key.split('_')[0] + '_' + key.split('_')[1])
                             select_count += 1
 
                         elif val and len(key.split('_')) == 2:
                             resp_obj.write(cr, uid, update, {'state': 'done'})
-                            ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[-1], 'answer' : val})
+                            ans_create_id = res_ans_obj.create(cr, uid, {'response_id': update, 'answer_id':ans_id_len[-1], 'answer' : val})
                             sur_name_read['store_ans'][update].update({key:val})
                             select_count += 1
-                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans':sur_name_read['store_ans']})
+                        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'store_ans': sur_name_read['store_ans']})
 
                 for key,val in vals.items():
                     if val and key.split('_')[1] == "commentcolumn" and key.split('_')[0] == sur_name_read['store_ans'][update]['question_id']:
@@ -987,7 +994,7 @@ class survey_question_wiz(osv.osv_memory):
     def action_new_question(self,cr, uid, ids, context):
         """
         New survey.Question form.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -998,7 +1005,8 @@ class survey_question_wiz(osv.osv_memory):
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
-        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),('name','=','survey_question_wizard_test')])
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),\
+                            ('name','=','survey_question_wizard_test')])
         return {
             'view_type': 'form',
             "view_mode": 'form',
@@ -1012,7 +1020,7 @@ class survey_question_wiz(osv.osv_memory):
     def action_new_page(self, cr, uid, ids, context):
         """
         New survey.Page form.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1023,7 +1031,8 @@ class survey_question_wiz(osv.osv_memory):
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
-        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),('name','=','survey_page_wizard_test')])
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),\
+                                        ('name','=','survey_page_wizard_test')])
         return {
             'view_type': 'form',
             "view_mode": 'form',
@@ -1037,7 +1046,7 @@ class survey_question_wiz(osv.osv_memory):
     def action_edit_page(self,cr, uid, ids, context):
         """
         Edit survey.page.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1048,14 +1057,15 @@ class survey_question_wiz(osv.osv_memory):
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
-        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),('name','=','survey_page_wizard_test')])
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.page'),\
+                                ('name','=','survey_page_wizard_test')])
         return {
             'view_type': 'form',
             "view_mode": 'form',
             'res_model': 'survey.page',
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'res_id' : int(context.get('page_id',0)),
+            'res_id': int(context.get('page_id',0)),
             'view_id': view_id,
             'context': context
         }
@@ -1063,7 +1073,7 @@ class survey_question_wiz(osv.osv_memory):
     def action_delete_page(self,cr, uid, ids, context):
         """
         Delete survey.page.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1076,9 +1086,11 @@ class survey_question_wiz(osv.osv_memory):
                 context.pop(key)
 
         self.pool.get('survey.page').unlink(cr, uid, [context.get('page_id',False)])
-        search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),\
+                                            ('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',False) })
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], \
+                    {'transfer':True, 'page_no' : context.get('page_number',False) })
         return {
             'view_type': 'form',
             "view_mode": 'form',
@@ -1092,7 +1104,7 @@ class survey_question_wiz(osv.osv_memory):
     def action_edit_question(self,cr, uid, ids, context):
         """
         Edit survey.question.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1103,7 +1115,8 @@ class survey_question_wiz(osv.osv_memory):
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
-        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),('name','=','survey_question_wizard_test')])
+        view_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question'),\
+                                ('name','=','survey_question_wizard_test')])
         return {
             'view_type': 'form',
             "view_mode": 'form',
@@ -1118,7 +1131,7 @@ class survey_question_wiz(osv.osv_memory):
     def action_delete_question(self,cr, uid, ids, context):
         """
         Delete survey.question.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1132,23 +1145,25 @@ class survey_question_wiz(osv.osv_memory):
 
         que_obj = self.pool.get('survey.question')
         que_obj.unlink(cr, uid, [context.get('question_id',False)])
-        search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),\
+                                        ('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',0) })
+        surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)],\
+                     {'transfer':True, 'page_no' : context.get('page_number',0) })
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
                 'res_model': 'survey.question.wiz',
                 'type': 'ir.actions.act_window',
                 'target': 'new',
-                'search_view_id':search_id[0],
+                'search_view_id': search_id[0],
                 'context': context
                 }
 
     def action_forward_previous(self, cr, uid, ids, context=None):
         """
         Goes to previous Survey Answer.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1158,9 +1173,10 @@ class survey_question_wiz(osv.osv_memory):
         """
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
-        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
-        context.update({'sur_name_id' :wiz_id, 'response_no' : context.get('response_no',0) - 1})
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),\
+                                              ('name','=','Survey Search')])
+        wiz_id = surv_name_wiz.create(cr,uid, {'survey_id': context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
+        context.update({'sur_name_id' :wiz_id, 'response_no': context.get('response_no',0) - 1})
 
         if context.get('response_no',0) + 1 > len(context.get('response_id',0)):
             return {}
@@ -1170,14 +1186,14 @@ class survey_question_wiz(osv.osv_memory):
             'res_model': 'survey.question.wiz',
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'search_view_id':search_id[0],
+            'search_view_id': search_id[0],
             'context': context
         }
 
     def action_forward_next(self, cr, uid, ids, context=None):
         """
         Goes to Next Survey Answer.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1187,7 +1203,8 @@ class survey_question_wiz(osv.osv_memory):
         """
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
-        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),\
+                                    ('name','=','Survey Search')])
         wiz_id = surv_name_wiz.create(cr,uid, {'survey_id' : context.get('survey_id',False),'page_no' :-1,'page':'next','transfer' :1,'response':0})
         context.update({'sur_name_id' :wiz_id, 'response_no' : context.get('response_no',0) + 1})
 
@@ -1199,14 +1216,14 @@ class survey_question_wiz(osv.osv_memory):
             'res_model': 'survey.question.wiz',
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'search_view_id':search_id[0],
+            'search_view_id': search_id[0],
             'context': context
         }
 
     def action_next(self, cr, uid, ids, context=None):
         """
         Goes to Next page.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1224,14 +1241,14 @@ class survey_question_wiz(osv.osv_memory):
             'res_model': 'survey.question.wiz',
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'search_view_id':search_id[0],
+            'search_view_id': search_id[0],
             'context': context
         }
 
     def action_previous(self, cr, uid, ids, context=None):
         """
         Goes to previous page.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -1241,7 +1258,8 @@ class survey_question_wiz(osv.osv_memory):
         """
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
-        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
+        search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),\
+                                    ('name','=','Survey Search')])
         surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page':'previous'})
         return {
             'view_type': 'form',
@@ -1249,7 +1267,7 @@ class survey_question_wiz(osv.osv_memory):
             'res_model': 'survey.question.wiz',
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'search_view_id':search_id[0],
+            'search_view_id': search_id[0],
             'context': context
         }
 
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index ef82e1eaf87..d13d006312e 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -28,8 +28,10 @@ from tools.translate import _
 class survey_print(osv.osv_memory):
     _name = 'survey.print'
     _columns = {
-        'orientation' : fields.selection([('vertical','Portrait(Vertical)'),('horizontal','Landscape(Horizontal)')], 'Orientation'),
-        'paper_size' : fields.selection([('letter','Letter (8.5" x 11")'),('legal','Legal (8.5" x 14")'),('a4','A4 (210mm x 297mm)')], 'Paper Size'),
+        'orientation' : fields.selection([('vertical','Portrait(Vertical)'),\
+                            ('horizontal','Landscape(Horizontal)')], 'Orientation'),
+        'paper_size' : fields.selection([('letter','Letter (8.5" x 11")'),\
+                            ('legal','Legal (8.5" x 14")'),('a4','A4 (210mm x 297mm)')], 'Paper Size'),
         'survey_title' : fields.boolean('Include Survey Title'),
         'page_number' : fields.boolean('Include Page Numvers'),
         'without_pagebreak' : fields.boolean('Print Without Page Breaks'),
@@ -46,7 +48,7 @@ class survey_print(osv.osv_memory):
     def action_next(self, cr, uid, ids, context=None):
         """
         Print Survey Form(print template of the survey).
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -54,16 +56,17 @@ class survey_print(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for print survey form.
         """
-        
+
         datas = {'ids' : context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size', 'page_number', 'without_pagebreak'], context)
-        res = res and res[0] or {}  
+        res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size',\
+                             'page_number', 'without_pagebreak'], context)
+        res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print'
-        return { 
-            'type':'ir.actions.report.xml',
-            'report_name':'survey.form',
-            'datas':datas,               
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'survey.form',
+            'datas': datas,
         }
 survey_print()
 
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
index 2074a88c02f..97a6d6c7453 100644
--- a/addons/survey/wizard/survey_print_answer.py
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -27,24 +27,28 @@ from tools.translate import _
 class survey_print_answer(osv.osv_memory):
     _name = 'survey.print.answer'
     _columns = {
-        'response_ids' : fields.many2many('survey.response','survey_print_response','response_id','print_id', "Response", required="1"),
-        'orientation' : fields.selection([('vertical','Portrait(Vertical)'),('horizontal','Landscape(Horizontal)')], 'Orientation'),
-        'paper_size' : fields.selection([('letter','Letter (8.5" x 11")'),('legal','Legal (8.5" x 14")'),('a4','A4 (210mm x 297mm)')], 'Paper Size'),
-        'page_number' : fields.boolean('Include Page Numvers'),
-        'without_pagebreak' : fields.boolean('Print Without Page Breaks')
+        'response_ids': fields.many2many('survey.response','survey_print_response',\
+                            'response_id','print_id', "Response", required="1"),
+        'orientation': fields.selection([('vertical','Portrait(Vertical)'),\
+                            ('horizontal','Landscape(Horizontal)')], 'Orientation'),
+        'paper_size': fields.selection([('letter','Letter (8.5" x 11")'),\
+                            ('legal','Legal (8.5" x 14")'),\
+                            ('a4','A4 (210mm x 297mm)')], 'Paper Size'),
+        'page_number': fields.boolean('Include Page Numvers'),
+        'without_pagebreak': fields.boolean('Print Without Page Breaks')
     }
 
     _defaults = {
             'orientation': lambda *a:'vertical',
             'paper_size': lambda *a:'letter',
-            'page_number':lambda *a: 0,
-            'without_pagebreak':lambda *a: 0
+            'page_number': lambda *a: 0,
+            'without_pagebreak': lambda *a: 0
     }
 
     def action_next(self, cr, uid, ids, context=None):
         """
         Print Survey Answer in pdf format.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -52,16 +56,18 @@ class survey_print_answer(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for created survey answer report
         """
-        datas = {'ids' : context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size', 'page_number', 'without_pagebreak'], context)
-        res = res and res[0] or {}  
+        datas = {'ids': context.get('active_ids', [])}
+        res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size',\
+                             'page_number', 'without_pagebreak'], context)
+        res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print.answer'
-        return { 
-            'type':'ir.actions.report.xml',
-            'report_name':'survey.browse.response',
-            'datas':datas,               
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'survey.browse.response',
+            'datas': datas,
         }
+
 survey_print_answer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index 00c4598bfb1..2b79e96d42a 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -27,29 +27,30 @@ from tools.translate import _
 class survey_print_statistics(osv.osv_memory):
     _name = 'survey.print.statistics'
     _columns = {
-        'survey_ids': fields.many2many('survey','survey_print_statistics','survey_id','print_id', "Survey", required="1"),
+        'survey_ids': fields.many2many('survey','survey_print_statistics','survey_id',\
+                                'print_id', "Survey", required="1"),
     }
 
     def action_next(self, cr, uid, ids, context=None):
         """
         Print Survey Statistics in pdf format.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Survey statistics IDs
         @param context: A standard dictionary for contextual values
-        @return : Dictionary value for created survey statistics report
+        @return: Dictionary value for created survey statistics report
         """
-        datas = {'ids' : context.get('active_ids', [])}
+        datas = {'ids': context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['survey_ids'], context)
-        res = res and res[0] or {}  
+        res = res and res[0] or {}
         datas['form'] = res
         datas['model'] = 'survey.print.statistics'
-        return { 
-            'type':'ir.actions.report.xml',
-            'report_name':'survey.analysis',
-            'datas':datas,               
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'survey.analysis',
+            'datas': datas,
         }
 
 survey_print_statistics()
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 1dab4b9c909..b6c1ca55567 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -30,7 +30,7 @@ class survey_name_wiz(osv.osv_memory):
     def default_get(self, cr, uid, fields, context={}):
         """
         Set the default value in survey_id field. if open this wizard in survey form then set the default value in survey_id = active survey id.
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -47,14 +47,14 @@ class survey_name_wiz(osv.osv_memory):
 
     def _get_survey(self, cr, uid, context=None):
         """
-        Set the value In survey_id field. 
-       
+        Set the value In survey_id field.
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Survey statistics IDs
         @param context: A standard dictionary for contextual values
-        @return : Dictionary value for created survey statistics report
+        @return: Dictionary value for created survey statistics report
         """
         surv_obj = self.pool.get("survey")
         result = []
@@ -75,26 +75,26 @@ class survey_name_wiz(osv.osv_memory):
 
     _columns = {
         'survey_id': fields.selection(_get_survey, "Survey", required="1"),
-        'page_no' : fields.integer('Page Number'),
-        'note' : fields.text("Description"),
-        'page' : fields.char('Page Position',size = 12),
-        'transfer' : fields.boolean('Page Transfer'),
-        'store_ans' : fields.text('Store Answer'),
-        'response' : fields.char('Response',size=16)
+        'page_no': fields.integer('Page Number'),
+        'note': fields.text("Description"),
+        'page': fields.char('Page Position',size = 12),
+        'transfer': fields.boolean('Page Transfer'),
+        'store_ans': fields.text('Store Answer'),
+        'response': fields.char('Response',size=16)
     }
     _defaults = {
-        'page_no' : lambda * a: - 1,
-        'page' : lambda * a: 'next',
-        'transfer' : lambda * a: 1,
-        'response' : lambda * a: 0,
+        'page_no': lambda * a: - 1,
+        'page': lambda * a: 'next',
+        'transfer': lambda * a: 1,
+        'response': lambda * a: 0,
     }
 
     def action_next(self, cr, uid, ids, context=None):
         """
-        Start the survey, Increment in started survey field but if set the max_response_limit of 
-        survey then check the current user how many times start this survey. if current user max_response_limit 
+        Start the survey, Increment in started survey field but if set the max_response_limit of
+        survey then check the current user how many times start this survey. if current user max_response_limit
         is reach then this user can not start this survey(Raise Exception).
-       
+
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -107,7 +107,7 @@ class survey_name_wiz(osv.osv_memory):
 
         sur_id = self.read(cr, uid, ids, [])[0]
         survey_id = sur_id['survey_id']
-        context.update({'survey_id' : survey_id, 'sur_name_id' : sur_id['id']})
+        context.update({'survey_id': survey_id, 'sur_name_id': sur_id['id']})
         cr.execute('select count(id) from survey_history where user_id=%s\
                     and survey_id=%s' % (uid,survey_id))
 
@@ -115,7 +115,7 @@ class survey_name_wiz(osv.osv_memory):
         user_limit = survey_obj.read(cr, uid, survey_id, ['response_user'])['response_user']
         if user_limit and res >= user_limit:
             raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
-        
+
         sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id'])
         if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']:
             raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
@@ -128,14 +128,14 @@ class survey_name_wiz(osv.osv_memory):
             'res_model': 'survey.question.wiz',
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'search_view_id':search_id[0],
-            'context' : context
+            'search_view_id': search_id[0],
+            'context': context
          }
 
     def on_change_survey(self, cr, uid, ids, survey_id, context=None):
         """
             on change event of survey_id field, if note is available in selected survey then display this note in note fields.
-           
+
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
@@ -144,7 +144,7 @@ class survey_name_wiz(osv.osv_memory):
             @return : Dictionary values of notes fields.
         """
         notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note']
-        return {'value': {'note' : notes}}
+        return {'value': {'note': notes}}
 
 survey_name_wiz()
 
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 7286a017560..29ee447ce8a 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -37,27 +37,28 @@ import netsvc
 class survey_send_invitation(osv.osv_memory):
     _name = 'survey.send.invitation'
     _columns = {
-        'partner_ids' : fields.many2many('res.partner','survey_res_partner','partner_id','survey_id', "Response", required=1),
-        'send_mail' : fields.boolean('Send mail for new user'),
-        'send_mail_existing' : fields.boolean('Send reminder for existing user'),
-        'mail_subject' : fields.char('Subject', size=256, required=1),
-        'mail_subject_existing' : fields.char('Subject', size=256, required=1),
-        'mail_from' : fields.char('From', size=256, required=1),
-        'mail' : fields.text('Body')
+        'partner_ids': fields.many2many('res.partner','survey_res_partner','partner_id',\
+                                'survey_id', "Response", required=1),
+        'send_mail': fields.boolean('Send mail for new user'),
+        'send_mail_existing': fields.boolean('Send reminder for existing user'),
+        'mail_subject': fields.char('Subject', size=256, required=1),
+        'mail_subject_existing': fields.char('Subject', size=256, required=1),
+        'mail_from': fields.char('From', size=256, required=1),
+        'mail': fields.text('Body')
     }
 
     _defaults = {
-        'send_mail' : lambda *a: 1,
-        'send_mail_existing' : lambda *a: 1,
-        'mail_subject' : lambda *a: "New user account.",
-        'mail_subject_existing' : lambda *a: "User account info.",
-        'mail_from' : lambda *a: tools.config['email_from']
+        'send_mail': lambda *a: 1,
+        'send_mail_existing': lambda *a: 1,
+        'mail_subject': lambda *a: "New user account.",
+        'mail_subject_existing': lambda *a: "User account info.",
+        'mail_from': lambda *a: tools.config['email_from']
     }
 
     def genpasswd(self):
         chars = string.letters + string.digits
         return ''.join([choice(chars) for i in range(6)])
-    
+
     def default_get(self, cr, uid, fields_list, context=None):
         data = super(survey_send_invitation, self).default_get(cr, uid, fields_list, context)
         survey_obj = self.pool.get('survey')
@@ -71,7 +72,7 @@ class survey_send_invitation(osv.osv_memory):
             raise osv.except_osv(_('Error !'), _('%sSurvey is not in open state') % msg)
         data['mail'] = '''Hello %(name)s, \n\n We are inviting you for following survey. \
                     \n  ''' + name + '''\n Your login ID: %(login)s, Your password: %(passwd)s
-                    \n link :- http://'''+ str(socket.gethostname()) + ''':8080 \n\n Thanks,''' 
+                    \n link :- http://'''+ str(socket.gethostname()) + ''':8080 \n\n Thanks,'''
         return data
 
     def create_report(self, cr, uid, res_ids, report_name=False, file_name=False):
@@ -93,22 +94,23 @@ class survey_send_invitation(osv.osv_memory):
     def action_send(self, cr, uid, ids, context=None):
         record = self.read(cr, uid, ids, [])
         survey_ids =  context.get('active_ids', [])
-        record = record and record[0]  
+        record = record and record[0]
         partner_ids = record['partner_ids']
         user_ref= self.pool.get('res.users')
         survey_ref= self.pool.get('survey')
 
         model_data_obj = self.pool.get('ir.model.data')
         group_id = model_data_obj._get_id(cr, uid, 'survey', 'group_survey_user')
-        group_id = model_data_obj.browse(cr, uid, group_id, context=context).res_id        
+        group_id = model_data_obj.browse(cr, uid, group_id, context=context).res_id
 
         act_id = self.pool.get('ir.actions.act_window')
-        act_id = act_id.search(cr, uid, [('res_model', '=' , 'survey.name.wiz'), ('view_type', '=', 'form')])
-        out="login,password\n"
-        skipped= 0
-        existing= ""
-        created= ""
-        error= ""
+        act_id = act_id.search(cr, uid, [('res_model', '=' , 'survey.name.wiz'), \
+                        ('view_type', '=', 'form')])
+        out = "login,password\n"
+        skipped = 0
+        existing = ""
+        created = ""
+        error = ""
         res_user = ""
         user_exists = False
         attachments = []
@@ -124,7 +126,7 @@ class survey_send_invitation(osv.osv_memory):
             attachments.append((id.title +".pdf",file_data))
             file.close()
             os.remove(tools.config['addons_path'] + '/survey/report/' + id.title + ".pdf")
-    
+
         for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
             for addr in partner.address:
                 if not addr.email:
@@ -134,7 +136,7 @@ class survey_send_invitation(osv.osv_memory):
                 if user:
                     user = user_ref.browse(cr, uid, user[0])
                     user_ref.write(cr, uid, user.id, {'survey_id':[[6, 0, survey_ids]]})
-                    mail= record['mail']%{'login':addr.email, 'passwd':user.password, \
+                    mail = record['mail']%{'login':addr.email, 'passwd':user.password, \
                                                 'name' : addr.name}
                     if record['send_mail_existing']:
                         tools.email_send(record['mail_from'], [addr.email] , \
@@ -142,11 +144,11 @@ class survey_send_invitation(osv.osv_memory):
                         existing+= "- %s (Login: %s,  Password: %s)\n" % (user.name, addr.email, \
                                                                           user.password)
                     continue
-                user_id =user_ref.search(cr, uid, [('address_id', '=', addr.id)])
+                user_id = user_ref.search(cr, uid, [('address_id', '=', addr.id)])
                 if user_id:
                     for user_email in user_ref.browse(cr, uid, user_id):
-                        mail= record['mail']%{'login':user_email.login, \
-                                                        'passwd':user_email.password, 'name' : addr.name}
+                        mail = record['mail']%{'login': user_email.login, \
+                                                        'passwd': user_email.password, 'name': addr.name}
                         if record['send_mail_existing']:
                             tools.email_send(record['mail_from'], [addr.email],\
                                                   record['mail_subject_existing'], mail)
@@ -159,15 +161,15 @@ class survey_send_invitation(osv.osv_memory):
                 if record['send_mail']:
                     ans = tools.email_send(record['mail_from'], [addr.email], \
                                            record['mail_subject'], mail,attach = attachments)
-    
+
                     if ans:
-                        res_data = {'name' : addr.name or 'Unknown', 
-                                    'login' : addr.email, 
-                                    'password' : passwd, 
-                                    'address_id' : addr.id, 
-                                    'groups_id' : [[6, 0, [group_id]]], 
-                                    'action_id' : act_id[0], 
-                                    'survey_id' : [[6, 0, survey_ids]]
+                        res_data = {'name': addr.name or 'Unknown',
+                                    'login': addr.email,
+                                    'password': passwd,
+                                    'address_id': addr.id,
+                                    'groups_id': [[6, 0, [group_id]]],
+                                    'action_id': act_id[0],
+                                    'survey_id': [[6, 0, survey_ids]]
                                    }
                         user = user_ref.create(cr, uid, res_data)
                         created+= "- %s (Login: %s,  Password: %s)\n" % (addr.name or 'Unknown',\
@@ -202,10 +204,10 @@ class survey_send_invitation_log(osv.osv_memory):
     _columns = {
         'note' : fields.text('Log', readonly=1)
     }
-    
+
     def default_get(self, cr, uid, fields_list, context=None):
         data = super(survey_send_invitation_log, self).default_get(cr, uid, fields_list, context)
-        data['note'] = context.get('note','')
+        data['note'] = context.get('note', '')
         return data
 
 survey_send_invitation_log()

From 836e67c9fa22c6f193dd21c8653932bc071122a8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 26 Mar 2010 19:03:10 +0530
Subject: [PATCH 135/248] [IMP]: caldav: Improvement in export data wizard for
 binary field

bzr revid: rpa@tinyerp.com-20100326133310-jm2zsjxmoe7kam7q
---
 addons/caldav/wizard/calendar_event_export.py | 24 +++++++++----------
 .../wizard/calendar_event_export_view.xml     |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
index 042d3bc75b6..856d9e9bc91 100644
--- a/addons/caldav/wizard/calendar_event_export.py
+++ b/addons/caldav/wizard/calendar_event_export.py
@@ -32,38 +32,38 @@ class calendar_event_export(osv.osv_memory):
     """
     Export Calendar Event.
     """
-    def _process_export_ics(self, cr, uid, context):
+    def process_export_ics(self, cr, uid, ids, context):
         """
         Get Default value for file_path field.
         """
         model = context.get('model', 'basic.calendar')
         model_obj = self.pool.get(model)
-        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
-        #TODO: check why returns wrong value
-        return base64.encodestring(calendar)
 
-    def _process_export_ics_name(self, cr, uid, context):
+        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
+        self.write(cr, uid, ids, {'file_path': base64.encodestring(calendar)})
+        return False
+
+    def default_get(self, cr, uid, fields, context):
         """
         Get Default value for Name field.
         """
         model = context.get('model', 'basic.calendar')
         model_obj = self.pool.get(model)
         calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
-        return  'OpenERP %s.ics' % (model_obj._description)
+        res = super(calendar_event_export, self).default_get( cr, uid, fields, context=context)
+        name = 'OpenERP %s.ics' % (model_obj._description)
+        if 'name' in fields:
+            res.update({'name': name})
+        return  res
 
     _name = "calendar.event.export"
     _description = "Event Export"
 
     _columns = {
-              'file_path':fields.binary('Save ICS file', filters='*.ics', required=True),
+              'file_path':fields.binary('Save ICS file', filters='*.ics', readonly=True),
               'name':fields.char('File name', size=34, required=True, help='Save in .ics format')
                }
 
-    _defaults = {
-               'name': _process_export_ics_name,
-               'file_path': _process_export_ics
-               }
-
 calendar_event_export()
 
 
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
index 48b6224c2c7..227822966d0 100644
--- a/addons/caldav/wizard/calendar_event_export_view.xml
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -13,6 +13,7 @@
                     </group>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
+                    	<button name="process_export_ics"  icon="gtk-execute" string="Genetate ics" type="object"/>
                     	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
                    </group>
                </form>

From bfe78434b90b58d102b680b19967156d0b76c109 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 29 Mar 2010 10:19:37 +0530
Subject: [PATCH 136/248] [ADD] stock: Modified osv_memory wizard for 'Upstream
 Traceability' and 'Downstream Traceability' wizards.

bzr revid: mtr@mtr-20100329044937-4ma6gqd8ed5x135t
---
 addons/stock/__terp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 5fa272238d5..bc951832876 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -51,7 +51,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_location_product_view.xml",
         "wizard/stock_inventory_line_split_view.xml",
         "wizard/stock_change_standard_price_view.xml",
-       
         "wizard/stock_traceability_view.xml",
         "stock_workflow.xml",
         "stock_incoterms.xml",

From 21e88de3ce5c4f29a83182ae2e8b780c67c3d158 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Mon, 29 Mar 2010 10:46:19 +0530
Subject: [PATCH 137/248] [FIX] l10n_be: wizard l10n_be_account_vat_declaration

bzr revid: psi@tinyerp.co.in-20100329051619-kahumpk7p8afqj9a
---
 addons/l10n_be/wizard/__init__.py                        | 1 -
 addons/l10n_be/wizard/l10n_be_account_vat_declaration.py | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_be/wizard/__init__.py b/addons/l10n_be/wizard/__init__.py
index b811c54a6e4..88fb82f2d71 100644
--- a/addons/l10n_be/wizard/__init__.py
+++ b/addons/l10n_be/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import account_vat_declaration
 import partner_vat_listing
 import wizard_vat_intra
 import l10n_be_account_vat_declaration
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 490709b15ec..e68a17b2123 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -53,7 +53,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
         user_cmpny = obj_company.name
         vat_no=obj_company.partner_id.vat
         if not vat_no:
-            raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
+            raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
 
         tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
         ctx = context.copy()
@@ -105,6 +105,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
         data_of_file +='\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
         data['file_save'] = base64.encodestring(data_of_file)
         self.write(cr, uid, ids, {'file_save':data['file_save']}, context=context)
+        return True
 
 
 l10n_be_vat_declaration()

From b5c601d2db69c843c2a65903aa0f139595e01ed8 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 29 Mar 2010 11:00:54 +0530
Subject: [PATCH 138/248] [Fix]: revert the changed of <MTR> for point of sale

bzr revid: sbh@tinyerp.com-20100329053054-fb7aipahvu4mxebu
---
 addons/point_of_sale/__terp__.py              |   4 +-
 addons/point_of_sale/pos_wizard.xml           |   5 +-
 .../report/all_closed_cashbox_of_the_day.py   |   2 -
 addons/point_of_sale/report/pos_receipt.rml   |   2 -
 addons/point_of_sale/statement_report.xml     |   9 +-
 addons/point_of_sale/statement_view.xml       |   5 +-
 addons/point_of_sale/statement_wizard.xml     |  15 +-
 addons/point_of_sale/wizard/__init__.py       |   7 +
 .../wizard/all_closed_cashbox_of_the_day.py   |  60 ++
 addons/point_of_sale/wizard/pos_receipt.py    |   2 -
 addons/point_of_sale/wizard/wizard_return.py  | 546 ++++++++++++++++++
 11 files changed, 622 insertions(+), 35 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
 create mode 100644 addons/point_of_sale/wizard/wizard_return.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index b1838a28fc1..153584f6a26 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -41,7 +41,7 @@ Main features :
     'init_xml': [],
 
     'update_xml': [
-      'security/point_of_sale_security.xml',
+        'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
         'wizard/pos_details.xml',  
         'wizard/pos_add_product.xml',
@@ -72,7 +72,7 @@ Main features :
         'statement_view.xml',
         'statement_report.xml',
         'statement_data.xml',
-        'statement_wizard.xml',   
+        'statement_wizard.xml',    
     ],
     'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
     'installable': True,
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 2e09b5cc9df..50e3630c4d7 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -10,7 +10,6 @@
 
 
 
-
 <!--		<wizard string="Box Entries" model="account.bank.statement"
 				name="pos.entry" id="pos_entry" menu="False"/>-->
 
@@ -63,12 +62,12 @@
         	string="Close Statements"/>-->
 
 
-       <!--wizard
+       <wizard
         	id="wizard_all_closed_cashbox_of_the_day"
         	model="account.bank.statement"
         	menu="False"
         	name="all.closed.cashbox.of.the.day"
-        	string="All Cashboxes Of the day"/-->
+        	string="All Cashboxes Of the day"/>
 
 
 	</data>
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index f3c21da2dcb..2490d5719cd 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -138,6 +138,4 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         res = self.cr.dictfetchall()
         return res[0]['net_total'] or 0.0
 
-
 report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day)
-
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 1d5e70241c7..1d2e6edc9d0 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -104,9 +104,7 @@
         <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
         <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
         <para style="terp_default_Centre_9">Vendeur : [[ o.user_id1.name ]]</para>
-
         <para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date = True) ]]</para>
-
         <para style="P4">
             <font color="white"> </font>
         </para>
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index 7bdece39a77..8118d2e834d 100644
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -22,7 +22,7 @@
 			rml="point_of_sale/report/account_statement.rml"
 			 />
 
-		<!--report
+		<report
 			id="all_closed_cashbox_of_the_day"
 			string="All Cloded CashBOx"
 			model="account.bank.statement"
@@ -30,13 +30,8 @@
 			auto="False"
 			multi="True"
 			menu = 'False'
-<<<<<<< TREE
-			rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
-			 /-->
-=======
 			rml="point_of_sale/report/all_closed_cashbox_of_the_day.rml"
 			 />
->>>>>>> MERGE-SOURCE
 		<report
 			id="pos_users_product_re"
 			string="User's Product"
@@ -59,7 +54,7 @@
 
 		<report
 			id="all_closed_cashbox_of_the_day"
-			string="All Closed CashBOx"
+			string="All Cloded CashBOx"
 			model="account.bank.statement"
 			name="all.closed.cashbox.of.the.day"
 			auto="False"
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 7f241e5bfa8..19e7bdc13e3 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -427,10 +427,7 @@
        <menuitem icon="STOCK_PRINT"
        			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
-
-				 parent="menu_statement_tree_all"
-				/>
-
+				 parent="menu_statement_tree_all"/>
 
 		<menuitem
             name="Close Register" parent="point_of_sale.menu_point_config"
diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/statement_wizard.xml
index c4f4ddf9072..dd9715db628 100644
--- a/addons/point_of_sale/statement_wizard.xml
+++ b/addons/point_of_sale/statement_wizard.xml
@@ -16,21 +16,10 @@
 -->
 
 
-
-     <!--  <wizard
-        	id="action_report_all_closed_cashbox_of_the_day2"
-        	model="account.bank.statement"
-        	menu="False"
-        	name="all.closed.cashbox.of.the.day"
-        	string="All Cashboxes Of the day"/>-->
-
-
+       
        <menuitem icon="STOCK_PRINT"
        			 action="action_report_all_closed_cashbox_of_the_day"
 				 id="menu_all_closed_cashbox_of_the_day"
-
-				 parent="menu_point_report_register"
-				/>
-
+				 parent="menu_point_report_register"/>
     </data>
 </openerp>
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 1384fb8329a..82d9ea9409a 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -23,8 +23,15 @@
 #import wizard_pos_payment
 import wizard_default_journal
 import wizard_scan_product
+
 import wizard_return
+
+
+
+
+
 #import wizard_open_statement
+
 import pos_add_product
 import pos_confirm
 import pos_discount
diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
new file mode 100644
index 00000000000..0968c6c71d4
--- /dev/null
+++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+
+class all_closed_cashbox_of_the_day(osv.osv_memory):
+    _name = 'all.closed.cashbox.of.the.day'
+    _description = 'All closed cashbox of the day'
+
+    _columns = {
+                
+    }
+    
+    def print_report(self, cr, uid, ids, context=None):
+
+        """ 
+             To get the date and print the report 
+                       
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param context: A standard dictionary 
+             @return : retrun report
+        """        
+        datas = {'ids' : context.get('active_ids',[])}
+        res =  {}        
+        datas['form'] = res
+        
+        return { 
+                'type' : 'ir.actions.report.xml',
+                'report_name':'all.closed.cashbox.of.the.day',
+                'datas' : datas,               
+       }
+
+all_closed_cashbox_of_the_day()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
index a812ad342a4..27cdfd19ad0 100644
--- a/addons/point_of_sale/wizard/pos_receipt.py
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -22,7 +22,6 @@
 import netsvc
 from osv import osv,fields
 from tools.translate import _
-
 from mx import DateTime
 import time
 
@@ -63,4 +62,3 @@ pos_receipt()
 
 
 
-
diff --git a/addons/point_of_sale/wizard/wizard_return.py b/addons/point_of_sale/wizard/wizard_return.py
new file mode 100644
index 00000000000..591fd00b18a
--- /dev/null
+++ b/addons/point_of_sale/wizard/wizard_return.py
@@ -0,0 +1,546 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+from tools.misc import UpdateableStr
+
+import netsvc
+import time
+
+from tools.translate import _
+from decimal import Decimal
+
+
+arch=UpdateableStr()
+fields={}
+
+
+def _get_journal(self, cr, uid, context):
+    pool = pooler.get_pool(cr.dbname)
+    obj = pool.get('account.journal')
+    c=pool.get('res.users').browse(cr,uid,uid).company_id.id
+    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id','=',c)])
+    res = obj.read(cr, uid, ids, ['id', 'name'], context)
+    res = [(r['id'], r['name']) for r in res]
+    return res
+
+
+payment_form = """<?xml version="1.0"?>
+<form string="Add payment :">
+    <field name="amount" />
+    <field name="journal"/>
+    <field name="payment_date" />
+    <field name="payment_name" />
+    <field name="invoice_wanted" />
+    <field name="num_sale" />
+</form>
+"""
+
+payment_fields = {
+    'amount': {'string': 'Amount', 'type': 'float', 'required': True},
+    'invoice_wanted': {'string': 'Invoice', 'type': 'boolean'},
+    'journal': {'string': 'Journal',
+            'type': 'selection',
+            'selection': _get_journal,
+            'required': True,
+        },
+    'payment_date': {'string': 'Payment date', 'type': 'date', 'required': True},
+    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32', 'required':True, 'default':'Payment'},
+    'num_sale': {'string': 'Num.Cof', 'type': 'char', 'size': '32'},
+    }
+
+
+def _pre_init(self, cr, uid, data, context):
+    def _get_journal(pool, order):
+        j_obj = pool.get('account.journal')
+
+        journal_to_fetch = 'DEFAULT'
+        if order.amount_total < 0:
+            journal_to_fetch = 'GIFT'
+        else:
+            if order.amount_paid > 0:
+                journal_to_fetch = 'REBATE'
+
+        pos_config_journal = pool.get('pos.config.journal')
+        ids = pos_config_journal.search(cr, uid, [('code', '=', journal_to_fetch)])
+        objs = pos_config_journal.browse(cr, uid, ids)
+        journal=''
+        if objs:
+            journal = objs[0].journal_id.id
+        else:
+            existing = [payment.journal_id.id for payment in order.payments]
+            ids = j_obj.search(cr, uid, [('type', '=', 'cash')])
+            for i in ids:
+                if i not in existing:
+                    journal = i
+                    break
+            if not journal:
+                journal = ids and ids[0]
+        return journal
+    pool = pooler.get_pool(cr.dbname)
+    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
+    # get amount to pay:
+#    amount = Decimal(str(order.amount_total)) - Decimal(str(order.amount_paid))
+    amount = order.amount_total - order.amount_paid
+    if amount <= 0:
+        pool.get('pos.order').action_paid(cr, uid, data['ids'], context)
+
+    # get journal:
+    journal = _get_journal(pool, order)
+
+    # check if an invoice is wanted:
+    #invoice_wanted_checked = not not order.partner_id # not not -> boolean
+    invoice_wanted_checked = False
+
+    # select the current date
+    current_date = time.strftime('%Y-%m-%d')
+
+    return {'journal': journal, 'amount': amount, 'invoice_wanted': invoice_wanted_checked, 'payment_date': current_date}
+
+
+def _add_pay(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    jrnl_obj = pool.get('account.journal')
+    result = data['form']
+    invoice_wanted = data['form']['invoice_wanted']
+    jrnl_used=False
+    if data['form'] and data['form'].get('journal',False):
+        jrnl_used=jrnl_obj.browse(cr,uid,data['form']['journal'])
+
+    # add 'invoice_wanted' in 'pos.order'
+    order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted})
+
+    order_obj.add_payment(cr, uid, data['id'], result, context=context)
+    return {}
+
+
+def _check(self, cr, uid, data, context):
+    """Check the order:
+    if the order is not paid: continue payment,
+    if the order is paid print invoice (if wanted) or ticket.
+    """
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    order = order_obj.browse(cr, uid, data['id'], context)
+    order_obj.test_order_lines(cr, uid, order, context=context)
+
+    action = 'ask_pay'
+    if order.state == 'paid':
+        if order.partner_id:
+            if order.invoice_wanted:
+                action = 'invoice'
+            else:
+                action = 'paid'
+        elif order.date_payment:
+            action = 'receipt'
+        else:
+            action='paid'
+
+    if order.amount_total == order.amount_paid:
+        order_obj.write(cr,uid,data['ids'],{'state':'done'})
+        action = 'receipt'
+
+    return action
+
+
+def create_invoice(self, cr, uid, data, context):
+    wf_service = netsvc.LocalService("workflow")
+    for i in data['ids']:
+        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
+    return {}
+
+
+
+_form = """<?xml version="1.0"?>
+<form string="Add product :">
+<field name="product"/>
+<field name="quantity"/>
+</form>
+"""
+_fields = {
+    'product': {
+        'string': 'Product',
+        'type': 'many2one',
+        'relation': 'product.product',
+        'required': True,
+        'default': False
+    },
+
+    'quantity': {
+        'string': 'Quantity',
+        'type': 'integer',
+        'required': True,
+        'default': 1},
+    }
+
+def make_default(val):
+    def fct(obj, cr, uid):
+        return val
+    return fct
+
+def _get_returns(self, cr, uid, data, context):
+
+    pool = pooler.get_pool(cr.dbname)
+    order_obj=pool.get('pos.order')
+    order=order_obj.browse(cr, uid, [data['id']])[0]
+    res={}
+    fields.clear()
+    arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Quantities you enter, match to products that will return to the stock.')]
+    for m in [line for line in order.lines]:
+        quantity=m.qty
+        arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
+        fields['return%s' % m.id]={'string':m.product_id.name, 'type':'float', 'required':True, 'default':quantity}
+        res.setdefault('returns', []).append(m.id)
+    arch_lst.append('</form>')
+    arch.string='\n'.join(arch_lst)
+    return res
+
+def _create_returns(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    lines_obj = pool.get('pos.order.line')
+    picking_obj = pool.get('stock.picking')
+    stock_move_obj = pool.get('stock.move')
+    move_obj = pool.get('stock.move')
+    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
+    clone_list = []
+    date_cur=time.strftime('%Y-%m-%d')
+    uom_obj = pool.get('product.uom')
+    wf_service = netsvc.LocalService("workflow")
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
+        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
+        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+        res=cr.fetchone()
+        location_id=res and res[0] or None
+        stock_dest_id = int(val.split(',')[1])
+
+        order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
+        if order_id.invoice_id:
+            pool.get('account.invoice').refund(cr, uid, [order_id.invoice_id.id],time.strftime('%Y-%m-%d'), False, order_id.name)
+        new_picking=picking_obj.create(cr,uid,{
+                                'name':'%s (return)' %order_id.name,
+                                'move_lines':[], 'state':'draft',
+                                'type':'in',
+                                'date':date_cur,   })
+        for line in order_id.lines:
+            for r in data['form'].get('returns',[]):
+                if line.id==r and (data['form']['return%s' %r]!=0.0):
+                    new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': data['form']['return%s' %r],
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':line.product_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':line.product_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+                    lines_obj.write(cr,uid,[line.id],{'qty_rfd':(line.qty or 0.0) + data['form']['return%s' %r],
+                                                    'qty':line.qty-(data['form']['return%s' %r] or 0.0)
+                    })
+        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+        picking_obj.force_assign(cr, uid, [new_picking], context)
+    return res
+
+def _create_returns2(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    line_obj = pool.get('pos.order.line')
+    picking_obj = pool.get('stock.picking')
+    stock_move_obj = pool.get('stock.move')
+    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
+    clone_list = []
+    date_cur=time.strftime('%Y-%m-%d')
+    uom_obj = pool.get('product.uom')
+    wf_service = netsvc.LocalService("workflow")
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
+        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
+        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+        res=cr.fetchone()
+        location_id=res and res[0] or None
+        stock_dest_id = int(val.split(',')[1])
+
+        new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
+                                                                            'move_lines':[], 'state':'draft', 'type':'in',
+                                                                            'type':'in',
+                                                                            'date':date_cur,   })
+        new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
+                                                      'lines':[],
+                                                      'statement_ids':[],
+                                                      'last_out_picking':[]})
+        for line in order_id.lines:
+            for r in data['form'].get('returns',[]):
+                if line.id==r and (data['form']['return%s' %r]!=0.0):
+                    new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': data['form']['return%s' %r],
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':line.product_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':line.product_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+                    line_obj.copy(cr,uid,line.id,{'qty':-data['form']['return%s' %r],
+                                                'order_id': new_order,
+                    })
+        order_obj.write(cr,uid, new_order, {'state':'done'})
+        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+        picking_obj.force_assign(cr, uid, [new_picking], context)
+    act = {
+        'domain': "[('id', 'in', ["+str(new_order)+"])]",
+        'name': 'Refunded Orders',
+        'view_type': 'form',
+        'view_mode': 'form,tree',
+        'res_model': 'pos.order',
+        'auto_refresh':0,
+        'res_id':new_order,
+        'view_id': False,
+        'type': 'ir.actions.act_window'
+    }
+    return act
+def test(self,cr,uid,data,context={}):
+  #  import pdb; pdb.set_trace()
+    data['id']=data['res_id']
+    return {'id':data['res_id']}
+
+#def _raise(self,cr,uid,data,context={}):
+#    return datas
+#    raise wizard.except_wizard(_('Message'),_('You can not exchange products more than total paid amount.'))
+
+
+#def _test_exist1(self,cr,uid,data,context={}):
+#    return 'choice'
+
+def _test_exist(self,cr,uid,data,context={}):
+#    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
+#    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
+#    obj=order_obj.browse(cr,uid, data['ids'])[0]
+#    am_tot=obj._amount_total(cr, uid, data['ids'])
+#    order_obj.write(cr,uid,data['ids'],{'state':'done'})
+#    if obj.amount_total == obj.amount_paid:
+#        return 'receipt'
+#    elif obj.amount_total > obj.amount_paid:
+#        sql = """select max(id) from pos_order_line where order_id = %d """%(obj.id)
+#        cr.execute(sql)
+#        res = cr.fetchone()
+#        cr.execute("delete from pos_order_line where id = %d"%(res[0]))
+#        cr.commit()
+#        return 'choice_raise'
+#    else:
+    return 'add_p'
+
+def _close(self,cr,uid,data,context={}):
+    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
+    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
+    obj=order_obj.browse(cr,uid, data['ids'])[0]
+    order_obj.write(cr,uid,data['ids'],{'state':'done'})
+    if obj.amount_total != obj.amount_paid:
+        return 'ask_pay'
+    else :
+        return 'receipt'
+
+
+
+
+def _add_pdct(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    order_obj = pool.get('pos.order')
+    line_obj = pool.get('pos.order.line')
+    picking_obj = pool.get('stock.picking')
+    wf_service = netsvc.LocalService("workflow")
+    prod_obj = pool.get('product.product')
+    stock_move_obj = pool.get('stock.move')
+    uom_obj = pool.get('product.uom')
+    date_cur=time.strftime('%Y-%m-%d')
+    order_obj.add_product(cr, uid, data['id'], data['form']['product'],
+                            data['form']['quantity'], context=context)
+    cr.commit()
+    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
+        prod=data['form']['product']
+        qty=data['form']['quantity']
+        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
+        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
+        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
+        res=cr.fetchone()
+        location_id=res and res[0] or None
+        stock_dest_id = int(val.split(',')[1])
+
+        prod_id=prod_obj.browse(cr,uid,prod)
+        new_picking=picking_obj.create(cr,uid,{
+                                'name':'%s (Added)' %order_id.name,
+                                'move_lines':[],
+                                'state':'draft',
+                                'type':'out',
+                                'date':date_cur,   })
+        new_move=stock_move_obj.create(cr, uid,{
+                        'product_qty': qty,
+                        'product_uos_qty': uom_obj._compute_qty(cr, uid,prod_id.uom_id.id, qty, prod_id.uom_id.id),
+                        'picking_id':new_picking,
+                        'product_uom':prod_id.uom_id.id,
+                        'location_id':location_id,
+                        'product_id':prod_id.id,
+                        'location_dest_id':stock_dest_id,
+                        'name':'%s (return)' %order_id.name,
+                        'date':date_cur,
+                        'date_planned':date_cur,})
+
+        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
+        picking_obj.force_assign(cr, uid, [new_picking], context)
+       # order_obj.write(cr,uid,data['id'],{'state':'done','last_out_picking':new_picking})
+        order_obj.write(cr,uid,data['id'],{'last_out_picking':new_picking})
+    return {}
+
+
+
+
+class wizard_return_picking(wizard.interface):
+    states={
+        'init':{
+            'actions':[_get_returns],
+            'result':{'type':'form',
+                    'arch':arch,
+                    'fields':fields,
+                    'state':[('end','Cancel', 'gtk-cancel'),('return','Return goods and Exchange', 'gtk-ok'),('return_w','Return without Refund','gtk-ok')]
+                    }
+        },
+        'return':{
+            'actions':[],
+            'result':{ 'type': 'action',
+                       'action' : _create_returns,
+                       'state':'prod'}
+        },
+        'prod':{
+            'actions':[],
+            'result': {
+                'type': 'form',
+                'arch': _form,
+                'fields':_fields,
+                'state': [('close','Close'),('choice','Continue')]
+            }
+        },
+#        'choice1' : {
+#            'actions' : [_add_pdct],
+#            'result' : {'type' : 'choice', 'next_state': _test_exist1 }
+#        },
+        'choice' : {
+            'actions' : [],
+            'result' : {'type' : 'choice', 'next_state': _test_exist }
+        },
+#        'choice_raise':{
+#                        'actions':[],
+#            'result':{ 'type': 'action',
+#                       'action' : _raise,
+#                       'state':'end'}
+#        },
+        'add_p' :{
+            'actions':[],
+            'result':{
+            'type':'action',
+            'action': _add_pdct,
+            'state': 'prod'}
+        },
+#        'add_pp' :{
+#            'actions':[],
+#            'result':{
+#            'type':'action',
+#            'action': _add_pdct,
+#            'state': 'end'}
+#        },
+        'receipt':{
+            'result': {
+                'type': 'print',
+                'report': 'pos.receipt',
+                'state': 'end'
+            }
+        },
+        'return_w':{
+            'actions':[],
+            'result':{'type':'action', 'action':_create_returns2, 'state':'end'}
+        },
+
+        'close':{
+            'actions' : [],
+            'result' : {'type' : 'choice', 'next_state': _close }
+        },
+
+       'check': {
+            'actions': [],
+            'result': {
+                'type': 'choice',
+                'next_state': _check,
+            }
+        },
+
+        'ask_pay': {
+            'actions': [_pre_init],
+            'result': {
+                'type': 'form',
+                'arch': payment_form,
+                'fields': payment_fields,
+                'state': (('end', 'Cancel'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True)
+                         )
+            }
+        },
+        'add_pay': {
+            'actions': [_add_pay],
+            'result': {
+                'type': 'state',
+                'state': "check",
+            }
+        },
+
+
+        'invoice': {
+            'actions': [create_invoice],
+            'result': {
+                'type': 'print',
+                'report': 'pos.invoice',
+                'state': 'end'
+            }
+        },
+        'receipt': {
+            'actions': [],
+            'result': {
+                'type': 'print',
+                'report': 'pos.receipt',
+                'state': 'end'
+            }
+        },
+        'paid': {
+            'actions': [],
+            'result': {
+                'type': 'state',
+                'state': 'end'
+            }
+        },
+
+    }
+wizard_return_picking('pos.return.picking')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ccfb3bd4d178b56ea65b59a42d7e47b910b072a9 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 29 Mar 2010 11:14:25 +0530
Subject: [PATCH 139/248] [ADD] mrp: Added remaining wizard after converting to
 osv_memory wizard (Compute Procurement).

bzr revid: uco@tinyerp.co.in-20100329054425-lzfhfk05cvq4y6oq
---
 addons/mrp/__terp__.py                     |  1 +
 addons/mrp/wizard/__init__.py              |  2 +-
 addons/mrp/wizard/mrp_procurement.py       | 45 +++++++++++++++
 addons/mrp/wizard/mrp_procurement_view.xml | 34 ++++++++++++
 addons/mrp/wizard/wizard_procurement.py    | 64 ----------------------
 5 files changed, 81 insertions(+), 65 deletions(-)
 create mode 100644 addons/mrp/wizard/mrp_procurement.py
 create mode 100644 addons/mrp/wizard/mrp_procurement_view.xml
 delete mode 100644 addons/mrp/wizard/wizard_procurement.py

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index acf25b160e0..10fadb00bc6 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -62,6 +62,7 @@
         'mrp_data.xml',
         'wizard/mrp_product_produce_view.xml',
         'wizard/make_procurement_view.xml',
+        'wizard/mrp_procurement_view.xml',
         'wizard/change_production_qty_view.xml',
         'wizard/orderpoint_procurement_view.xml',
         'wizard/mrp_price_view.xml',
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 043cdc94465..012677a9ca0 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -21,7 +21,7 @@
 
 import mrp_product_produce
 import orderpoint_procurement
-import wizard_procurement
+import mrp_procurement
 import schedulers_all
 import mrp_price
 import mrp_workcenter_load
diff --git a/addons/mrp/wizard/mrp_procurement.py b/addons/mrp/wizard/mrp_procurement.py
new file mode 100644
index 00000000000..77728c05517
--- /dev/null
+++ b/addons/mrp/wizard/mrp_procurement.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import threading
+from osv import osv, fields
+
+class procurement_compute(osv.osv_memory):
+    _name = 'mrp.procurement.compute'
+    _description = 'Compute Procurement'
+    
+    def _procure_calculation_procure(self, cr, uid, ids, context):
+        try:
+            proc_obj = self.pool.get('mrp.procurement')
+            proc_obj._procure_confirm(cr, uid, use_new_cursor=cr.dbname, context=context)
+        finally:
+            cr.close()
+        return {}
+    
+    def procure_calculation(self, cr, uid, ids, context):
+        threaded_calculation = threading.Thread(target=self._procure_calculation_procure, args=(cr, uid, ids, context))
+        threaded_calculation.start()
+        return {}
+    
+procurement_compute()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/wizard/mrp_procurement_view.xml b/addons/mrp/wizard/mrp_procurement_view.xml
new file mode 100644
index 00000000000..6d78f89793d
--- /dev/null
+++ b/addons/mrp/wizard/mrp_procurement_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Compute Procurement -->
+        
+		<record id="view_compute_procurment_wizard" model="ir.ui.view">
+            <field name="name">Compute Procurements</field>
+            <field name="model">mrp.procurement.compute</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Parameters">
+				    <label string="This wizard will schedule procurements." colspan="4" align="0.0"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="procure_calculation" string="Compute Requisitions"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+<!--        <act_window name="Compute Procurements"		    -->
+<!--		    res_model="mrp.procurement.compute"-->
+<!--		    src_model="mrp.procurement"-->
+<!--		    view_mode="form"-->
+<!--		    target="new"        -->
+<!--            key2="client_action_multi"    -->
+<!--		    id="act_compute_procurement"/>       -->
+		
+	</data>
+</openerp>	
diff --git a/addons/mrp/wizard/wizard_procurement.py b/addons/mrp/wizard/wizard_procurement.py
deleted file mode 100644
index af43437cc52..00000000000
--- a/addons/mrp/wizard/wizard_procurement.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import threading
-import pooler
-
-parameter_form = '''<?xml version="1.0"?>
-<form string="Parameters" colspan="4">
-    <label string="This wizard will schedule procurements." colspan="4" align="0.0"/>
-</form>'''
-
-parameter_fields = {
-}
-
-def _procure_calculation_procure(self, db_name, uid, data, context):
-    db, pool = pooler.get_db_and_pool(db_name)
-    cr = db.cursor()
-    try:
-        proc_obj = pool.get('mrp.procurement')
-        proc_obj._procure_confirm(cr, uid, use_new_cursor=cr.dbname, context=context)
-    finally:
-        cr.close()
-    return {}
-
-def _procure_calculation(self, cr, uid, data, context):
-    threaded_calculation = threading.Thread(target=_procure_calculation_procure, args=(self, cr.dbname, uid, data, context))
-    threaded_calculation.start()
-    return {}
-
-class procurement_compute(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Requisitions') ]}
-        },
-        'compute': {
-            'actions': [_procure_calculation],
-            'result': {'type': 'state', 'state':'end'}
-        },
-    }
-procurement_compute('mrp.procurement.compute')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 6980e2febf0532a78a5064d5f4f867db924d5e0a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 29 Mar 2010 11:26:31 +0530
Subject: [PATCH 140/248] [REM] point_of_sale: remove the pos_retrun file

bzr revid: sbh@tinyerp.com-20100329055631-9ohrgumbt1ptw818
---
 addons/point_of_sale/wizard/pos_return.py | 596 ----------------------
 1 file changed, 596 deletions(-)
 delete mode 100644 addons/point_of_sale/wizard/pos_return.py

diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
deleted file mode 100644
index 1b5860cef1c..00000000000
--- a/addons/point_of_sale/wizard/pos_return.py
+++ /dev/null
@@ -1,596 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-#import wizard
-#import pooler
-#from tools.misc import UpdateableStr
-#
-#import netsvc
-#import time
-#
-#from tools.translate import _
-#from decimal import Decimal
-
-#arch=UpdateableStr()
-#fields={}
-
-import netsvc
-from osv import osv,fields
-from tools.translate import _
-from mx import DateTime
-import time
-
-
-class pos_return(osv.osv_memory):
-    _name = 'pos.return'
-    _description = 'Point of sale return'
-
-    _columns = {
-                
-    }
-pos_return()
-
-class pos_add_payment(osv.osv_memory):
-    _name = 'pos.add.payment'
-    _description = 'Add Payment'
-
-    _columns = {
-        'amount': fields.float('Amount', digits=(16,2),required=True),
-        'journal': fields.function(_get_journal, 'Journal', method=True, required=True),
-        'payment_date': fields.date('Payment date',required=True),
-        'payment_name': fields.char('Payment name', size=32,required=True),
-        'invoice_wanted': fields.boolean('Invoice'),
-        'num_sale': fields.char('Num.Cof', size=32)        
-    }
-    _defaults = {
-          'payment_name': lambda *a: 'Payment'
-        }
-
-pos_add_payment()
-
-class pos_add_product(osv.osv_memory):
-    _name = 'pos.add.product'
-    _description = 'Add Product'
-
-    _columns = {
-        'product': fields.many2one('product.product','Product', required=True),
-        'quantity': fields.integer( 'Quantity',required=True),
-             
-    }
-
-    _defaults = {
-          'product': lambda *a: 'False',
-          'quantity': lambda *a: 1
-        }
-
-pos_add_product()
-
-
-def _get_journal(self, cr, uid, context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('account.journal')
-    c=pool.get('res.users').browse(cr,uid,uid).company_id.id
-    ids = obj.search(cr, uid, [('type', '=', 'cash'), ('company_id','=',c)])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    return res
-
-
-payment_form = """<?xml version="1.0"?>
-<form string="Add payment :">
-    <field name="amount" />
-    <field name="journal"/>
-    <field name="payment_date" />
-    <field name="payment_name" />
-    <field name="invoice_wanted" />
-    <field name="num_sale" />
-</form>
-"""
-
-payment_fields = {
-    'amount': {'string': 'Amount', 'type': 'float', 'required': True},
-    'invoice_wanted': {'string': 'Invoice', 'type': 'boolean'},
-    'journal': {'string': 'Journal',
-            'type': 'selection',
-            'selection': _get_journal,
-            'required': True,
-        },
-    'payment_date': {'string': 'Payment date', 'type': 'date', 'required': True},
-    'payment_name': {'string': 'Payment name', 'type': 'char', 'size': '32', 'required':True, 'default':'Payment'},
-    'num_sale': {'string': 'Num.Cof', 'type': 'char', 'size': '32'},
-    }
-
-
-def _pre_init(self, cr, uid, data, context):
-    def _get_journal(pool, order):
-        j_obj = pool.get('account.journal')
-
-        journal_to_fetch = 'DEFAULT'
-        if order.amount_total < 0:
-            journal_to_fetch = 'GIFT'
-        else:
-            if order.amount_paid > 0:
-                journal_to_fetch = 'REBATE'
-
-        pos_config_journal = pool.get('pos.config.journal')
-        ids = pos_config_journal.search(cr, uid, [('code', '=', journal_to_fetch)])
-        objs = pos_config_journal.browse(cr, uid, ids)
-        journal=''
-        if objs:
-            journal = objs[0].journal_id.id
-        else:
-            existing = [payment.journal_id.id for payment in order.payments]
-            ids = j_obj.search(cr, uid, [('type', '=', 'cash')])
-            for i in ids:
-                if i not in existing:
-                    journal = i
-                    break
-            if not journal:
-                journal = ids and ids[0]
-        return journal
-    pool = pooler.get_pool(cr.dbname)
-    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
-    # get amount to pay:
-#    amount = Decimal(str(order.amount_total)) - Decimal(str(order.amount_paid))
-    amount = order.amount_total - order.amount_paid
-    if amount <= 0:
-        pool.get('pos.order').action_paid(cr, uid, data['ids'], context)
-
-    # get journal:
-    journal = _get_journal(pool, order)
-
-    # check if an invoice is wanted:
-    #invoice_wanted_checked = not not order.partner_id # not not -> boolean
-    invoice_wanted_checked = False
-
-    # select the current date
-    current_date = time.strftime('%Y-%m-%d')
-
-    return {'journal': journal, 'amount': amount, 'invoice_wanted': invoice_wanted_checked, 'payment_date': current_date}
-
-
-def _add_pay(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    jrnl_obj = pool.get('account.journal')
-    result = data['form']
-    invoice_wanted = data['form']['invoice_wanted']
-    jrnl_used=False
-    if data['form'] and data['form'].get('journal',False):
-        jrnl_used=jrnl_obj.browse(cr,uid,data['form']['journal'])
-
-    # add 'invoice_wanted' in 'pos.order'
-    order_obj.write(cr, uid, [data['id']], {'invoice_wanted': invoice_wanted})
-
-    order_obj.add_payment(cr, uid, data['id'], result, context=context)
-    return {}
-
-
-def _check(self, cr, uid, data, context):
-    """Check the order:
-    if the order is not paid: continue payment,
-    if the order is paid print invoice (if wanted) or ticket.
-    """
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    order = order_obj.browse(cr, uid, data['id'], context)
-    order_obj.test_order_lines(cr, uid, order, context=context)
-
-    action = 'ask_pay'
-    if order.state == 'paid':
-        if order.partner_id:
-            if order.invoice_wanted:
-                action = 'invoice'
-            else:
-                action = 'paid'
-        elif order.date_payment:
-            action = 'receipt'
-        else:
-            action='paid'
-
-    if order.amount_total == order.amount_paid:
-        order_obj.write(cr,uid,data['ids'],{'state':'done'})
-        action = 'receipt'
-
-    return action
-
-
-def create_invoice(self, cr, uid, data, context):
-    wf_service = netsvc.LocalService("workflow")
-    for i in data['ids']:
-        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
-    return {}
-
-
-
-_form = """<?xml version="1.0"?>
-<form string="Add product :">
-<field name="product"/>
-<field name="quantity"/>
-</form>
-"""
-_fields = {
-    'product': {
-        'string': 'Product',
-        'type': 'many2one',
-        'relation': 'product.product',
-        'required': True,
-        'default': False
-    },
-
-    'quantity': {
-        'string': 'Quantity',
-        'type': 'integer',
-        'required': True,
-        'default': 1},
-    }
-
-def make_default(val):
-    def fct(obj, cr, uid):
-        return val
-    return fct
-
-def _get_returns(self, cr, uid, data, context):
-
-    pool = pooler.get_pool(cr.dbname)
-    order_obj=pool.get('pos.order')
-    order=order_obj.browse(cr, uid, [data['id']])[0]
-    res={}
-    fields.clear()
-    arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Quantities you enter, match to products that will return to the stock.')]
-    for m in [line for line in order.lines]:
-        quantity=m.qty
-        arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
-        fields['return%s' % m.id]={'string':m.product_id.name, 'type':'float', 'required':True, 'default':quantity}
-        res.setdefault('returns', []).append(m.id)
-    arch_lst.append('</form>')
-    arch.string='\n'.join(arch_lst)
-    return res
-
-def _create_returns(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    lines_obj = pool.get('pos.order.line')
-    picking_obj = pool.get('stock.picking')
-    stock_move_obj = pool.get('stock.move')
-    move_obj = pool.get('stock.move')
-    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
-    clone_list = []
-    date_cur=time.strftime('%Y-%m-%d')
-    uom_obj = pool.get('product.uom')
-    wf_service = netsvc.LocalService("workflow")
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
-        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
-        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
-        res=cr.fetchone()
-        location_id=res and res[0] or None
-        stock_dest_id = int(val.split(',')[1])
-
-        order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
-        if order_id.invoice_id:
-            pool.get('account.invoice').refund(cr, uid, [order_id.invoice_id.id],time.strftime('%Y-%m-%d'), False, order_id.name)
-        new_picking=picking_obj.create(cr,uid,{
-                                'name':'%s (return)' %order_id.name,
-                                'move_lines':[], 'state':'draft',
-                                'type':'in',
-                                'date':date_cur,   })
-        for line in order_id.lines:
-            for r in data['form'].get('returns',[]):
-                if line.id==r and (data['form']['return%s' %r]!=0.0):
-                    new_move=stock_move_obj.create(cr, uid,{
-                        'product_qty': data['form']['return%s' %r],
-                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
-                        'picking_id':new_picking,
-                        'product_uom':line.product_id.uom_id.id,
-                        'location_id':location_id,
-                        'product_id':line.product_id.id,
-                        'location_dest_id':stock_dest_id,
-                        'name':'%s (return)' %order_id.name,
-                        'date':date_cur,
-                        'date_planned':date_cur,})
-                    lines_obj.write(cr,uid,[line.id],{'qty_rfd':(line.qty or 0.0) + data['form']['return%s' %r],
-                                                    'qty':line.qty-(data['form']['return%s' %r] or 0.0)
-                    })
-        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
-        picking_obj.force_assign(cr, uid, [new_picking], context)
-    return res
-
-def _create_returns2(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    line_obj = pool.get('pos.order.line')
-    picking_obj = pool.get('stock.picking')
-    stock_move_obj = pool.get('stock.move')
-    picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
-    clone_list = []
-    date_cur=time.strftime('%Y-%m-%d')
-    uom_obj = pool.get('product.uom')
-    wf_service = netsvc.LocalService("workflow")
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
-        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
-        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
-        res=cr.fetchone()
-        location_id=res and res[0] or None
-        stock_dest_id = int(val.split(',')[1])
-
-        new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
-                                                                            'move_lines':[], 'state':'draft', 'type':'in',
-                                                                            'type':'in',
-                                                                            'date':date_cur,   })
-        new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
-                                                      'lines':[],
-                                                      'statement_ids':[],
-                                                      'last_out_picking':[]})
-        for line in order_id.lines:
-            for r in data['form'].get('returns',[]):
-                if line.id==r and (data['form']['return%s' %r]!=0.0):
-                    new_move=stock_move_obj.create(cr, uid,{
-                        'product_qty': data['form']['return%s' %r],
-                        'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
-                        'picking_id':new_picking,
-                        'product_uom':line.product_id.uom_id.id,
-                        'location_id':location_id,
-                        'product_id':line.product_id.id,
-                        'location_dest_id':stock_dest_id,
-                        'name':'%s (return)' %order_id.name,
-                        'date':date_cur,
-                        'date_planned':date_cur,})
-                    line_obj.copy(cr,uid,line.id,{'qty':-data['form']['return%s' %r],
-                                                'order_id': new_order,
-                    })
-        order_obj.write(cr,uid, new_order, {'state':'done'})
-        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
-        picking_obj.force_assign(cr, uid, [new_picking], context)
-    act = {
-        'domain': "[('id', 'in', ["+str(new_order)+"])]",
-        'name': 'Refunded Orders',
-        'view_type': 'form',
-        'view_mode': 'form,tree',
-        'res_model': 'pos.order',
-        'auto_refresh':0,
-        'res_id':new_order,
-        'view_id': False,
-        'type': 'ir.actions.act_window'
-    }
-    return act
-def test(self,cr,uid,data,context={}):
-  #  import pdb; pdb.set_trace()
-    data['id']=data['res_id']
-    return {'id':data['res_id']}
-
-#def _raise(self,cr,uid,data,context={}):
-#    return datas
-#    raise wizard.except_wizard(_('Message'),_('You can not exchange products more than total paid amount.'))
-
-
-#def _test_exist1(self,cr,uid,data,context={}):
-#    return 'choice'
-
-def _test_exist(self,cr,uid,data,context={}):
-#    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
-#    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
-#    obj=order_obj.browse(cr,uid, data['ids'])[0]
-#    am_tot=obj._amount_total(cr, uid, data['ids'])
-#    order_obj.write(cr,uid,data['ids'],{'state':'done'})
-#    if obj.amount_total == obj.amount_paid:
-#        return 'receipt'
-#    elif obj.amount_total > obj.amount_paid:
-#        sql = """select max(id) from pos_order_line where order_id = %d """%(obj.id)
-#        cr.execute(sql)
-#        res = cr.fetchone()
-#        cr.execute("delete from pos_order_line where id = %d"%(res[0]))
-#        cr.commit()
-#        return 'choice_raise'
-#    else:
-    return 'add_p'
-
-def _close(self,cr,uid,data,context={}):
-    order_obj= pooler.get_pool(cr.dbname).get('pos.order')
-    order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
-    obj=order_obj.browse(cr,uid, data['ids'])[0]
-    order_obj.write(cr,uid,data['ids'],{'state':'done'})
-    if obj.amount_total != obj.amount_paid:
-        return 'ask_pay'
-    else :
-        return 'receipt'
-
-
-
-
-def _add_pdct(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('pos.order')
-    line_obj = pool.get('pos.order.line')
-    picking_obj = pool.get('stock.picking')
-    wf_service = netsvc.LocalService("workflow")
-    prod_obj = pool.get('product.product')
-    stock_move_obj = pool.get('stock.move')
-    uom_obj = pool.get('product.uom')
-    date_cur=time.strftime('%Y-%m-%d')
-    order_obj.add_product(cr, uid, data['id'], data['form']['product'],
-                            data['form']['quantity'], context=context)
-    cr.commit()
-    for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
-        prod=data['form']['product']
-        qty=data['form']['quantity']
-        prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
-        val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
-        cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
-        res=cr.fetchone()
-        location_id=res and res[0] or None
-        stock_dest_id = int(val.split(',')[1])
-
-        prod_id=prod_obj.browse(cr,uid,prod)
-        new_picking=picking_obj.create(cr,uid,{
-                                'name':'%s (Added)' %order_id.name,
-                                'move_lines':[],
-                                'state':'draft',
-                                'type':'out',
-                                'date':date_cur,   })
-        new_move=stock_move_obj.create(cr, uid,{
-                        'product_qty': qty,
-                        'product_uos_qty': uom_obj._compute_qty(cr, uid,prod_id.uom_id.id, qty, prod_id.uom_id.id),
-                        'picking_id':new_picking,
-                        'product_uom':prod_id.uom_id.id,
-                        'location_id':location_id,
-                        'product_id':prod_id.id,
-                        'location_dest_id':stock_dest_id,
-                        'name':'%s (return)' %order_id.name,
-                        'date':date_cur,
-                        'date_planned':date_cur,})
-
-        wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
-        picking_obj.force_assign(cr, uid, [new_picking], context)
-       # order_obj.write(cr,uid,data['id'],{'state':'done','last_out_picking':new_picking})
-        order_obj.write(cr,uid,data['id'],{'last_out_picking':new_picking})
-    return {}
-
-
-
-
-class wizard_return_picking(wizard.interface):
-    states={
-        'init':{
-            'actions':[_get_returns],
-            'result':{'type':'form',
-                    'arch':arch,
-                    'fields':fields,
-                    'state':[('end','Cancel', 'gtk-cancel'),('return','Return goods and Exchange', 'gtk-ok'),('return_w','Return without Refund','gtk-ok')]
-                    }
-        },
-        'return':{
-            'actions':[],
-            'result':{ 'type': 'action',
-                       'action' : _create_returns,
-                       'state':'prod'}
-        },
-        'prod':{
-            'actions':[],
-            'result': {
-                'type': 'form',
-                'arch': _form,
-                'fields':_fields,
-                'state': [('close','Close'),('choice','Continue')]
-            }
-        },
-#        'choice1' : {
-#            'actions' : [_add_pdct],
-#            'result' : {'type' : 'choice', 'next_state': _test_exist1 }
-#        },
-        'choice' : {
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state': _test_exist }
-        },
-#        'choice_raise':{
-#                        'actions':[],
-#            'result':{ 'type': 'action',
-#                       'action' : _raise,
-#                       'state':'end'}
-#        },
-        'add_p' :{
-            'actions':[],
-            'result':{
-            'type':'action',
-            'action': _add_pdct,
-            'state': 'prod'}
-        },
-#        'add_pp' :{
-#            'actions':[],
-#            'result':{
-#            'type':'action',
-#            'action': _add_pdct,
-#            'state': 'end'}
-#        },
-        'receipt':{
-            'result': {
-                'type': 'print',
-                'report': 'pos.receipt',
-                'state': 'end'
-            }
-        },
-        'return_w':{
-            'actions':[],
-            'result':{'type':'action', 'action':_create_returns2, 'state':'end'}
-        },
-
-        'close':{
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state': _close }
-        },
-
-       'check': {
-            'actions': [],
-            'result': {
-                'type': 'choice',
-                'next_state': _check,
-            }
-        },
-
-        'ask_pay': {
-            'actions': [_pre_init],
-            'result': {
-                'type': 'form',
-                'arch': payment_form,
-                'fields': payment_fields,
-                'state': (('end', 'Cancel'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True)
-                         )
-            }
-        },
-        'add_pay': {
-            'actions': [_add_pay],
-            'result': {
-                'type': 'state',
-                'state': "check",
-            }
-        },
-
-
-        'invoice': {
-            'actions': [create_invoice],
-            'result': {
-                'type': 'print',
-                'report': 'pos.invoice',
-                'state': 'end'
-            }
-        },
-        'receipt': {
-            'actions': [],
-            'result': {
-                'type': 'print',
-                'report': 'pos.receipt',
-                'state': 'end'
-            }
-        },
-        'paid': {
-            'actions': [],
-            'result': {
-                'type': 'state',
-                'state': 'end'
-            }
-        },
-
-    }
-wizard_return_picking('pos.return.picking')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From d596d0f1a40ae60f2866b334b0539cc459c8a45f Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 29 Mar 2010 12:53:02 +0530
Subject: [PATCH 141/248] [IMP] auction: wizard_lots_cancel has been converted
 into osv_memory

bzr revid: mso@mso-20100329072302-sjhgr93nc25yk0zw
---
 addons/auction/wizard/auction_lots_cancel.py  | 57 ++++++++++++
 .../wizard/auction_lots_cancel_view.xml       | 21 +++++
 addons/auction/wizard/wizard_lots_cancel.py   | 91 -------------------
 addons/mrp/product.py                         | 61 +++++++------
 4 files changed, 112 insertions(+), 118 deletions(-)
 create mode 100644 addons/auction/wizard/auction_lots_cancel.py
 create mode 100644 addons/auction/wizard/auction_lots_cancel_view.xml
 delete mode 100644 addons/auction/wizard/wizard_lots_cancel.py

diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py
new file mode 100644
index 00000000000..91f38a364e0
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_cancel.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+
+class auction_lots_cancel(osv.osv):
+        '''
+        Open ERP Model
+        '''
+        _name = 'auction.lots.cancel'
+        _description = 'To cancel auction lots.'
+        
+        def _cancel(self, cr, uid, ids, context):
+        """ 
+        To cancel the auction lot
+
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected 
+        @param context: A standard dictionary 
+        @return: 
+        """
+
+                lots_obj = self.pool.get('auction.lots')
+                invoice_obj = self.pool.get('account.invoice')
+                lot = lots_obj.browse(cr,uid,context['active_id'],context)
+                if lot.ach_inv_id:
+                        p = invoice_obj.refund(['lot.ach_inv_id.id'],context)
+                if lot.vnd_inv_id:
+                        p = invoice_obj.refund(['lot.vnd_inv_id.id'],context)
+                return {}
+                
+        _columns = {
+                
+                
+        }
+auction_lots_cancel()
\ No newline at end of file
diff --git a/addons/auction/wizard/auction_lots_cancel_view.xml b/addons/auction/wizard/auction_lots_cancel_view.xml
new file mode 100644
index 00000000000..e80222b1e71
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_cancel_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+                <data>
+                        <record id="name_form" model="ir.ui.view">
+                                <field name="name">auction.lots.cancel.form</field>
+                                <field name="model">auction.lots.cancel</field>
+                                <field name="type">form</field>
+                                <field name="arch" type="xml">
+                                      <form string="Cancel Payment">
+                                                            <label string="Are you sure you want to refund this invoice ?"/>
+                                                            <button icon='gtk-cancel' special="cancel"
+                                                string="Cancel" />
+                                                <button name="_cancel" string="Cancel Payment"
+                                                colspan="1" type="object" icon="gtk-ok" />
+                                         </form>
+                                  </field>
+                        </record>
+                        
+                        
+                </data>
+</openerp>                
diff --git a/addons/auction/wizard/wizard_lots_cancel.py b/addons/auction/wizard/wizard_lots_cancel.py
deleted file mode 100644
index 1d7f93b14d3..00000000000
--- a/addons/auction/wizard/wizard_lots_cancel.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-paid_form = '''<?xml version="1.0"?>
-<form string="Cancel Payment">
-    <label string="Are you sure you want to refund this invoice ?"/>
-</form>'''
-fields_ask = {
-}
-#
-#def _get_value(self,cr,uid, datas,context={}):
-##  service = netsvc.LocalService("object_proxy")
-#   lots=pool.get('auction.lots').browse(cr,uid,data['id'],context)
-#
-#   
-##  lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', datas['ids'])
-#
-#   ids = []
-#   pay_ids = {}
-#   price = 0.0
-#   price_paid = 0.0
-#   uid = False
-#
-##TODO: refuse if several payments?
-#   for lot in lots:
-#           price += lot['obj_price']
-#
-#           # add all the buyer costs
-#           costs = service.execute(cr.dbname,uid, 'auction.lots', 'compute_buyer_costs', [lot['id']])
-#           for cost in costs:
-#               price += cost['amount']
-#
-##TODO: pr bien faire, faudrait leur poser la question: continue anyway?
-#   if len(ids)<len(datas['ids']):
-#       raise wizard.except_wizard('UserError', ('Some object(s) are not paid !', 'init'))
-#
-#   return {'objects':len(ids), 'amount_total':price, 'amount_paid':price_paid}
-#
-#def _cancel(self, uid, datas):
-#   service = netsvc.LocalService("object_proxy")
-#   lots = service.execute(cr.dbname,uid, 'auction.lots', 'lots_cancel_payment', datas['ids'])
-#   return {}
-#
-
-def _cancel(self,cr,uid,data,context):
-    pool = pooler.get_pool(cr.dbname)
-    lot = pool.get('auction.lots').browse(cr,uid,data['id'],context)
-    if lot.ach_inv_id:
-        p=pool.get('account.invoice').refund(['lot.ach_inv_id.id'],context)
-    if lot.vnd_inv_id:
-        p=pool.get('account.invoice').refund(['lot.vnd_inv_id.id'],context)
-    return {}
-
-class wiz_auc_lots_cancel(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':paid_form, 'fields': fields_ask, 'state':[('make_cancel','Cancel Payment'), ('end','Cancel')]}
-        },
-        'make_cancel': {
-            'actions': [_cancel],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_auc_lots_cancel('auction.lots.cancel');
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 375bd0c9f46..b4cc4214d33 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -32,35 +32,42 @@ class product_product(osv.osv):
         bom_obj = self.pool.get('mrp.bom')
         product_uom_obj = self.pool.get('product.uom')
 
-        def _compute_price(bom):            
+        def _compute_price(bom):       
+            print bom.product_id
             price = 0
-            if bom.bom_lines:
-                for sbom in bom.bom_lines:
-                    price += _compute_price(sbom) * sbom.product_qty                    
-            else:
+#            if bom.bom_lines:
+#                for sbom in bom.bom_lines:
+#                    print "--->>>" , sbom.name
+#                    price += _compute_price(sbom) * sbom.product_qty                    
+#            else:
+            parent_bom = bom_obj.search(cr, uid, [('bom_id', '=', False)])
+            print "========", bom.product_id.name
+            for p in parent_bom:
+                test_obj = bom_obj.browse(cr, uid, p)
+                print test_obj
+                print "XXXXXXXXXXXXX", p, test_obj.child_ids
                 
-                no_child_bom = bom_obj.search(cr, uid, [('product_id', '=', bom.product_id.id), ('bom_id', '=', False)])
-                if no_child_bom and bom.id not in no_child_bom:
-                    other_bom = bom_obj.browse(cr, uid, no_child_bom)[0]
-                    if not other_bom.product_id.calculate_price:
-                        price += _compute_price(other_bom) * other_bom.product_qty
-                    else:
-                        price += other_bom.product_id.standard_price
-                else:
-                    price += bom.product_id.standard_price
-
-            if bom.routing_id:
-                for wline in bom.routing_id.workcenter_lines:
-                    wc = wline.workcenter_id
-                    cycle = wline.cycle_nbr
-                    hour = (wc.time_start + wc.time_stop + cycle * wc.time_cycle) *  (wc.time_efficiency or 1.0)
-                    price += wc.costs_cycle * cycle + wc.costs_hour * hour
-                    price = product_uom_obj._compute_price(cr, uid, bom.product_uom.id, price, bom.product_id.uom_id.id)
-            if bom.bom_lines:
-                self.write(cr, uid, [bom.product_id.id], {'standard_price' : price/bom.product_qty})
-            if bom.product_uom.id != bom.product_id.uom_id.id:
-                price = product_uom_obj._compute_price(cr, uid, bom.product_uom.id, price, bom.product_id.uom_id.id)
-            return price
+#            if no_child_bom and bom.id not in no_child_bom:
+#                other_bom = bom_obj.browse(cr, uid, no_child_bom)[0]
+#                if not other_bom.product_id.calculate_price:
+#                    price += _compute_price(other_bom) * other_bom.product_qty
+#                else:
+#                    price += other_bom.product_id.standard_price
+#            else:
+#                price += bom.product_id.standard_price
+#
+#            if bom.routing_id:
+#                for wline in bom.routing_id.workcenter_lines:
+#                    wc = wline.workcenter_id
+#                    cycle = wline.cycle_nbr
+#                    hour = (wc.time_start + wc.time_stop + cycle * wc.time_cycle) *  (wc.time_efficiency or 1.0)
+#                    price += wc.costs_cycle * cycle + wc.costs_hour * hour
+#                    price = product_uom_obj._compute_price(cr, uid, bom.product_uom.id, price, bom.product_id.uom_id.id)
+#            if bom.bom_lines:
+#                self.write(cr, uid, [bom.product_id.id], {'standard_price' : price/bom.product_qty})
+#            if bom.product_uom.id != bom.product_id.uom_id.id:
+#                price = product_uom_obj._compute_price(cr, uid, bom.product_uom.id, price, bom.product_id.uom_id.id)
+#            return price
 
         
         bom_ids = bom_obj.search(cr, uid, [('product_id', 'in', ids)])

From ba26fd5ce3bd5a4ce9f8d8f52703d5af7d2c6512 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 29 Mar 2010 13:06:16 +0530
Subject: [PATCH 142/248] [IMP] auction: wizard_transfer_unsold_object  has
 been converted into osv_memory

bzr revid: mso@mso-20100329073616-4wqbajcfbav81mte
---
 addons/auction/wizard/auction_lots_cancel.py  | 36 ++++----
 .../wizard/auction_transfer_unsold_object.py  | 90 ++++++++++++++++++
 .../auction_transfer_unsold_object_view.xml   | 33 +++++++
 .../wizard/wizard_transfer_unsold_object.py   | 92 -------------------
 4 files changed, 141 insertions(+), 110 deletions(-)
 create mode 100644 addons/auction/wizard/auction_transfer_unsold_object.py
 create mode 100644 addons/auction/wizard/auction_transfer_unsold_object_view.xml
 delete mode 100644 addons/auction/wizard/wizard_transfer_unsold_object.py

diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py
index 91f38a364e0..117f9b5eb78 100644
--- a/addons/auction/wizard/auction_lots_cancel.py
+++ b/addons/auction/wizard/auction_lots_cancel.py
@@ -30,25 +30,25 @@ class auction_lots_cancel(osv.osv):
         _description = 'To cancel auction lots.'
         
         def _cancel(self, cr, uid, ids, context):
-        """ 
-        To cancel the auction lot
+            """ 
+            To cancel the auction lot
+    
+            @param self: The object pointer.
+            @param cr: A database cursor
+            @param uid: ID of the user currently logged in
+            @param ids: List of IDs selected 
+            @param context: A standard dictionary 
+            @return: 
+            """
 
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param ids: List of IDs selected 
-        @param context: A standard dictionary 
-        @return: 
-        """
-
-                lots_obj = self.pool.get('auction.lots')
-                invoice_obj = self.pool.get('account.invoice')
-                lot = lots_obj.browse(cr,uid,context['active_id'],context)
-                if lot.ach_inv_id:
-                        p = invoice_obj.refund(['lot.ach_inv_id.id'],context)
-                if lot.vnd_inv_id:
-                        p = invoice_obj.refund(['lot.vnd_inv_id.id'],context)
-                return {}
+            lots_obj = self.pool.get('auction.lots')
+            invoice_obj = self.pool.get('account.invoice')
+            lot = lots_obj.browse(cr,uid,context['active_id'],context)
+            if lot.ach_inv_id:
+                    p = invoice_obj.refund(['lot.ach_inv_id.id'],context)
+            if lot.vnd_inv_id:
+                    p = invoice_obj.refund(['lot.vnd_inv_id.id'],context)
+            return {}
                 
         _columns = {
                 
diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py
new file mode 100644
index 00000000000..fcc623f3cdd
--- /dev/null
+++ b/addons/auction/wizard/auction_transfer_unsold_object.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+
+class auction_transfer_unsold_object(osv.osv):
+        '''
+        Open ERP Model
+        '''
+        _name = 'auction.transfer.unsold.object'
+        _description = 'To transfer unsold objects'
+        
+        def _start(self, cr, uid, ids, context):
+            """ 
+            To initialize auction_id_from
+    
+            @param self: The object pointer.
+            @param cr: A database cursor
+            @param uid: ID of the user currently logged in
+            @param ids: List of IDs selected 
+            @param context: A standard dictionary 
+            @return: auction_id_from
+            """
+            lots_obj = self.pool.get('auction.lots')
+            rec = lots_obj.browse(cr, uid, context['active_id'], context)
+            auction_from = rec and rec.auction_id.id or False
+            return {'auction_id_from': auction_from}
+
+        def transfer_unsold_object(self, cr, uid, ids, context):
+            """ 
+            To Transfer the unsold object
+    
+            @param self: The object pointer.
+            @param cr: A database cursor
+            @param uid: ID of the user currently logged in
+            @param ids: List of IDs selected 
+            @param context: A standard dictionary 
+            @return: 
+    
+            """
+            bid_line_obj = self.pool.get('auction.bid_line')
+            lots_obj = self.pool.get('auction.lots')
+            lot_history_obj = self.pool.get('auction.lot.history')
+            line_ids= bid_line_obj.search(cr,uid,[('lot_id','in',context['active_ids'])])
+            bid_line_obj.unlink(cr, uid, line_ids)
+            
+            res = self.browse(cr, uid, ids)        
+
+            unsold_ids = lots_obj.search(cr,uid,[('auction_id','=',res[0].auction_id_from),('state','=','unsold')])
+            for rec in lots_obj.browse(cr, uid, unsold_ids, context):
+                new_id = lot_history_obj.create(cr,uid,{'auction_id':rec.auction_id.id,'lot_id':rec.id,'price': rec.obj_ret, 'name': 'reasons'+rec.auction_id.auction1})
+                up_auction = lots_obj.write(cr,uid,[rec.id],{'auction_id': res[0].auction_id_to,
+                                                                                                'obj_ret':None,
+                                                                                                'obj_price':None,
+                                                                                                'ach_login':None,
+                                                                                                'ach_uid':None,
+                                                                                                'ach_inv_id':None,
+                                                                                                'sel_inv_id':None,
+                                                                                                'state':'draft'})
+
+            return {}    
+    
+        _columns = {
+                'auction_id_from':fields.many2one('auction.dates', 'From Auction Date', required=True),
+                'auction_id_to':fields.many2one('auction.dates', 'To Auction Date', required=True),
+        }
+
+        _defaults = {
+            'auction_id_from': lambda *a: _start,
+        }
+auction_transfer_unsold_object()
\ No newline at end of file
diff --git a/addons/auction/wizard/auction_transfer_unsold_object_view.xml b/addons/auction/wizard/auction_transfer_unsold_object_view.xml
new file mode 100644
index 00000000000..33c3c2007ed
--- /dev/null
+++ b/addons/auction/wizard/auction_transfer_unsold_object_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+                <data>
+                        <record id="name_form" model="ir.ui.view">
+                                <field name="name">auction.transfer.unsold.object.form</field>
+                                <field name="model">auction.transfer.unsold.object</field>
+                                <field name="type">form</field>
+                                <field name="arch" type="xml">
+                                        <form string="Draft To Posted">
+                                                <group col="1" colspan="2">
+                                                        <separator colspan="4" string="Transfer unsold Object: Current auction date to another " />
+                                                </group>
+                                                <newline/>
+                                                <field name="auction_id_from" select="1"/>
+                                                <newline/>
+                                                <field name="auction_id_to" select="1"/>
+                                                <button icon='gtk-cancel' special="cancel"
+                                                string="Cancel" />
+                                                <button name="transfer_unsold_object" string="Transfer"
+                                                colspan="1" type="object" icon="gtk-ok" />
+                                        </form>
+                                </field>
+                        </record>
+                        
+                       <act_window name="Draft To Posted"
+                        res_model="auction.transfer.unsold.object"
+                        src_model=""
+                        view_mode="form"
+                        target="new"        
+                        key2="client_action_multi"    
+                        id="act_auction_lots_cancel"/> 
+                </data>
+</openerp>                
diff --git a/addons/auction/wizard/wizard_transfer_unsold_object.py b/addons/auction/wizard/wizard_transfer_unsold_object.py
deleted file mode 100644
index dd42ed865cd..00000000000
--- a/addons/auction/wizard/wizard_transfer_unsold_object.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import netsvc
-import pooler
-from osv.orm import browse_record
-import sql_db
-
-transfer_unsold_object_form = """<?xml version="1.0"?>
-<form string="Draft To Posted">
-    <group col="1" colspan="2">
-    <separator colspan="4" string="Transfer unsold Object: Current auction date to another " />
-    </group>
-    <newline/>
-    <field name="auction_id_from"/>
-    <newline/>
-    <field name="auction_id_to"/>
-</form>
-"""
-
-transfer_unsold_object_fields = {
-         'auction_id_from': {'string':'From Auction Date', 'type':'many2one', 'required':True, 'relation':'auction.dates'},
-         'auction_id_to': {'string':'To Auction Date', 'type':'many2one', 'required':True, 'relation':'auction.dates'},
-}
-
-def _start(self,cr,uid,data,context):
-    pool = pooler.get_pool(cr.dbname)
-    rec=pool.get('auction.lots').browse(cr,uid,data['id'],context)
-    auction_from= rec and rec.auction_id.id or False
-    return {'auction_id_from':auction_from}
-
-def _transfer_unsold_object(self, cr, uid, data, context):
-    #if not (data['form']['auction_id_to']) :
-    #   return {}
-#Historique de l objet + changement de l auction date + supp des bid line
-    line_ids= pooler.get_pool(cr.dbname).get('auction.bid_line').search(cr,uid,[('lot_id','in',data['ids'])])
-    pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
-    
-    obj_pool = pooler.get_pool(cr.dbname).get('auction.lots')
-    ids= obj_pool.search(cr,uid,[('auction_id','=',data['form']['auction_id_from']),('state','=','unsold')])
-    for rec in obj_pool.browse(cr, uid, ids, context):
-        new_id=pooler.get_pool(cr.dbname).get('auction.lot.history').create(cr,uid,{'auction_id':rec.auction_id.id,'lot_id':rec.id,'price': rec.obj_ret, 'name': 'reasons'+rec.auction_id.auction1})
-        up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[rec.id],{'auction_id':data['form']['auction_id_to'],
-                                                                                        'obj_ret':None,
-                                                                                        'obj_price':None,
-                                                                                        'ach_login':None,
-                                                                                        'ach_uid':None,
-                                                                                        'ach_inv_id':None,
-                                                                                        'sel_inv_id':None,
-                                                                                        'state':'draft'})
-
-        #   new_id = self.pool.get('auction.lot.history').copy(cr, uid, m.id, {'price': recs.obj_ret, 'name': 'reasons'+recs.auction_id.name})
-    #           new_id=pooler.get_pool(cr.dbname).get('auction.lot.history').create(cr,uid,{'auction_id':rec.auction_id,'lot_id':rec.name,'price': rec.obj_ret, 'name': 'reasons'+rec.auction_id.auction1})
-    return {}
-
-class transfer_object(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [_start],
-            'result' : {'type' : 'form',
-                    'arch' : transfer_unsold_object_form,
-                    'fields' :transfer_unsold_object_fields,
-                    'state' : [('transfer', 'Transfer'),('end', 'Cancel') ]}
-        },
-        'transfer' : {
-            'actions' : [_transfer_unsold_object],
-            'result' : {'type' : 'state','state' : 'end'}
-        },
-    }
-transfer_object('auction.lots.transfer.unsold.object')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From c4b7a902cb789875b4547635c9307d72145c407e Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 29 Mar 2010 14:19:56 +0530
Subject: [PATCH 143/248] [FIX] auction: Fixed fields_view_get error when
 active_id is not correct.

bzr revid: uco@tinyerp.co.in-20100329084956-qebf1vquhfkwliuq
---
 .../auction/wizard/auction_lots_buyer_map.py  | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py
index db80a2ab3f3..b20250edc38 100644
--- a/addons/auction/wizard/auction_lots_buyer_map.py
+++ b/addons/auction/wizard/auction_lots_buyer_map.py
@@ -107,18 +107,21 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
         res = super(wiz_auc_lots_buyer_map, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         lots_obj = self.pool.get('auction.lots')
         if record_ids:
-            for lots in lots_obj.browse(cr, uid, record_ids):
-                if lots.ach_uid:
-                    res['arch'] = """
-                            <form title="Mapping Result">
-                                <group col="2" colspan="2">
-                                    <label string="All objects are assigned to buyers !"/>
-                                    <newline/>
-                                    <button icon='gtk-cancel' special="cancel"
-                                        string="Done" />
-                                </group>
-                            </form>
-                    """
+            try:
+                for lots in lots_obj.browse(cr, uid, record_ids):
+                    if lots.ach_uid:
+                        res['arch'] = """
+                                <form title="Mapping Result">
+                                    <group col="2" colspan="2">
+                                        <label string="All objects are assigned to buyers !"/>
+                                        <newline/>
+                                        <button icon='gtk-cancel' special="cancel"
+                                            string="Done" />
+                                    </group>
+                                </form>
+                        """
+            except:
+                return res
         return res
     
 wiz_auc_lots_buyer_map()

From a8aadf5b4e6ac843e0817e5c6ac17c0f4e870415 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 29 Mar 2010 15:10:25 +0530
Subject: [PATCH 144/248] [FIX] auction: auction_transfer_unsold_object issues
 has been fixed

bzr revid: mso@mso-20100329094025-a257jp1j5blet6ua
---
 addons/auction/__terp__.py                         |  2 ++
 addons/auction/wizard/__init__.py                  |  3 ++-
 .../wizard/auction_transfer_unsold_object.py       | 14 ++++++--------
 .../wizard/auction_transfer_unsold_object_view.xml |  9 +--------
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index 61e91802f44..867cda476f7 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -38,6 +38,8 @@
     'init_xml': ['auction_sequence.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
+        'wizard/auction_lots_cancel_view.xml',
+#        'wizard/auction_transfer_unsold_object_view.xml',
         'wizard/auction_lots_able_view.xml',
         'wizard/auction_lots_enable_view.xml',
         'wizard/auction_lots_make_invoice_buyer_view.xml',
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index bcd2de8b301..9303c86818b 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -29,7 +29,8 @@ import auction_pay_buy
 import auction_payer_sel
 import auction_lots_sms_send
 import auction_catalog_flagey_report
-
+import auction_lots_cancel
+#import auction_transfer_unsold_object
 #import auction_aie_send_result
 import auction_lots_buyer_map
 
diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py
index fcc623f3cdd..9beb4893560 100644
--- a/addons/auction/wizard/auction_transfer_unsold_object.py
+++ b/addons/auction/wizard/auction_transfer_unsold_object.py
@@ -29,7 +29,7 @@ class auction_transfer_unsold_object(osv.osv):
         _name = 'auction.transfer.unsold.object'
         _description = 'To transfer unsold objects'
         
-        def _start(self, cr, uid, ids, context):
+        def _start(self, cr, uid, context):
             """ 
             To initialize auction_id_from
     
@@ -43,7 +43,7 @@ class auction_transfer_unsold_object(osv.osv):
             lots_obj = self.pool.get('auction.lots')
             rec = lots_obj.browse(cr, uid, context['active_id'], context)
             auction_from = rec and rec.auction_id.id or False
-            return {'auction_id_from': auction_from}
+            return  auction_from
 
         def transfer_unsold_object(self, cr, uid, ids, context):
             """ 
@@ -64,11 +64,10 @@ class auction_transfer_unsold_object(osv.osv):
             bid_line_obj.unlink(cr, uid, line_ids)
             
             res = self.browse(cr, uid, ids)        
-
-            unsold_ids = lots_obj.search(cr,uid,[('auction_id','=',res[0].auction_id_from),('state','=','unsold')])
+            unsold_ids = lots_obj.search(cr,uid,[('auction_id','=',res[0].auction_id_from.id),('state','=','unsold')])
             for rec in lots_obj.browse(cr, uid, unsold_ids, context):
-                new_id = lot_history_obj.create(cr,uid,{'auction_id':rec.auction_id.id,'lot_id':rec.id,'price': rec.obj_ret, 'name': 'reasons'+rec.auction_id.auction1})
-                up_auction = lots_obj.write(cr,uid,[rec.id],{'auction_id': res[0].auction_id_to,
+                new_id = lot_history_obj.create(cr,uid,{'auction_id':rec.auction_id.id,'lot_id':rec.id,'price': rec.obj_ret, 'name': rec.auction_id.auction1})
+                up_auction = lots_obj.write(cr,uid,[rec.id],{'auction_id': res[0].auction_id_to.id,
                                                                                                 'obj_ret':None,
                                                                                                 'obj_price':None,
                                                                                                 'ach_login':None,
@@ -76,7 +75,6 @@ class auction_transfer_unsold_object(osv.osv):
                                                                                                 'ach_inv_id':None,
                                                                                                 'sel_inv_id':None,
                                                                                                 'state':'draft'})
-
             return {}    
     
         _columns = {
@@ -85,6 +83,6 @@ class auction_transfer_unsold_object(osv.osv):
         }
 
         _defaults = {
-            'auction_id_from': lambda *a: _start,
+            'auction_id_from': _start,
         }
 auction_transfer_unsold_object()
\ No newline at end of file
diff --git a/addons/auction/wizard/auction_transfer_unsold_object_view.xml b/addons/auction/wizard/auction_transfer_unsold_object_view.xml
index 33c3c2007ed..768043b3bed 100644
--- a/addons/auction/wizard/auction_transfer_unsold_object_view.xml
+++ b/addons/auction/wizard/auction_transfer_unsold_object_view.xml
@@ -21,13 +21,6 @@
                                         </form>
                                 </field>
                         </record>
-                        
-                       <act_window name="Draft To Posted"
-                        res_model="auction.transfer.unsold.object"
-                        src_model=""
-                        view_mode="form"
-                        target="new"        
-                        key2="client_action_multi"    
-                        id="act_auction_lots_cancel"/> 
+
                 </data>
 </openerp>                

From fcd7f7b2bd1a34470e90fb0ecc0a778043cbf788 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 29 Mar 2010 15:29:46 +0530
Subject: [PATCH 145/248] [IMP] Thunderbird :- improvement in plugin.

bzr revid: ysa@tinyerp.co.in-20100329095946-9dqz9kqqrtdogbgg
---
 addons/thunderbird/plugin/tiny_plugin-2.0.xpi | Bin 65042 -> 65501 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi
index 7fb57818c1539f3ba560ddd6abbcb8c409888ee0..57fa5ac8104d7800b198ce8ae52b6e03e3187636 100755
GIT binary patch
delta 54430
zcmV(}K+wOE`~%(p1F)S2fAoWTJi+*u*t-D$0Eq(t01E&W0BLS>bYX04E^=gMRa6N8
z0~3_2OB0l=OI3IT0O<qi18tLCZ<{a_hVLu&KX~+RlEL9435ZZtswPd^#Z<MsoldYJ
z*07C?v!t8$-)9UIl9mf2&Uv5L$LE;*{wx~wo9T`#x${;&@$QS;f1CX2@e8sU+3mc8
zF>MwEr_;$lMZVH?uu9W3AYl-OSknr3uhPI7%kIv*y+Qrs$c%{#Sg1d|X}~#zgv0?8
zJ$~mEJ(WMQuGG9Wwhjb)bu>HgsAV=%8JC@brojRvuUKaW%5qF(oECp+vZ<m~0ywP_
zisNX##*jn=!)BdAe+=6)jnjX5FsK)3spQMkx1u~~C77+$aQXVPZH_gULHElpeSql}
z_e$R`gU5)?MiK-oo~;&rcQC4yM$d<%q)hL*rYQ7@L!EHu#?}|BF+F|H3OYAt*kI}U
zRT@@n=#vg#if4;bGcZaQ4`<dW?SxZk6n(-NDThIWxM8A0e;6+u4z@cj)T}@BI8$(D
zeyM~rTq+i(%VIAa4d|Mghqi5a35$9!ufkh!o^+HXq}q@Ovt%3Mn34piK(;teB1+Od
zt!TNvn)HMVE`N;uoyM^UU1{MwB_f~rp9l3Ee5*EiU#`=Be86jY9@t;azW)PIO9KQH
z0000808XZnvz7>rA+yx@1p^iX1QY-O00;m#XMH>_B<g%H&;S4i=aVriA%AjKuuF4R
zuuD~V1OVv+=>xp{1CVW9lQoQ%ZQHhe%2lUq+qP}nJZ0OqZQJ%K`<|!Ye${_>-2USK
z?p+aM@4a@!#+)-p=Ez*Rrko@&2o%6yhfHxi`;DC9B0Deuz+XTBKm~BLG`FFbbFj5A
zHgux1voTdxf&>8WOf>mf+kfNrQ`rp!;0)LqAY4x7CoB}!U*7^NE+(u1@YiSm00QjK
zBmVuj{+}mmClNI#AqQi9Cv#gH0wr^6V*pVH0!B^(VPg*hCI$v(0tQAdW(F=MHUeq}
zMh1q@8a9_d9|Lz1mlgqE0K!71ATc0uJ^k|*q@9?$BLD!@?Oy;Ctbb%l`|~D<serTq
z06<+V^oKqu002;|xUhhd+j^0rv>CEI!WUcSaHDv$xMh-AT@sE56cp4Kjz!sNnG%ot
zxp*Z6UQw!`Y**O+P^MhmdO~8K<c3~kFd8M2S)ByIFdISeYMfESn)Ljq_q3#jP@g7v
zH+#eT_Vd)`B=2q#8GjBqG&D3ji?k;u1PD<*&9f3!vh0>oME>EKyL3X~?8CzYHrM!9
z1q(AX^H7YHy?xyoayW=&kwT>$MeW*}I$G?=bHdnRPFq{sAmhwX>dQyRmtG5tMwLok
zTU)q6-RkDUt5?{N0YvCP?l=P*8yf=;k5{)A-Fw+S0w3}3B7fK2-!CtLp2(ILx^h&>
z1QA5@XDp>ohYp-p*4BL&kNGt<@Xgi(v+xD)J-(l6GS!!@ZM_>^-1OI`uKE|OT3tTK
z=~8I%Vjz8bwU9dDLc$E#xB-DWW6>*;P1M3!wopOSF74!OVD{lhcas_-TSyEZt`N~4
zuqkEzaT9tm!GBiUy(?D0IX#r4lyfD*-rFd4oRh!2aPGa-dcw%d@L)JPR@oLtsnMQT
z0X>=IsOEdE0!{%^;7?gtr>&t@W2~3Y*}w{rJl<;d4D+FPus<6Mfbj%N1#n4g@PW#q
z%;4}%G<#Xnm6fbZouOg1LpN^xjh6tZGO>g(VSl4&f`5dLR{5BH4^z10+R3rXslZZX
z0IpzS#ppNoivQ~EGhDD5;@9N&bG&tI0a9Ngq~;2OQ;nR2cU1ei7Q53VypfYT+Fv16
z%y0-Vxli~BEShC%zpl>d)P<V~7f9XexKFpc_Y}6F9lOyr&q*c+8r1}%WRW}8khs!>
z<aC2HSbzO2wyncS*?YC@0ifWH<g-J}af@8e5Y3`wjEQFoT!G%~kNDom{u1;Fx;|;H
zuQU+6`4`W`MP!7l1@!{t{*8H2=&_GVe^{sVugnv-aj`WwH2yc{)%?F_p0qguGvhy*
z$H>9O#KFbL@Hggtg>k_AlX<{k=peWx&7YwETYu(N{wMPiHN_V6F@|%#Wv0qBrKOvP
z=9?E8Pr@i6MO_L5lhNhHAqAWgQN*=HToLs}K$eR@bwD!Y#SnvyCY;Qt4asEYq)WK*
zzuObJy{1IaJH$YAU+B7@k3R1@ciw;Wk_BqiV0c4U`yg6G@Dopm%4vkYe}k$u?jkXd
zLw^8g2*Y5-#FaqWA4z1FrqOOHLw0ntB6XWnwUE7JnIvu;-G!dl05ene?qeS#tQAuo
z9gcH)g#&Hkh%imaW<vl?xKy@!>4{9;cAaP%O$*fRr6RY>A|I$C2~TMN2e}WC)(c7F
z^oHlogcMQ!=tSe*uV6Gf2`7j{(bH=~A%C}J4-1^R_A9cKlpz0V+D0KbP0xuAlBODX
zwy{FJ0`TnsNk|ws5=q0V+1dt7oCmgr#}*vojJkADTRNyZ*^B)K754U@qt&V_zdS8E
zjD|%j+0$VdXj%+q3_&cemx4$GdI(=<n15o?iuZk+)b`zMUY-ye)61vd|AgJxB!3a@
zSZ6G{5aE&VS3uQo4~zZ<11Qx%2lG5#Am1j&uIs~+-VFNu6NQ0<)lq#MEMjO<%!Fw#
zoNLy~+Fyyv-@XshdIqGr?83gzjh?~okh2M&eSR5ZzW!nJoH2T39=^jK%)1e=4%z*-
zRW<jM&0lf;fMY_H03}y0jZYe58GjtT)WM123ve}jbs|kR5`>AMh9ks#t?BfOA?o_e
zel!pWC%2(@Z;W6=F%(2r<kgHvN|8S#P9zj6`lGyWli)|h@kkBfAqfF@DZlfQa&0Ln
zf}!Fs4WCES*9Y3#yhN_3rAAxv?tI2`AAwFdT*zt+2ts`%XCA`5yeyO7$bZjau%H)M
z1BW2g57G1Sy{1SxW!j_zZa>N7g~0kYYdaDO!p`V6iTDWCD;3#Md;v;eh-@4p*`xkv
zT4GW)-r)S9B+h>ch(^x;_XDD^Il-UsC*W-QpR{D+VqxK8Vfq^_H#KU@|4B;-EI1;R
zU9C{5f6@{f=`R4zZ~1)uH-EHr`a3Np&5#8!{9Ij3@fjJ-t;&oLBc<6yJmOR&^HAYY
zJs>ck@IXX7k-8SaEzYVSiaZ)q{m_3<P=yf?b%||wM!tlB4K{}}np?BUHpH&2jkF>r
zuk(AJ`hJ|e_q>{ZVMeSQ`(2^c#BOn5r1aOg`$sdxjm@!S(IiWhS%0y;>zSC4ZRwp}
zft1Wd@r2?at}Hj$!U(a(JUu-;JU?%pUtVgxO!QWXG&BreaQuc49Oe`u9MRC+Z~|DA
z%ai+j_$?A_VXhgeZ-tTxA}M+JAu7;){yc#+QWrvSNn2le93=QoDX>c-T@a%N28#Tg
z12|ExWrb9@po=#w8-HA70jq>Ew2V+sFms=)1s0Hx0W+Kg3jvHfqEb?P-D!!GRvfs(
zZkEhJW`r?*b1%?ZpRa%iZ(ksQ!1YcGZ?!RP%ln(mUwOqTl#uQ92M#)k&9puSfOg=)
zG5?h*EP_EQJM@=yAMJ|`K_;6t0E0`K$JQ=lzwiP=(M8zUiGMGEIvuh=>HWb0`)e^=
z=XP%q{7uhv1I<J8B{Y|xno}OZLX!mK=`{?ZV3`5qy_4HZ@79v?L9-^)U5=jposPHO
zZctR+NX}anYlNFBQ+iAOh@wpogU1si+vJaliMO!)(@ygYD@AaafoIUbzS{C~B_$x}
zt*y{M3Iw^l<$u}DlPs(2l87T+%APkT77hd`HY5A@>};Hwx(Y8|Ec-RENP&Ew{b!q2
zb-wvJD#TueFwtFIMTO)bM(FYJv4rL~5N*UhD>@7;9GpyR7720usJ?5<>)6;>qA!O3
z0Y@LIlIw?Y0!g&9larBQ-Rfz~t<66AG7_t|4Afid|9?y`&2Qmi!#~ve3$TBumy*7t
z<^OGNDcTY+aS$jP+x?AOOw3%2>|D$of8!QL`MvT#xdn-Xih^Mlqj&Sa4S5}Z7n`zT
zDDoKJe}rMH<wa{do|H5Vw4e%7U!Z@0N0`j|5L{+loHHbm09#$8nm~MRq0Uu;0xk&T
zWt?1+F@K>jh{zU|v8vO^Cvyk$y~%dx_VwG%HTaI#j_3WS&&_k!D;P&Ur03Y-q43W7
zdMdR~PkXjZ$<p}v!3{ebTY$2%GQL4w+JxjXB%x+K&B7l&iK5%!9dLGbQ#COGk5_K7
zGBq`oTI1FITV_M%hboG(U`jGW(X^<aCRY{s#D6%D_(G#XLxb$QgIb-PkBhsWUS(Cw
z^9MUz_1SgzCo~6|g;}c?Jzfc+IM)VJ^g3#avI0&t6(7qKRLFqq#uFrn02&w9Ibvj0
zZpleNoR|+v%}#51Y0<aE&!6BGnHh`2@$r3685#T&x3^W?<>x(Wsw*#Cp~(*LE6#fA
zFn^z)E5AJ&lfoT5asPy^s;a7&w|96MwrnBiPjUzYw5cgVF@@k(-$X^l3Q?Zx+D=T$
z;gk@JNEBxB3g-6{DnosG!&I-R=-_nuQiFp7$zdPpB&ORgp7ahTVAl(L+0NXLCQWy&
z!!g~sJQ2MwOtp+&63(UIw=J~I&XeZNYJZ5hIl^j?*U){>B7rb^JfZC9-i&XUePuae
z_+x$=gxLU~lo3C9pFy_0HUN8ju-}siYP%qZKY`<r!-W<aD*Wt~s$nJKUCB@ag;U(G
zgFVY}FTXTf*=(6JgOlU;_AvGt_7DIA&D+IDFmOhKMMz#|oQTR0laxYpU)_{YFMrLz
zeia65T*2~?xaa!K{{RJbZG+iB*<D2$tnI_W21336EgausjOCf=mD_u8$1g9eL-4x^
zqDD1HUu?GlUJ!;P5sZZv)&P+s92f6QAJoWHe^0y3IKI-FyWN=6gAOYsoiOP9ml8UN
z|4+gJTRHR}^>pGQ8$Ul2@1O7sseiolPrANO{%49NZmE-K0RaH~g?~gqMQ1}pV@F3i
zQ*)F5mZd+%ML9V2;Q-(Oj(q`))&+%1Ne$Nd$UI;lKJLoO%c9R5STfLDhxOjy-)SR}
zG-o(Njx3lWG0e9_UH4V@Ue}16pjYSDn{Erxf52d?LpV1Wm^Ubj1~U`eLw^~p@Y~dB
zM#O}3<zt6NgpjyGKR-Xee!iqkhFrf~*zL)XXd~;aa66wUj^Fm^?{Ukdaaaz?kL>l>
z*XtJ6<tk{)?CtGo_wli1V^rLvnrw(rM8Rk-aL_3e{mIoFdNuy|G_^G*d{apILHfIo
z8|@X2=i66WQyhy8@s9o4_<#8Lyo+$36J5Uz<DHc~<xY0RtRI(;XIWbjy?f20S6v#*
zERi#=WBYx}%gdL?*K2EQIXO9A-kzVIpNkXA_Iq+Oi&Jv;BCKu%b;A|y<4ybbTU^lu
zC6|d+H|a!v5K@Dbl)<p5!r+VoG%lHz@n<f{7oG+S0vYE4Gy%viLw~x5hli6>lYA{W
z^>?|Hz6jczY>CtUudlD`^P4vxmpD#9+!a`I<21LgSB8s1T1%YY-`|9<Ab<b>z5q0T
zE$Lrt0s!9T=NsULY=F${pc@eBi(p}{F9M_flO_s56wC??UeKG&QagYUh8&&*4hst!
zotja@mqL~j2#y7S4S!or{)d^Wlqa_n0DuoI5(tC`hOL|tG&L3<n(G)ixR#x>y$uo(
zniwwx6D*Vfmk^-148NimCpfI5F}s2!HZGtvF*>U?FfdbR@7+iw5~!Y16edC*VK7ht
zQfu!m;Y=tzqMKZ8f?hl>x~7CusopURB0>~MA4PAU5Gqv^5Pu*5_rIH`56QN=+n?z1
z7vTSHp8w(d|KFueU<Q&uh5zGM0A7VUeE%5>0L1<SqGOi4e|-P>U%sDXB08qaR#O>=
zf2QlX%aq%vIp=^xW&=bxi9Z8AL=b&&Jcw#A2LPEG3Hn=5-=v867TrhyNI9Q~e`%l0
zJXsJmVO<<~#DD(d<Bs?GlTpbE=EuDHv=aiNj`)cfTy|&A^Tk%|@Il?P?g~+W<F#+o
zvO(4m=ZKk|J8c`syGQHyZDtSNjTSfpV(0z+_Crq9a>?`<Du2?vTX*aYxZCgmmt;06
zocIdQ-my*xH%wp;AKw+cD;qmo_aj_vjEbx4bN8jw`hP-q4I(&2AR|}->@ugy$$O{g
z5&kt^^#WHL#DKs>V)|O*Jw?Q|d#)1>yi&_X-Zn*?6plcj-0vUz;lxzNn`zreA{T(M
z>yRer<>!ywNyQORMU5pWYMBXb&^RK+<ry9YQccC-^p4w^e8V@q2A+0V;|5ty4r69a
z!e=XTet#uNf}@BF1N6!ip`cifyz0CrR~qBkV?sVW6ox7(=4eR2kl*ZcHccpsZiRd4
zIgZhg`$vh(A&)YO3sExH6rY|wI@5ak9;8B?DZ6jxv;e{#`MY>(*?zt=HmSq&)#e7H
zCNiw=lo+Fxb?XQ_Ma>J!p_IewrvU+J01`3a6n}<EGU!ahK+fIKZEPWQu}C7Q$#H6E
zii%4Or{(4X-U1{c%`ZCGGm=q(Rkp)*%z)vrr$Tl`xh3T#`2|dB%unt^=k^K-lws^8
zaPBKkSuhuTUxs-WNNe#*uiL}y2hmK-Ng$)ZOq*vYHl>2Ar?edv!K&+ah)X*ko}XDa
zA%Ab~2gddQAWl!qV8R*l%*fGzm=(xFktGWMYM6fiY`G%$-SoBNrb$h;>1w#$%gPxy
z?P-+FPVxPckR>}9#7GR*KW$V&Bcw+O>{Oy^vuN^Yt?&F$dwlm^zhdL_`rgt6_k8B_
z^x^GpXnuXVXIE8GsB$iDN)as}?7rbPjDM<Fxu{ks6Khy2)Tt>D4$`R^SzcB#)VKGK
zevGz35uqq@L;V76AIsFT;)S;TWBx=QN@`AuwkA%l`VPi_xVKJCProuTIYB2QLnF2{
zK`#Lgz_tpehM+jE^*;v|XsOdMhCi%j_*d;Gr0@8Dz1$&eOTfrNAY<$Dm-b^KV1MM~
zVrAlD<ouiVJKYeF|ChW91{@cOT97;Zf2;k%{;vK0<W=%0KbX_SnU;@LGm{|9Ed#{r
zC{0vBVFL&tY$77#tW}{j5VTs+(do9@5K$Af35)2IW~~cz5dy@3nhWzOr8msQjx*Em
zx>vZcw;ua$kAGZqKL2tw^+TrH^M6g9n3#ZEU|A6@m?Qd;anUX<fMAhgTqTiE$Q4tt
zY{5D~PJtF_z?(yFnZYI`f?oDw!jv9$d2>UI7poaBCVc(q5n#P>2~)n{;^K0xQn93p
zM4XnL9iv#XQl<nYDJf~zq(J~Me#8Vb0Fi)&0I;#KF?!?x0Tx(7l{{`3fPaS=SExmS
zBFL6G^!CQZln#R;BG9D+j_9bFeIk%z?8JrJotWHknT;Gb!U;yOX2zB&MuLQ+MuCC=
z0TR=X1j0ZXEedRus7=WW=pGpr9ero89FEF#dtO3&P9|Ukb;{_B+fqGM@c4->ticQD
zPgXETanm0#Ul!LzZFDhKz<)i0=4VR3y}vbVi*kQ5XVdc9<;K(YYR3_Ez@uiTRZJ84
zD{O-##ELAqOc(~A*R|H|HR6n#;7l=z2AuK6%9N_mPb@-o_58BW1@v%wN>6_eXxq2Y
zZtH7SmA_2Jo=tpT;QIPHf8(m(QR+7x|H98xc&W=WEFYJ5ipiPzwSNR}pmW|nAfp5E
zk_8?ylObm-7-#6fJpVk=au{rIZ(s?IpzCb32gp%JGe<{cUq=jleA5Dv2PcdkkI>p5
zP%C$0Y|{Nt4Cy?;&by~RV2vi`U-Zh#T{5~E7?DFS6vW6t-7G%4!%LEOVSj8vKfyq}
zcW)N!<DNNLqR11(OMgNgXEu!;uac*6r_#GinzJ;76H2ZZjS@M0fUH!<-N*O3(3klO
zKw9``jVVs{_y5c{!V&Xt(LW;YFZ?4?DjMrM7@GZm(QycWXm;!l@bvWb_4V~f$h^J1
z?R<Y9e19K)e{XJX1_Z|6e}4}>f8XCfFMNNe*!yOb_obz0&3}0POlaIJ?A*$0pKHGO
z9(nz)ZC`qPcsM#f?!5b>OTH>c&&Qv>8>i3TzP~%JzSq9L+poTljt=XOzdtL4OY@Se
zJGUo2#65f?E-xRxzdmzYhjwmX>W;o+v-|((pfKl{guJ%Vy{o?7zP#+Bk&(5!?RN_+
zpY5I9kB^Tq=YQz*wEXR@&HLXk%irIN-`~OEncF)%6R+R>gIm21-xHtT-)CcO8+R|e
zJ)7Tu9e>p5dxfZ{XHeVW_u}Dw<?eTSda<uxbjR`c%hz|?)%W*$-uLU>_v`(}_jh{7
z(cJg<!1H(i^S7mC;N-`5WPV?XwU~cY<*=W2c3yXWUVr}O_xDGoNXNzZ=jYe=N>)l~
z^Zj&sV{LP~Q^;pA=jilNM@M&O=h*i4WldFWZRb{6^>k&B`S|kbpFace|2Y1p<J|wI
z<NjI`0Pq4o_kh5l;E(`lG#4Z?R)A1<b0HdDVSEiE^bkNhStS`cVl706kRP}>iiD_w
zx=?Vy!GDfFQD{ZfK|u(pV}mHMF_rniAWc9ly8;27*|cFm@g$h|>jG89?CH!j#lhTk
zn1iq^NL-~2^pF|ZjX49UL`@N3xp}NvoWLam)l{Sm84C4Ak@@}n1g*Az&HC?yk_eFY
zw+ayK=Mmt*=Y!OZ&dCw{SH<S?$r04^#|C@;HGiQHvbAy2|1TxA{~x%1HZB%sE{6ZS
z#<T${cl9sVm@v^nNI9#i_y4ygHT1u^{;K#XNhNuVVc(PK5!|eqUs%Jjm|%-TL5RtM
zePINm7>7jj5W*k8N&Fh1{u2aZL}6x%h^S_n>S7%MgVK!<RE(nx_2y1Erq^DZZQGb9
zE`OG1$tdUAS&nWqH{RJN!M-$gD+iY(=%nzj3}(yCuOtIgdzjhy5Vs~7jEK8=3*kz1
zLQPN^5qr(dObk<zTc0k_3MQL-{Ognabl}bhGZ=Z?t$Nu{;ENU@-E=~-&kUxaNGQz;
zX0Iq!)vT?L8Qy^DFq!dk<UeJz7?<22$A1waUijsKJdO1Lg#$@spC94nHjzp}7Y1T5
zgTO2pop)(5#$K4QWVHl-XSQ%9slX17@G?Fa>buq$z5XbA4j&pyX`5kOnDG?z)-!M~
zq|%{_W-1H)uHFsdU0<vHqCiTr4mp8fzE*Xj;VEvp09;eTQZ}`2z_>nYwp=RTZGX4t
zm@D7R#IS0hY(p~Kx;5I0^gO^-UJ&giHH#gyj{f?+)kTZKMu!{8>cKqDc2^pEs2NPZ
zgW__W@}izFn(U+{<KL6VG`gfQ3v?U&<3|tqQ4`i&Eq2G0UN@GZO6a9W%)uSmcrvb)
z%T|coI;~|=l!sY`5^0zGvC&UtT7N?F)b|3Zq7%-Y10m%JBL~#qq~ZmHxoSe4DUXRd
zoS`&Gv{T!3YlQ1KGMTot6-)5$IIjWaH7NIQL<*;r&%`^gx{uK4Py=IHDm#z=)f1!q
zIfwWU2DlqEv_Su*dO-fl$NrN6A`T9=4*%we|JDAl5-lYY?QueUXEyQJG=Ce@(*(v<
zOrWOq3n}s)rzIi<CI<6aobstfDMGLs7g-J0#U-I9c#@Cj)5fVtsAYqPwQLH0GZ4YM
zsfGT~IR3S9FU!ZjlY6lRy8`>1`L5URe;dYvR;yQp2ay>~GG^e%0{|PM49Eh&0;~k2
z1)io~hZYhd<`1y62=VgKRDWNuLiaqgpHE3IJ8<x6V@;ZpA{JDhkf@xVUY(pQN~ZWT
z&j~n<G(p~v834INb_YNW8S36{lZ(v-eYaum#oj0=X`(|?GF3>>hwy=k#%gb)#n|>n
zwyZ36*|_8$T;LQ?tiqXz>9>%<es0YTN8p{oN_7K(x4peBG!zWX@PFjuqI5cqvA4CP
zBw8;~Z}~!a;k*k@EEH4*d*+n3cFg8x_}rX++a?3g$H%Sy%JYo~Cug;3J1Sgg(%ACg
zezTvSmS0I$mL!@aw_ots;)0nN&DYhQ|FU;b2tao2nivJj%L_}z5?$sMI)7~D#)}7Z
zuirteNPa>TjHlJ5yno+{hBbcllTKB$)w&YkEMa_Sf2}>$W673HdX8&QNW4bX<7Qip
z!5x0))Z_7#poRut>@z>buj`u?vnE9^UI_^e4IQ7=#l=8<N12lFu}+xW4v*yA1<NH1
zg*-ProT%$f`!uQcMDoYrU@*E7Iqm4*_o$qlP-Tt88vK_Vp??YraSCTrvOgib)3bxW
zKd`T<P=QNBbE9kTAagYZMsFJ}&pjj01Vs!7a5`x0BJrnm#7R_!x3@64_~h0#(XYnr
zYD<ujR{P3m+o6!rm|IT-H+u`^i>sg7T&!vZP)3TZJA5bTwcU-st)FMDl*0-?ikZ|<
zZO>+>(!7ZaPJfU5LGz(%XqAu9aZw_+sd0J^#eewfrBTMj@XGV~VcM5(e#&_nEFZ6T
zdDS$(G^P_l<T|^>B7CLRfQ!hr>`(`|si<dtU!#o!>1|hHeV(sibf)S^DTCseN6BBu
zdb>vC=|3jbZrvUXkF5zzb0}*hR_)tZquo*Xa2tV?)PFz_eFOb_G~txWtMmWECI5fD
zKqFviXzOhA|0<dQi~Y^LTPK=JDVn2%%)DNAscD$Whe0P*O-0G~A@LIj*oR}WvoI1b
zQ0%wXQV2(f@6%Br*|TF6D1DyAg(E@}$3UA2zz$<dgCP%!MH|dUG$t)?H@m)Cg)`E5
zC*0p0j(>S>AL=PD;jNoqyi!0BA%uX6BM}mELW1GC?Ec^>Wx;yUy9g$z2k`>|778Kb
zl|c^_5ZG&ny`^nBkrmXsq`=@61YTDC5tpM2lgFUV0WB232el&L<b(o|4`Hk0Jkb4H
zn`NdI26#3lr9-aUke!T#Oul6zIEXY?j-t;7AAdyg3SB^6pR#Mi3meA#Oz-MCC_`we
z)!q@a$wjkn$pJq?Qo>Bdg)IYnQmG<3wDQt?*Z%d^G9W)+Vf`x?RRP9))}sbA2A2~m
zIeDY+;I7~Qe4)0*fv?!qXg((9TfQbTFzK$x&#@P}shB=szMj?~i7W!_#^d7@a9K%J
z?tj36*z;(d&nfMh@{oQpKjA(gGzQ?kwoC~zGv=*uZc)oM8V1sbCiMF-AT5o8(<>J)
zx&c>dAe^Axc;Ej0kT*QoGOKKtv_Z@cU8qU3RxBskTyD8$%rPp#SmteosrTU#IV~AY
zH1y}_Ja@$98Q4|BFA;9IAe5v}UKhn{pntE?O)c0q=QGyCmkO|Ko~Qm_;z1$AMZDqx
z-)~FTKU1DV?Uu@qCOtPo^9<@0xYE>UiP^qhpJeRaUnYZ$rs<!&48Y$><{w(HkB#Lx
zqd=2D1?m~&t%M3b_go=u(n=CvC24+7H*rn8WtIQppe2{X#y>uNH1zJmMw0~`Cx4Xd
zqn{TD2CB)(y4r!9UXmgtJ-Yh6ocz|KQaNlK@=J{GyMO989VB*jhuyRh(N7Q$<PV>^
zfwJR_Ox#c*ms;1W!JXkE4=H!hUvJVKiWb($tqf$h5Jd3IWaS^k2kK9g(n~*!YFaMI
z`?}iAe(7J9Y^Y#A8A;h)>;Ae*{eJ;mAEYE$qFqRAh*AA&Orm9@U{z*$&V$I**B5<I
zH*p>*D{%;wV$%LphT2;Wyw=4N++2N|%`MxOh+f0Xr_;fj4oL|yzswQBnx#5id^Y%N
z(TGwtMPTJIg(qB2{~)7$MH)5pL2IbYW{;V0*aOl3BiZS{&rD8&h&j;b?|+Cb|47@v
zfcSR~OWV2_OBtK|lf>%%UjN6E5X4bXTnXaO;RRt71^@s^^dIHA=&6J*31E4I;2zkE
z5aA&~7`0MOh<t*u=rRS6K{a7e&j}~@fU0{C_dtFu0R&ntIbjl!O2t)(;?(4$go`g>
z2U-~UO=s5RY?os%QxlArm49*NjB*c$ngkC8@#E-ET$vj@Bq0O9HVMTlYjhvhqNl92
zQIpwdNUqeDy5Ybo<MYspjBFz?HGG-hSWl3;JRaMA`<>Hw(%=9;razR4<TxDsoZepq
z_oaOfV{GEGGK*?CK4ox=Bl+)MaCS!#&Yo_Aqk4aq+Ef*?)-KKIWPe|f2NMgS6)T`f
z0|V$5`m+FJBgprfin+7TBnKs9W(})zKZPAlk)GF~_BL86Tep?3J0zR09q=i%sLW5(
zuN!rqP8*IjUgGP%-aLX$pxZl9xr<}`&xz#lKFSBnpVuq^|Kf80td@h7zB`?vqvL<;
za;=SRoXwq#t%;q?ZGYTp?W~+l&20!gVW9{J3~jA!9k>V_jEx8g&8_Wh9h~%SoVa13
zyrKU6XKD45WHSG}{tK}GY9;@pX!>XNdJh0#J$P$fwIbSdi59s)S#~bbaYx|U>e6w<
zUva>azlZD6fM!y}(|C)QzU?!1`;Tl3{$H{!5V6}a@ro`tuz$n~PAzgw00f21ymA12
zk3K@~7=DK7SByRemLSbMf>CKVzCAetewvt25J3hlF8PSc6t^pi4B0t$8mKstQzwxB
zniAzky@mfjntufTB<AKW|9`1s5C5%-t-UZ~silkpetYxdxr?1I!JI6;&ZHbwpI;0d
zTD#SLPc)LqNq-)NL{R<%xqf1sFQ40<Fk%h5deOLjR4{E_IyVF@uxjkX!*;vtWYbX#
zCLq0m55N1wE{2);qels~T%+`yRrxA?tyjqvc2(MfU7>!fxA}+WB6iIaTle&G#+DJ&
zYduATY}Yd|(YbN@4ph`}=e$+|Co2c55N%ybl1nv!$$#<GrBBD!*D5FY365S!54~k)
z8rAPj!e=;PzjDNe#u@+sDP?sM|FB&gJ0G8z6MBnWcU-W5vOZ7n6k#GYa48W5Jv292
z0Kdpc=%gZlntm)$7ROttMM8O_i4_3Tat&r^B~?E$!KkP-G_hrYhInGdT$5mudsP4;
zAjB$wdw)MnVGu%5sRNLFKW8qA-!RT{VH}k=0OjK}K+J*ZRY*a8XFUGMddIbOb>YTR
z)o_-?g-N}W5{G&g3>a!4gkUsis7in*5K#T~Xf2h-%$ZVT*AEXYe4L!-(IW?29j<)s
ztXNwi>r}zDz3Bjyxio-8@cA$kaR_S~yu+=Ic7Jxa!*g?UuqN)`eS!4dL^;OAV9EnV
zOrS`Cq<aS4L5^@SJRFp7xX)ov&(9Nmdb1$2Gxt^<6ifzawIroj?V8%9m}$V}4lxdl
zLdw&9gno)d>l+)91A7d>v*319Qdwbs>I6i7#HCn4n95E3>eF({j*I%?<>gVod0OVo
zlz)IvGxRMHe^mez4~Ai25<yauN>Uab)kD#LyK{OzU0%9ZFW`r;zwa1Fivov+h90b0
zEqi{9Bx;)aN{{!sR4iGbrCzz*S8i;1{l1{*<NLgNdDg#b*|tFaI_rYp{=7@{y!mwc
zO!hhZ@;qs;KAXF{%iQ4Z+NkOBX;`pe9e)wY{yzJm9W!F+`7-sKlegM=|N05v<9#x{
z5!+zp4EPO16E<7H7w_Wzf2%^hN`%iq^oNo}|5~9|)VDJJzuleif7Xx(N?<(Xr~JRI
zP<#Bn^G8=qQ66Wc=j6J5iW8>B*FZH>v7{<rt1^LwNs3}Ma8c+@4t`D&#o%E(QhyC&
zQFB((SLb|;zc5UY$Wv^hjY(jxD#M^damD3iv#Y~#<A-*zFg58d_zBOi`yYQ;{`>=c
z)g*q3P1H&%6w;!kx3{1t487SRt;+gz9fbg<H|?%(jAy39FiEV6=t8P)mk3#rWv<O5
zsfA3TC}-riIC#nma9Z-&2y+&DrhhY?!qY0kj552O2wFpU`J^nS8YZ%A=P0c`7E!X@
z=b0XAZkh}Cct-nUTW}LUMOdjX+JK^@n310tQZ5?YuTPe^fcG2#POf{}BB_JApYXN>
zaD<fvX#m3{xG_)8dy^H|aY;O*$NTpW$WFe1^Ni+;dWZ5yG=6rENW-qT2!GLFi(1v8
zQe=pkIiLkh6g;y!bfI(2c)is!T%EGv2k2OE$9i<S0efHSEO*Jf<Cl7{9W236j4Y4_
zrGeuP>}N)esT>3~MF{SY*ox<0HruYjwe4Egq_#uo!h6*H%!+YDh$tG*emffwD$zjr
znK$tVW;+Om4t}_dY(Dnk{eR$-;2&a=kajBI5?1f=hL!UuL?Am52}lA%GWf=VEgEBl
z54AmjoEFFOWNf<%@&NC9ih7UB%II^u9D-jyrR8`j8OXbqF$BmLq<0)PmI2wU;ET|X
zJnD#}wznu_ck)4AI${PWL#WOab?lZ^Ie@TErepI9>>4L{dT`!{hkwIALEq3;=Ho+^
zv@i-C3?dZDXCL~tGagcA=JlQCIaixMFc$P{$6Sr#Bx=l;cj_yRw<XDUi?gHGY}MD5
zU)=br7YNn9-e+CT(YaqixZa_y;Qr@Ih^K`oxze9A^?#KTcE%1Swhq?+V^P}i*{Oj+
z7DW$1k7IEB_WRoxEPv#i+4PIg@wlh%&X)ll1jV<$mWiR3>C}&dpb2Ku0kPxygPEgf
z498>EqDJ21&~amE2YZ1eMW-wcyZT^yOb-^|pMUEwLCSxXVygQm`s@8yK`LzPYV$t|
z(hHbd$CIOkeFHtc-Ny$zNT7Kjg2_HGk|VxvSr7%9A(?DK9Djbff%y5p-d>99vwaMM
zxy)a+{JjL?FH%;IJKr-AufVa354`b8hBGo6@jeV!{2PZ3kVUIH;ogruYJ*u*pv%m^
z0s3y-zmciCz4lGPfKG}<0lSp&a&W0o(U?hTd@d;_72NxbicdzKs=ua?&wxW?vJ^P(
zU40A<4LuDVeSdGjhO^c#zIW(f23LxRY^%Ipo;+f_Wpv-a?r$p@jF@EIJgU<|uXZ{D
zHp1bUO`dsqm^QLacX$}%vUnV?Z`d^ql?lpL=o@({7v6oJrZq#bp`g*lQ9gSvX25{<
z(@m^RZQrq1jl85e5{7Ce=XO1&YI5%3!B`l$utOPb<A0<Sc%00HLT>9Df536I(O+!T
zJbm}@KF@%=*Fm8kM{B0=j_Ht1_3GU*^e?}Dh?DEZF}k(CwN*Mwm;nL&yKiQff}2A7
z<CoF?tua&I!O6zh;s1JL=Kon08Tg{08vlP=MYj2ydtOS=7E{#68O~{FxGEiK%4(RR
z<ugEBMSp2pWTS^-4xq`Sd8?nGYnKn2gzi9)%&)<wq*zu~5Kw>+(RPYY8J>h9R$6rm
z;zT^@j>&FnYjAINezT)3@346r_})J{dhMEdzXkaIL`V-kG1ZR-h7Csnp$+f8O5L4q
zB`cB^&-@_PyXAp1HNTA`AcPL}*8|Xs!8snTK!1=TThNXiTHkf)2tGS2lg~ckCK-EC
z&EknpE#SoQx1uBwI&?&u!%$NMR0bTBuyDENq#!;_yO*I#ZY;**krhwS?g99~S(L-D
z`)HJAqU3z+@H_Kq_Qal<a?{E0OdFocX2Lng8omYEw`^z8)0MwgY(Exe<x$-69iIV`
zkAJx-ub>zN{E-_+gdhx~Z5edYeLr`s^Uj`S1v`s;-3hv~3Y9|cABRlYV)(lH9wXoT
z3^=U^<;b%e-=F@QG-9F&IDHJLD)Kx}c&Wm3tl;%RNT+ldR}Toj9!K!#+BLEU*&Rf&
zgA#`TF>D{Qg>b%2&+P&O+xf!@A;-4MOMh5%Tn=*6Wc}8jBuI-4ocs6X^4s`+q|0!A
zSo6t2#1{&fLS^}4>9wVed6^V&M3fUQy5`U}6|Rod<UzYFv6BT-lLWcML^J<kD#QCR
zV=E^*Ou5x5Ml=s$1o;Btn>>fTDM|CvFY@~L3iW-=>Ao=KG8x3mL6Q7i{>bews(({y
z7By+OfIfmG31e|A0;h^;2>y;1X&R8ei}*z(=4mbZ^baE!4r6o-71Q{dhJ+*_${xPj
zN&7y5h<uw5m7^YMMMcHthy0jg^FEUXP#>kYok{fh<Z}f@jj*@>-X&kh@N)Yq3gDLg
zIph1|`!N0x%gWa9kK&;>wxLy4{C`K5XXIq`9|Yr&8Ibr3e<Ro#aCF=RR6hfP$g|JT
zD!iFJwFt$0a3&QSK{ZJuBd!#Ao;1{_=K?y2s!a&PFGt%nryTUl{%pN?(Sl#X0jCxq
zN6*+v#LChoke)X3icafAgwq}6eFFSRRqz%1%0eibbf793`~K7?ca#mNBY!06f;y7s
z^S&Pxzrnc&LyS&a0ye+jYOI@7(5A>tonfU0-VPA70=#Chk3?-lIc79hrcC`5)O2Y*
zZG8d%B@FqBa*w0{!>j*sB*BmX0O<d9%!al$Cg!I981f|cgv4L?$B<RFY!(<$x^o7(
zaa{cQ1ETEvKna9f&>-d8Eq|y5#l%L#Wsz-TaMxtod68=R677HW44cooEG$2{cHh6g
zd^`*+3|ZV8-y{FBLn0nCNV4-#&ehPW*~6TOe6Agn7?MPW9uS}iEz_4Vdwh5}NKAy!
z>KY1|^O3bLTT&@B1`aNg2@a@Yn^g!M4qtrI8&eAS{cy0C#yn!+!hb)x@yLyl|Da9(
zePPEpC!xP@>~w<N2uJsRMYy`vF+U3D7FaBZ+>Xd8=}D^l0VK+`zo8@MB}pfGQY2EK
zw(aO;yFys5w|w2WhikD_EtDiOasc;RS`}hO;n^ol?1v!K#oMikR1pS$#6$st^v{v|
zN&1ur_q>||7|fr*C4UVOkW7gX_t4xS?1ZOvQw~@x$JPZc`KwX;7nlPGH8DV|y-0z9
zg`N6KAgDjX!6!R)`e40D;W!)Nc(Jn-NeSGN^&d>g#)OxU8ztc)f9(S?pQt4qmEs(A
z!<!)x4VXHNJT(jGe{W9FmC23pp#8c&r#RF|9PN*8%g}D+FMsE&qzsmbRTnBpRXC1K
zKcC8@c&epn><-J17(?>bLG>h_pX}S=yFGrqXsKaSy<d}Eg=hlbaac}{)H`znVW!+$
z7oyc-C*k2b<4UaU?ZuQx`jyT-t7-SZ#yUZ|l~U%tSmuw9;rUTjd`$Y>dxoTd{=k3N
zU8m=iv-ZO}<9{@jOFaUl4A?%m`e(~yC!DlRS7MBVwt_UNoDgmQeZ`Q+D^U6UDbJ)p
zKmld@gy}Tu&GfWOhxTF?2^Sx>My=>@oq#9*ORjeOhatERd&C?vzWJ*)_wAq|s|*}M
z&W*HQd#MZu{N4aL#K(%aq8#(}thlIqc-7`kFpatJuYWb}H#J%xtLXy4q5`f+=d~5@
zE<a~$)X9irXZVEEqYJ>0DS&&lntpW<%mxJFat7A*$QI@}mY4ui6#K(RuZvD^GOz1M
zE4wEosBo6bTqG5a*&=`3;RocOLJ?GBu<JFt{jS`g7G3V-ImP$+aBQ%H;6mPtWRM!z
zMFyTmIe&|RFZwaTjD>m;eMAK&FA%7(HW5TCp~rW=KzwgsmUQ+Pct7hNM&-93S+s8O
z;ybcUuH%WZhF?{1zVvBX59Gc*31<2JNzo4vOP+`=-Z05OF6jXHzoF>g%1QsAXhT<;
z<X`wZMS~NhZ2}n(M4x{IPXLbcMo`UBL|P@38h<Y+vvMff8CV&?vz(nlGa?w4n*{Q_
zyhi(WFWsA@+AP3}29OLRF(uJ>^ib(wR1Lz{+X{egsFt$XhMpdov(k)GBb}EwEYy~o
zuJUpdl3z5Wi!gLzJhqI3w=TL|c7qMczb){CJRd<K(n~0@Fk*nTQ`?|wS}xK3veP!5
z1Ap1==^|LQaM_dL<~r8a5Gxgh=4D%NXY!*e=$OFD4Wt%=fT3g|J{)g5Q<Ig_#^mp9
zt6qX2t%f0h)<IaecXPYd9S>OmdE${Ox#CDFu!4tB*lw8p)C>Q`(>ncOX&-JNnG@Ha
zFfmurJqX&52pj1lC&NY}F<J+&3tTUX=6~ErXWypgboW_llm*>Xd-8PPWKY*^0_78V
zXgD;CVg1Dd)8<(!=25Hg>V-{r2#-s*)U}WP&qWz`No3czZBv~3tB?c)0D$*j7sb)o
z%Gl7!?ms2j-`7Uy!0g{dbF{qVUlC)=Gh!9Eur+yKwB1e-1bSbh*xpKLp-@VpZ-2wG
zr@2v%-Jkv5El0c-w%`S2CoNHiP&F>sU>g(_YGj&UhS)t+dUnC8fpP=X*S|c@9h!%<
z>S7oXWt2Gxe4gL<(QZ<f1}OXzJy+B)fB=LYgon+nGZnOuB6!Z5B0iqd?&e+Q{JBd>
znX1Y5{suXC#cf0~YdTUIp5YFhR(}rm3pV4`l~e_}@zISchdF%ORGEl`sj*b=Hy@Ca
zU~ba{<ho>yMWgTR)*bLaXQw!xmpjyC-x}zT$rb|rcTweUEvkQ?7F~q_iNEj<la23_
z31UD9x#1N#0wmCx8XmOba6^zz8FXVB;OI4ylw7Yr-+%_iI?u2(f1B}Q{(m&}Xq}4u
zUFL-zlU1lBD55~}Q)pMrPws&<MuU?-m1h%2MNQ!68R#KD5#{jvC!08KtyaS;Nq%Fs
z<*?l6zA}hYy8))3X$?_t0*TWPjFQpH%`xzy3!G@Tv1NCBbIDtA6Z=Q>bTG(4l4gEm
zNSNk}02v)?!0TK>(JB?8Re!7>He?ex6*;jwaIh7V*&_v`JL4UVs#DE)6*pz1y8Yxl
z(@g7IoEUx_fw^%;FMKuCm$b~6Siednv8!t|Xl^c>N2BMCci;|S-oe0x>s`veLH{|I
zm4D_EntJ~#_s^Lq;D2Ljf1AtyYH5~#rql9Yr!=PTFG~}?@e#QMFMo8S9g2L|C5503
zBUc~55?YX6D@6U?Ca6O3I5l1~-oBJ-t5I^au_0PNmE&^DMP3U>B!WT+vb6_{3HpWW
zdIW>)MDf!OI6|tZOD&=qI8eni1M<@#CyggIh4*<Ic31&#okhvn8m^wa;o;q-T7Do*
zQUuuC={upvGMPspbAJuB!PNZH@sSX9)oCSg8KeL3Z`U>dHelxDHZDoz*7o;5gB=C|
z0Koh+;6EzF$=Jr}zl_z*+3G*W3Ym^2@fZF+)~ci~hYbc8Kht+gHMlk-3Ul_UT{VXg
z5<~iK$rPy{8G<CkC}qU@6Xy%)NtescKRkdy0`PqxC_Gn}Qh%%og%7l+OAPw)(GF<T
zdqgj32B84dQFn<?+M&8bJSinFRL93#*=%Z{afwY=S>qgoaK|6A#B{TD@OHLSXDV5%
zZ)rWfeZ4)u`o8LCTdz$G*-7gvSH=St0Z{}CfVd#?djpWod~=W-8Bb6Rgi<$}QJcPv
zE0z006{_<plz)XG>Ph;satTqXAqb>Uw%24X*-~PE{y6ULU;i4gu=SjDV#^%U<|0*P
zF)J&t(1EH@(L4EtI8i}#;@ncW-C0Qla-NT&;QIiVJbZyYO~qgwytp<NqzDgH>EQEz
zMW>A7%m9nWex+!=q<2IEmX&jpK*q&^W2Gc!*7y?T6@NdrcMUpA!YAc!ZgH-bC#Ri(
zEuYus2G7$~qP#`f4CAv<`4NNZ@mcSl?{UibQ(c5Dp`g;QFBQ$g{zwVdpyCqjIGu-A
zJiAUFt6!h$noR5IIO&2A;F^JuLvcB&F_%yp*>sFCQD{^OPl4!@V^F-;J0vP=Fw5r#
zIMKUF;C~_Jkyr+}CV4^cTdK26IsGX&^}Qjlz7ckPrO6?wu9>(0ajH}Hw{NL#4tT;R
zPNi<i(Ji@{T>3dK6ru48In8j-zbM-leQ%z)Q86T6h(G=Z7XSe1U(D$5Lf+zUS8Ir*
zY9;@|-|c5g-P&=34e3j2>V+@&ji^3eoIC57OMgCzvu99sMopZ~W#OVV8%9b1Nh3iH
zaJKpUt!IZ0t&l>qzOurWEIm8~q?X?8_R=6#Cc(a#&V9Ib*=tyVwl%q2uM?v_PmH;G
z>s{p{!ZM}2KcYW-syN_Lov?ZhPa;@8_E?fuHOf?S1Uj2u)hM_Qo@{ecZ%3_57i~c5
z7k`vDsiKly?(Z_HUS{OLkzokO?Jv{nuO#(h!=jOJ8mkn)T$<rjndX*_?l4UOgs9+0
zkNyxeHTs9JlK#P9PG08#Xwib~d$JxScBH~a(x%-BA#g+R^4z-GESbjfp$n39X!3Lk
zcQP#EJEe-USrw>-7!Rw8WRik<v8_3^p?_XW6Y>D_yPuRzy#@7JCLv|<*z82eWx@9G
z0}TAC(Aa&>Tzzv4>lRzh8i3b^<wIt`9QJLq`2b$cu;HBiIY7rFZIl3W>ODy7ezv-c
zN49!hd(c#yE1hEG`kI>nk9O(d8!~ouDBm3@9xhtx?wf39o@;V|Y?<S|$9+MTT7THh
z`tL5bT%S_+S0ZJUE24gDv+!9rTEbPis8NN6KomfvLW~K)7<gq?6i%m?%|M(6$q1ek
zIsuEcafo#Y?j|@#@_>-I63kOCG}Um<1W|j2`uq#p)ClQ_6GPv@C3O@?qB5nZI6d4A
z;|?$r8YI)gjLnJJnW*eyLV9vJSAQ>t<5Ousohg2>&l<FwG7!Vtsjotwm#`bgzMn%X
z(>=x=b604s@PN72t6w6?H1vcY<{eU~YcM__LeoUg@jbsK8W~AJ{Lz{hL9y-q`i#SO
zZ7M)}#F;`wOvG9AQr3TS6S4cuBlYrbe$xy&e=L+75EsQ3vOUjTa1JHo=zozu{MI|8
z0g>!#ZP{qMZQE^SKr?%RPzFy{TGVX8C!p=5vw_5^xEl7E1Ybfd#9uYy*zr=T^4nu(
zWjMeOZRd<`b44}1ryqpu;lbk^H$d<w0f1bmQXcK<y`=^;^gQ0$C2{K4hDojF?zNe!
zw2?Pacgop|?2n1LD7+CU5r3iDEef!KFx~TKM$`Q$a)gLY-l)TtUA>;3mhr|=<~>Sp
zWHurVDlPmqDakGWWiz0;SfU4$AVEwUt|-Rr$+j7;)-%I(1vdnUgGF#!Gwg{pEfFR;
z<4T`lix4L49g5~@CK)iF313iqUySU%u(R!5U&RjJSd&<}Y;z2PJAZ1ZGwJ&A#F&#p
zt&xGjgWYHfj1R{O(U)(r-(9VBynmD@wj>9`7p^2j8e$^?)d`;~r$&-t7)!HBKvT;^
zn^$T;T;ynTQXCRG$eT|%JcDTWg5Fv+a4JH6)(LUK3`{XV#?UFrd=L3^;}LQoNqP8I
zHX8RWzKLs|B@s+{R)0uHC?mU<-!|GSxrA=X?s(V#eJk+y>SI{5a2?ehoeE`e?TW;A
zcA9#;jgUN<TetRDhr>}>+Y1WHFRoW)dN@+ddpzruuVqr>Sv1Zin6IJ3#vUKLYE9r-
z<Ftcv-ErT_=q92HZDLbAx1ZhbjG?|cQ=ee5d%s&w5w18ZrGJ2^7Ut*mS`@;I5)hl;
z&);u)JeNMNkN9*xcN^-KicYt;MKqriUh?%D#em;6w1pTkMepQ_N|57?>u%U@b-?aJ
z@xel=XdN-a<+((sab}U)DcN>629MWxAol3`0B;mKvPgU<7}Wu^__AST${Cotby9;H
zk;>`R<IG7ocz<ZC)(Eo%Km#zZvZz<E*QS;@A0Ir$`uBM7RTFc(;E2zHqf{moYeRWY
zZ^YY^P}uGjn|5~rfC&p{Yrv=*0sLz1hix(>_7M5au$G)n#gb`lau=?g@HEG(j%Hf`
z2IDT>y4H31Pp+A6wTZhbmxPvVN-|ThG%!0<WifOixPO7gfl!N6_RA$MFJh|=S2rU%
zz*IB*E}Ml?2}+@ieM`u9Dz!Ef>2+rJbLYZxCZJdEg$OZXu_qW_L6Ry`YJxdc<p%OE
z8M7FqFA&~F(AeNoK^REoBU{*<4ds7I--(95fsn@Vr+5Gdb?>S=OwuYLkq+K&V;DBl
z3CS4AZ+`$bK*_)BQTErO34{Z1^GD6+6lHlG+D$bhXUZb)Shso*ms(c-O#Y^c)OcKm
z+B&<?^{rCoQ@{5sxg4N;m#xaKvfnB*ZMxXT-LdOZUB-owdqa9t*>7aI98lVA!O#6X
zgQ4^5{LO6kpn*ydx95gS==htN=V##AG6yOG<}LSQ3oL(>!6;JrF*~u!t0P?&<qj9U
zL$@T$l?R&3odXEKDD}zWK031AtX;b65<6`mZfWoXpnG7H@3A`Mh85`!ST%utgZHUP
z9*#XaCRtZoj=pEej)mO^mW+h<hy_)|@Clxu!;^7FvY|T3wwYkfopgHB-BZYS<K~|X
ze)~YDBP@R{Q>5FieR2A#(y3Z*=3;~CVgoPJHgSqZJ7u~28#0&#vUEhVlp)(Zwl}}y
zxTJy8vGzGiqeZE--?2v*xBEf?J?^Ggiaf(J*<?Jd1bCmoty-vKM~0qDqqJslhI`PP
z(M!GvT33!CVfJMKR0`}Y^UgohUkd0fno;=|1+RbC6cwqy@IjP-^~s;*BscGKi8*Gt
z8+xpKe+xFYf;YWsSDVZ`_NN#(6f=rrbv(UI#dPOFYRoGV<EY>lbh~}a74mikRZzx9
zYGz&~g;>Iau<H{-L<VD61U@PInR{#p+I*P)yrm8D(9}A&K=p&gCWJk6?Hn2fZ{VlG
zehh!1nh#W;MH;XmryB5YNBih*C@VMyYX?I=?9q9A4FI)kUJk;v)#dz|&Vb*&q}|DK
zbVBt#kTKP8tA1tES*AnrE-$Wjh4UQ-W}w83DE^Or%f72bMrRY(s)01t{oLP`01Kk3
zz&s^uKjF7l0wC+IzWvAgeNu%M-su0SVVHm1EqN04a1GSK002PI005BxMZ;Lx>Khs9
zJL&&j#Hh8WN&ba@h+s8&+YL4ZpA;WZYQ0*R4wqj5o?#V$k`18%1M7JkiU=r;!W&Y?
zW4RRE>T%!Q9mJH94kY9v0mboS9XBzqBR4YHGO7;bP{k_&*2!v6r1fgG!Tai+CQN_S
zEIbgtBg)qA<CmgVqz|fUu%V7SIWoz!MdL6kgbIk3@wINW`}mO`{<Myu6<R}<=~W-b
z=|dXFn1V)L#FH`{4>?}&(VR_6Xjm{?+f!3--cBYtzlVOP)xKNrkO92APocV_W6bGs
zP&St>?&<LWg#KtV+5<d%y1W)*!GM41>kh3BF%uGPX!}6HEhH-&Rq^<dS}=zIB9CF$
zPZB#3J<5{tNsRj9_UM)v6zF!xfHAfg6azdLMpUd!DYru5`53spz0;>|!8;b)z|EGG
z9VGiISm@Z_fggRkw^pM2Vmdz`cDm^s;-$<v%V{L4xZUVBYc;Z<AlHvow&{OR#GGeF
zJk301IAuV}VSs~VG1!B(hH$WkPVg{1u5$zrEEeD7QZN*f;P1{~_68<=c7kw%Hv5Z#
z3n-hWh$`2?D1+ekMuWPIq6t6^hH)txysjRscN-B%AW^F%@~y9YH7p^~*)WI^13&kP
zN%Hq6$qp1kPA4(LVyGDO-NSzu8yHHZX=$TJSzCTWdJ0eSxBOl2<CI~1k_3NUDrnL=
z9ut9D#y!Yrz#Wag@iFg_q#(mJ60<elUAC_}ir`f)FEL5{*<x}dqp_k*@=(Y`qeDo9
z52Z+kAHzoR5!4rkSN+ri5xFT$i~e~09Kgip5>OCp?NLZg&`q9RKWl%F(e)y~<#r-C
z;r5|;dc=)zg?Yrp?ukONc^j=T>AE@x;9zzPpo#y~X}s7=<|tC$SFcd8km>>Iy^C&2
z@0gbqo`0}04nd+PtIv<IDvYSq*GF%)3^|JW8X!V(D+*eior*i}tc&<d+LfHC^baEv
zoEc^k523|ggWsu<6kLA|Ik2&f`;tx+R$&7GErEH2$EG`!Rqx5mtVJGpra!o3hR>u+
z8i7Dw(m~29;igQMJL>`CH5r=c;$6{-B(=!;IQ+JeqXaoKV5^)eawJZT<#UA@>x3Eo
zEdlW(dtVF+R*eT-CiSE~>+uAoglS=IflKoxg6Gi{knHYQ=4pSSgChd%l`}$XyC^zS
z!*#$9)@lZ9(wpKcn%D$Mf{PgTH1!UHJQU0pE3*o=s8Fgs)`3dr#;px~Rj)ek^e@@V
zl-Sx(Y_a4ENtO2H)Y$7Pi$Nxqvemz=R5U+M)hrucL>qQ<j@zG~+#`j(x9vfzM~I}~
z9WIOlh^y{f%-nxl=d*w6$R!XMBvGB{bo-$ue}me?hQcP_BU7b(QsZKYo{v>o6+jq%
z3ZAHx#>WtgW6ekD>CV)9ZC<M$$CWIVHG90{0<eVCGh_WIUuU)MpwdvRU;;kgNqYtE
z@LBpJ`0tTVpW3h~Hw$;6)WcD6bW25H1JPwqp$*AoR-k`ju&jI0zFZeOdLytk`w1{w
z$kG`#`%eicA=O>cLot%eBM=%0iR5OhDh;#Hy;a9|VQ6BSA~b%91Y4G*0-wN#@ThVf
zwroC0x@o&7H`sN0NMpo)H&yIe5;S*GJhe$=An0D5n}=OcSMJ<!ys{EjqbsW$l$34T
z>1HdhhK7Ho3k2kQvE2QVvyI_G753gd<3G)C#PV^fc$TtuJ1;=r-qGq9GKVB5Wv6J;
zjeu{M+ZdaBR|k6bNg2?LK)03W5jaA~9uT&R7{oSI)I7=m;XSAKdwzGW45`G9QP0Hj
z9iP<6<k!>tk_NM6iI%rb8OZxP{6}XwXqVu1e^!6@eSN_pIus+)Z`7Evtg6ZAbQ6I7
z4WoClbk6ya)L9|s(u|-RT;Ui~>{ey`^#?wq;|@$u>)7@{q)abz53C?dM+Bk^ktv36
zmHG6MsP9BuV;J9>y{5${%6&+?@k_#3P<8*+)VmB*YK&j-+wqr9<2Xc##RVoquokN|
zz|VgM0Q9%R@G$bDsR)pl!Bjg`;rF{c>;u3UT#AHyIOaQ3j4-#okGXo#gtwX04q?F(
zf8>`dP*1Hxw^}dIc5h$kEKYp-eP28Jy<lx`kR|jMRcoW>F!Zi(JSsx9LA`q=uheWP
z=Ei+LCLaZ@AG*&Zt`9Dr=dH1EEB?nv)$V^-!0OlMZCQJrNA~CUzogiV0jpexYx39%
zK!4I}uz#=A{CoZL@0A)+5J8E*@Q)y+^uu<80U_&3x6gqhAx~j`ks?71a+XENzZf=-
zCLJoHT`Y=HfnX+OQ+Fp(tj#5NPQ$G;w#2pbr%8);)f(6@)#bwv9?pXn_WR0bpWlD2
zOS{wnM#+IIzb3}lu&U=97hNcw&Q-^Sx#PDTLpH!1VrKQ%Z#)a(cYJq#^zdvqsHFEd
zU!EPEy?*(BjtCkz`(ky`K}u>;vJ~R6h*<>*0n<^|?t-9Pgs0tc)*xV0*=(?tUFjAz
ziB(cBpjuh(A!=zr1)=f_k*Vww$n$^JiP|RGRK0q!^=c`rT>w`;8TfJbbaqO0@Jf`G
z$|<VihqBHYK)z)(Kq;x~PotZf{_>!%9e*8K5t&((EWz63i(;=s?3+k;Wy-nM(FoLI
zcnQn3H2Qt~DxDItPRzgXRz7Z6U_l)rn9IRd{nP*a)KpLWO2cYrAZ5Bbv*>>+jmklX
zEmpvrWky{kK66=p`P*8m4-VdGe1UL?T`&L}_0An}Yl1bO)k+TD-26;{L;Y&8&_ezR
z3ws%31ELEoLY>%J8+u^@D5}$kDwe!t1=u46EI^&>iNCoxDBi+$q}{gp;8I!Wr)w6o
zsb;%mml>wFkThsM#KxM9>}P+};B&4|I937zo*N9p8R0MhVb#-nT;q;BM=5l8ADlJ{
z!m&^+@|1-yd#qyK`anaMBfn}+^gTC^1}8{K3|rC=l?NqWZ>2B6qATGZ2wP#+!s=-U
zrLVg1a|flQKFR4B;m9foa#>ZVPqP&gOPCGTVs$Zqkcd^Z-vPYGbb)`<D8$Xh)Cc}Q
zt+Ol1g9n#0zO;xO0Kj?<008Y@tn;rnTwOP7D+fEnzw4)}x=P8v@ORU^^1gD|XiYe^
ztvK%l&M(K6Fchu7lrmY4sb{xOXxN@wIX0a6b<wJoBs}rQL?spMy_minb4+s#@Qrg0
zpTGftP{ilz55|5amX&{{5&2z<7R;U6u=IY#@-_RQ_`)5;qel=(Fw<kb6HV<8=7cHo
z-D&bYX;#VV5b@6Rv)|wOV7$mTuUI_3+kPG@0wfdL9!GK@QGPrjBZ8TBpT-`n(Zp<i
z8IgQgZC*S=h-Q%5mZexp+A;aE#Uj(UA;^*5ist2%kKdgZ@R@&D#U>1P<UZ>p@L>Lc
zpO=CWIn05kI&*qf+Own|BjPJ7yQ2x~tgZaz$rV!o!}WS?aGeUMMk4TfQG3a1UlJ8X
zb3a@%@&%*ORM6Tr(wg|{M$z5KmX>~2{o-)e%+@&;q<a~WD8e!wz;RBX$DY>F+cBBt
zxn{2Fb@tpfE6aaGwc(^?%AB@<UpWA;W?R!#hxq!(rjC8+A4g{MF7uzcAbCOa_#SoL
z;@KY)v+?)TPFHYGyio|GbzUwmJ~<-vjDma~Il^cB2Y(*a<rKr^jmiWzlE2%Bq2S8T
zu(1WaRs;0kAwq7TE`q*69`?z;r22T|bOMO2qN>;5o=JaW#m=}4`M@9{_aPK@*`F4b
z<=}CBo1%TwLI~BMlP~a&o@?(K`A*Jr*~NGq3_de`^Gmpm03i07k(1*gY)8%q>cTSK
z=m_$~eJkQ?Xk$!*@8)#QMz=2(XzG!TgGF5A-M>wF=Dwg~Nc&)ImW%-3o1124<Bixu
zz`vL11o(e$n}{Pw@13b*cw&BdBhmX&l)urX?F|U9=o-n*Je%A`f}mZ1E?TDLPa`5Z
zB9Z3@qJR!m{Xpay^~l4QZcudF-n`uBFlNZ?2^*Y26DNUd7}y;pwdVkkp*l{6>(ehm
zh6xR%z1y$_!f)>QCc?o$Gfn;K)Si@A^P|j!cz}Np-8GZdil|GCmgVM!86nM8b(8I6
zc+?(|MIuNWLGZZe&3GXf0C}Sg#FY8b&lppHY>Q|zOkmo=)}F8{vkbfi>|x6Y2Finj
z^gRU62Qjp}X9w=PJqFhjbDNil3m4;YW&mQ%rFkv8wHN1kLGUdBRTe4J@=nhq2Cd8Q
z8!vwuk{i0$LU2k#$78~Ys7A=)Z)2E;!+=p-ozN(y3IHbHdW152G)V6j`@^+eGTHt3
zbls6&T)@z1(PDwpoWCJNy@7GeOXXgcf5vJ3`&a~8YXPhp<KuotvwC%Xz36)b1gruW
zz2W)hN!M>3$}i8JMVwYif+m-0v^82&MjL<6#A6_Foh*A>IbPPH4<Pp;aEjJyRr13f
zqM>2oJLmgaR{O;Fd&ievz)+jeT>yIXHZEzXzL~#nGZwvfmCh1ouTP6Dga-z)2^%3n
zaxc&is^Pwkw;sW#ZBvnN`Xdsh2*Mt4)HgIIi#}C5Gncs(kR&S{TuIlmj=5}zty6!<
z%h%0CNi>Uw$y~_*VraPW>F`kSsD-BqXi>0*qc1Kt9s_Pj@J!&xu9W-@ADWMYeXf#2
zC`4hg2TuN;oNP>~=K7cU=?s4hUjUR1V1PDu+V32l)>}Y1Qj^2&mqq-XJ?OyT*)Nq>
zu$MvHNJkRyGk1Uqc+^ZNtrVN6AE$p06GK)(Pnj8-aw~d7E+8uHeb-%Gosj2rJCRPA
z)&)@~<#g+e5pv(B0Xb0tsz%Zm`8m-<8C~s%yr~cG*u)f_zVN<zUyREt7MnMz)r}s7
zW_3Rz_wPq_EEe{80J!m`RtGb;&drd9_w3y9R<{5xXe<0PUI_}UVB$>%uEl>*^E_v6
zCst@utfJ$5sPr70-Y7THF+n6bF?!}>M0SGwTNNq@p~wu~bfL1Z3zV$jThuC0QR~%z
zQXRVA%z0h^MCOd-j>w(FqMcpWmS3Dp2+JWw<Ycm=55_s<4A@tv2YNp5y%FEN-yWRk
z)E^O;0VBLfh7z50_J~>2Q7M0p2yw}l%zKz`FwP6I=Zz+pk~=pzv+r#E(Gi!*YA{10
zhPXWOOIll=N<)WEB|E_WTm;z;CfKQW|1>&hy_wEaqWX3|((DolfJPMx=9U(+;9)A{
zFte^(?o!}wQGyb%Ptf;_>D;tAnKq&{4;>Th_vKi#fSH~Vze}m>l{9~3974oW5TtZc
z#-bHaN6_(T?ggdH6IOe#{Ull$waM8-gjXNo{<2<&75w$*$HMaR^7PEOi~nOFv<P=Z
zU%=$_!J$-dqrWap*OVO_0IL$#!yxZDhCL!ZlD6;UK1kAY)On`dw@{;XQ=EN9r$F`G
z{8mvje%uM^C(Lo?)z*J+q6oIeQ1}fVN=1hC2su}e{TeV@W;@4x4rF58AUv2}%F;Ep
z#IS4)7>Rz>Eae}ajYHEa8`H%&jQr!GSQY`2iW7J#9t~0t36k71){FV&67s6@qk)^-
z7Dv+gjj{KF(_*T^kqjVt20w_8Z+ix5lvS_S5++o@Jk$@VC^3JwbuNW#tF(DJ7O6*$
zAk!`k)&PGcgmh~vOte^#Cf(J~nbqo62|7%hr%buNdz&^iqJo{fP>-AOCa0F#Wk;do
z9YpTI5|^S<#Q70iV63L&40sx|YGI}@4r8iV#lRU7aF7Q3*^XIQX*V~Tq&S|aNd{|G
zgTO+^VA8@^2uy!U=4suUjk;opt_gcDhVcDf+J&fuYYRZyGUM5`n*cS3GO}L^z0J{y
zV@nf@h%}`%uW;Ybc?p*VbdGU7@%B5qV?}Xo2S{H;{E!2DoEKkjCNqcQ>Y~=afn7g5
zm!Mc`cyNw^0+a0Z73-z&Z}WyafI5XWK-f2=I&b`(NymRL;`d&k2sq7ONttq9$p2Q6
z1QOa3b&n6o+athdE#U{r?z{Acq*gis85kX9n&Mp?!Whlfg-ae-msxsp<H!wwX)Yk8
zmH|i+>yqWIsZ9?)jjvw0OQ8HL?@JMK*3#bUwTSvAZ*(3KuT<?6LDEQ5zeS|xTgo+t
z0Pw3FKZk#v+m~v&?G8Z?L;bEE46lNuT&nKF$bo2Vn)5t_MIZs(0g#}_%n7)l(nA`k
ziIYZ%EG8$$vg#d>r9R7ua@)K|bG`)FN1K&dKpkG_CEM+y5k*>bghhnHLd?CWA<&0g
zz_Lmg2ZgLLW{i&ZswNZ=IGB@vghe`hp+6&}^^kwCHj7uF0%9+K+HlDwida&az<-$u
zzctm7L-C?<i@3pT`BLY;REzW*6OU`r5D?ps_13zT6mutzWMN#6#BxBH{6)}V%)Fhu
zm{cn|75uRxF>I#KvR;|%FNS^=ASld+`Vk|xJHqv$6&OFU9?c+$CL<^LVqCzKSL-pY
z@z#IkAw>o;gM(z#Vj*0QF<^O$v8PfGK^8nFUITx4nZ##NLcRpK_@P9LmEey(kC#^7
zC;Tf1>_8E*u(bbF_4LAGP^`^83+jeMh#p?rRiUMkJ&%ioP@`-8#C4PUv!GZNDeO{t
zJ72#hN`x~T8FBXlcrsB>qn^UCQH-|X!|{J;T}teJNWIyDB+l^GcOEG4iP6-rRY=yk
zGH-bjy?O)U42B2ZPHT`NTT87}*RIddE%qfkhgDe23?hnxQS<09w<u%5zh_$ZV77)`
zX`5WXTcJ1BMsmHbjPDsaP5*`xyT5W?@`SJzYBwl%EH#ryG*Sm^AF1&u<7O4RoBMzC
ziFa6F(fp>l0|{V_PIPIY-sES6G%;mtYZSUESM@Ou;fs0rhTi3|sNXNh`f`6&Y#|C%
z4$r=e^w4dQGQ_vTIwWSFa?HK4Q?-fo%Ff2a2?7aBGIgh476%JHihR$}5yJd=)`o(`
zQxNeof-*CWA$UU{XUS=NOOv|Ma&>>%jOhf8E%jIs@6=><Aqq6k3dJdj^;m&>1!-oD
z@cIHN%nq!Jo1p4o8n=wa4%uv=61<{kw`)&xO7D=;gp%}qL0RvB;yj6#@G>x3jEc~y
zE|4mQ3)g<(l<d!{`tvE@7E<fyx_H6$eu37f*t@9<zhTUbUEUX)H!`F6ZEAlr2UXM$
z7V=rUv4X9GTvOj`N%%s%w;I7E4>a`IWgR=(0L{!<=m)B5BT7IkS{WTzv6_z@*7~zD
z&}@(?m4>SzU(l?U%gh_tG>8h@H1h14P@z=%CJRh6s?3n@qO?h}HMmpBtIbQ;lqaon
z>EL-bV#z37TAs1173SfzMdg2N%w?=49a+5=23g{1(&JIYbW}vmey*!6VhMLhdfcsA
zJ)fxx1fwc(LS-@;@Xhoa@rGbN=tA>Nr8v1q528qO4F|YAnd6fb&7!s(nr5-%<{(__
z>hkowA3t{Q(xP}Co+^hDEq!*oNnoQ8Xp09F$FGl>ZS^0AT)tIZfscRHDR?mthY?!R
zX?z$U;Nq_J+^?-0_P2Jvf_cFOjy2lP5{cpq3!u5_-?HbFFt6~!*DJn#eoft{fQCJ@
zT5+<rnvf4Dj{MF#pg}8C@0au2LyC(2RIad%t&@{IG(gaqAklkF5LQ)rPdVn^9Kpb{
zcXNzsmcA&_4hq@84NiX{{cX#>RxMC0m0&E){d1F&wGVpe*@$t*b;_(E#@MU@ru(*F
zNZ@!ThP)u=c@z6J37%{atVlmxcZZM9=M@d0<>-3j_0@d_<(m21;JAo^>64P5`+m;<
z($wub?<Xbdp2*ETk<|fjsMN!qDS!=9EPAWaXgWcIkxus&gP?zE<K8n6H84KNDA-CO
zG?o%lIS$~#4jwpHf?i|q<s3rCyi4#U@@;(~5-pwysb3Lt#0TcMagXhVKo+D!KjvKH
zpO~6^Gz_t^pbz5pYV=TJ@>@*$9HMGJhnd^mXl=skAVjajGZK<T{C7a}%F(6%Z>$^T
zvLr`|_(X1<V_$!UcH5%}bom(k`gr@ogaAge4h4?ET;Y;l1)?lByb(u$guzJ43KB@5
z5Lc!?`F=uaWg?KFVmIFmKVoi9RQZlt&YW<t1PVnb{fDAW-fq98+A7hnv?+r0;wWjp
z=>3^wLHIxVQS@rzZN0?Bn#fX4F~<~$eRn)q-40KxexZMP<IA|BI^`Gj6?uKCvvVM%
z(qTehZ!YSI6>gbY46vdZQ|w9PYq^V(I2#F%G0P8kD?j>*BDcDNg-KLIiXRnbac@u=
z{zP-pR4j_`*V@}%9iA%$rIo=7ibu3*+&^OHVW0ch)0|ic8VZJ>He&{{MaHR4>JFAA
zgF$4NO4NTsl41L5$9e734bBT~=(0c{qZ4PFVu@$FeXI-YP{woTd#xh4_BOen>2!vX
zH{CNIdWWL<UZs+Oe#N>VE76FJlvb|@E`8S_V&|(-em}a~YXR+9)*4|RFvj)JEi15U
z1#j%_*|m4EbU=J=mk_{;3P3>b&*q)Xx;|L|BHVwm0|pM&pp2U{q`%BT5rpV10rd$L
z{ptx_V<nA5KY{?<c;l;X^P$}P8qpb~NzMnw<WT%cn{t9%xV}^oKXy`IJ|U@~PP@iT
zT&kJZWvR?9@KwEDQ?{OI=ifA?VMW3A;UT4lKEdVD9`91Ax-ccMXm)1O?vtFcEXOa~
zkfDFGB9wP{?l-drx)0bP_&aV4ot48pC5Y!H^;coPdVMb{H7=`rOx>We;`bRg2pn(}
z*Wu||&}jDM?|Mh)1p&}CZzki+aAuf5ay+y5=e*mtY#`7dz@{E%n{2aGcrTE6atqmD
z^VkPCz3zF5+xL5GdSP9!L_e;S*g-^}#A<(#x+SBN5G{N%Z+lJ~5RpU>q(5eAWVnt`
zok9mXfYqG~!nT$6NcRYkqsG5g7qt}<+$*j*#yJMmz={x<>6OS_-`5JBXLhdkeXZR&
z>Xco5f&j}7h?5>a1hWX|7;?JZ@6V$H)J!0jf)(UU9f9DJyJ^8Rs*9&rbQh~j%~pTr
zk5&8p*DvawAtN<<Fn)=k8k2&dxTH82%i<V|PrlNU0_Xlbd5%5;e&U;usalO(rO-L*
zmsdqKImxZ+)(HlhLg~whewZk?XKEE8NrtRLHJFhdQ1cg6C3eJ}w&CP)Xo=eGD3%l5
z#tz}&d{nE_@F;+2K@YqmDm*NTi^YGQ!<6yo1=!&)D9E#g9Bv}Y-zmtZIu}pw=XlhQ
z&wXqr&h%>{P&<>ndSM!_y5&eO+{aW(Z>)MpTm(g1&p`nzwa!bmZCh5-MAuZUr3)Eg
zD|2wUau3d*4%^e4Q8QU?{&h$I7m*5nmT>huA#pYnZgiJP$10Ov&SB%~V}*Ya&k`Sv
ze+kouQ;55d&l)~d^U1)6`8ab*Z)^`X!<pTTNFsL>XkEAhyo=KeKua1E2sccc65fb6
zfJvc5kUrU+m7|c5yZto=adS$VHs*~2d2frXbAvr#<&s%|wU$Z~%Ms{^LjuyoI)X#8
z5Qnt(9#Lsv1l+@`@#%#E-q?S^bg@dWHoNC3pb%s^M1C@}h;vfVl~2ci3aW7~ejxUz
z5U~2Rr~7T??3MH!ngN)Jl-SAE$ILC8aXk5VAnUjsOw{!<^$=-QDR>@7kv!O?;r9g$
zoVbD>yfiP(sU{<d4ypQTX&;ss`%sjPBypNW9_2pMO2%W55#&A=bVz@vN-4-tE@T85
z)=2gv85C;=c<*hOgZU8@>2Hh8#L%BPS0T-bQYLUSHlzZ2$v74M@u;(UUdTC_1w_^p
zICjzAXNO>`2QLi;M{@4zSO+?K=HS6u-XKo!_J{56vevT7uIo-Jj%F#lnJ@}Vj;}Y*
zBTV{Xozan_nV^Om+jD>Qhn1}lD3$C3Jdfla3e>>LnnhNT^OTT{vVagZ)Z-ku?|G<%
z^k8|$s72(pTVUNhrIHrAE*6#yKSu|nWV=8T&!@alxe0?VnmVXHcbs7!h|>J~I<O#=
z4?dEyIDVIljO;ygD3~%Rn8I6WEb(WZ`4dTsP9rHbyLfjVh%bL_Fd(WA3el>EqPtA;
z<o85e4Iyx`*>qsxfxDjWOQ(QS$?N=b5;_M^ctRWgFuvOY0O7;9n5#A;JGc+LLVc9^
z)bq$-Eu~-&gKhvunIg;{@{_^xKCBRuT_q7Mvz^<%4?&aUexgS#r?n`+$~ne}K&sUI
z30l}EY~KV_vTlE&;L*Uq@CIROuSX-&EX*0OoTN*PuyjKW-7DYSWp!@lP=p;J&RPH1
zq1Z`C>5fB!d`FZ`BdFU6q8L2?EjZqIOdv@(p0AL73MW+7zROA$1_^&pcHhXM;H(Up
znFvr!WDIg2tP8!Pd=6g|@G_s^slg1Br*Q{*P)>63S-^j8i}$I#ojGW2zNKD4OS5D8
zC9<$=yVJ$#_G-HJD^p<<b6s&}mljE})hnFZrOZyHGad3G6Bn~`0a+=z69B7{7R=Jv
zbxEniBa~gqa>*1py-~Ild}6Cag~kkpOpWL_VMi|N2j*z;xhPaAsnE~j-tiX%vWILC
z{nj)?2-$yP&k4hG45V@ifyUqPw!ELWmd5ziQoJNh+B$PG{2<bjsF9Rme8)K40$U$2
z?cY9hhGv$VTXQMF@ZeWd&ewOXuiC#vGdUE}R4(_GZ1%Mb;Z37ye{E_TEo5jX?q5rf
z9Y-7a@K<!zxi5I#kb%!lSwBd+cSNL+Jb|9Ro+p1SuD=jXPNlBo#cluq)|fR`n|7W?
z+s$Q$Mp9yI`6XY^ILM7gNrBd_xjg6y#$M4Xu<NSsmOBjH7c`xx1r11A@-2@<+0a61
zcP#i_0P1=Lt8lLejL7xHlWsDb{+je~6ET*Z#;3w7OS;X=65ZM7Uh90QB*t0OR^|9I
zJtcq90VaU^DLUTC%~Zb|jlc1e?!cARpH6ZnzN50Q-Dz|ei8+JjENPyFIP&bg|8+_D
z9;evCYr9}n;U{zjYg^i}VR&N!ysK)s7IOIe8&HeFwjPUfioikxl3S`JgSmq+kVS&^
z#-&*h>6?{1$A`xFkL_BcC@0zM0LLd9&lP_S;<T4M=V71&A)x~`k;lor@PcmU*|`Q&
zBfMR^p;3<7J+99qdznOg2Jui`b1XbO+&0O?iVh>=+()v<A=k6dAB8PamcHm40Yd=}
z&=aC%=n0|Z3NWmz+zZ3QjW!X6)7FmRs>wodl|UDh8lEZisK<!1>wcsiv^(ajs&0Qf
z5)y8Vl$WepUx+3ed%z4_BY7@Qb28>isl^H~vh*Sy$%(W9;1CflT5%K6gmgb^=`~ki
z^CW9@DpH#EF+`s>Q5zG5r?AQqw*yme913TvQ4G^P5=#psG%I3PT}0q%aVh03ezc(}
z*i_AOg$US1m9waJA!#~A3q(Z`R-%98UOI~E@IByyD1cV|o?)$u#Bne4RJVQW{fL&`
z#V1*af*q%8Efy6zW##;-!WC;dMZ~`H9{LJmuYRpX2|tmcgY0^^eWOFmCyv{fv?c94
zAKw|(H_7#uvJeB;9iCJWh|O)Z#u2=>xyRcYt`zZ`_BvteYRPk>NOOa|u}puvy~JCn
zW9{jAlS8+oR$IFrwriN~VerdN>k5mi!e`3cEHLAD)+uX?w{ipZ<r~}jRYPca!7wcQ
zJ=ODXD26jU_j0RPl}DY-x{+p;>StQ(I?l}YU(xMFQ;^9GosD8io9hGBb5J#^A^rw>
zIHh0hkJ;YvO%SfufOdzdkuiVX6}r*>J0yT>+2QMgwt9Y<$oC;McF;!AkUp@VcUutO
zz?gd|r8@PUwxdtMN8M&OI+im{tw$co;nkJzSitLS(%PO#mF9vMUsz;L;s*Zq{&M3f
zfqY{<1RY#Oezw3DZr7*noFK2)ZK`#q-8K>Ygg*iJ5}%dX_J4BjIwyY;o+G1ENj!G@
zXqyO~4SPq+7S+T~7@D;j%!3Awzqkjb&ielTh5+Y0G}cUf#HCtLn?b&uywKVh{$XR?
zvX%0M<deW8w-BQ)CH07=9@R1*J+*P4gdd|X<N*zWUPDbP*`?@7jHhxae&}SZ0<Qi%
z1pUMyb_Vl{X9-Cu0n2}>?Als8K2UZIr-UewYshSXsK%rZhVKSb<soMtk`zAV3YyQ_
zSDPui(Fbm|yO;W_FiLiC12lYbj0lE)Jw@HB(TdeJIz8IgEpYwdYpidQK5uc)zkEoD
zO{pcJxjOB0PBG7`k?=x6VATlEp*=_=LZJ50lgEj8<bp^iY>j_t>X6QVlvz581jKBO
zW7;ZVb*bCQxL=?lDsW>q71jaHrgwQ;ZD)O(;qq!&)Xv7vRxGh&6O68*jlJ61*|yTq
z)ppbGs7v0!GZWD6mp{xXBV)B?m@SI*-8n-eTw9*w`RxkZLrC6$?k_trA)Euy`nM6c
zs39LN8KCw8Fdu)wi(OruT0@LF;;neZfNZQ5hz=P18nL>YFXxiriL|@mb^^4VDs1ho
zrX&FJ5Nn{K%!{Uz&Mgn~DQ?}UTkK-4r80XltAXjFnhQ)Du{mgQ)t|rDpebomQ8UmJ
z8+Y-IUCNIV99O8&2rTa?y8ztJ_6-do*HtFfQEy(^o^*e(uNuCt<KtLa?v)>Z?}*bB
zYT)l&rw~vYbmwO!QR#x_P#@3$lmsl%`hEvyFBlfNX`ABA(8n~i=H@CN%2yoZ=hJQ~
z=;mcNA+aBDr!^<+4ia>6HPJEa=22NHcjmY0M1H|>HP#*2RQxz<kbL?$c)eV1NvC<X
z<xEwild6C3-o>7<CXaF3s@55;AoAbpist*Zql(H?sixNE^!=Xj<}Ln7mZAhkIP{>R
zy3}qbkQ{(8kav*g9_R~t{{osZ@{5H+$KROd8T@=6+?_SG*WEdVH|3)@pE>d;VAaXJ
z;%vTTMdRIL!Y22A)QhogS#>5-?4_>t(#s);l3#zh#}(_U&ZSQ(>uQ+wcwjx3hYabr
z8#H6_MEOzbR&O~!`-tM17fRQUC(}GA&=X9YHvokKx2pE_(V+0VBMO^Hd>@2hKgSqj
zQn)+x4;WDy9}A+YRff@E;AF@v%tM&GZ6fUp5?!yO`zbItYv$1!e=7y%mw~I@J*wfs
z-%fv&X{aGyxfh61-5cmTSCKm_-3;AuZX0ymQvS|}TgM^LiDg_v%9Xi+jZ(FORDn=V
zS&3d`7e#dWa&Ok+U;IasZ>zsL96C_!g?^AN8CR;T>My(^aAt~3oV?isEx@$uBM&Jx
z_^=Fn@}AM*NWh}jDvh`mkM#J)Mj`nOR;Yj3S#ZVT-SD};UCw-a+}eJBeGE;g)_fmK
zZMfci-_!SeJ$`!>+zs-jXM^F-^sA%Hd{c`z43*r^p!;rMS>0^DpMA~reB7Jt#HUWq
zinbO9#p6g?aGAG={QQ*9|E;voi$ad>_|TTFqN>9*_BwQqtHVUF<H*Yhly46B(6WEw
z`M|@TJ(8wUF@5rpxVmO3z6gLp!q_*VKDhHiLKfGXmF^ls1FbN`EIaAft%o<iMam7-
z26_<183YiHWHuyJ7kqL_iRcV(#|t2AAQe8%KSfsSa(Wq#lCzHA?AIu1Uj_l0d%%(?
z9EI;yU?f7Os*{{>PkiSM{G;+0zZQSmq*st|>&P$bXpqzU%UkH#>s_pEh1cB^-behD
z9fmNk$4`FzTivjnn@G3#DfD!IC=9;gqI8#C&awBQzQ_`ytoMVYJPXlWX;4{jy`|WF
z9rQFfgfk-)24a0Q5_}>fK^X*oDetub-RqbDDJQ(HEk2IZj89yDcfaRtKlXn{?^r5(
zUT&ejxtQGVtj195CxKNw<1Bks9ybE8=MKGO6bUwPr6*`KREb$DRx@DzT7-SU?0xdg
zuAqEjmMWQBf;;bm6eE~<r`7Pmfl&A%fVfYB>zh`=u2s6u)*7Fm56`3dz&DMWqQDWO
zC$hpGlyN}qqq6BFION&hoY;Sy+&OyldKgr@3|yOB{m_J$u7L@z8>BZbF;W)t-4yhO
zzx4Y@=7q_^3o7N3m-9>r16q|@^hvs$823ff^m0neyi_NTh~aj;YDkymd`-WGHlkR5
z%HKB)9nW({xX9zCs8F4c&P#|4scV?8ZZl7(INDzCT!0`>O8=U2%EW(|QJQz9<!w)c
z(fV-B{MurS002Vi>)Cj?f&28FDeX07)u<AWg2E!~gBCQMhLf7xDA>Px+s``RM?(xW
zg+_o3`+UOd5)8|N>-qpxMw61ACFlu<(+~7`Zr8H^sk|8y5tvhY++5y9Y(`{1<r!rh
zT8wNUDuP-_-<7)9Iq`oy4FRgu-0BNYDq%Jw&%VlteaH$}jR*DGOFT{_isQF!Sks|Q
zx{*xEolN>nQbS7LqHO9ehnh-idPQdtEcvRu2A4gvSC^0o#X)LH;94@+36SWR-+ecp
zla~ygvNx9nlB8JP4JMhMPi_w}tTZ>VpgUC9V3suSB4S)qa43Hpb3`&6d0q$_G8-Gc
zaZxz(MZz1~ze?<#$Q=tb)9t7Ko1FPBX`ULot>lxJvB(h|`pyNtTdQ#)xhU10s_bS@
zJ}yDlzqv}*KcE4!dQ2VvtV`0Wdm{Q7?CMw-bm*o4U+<u0QH8XypV-$)G2tSjYDSY`
zu4T8!^Y-V6ljwgGBpzsdsun_#CBj>p2D*6iDI<;nit~JDNd3Vjvl_*-N8@vHDXg-q
z2SrFMJyVWmY0EZw?b4j@ji0~m9y^=&s2WJ#xYZofbvcWD2D);2gMx{rn$#<Z3jC3`
z?s;bn<o@k}d^WOv<l`}e>K)i3os9#Mw8nBC*;jC$im`u$+-sZ&c#kf@!gI=T%xAxb
z7PQFbMu!u48t2?Y!xD$DWivH=fVz*yc73rxpDA@*#JGjAUrP34{2Yd@FJli<m0;sc
z-C-<3-Vt3TeztUgdK@5Bx~9~w$J)>@Tj}j%jw|Q*QH<J2=cJuj6D5u~9J*xrA)b0F
zGlanowa$Nx_qhf3nyhhQqUu+e<91skSZ({7$BOI5a#nF~W<#WbfG|}Rz9HqK>CjUl
zl0##WQ)y6g^xTAfPO+S?NigXO7iF4c-ZnY9MfV?k%DS9+724g6N;YnL12{=|*}g9Q
zr@cO%5adq&MG0~k_;3vo+$e)O+erx=hbuI<CLVv#Ola&MiwSkI#Y(pJHJ6kTxwBqA
z=_N5K-q!?6sXw%Xfr^yRHauZF^yJ{D?`(UN@kuqxZM|O`%6A-MZ-=>cP8|#UJg>G-
zh#+CpJk(`Xe^oPO903k0X`6OdOv}zkvv22>tmF`@`)QDuU(plACr`={%V8>2TUQXx
z1UG*lX(AlBu|*d29MFbElvcEX>R&@q4A(?zHR<~E;_qbc#Fg@=M~Zl}tTu8OF{H7)
zDp07o2m}YlZf0GN%O-28#BPdHG<kCDl^qU8*)Dyxt>Id*1<Zbg-*;Iw%b)h5gs$U6
zS(ndqpWoA-4-1TK)h{xZ#ilMy(_L-deSm+J5iR~CeB(s7Vy(13^D0m`M!|x}ho;RN
zl58I?cJi5_fA9W&mp)9T&0+uEx}T8xBW|jqq>YO-90Kd;s-g%qGi#;KT76_x$JU)Z
z)3uk8%K1p^I|I7&^ZEMc)7N)U+tWelkxNky_cexbkYs0pead)tu~dWEI7IQ6+&_OE
zxFhK{<?$ugCN%qQP+=pZPX`F8*D>&w@(!$!*3Rkc(v;A6hZ2xGpH%f(UN3x+iiZZ&
zUJfJMvpbozL6|vEr7u6jxP|hn>07|J6WOE?!cU4(6Ms7MYJW~}1w&_9^pM%^oEouh
z=+vyq+?!<d{*KI5VQ95}N#U%#YSMp84>b1Qp!{Bp2}E4q^67blAqHYQDhIqAuen}i
zRoK~V)76ypwI{DpagRjvebfni)7Xf%xGL3H(*0VR02%*2cwxRRe}JNs38-ql6`=O#
zw(zc*WMgfNsbDd`GGA1%uL!W=S6Od{yd{0D2*`;{%Dgb?pG_fB_r@v_C4qld<zvy?
zigvi5wmVtBeBrhujegG=OEyyZ?Jb(CAro*$ba$v~etIo;0L5YRE@ATN{Y=;6nc7p~
zI<`+SbcXFf7u^v#)`G%1eMCLbO1FWb5gcYRpKQnaV8}VvT1RY|=wPk7?10o`aDLNH
zPLtj3HodZ2<9!8t6Di+4yg7fseYau#L_>6=$naRtakh8q%_1^7-es2!J_p1vzOpCV
zN>_ILX~lNaa<_Dpqw(rGZrS%q8aD2Kb>s8WTbmK!u@^m5(Xy`!D@%hMdMhmX8tCEx
z^sIX%Bgg!<2xD@88awsyp}wkeWzT4vP#F05rqA=#Pi=g{GlCYDRSbUxl=nc$Gx2~`
zdT~2KTBJ$OB^)E;FIbXYoE+!MF;NzhAhnHCGD&GF19BF9@>5wiNJ}hkpVtb6vgD`y
zPc3S8sIuv-_D0M)FA_lX8`M{MR(3W^go(rA3>^Y;av4)}1J3q2To0!CUq(k6jYJ`N
z%n>$JoDhpl#mLvqu(5wV$9i~SJyIXJ=3?LzV#82tlFR8FJQ*cGxW3@{x9$ENjmyo`
z)$WPQ%2y2+I|WT4!7j)xX4*#}t4%kv7B&Ui&j_n4T%amGFqQi_YCdU=pQl^gbrauX
zv9+w6jZ4<an<OeODV1)PX<X_d%CWK!#Uaj(G`bnk7B^g}eyo2SYGlhnGb;6#@^scv
zTP>)nfm>hZtlY8ZP|pEtI}JSW`G##d+i#()Jl~~H#%J}qQVD)@U*G@i_DlD)<T-`r
zs7U|@0FZ_H_uD=HbAyDxH=(X~r%C>We>9=0^x151Ap987&HG&|4VSV>t3gn9m47jn
z4~j*??{G$$TULKJm_`JeP+#=<hMSN;)y5>JR}eXh+08z%hb=KN<4l+jY&MXr74Lc%
z;H5K@GR?)_jHu@TfPIAJLf!9B1=T8^AXQ3>8ouVZ7Gr1v6K<v0AE8!iy?-2YHnsDd
zS%MGWG8aFggj+CzA1mA9IwwmvVSKL@K_x_&hk+Uwr2c<vJ&8aFdN8U`J$`c?Nq*#j
zk#4a^3j&Kei`3H$%7W&UqyX&+fE3Oe4$HvCfK&u|C7GZBTGlafLoli}=H|y#$Hm1(
zp^J`|MH^~s7T*UqniKRsa(JBNoRdhzF<_)a4{L6nR~>Wl;`{_P(ot{2X7y<3P{3}t
zVrI?gPn>@m(-#`ph0ewSjjmZ>SQRA9DV2pGeF=>?wpBaqcB8vU!V6=h+KX@5=o{P_
zoy;ccDa(5-Nm}1WED9cJfy|ZS;C7{TUP{tQN@pnjFx;@?J*(!)mhza=T}(D|A-vhr
z{Kz87UUv?tx#cH*5m1YF!Tdq@mgFW0QJuO{-6VgCB^rE+w6gqMq`Cw&gie{3&fIk5
zPTv*++0Sq{9ob#Oh$@C&tr!vq?nNlzN3>W0yh#XYZ7o@Oze*7H<pw7JC*gS4<nl@h
zK5N)b!8vOqUUmWmrkrO&v}|XGN7r2Qo|rQtv}rq+S5Y~gsAXnbPUx4CgtFpIyYy(i
z4*!2onwM@Ti&B!7DTqq2r-t1c0tuxtpP)(Z1NBv0ox_qbw5ltbQ$kgwTLm;?wKYv(
zyL1?M`pHd7*|53r2z(!%65=W6X%#1-qUP!V2YdIUp++e!$6fA)a;grSQHd4rYV>7h
zsVMm!aqpMyA9AF0nP$v0!w!0$4^s<Zn!$g}uE8BwA)^cYrmn1a+`rieHpVjhe1F_A
zHz}&kMcr&SH(eTpfHXTJbnyiU{0MlAM96e$tB~lKBCMouA_p71rf{)!bt*1|ae7XF
zbDUEtq_&w?MjyEr>loa8nZsYzEhn3k;g9ZtCz(GF(>;Ulh7vnSIa+no_n4buG)RBF
z2&06Xe$vvyGX#_Ey+y)B+V7Or3xb9oShd}|4ED%ZC<gQ;E*4pTBV%cY#3Q|t``)RI
zWb1Q;1dnoB(($+M1Bd*^(xGsq<4T4ZRC4-|^?2%?pqn?pP?rSH@!z@Xtlgo<i;A|k
zz3I+z(L?&0TW<LNm;LBA11x!Rb@_kF=|KSiOp*S!AKgDT1Nht4ME}{p8#<9D`4|3i
z6SvydU-v)xHh)8<(5D;-%gkSsW{0qfgJWzY01V-U5I~rPH#g1a6DWjtuzkN@$Gkbw
zjKD@%!@JP@z8-ns{k%^4;*k}^z6c8DN*{@Qmoq2s(*Kt1dBz}*_j%ZYf=_=<*BNWL
zTOA%dc~?4$<iHF}NDjwM9hZ!!DeRd><uk(JlZk{UNBt#ZT#vr)l2-ENW>skHLb(<w
z*Jk7)120241LDpcTNEMno$hM1+ci(*z{?vJg^5-h+=y@dM8FI$J*3<Rbdaeuw2b`=
z)($nMYcBn9@ahbgmpa|Axb=TW8@1AJsXm~STaFdX`~6)vq;CiVUN1Bk&hVcF`aRD@
z=rifyk}Y?*(ER$7`c2@=4;~l+9Al&(J^}DVF+j&g@2x0j47vhwUbQcQ2`~2__bk7`
zT&#r<@L{~sQvjyi1$aSSv7k;dK-`$k-V!5GHM+j<0I^|a)o%qUAoYI_e9wP<W@AtA
z@@Fs~?@v_^N_6J|7|kDJ7Rpc%lOJA2k~ibJ-HA!*uBaEc1A3WTL#ZalK0Ub%&TwGY
zby-_44t!U2mR}OjgNEzOw$+dX-xyuXoM5X&q97DZtl8GpP4C|cs2_IBFN_}Jfe=JQ
z@N%_Lvqf|?oFE3z<BNZqKyH3-Sp?69Tt_n;%bU*0Y&9a3JHrpdI^J=^6|t+;D5ZoP
zn2GuT$szXk9km7Y07uvdx)bXUNnwoHr4B*T?%$;A92jOsX;)w1U=G&2vTIFk+IJ`f
z?WUekI9IP28JC!uI}TYc0a9=^IXrI5B#Kpcc?^h=3Q-el)Lei2->;oZWw;EiEnCgr
zup~OBkC7xrZx`@smvUIeQ4BwCYR?kv4hnScR%Jz<;B>S&Y?1uf=UMsD+^}t&PE)8s
z)ouFmb1G!sq3NE>rcUqlR1s))n~tTD&qTM!#q=|sgOAIhjEieO%f^=^{O0C4WTK}0
z%{MUe3s~dqIii2Bjv@m>L65xx41ZjZTE$f!JPGbs#!B!Z|KlY+|80npRF;WDP$$`3
z0Lx2lwZksJV#z8O&(RCGoK0>>7va9Z&ctarH>R*1Cr2SpoJS`Tbem?TFj9MvCIEnE
z3)i&^1^{5`6#aFd?8u?U0J~WhCKK`ipt-_zyz)j1zx98+Xnw)`iYoXvd}>`pHNaR>
zZDYXdPQ*q?KpwWqwPIQub?@<^w0vKjatDLbyQDrHRg&Paa#>IXMm)_^T(OMz<=`0c
z3G3lrGQgCttu@+=19V^l5_8#0To+_Hh6_}(=tG9NUyI){;0SIzaVut`Mpya=Y*6(=
zCd3tWJ)nPGJ0$-+tzU`H<EPRwR|54X8qj+4H2do$fI|Ik3_N?Yga@`v2F49Qfw3-h
zepdtT9=NGUD&$6^d{?!?f_zbE&^6peoQ*{H7NvS3IAjlYiuFY%6e;i$_?bzLssov{
zsB(>Mr;)b#aZ<!EHSskUiE}_iSCt7-MA-EhIYxgbidSDGQ&%^=@e8B|zhOdbzAk@2
zSa$1()ZHtXC?$pkkV~FwnM|+C!3f96B&d|Ok7W62_I)EQ9@VMt{O0c*)wdfp%DoFK
zMo~wF5|{qGVP?w8Uu45j7$==*bnWc2duq7`9Z|5IQ7FuzdK93x<h1U-psc>I^kl*L
zp5lN0-V7U!d7qqBGK_*?Lxcg=ps@>NxJEC8e76fmeG_XyKbHV_o~9J|=J}Z8GR;_5
z8OEmsS9%QmFolf8KuCiDZdX8DxoV)LfTosJVm3e{a-ceBs{8(Bzo|<*a-I{_D#M;X
zE>{lu-<8yVy4=4jDd8*;$-nS-pWCFi@t1#+@^<n208WJ$c$cHJX}Ky+)-JSxLK(FQ
zAnPTP1tgtIFpxkI8&Cb3`x^FHgA>;_lZ;U;+(=az*h}9_j|_$6t#S-WQ5uaxN9K8w
zxhpxllg}NhDO_iuQj|cI0L_xMOM=Q?fbY&>z(YEo5K&pQq)$L1ZlXK`p>9{{{$hWV
z>+x>O*xJ_C%~e(z^a{4Qwy~lA62?s%kC^fvD+lSth=nNd8H{vKajT2Cdw^g#FW6Ng
zB<D~r4|1$n8lQNLjbhxlkAHz~9}8DfdV!R85-^99OjZ!+lJe-(!?x9C^kQLRz*k6a
zpsifO24?2v=DuI?Kvz;O#@IX^{J4K%L{fM{B<|fO$=>yHgzeM{PJqgtMP?am{6wc0
z09PK6P@XH(PnxF@Ujq5|@rdxxRVzaN0Iw|h=^rJmLX|oXUQePD5sxxwlqR?<GbgBy
zsimA0|4eYla(lI=3!oi(f?i<JZje99c71p6&v`pNS{zy-hVh%V5@FubT*ZGSTB?-X
z&BR6nGC!Ah7FO9WN9+>5R3{joMIrX$S7@igqs(p#Ta$!1)VLOU6o7G@K#C25fX3;T
zd@V>1;%N**eSq+7`J!M|PSUOm;I!Y2wMv(-?|RV&c9u<$vA90~9!EY9b|)eM7$W7A
zvt@~_R%bDoSH%w~1?fEX7@&WKP?}p1XlrQfSgO8UqLd)z;<RNb5Np;Z^Vs+uf-?&C
zmAdn)ZOf~UT#{u}*pB@Cw_SU0rphD-?-D9F%*9N_PQ)2U1pp>`bA4hSN%43&#a4A0
zq^qJ=T?L~2MdobR>g+6+=Vxvp81$(tY?Vh?CzVj)c~6_LV1{;6T%v#ICmv*lJ!_fw
zr24p_y{_&x4C1V_fC29wuVti7g)KEa0?#;0&o7-w4eczNCI?5&m7|nbLRsz^CzL!;
zG?J1m&uF9Bu7e+Kv-y|LH4~E~zZ|`(!;`4#_NQA!e=~PGQ#7kP@5tUZ87icZ<mXGj
zw8+$+Kj4Yg%ZbP=vA=)fKT@sG0*DlyTXf`ndDUgU9kg_9vg7;jG!oq7zDyK1EoV(P
zHuOCWOCPXYP2p^v88_FscmO&;#lK6X`dTm0<`iLDmr%0ixdu*Ij&d!wyp3#~5q8xE
z`26fGL;fcB%UQkI>gF^X>^f<kND^Qs<K0*?5)OssB*)c!*R;rVVw>21{ppcy-kpI`
z0V?zgs;R4Ak)y`>LB`CbD(&ISzEy9`8Q#l!gyB>qq+-3$?9Ob36*893yk!)<5%bgf
zz|Utju4D!62}vdA6{~==z>)yr^nki7eUKHP{2S8`rS-}{9XhxF0(%YQ!Bqy%Jo`cG
zwz7YO9QV5z^3)v6=i<PB?*@_GP#hnNZT({9ZlmPZBi1!*IP-_jm0C+bos=kB9229F
zDxYzs6NT|5+)g4BA|=td3v%(5{pT05BDb-iVpj8teXutO`Fpd+88Q~doZ`{;m$~V5
z6{FqzN<s5Z&fDZzmJbq!ARcD>R3<~Q+;%68xfi}oXT6x7)Qk^*|JhJ)nNmPG#g=mc
zW9`rufF)mvokE8K_|2MID6GlQugFavjBGQO+1M%gLLZ}?)3QI_-H^u`<hg#R0lavl
zH`HznD+~d*^3#W|Jmxc{rD+%8`n&HlDixb~BhU9+;8w=%`TXg8;uW_YG<A09+0v;?
z39ntLE_51GXs4-vTzIF<J!53sKT=l!gGG!CQ9y!UcPd<sfcNJtcU3gzOdbt8o`utQ
zao)1;u6o`o*wUDoA&Si<<SFmzCfKpx>jVrGX+VK;9(Q{)q;aC;Rj-TG!w!p)b_!lB
z=X37NYwC^(y6={j8w233`Ngg?XiWhGrk(g)WJTn~M5-Bo=hLwDCYTxDVqUxKR_9b|
z`e=xb7?z#szV~}|cAbl^BjSNWt#4-ZKy*he1oHLlfE^>S3R*1eV0T*@E(`F^m%oL_
z!@t}+r<SqBrSijDrxOSO01M*3#DKr;-S+nwz&|V|@fZG)O)K{)Y%n1F2(6KG*4ve%
zF6@QT3rz=q3dN(C><w1@8PDDvX60Tez5j60QJ=*!*1CX`5Lu*s<@v6%F72g@9zxse
zZaopCD=g&0#~U8_STT|em;+2Ofh&bv?O+Psib}-nLKJ<=tnG3k=01a2O(n)57)^8u
zJfAv}8u}c&Lf*V+Y>|3-b#V20mi{>;s9o)&Y?6(Cm{KQ!g)r_f9Ht<}N$BLCB!7mS
zO{{{_q(xWI|Ft|kI@&HZsi!O!yDKc3$Ltr8k`@>!_CA_og1Y25APWXNX&n>1)~DfP
zsYhpHV<U{)>4d_HmEgGUMNCYtcg;aeL%k4$UZF}gJ~0?r@LR-s8opV$?Dq0k1CCRQ
zVSi13h>*;_;v}*UXFF6xr$c-Hm4)|suvOJB_mYIK-xPwONSfG?_Q?^vKk!HLqkjOg
zc$aW-vssj?QOV<BuM`M-KVYe~%Mz=;*NS@nTFo$T|ERsbe(R{>%)}}!^W<=J5szir
zWGc`_P7IXVxYBC?AIW$YuAxrz83)Q=_8A#}@`d9=Rml8Ys9P<v2uNo2!H#;$loIJN
zY=mAVYP6h}nV4L2Z=w@Y`7vLWuqyD2{ko4pCa(%(D)G)7Gl;e@eL$P0`Nv*iO(BuB
zwyl;fm<3ZPwkEP(G++R;xs&MqSa9|}4NjEE&sTU0vvDVaXJ<awKzod=ESV-QwF_l`
zK3!-B41Im_bsQ;<OL8j#IN}FAetlBh6qXyfgD#B6`)fV<mDvth<_s?znKPDM$QuK4
zM`2AH4?nVMC#oH+(Q&k38pziw|04Tun4=GH?H!>D&OlJsCr;eu;K_a|+iqMr>R{Uy
z0<;TPnG5T1&wvgE`HstTJa6pg=*FCX&V(YMhB0sQtm&1ahAK(Si#?jd9cT;FPd}p@
z;Em7!PkU$il~<FjeI!VL0Kwhe-8B&0-QC^Y-Q6WfaCevB4#C~s-R&ild1mq?bIzPU
z;JsOWFZu(&Rn=YHd-rD7Rrw}<<@S@=&&`+_Prsx#hb7^%44~2A{*Vf82K@VfxzpB8
z+s^o3d81mqE`lHl`2UK3cPUQEu79L7TOUX*LWt~RaC{H(4#%V=7|o?cX||y%0Kab6
zCFUW+O)^_`^}z09PPMoSFgxP`6pP#eG1>KUNz)W(ImaIKg8s0~R{!dgvw@w~I{op}
zWg3nl7|@5lAWVTPP{+!fJZcz!p~toe7-K3$di&hL^*st<YeKo6<m0VuX|^k{176d)
zP8avA7pLc(T3E9Asvrgd81-XNF$lxaCRpAb76nUk*RP(W3Uwq1hWpH7mF?_AI)lrg
z^ljPsX}6==Z6_<Is-$AJaQ-8-wxh2`mmw1n{$#|~X10(a_(Yn$R8Yu&Za&p4c|`jF
zcfR#<oSwf(_%Ru}bCjVIEK|L0AF3dK*Dd)=d+o3N!&0F_^hf*G{vrD_B^(jw)q5M3
zz&95(J#FDV5HkrI3N0LUGDHfOY8Yt@j^xW;`KffA>`-mKf-fOgn`_JMC<cca`N+(g
zZ<Rs6<>lDZ`pbn5?7GH(xAXuhARKZ|iU75Q6$L9rgo5Fd{K;#XWW18Sz8F8GX0?EC
zs3#auter@q4HoaX-CeQ7SBWG`^s8p;XZI(Q(r2a=AU<Fh*`{5RRF%uy#t^%dgWPR{
zEOJjZyyw%vV}n~ZV{+E_BrW}H@m!_UQ3eOtfh_7>0c3R*Oz6~qFW+A}-t4A&*nV{)
zQer1)cbPlhe0=-Z!*s&*0dzmUs|#SIM};7+dTl!yDwh!)6kdSXh4}LJ+bP)RqG#-d
zM;i8~S1L$VLr#g(>GcMElO`Zp_Cu3I1ENk7I7QkL6pQL|*dlIx@ryKLTHuf;GN1R4
zE-Xj};WhGvP}AXmCCUYa;+A42+(PDY4rSWnm@9UNa)b$6S4FJJVq2zJrh7IyNZv1e
zk2@~W`FepqdME=#AObptyvYwnAfYTZ8~9#veY{9^x!rDfP+>YTs$t1`g5DUmF1#h{
zv|)!%b)X*6`h)MzSbY7jt%^FG^`lhAs;bL`w#-PBXP`HK#)o7|y~QbA9kjk^5RH^Y
z!F|d!W!#zsWl0hR;Qbsg_3&Vj@rI}EOg@XSV8dew=<7}=a*A1t6A?|H4w_*YK8<Xx
zVXK+Ry0&1SNx3z)JW6Y<)=;9GwExa?O!@V6_1`gf=pn#fh;$qd_!e^>Z!w4Xmn{B|
zTyK3FD@x;kw+N(q`}#-J!J!X{ApD|ZeH<$)Da(t{_gag0M@3eeTT7W+3UVC+F2w6*
zO(kU%kAkk=_&rLi`wlQH7`sDDXQNY5ExBQ0kNA5K#dLwAg=P&$_H+t^+Oe;Up^Gqs
z_3p%3M%wWG$i1Y&4goOA9Zj;-w9^Nzo$8E0C7W}9noJ35v@=!Dtwf?7T6Wb>v58rp
zINrO|HcpRJV38T?>t9b%IO%;;W0j|v-Td<6rKuEYtnC4r5`oxZ@=TVBH=g_%WD4<o
zvIxr5U&H$65iaiaPqaxA5;~Lskrs*LoKDOPl3K1mj4J^qmJfFw>+V5yM-Rkl)sY$<
z2I;VWr19id`3VGe9+LI;?tY(!?>S~yc2boSlYH$?9EQ84KM~*9Cja1gYIyGsVdab>
zAvh7#1KGe*2Y@Dm!@%a--^idL`Rp}?<=<1LWnCG@qlt0Ky@d;=`_uwqCIJ$e;pSg1
z-?JtZbDP)i`gLu^mm+V)$f^Og$yL|sfg(_UzVx6yW)nQRQQPs`s?*zz^f#vvwqu22
zv&u$j$eZuMD#Ckv1`8G-K?fM}D>H)EBR;o{#T5R&HGF5FUq{vP`F+3w>{k|wFH_=O
zM4Q)Or6)sHiJf4iM>0=NKVqB^$Ebn~slF4v5!ag|nRAMou})}lbsW#yY{SjI274!e
zx?YR9+_&Ix;+T@t{$;40-2&x>vU^4I-}MzX-U2BmdWsSe_$`Qjt$ic$SyAp^#T5YF
zf(PiA0Qx`GWBXbCpuC?MBxL`skNTt7!oSM&@akFW=;H{RYa8mz=xggaTMy`S0002x
z|16PUCMzllFOBeWl0JF`f}m32)z9~T4kUa7KRTZ10hoX)%q;k0hF`4!vH(bei4H>(
zjkUHI0hJs7XQU7!H1&^IS$+Tz0t7d_stXc^J1#p4;ND+`(}$N_u~zR#9q09AyC?v#
zXOd{3g5)5Ek3nx;0Ed83d{Lo+(|lby$jfNKT7ha>E)p?Hr|71NOc1b4eP`x>zy+02
z`2_;uz;WogBJPTjm9QQFPV4|fHY(sz=#q+5YTPjMrCch}AEppG9WD7XlC$XHBSIkF
zxjsnQRbj4!-JaLqg0kp>7Wf+#SQl3)9yzyHP;#9~_#G7Y@Z0BtGfs^wrzaJVA<LG6
z@jF;ZJUks7e#}}ZB1z;loH$c|-}@xJXpI61d1t!~SBtOr8pcD{1E`@CbaX_qQLZWS
ztz$A>%7@n~)F*v}U3$iusc&$Scp|z{ZBC0nhnAa~+u8bkO+xFMgJ&E3u~rIb^avg+
z3&0oZIp_(wJ#NpEm*%=t0L3Q{rwELAbOQn?cNa7<`AZ^L7o>w7N>c!TTD%w+IT4X9
z0UM{J-lQ0*OTIM*iPs_pnbmf0_$=0}IaK)f6|dRzN*eu4wRt-j3rbM?(H}Rw<|V1T
z*cp`xsof?CHbT}{>bV1Nj?tCI!3k-EdE}H+O3Bfsv8rR<7fJ{klR_0?xjzL##FmT*
zy$kNRWmRx|n;OIc;}RHu1yhrcEUTY|peQt2!-nUQFc=L(e9qEUzY`PZsy!QyN&{ie
zOu&_}P!{FQOl4iH@OiP^Eid~!y;d&~Ry*U95|`L56i-`r<(bZ|bIpZZ%~A__VEGt3
z%4>K7Ezs}mR?NA=Kir{!AeVTFR>dDu(4o#5rMarCvDzhdZ}~-kGe!mX;c~h2o7f>R
zO&=nlJraKd0IR~h&l3O}{m%uZc79t_(7!G!+JCJo@V6BO@&8xV|6f)Ae^veOtLo=H
zkF%CLNA!AKtIgX2`HuZ}i5q>VAH^i)EG^A!|2nFS3Rj5!Xn(D)9%WM-^u~`blnTd~
zYlREb!!|4gh&}p$sWWUbW~K6#CE<jLu}O50TV4bTms$W}1ZAa{cd+--WSS(3Ld;&y
z=eX9#r4XJ$e3_4j0`0UWYSO$C&^d5m%5VZlVZr2FI(m^9dFK@3O4)ieAq8<_ZH_N+
z`R(T<*}P;#=3fd5K7?^3Lor&GAF90zFD)&7FN@SynhC&v39rkhLnpL#o@`L^{@Ufk
z6cJV)Ge(0ST}9?ll~0EdO;M7vZTh%e4z25i1^Jg@uxgUjvmDG^e6&i3VB}$bHr-Fw
zM407*XyLsqq5>iL@1w6m()$P6+^jDK!?y|Gm#{B`?(LX#h4;En-EsGpG6Fg|*2+9C
z`ulnne7^~QnsS5r1&PMf0H$;ynR!WX37sYT$kL<55)%w$_Xp}D$zqW@eAODUehTRA
z7+a+y+UaW?&|+4c-sZRh2Z;5D!G>RgoNK2;8(^n|VQT?GMBUqqmdudq`pgjC0EmWi
zO!yTS-jJh_zoJ}#ZOCAcVBdKN)~8U6fM2}v2(ejzR1YG1tqHBcXMn=zbk@*!HovcY
zOtXb`f!l3dRj1}G-DY=26DgL+Fa+Wn6uL8~sKKvcit51+EARaSd^XT>n?D&C<8HZF
z>9LB*2j@>cX~flH!Xs0M7MgQW+!8t21L}qLnT?Uri$PZkUrhJS_RXrlcEF>2(!Zej
zkR0)UGTqmWa=K3Bb_NMNl@qH!L7q}A<_qQ;1$O^}WFRMm2vP&mL}dLCth>HwZUcHR
z8KKLD4@dS6KE}_usucVKU$)Ge0fB+c#QVvy(T@mFfjqoH6T-bvP(@#JpU;4uGq*u$
z<-Zm#zIbh!mwy)}PvEKOAf0D)hW6N(cd$`^nw#+v3T4TprFloj7(aG>AUIdmH>{j`
zw|KJ5RD{q+J(`R$j>@hjwGH>}(?=ESF&Y#Xxp$#c+V7-+-0q;xLAljL!Gvag$UzS#
zC%0G=6D>N{@V}Jv_quH^n(ck%`%s+l4R3%f!j0!*VK06Zm<cxg11|c@puhnMA~oNC
zI#BL(7Lbk@7%GuBVV_H6Uu#F_x6V+WQM@v>-J#vkTTL#{yR+?TU2U>XhR(<3&=5)p
z*OD+o68LKHn7$@fqnn;;51a8DTDT8`y?KJTUu!`FSvUjNL`k~I68XnP6QXEA!FzKU
zi10>95P`6i_Kc`Ld`ud)_Ac1>I*~4aOPOb^T{rK<Ra}l(b#7=@9Tz%BLHtw=mQ{vp
zXckA5b>(s7z?NP+PD6&T4ON@E4}SKs6b=*-Oc{Q=Jtb$+R4yvF4DCe67skV2kN`yG
zk`blP-Uh1Al&#xXLF)Qc949k$C`LUuWMOT@R9b#IKPR)$&#tu(*%^lRQo)LU#f%Ga
z%BMy#pJPKB3+m9wa!5=`D2JQ>C<YetfwEA6On2gV41KVCL>Z}jY@ZpmP9Y(~1w7%r
z1XHC1XZGPGP`lj|gwPur-@y~Cq(<@1o()UX0KAI7^e`CkyWE|c%IUcCeUia|zDAD8
z(HSvE5+7Ehf`oa@yvk9OD`-)FzMz!RvuI$OKP6{%FAC@!mNK0-UPbss#6ps^<toNv
z;T+^a?0$Oey6}ho>Wy#3Bvc8FI6T~v)=_?=TDbtEa7p`pom;lf=Dh)$HWv}Z+Ahbb
zg(*ogpUvu<N+a%-oaIHfgKUv2YQKsNihF!CbHmZ9N&)>|20g*hiAaKfzkS`&t>o1a
z#ABnCg~5&jfQJF~l7PAG{+c&wd~MkjNxcBSikd`Fb-4qi-@NL%!Tr47_fp+9`6`#y
z&M1=IX`17fS-N_o`g&ATq(j3C;j(KES4Aty0tr@#QsI=h!{QoOM3EFyk_;`zUXdJP
zK=TanA(J@bs*JYY!&fYSsY#+oA6;A3I1dL^<-X-m&FcU?vPFqgf{`a#JajY9qOUGA
zdu0K>vB?W;S|TIT&Vr473*LisLUS3qgww47(sO+VoKr2ehq&7aOu3x5Hp5PO0oKv*
zg9S8Xmm-}{z5s2Ki@ctAX=1G?5cptl%0?js+}`R06t)4GzHVcGux3=$dr+iAN@E*l
z$9^KkN4i)W=DmC10F%-V_kEDhHeR57MExa8wwZ-&!hBo-;9Sg?P%=pclwCJvA3t;f
z3_n5ZL_m;aJ{ZvKFmHzg^xA!i(jFDTgO0@r+xiZt(;6Fa`GkebIESjMS2QKYWn3RP
z-;GjfBE~9S4psqwA4c?q3Uk}E+}GT!{)tx0>-F}WYvp<JE9Qu!M+IM=92`r1G7_&T
zTkD1~Q9q-iEI`E9rlQ^N*j7hkGN0E17y`d`*$D<D<Mk12X=m42lfGNt`7XM4$Cvl5
zk{6aCWWO;<yyJ!KC<JdxvIZpUWvw*;#nweXxX_v!0Ui8*Jvf+prjk>f04{u4%GhAl
z#cQxS4Vnor8_R%E>0m8Y$+%HRw~Haz5PfJ^e2BSigjf}Czdf%;$Wv@}25>V>JnDJP
zcq7U%35y+ODDG;}#0hJ}C`W;<qT45VGFYV}$+d2)wW#H^h~;BNjsc50&IarHrj@?a
zZ~VCw`K23w$-t)dtBe-|R~8I=9fuXr8CQ>JrhEnPY<T&GTc;pc%30{&I;wnVdN(5S
zXHOrGmYglqw8UvG!LLn+#L-8J)dEhi{Q1>)R(ThmfzX;7i>5U+qp}S<VDX=II@-7@
z8E*UsD0g~2U!OBf94It1E{DB}aaJ5hX)kV&`cP1RCTHT5lQKhi4QM1jiy;ymCSZco
z7n&6vG#|j7oMJ?pIdv{y`>nM2u%8NqEIeAlPNsSrTSUwrEF}0S&Z8W>j@mX11W?p~
zUZ90<sDCTpv8WD#svIdcZJ<bWk<ZJ617;J6>BK)${=R_lUiAJxq_`GQt=VL^x-M;P
zF<TIShF$%uSK(K}W#<rAi^>FF%_?UPELoYC!JQeTTG%;!c8zE_Sbx}7@*{Va+zl=;
zXo~t|Wl@qxIXRDA*ZsRj%#)mEJ2#fzR=uoE>cxGmGKWLgJk>Gxg)-EE>mw82<*KW}
zkn74yo~j&;Nn=)V1|JV48+d>YHQ)PkO$j4^6clqCmS^|KkiC8X?y0V5{{ql$mJCaC
znsUVIn?Y^z7=!PvO(X)vKJr!36cBJ9F7J<uLqIE12g<+D#50$wq<L6xQxePXqa!%K
zL%hZggQ%y`YIFp0ye~YA&flsuY(?LMV_JxqRO4MZqCyBt^FZ9M;wfbxJan+}#!Xj$
zwbl!+pc<4a!&6a|Co_$&9~CdPwFitM=e`V$wa0@xUY(OALp1KdqSjW3NAyif1a2@g
zuM!JQHVK#csv+LEXO-l5wmsm}okToz0kQBoIKTySy9zr6-~&j9k&5RdjFf%XDw1=(
zpX^wNKXTE{t9W=R4W>SAgiPivWJA?|x6O{Hw~*y?g0_nYL@sd$DWJLIs}0|a`YdI|
z*pF=|`xGLr+Q$-V7l%CCEuWPa%!4Tq>&-e76_U+^7L*a>a9Zm@>9^aXBthR0wEN0`
z&E@mKJ83$6uK79~X(gs3G59i3Fjd*Ts`G%2l>rI5VRemT`T9)Y`j@v1oc)`B*wj)s
z!eD>^0Ng?T{vReCdpkSJf4{GJJc=&zqy4+Qi>Txh4XoGLP<hgW)Y^9x6?w8KicgS&
zB7_ZAMF#1(w1;!ioR31D?uPIri_;2-6JHGIlJ7ZSA}@#JH???a=hq<ZQ_>5D&UxGF
zJVcgQMHoNwVeS`7<way=*_M)jBj@eer6|8<8xj$MEY-@9<RKnj-=<uxKUiFx-ED#<
z%p_{Rzm2?wVXi;x)j4d=C{0!DwCTviH^;-34UOjPDcO>FzelJ6cUdUKXiMHPv`uH)
zNqvZ6fUDplpza$?dLRN$pRFKQMk-?<i_~&hHN8~mD;>#N-e~PvnV{)^GQ2-OpR7^(
z8bYq>ATy0fpVEXo24PYqKQd8PPAmdJ-bgjIYe{^_5F1>#JtD!e2?SQ`gCJhnYzNN)
z=~^M|P{}xNE3>HvQ|ZbR>Q*(~R!F6#jJMg=7#w}P;tIP}#C}v)DGzn&fTo}|^hy4>
zb_%}>W4m^aKjI<=RC7Lm=A2Rm3?4B1`pkjSrgfj7<AKm6Gpvpl{we?i!3y&Uw~Lbs
zyv(hy_8RdCtZw81%a4A47L+In{A8=BJ@#D47}92YDEwif-Ko*TJYz4FN)_<A(rZ-V
zVgdzMCXNVrYm(LWY|TofDk3HjXi<w0{$*~6W(a9-$1V%U2|fjXv^DJgtDb}1oHQGU
zLZ;(dTcG2l8|)m_3{4f~m;LbOq+Wl1!9HYno$_TkeW$@*uwP5Q7?($}F%r27)d2$l
zd<Fvm!27*alDUqhld<`aa}kx5jir^ojh(Un&!f?b+ODuv74g4fEM893a!~-b?NV{L
z^aBoLcsg1oARah>95VO>3up=(GH{0tE1V*MW3c=8ypR>wa~K-8iE*&3TYww?jn@OK
zM7ixw_jLY|(aluLHq^pFe)SQ4?@IppvaDA~fku8~im%CJGE+{3VT|X-R#MBpW~V%H
z@e>Nu!&ttg{YmsR;Jq84>TU`99coJ|{rvZ^z8P9UhCPUXynY!?e1)0MX`1S+^85bk
z&J?WQTm>F)p;+sq-(2Kp9aRMA0KYDO`h4#0w!w{K3}MusVq&{ky0w#_W=qICOM<U0
zaXv9zYa{;@tPDa=Y#RaFAd1*g1b#s47pDuN)Y%MEK1Q;?v*6Gk>za*&NaQFQvWcoD
z^ibyK2LjE1xg?n>V<B82e=@N`m0VfU+r~M#0XdUd=?a_c8(FQ4t2ZWuf_l!YPE(NT
zw~zqU6zC8S$FO$XB*o|s#TN>fV4?eEr($=o&e35A#mzL8tmdi#5!}4O5IDb_RZ(Ig
zdag+o*Z#0ti|g(QHY9^XXBcu@><r_YJrbYG@-%jTq!g=r9S0kr33E0|_mHi|rJmks
zV+5RV<SG$ZOw;D&`DJCO3w71i`tC{Vbg%iji}MA;P%u!C)U^Y~BR$Wk0VzH=>2CK+
z@(DBCiWJ(M!zdPlc%48J=`!S~zdT-IRgeiUk23Aqlkms*xE|F-`SoDP$)wI?1>G4C
zs&`|5R9h3G$RdUdjPK`}5U|WXoVN=#r#h(P-)|S0%(`GCU-39pF;Dj6Omc|&M~tPu
zW7LO~w3y%<qcq7Tw=T3HNH6&o*FAZJ<xjLBGU`VK404_t_O(a7@?E>)$H6HpqRm?o
zy!>NXTufoh&>#jJg6X&tp3-SeL?K!RPTjzNqu3R#$BGI_0?Xi>Ci(dxHd8nzl8_Z}
z)Q`zEhhZx|_Mc3BS*e~#rTFz((<K7I#lW7W!9WHuzD^8_bHKLe)Y4HY<J9X#z^i!_
zGUO4)+=(y*thfjSMn5%5J-!-#ebG+!xqn~F5lWFTotWR?Y6l2b#~~<X&+HRmY7D!7
zJYrSPG&?LMm)Cn8^66<H5F3n6kg89bqbJvn5TrZbjN+t+?*Y5k7Nhlke@Ux{VOauG
zGDs0SvqiSOuZB}1k0<fFK_@I?iqNTiB8`Nen}G@hYvd}MICqDjywJW8FY(ptX0oXQ
z5at&=f4`Yd;qbidTx4zb_u|5a3POf|<6_iXsvsZspJRj}8KN732sPD(0DJ^N+&Kx`
zarF%k;O5f8_o#qV_F(?K6{tsYu@7itO?8n201#9Bd@}Nn=Z$*$4*F)6R#y6YnmW$^
zdhQ4z*(LHp^550cFjYX*WG#`g3TW8)QH1D&xtDR5)kQ=d9m#PDX*y~5Pu@O%0z4{B
zs!eT&x1CHL$PLY>tYgj_osRPQs1$Z^cCg@ngv8{9&@IpaFuXK$XKJ066JRZwNhJM3
zK3`tl^=fwdfCRs%>DjA!ufhUgtwsw3Fn#gzEwHc=ktwhxnL}Z?6I>E>z=0(cl8`z2
zI@=lDRzKdi(zjcQG<m3yRb;?_iX}M@NMWQE!seZ%H|lA-Nu6`neZq}UF1n96HaEOP
zOEuTRN@7{wNFnvCoP&9(4T;IY!-Rx^@s&Ypp2PEW+h~2aTxr@@R0<=rQkJV}Z$x<{
z+2hffBf1JEW<qt_)!nW2AmfDk15rdA^x>BhN44A-aB-C7vYo)woO>*P?&XY3&>U{=
zqXKYsIH|Q9ek+#e{qL4HLUO~QNX{2%L0Q?MqokCW%eH(-(^F}s499)t0_y7d5{oVu
zEE-LeOl}lSo|s|eTx(M82TPIx_)ciwO*^@tylG^brZZb6gTe{uqUds)Z?9gYS=2v=
z^AL|RU+225FLj`kGBN^xG5Xw$ud1_uMpsr=?oLAr3C3t7BuvUA3_Mgq)INRu`tT^o
zeeQifGEh)Z(9E9k&?9pQl70+-0kzvJ`7Eu6o(5m1w^4O-bA!$0wuX-g9qTmZCcX51
zt(G%puW@V1bK}+R)V(sjK#073)@{O}eZ$q}QCZ0oI$Q+z3t{|!kczr8tI51~eEjrl
zMOAx`*R-A9CX_diQR1kC!I0W_Z#nPDgM)>sgB!s%!UwANw5=^I-5=ZD?z=6HG|*Ad
zO`8{~si??gn7*M-YS@ZMwJ#1yVvDYqkM{3b6%ga$DA}Yci0s(QS+HhEcs}UMHft#o
zUo_+cF?4H+9UWeOX$*NtSN4r}iXFNc85uonW^Jc3TUK-#p`e;0o0P0x%nf*?tyOut
zG>nXlP*PC1i5EAJLt##qO>sRXMF*cXr_|dmW6i6UINCXIxt8M11v_37gYQ0>7E0I`
zJdWL)h_+75$H3*quQ($d+>WTys|2V<4!$?*b(L-0&lm%L``W+ait*y$(UR6Ym;AU@
zwDq<Y4qe+nQg+fE`NR&KR*|A}r<t}!b)G`N`R_jIO*Oe*$)>zSMpvG1CO&sQA^FC(
z_1B~9?Qv;^9oz>hbM|S#JKVPhE`}~zEM6!?uADK`)6;JsOL9?BQH|Hz3=V>Rkmwcj
zW9Yy){xraU!tm)+X<HW?8{5biV(Dk}AW{I^Zzt4_wG0dj-x@uG7c4*RO%n05vaq13
zl{5-XJZD&#n(sO_G`KL0M(7$MBL$$KcFm^W#gRunawxW3DoR2vKDQMVZ~7uk`X@$m
z=oNS_Eic>K2m9jqXh@WmmC@1BsSyaq`vsAXJ_MtGPZX(%R2a}Q6C2iUnk)u#^f0Cw
z$-LM{8fZNFw|nNxKQNC1h>3iLO)ybRx#|ewEkZ+EdXdZ++FfZr^?cW+Z~;P=KL*F`
zcn0!~w6f5q%~TKoj*O{rb_WI(T~(DL?gZ%+a>T~B?;3ojrG+CdbJP>|N!>VwZkm9$
z*_z0IY36bvOGEO5_MIITH^x}X%Sv_0WPhP^<FiE`M(QV)9&$g<F&9AJ+T2cyHV71s
zEw6RTjAMRLbxzJn5h2#tr71{^4v37QXGIi0w?bVBH=i$kqT=G>k+-uY3y9gaCp@YG
zEPbk9GERb_TEepKY#eq=&<Zy3#$dj+`F+8ErUJ+RG-dCN^%iw|2hh`8){CPHr8UEr
zX@Fzl`ucNnYS5w|78j8yK9MaR6Qf?GcKIe2Rr&^XcX#_4ke3nFw~{Iw;hcC<P>}PW
zhcbk~aIWlnGGa#nv%S)Dz4(-jH?Z4jYXkD6ESsnnePPn(x6shotF|w-$hiVNyL^0q
zeB|-v^|TmeB6+e1yS|FKEJ>8+-aDk06!YStmZCw2E)E#6o0toW-u)shBxEpj73f)o
z>O{@RA}TD5h*;`GvEZpfNlgX^uttVIi5+r1Q`}lmAXZ;jP)2pqNJK>iEx6UOf8$m>
z364yF`FYUtHdS1twB&fScbx*U`I8KPrT-$6#k}{Y?}rTD%U8XnSF)Q^(SagO6&_0p
z>gvlgR&JLU)|T(aO|9+i?GY$qM(C-zp5;1r<*POzD5-Vl%xCVK#ooa%-_ASwdT#g2
z8-1~@d8sGcJ?7dXr&d%g5)!hjcW>0Zd-WM)d`_3Kn$6fm<81W6H8FJsfLaoNaqyIp
znV6oAN1XNH7qTmV-(TRuWm@IMg+XGctGnqsrmOVYySGQeV`r#Aih|0>sP<r6-i>1>
zfYVh|KytMA5-ysd0IU!do01{wijymQI*}q9`QBB^uy1VT`1p9AzjuzeT4h;)-2gOz
zF>PyWOF!_?(urYjZ%>i9c+BvB8G!|%6K0YOuN<hetINB32pI`c*f3+cT?fdUuN!mG
zg0dTuQhT(Px`6B8;H3F|3*009Q2JvukBC~rhY6sg{<BME>I%ScosoqUw7Ry-P{<dL
zV;ON$#`EDMRCGEjay4sZ7KC1lA{NK@G$kJwy=Z+rNC8N?Mn9kSDoa3r*Bl?jD)S?~
z<MbPgYlXQdC-DFt(U1t|@sz-$H<*B+FG;1*Ib7Fy(yMZFIkj@E2i{PLh<hB$iQ&S~
z@SZwJNaa+HGW-C=z|GCwoDm>!lM^34!gafpADS9&1hGEGT=<3D%SdlrP&z1Q-C#U$
zY_W&;)-5_|@Eu?Ctjwx^tBHw86-r%hn%PrkH17#O2w#5*`G8ch>Yy<#9Sz;5v#QHA
zo15A4<-DrwR~u6@vNR?z50Y-${hG)3s6>Jl3<E_Uzok7tJuN(A9bzN|l2i!a6CF9}
zRZVXMnjRxN4`#n?=v?32(9zHUg!A{{Y68tc;Q)JCxYR);V)h1q2IepO(}{}$VsSjF
zH`dqRUha-1_?A$Zq_Z#-DVA&8Yha>vUA4}9@{y{T!G6UZh0($;P|K}bex8;#H>b>m
z9dooj&QRJZiMLM%zdktHsdP#t@_23A=g+lj($&$+0klg|AUxI<+-j_>_>RV7N>fII
z7N*X}7wn+Yr%M-qKiTh5xL&e(2nkDdr{852h}u^*L__cOjYkCKef<cm53Wy;eeR$d
zuP~|2_u+R$pTiTmppP;Is1lH1=QAbhs2x4MldVT;3Z|fYvZO$(iOELC#(>K*zt(u@
zzdm>vay)kjpXScJL#97N;!Qu5RN?w&+iy%6AK#aBm^hk$s)*g^K!sI)u!v1PkpV+(
zp$avaW%CV(l$4~!<9>RaRS7XEdFBvN^~=^)4ndHyQ-V&4R`#Jsumoe{DX#0|!KL=~
z-Smn5a(35Qzt9koS{9%OClCDdVuT<o(dv1_wgY>zbTJfBdh1o?wj_=Kum%hJkmoC5
zC8{GJhZuu@0^Y}fQeGVYN4o4;zfirFkXt&C;Ez72WD<k{kJ7q!PD#<;xF4;cb##R2
zvL;<&mJuXr2L@i#K$w~9>v5c=452VawWmH>)s1VaG1PFFFJLpWaZzp9i@XQ&8cQs~
zz@WFxFI?w}#|N7Sz)0#cSwsf-2s^ovoO5OO(JNzrq3zCt@BJ608#VFII4`5M+|zZn
zoW~LdfrhvqFLEMVG}yvgFufoKsft2NCa;RPXT1QAJGgcAbqU;>VL(^yz!C=ZNQnt2
zU!B^bm9-JED+)o{g0B+{yK`iaUXWq^y^D}SrDJa76|9f}VmyKP@Zsa(>`$bMMf2mX
zka@y?5^<c5a1xhKLp&)%=!tiOy;XqOoF;5O*1BYW)@oyqPL4}tF_Gqcy*If(rJ8&u
zSzDNC>be4elN6yV6iccp8mFA5_(EG~2RDPaw`^NYL+{IfgIdX`6p;@oM*=xQMut`k
zP;s?G7-I~90WB$NyM{+fMa9L!5|jt4{eCQeWd&FQkViy<R~y(9j0CV^jGUTR##}2T
zVapjFas7MmwysxxX+w<6+ecP5HZ~CV6cFt38ied(){DZ$D~Ph_e&8$OT2M_*{+C%Y
zN<()`T=eiVc4>koKH^zqfgtB*bAP`nIaj72JoBTonNPL)R~zFu_>`FGrVf#)fsM(3
z^A_;mR<X{zP6O1Tp!&--0ikp9@<8{9tnQw|BA9GW9&YHr^Bq;3;79uARaSTey+eU*
zIvx@C0zO1;FY$+shHOB*<L3Shxr!L30tEwgB(W<9lVZ>Nv>A*qmu7Bm?(X)EV?SIg
zJa1A#?bW~QBY5>gPcI&QM0fLH>{Ua5!|~x`?|Bj{rB9R+FRT~vS``{sWlrR6-xx4R
z**mI{uCHYUK^!U2ug$WY38W=0_AZusZf;=A*t|Z$K*fH8fJeTVNLM%PpE#A|)iI&t
zG$bs_j~%6>{To?n4GNfKzu3!^2h(F03RZJ@$6+iLV^WIU@sp3L@c}~;7R>s8CG|<D
z^5W`T>lu=S8s80zM$v4<Y!Q0L(Zj;^_xD#+RJ4W2*w~IKS<e$(CnE#cKLeoTit?zF
z__=|LfnX-w4JOqlgWGTPvWE2H?Z4NMp{2=8ju=J}e4bVCf+GOUq_7(D0tw<YgOxFx
zGF6?u{g{RqfP<2mtINlCI9MisV}i|CM+I5{7ZYPfR$EQ9Z{7VJm^84sYERmyt&KQF
zZjpf0cMwE|h-9MZV|VAe8={#zr3cGWx!5sTEg%S(Ebi3y8uP}kTyKTkc6x_kjL`nk
zfaTHP#f23K@Qb6GHCJb^lQ0k|z%<5O!v>Ez1%=uPg6DBfvGFhfmlsukXaPD6Y6~>!
z)p||kY9PDh6Nd)M2Da%*=`uDt!+jCZ;9V^CGWuq-xJWkUm?~RbozJPCnR^Z)(sb~b
zbIhZSRi?J~+fKvJFh?{eS-6^9ICywKVZ>mp0Bn(Uvv)`t)p6BO_8TpHI;ZuS2Js6a
zHP|zo#?K_ApkVB4JC~+^65pk|yE7H(cy8w>q7QjV)n@KyZ6&U|F7JEFQ1c3B>_{+!
z(M%Y)LA{`WN!}5ntXX>b`ilgp*DhaSVq$WlbK9f!Q~<}S%BzpOj%Fa*Nbxc1hxU6=
zO38$$y^7zfX*FqKdQRod_@jK&Oy#UpL24Dv21b837lm}%5VMzmAf!e3%s!V>^)dcq
z7$<O+f#3U2bl!#6yd=KoIr^W0d2mv&Y=O4&8Bs=r=kBB5%VIy@9cW|#0SzD|6dnnN
zOQFjWF#4=#9lGKM`h;Z(NZ}LNDGzu#fFiNdLpzodb3Yhj&Os$OkbwXTWy<<ak;-ew
zY1BfRp}Fxs>44vV%0<J0_P9PuK(*s}SNZ6G6CX0@+<pcCgD`stKY*QMN#bj>I${;1
z#m)->dO-t-*Y%Z?`f7Vs2yg$~yUxPL_z?4+PXlGjt5De2@VfzugYWd#_;74aW8jj8
zOv<}LYg&VWb@*?e)HLJMy0tlTUC!8|KUWA=3d5Is=fmfJ!sqC7>k|tbg5A;-Y<xgg
zHa6p}E<GdHYUpgi+{+5qXRzrPqV5K^daba-Z$4z`SfNcu)BdDEA_*Sk-G0+F9su|G
z3e>^i%5s>wNhKx4qGkLcC$E(ATWKcuE@$3K&m5St*$u^5wTE|z`<$yoJR5aZIke)(
zfzN9@m{!|=;x42DxBbSGg}DnjH^8Kj#RBGf(>9q#U0OBzWk{o&5K^lySH9lsm@4rS
z`N2*sSVUZ4@B0z_fSkSgnuxtZF<>(#P;fgK5_+Ja#W4(@x2EclWCS*Ee6jq}S_8ae
zhz=WUTbh7um6Vj7*(|t7CkyKU_(h0PFv$5aa*B$77q_Yy8R+PMlJfG0Y&>swwxgn=
zSluPv4Gq7A)6&yR?vl={C_AUaOl%kDl-nJSKR7eNN_$5Y2;j(Ma|4}ewCg>*(6;%A
zc+h*p67XwjDDwoZ5Kj@IkE82$CM)g%y$0x`E)VAFDJ45JctMQ%A+g`zdx~`6x{1$U
z7QRk@v=4(f$PLouB0yg_h6>@3PR4Y?iifle2}#qONR@6aKMh(caLb)7)*xYE1jMSW
zJoG5UuAIrVx_Ie!HqDn3(E+pzP!kYL4MZdrX`WZA8=psng(0Yrf&>(mn1N*4e=DUJ
z9=(yS0bH4}op*<Z-Bif0rTQic49EQC!Q*6q&8Ekdm{Hy59xK%fJSKF`KjC<tbiLoq
zt|&ool7eClIc}kRhEdhB$Nz>%uySd-B=>-v_5`vOIa5IdZ_Gb8{aK1U1-}(z_*(XC
zCC4;yFzUOkb)mj|NF9vlmn6PtysTP0YVDTqF1{SXhG)#qch)pQWvnIT4jYEg_utWf
zzUr3Q=4hgqIbp6*io3L7qOXA!t0<WPpQFQSovPqSVocsY;vguYWqtY-nfl4ctGJ}7
zC|mS(*c(#ACSwv=?PbSdtffrfL!*_GB2m|sYJzH2dKgti(%A2w_kj><cCQ#CL_KT@
z%6%hrkZn45mLAT$*)SVlaJ=>je8QlA0fd+IUDrkV43+>#ZUkEvO)=iP!yUW?Ufvre
zT0Xgl9!)jQ&bhz?yFs&};#Fjemt2YTI8i$kGZGyB2RlYS9$2zbB_P+RZLr8IR2(c<
zO*3w;FL#ft7CnL5v5d(#y7}AX3kOr|IiI%QeY`B?2H4IqG^o=&y_Z052Ak`Dnvf3F
z)97Q!(*|(Xqg$2mOcluA`K)v+m}^2Xo1DB&GqG)PFNsZWj-6J=9ii!pK`pnqDoDCN
zZEYJ(SM?P5dZC?{D8T0B&fW8zYX+kxc0ID@i87IyhP{AYE-gMuR)?><pIht7l0%uC
zq<n^tExv#SD(7Nu+=F>tI+#3v{D91x-5embJp<RoR>yS-TaCIOmr;`h#Xq5xe%XDf
z%5PJaAUB`f)>?F>)~4v-!K!R4(gwq9_@!9W$=^@K)^^0TYqiG2fscO_%&6DDOm+|&
z0G<1I#YGbv1DJtK7EcUorMmKgx~-|fDkzDSvBSW@{KR4HWkwhav^8^oM;az{!7<xA
z4*TQmn1&#i3O0+aDH`2iR^-5AoNcLD9Q8+`WI&u0#a^SX2`C%xV+B2NeH+kKm9Mvy
z`b=k3#rPr=L4?$B9YXQWDXgDmPgG!TD=Q7GogdtrhB5(&7FvseS0|dr>UU4Tsx{NN
zS*BJkiP^C<>6oY?Q?I;#Cf!O8kb{$I(!JJ=+*z<ahI9?}O`8EDqDI>Q#JJX?7#ZJx
z)+;$gmR!il00<2bIl0akh>fQ4kuMKVA&60#`c|n)OcX@Zxgc~<C)Tg1X^cRzW7fiS
zI~%};QVz)*&L2q;aRn!!b;E}rqyk1>ah`qys$iR09dhKqg+r2mp&f5r`M!E=T>I&?
zAi#jV2^SN+WWxOVOo?&{!2GoPb>1=k%1R1?8KuHRh+0akI}OQ8Uwo(XmX)M*b#)c&
zf{_pfhYBFjToJOaBs|sXTZ)Rf!Lj)6t7!E+-FWrMr<}PKH8rsSbC_CNP=Ne%_cm*w
zn|MubP4o9CVgNONJWJxZB?Z;Z+;W&bzUwIoQwdxP<ECIw=HI6-hykKq?hc65TWX0I
zo>frY&;uY3d=5#ve0!#0yAi7eZg{_tVOv9I8t*_Ib(_yP$N_HeLjxXnTs%<NS`WJn
zB0-~}(b0f6TPxD^Y?g(^#l>mS5(%-TEPWwvY}t0}7mWgcftq{zPT_(Rd~$rk_CBX~
zqOgRa5qql_9ZH@a5ZcJ-Zgl}wxP%Ga4|x5B<q#-Hz=cv{6b+63oI1p^H2|4vwWu!!
zll82M^&Y~bGbN@J)zrd2g^!oWhaIN~OY#XPZntKl%JDhlbYC3(a1@^k17TW?Cs9Dp
z9reotiBR2t+v!;YnK}~zwSMD){0v@pKF<UiGS-9Ac6l9<h=u1`A1L0ASYJ9z9332W
z>g@gne!i8R%fxF#u(<)h%gW%~y9_pL*YtJwAuo?W4F?3=HT{M5UDXlafIQxi=JZV6
zByxRnXflLL6$AtiFtUP*`}NJ&o8)6hDF0_7iEzh%JJvwEXfP0+V~Cz@>4;RDYC8H^
zFNmY^1azRz>EUK2i#dzrm!8c7E35+C;x$`ExO&RQF{=0sznr^#Pe-%IZ~+Rnk&%(>
zYgtQ|@zl$bz|BDzWarN-=dQQVBVNoElV7b1!`W6LYU9lUzkNh7T!KiIV?NA9ne~yc
zZ|{+ReWd9RqUoDVP+Hcer`-cdKtj8EH`7Uew}&g$_&ld48_~Hfc02igQ)|hQk@W+J
zwoR3mtE;N3q~=);XXKYWyHzbNc3<Z+3)%Ta=JF_-PfhJ1(A~Jh4Qd;!LAq7m8utAL
z-?o6~cRzMDaN4lO&x<GLwe*fAT`eCtV6-oPdcv6Q?KuHc0EJJqye`d5O~oC}IY9D7
zfbZKJ-m;&HT`Wv&>dLt^$#*cv0jn!<eac{qbztYyNq9VUz;qm2Mkb)C35}i4u_g`8
zU2veVV88C3v*(sr#b^XWJ!o%rRl}g+jh@YVhki#cdi?%=m4S}FH-Ykj!%_R1JI0=W
zk+Q<uth{i$;R{xItK8xTDMovH`|0Vz=ec7{Me<@>)5wDzXJ_XWw31b=Y&}UNsGU2h
zTix0CjVp>UzZ8&7yjva->Ig1X&9Gq!@Idk7ZgrF@lA0oi0aNMNRM53HSWIQL=3BNV
zRg1Q~TvzO*!i5&2A{oXRJ<8HTV{eXs=S(ziV@5g-w@iw#5Wc*{hIGo(>kdBph}g%f
zP17iY%Eu|mj|t0LFUdi8xq2GSgu>r7sd)ti7R~3dz8dVig*IcsYu8E`*KX74ERN_F
z`@+%Z`mQwWqa*o#=pkWMcun*GjBFH$o{bmVla~TVdODGp^qt4?kdyXkT2)_vRTZq?
z(Z_)e3k!eW452HRO!~}uBB_Rv2P$@s8Lc#%5<#9g*84S;n_eI&xuIGx_KeX|JQa<f
z*~D)qANSbGxFz@4U_mpjLzg<_4x&=o`QoF7o!tCU`4%rAP;z0{pg#(?HE9!Hbay%%
zJ(Fhwak`Vc8`EZq_#D6eo$<MU5J9<3sO6*A_>R`0@{69m-PiA6?w)(&CHy#uV!_zK
zaQq-XGW0xZk{EWM?t<nHFO~%}L>G#axJf?}n>OExQaWX|Zm)JDf6JyIacD`F@Kh*o
zO-F)!7>n$(aoFMG+7_+Khi>v!W(%$K#U}?dC9P=8b<T!cZVDElvwT#4*Hknz!j^{}
ztQtEDGXElj)_43Jl)f5&GGDXZ!<jpT^O3Wv#(8?!JgpUCYd3@2xo%n;-^fOJ^^=%0
zzbcys7f8K-P>4r0|NFqT6pth8_nMihGb26#D)yBQj3KpEEjrh1mk~neics<VT@2hW
zw`osqrIFZ)PbZOBWM6`R$5~%c+F3Jt2MTb7=ph2=vvToNccP-0hj`qgceYBoXrMn7
zo7N`Qsu`rS)_Hz+L*aaug*c!oY_Yy(=IZq@xoE0gpb=YqybcSl0)6G>=4Q|6t6}n|
za3TQ@VHM6qv+SiCJB=7~&xk0e<Y6q4XJTMck^^}EO@1~igx-^XlwA>j5cEXq^_uiX
zYH@Q%p_VXcllIZVD8B(}!~p@}+e>jFR-{zG7l;Rsp?-zawqlRzdBut-?+!UOwo#68
z&cwONT6%h8Z-E#pr)-E7#I*EeM@HD*f<|IxZcA(!d~$#OPfXB)2)T38QS9<gM@;Un
zltr5x;NPo2aV#}|<X2YG5PK5_T%U-Tz<Nr;bWTMcwi3yMe0bXT;JL%xq+j*H*f|fC
z;8{>Z>8obj&cZUAADFa1i;1bp`7N!pQOQ|O1s~O?_G;|fHgYpC$h99hW?<x@KHv^e
zCmvRri18a^kGK(macX3Ew8XPWzemXQ@<we%v(}(QA{K#vrGHqhg1MYq6a9W<y+f#u
ztf>e%jetXv30WVU{q+i1VPbfPoZ&Kx)RQmm`+ipS%Tpm;WUTXQO6_X1$^4<=g4sKw
zpw2UFAqMbMB)X`NuF!REk9^*{*_&oL<pbm43A-Xx#GjjBj>haV;>_(*>CV4U2}stn
zeQtaiO-9y#2)vyMg$teIIJ67AZ}U3s-|EaL72~15RqPdFpdN4FvpOY0ULvm5K4|Jh
zJzj<;&WJ~)dv9faw6rA4sQ2{rIlr-ro!qQ%l0*&-VV#q*GrR@#WoWqN>(wxnBq>Y3
z`0jZ;W{I9tHY34-gS*&t;2IY%((A(dgFK$cHc%vg85Mof_sNmo>yUDMLaIy=6x<D#
zPoBgt%NDjl@Qur1_RCn&s%))jpW_R^c#POcQsHW!qqQrd<{vMymz1$zwWN%x#$6~D
zCtWkm$}UYN4f)wX&9->UEYoVVc?&9Vlj|OuswdO*tz;*cXXn$mkcT)-N=WI!nq3U~
zB43GrvkNck+nf3N?2gJZydKO}8N9okz&AX{C0$Ytc{scpM`g`GPJ#%bvM_sMY=3mI
zTEA%Bm7Z>PeDJtzEWcuG-#s2U62uQxpu{F8Ghe5mqSDp=%+=s-mf-`YT4#64e^u^j
z87!kPH=Z{TV7<j#(bC=k3nt~G8Aktw<g-YBo~d?I*3;W|K{rW5j#b>4k`zWSb78(W
zP(xxTjmj+!f5CXR@<0kHuP7@!Io`;5+)FxJrltw`HOc;!4wmnFWfK;`t7GC!(7GZ}
z|0(`qtmb&=6Pnz-`aM+JDX(F<k6gTT$m(vq>Eyi!s!;bk{Ub`PIN93?bf=q><)KG^
zoR0=g<{w6!7*eUW5Q=w(V0h@3V4Mc-m%c@%>}(^27A#B;F^?g?><^J#kqo8kZK92r
zODb?C40GoQeO}Mnri0hgL{WGQyWxIv{{CHtAl=APGlI{q-%&Be0c~J|ja4%H{1hww
zX8OXr$SxTIbx&zYWbpG=hfY+rUP}Of{p;j=GTJ5k-LKzjEi`K?<7DOQ)&Od?)I_AE
zK2_79XUP%g(uUh*_IFY=hRe>W2Is)jfBiarGaXJJRZxFR$=4f(2<|6+cIpZEVh4))
zux!z4Z)Ux+7y9lZJidv|&8;s!GR|?JFm*2WwfY_A0sj*K>_H?d(Y8SzakJwMQ><Sk
ze}p+$P4;R8q`@wRhZ33nZW|p#LJqugf#*rTnv#~DF}1M~2}wc!-K*heJ`lp?M{s+)
z3NJ5!=kW=)a8qZ~am^ww;!+kk<|=DF*aqUFTH~&7v<*%H!2}bZTV)al;&Mk!6oMyp
zl1=eN#k;rbpKV&+!V9^7q66NF#p9rCe^?dnVM)>{ufp+EI5h7Du1(k=ODER+w5saK
zktIGld|J{c?z`zNHgKqyoLDS%5U%ZU3ENlS6%2y`?4euCp6-tJ0B17RLS)0ojnuE@
z<>eWx@Vd@J?T_0MZla>1V(W*WW<}F9@&%YTp=6`6b+$CFpX0N&F8ln&%AKSuf7ZFN
z8<w6F3!C}rStS4sCQOG0A1F+4OVQOCg2Kr@2z>HHWia-y*m^%}LH_W_;QUy^e>5ZB
zPee95s}PsnsIqVIY7{DkPpwp~|7?+6g34@iKKTSDV>PRCIQ$$=;ckI)gFz_E%Oc-A
zsHA4>vR_q%;QMGvhk%Lj^$gEwe<o-6#k(yA&Zs*JEp$~=UewhEa+i?gYnIN&j>Co(
z?Ccedk_=N{nPf!qUV?yPoWzHD;?FUVo-%d(L-n5s)luZM7qH{|jqj-~X-wkHdqacA
zS}VsaCz>^<tgBuIcR+x|!Lw8}(U{{!4{P1<uJd)YTR&tx4a(@fyR=X~e<v`@NL9&<
z-|QDxOzP+J>*~<T;gNsfLr<mfdnJ)8sXWe-YOoM*Pf+4GZJq*QwLV;i=nVnmY!`Ti
z$13?493vnU<ZK7KL5SnUc`1sCDP2puAbC|2P4>}XQ7*gA(=G&|!cA?>=(><|(ty;P
zGn9@RCZxJK1i113Vv8_nf7yHKK5*3G1P8?jad7W-zPZTth!zsjFoG^=<?5X4MKrsg
zd28}xC{z-pBo&l?S4U-DqEJv8C=3jm91k8Ud0tW4tecaQlWQe#$?QfaO#U(tt%4W7
zo3k_NUKYSiA<Y4loBufi`}U1Q={80?KCa(`g>^$-I%|!$L$aqYe|gp9x6<xsO3C@`
zo0*<tawXcx-ga)vQ%fY~vj(Oub@M5#Ju0d*&eB5<jY;--hH3@`oAMND-UM)F{1@D~
z#kzAqq6K{B{A;V0l^BYFxD2~dx`ZbsD%z8kSh)p3Dau(0rP$cOQ2oe<bh+0$gGX1G
z{qA#2h_aAtD#nyse`F0aj)C@)Oj*ckdy7l$N`3Juh9M)Iv)<dg{=Jp!M{<brLqUwh
z$C1tZos0ZsVI}bqD^CV|{LScxE>L5pkkRuEqgu%Zrb{F;KW`!@m;kVc8$S8+%;WS)
zOFA$TS!EVU+Q+bPRcZPCw7u|vgtmaPljX_h;7uJ&`ggH6f6MF?GF<uBUrujliMI&}
z4QL*7L3hivYEHx8j=!VxcWL=Nd;rr#gbY=V>EqgxE-vpqByowUZt=-~F+pDqn(%_W
zOu05Dfg^KcWl3?G<4JF{d`CXr?NlclMXdb_#TpTN>f0?cSlB^h&3ofX>ha394M=Df
zPSECLuvzsve^G*k^<-+CjPlGQpW>x3`I=_lGrI91<Wof;qhN<T4j#sH7uek)7U-FH
ztoi)lWQ$-oRG+aZ3y?RsMty-8iRJbDEAJ*%b$doy+LlTWuCMsV#I^-X*?oo8frTCZ
z?_69aGLOma;4zSk+hnN$Lf_Uj+E`6N5)$Sk_VKE-e{@0)CJUL&Cq-4bb>l~<H$MhN
z>#bb8gkE0SE>`s(>zrzS>hw$6XU_SUT(Y>ziBVfu5f1+H4(3L`QuM1gnVhD9d>(6u
z3ooF_UOFg7Tv3X!*CTt=)s(ORVQ&gq`qv0fZs!iAvX~cMJ`G`E31Q<gCEG|-q_Gvy
z^sC#Oe{|{Y4x4W!Y)ksEhv9>xPjkUTRKz5sDf%UBT&#UZ!BQMV+pwL-6MR$f_Ujui
z^^MQBWpWf2N*dZi8oB2yYJqB6m)?vv((WCpH-RoQdcGH+I%COO;KS^)n<Q>`a$U!S
z!kcQ#$p*tTa;a@ywe%Q!K5(Vv$&7UA_fBydf3kNL;#wg=_l)XscG_{gFcuaA1@9ue
zI($p1>!TodB63Ypum$$M`Gi1o(i!OqEX4vb>qo(H#>cl1u$y7OulaJtV07**GadH)
z(Cg+dyFQUI&_dT?Ov9!mz7c%X(?fPbPt={`wK{UZ6bqgojT|YJh2_nf(h1ngGseVz
ze<Jgdm|kL6TU*-r<&H=p`D6r5b~LZ(N&Kt9fks9AHwKm}&AQ!M-?ax3`R04N=63c)
zT9^l>eH|VasN)`lLnC<%{tLSM#e2d&oq@f>E7M`;Sri*nsUq~+y)+c>%Y*z{icP7e
zSl?Q4BU;OhSCAJs-TR)^clyMve226re}xFDm>{cNOie?goMbXNTH~ySfer1LIj)N{
zIMO3AM!02m7umo)Q7FQjtJ%v4Tkhp(ldGM(B!h5z*GL{0d975I_~w@%4K&InpQ`Me
z6Lu1a<$*tqMo&X|2wPBzAGAK*PDY^<(d90}%IesY@L}trnKL_SYJqZWD%5}xe|p~9
zE6BA^**G1G6u#1iE#&)Z)I)IDC89UhPj=Q9q%zCxHoTW+Ro=qS&912Tk{<EO)hxJE
zQMeFJp;;FlH{tO!(L2gEXjm`Rrfu!OHYRZ`nD59c$||=`@{#iuRT!5JLVP_Gi5h(I
zjg8N~6E;7X*@_tqOU*-u((zH!e^aQK_bRsI-+9s_0a<3*B1c6;@%(;7TRBE&CH$hY
zbdS?5i5v^kb+~b06MDp#YK@;9yWMGT*OE<Q>qybUWd{-3OD@tKCNjY5qL_qPMrEFd
z`C`pg#96&~m#ocxX^h@xx;i?21AA0kxvz<}(eN59vbKAP>OF{J4&A!=e}vrK_Dvyv
zu!cf$hP;DuvcJwfBep8MoHzZ0ZQN(9Q<hzZX`Oe;z4OF$%#drUfe7zApJgU%$8HOB
zyZqe89j`+hj+c=qS1@Vcj#BcuW-(&Ba_BKag$qzK{-m9Fi?$HtHJZ%xxi}BWadx3u
z=YvyDf+5RjK;|W#6kpLVf8rzOO9CJ`h=Z;`)6@XDqlhAGnf=5UFj<qNIp+kldJ#lu
z?!PBj+%0savf1S7By}<&-?-+zdyptl#k3gXP~$CtFD&`$@{lfI&FDG4Aig?_VJXD5
z^66gMOXTLLwPwMOnS8G19iO`OLP#M+Nwe^~4JXR#EBVC)o5$vOf9%0>4tmUz&dwGD
zDv-(|e-HHhES`+Q+Erqq&xZtcv)-*SUjiBG@VFfnfM5)VY*#(j^_^>Hb+C&9;D+n8
z+&SiP(vQPlTd9T2lkt}58<-9j9j>qtoAB2Af<_sq59X5j3XEe_#2f0?u3pMr>e*^e
z#~jBY>&9X(UGeGFe=~aW%2&p#u`sNb^I%NrQL%Bnhkc_9WSj+Emd<x;5RK<#3B}#+
zE;_5SSSQ^ktS}?f{4QhKG^HkUR+1=`KM^!qB81kP`z@j<Y#-BE#?sM^&pExLCJhv@
zj5+F3G^VG^^UO$~c&VXWPmAHDN9uRWL>fquh}yy05INTVe+IIyko0k(V?BA5A-5=G
zjXqA8I{8c5;D<}k;x06(!Xxu;AkuhrZYKA}R9RNUhS8$456Jij<8^L4J<|uhLnMdi
z3+C^AD!+334Tiv@cg?x%Rcjwaw_1EoL(T5)7u&NU3Tm8-gfL-<pb{eMvvV=oa@SWi
z8AXETNJ%78e+J&5q-cgvk)UPNIraViZSHgOS?7f;XCVjnqI4KhU6BM6>hlI}gCsP2
zIU%YI2$(!O5Gh!}`jMZEm|>5Ohk)}mpLenMr}mbS<mC$?d1;fAbkxUhd4Tb>t4Exd
z8cj(_pi5}JS#e?(#^au#kNkS65>Dg`I=wF~VdCoTe@!-1?eib_Ksh(#CVfb*SSjat
zzQx4KBv8OJLp=Q=W;PJ|nH`Q<XpaI20Kg0c008w5K}$_tBW(-Ae`}hJuMUX(X#dJM
zk^8A>My#22@ZFoQ)Gr|!$bp4NA{|<6y)#&Ps|P8XFtVoCy1k7&nFqo=KQOID<Cv@U
zwnoOIf6W-m6$rbg8YIJz-lHvPhxU<lO$%oVpx*=r21K#e@k1JfG-`c}fM0Fhn04N#
zHK;%&h=>Z_kFWR>fkVZii_M3GhqaXIV?Sgp6IbWSkxbZ^>hp@hhgb+dfNvl9mYv8`
znu90@6B1|cdf*xGb(nT1q&&8bq20=&<J0ewe^&-%MFVz(ir|$1sz6kN!X!f{R~z&*
zrLRv4`>>W)(za_~XTT3XZEf+JZIBs;HKkDqKT{PyCb6>+5KI{fU43w}iLOSolgDRu
z=Ge?>>~2~U)HIOhmC~qhFrE177NeU`y(WKdsA#17E>t%n=utsG(wo|b_T~i8Wvb3{
ze`-&fRQd#+Ig`KD5e6eYBf1NHPFSN8WfDYLjm4A~x7q%v2&DPRdZgEPtjA)Wp}ggA
zA%2lYJXW?gajWx?1*6A0Y0F+MUn>T^5hzw<WYF$Q9#zamL;yT<fy|C@N`#*~26@$#
z&5h5!eeY+Vkk0zYwks~=5krR9N(yA_e^bi9o-NG48D}>>9kJtzpy1a$T8GzgL8>|r
z=`^!w0mUn<d#7YK8}b?%@6}Hj`Qa!-ikR8e6z3#&{xuLn6&8Ak#(Cu;0~FH4MWbZ1
z3==16#+yJG7+(lwPHD>9T03kHJ+&GcTOsg7&~l||+SEe#ss9~!3{kx7BASZmf3a`9
zr?-andpgSBgHO*+?;pWOk<~5oqx}_p{-c!;ojg!p>#g4%Ssnq7H9|t|tUhL`vkfqI
zUmCfPHa7cMo(7X3fh9(*Kk}uhyB<V7XBy>@$i-kq%Z+E1kkpdhIM296`xCZ|upUcR
z0&@8yefNyA($bOvbAZNGa#-vge_g;a0u$OUBF!dSBjV6im+xqL)Xy?1DSnC*An%kx
zbA4|7Hu>5V8pU;4&NWsACM608gbe&s*+U{Pn)y^pc8VDo0N_W11^58)*C)sO$M-+p
zyO*-DG||_!`}xK_2mo+Ptbw4s69B;Ps4(QnYq>X!+#e_x;D4foEgUS3e|7c$D+-mY
z<`m=Yk1+l~eFXcrReJXS2dh+H`SWz&FuMQH1Ns$Z1@TXmoVKm$f91q3D-)=_Z9_lW
z-%Wyt{wGJ)URPJ&)|Sf9*x-Lfc@V59JH46nqrv<QRR#M`6yHy!#{Xs%q}W~%%^QX0
z59iDf{vv7H{&x;;pYf}}f16`J+TSf&LjKD+eQg_EqyOrg!!wIt`x~YGk73e7`^%!Y
z4P5(woVlM1@CV9Sr@9{Uhhy)4h|c_qGQj*N>a&fFrOkh}iB&AC()$hM{YNxa;rtWC
ztE+2iZ}GoJ)2<&r3-ZJ{z9}F8fayPk1%E|35d0G*Zt0*erf=|Xf0lBm+kZ5xcLU*x
z;qCVy?Ju+5umH#2ghc;j{iV34Yis+zdPu1qCz1O0`;YebI7lP<#jO82Qkh{7!T)&)
zI}-mjQg2aU?C{@1Y7P&Z2Ja1n_eW?#lm8V`Z~N(gjRIE_S7N!ho-)AiCRtJalVhcC
zV_<1x{y%v46ZK>Ae|U})3^m_ISnH3;1Ec<Bl=v+jE&l7|F^fTuAicSU^v6gQ(fqYT
zY1`OY=-d3S9-c&Sv3tt$VivyjxZlh|`CA+SzlFx%E<1n4!#^%KZ%7u2ABj)D4VtF_
zdtU-DjPjdh{_g<*kpG6f{T=yFUGTq%!~c+Q`aAK-#grptf0-*t^bN5I{C8rGcM8jI
z#DCUo`HNWH`lGVL--&|`vCP_*jj|(eJt3eU*VkW()NH>IZS~FGE<jfQ9M8YNe49pp
zjAvdn7ki+=hB?q1DF^6xQ^nbTcmC%#`xjAD=Fj0Qc_TuSZyaa7^#lNaH#M2#KN5d8
z)$~7r>Ej#Oe?;LMnjYUsz3+b9+x`j;;RN_iw)ZdQKkjtjnD3L({$SQ?yK_YK3&DAU
zzqyY2BQ^WixgX~S_(RLn<mbkMCsy&tB+)sWa>Qz3>L`N(0DvI<kOKV`7BBQ~n3<)v
zo}RXy_Fpumraz~g)@P1wYhD^%=51EsK!10aLGs_Uf4|T6U+xOL`}Bvqt#K|Kn5@wS
zxo?}3`S_1i!Cx($kp4IGhmxeGlew9VmF{0gmR6ShVdS5sh<-Kln=`<FEKCIQvoO)`
zus;i+{AyjIJHUS`hXV4m9Ln#kKb8G|WkLA<!TQUvpBn#vhy5uL{i~PI!M{h|zhFPb
zqW=#2e^YMvR~Sqfz<(0oePjI)-~FBSr}*rzUW$kR8NPp6_EU!T@3cQ<MStC<J0b!8
zCy`N*pCY5bZ~K3$Oa97(hynOrYZBzA*5vP;KLz!E<!HtO{2{Lg@>5>#cL)E}5c_rL
zYm)%}M@2D^pNe9C0RK>S_!VgN72rSWJb?VvV|n-;_Ge1}udwc1fd5m1KgiDn|KH(%
zCJFyKhGT^Q|6|H9$j_AF-+_NVY53LJ#p&M{*x#Nzfc$*!@H_L*Q{=Bq*}4CCCH~u)
z66EKZ@+TPNhjJnS<=ao=8;5!RNALdulh^y33G{<{Ji+*u*t?T^{3!$zl&njWsQfMg
zjFZ>=PytPoDE&B-)c6t(4FCWD00031008ZQ94eF1{Vgg10v7`m0000805@lSJT4^a
zd@#@e00!p(02TlZ00000000000HlE_Et7!#9UgL4uuD~V002-+1qJ{B000L72LL4k
L005%>00000Ar8W6

delta 53988
zcmV(&K;ggL{{xcz1F)S2e+GDyH(Wjmt+)XI0Eq(t01E&W0BLS>bYX04E^=gMRa6N8
z1Eb_<N7TQ3M^$(P0O<pD0Bw_BZ<{a_#osISJ9zYMlCi^|B%p+<QZ;GP9;T|@>vV$+
zv4(AAoF(0~?>=KlA!&Iq;`;m!$M?eK{v;dpo10E(wG9>_4epEEf1AzI;}_(1RJRTG
z*0wnz$Kx?P#-TPfS!7v8Xhfn28&=`&RarP;)!hZRH>kfnnR9soOZ`VQ4S0u$(u8o?
z<99*PQ=3QLl}5DI<v_602fGapM&%=w3)NX@8Z1GHig$LP9LHrYSn-#ot14ckfU_!P
zIEj}_3~5X;td<!hf3PmIB>T4^gL;ORTD?4dE6TmmlDni<sMnuubEt(P-7mNF1#Vj0
zD?_&o9wRmxDUiH)c3Sk^!>G~*J?{^SakCSKp(vyt^}>l8TVE{3?ep`bU{hm;7tCG1
zD$8pF{ies~;>n^k9IQ6Q!-+TAc;UG;iaueCw8x-9!gARme~f1id)J*7YTh4uoGEy-
zu+-8U&J{D$dDsg_3#R7wp=}#c!YuFQr|?#sCLO0KtyVO~JY7dPVKl`V&^1odn9*#<
zDpoG9CVj@GP(Q~0p2smOU1{Mo(}tf1^;CRIOWw!z+K&%-E#DCLtGWAsP)h>@6aWAK
z2mnr|kvA9Wvz!QuAr9bnCp@wT4A^MS002wnlR+&Ze{85lOKhk`OI3IT0O<qi1HAnM
zkgQ#kHjK7y+s1C&wr$(C?cKI*+um*Nwr!hdKl9G3`DfzH7yoxoMO@u=S44HyS}U*2
zEA!5^T3!km1Pb7<hipka+qJyXA{#IOz+XTBKm~BJvaqF-ceJxKF>?N4Z)>Ka3<&_-
zm1rtff7k0Rrs56)a0=`K5Fsxs1`CDt*I$8^5EoVi`0KrY00H*rC;t7n!Jl8$&LZm0
zLXIW|&K7pI1j-gRCIF(21PmMm!X};sjP&$O1oRA?O!S<LtOV5b4D|G$wXCjx-UjY0
zAtM650EC51L1IYacJk*XNPBS&CjbDbo4)`ke^|ww_UA<qGXWU^0D$^9=nn%>005vk
z31I<c_qAdr8FOR>gfG_2ktT^239BUY`Xn4rC@82e9Lw^Pa%FChGl?n)yy8?rx$f}2
z;Y|6TYYB<{QtSFrA!w9H=Jk>UBdi1=D?g1JS7qiueWs-}h5EI?d)OM^x1OgiCV6*~
zf5>pap`oGKm}R^$AwY;4Xr7g+lI1pyBMS~rJ!BG!W*;6NusO%SDw&y>n1*Am9USUU
zkt0B)iWRHmDe6{NHPGTlpA*Ioa@*V6hZtstQ(rzhzw}#~HLF$Y+uI`y>sK}&UcJMI
z4I#n?^Tz2}Sy}11xxIU|f4rCPA@C93e-*p!+`YU6c_CY!>&a6k6GRftpE8#@A2@PY
z+t~D<KNi&1!nfEA&cYYI_xgRR%hp`9wfC)ebJ1Oyxfz_ZXm|S}r%R*7i-Yv**Fow=
z2no|;;|2!lj>RlXHB$>`+d&0SyLOPXf;mJS-cD+YY$DNnx<SNv!lslD{G8B_e+{wT
z>RYx3&h4fAMLAb0?6ZYp&oP<hjdSm<-WyI{jt9fuxx%{eiyG~T1<;F8o@&0&I`9M_
z1^$GYW!eU6CDvx?j1{a9$@8st*Qfw`8~d}V5ExIeOaPa(79Xer${Y^gRI86UT}9cZ
z%mo@&Cv5#Xz~naoRVJ1YChQ%Ge-=pCuWDcO?-2^uJbQT-c~w}748UbftXPAlK8dWp
zexn8JVSX)sf2SL#Rv?Yvgw&kDaB5ML@J{Mtt8v@S!t1$tzXmF$OXv^arS=Fvfkm^;
z9M&{AoV#%|;ex2!oc4a~>^_CB>%^^h&vTH;gGM)lC|l-@H6|`MBRO9qe+|_<i*M<2
zQ1)Fec>*YUAo*?+v)>?B(8n+<n_%LZ0av281R%aQvAqO;g04+k7$^^hZ2ZMD2@zT0
z8bSR)`F~?xG<w{l@*mbI|10w(Y+davj7<KGdA0xVnI~gGz{K!R<}t8yGO}|r(Ep8j
zU*YU9|70F87&-_pNy{hbfB%+wRsYGnL@n_J1B{W}Z`rAGEg6}X;rW(DhU0KbNKx0K
zpk#Cf2}l9wL=*`f5jR8w5s;-~P+gD=1#!d>;|XVrX(KY(Ihj%}{O^uLF7GK3^iFXQ
zy_X+7&xfD4UEA+GePltJwHQ9oHNJ?Jk^IEdVe*<`@86*6O*=?Tf8!9q8Nx7Fu|G>8
z9S$XP%F<{zR3JNhSde-ws9MQhvP~1$4{yWHYJr(3`}VMp5LQd54iCmTyd!`%a6}j<
z<Z>W@CS0r9y!Az<Zn}@PjHd<acT<r&<dFB(kc6i+frCAUNgIS@aQY(hW<rZ8dAiWJ
z_9_{Sk0S_vqUh_lf1{Awv4scCT=^GUNlB7_HE*F1oTTT*1j|qjKHFNOUIO@af+Qr2
z8;hi2)oyM9Ce8!f!D9;!b3|Xbs{h`vKHiP{1{L-Rn4{IMuedlVK8S%uD&5tkA8cL>
zV+choX^@6U1A2&9qo03b){ggko7C~!Xjz&NAJZ?O+xvuFf8QVx?ObChJ{RGZ3{XTh
z=m?L=f&r9n`~mYkU8vA5&Zg(foZbTZEQUf)!s4Vc4i-5)DQ?QR8^JkiZ4;nO72wbh
zX)^;-Q-1DH?@mW=f56d<&o;k=G2ig8amEm{JP+UL0Or#KSdZ*+)25d9$r_+Ezt29Q
zMu3thpT;MHf3XCPUgqdb{{^@bu`-b+7X`vdP|F_bv)X*}MIU|j<?t&A2q&+xZ+DDf
zT`3GiPUO{`TUv=f^ruJ|RLn<3{{{h1<k4s?;Q<K&R~f&{Z<V?-Py{2TEKT1>($@#t
zy8J}W=-*9t5<LYBXTAbmaJY~)7!ZU8NG{xj`T5zVe|N~w;jp0RSc3;3)DJQ9@qK1U
zx#c>fgYIHv3PNE08+Dxth2f_^Hi-BL)~b})Q2YQ&VTf!Uqu8SVXIf%XHC^NUp(M_K
z35don|Mvr;um!=N@F(D6_Mfz5<YZ>%WM=#uEjKjlD*j1J2rM`vlpXCb>3`A^8tE?p
z&TsmDfBZMJbpAUnrOc59F#O$I&F~o*EUe3o5u;>SMLd71O68-%qk2MMK;eOicp-H!
zf?J+eLlk>9rTU}uP*8;v5Os^Mdqus3gAKJrFj&~I$~DHVu8y`LCa>{(o%nqmzxTeH
zePKqfnfPC#)y8eIW26k!dIZGK{~ViR&ZbG0e=N6Veb+ZNCEL_LxdbVliRKQ&L0n#H
zw1W|1iG6x{czAx^JiEBiewpa27HMo8I%mIw5FFtUAsp4zT6YFml+Ty{e7F+{v9!>N
zGO$L;1d)<D_z)H7IeVT!8m$i{xS(yQItmtirxe&BktvK-2LnZZ&IO#P(6&Y@TF}EA
ze~}BRwuDti8D2tYAegz&(*_GHz<?P^f`tIa9aSwYx$3e)N-GIkW;0J_Co{$vzrGh}
zYba2}gLfztK;V3*g|}Xxw&T4c3s6~h4kKiJ<-tKGv7I)+0MH5AKjObMgGDe*WrO~b
z>8E|MCCFrz0ibtH^W5A)91vbWC_WD#e>?UA(D;EYP<Fq+&-PjZ*R|DG41e7_-AMD$
zaskchukM^ru+S_Cd2$7VC|GXDaPRE?(zp3rWxqv>@itfA;a1m2e<wJ)el+(jnkCX*
zjWNBoU{uMrm)`S<fpwB+V&W~l;H1kU!&(U(X7Cv_sK2hFLRlFIdUG@Ej{-rie`tMn
z_ae*gz93>xmv-RIje`RLip$8ko1Oh>uA$0{7sqx5EK;bD@9^2KT~lDOh6=G;DNJ-*
zUs)+Ngb{XhbR?<u4MZEc$AS(63kN6LmQ6w&|I5Iw^>u7)EYS}mV4uAoRoU&sB!MKx
z#o5`|sD9-n_QrM(eF=%hM;7WWfAxQ+m)5s%iP0Zw{RP;+(@WXF$?E?$x0LJ%7}*Jw
zOzi*0Ek-6z1~yJ6_P=opqvBrWpWK4PK}EqZkJZ2a--f)-zl%*daTEoN??1w@&FZ|Z
z15a9p23k-RsXr(n&@)_iZ5S@|=T8?%A_3O=D0PAOydvGp1VvmB$cvxye@P~U!XP4>
zR3>W9qn}KjO!uZ+U0YXg*H_@%-rHXHpT5`6-LGKm1(0522M5C2Yip_0zP%kevZcSr
z$M>(<SXl#AR8;T{>(eHrmLLhW8fX^&=t&g4MxVgb)9dPq33$8;%jK!5snlBUo;%rf
zSspbM6Ty^Z`r>I(e=W{xfAEQMAc=)0#l}XtcSrSldtX-%ef_HH*5?m4xSG?eo=<3Y
zG)wa~Z#ukELJ7`wq?k3-6ct6B7%D#IDX7pvxAiAT5CJq!&NIZQ>b%n9z@Os2D7D*d
z6=lWWmSSSym6;ifBk}S5PZ=5f6E`>2Toq@%>T1g`oMFk1@XIdxe;P2KpUZciO-T`s
zUbuh4R&{mt%iBA=ENhOC%O^R6A==awp}1m5n_r@mQl%*ORb3Y*<w!~>MidGYc_q{P
zF_n=4ol&ZHbWBLPLYd+IzSM{>bQ0rDH+Om`Be2^!zFb${N3)g(*1?$G&wLU6FHH4}
zJ`#@KA#a;#8(qgOe;YLrKj#Q*KwiW4yov?F>F|VdV)`<^VfIwyh2f9*X%J=ufl@~O
z6?}(SciRCR9Kh}-5!81;4#a?eB1Z@<G*<dMDA&MB#=DWB1PP~jT!na5;9h)bwXxbU
zWrifj@9tvk(eEMv23d57lVISChKP{7%s3O3BPJ<_<-NKqf1_TQgJl(kXkNl{lX&F$
z&+~wSy0ycsqwK7p4Au4HU<0Av-wDUJnqYY)dgt}+-|{O6>k`~GL)5AT8;I{T!VAKX
zB!V&1!Wts7N8sX}8h{#`8SLt`o5WYyaCMk)c>cf&O(zUK%Th)M2@oS3w3A2YY4{-_
zvM%<Sc>jc7e?;X|aNPZU{6AAPaZ`gt8wdd4FZ?3{D!CXLnK(K9FtafIZ&@lPA<E8S
z00#gEaO4MIye24AMrydmN9GCp@NrvSQ66*Z$ee-ZHlqLj{!SZ(q&344dT7ZQg<-KN
z>b9r0`?^Zx481bH)_hZl&I5z30pZeUXwj%78p1^Ee*k5;%x_z-6&V}BS%4iD8A{>?
z{rvp=`uUPF8G7|{Zoex_qJylv%;j>dG=9@-u*)Tz#%?vNFuL38(4bdTpQorJySuxq
z)6d76gHd^%YPv2$5e=iY!2Uyp=ufWZ*r)l&r>U<p;+sJ#4AI?wT<a{eKi|C4n&DWk
zOLXqlf5peg=buOT9_#t9n`|%ds&ug_W%FD-o@Q@G_U*R(y6o0mVvd?|8{6w&T3Wg|
zx>{Xb&CSjA_VN1s{9K$^a@duhS)7u05MgmAs2{297;oOY-{g!TD7{FmzD_6dhmank
zqzr*Y6$WPzpmEK#ia&KtKKC+Q5Xd+SqzOcJe;w94I5?P`n&fN6X}Ha!^h40uU`?D3
zczu0co8P$pxWI7+;;O`wAE&u_y);@B(*Diy{rye&3IYfK;0HkS*OLCVCIH~={(gb(
z$cD&Fj(UMneh8Kp1|l#TVl>eRqF~lw@Pa;MRyu)%Fy!zga9CK-=+q3FeiU+)Kyb_e
zf2`Q*3Owd&(q3H7006$UNFWfN7<Tf;(9~FbXl`TR;M(>s4z@@{XyUvOjIdAwoI-#S
zviwTk9N@4{CTxmQ*tmc)#ON$Gz`%@MeYc}gNTB-4(U=JNgdsqINNs&Lgfn6Ai0<-r
z3HtH4=vtD>W%@@jhzQXj{S<xuLa0>He?Wi$T>oyKz9d^3?th}kUx5F+dH#p*|9_V@
zff-7P3IE5Z0K5uy`u#H&0EqtwM8~Xn|M>p1zkEOYL`-bAot6p?|4jFDw;7jjOYT02
z>^g{W5`PAKs37{#crevaE&wt$67;vAfoU=E4Z5)akV*j&|L;9Ai)2C6gf$7|e^G~z
zk6YfWPX=Xc7@m2JX=emPU5R6HxSX!u=kv|Dk^TB-y=9_6rz^kaCBy7tj!|=a588J2
zch9!(o6KIkYi)1@#IF1Mt%uy|rPAp!RQ{xS_nx?GaQBfxPN^JHIEiKM-6P#jE|{QR
zKE6wMH&!;*o=3R2SXDQ-=bj7af3=04T10S)AO^5P*d-3t<M%GFL;Neengz~wh(Uq#
z#Prp~dy2>_k344_c;(jh{4I)~(l`SB@^?IY5yVs`8);jIBIkf{YmlaA6=#oJNhOg`
z#Z9Fs>X`}c&^RI`6&ap|(#<6ibWU5Dd?VMqhF<pB<A&MJj$`JG!l%pffBvOOg1-<K
z2I*8N!a%W{cr|!UFEz)p$Ao;jDU4K8EYOg$kl!3~H%uvtZ-o2k*pJYV2YwM(Kptk4
z6rp6UDm^`WcBS?9KS+nVQ1)EUX#+$!@pp6Av5LJjG;6@~)#ZhtCep8MmztoJ_vi{c
zN6!n&qg22eqyYhG0us^Ve-wpF(d$mbK+fI%Sl>kGW|l%wm*>#b5|xl1Nz2Ovya7l;
znqPEuU?8IctLlL3oB_jOONH!?c2CMr@(-NUoS)o-&g&BrD96}M;Mh}|vScd!z6kd!
zl+osuS#yBd3#OTvlSD>=nYPGKYEA{$NNGPThSkvPl#p>bI6Jjze@5Qe3ySLnK%AbI
z#e_5Bo{^^kF)vhrB1;s`YMg%mY`rA++wimJqDf7)?QXo;&CVS+>ur+DN%8xVlq1_8
z!bl7;IB8NvBcwwK>Qbg^w`}%oYv}q=e|+~@yJY3_{@&CA_j=~@^5yMmY<YdUXH!#E
ztad4BP7y66?78MLe~PYLKCe+M7jIlG(yc8N4%V$5U0PB#GH?ipd5p0|5uqq{NBsir
z7|YbQ=7qNVWBx>*%IeNacBam52973wxVJ`4N4GpNIq^eQmPY*d1f3)}0P6~vI)c);
z_WvAMprud3>Hn~n{$I79kb%?x^>T->9RUL~fvlbDU)qn6e}I95lZBC!f#Yx5?_^y-
z;a~D97;s!9YC*1u|E=~5|GW14lUFIA@GzxIFfJXbWhOybSOtpLQ<|!Q!UhsR*hWVE
zv{8f7M9^+SNB^<ej)<C|Ls<MndDf;V4<S$-sHLcYQfA#k{3tX1wr80Wd-JjX=7{Ht
z<2lR8%pdv3f39EZ#KZ*T0`szH;T#c9#(9T~0D@(TNws7`5oc`Sk|oOoIR#pjA#X07
zRR*h&2zvR8DPwx{#q~8YUYu6ExbW4ZXQ0jc1x&?)tE=mkYUOV=B;vH3oLHsO<#J^x
zDJd!QW=#Ts@k2(KL5Kt_1c3GR^<RgM5MV*2RLSE;e}Q<2KZ~>}Py|^shu_{f8Pj1<
zL<G8Z!4aLba*hR3Oq@A!dlHiyFLIE7j&gtzteUfCijyGWs8gUIK!C&!Ac4@6#)twN
zC+bl00(wM6$Hd$kE=8a+-kg=vo{<R{L!B_V;I`IG6+V7q3v2QM29OobQCtrM&X@n}
zrZzqwe=Fn~Me{eK+uGY4u|v5(p0jOz?RMvGf3;_i-se`g*Dj%n$_ig63AH8*DHn#p
z=XI-de~mn)COB0}q5)^Pwl<?G@)wU3T{*kxcLhC|p3*ni1={i}vfuogRpT$0bzqg)
z6S%s%Dp<c9aFV|J!M`AO0xx}0j^*q6PBA$%f4`dG19ZmQ4`jSAQM$k_ZaVB@4dVhG
zlpl~US^<L%?gK2z9(<L9_5k_I$=t~a+0O|BAK$D{<iQ!E*E6h+2Wt6NoK<Gvi9Veh
z*k$L$7p%$D;)_m2rCU}n10!nqg@PCvsE65iXXLk(efS?+Fi0?z=-Zve`nYFGmMr!H
zfAN;oz?n^B!>i(M+OG2Hmf<K1<$#j!L!(5F7$hsx_3-t(D)M9c0+10Ft2M*P`Tn2z
zMmTEmE&4~q{e^!-N+lBmM<et9FFFq456zA|0G^(nzP`Tx2${FHx9#um{qOIC@9&L`
zjliJz`|t1J=kNRb=Y{X@6bHYIivG0pf9x4=v4p0LqOQ&Sj=7fe@6p%qx{lwE4-bb&
zM_spnbjerMue0%|@22Uqx9{)H%kS0i?~cpw!^4Ayqwmj3;j;YXny#%$PYF-I$cu}I
z@2}6iw&CrYm-@r+xSWAMIw;&FHX*<L*Y0J1Uw?j1@#yGk{nopsweQyU&d0|`f4ECb
zdRoEO=EnWq%hLDv;`et*MCR7^_QdP=z|dyj!}rAJ_xI^o`}*z6PVdI|Uyna(^u1El
z%PYA3;Cu1lzG~+?J-x)wKc@5O`{nDq{qp;JE&u!V_WSjI{rfw;^KkC_d+_;t;Q8Ci
zDroZKJF1|+)J8lYx@yE<CnvwBe;~i$;`{rfN~H7r`}6bbdpSF$tmS?>y{WDx-8uBL
zgyYxrVP|JgSJ&9q)<tb~U0v5^TFrD-u*LY&$)7I+@c(%HO~-lsO~?JUCIH}t{vLrr
z!6Bi6&}gnmWGnz-9u`70yu$dJ#^|Ad_HxRy^2FMRj-fobI7)=5f_hMJf50J5VkopC
z8lWHq)N#R-*qADOV34LDR^35>F048*pm>su{PjU<;toH|wIsmYb(w;(EJ@sC4E2#2
z*i1Nrs6@>WV7a($n4Q6;g49)|jp&Q?e<Abx`wLocWz7ccfszQ24zvjn?Bx^Sz!!kj
z|C*C0_^*o1^^-lg_m2(sfBtJiA!KLkZ17)7YX3iQ{j8kKOq}%pd5>uwRQ~c`?lEDa
zgOGC6Q1AV3OKRwUbN$uvQ&P$b7$bhi)1$cAGg(+8ahPC>!@-Ejg8ktHq8JB6^AN%x
zz)Ad?paByE;zZ%*N{FcDnHu7qfkQG)5L67m=o>7Yam=o~H`=!_e~(?QPLom2bh4e?
zXRdv6jzj!t>X-K~NYF{)-RRAiT3$&8r*<)O@F8wYGZ+we@)shMe+V^0Wkl|_Ffr0k
zMQwh%LMxhX?DDTo^8WyL*`LA4=W5f>c>-Uw1nK!9B=<~j7KVh<qG<k#QeDH+_L$)V
zm=2Q}FHbHem(B3oe;slh5#ohk0m#clA5b`mMDF<!UVa0q40K^I7Bd*klEGz%7Gvy%
z2}@2};4ZV3Gf5S8Xq1=X!N|a^*7%jD_&H*DIHi4tVPVEg+(+NgqlilPM+{?m*muoN
zDDT>8-4_K?l1=C_1k;t8GYxl1>p9@6GM0*&O(VwDVT;x8e~O(B2lly&jZ6&dM#^?1
zqs<%R%_y&ZT$KgUK2r0zF`JmLyUlJ|6xJWOQ7oQJ<E*!3aR*u<blWJdM=38F3BQt^
zwPgc(^BI5r)|>^p3E|=CB|mJ&nybU^oYL>XGExn@@QmHRB^yu1wRYVMm0zQ^N{aS0
zuT&=ORyZ;ie?z7vBu{-WlrBEz*xnaXnJ{)ly(5(<B+OG6>PmS`)a3}HL86`7`msv5
zh9jG4M_c(D-UH_~u%Z^_{*6fSgz}kq`&I7|8XanIOj~vP@xOXvlt0%H|G@wc!^T$V
zzf=#%U-{U7GC;)9(a!PT9Pz)}|7D_;RH6e;sNc*6e;%t=Q+k@fxT-1Cv_TO?fzz~P
zl)%JL0kd-fwJ1d>R?{Mj(VB!5^aOYE(R|uC6$!Om$cVOW;T=5@yt{fBkLFR<`n?<<
z|90N_ChRiobLPALK)_8nGg_T~F&;!_49S?GKQ{nus0tu605h;MkT!UlK|NY%sCWRt
z??s50e~;#d2Gt+WGkXP;baI3HpSCunDJkN?6$yzd>FG7e$)aRRV)@R%X`~4X{!9SK
zrE=Q<>c~*{_8Xk6uIM|Bb1x3Y!ATRHQc|fxg1&?gj5OA}>#Zhs*K+0MaZ4tp_uv92
zfZ~-djEr|ehI@In*X%*JhRZdL06q>5cF<5Te=sAHi;FVpG$uYaQc`GrM12(t5k>Q^
zIB`%=8ElzTIy$i%8xeDJ2JIX4+#eq|2FuUaA{-nwW*w+-VM$|4Lwha${@VVf+1XNP
zQe6HaV~Y#s;xu2Ey8%l+!Jz;-b*thOC@(L}mA`*vUZV5IWv;(?LihRa$B7gqM8kMl
ze_ts0FKgQ1$2{p)w^*+!1I`l0cMa4zP(7Az+NS5a1&79KRzGgE*Baj9XHGpHO$lmh
z^2I&#Q)FFTFPk?jdGkt2YHI5Gt}HGF892$7MvQgA<aK%`=Pg+Mwp7e_$HR%f+Hgpd
z?noqm3<&}IF)FVUb9ax*!2wm?M6Ahwf3Y5>sQ6RyR9a39!Y4f^<og5riV79DEG#dk
z?iMmnOW@Z{lhv75)Ty9|(I8GIjeQjUl&%Dc>d4k6CMTc#nil%yn0;L-GSW(aIc*0N
zG8$9cvEW8ukwQt$Q@g8modC*cu}!Dn1f7nD$+yk(thGvb(MJiRI;!32>{OZ$e{tc-
zVE||WR4uK_Av!Kf<Q6qf?|}r5pMDx;Y%H$=pFgHU#m1++x8c&!TDNy?%S%%_5k#Jg
zdmO@7YAv{keCsxKpu4I@_V*RqIFSBU71rn3GDcUbuCxj$jzzS>Rh*AoWWK>;Qr+gw
z{>a#>z%;vxW@7c8tqs~Og)f&ee@JO91kpFpzef`e>HPYDKU@m<*BdkfMn-lnw*Rl9
z39$Iz+`CPpg|w0dO6bh%RkymPxk5N}QuS1{LO&8eaiBv478^4I@dCwOTOEaPOvK&~
z3M2<MtU~3_)1MKD(8RIO<^r%Im@;6<L*g-pvyn|nOIs~&uhtO^KYSAIf3FY5ytWSX
zRes~GnVr8<KoKE?f=VC}5^_L-;kxedaF;P-z388Z5Hx`Jg8&PKlJUx-2MGx5cEH}y
zHXq9gYF|)b@CpJisqy^G)q}~W*I|bi3gm-Y7I1b(fhd5m({&l_xzk~uX@dctO-bpL
z?=fN{BOz00od^jg&6B6-f49X4QMyDIP%xnEUiZd^u{hPgyb8_``rYQ>gxTz>RsY)&
zKT=B4T-B8|1A9`rGA69*!eYna^~Nf&pg?i$D-Tr>#$wj97Bm)@11dRry?_69AmD7F
zuGNvR#LRd;HuhVgHYzCTw%6aO54yR8E^xkq)-Z`I671UZ;{<R?e_2g_-;vnsaGcLM
z?V0j`Zm}TYJ}@j6;JvO~88I{Vt!Qph+bsqL(w8Re`yenaje^5F4=$z=S9vgkpu=R(
z;r)O&BE%}Ye227A+#X%1S*uPwH`zjdsdmgMI>AKtZJDv};So748BH`y?AJV3<i#o2
zWn-2I7hEt((kHL0f6^7u*RKt2*mjpwmc*AzupI8Efh>vOP~u`<iNNo--&bNO&tdkz
zD-I{U*2D4*8x%Ry)M<%Xzh0kY9XwtpgN>)@p1cjg-$~{lTCtBz<T;{2lRyO;7~-vk
z3O{$<AZ^o16JMoh?xveLC*HCvve;?K<+1UPP9BYXy0OvZe*nh`<@@R81ww#oGqNwY
zA*X*!6OtZY-Yq4+^{Q5ln1p7D^L-CY-Ti>XuIaR&HYO4S@kIXctsg8u%E-hG6LPI{
zyByjcDfX210L^-n=~S|`L2jcbyMZ8rXCkZkAl}z_nw0r1R$SY9LEhipVV-4hQM#^*
z{bVd{f2Egof0@by+z_lRSgKP*Y=lwsYC@uIt7u(rb;gaz*xw(sUq5jcB`0|Rm15fQ
zRF2wL0leDH9nw;Blfxy~o`_z{%ctAPk`74;F~7tf%95=%QgS+!wP;MKmLjnHn8F<)
zZ?K<Hu`Gj{`Jg>qZoA7wIO2&I@R98N-)APr!Nlz7fAhD*R)3`JUqJjjhh^+sO{7gs
z|4Cwv0q_4~NeJR3D4`7T=iv=u91Z{gNc11&x|peiZb@JTgpgj?^HAYoK^XNiEr<ew
z@R)K%kRf$pP_GGRkHG4C5RV{!ECB>sZFyl5kt(GXh?3Og!-VrMVMkgRg$);$<Q&%{
zZ!=Sjf0yNPm5d5c$Jzu>MTw)BPh8n+JR~7Qz;;QcY8!N4mg1-E)nBHwF_4_8t@R^8
z)h1_Ql^Hq4VCwj?cUVu5dfc8{{(D{1w=&=WJkuX4MDpy8{?6|&f_pN)2eGz4vonk9
z*gs`)OQQI1UvPGQA)G$lghcm=mDyGovDE#Zf78u5Cl4VOLMu^3kpTwKD+*u+$U#u(
zGZXh<n@J8%#>^hk;Cc!_oFYA|N9}8}R<UWXSaVFaSl#DSY*n3~rdu=aI+->aYr4SK
zd%b=Hn?QGPrt*-$_@5KWkv)_T=0DGw0sh71{#h+YYXgrTMov!ut;@ABv30R<HnAag
zf3~poptZMlF|)8G@PdURATYACwsYhpa5OO{AhfWtw{vthuyy8wh4O*=_m8DDNRrL`
z^ZYNs{;QSzkD}?H+3P(3fX&d2P4%*9^95Se0%iG`Walk`SDS0+A%EpQbHOgIYa^Oz
zF?Z7qUiy~r*v&t(E%<-Qwm`&h#w04cf8D_nD><~uF#!-1GxI9|3_SY@xnlY0r(ZGp
z>6wGI@(F&)xbyAG6Y$f-hJgsuYjY|@R;9RKQe?=@vC%;N6ghDQ`L8KaUi4eU|D*Xw
z;7?+1;rjoVD)z|Vs@OUUGgjIvDBw5OJkQ;1d<hn0>Gh@+s0RGv;Ltj44!fdJe?-m-
zC?tXkAIJ?8TYLpv4up}b&^3!D9lr$A)@1TR(SoYSK0NKVx{o)Uv|$3%8~N~ij_qTa
zm_B-yQ7bgd&RA3~(^vbH-C$Q_EZGzrHv3w5v=*^zpICdQmoheu8DASHBIUZDfr-vc
z(zl_akGkfy6F6AdS%hfoQ<7Y3e*jF6rY?LtH@{Xmz>jhCLwo70y3(lbHVB{Lg#9ZJ
z8=GnY0HjqkNCLulaO{13V~^=9^E`0D0?Yfoz*B^Y)WM}i6!p>E<pBJnqM(zC184@Y
zK$)FxpcV-gj3<@>%qldQpq179#Ra3I)6m411RCRsmGVqONbc1Dh=35Qe*y0OF@-@0
zMWy#a3jAF-Dehog<ipvkt^q2>X@Ho5(yNhz{ZF|AkoAx1>gyv+q-)@;h>Mc?CM6H_
zE$K1TK?uQU&`^~Dk0GE28qiv+OqepI$*vwAnE5z3EMi9YH#^<<I#{qaL)WN6>iW_F
zDD!9liQo%hCVnEUYVwY>e>vIP-;B)7&B2;_eD?>@^$_Knlz^!W8Z&|-1(EI=_5?e@
z#d5P#zTrNHKRrKB^y|-p%+B0fcTzAKqScX<VRdNflwqa;S2)HxG6<<m_Y?Xn5v{GS
zM-A@M1J8onPf2Ho`)d#o`4g961!Jl-^J`4Yt2iwhL{wBn-*LCjf0-)-pJW(VA!bzq
z6Ay)BU=l%6l1fn)A2vYIeS2_tJzZRQ)GXkKvb}Gc#E1fig@x^}S}%Ehj3#QC`N@p;
zyH@_TL`%JNy{}r|^u9Z%<Kz3he0eswY~8X%{W|T2-}<~w^t%3Z{!I2g{qj2Qs5zax
zz0F+b>Rzwy_HA6Se`FaI$@xCz(TN>3@_Lzi&dp!xx_|wI@AWyJUXN?Eb^-hbq6wd^
z<coLp`M*`6ULnG#C;CH4qJOPWD;Zdu{NL_Q_&;mN10^sS_E-7eR;WGy-ua^^uB3o7
z+IxJ}F~tE>>u0EzsZ?5Bpk0-~%qUH<60|7vCJ#R+g<|-ye-)*Uv8XjG<)?c##$OaJ
zNaQ6x(atC^SDj(lskH2RywTn1w9cawB1}zs1Afe%b<gvM<<C6eE2i;NtfJP^VUU)k
zeSL+!;pi=vY1K9-YbXRTeQCG-W85>HMoHq;MCa1=J4DDz%yaFYNv&jx#kr$*65uJz
zz-h^+qfFUsf0-^n6rWZQW>nbhMbH`}DkkMH)iIIfx_;3*U=bzTf1c{2=B2rEjc0T`
zwudzHQ-qiKp$#fYi5vTiBjusNWqmUL41CW8;NZNcEtcM|7lXGWfFrCTNCOxl!Hs=#
z*`2J!{+Y!6>uB%(0omCPaGt?pQU5^UkjCHs5oyHje+D52Y*D)=OqvWaGZ(awk%D_x
z_ea=V3tnH1EN7Qo#6CI}+>!ndy};cs4d&bAo$(8O*iPmUC<bOo!?K`pN48Vrrc`!<
z+F}F`NNlCEFWW7*kh%_S8&bPrbm3j<0VbuNM2IMw&;Hx%5UMdi_?g%7`{vsSMvnft
z46MEme-Q)Vli(lXQjqql;F8ww@kUkiC`2IJ5D7>E!?O4$f~}fkgb#JSfE<=b3S_K1
ziV6VlyGr_xODgDdJM4mAzGW47DH+H+R<Q)g=cKpnwpM{TEZ~dKPTU%ZzwB;M#%>jY
zy>-P6QHD`nDC*g)s&fHhoz2GP7uYn9@$}(*e+~{t#6aKBmgnQcl(jL691SBCD`p=C
zbTS@NX66l?=Q&ndJ}?#x>c-rRe@fO`ENwSbnQTds@08@ktlDX;sl2%J)hrOIf4$GT
zo}qKSf^fb=Tf_a&l@KpWFLLESR~r8+CG1TcP3;_Q{>P%U)3b9Uy&Q@@f<F7u_|5mX
ze;-)rH<Q^HpVLuq{jDE8ItYqiLmeZ19pi~VJ3%wdq$6VI)dv%M@feQhtYxi&=YiAu
z@HX}WNs4ZH8g|Y8^q4*@z(2p%UxJkXGQ~{qPxROSuYy$A&dv6J6r|@cH%`Zg344b6
z`a6#g_K-mHKm?QhU?hip-*O;|G{dqve}p*v@`Lg7{e68DSEqXzhI5%&b^Lt<5--x$
zkK5lfk*~mUix0f<%0@G?n(@B$m;CDoj*!JGx)DB)z3M~RQ=m&scL4p@9^c5+J>Gj}
zU_i$uqJZ7Xc)7S#sAx>2G`<%UlZqbw#wEw2Pc>gt$fv+zvDu33_inyMMn+yne@=ea
zU?bV9=il3OFGI`4M0VBQFHfGaKC*i6U-vgv^u~;G?w&PiVVB#Tf$I@)Os3Dg+>Glv
zX4~8hKeM@=uCCcMjZ_HAm+6{#DHq=To~E@zv7w;RB~U(l&u74Z_R>vl%<SH=SB$-7
z*b|29q~>-!r)qQW;lY^cIkCeSf9!rrD{?!V3x(b^H1WW3w$q)j*FJss@;=Xid(=ar
z9>r*-@Q&${P4(&D(hn@Xen^n(|739Qcx$h6k~9Yb_;=sTCJi@*_Qx-y{aa(Efupmn
ziR1tE#?1e-Dl+hSVGaKOwu)@~H~0KIK}TH40B0n(vGKBOv^l$Rik8n1e{lt+d6AV4
ziYbsLpXRM$;zx%<@Fa96f>c2*HYLT9ilTrbgouuFe9Fiq6tVJ(b1(<uaZhYcb9<vl
zi_4omZAGW;+u--!;o)od%=-<%_a{Pn*s+;G3@~g23J7gP&t>Y)bQ@W*j6~)KvHlG=
zoSDVVPXa>dumF7k?O2?nf00TAX|e^KsNuC8*UpgB({hEJV=j`h7qx8enAAcJoB(S|
z5}^Ypq&W<AB|sIxAxTTuD-H_cgS2~Ds^q2;JZ?FO1f5=h51d7L4Ev8J8AeKu$4>uK
z-xe?InJIVOg08fYsT@X}GpvytpgpS&W_>+{E2WMjVHR$sZNKpue;|d}>xxQ>AwZtI
zpF{}4FgjMj=RNmxN4oE9+19YL$X8vU%PUYR<N-gCDO-(RSKeb4`kn!&^`V@&cj5=q
z??@vjnt{{DfU2X;@`Zm_dW{vno(t)gjo|77!8hOt9$vXc)gpU<D0Nce5Fm!{LADak
zx9hu~V_>^{I3wiRe|38cYmLi8ZkVp!IFJNulYw*HT`awg??t(e6oj`N??-;2fGJj0
zES6na*;<rK14l+X<DzQ~Z&BguN>A>0*bzHhA~j2rOHQ=#AEeU1A2GCXpu<#HpJ2pr
z6GoCR5WXp}JD8EQ{LUh8c(2sh!<_C9S1Ff8tQrz2$m5UNfBK?2kzrPsfeY*>NRl*>
zz#?$2oQB}<Y?Yw_=|7KOL}HrOrc3`Yc4ap~$51tkuWd|70;25YtDAJ_7l<sd{ZKvZ
zl~GbsYI!J#EwSh~Z3OjIe%qczpHDthRMHH8`|n-yRV*);pOOG>`JXGkKfVv+53#K6
zjQ%JdIul!3e-)*FWO>HU#{WSucG*G6zwkGLodU=FoPZjjM-X}T9bSPqcc2!bm=DRM
zVkM{{X=1>YCeN3F`t({r2T`*PrO$G*OLNXezZl5Tj~6Y>5)M4E1UY=hP9j#3DTVa1
zRZwzXD<+)otmqfuPpXEmG*A&j(fR?Znz0u^eSAyVe~3Ctk}jw#WijvfL2(DpH56)m
z(i*t&{Z?z!tco^8X66DbJ@~edpdIKvgMBD!7sfuLwLE3!uc)p^>t*K$_%C6|Pn2sk
z1sGoAk0S|z1OPz)uVXf{vo*Ca`^S(cu_q+|!as(rx@o&WkJ6Jn#D(J;z#kax&<{!=
z+=>RNf6!q`EhsMjD?$$0E*5uHwu2X`wm;D!t9Qg=)^%a&$*t%9_2uJXaADZ;-sB!R
z%N~h%%rME`QzcJRyLK0IBI>zrOmbKX8G2BFBCOm%*8K6|VLveuKD&E3aL!lGq5QXM
zkqK}}v1~|SHS4Tm*hs|Ulm3`;;N8RiZW`05f1xY?<oY8QM!|y)-S@dY-<+huo{94@
zb`#u>_e;W+&CdB>aPC1Rg2)|+98zASdLKZdoO|oK;@(m}M30L_3e~rqyzQ0=EA*GH
zns#w5H*18FL`L`F?qt*;W)z=&!^L?7q0ZlKOr?u4_#-C@5oE+h?<eU}9z61|3t=$D
ze}GFHBOw_RA?~5MLfHsU>ZcsBn2&4<TMJgA_s%f~5o%+BR{D^Ff{MBfeuJQjMSxFs
z>Gs3=kiu~^!SP~eE0GeoCmTGNl8p)fMsAXVi^|#qVmek&I4r|C?148&AR07t9DQmL
zF!<h>`cW=F%8izFbw+WZnfPlUraeQae~rI_uZl86GEPIN0#)%SF8ypOpW>;GqNyjm
zAaV@JM;FzLcz&{foA2i6@w~N`RqcLNZUv$leA{s;IZFT39fXN;cTI>^n~j8<^OQ5O
zuCEVMGAS#aYgWttft6)~bTg&gXR$m0AH(aTy5xxTx$hK75&ePxwx?d-Id_%Ee<tH3
zl~W@Uq#W2GuSTr(u?tSdwmUJ_QAbgRR9=X7;J$L$^A)J#{)Br{Ah3|KW5R42^?G{R
zwNqy?n}m}OTeD7dq+Y;_|0Pc+{=*2|mo0J*8Q<d7hU;d?h(#6-A@^EFzoSf+9e#I^
z9O7fyM@gRPYF0wjBcgg^JA}qUe>iKE>rI{3*Lu28u(*&j%4K!gr`zAf26Zy>$OS&(
z<nSCYbPC`et#&{I1hWx=xPqQ#Evl92Cv$8dDT>3vqxX5251IE>l(qd65>y0pRUVQm
z`)qLl?#KhOm{26u80=cD-hdkysAabYd2Y#l0URsr5V(+!5*ef>cCn$Ce{t?&(2GHA
z2t$#6WIs`%=?erZtZgLGa@f(W9}wT$m(>r4b3C#7hhGX?kIdTFc=4S%rdRRASR=2h
zI9~>|Ec^1`UIepz|D@=xy8zerOSGfPAD46w{NGUYZ{?(aP*m4_Nb)cIouVNL0=EC*
zm3Trjf&1|CB`FR23;ZcEe`_it(#gO^V=o{>a(Y;01^1LqkYCsRwpP;l{B&!cD?h=B
z1(3**7?Wr`dZ~0Vs)yhk>;yp9mCI5(ZSL-v?V#@>gFDVHR?t}RTE=33jXiazi_mwS
z+_3#-voE(<_5qA6yub%W+?Y@z(oHHe=ck8o7TZA4GCza@=iS!Ge-aa|d$AJ=zsl5c
z*LTZvpf*D~s{+05s1A&lPM-UUYc8?*Sq}+A$(&93i{VrrUR+m{Y)5;!f~i<QlnlC?
zxy|Ln{UmN;WEA9S5$}4FGqlhd9)$8b;0Bu}IjCH#mAnZ{wtptOn-KMl{yej|4#n}Y
zf-Vtg*FTihiUQmXf0^`PCHNMmK{VwhFO@x0)+dXPTH{zy=5ovj$TlIW7BO&}=nbQu
zSu~Rm(gqHnXnsV!+}k?_;Vmrs=N;HB^gowp+%=KSz^+|s>aUU#5C8z)e_b9Y6KfMA
zXZ!yYXMbNMp?&jzlg}{<Qh&vcO|Qrm;G(wVJ<$$(B@pO6f5{RDYoUcAX~q6^tKOC-
zdA0zyd-q(4I@rP&l<l-cSwgj+d4^k{s8FNR{IbLzVKTD|){T_wpnd@rKRuwiNvqFC
z5K(?H1%uD?n>^Z2%FzHtT%hNP8U+%7uz_&1ns=pw7Ey%E`B22iQ`%p@%bq=VE2~g7
z+udIyhb+5~e@bOfN6Em`--6T1!+ybLyt<L9A~!v{Q{^&6Oq;0?kuWxu>EH1IDGTN`
zPe86o)mk?B&2HWT|8sUq;(58kO!sVn{upl&(0><S{?@Ge_i52n9F+VE|1jS8e%WAp
zgwShVkwZWN-KmiwYj$@8nUo=S#zFQzV=1Y%hO>2Oe^9Km410^W8E>XfGtaiEsJn7+
z^w{hoWkC@|5;372aew&-(pXIn{#5P_994Azu~X0kej>_|_fJ*{+&b;XSCWFJ8mkfc
z&pj0o=MF<mf3sSmz626y9*ojoRU2dA!{<0L?qf?H_!d$(5~dE1=;>gPLnJNyCXg^K
z=Yg`ie>Q+ud4!_XszNJRJho&LIF-3^x^S?SlR2Y>zqZFao7ARS@G7s%N%aQExu+S|
zHaRf-*@N<a8o%(>)?CmsU0`LEN@3U3YSLU^wET*hJKBcZhj|AB6K-%V{|5c%Tvq*=
zOK9r7%e+5VqJaO6rTuL#|Er~0{h3ayf1T3UfBwHLP59bZ<O00Nopw0tVTTlgHk@2z
z5KCx5X0-_QdyAkN#q-2u)nw~Jy1iD}$<~%=?L?l_Jr8*`0+9#`A=u6VFg7>~*X<An
z*_lGj9yn6ExLZB41vp66D+BV=FgJ}mE`|4b3wA^iZ;e^m#Rjf{yz$}PwMJnuTuKDk
zf5Q1Yq1P&zTOe~4wb9Jt!s(F^b;Wr(XbEHB;BR+0|2ANz<aSOe<hG9YKZ6|s0RX`K
zGvGgZ#M#8w`M-?S-NpJp#tNB^CHWWrKGy1_ZpU?c7=N>ON_Dt)V+sqlsU3C4P!c1$
z9;p;*o(w^f5tMRbgNd^R^rVX=7amU_e~>_YUkD1XmES2ggu?qe)1`(3_-Oky8oi<y
zG(%7T8mK$O#~n~Tp<a|y=W65QZLGGn(742AD=a^qf^o+mvc>gsbn&*gQfI1IYHnz~
zeEfX8zWTo!X4|gJjMzx)tCq(D7XeWO3xPNx3i<+(&HZwboEVN#4TVzITTq+7e@&`X
z2Er6;@+(z@AsR>qu<{5|sUZlYQMOiPFIZFJ#CVQ+2G+g?E$zG}omn%-bT~=Xn9a*8
zDs`bMRrQav5GN{$j$K-dwz{f_K+Xy<6#X9Hl1I+5r>W>oLKauYf|cN*svLdaFMp_@
zxX{Dmv0W<J{MJ9D0n5(4P9WoCf5)*_7B_EtiS~{k+r0vvCE=6yu&_K+&zIN9z*fj_
zcZcWhE>+p2Y=QAzsQQS-^!#k_DDXUC5YrH0O(?AL?@vXubU0LoHLSb<J4)x~mB^`A
zz#1^1x+2qlI!Zbx1h}FnWLH{BYRV&&K{gv>NEG@dji*TT$vz~}=Mx&8e?64#dkviE
z(=6~1`$#McT${Y0|1I5Bu9E(gm-^nA-_QiRw%qKPRNulo@Ho{acjs58mkXZoiBqLl
zdU!)FE}wpe3q@%1LQXT%`!5>TEkuCp@H`Kc6Z}sqiU|OK^e<-gcS&#gxBE6{u|tx7
z;qUe{rEX)l&Wi9w1N;h~f7L5)%RP2A%K0N@nT3A?L}sl<JSZUEJTr*IlO%aa=6%~u
zOp#9ZBf%O|o`8Ym?#li7rhQ*QfmvdhMFuiCVOoL)^SAav@DZehdX}QaR;wnPa)SCn
z#^IYGuaU91qpOsw0`&>Zg*V}A<gN3myKLiOD6`VrTyQ$(B_-{1e<ZiWDn}w4w<z#C
zQDy`Vw-TXy6^c^o<u>DOOerO7NR}}7vIR&acdj<}ra-R`Y76&FCjI3F2rM<h%t6|S
zbVxfVFIyyZlq=Xs=7r{l!)(G@2B;n$7Y3GmIxh6ut#V{^cSM0Ehop$K(h>%wnc`&H
zVph4U8GnnW0`rf%e--N(G>|Sb&+%|$KXh%z4JsLrig1ifhharDD-1JC7`tXFo#C?R
zQg#gI7R_f`yUCbk{TrBzI))hyN0RyAu^kqW(`N4IM3ZtxY`}tEV#B46a7qz!>HeoC
z&8^$r5VVXvRkb^V@w<o|xJjDM!P&k_!c*9)U1=E_3#yoje=XEWO3y)2%Z5rgG4cS^
zvx3S^1{u_I)%ndXaV72U!&?V{nr^y=(XDvgdGhVv#N>NBiC(8(P;Y;opPc4?h@fLo
zJ9(f9;oRAS@WkObwg3gc?9{P6PCXJ%1&@YaOv}zbS1kMOP-OVUX;+b?lWD;NT=okO
z>R`dWa@jj!fBAgbd6DkIr5+K^0~oZ=0NbR0$N~5f0#fY?Z1*|_b5AFiymIcvNmftm
zD{=3=(YfouK;l#`!EUBaL=gW1gkUTSx=uo(_a@Z8-X?9}_*?-VGX$e628RqjSW?5%
z(+1@5ADx#sA0eK<e)LQpX5=s*f5c%^o7x$p5rF1Ff31-<5OF>Y)~2S_jHl00Y_AN`
z4TA|AvU^XFMc^_{pmu_1o}>bd)P1VWu=@#+B7g_X8$W90K=0|s3HO29dp~ir{FS)8
z=3(rUXiE9cO@0wtbzczsa><#Sf~}dM7YjRIA3zoXLW)2|j<+`MKB9|Xr%poi+GohS
zp9V-ue`%^rMe!CT%yhBajtK%dwGRX*&WOfX*r7|sQFqbE43po2Cy@LGRLpi_{T|<o
zyU0Y$u2@RH(aQ7~oPT-Lr6iK>epQZ`kG*P69II3_8|-7Q9=?x^v0|P#`D_(G3CnvS
zyIj_$!DJzer8fRl)TUxT?K~hnbgYz8l5a&{e+MQw#?Fq58{YOypG5c);qpog@d7+&
ze_q+lVvv-jKLFi6;+P}x`iCevsrWeV6!&q)pusPvPO6-qo2CbMuoj_gu>t&y!gc{)
zrwrwVYeKOgPMwJ{_}D#FuYjB6o<qSM_FMi1dRFuKR+N=(F))x6%tQSMGynu<*JbH-
ze_2BqgaTG&k^3WZoV)C427uo4_jBR$B@|B-e+<U})%hA;oea%gEaCTtxmX*)4_j?<
z$lA`|!H%C18U&F$IH_5iNgll(=iVY`D$>c??H~^rJX*y4%6(zofZH0B+&k;*sw-9x
z8>t^qhQ3uG`vyXjO(b~C80QBD9Z6Ele-p*3aJzcsD=Yey{@@JGpmG*7^^J`@b*B@#
zYdKkYBZwz!KVWuePGNK9VZ&qqJ-WF1xvOO>kaN)8+%@Cx+U~e-=!cX)Cm$c81u1RC
zI5S0R>Y2<E)UpSys{M{$Mb~dLYxSrX<XX537&v&y{gjW!z?Ne?6x**h9J(*PfAXhd
z0cvaWpIe8HBC`g3fJgk_kDZD&RNqcn*4B^^D4d!k6FGq)Y>NgQE2AOB;a{@*vE1|N
zGt$~pL|v@Hr+lYMpm(qEqb9F43tVyGJ5#oG0Qx;makRQf0b>$O@KT=DLtuMDIe|cj
zYQ7^%K!evJbqO=Y^-aU<Jx=^je|X+%)q`FHykei3aC$>Fky;70*X~A8;dipWIi#W>
zXNX(Pjr9gQiEP{?u)nL@)?2|3M(sNxGSWq+*~gWqA5}S1qf#GjR?m7lt#w6av`#x_
zH9x3P3Ltp;@n&11Xp!HchaqSJd*6DrnZWJxal06dZf>}7QZoIvJpesG!oS12;D4EX
zOP{D@Lk#7>hxl(4GoJuT!DEm1$Zzk#_j=NL%;$^fFfi^V40?qTJM%teo9s;U()c5Y
z?FIM{nLUIgiS6sz_Jf5LR^x8%mY`ZbUE!ki)Tc6Pku}lW!x8TaqjYdJ@#?$SLk+=_
znSwHR8boqpgJI1nkxW$x2)Wt4?0*wEx&Ub}1~Hg31-L>e1j_IH1EAp|XAJ>_fbF+@
z<LgqxQCBo)vaXNl>vF@f-0%sJO-#-2=aqC{9I&UW5F25)?sRTc2QM^|x?u@=QI;<*
zZ(jk{336fWfi>P8Q2mRK20;QLC(;+fQ{=BQ2U?NFO~m1Hg9=YUbNZF{r+=gN%!xnf
z*w^s7jLjhnO(=lQ0jhaTwTv&rnsUK3u!EhxL;za?YQWk`R?~y7%=(8KF2DPX3AYYs
zo4)=f{F*qBa|aXcbf|*?005%_03iQM__ek(Fg7-DHu!t|CCw3$`V0TiZ|Vwv#b4hP
zUr=iOI+#w^EC8?YN<gW`Fn@r-wfuD@1e7M>b!n5aJPIz2pWi*5#FSEwB;+E2CGlgO
z*RgJ+*RnaXYL4VkCCh;}$?8y~4eE6vdm3G)jMU8B5PqX7Ht*vXqSmAjYU;3IPTRS%
z$+N}dFsg)#h*t4+?zDUOQ6B-cPN0?A!&d3lA13L;nn##|#@@t}vVZIkx!&+G9L>sT
zSTLJgQ&Vp~&ZfC{!#wJB?>5_H0Ph}Cs2=DTbNcL*E#-^5`rH6vJnhE2fCo<(S3=Af
zF#SDYHKFE0qK)kzD7Zyr<-b%tc~T4K5I__#><38VCSrauXM7T)zPLZSCk6+(-_m1@
z?FPpJ&xI3}s8Gr;Q-63p25oI^_iI@4j>R={v1aE4%e@K~ISq8;$DHi0mg>Ej&CiFQ
zZ1{zGt8mP67>g=xHM!4Pk1i<64`7vVI2JSIn-fnnO&LuYlCm4(AXyIeVyz<Vuc8w?
zjEw6Z!UK!PH@g-Nhb9Dg@Rz@V37;M#9HY%<(Q^Xj&=gbUIe!{w5ZqjAQnyny1E|9=
z{Eh*yZvgAtLIe^>)Gm#B>#tY|Pe^nz3TD8-&wFB&y89&AhC;~gBBoyq6NkQi_+kY^
zsWK~T@+@yJNJvlNPX1Q7?R%UuicgZ{uTKR{TEk-`P|vsr`4xCeV_<T`dnhGHe}%+k
zgLj+br-34PnSaMiOcH;(nB2r*qGX#q96HhD7#itIDU#t&zg}_(^@ZWxFttELZU)n8
zFdjb#FtPC)D43=0Ftj%KI$wW)rPugsk>6@75u9-AKq5WzTDa08a$-xd#G;*6m~=&h
z6;L<_4p1~;;v}BpCG!_j{#PGyh>+SY>b0w0a^IM@G=E+|kO>Y!oEM8L&sY^kWa{dp
z4||3@MNKUbp@cO#EzWjjy-)UO{2A>+?o|4RF$vBDQ;~<zLZ881Y7_-$V=in|)1H(u
zg?0EKKx<Hb{-N16W%YaV5=*fso*56P?8vE1X%o=Hb2><Q6<oFHQdb?If);(tT)Z1v
zv6MDhKYzRbG;*{cM+R)Qb7iLFiLpYSFhe~vLx2<@epKI!Vd09&;M0V@^kxH|ptLY8
ztQ~M!fn>-$x+0SOE%Q7rbVy{7gGxqNT{lHnYJ@KM{%Y-@ZF=+1%4SwUl8|EhU9Fw{
zU`|Ez#j5PWO)8Wc&o!X3xp5mKKefxwU4sj@2!CbPbQC)*#G+y)LwR+!`YKb9iNzd^
zFKbn;ixYLL#uw4Vo!q02XIGCXVVx}p(3(*qnRmx?<3Qr-`&M(0w)q@UUHJq8!z8L>
z-5!6`<Zn<1*f7}Sdt|DVPikB&k+ZRC>p}>lPr+l=viMkH39PwjeZ83m?~N<9qo1X}
z%YR!u-*Ew$MH`r~xGUCJWICxdl`0v5kG9iJfxUcxt3oZ@BA-0AV^eHo?LcWnpyKG2
ziNXe<%bh?Qk;yJY!(iF;p?$e6cJ@VLYYq@#v>v4~XbtQTPC{z9p@(54S41K-5)#SJ
zR#zEiqx-0h@4(Q+Hb-h^iG)~{rUD<shktUbaUQg8JW080cqBL4cX`TS#C<nc?phJF
zbWuFDOJ*SGU7lHlpHo+DU$Z~65Z0ipXc(53Z`tYPsH}vArwarYcr)K-$=k(pq6+(L
zobsP!IAQrZS3XPIxStg+Z*FUM4qHHyld@4X>qWpf&aIEly=wqH`=$(PMWWj&aDNLN
zBIFDT+eZ#z8!2fW7x4JZ>EF%o%#|aR+B4{zI=$nQI-6!az5mu^k}B2qu`LIAe~16*
zssQa4yc)>vxo;>uK!;*Lx<ic}%dVb`NjC);ST}wbPv@8)Rht!JD$5AI#ubh=!){Z-
zUwhy)KFY-OvWe>mLdx_e_rwaea(_Y~Iv1Iu|5lw(AC3M_v@?P6tKBVLe4^Zgv>(49
zj04pOSV_IjFr&uEg5Qe2a304YN-QZf9fq}Bp#y$41gO0pfrnA}m5Km)5kj?16>-0_
z%{B;(!Kp;Ji(|1p$pCZH_n4;-O?cx)?HC>+Su|Vg2Gm>Q*rVPDwAI@mHh+r~pMKxp
zfqpMo*B5LBy-C&9q%{J);}?&LP-EEOQN=4g8-}@lKY+<cLF<q1JBjOyi|2J?V$z2H
z@lm}q7P#{Dc~jm|@0s)Y{V&mpA#jEBU{wKI5$I212=?zahJUZz{k_H@3L+@^7yc2W
zlzHsd=@GIo_4*wt67m)27k?=d#35&yg#t=of6}BwWps!~Qz{b7q-^MICyKYb=FMrk
zcg2;ub%~j_>Qt|SWvMM4d~kE@x3b+=J^S9Z{obJlFis9y&YBos#j2TaT6Cp!K2sYP
z=8E5P3S9?tjGZ-DyY?!A-}c+)>E+&PR81dfxi~#Mef<jf92GQa@qfeW{sAeaMaf)*
z$1H9gECl?6vTg?i<vb$omZKH{o62^bwfs`AxLLf4dI8niY8O#k6Dk;$Ux-X~hd_b1
zUeqqpw))kZwNG0`{T#UJ$<Uvpx2sFKlUK65OkPP1Ka6G05b`af5lUIZU>e=bEX$L+
zZv1t4S!8BWsuXL3FMpb?9<hHS-HkE#N>?*TpZ+C0&&v4j=v5{qbd8vQ;jLoasL+x+
zQZSF5wMH!9?8Ho8;!@LkdoX3XCbRf5jmlA%HBP{Xc}7DuK66Q9>DxxS9}eDme1UM7
zO)wA}_0|J%bAqLS#abTT!s1kbUE^}G$Wq}63wsG;9ikg7Qh$TkMhALf0Vul5mnx3D
zbQ#z)1uRg5^NGKuBskvEZnVR$W&c7&NX#vp$xN$5s@ojXM@R;=0AhXBR_-%;=sC|f
z0xJOl&m9KglyC%qu=?r!XVbO<dl_^@Kb#H<!jVuM@|2|?Tbxq<+F)b16Tez+%sm&k
zCI?7qENjv*m47ECUSE|T!J-@CE(mK;_QJ|ZC#9c;@N*}nlmW@fDdFe}2y%IKm~V?U
z5_7mM)?!TwfRKoFjQ>8o=X9a-FNo{&sSo^rTBo8bIrr>O1&l0m0D#<C006XqvCh9*
zN%h=qtR3x*{w|-4N=2mp!rx8vlIPNKojswqy21xMSbv2rX(ZZsHGMJ*_wa{90?+p0
z`JDroSL}p{MAKv%kqZgxXy#+CSB_VtSCUu4IXnOeMPz}=XyWSBqOvq1zgyv)xicG<
z{`Dxn7GETv=-6zWFosz>ejHHzp#)a+u*FZXYJ9KiC2~I0+|s$sRdYV5AogvmX3y?c
zfj7$F@qc<gSYf0n7+>)6@PS7D2hlO-j3He+ZWICDGuKWK;)#V;WvLcYb`Sb&((+tg
zh%%(NL5g3>hsG}q7z{097H4|1UVJjSFu7qGKfs9Kra_aNxV$QEnsbjFel9J#qmB3~
zt4#CYk~+X;d%H0}R{%^d)V;YVKW4NkiHPRB7k@77>qAv%u{%6rxN%~`4y7)EF)^*9
z>iy_m3gyGQkJ52qj1%)n8?php2w{SEPxWHr<GT!}>(0RkwU9N*tU0y~WqJ#8c>z4X
zY-VNMBbX8WqB$|`hu}=obJi=}Ev1Jd>xbrhA{SVLHN=7b?6~ZS6Dk^u^Y!V@9b$-%
zo`0>yD;?wb`C`rt)i6nl@@kRhV!{U(UqF1eIwH!xj>^x@OJvX)*ul>i!2JUGJumm2
zhz|tWNhEg+*gcjow_39z$8TteQBcJd`9TBSAoQGDI;J;3an~uqc^Xi)1uFX_N>lCg
zT*f5{%m)uw6x<4nKp5@nxd*(v$<Foi8-L+`n)Ctql@BuScSyfCz}Hw@SDO$|2dHU*
zbzU1@N9}eOc%)yz+(GG=k0&>Mu4~KbsY8PBO`YFa>C3TAPUtO2PL4=K?%+207*2RW
z#q|IsFV0Y-2izl&A5^cne!Z@EcPQl<9w7s{1l5|j0{hAu@@`NUHs~!0U&!&)6n|W-
z5?teJlz5PL&d44;A50uKQW)?~k)iG(0#3{NuKw&clHX@#U)bd|A0&F{@MbZe-7ymi
zn*KN$5KkZ?`x<hp;lXj?f-AtF1LO(n7Bb&B&<yN63d9jZ@K#scXukwTkne;+s8XDL
zbmGfUu2?(6uh;6B8j`kbH-TsWt$)loen5DzA-~%}ctHkt`j!4%x4Xe=VsG=~u+KtU
zR(!$Cr<7+UGy0vaj$gfzf@cNmryt1h^V|rtdIt%FCkhX=5S$UvaT)?3st|H{>*^HX
zFrnpzB(%$@{sOZ)9H7n|x6oTgGn><bCOI4(Pm^*?vltxBYtGbIvsDI5)_>9W{=Ywv
zXPIn{^*-HWtu(ihKm9&DCXltXIv;w4^y@h78T`I&zd_5Y5il}__9q34hkz;qqu1LG
z7Y_|e*tpAW_D(k$?<8n30Fr#`+CyMFE$E~4U0b}q-}$;Dj=#43zGr}#mrxVXoBCkk
zBs6F&p;0D2jp3p%>qZcGCx1<heieqxdl3@0qX0sb(R1mY5JT^#PVhYL)3p7Pk3>NC
z|6qGr{c>EbhvW>x;-61<=YMQQ<4V-D9^@N(4l@%|SsWuu6eSInx0bfjll`IW8>K`o
zOzRwl4D*T+)z3efjJF6pjpFj{gI9zOE=k%N!EaeHN{9#Za1hRwe1DlM+K=M=PF%K=
zOt8`%K>58Zb`JnRI~=`%oefsV<ZV!gu(nOL4UpSr<Pcj##|3Zjns2BSFfkt!51;MJ
zkqbBHtK<ZIh9x}|+b6la-QB9jEU=0CQg7R6lXR>7TZBs#@eE(*CQ;!gvdTi|p;1A&
zQ7v`jI6>FW2qNV9dViO0k#A&8GRCWWJXtjkg|@}a!4Yp=%0@K@T>m%-GV^Ug3s+`<
z9fM{XxRZ;&+Jr^E5x_VphH&0`g{Pdz`5M#rF=IHP8gX6@)Vf5K&xDI9NS_jXUu~`a
zB$FON&XPsA-x%gfs(-;JDe`g`&8oRUko8<Vg!`N~V=B;{#(&H~3o%Kn5LC01c$`xc
z>9&!ifFJCt_-7EekUaOf$cYZ_3lF6C67G9DpLyrWDuHpgVt=@Y?J~>y#JKX@>@*W)
zlCNtEMH2mV=~x=%I5!QC>`|*3`dx$Q1!frLfTu=XIWd*U1l`cM8olhNJ4|f;PdIg?
zUP#9EB@?+ZWPe{*#5isM|3k?Dz#dS8q@GoOZ>A;mNFMQAO-fP%^%FWC(a*`21`$k_
z2O=?{93BnuU@%cI<1o)-Yf1lL`6@DL^Mb`9Q{)w5W-%}wIfsVjS<qM`-WhI&DKfPK
zXgI`HuyvD8zw6`NmX;P*U)2`qDtv8<EOtO>Mn1WDCV#*MFkc4euw82a%d*AmNS{T9
zJ)-o|j<4`xNQ!H$-)#9`Veadeg!{}QL4t)QozOOX1T)lcnA5D;n`cCktn5KyaB|}?
z(JhRN*)=bX0uv}3S?puO^a%0r!1hp<taBs<r78Xi5XxpM@N_oyjlWwuDaBxZHpGW!
z?94AVgnuP((I9v4%uhpMH&<0KE~=p15wyCs-;pV-jd~E86_M|GpajU*=O8k@=ozL|
zRNh#RnN$LGQ#eXdVr=MM2-j8X@USmZFYiODpBSzJW+jC7Xvt5sT9PW?Hq4pV=~W9l
zURmVKxO(xpH8!Avow=qa&3RY+P}t?hq~jhz4}ZcIm8X^`05sTQtz+T{eIB=Tw@@F!
zFjKGR;EWE~iADkHA+4-;S)I?&n9eq$MRjaPVy0m?ZK5v&t)~ca>@OtTHo!1JevAk9
zJE;6ZRL6A$CGD7V@7qm*o(K80R{_7v*G*tUACH1Q!!)nj$jlBo?+<i_bN%BDU}E2j
z!hhBcfU%tTB_HT4IdQR`%mR?JliJ|=5!ca$H0iMM!6g6+OsdaMypKMl-3MwP>IBvh
zVb6%llB@riJDe$x_x#Afd(Oq!X|w5~_jf{{e5-<Pk-j<mFR>{~ga9*oFTDY%-@N_w
zj1AI_@GcBsj3=p5hjlGV%{+K;WduQ&=6_?6$o`~^-%5Sd*0zM6Md!_*&Vs#`b*S<>
za%yaKSo`0QHaZRoC#ZHgqG+aQ-b3SZEasR%00dPHo<dFR3$$IeyP$@{z0?kdR)Uhv
zR`g`#KsGiHcpktY5`Ap`^KxRPI~`DILpRih$U_CEV?V*LZ*CSOJ4S@?o(n{9xqtlI
zIGPrmMaD>)Al>Pr;z1s@g@OY`K~CPN#nbwmz_d)ef`gYE(ndsimw)Ev-JX=afk8Tc
zpg;UX<0)os5~oBB$W$n{;gUx@w5&XY|2S3#QR1V4=0)Qkeva1quEKS#66rf2q0p=*
zAb}MH{PBWX)D<t1fpIPZ%K>F7@PBi&0n<+2l1jbsNbuH*)ToIb%SLsUzbMLDmXIhD
z%2$l!#t7H9rvI18rDz%{^k^ArV1)vvl6tp3?WZmenNhGA9Av8&3z0|QE{k)tJ+(&g
z{`^7FGPtAbIDYd&;#shzZv`6cSRbqfzVvT<nrXSgxpD|5WrGK5C}$SKqJNF9>0rNv
z!ql)5u5zulOnKY{glgT(d#<bGFNFnaNa3dn^SL^;k%FwraEO~nz#|Fva`hw*&7u^I
zuXaZpvZCQV8Z8#2Ux+V!8W95TX-xbZ`K6po@>WOC%QnHzP&wf2KMd2N>1Y<|+IASa
z#6Cu5u!u;QK}3_%s-YZb6@O_@`t*)VB~TWzsje5w)G2qwN=YwQXwpC_C+nV*U=37H
zO&cM!LG1-+52&T_3PsqW>>=0gCfzPzw=dl~@Du56xjJRVfC$!y%RJS8Uzj&rkQ^eW
z-rh-%{>~x?;iI+3j@}%A_{k)o%5r0A1W^oRM(57c_^Y>!SumGd)qikAj)j;T56_At
zF&RC@8&kM^fFvrG$;Nxl?(DcnAs&LF*+%+T5hmfh1jR}E;%s3WUpvx0dB$rcBGnQT
z8FKKGsw%L7-!RFNd}Olh_>iNbsu8_63UbU7A<ZvG(V9@rHi9UADc%v`>4g&hvC%Rd
z-gVv#bH02^<5SYKI)7+B0+|xW%l?P}YE#qQ`5*n3)@!)*45&w6RMKmAdNC4OpHYSK
zsP=WRKENM_nmK^g<F>ggu3m|V6fmxdD<(@XMb<I3q6XNz*~7dvzv2w^*e?4A+J4k$
zl80<=05maYpzr>uk0d9pY-4a*!D=~loEykaL$gJuR352@e1Ac+UW%}2WYr`pYVQ!<
zwWLO=3M`kKVb+=>+r#9N^J#YdA*;P0Yg3W7%CCdt-hwZqcwu|Zrd?cw+Yz3(HlMYU
za%A~Z5@A84K~GHiv#Tt6Hnyq0j3wMP^<l66^x;HJA|zRv11gizkWa4AnKcmeLGPYm
z0^QjoW++L9bAKez{mBBKq;M9s^}sBfEjtV0N>7iw_x<RxXNMNW>)=EsljwJMj=Ll_
z3W1JAWJ&zmnEB?wQRu~6^(FXNy`neMNI0R@56url1RLDd-uu-xqk*=rS1@n5ps^;0
zSt3#VAp^WOg_l(SQl@2I_<N<d&#$Tb6wvTz7HbZcHh)v{L8Z~i?0s&;B8>uZ|6Qcm
z=ueeOySRFJxdTT8-3b!?#|33I)%TPmu8mO)3<r0oSk98i{iOU|SFv)FkdJkl7OS6>
ziN=U?(}-@8GB=91JQ|btI!tR-Mwn|fL3DxczCXbi_HXMh`JTf74}&1<1uWF}mY-+h
z^m;)1Vt+S$xcK<4GX{Lnw52~`L`&EJ&CLKge|F={@HkTz6Lp;U=7_;vIsFpO)rZ;{
z88eTS3eAFKlsY<GXC;0J2JSsp$9y5+XKl;Tp3O^;KZL;ecIB9j4;|z%jT2o#9Yt=C
z>zjy_Y;sRa21t>mfGVL#?arwNcOm-)X(qhD7=MNApMp(nEf<D(bC|f>n>I$wQcm0y
z={J3O5HCWv&<`t6>J$aZZ1EP@vV3@9aEEoRQl8`_8K20dd*nyoVRsmbt`v*k5bt1|
z5Qs?DsmMN*CtTX6NR;iKL&5}*Kz0vVNdgHJ>c%~yFhDq^OawAq;_jE>Pt3)Es?b>n
zntvMsmO!E8Z17OL!Q12idscziZ_@Oqw9-gPZs^!?u^_x5#IWe)!rNM@s|``5o>HzE
z5Zlgpv4%Zf?7h;clkaLpCFybGz3@{*jV*g<r1tzZcGF%~H8JXhgTADU>6kUI*6&!V
zvC!bs$P)56*c+8*6gpSujCLZRVlz}&MSnd3CV7&MIi#tBjqZs~H@9mn5S3<m%Zd(A
zr_yt!j$Pgtu>BS=W7j6_fc1FyLUD~lZr2UZ{GWXiM@bWP4TKn~tK>hFq;Z$0iWBLJ
z9gsSn9AMVi%4|?zi7}PWGG!FVv)+%th9``px$O3Tw6%?u`j;#EN6py=MuMJV{C|Gb
zEc4`JH5AICIPB%6i=`&;hE1U{<OaK29@Z=mP2F|%VBe5so1iPmd#9WnFu>>!WVb)%
zfZFKR1Q7m^>C?Zh40gnd9Tn&T3MW)==D(4rJiaz?l^Na>;SlU=*^0BO(UWZZ?m=ge
zDmE7Yn_g6iIurpff4ckq>%d9n_kS>Hc}2=aI^v>ELAR9(m%vxeT5b7SrhP#3l%_QW
z+lQyLI{E~sXGgqimD<9Tz@qu7X@_re#*#e0Tw{jrvQYlP+0U8PkUhXo!MmSh=q&6S
zIilRx=vhVc8V$3^)VM4jvGoHgO5dm0AaFv_oG2%!!M}1Y?h2e-76d?7eSa8DG9#E^
zg6Qzf-=Fg#+H!zEd4SD4^*2~&sqkMQ@#Pn4z~*sxar!*+6StyvSM|d;SGl=t=<Fb(
zFA{V~y;HF$i5EXucm3wfh)E*p@xXKSvYV#nPGP{@-W$$DF}uqLs0RedFp|G(%Q}ll
z?o~G(k`!X=VI&Dnb<3n}kAGJSpJ%o&_xxhHvsNm&_y+tJZxP2mee<V(ny1NacX>RD
z3RE!$p9xZyHF5-mNp7bA)2b;QpVL{YDK}YJ+*j`KU%ISz1dCLw!A%!LHXs2@a!qh9
zkVo7z?|!620?roRuaDdTzT=yes$Pg#C)GOcmQ_MEI?bx;)d~ifMt|zdguNX$I54(}
zkf=b`qZ-o54yp%;$`RjdPup^E-?c>Vbe71AZefSAb3Ce7YkC$!w4x8raTgpEhsR;h
zVaf*Z0&Mda7UtVQjx-Y$Y!~KGok=7YkU;Cl=RLO2X8Jc1sGmw*zA*Mz-;m&%?O`fo
zaxHyAoB=^!%0U4ywtvh{v}#+WXrXJV)%^ei4pZjneCiTZFdNG2HKSp&(vo#Vct4y7
zavpPa8Iw4Wdo#Ajq-&W%r)ZB=`rsTfx(q@p;~cEkH|P2YyX@DW(4Dj!@ovPV;ph@*
zyaJOEhD6ce&oqC`V|$17ucQ>p6RM{?444#?7d=xxDQ2vF3x8ua7Gv9H2<&VxA6CFO
zA?jKWc6%4S$?zd715-7TGLp^15u@y{l0h^JNh$<s;S02UdEt+XTf)OX%$L53?m&fE
zx?lE9Q|()$kMwA4^4B=K8l|q&2w>%Oe7QB(C!ltxgU?Cs=%&OWEYTkkcHW|Wfw5yk
z^SI+vFN6`^K7X<8R@9!2^h6j}!ZPXOed?Xw`AHJ;G>bAA*n=vxr;-p7gH_e<rZjod
z!W>wRmcjVLsaiu$9F3r+UjLU>2$lRpW}bP0!-a-jfqY{pJj`}wifWBKVeJTyhx@~-
ztvT12@zKqNDiVn5SUnbo1|aMR+gLjX)qD#L!179}t$%?(k1TJeCR}oAIm1;*imUv}
zsu=$>f>@2x!{U>&OR0=mv%e{1&lrJ9_s?%#I}+s3U+Zn*pBC%|hq$y-(~%Rh{hmyd
z3;I>$&5ZKRD&s8_*$MpbDE>Dc1<?x%2pWiYjtH8n3Z6jgHainR9YtWar7d94!P1i_
zi*gL*TYr;k^~i#4ISUG>-#J!!=({K|Tfh0su#RgN`{LDTJAU+z#&ZV6b9(77RDhjH
z!=q?0I;P|`G@tL|%2jNIM*JeevmE2>sxvx5{8X`~3!AO4-?wnb*~pJ#)4(ee_HdYo
zEe94~)xx+>9d;8!_^>Y$^O9h~%)Pd&Epx*PPJdkJ5)f$@(9XckGl#pS0dt-|A=bn7
z93W$m^oe@PVQW%ftM`kLw^6|U{lYxTudKhxNks@d8d)i2Ur|j~%q9g~7-ydXKB8z0
zokVOd^U4CG(4Er&pnbSLQF2A5){&o<M6K1!HH@7wKWe~<Mwf8Q4K*Z1uR`%jS0HT#
z*ME>yKtpvHaYdh00j+Bkn0CWp*B~B6tkOzj;Dj@vTokR}b7O_)F8R5uf}p4AC}$N(
zs7&3Xubph%?e}mrRmeBtmDomG&1Kaba`;ZuX1?}z*~tb@_f3)Mqy)tw<aLJGC1NO<
zO6M>PhblY4#$@2rNc`#I8Ca2k&L7l#sDEF5QIlb*c6}3SS^Z{BkoW}os9*oS7zr9P
z00J${YmDv;>G#%9-VqOEIW`+lS;xp54B1U?fHGx<F_3t=b(h8&8k|y0p!picmh1b{
z+yJjehM%xjQ)5m}5Li+iS&Sk)RfDWNIg@vNZN})|GBS)COXI!b#=6`-w13oUkAHQ!
zBQBv?AJXUyevF09ZgsJZ(nGZV`yw@|)t1WDmgHVY^DHJi^9Y*_G+fpoPj9?ZrHQ1T
zn14nswP<Ms-QcRLD;8)27{Y_2P=x0g)h?WRizY*^Zx5`>*&`)N(6op$TxRq)Hlz+~
zi}<p)PJmVlg>F`*iW!Nvu9{Z_uYZxV72(O64VX5}%Mvy7>Kp=hC{zv2Zccll^V;w`
zWvAnp{H^?95c~zs8=Bs)BQrCb-SI2W0a#uk@>@6n2X^MW!|wceAiIwh-aCxmQpg8&
z&)6;z*rj}AFq74!24+&D)3but-yrumWR{Lw#d(TaQ57P*3*I#GEsyP2CVxQ7!dpE(
zZPiJv7*g5#vkz$?y8BqMnOU*^8OBSjT&M<+yx6!udQ%kRQmHYCH<Q74Hh3l$n^hsm
zeD!f_`(|hR*cIx%w`Q9Zaxu)$+nJbWY~2mbvwq)fZ0)g|ol@YK1=TV`!pFsSg^c~K
z4^Ew8EvN38xUwVcRKa@hoPSNJN}g6cE)176#xSU3D~kCv-$W71T1UI9p%TN9106|k
zexgCAq5{fpx|T%Ks_(C>z3E9#x)D@dGi>|dnQWYQ({r{Iy4)y)op1ZWRg9CY3*kt;
ztr-lDfO6eLkcus&4Wq5sQiIKrI^Cs8V--RdUDQr}LKczns6^ZaPJg$JDxR-HIzn|w
zrXT^@s)}EK8HuNfrC6}2=}23&p_%UjYqW!bYLV|w+VX-Ggn=#8rtE(=!@==B>xLkX
zT1nM2-}J-rp!mw9dlmSejU&MCr!*4@MdwaB7Hs}<5tfDqcMeNbm*6=*8uE})`+X5N
z&6$VHM!Z|EQ*#rE%YU7sE89Z5=p7sw)9Q)VG%M!|8Dk8b?S-|;{-lYM(fbY=BSnQ<
z3-wcznw^E(mHGCpuIr)d6ReHldalDh^X2>xm&2=jtjrmscQ1!#tFo#$meyQY%L=x<
z<&8^~shYagb@Rj-JTf>mwv9opju5p#iRDox6R)NeyLwD5D}SqE_wD)VjL!0j)iN!6
zXyuB#0U`wl4R|h5YHwXkAW46RytnfuuP2^GqK$gczGOD)jwcge7BJt$E+a28OX%(Z
zKwH^K?1nztpDbiAEDxh@#2;?P!Ajwt{dYZt>*y)(4c%VV)k}A>=PG0!4Odn$=IhLl
z7ZP<Pkk#*2X@9e*uOK7c0+?EG{cSJy7iZEyJs?$=UW4Z)a44BaUkTNBE=<6Z<$y0P
zU9}D0yfgr{nZOFUwRJ_xcE`)4%*t2G%P-1rOKn7<q10rX)Me4RV(!l$r902|zCv5|
zEV|qIj4_WywbNb0zZq)moVZ8hzmR+*7?l@dHKe5<kAFP^Q|DqPrS6mPV-18np+QpZ
zC`qNdb-WPqR1YK$T#XsQHJ%T>9_htTpEijGk(3j#oXf9lbQJt&R&Yv*f;flG2Z{8i
z11WufGilEIt&WL!URwq-%*Z=h>}Z3e7cxRGpNv)1{1P4_I@TL@(c1y_cch9QUgwb5
z8sm=qfq&CjEQ!4gfW<mGG`iird+GFjkcaN3d`3UeAR@}DoSM>7lZHR9Lg?4Ta-JY!
z9JO!Hy;B6$Y#kJiY2wZ*7P~IOh`!*FGNA*ia8QJC3N_o|puI-YT<CLMTn;(qh-@p=
z%lb>U4RGDt$miU9ux<t$dnzQLhfwChGP8YLbbq_8CAp_QHoM0GIOR<=q}mp2(t(VT
zV0oymX17Oybu%@r+9ez=TO*Zkd>73L+4p9YQhOe4)P1??ivi2P;b+YJ&zi;ny*}O-
zbZ}T~{L^U|#E+pi`xR>YofxVomHw?FXE&xE`RB2{Mi;=U))dAa<p!BNSEuf$tRpSD
zW`9uNaW3G{2ssx^9L#lshZ7_3(09cr-G<*>02kfLwOJ;x(H1&4ag1ue@5WYbrO-&M
z7%IBxJa%)8jU?7oCpA#X-&milu`g%7ju4Yrm>*Og@3+NaOxksOHmijde|Z;jQL6TE
z^vM76fS87;)c(?j;4vGOeD%DdNY}wRmVc0ts0=Sw9WxQp>R9xR@LY=Ah=w+3kcvbO
zdN>>Ec=ryes8YF&Jo2P{!#<fEf$Ob)N~)z>y?;JF*UEKl&>k56kZY$OdkdsvZ_Vc1
zYi{%=)I$@vxUl)S`sgze7$t?KPQCKeQ|zTH-yTXBCn!qWI;+q`XH_pD7}DSAFn{gY
z&F$y*4LD*T$BtCf$DHs9>1Yztog%f@%`UDb?HxUlO*9Zcf4x9yIvJp{@xCa!iDi%S
zozto~FBu|!SJPtQ-~dF;tI+j=Z9(tcHil(2EV$FIj_pty+ujz8wrH_@HDR;Y@Xz8)
zlOeA-xpbh9QTA{9^)V}!q6%jJXn#UC5E`Ly%<eD*&lj$U(b3m{6!wDb%Th?d#}xl#
z)tn+2I2rPi1qCL5i%933#K!w@e-_N$hUr&an6)C)%i!hCF4f4;o-<`SYN&VKIbv+@
zI{Nly)b>&jJujL2`VTJY02f3Dr5N#S`T8KhdBZ-*bmym2RkGK~xiu`g-hVsf_>b(d
z)Q2f{yTd2)y--i-no;#?`@WKQLRYp4w6VueHz$uCgN1%&KLPH6bIwyqY{^HIx?nPQ
zLGm`gxM)z{A#4@<@wPa;Yd(*+i@0yco7(TEkKqZm+V9V)b+_y9eYxJRSH90(bDS(`
z*}*uoIc8bY?_|^0kA>IcsDEDT$5ywiPv`Gry)TEx<MB>Ib0aOK0r6N;mdmPz0_69$
z->OAm&w1?KY58=MO`dl(;?wA=*Ecl)uQ~TYhzJqXv)Ali58O;SVrgWR)9W8WE2~x#
zivSoT48vTiLwbSCgg^VT%l$%WpqYl5^rQoN?9t{>Nw|R8LHDCM0)GG^kPL@~>O;tn
zDC?c!?Rf!&4TU2n_@~I~Tz9S_U~;qIwfNVH+mwTYXB`+-L;|;M3J-+H)VACeZ-`-m
zfO)FS`L*$6frEwH#Ikr|Ku!`*Z=h$dcGlJuUpJ2dAMsO$DWZWNG5Y{+^ulwmql|NA
zj@kpDF!%;Y6I&)YEPvjI`=d&UGC>QY^DRa5s)6Nr^nb_g>4K-hA)FQ=(-WJZ72z8i
z3ko3cPXetD>RrJNYB%9`Z}PF9q<!KJG{h_~`=>Ve#8El;atig&#pZusRz=x739R59
zUMh%jyA!-UbLrD2NwU5xKS84<OU`C7n*$rvA?yKV?xv=GCVv&MF;~mp$lv%BrWnJ_
zJFmnJ4~D^u;Q#z2xVm;1>|XiN-B#;6`tba#0Jye9OBgtkVuz0B4f7{Z2gR>65*+dz
zA5d(L^&I_qeGIA{dfpArflAy9x6eqob<}IuSZPaz9*PLVBqN~F0b#O;LK?Z`pnOxp
zz&7Pn&7w_f-hTtpH2U0%a&NWC17f&s>srz!c|WuM;q@$LF^zi;L#JKsU?tVC<m7SA
zh6Y6q2US%pcCQfyt*fa|uS@#S_K3#xAE5i`l5aJ`Vu%YpVc)h3y<DP*{Qg8QZkb=3
z`F_`!s4o{Hl`OLI0>mWl0w<HJ0hDfD%3V5oU5#CBB7Z|W8i2w;hP~ZlwFritGIW0Y
z$)F3!%)j(RGV27oy>M&V3aM;`hQH*LowR;$ATr0d9r27b2rWP|6c#`=rhZ9TZtb2M
z1p`rOZS;mAkv55yVqc`eMrHu0!H0P7AetZ&!|`9&FK3&Ou1iU|rlf2ncBOP}sAeAu
zsA#8THGg-8qy9J?HCT7w3LTY{rP@i#3fRbox(AZ(uYXgf_LEWlp&nZ5f}|K*_Etu1
z;+sQ)h@oV1E#<e7FrA_xyN8|}6Pv)to05oeotcP+A;`!2BR?_cA@P7a7Af~ZW_J;i
zdjcqQ41ZEsQ8Jb0FyYB_DCr58X2?tPC3e<TEPq88tvo*<PK=AH=j2pf?*W7yK|8b&
zZ{90)#XA-I`Z4<m|9NO83txY~by1ZxZGhO1ODW+zqIyP)ey(+=*Xu@XR5Nr65-+qq
zR~Mn!3gInHGgTt_ghAQ>rMa;nv|;~(NrmFsv*|gx3|85#gCaDJuFt0w?X3D6(%R*r
za(`WaN9!eK3WE_%pv+OLDVmyGChN#2@$4dT6$?#?SK+sa$95`btxX{Nhr99t)rw&^
z2ZeGMU~^DroN!`_OId`UL77TAk}@yz+{g^VFXqmWcB9@pv}Hxa=cgY!hbFSjpVllt
zwlXd&f|OEnRhz0T<nLA`iwYVvG1-gFe1AZg`!lsC<9I4(Pn~F9d4y%#q0hr)7VNQ(
z`~{DoklSqGVtI6YyQXdz&WYmdHPWLf_<*O%><KucDGPl>hLmOr!rda=S)lhy?Q}b(
zkiFZEn9|Mz;-{R3d1h-nfT;p1>B1u%fS`%CxIa<UlDY8r;Ol>)!{@W1=4ks%N`IOX
z_`F$RGFNM_Z8f_ZR~Y3ykcL<i(w%{(zqv!|Y}^$WJN8O#uje_R?O7p>Y|Z&H#*H}B
z6(^`;(7}a8a-mr3Zg3~CABa)i40u2@qOpAhCe-H^D?50|ol`~@&3gN36nU!p3==G%
zbLfNs6`NSlW4ZR{`C3ulItpEllz-D9Zc%jTbk4EM5d)X#RyLxF<wcu{DAOyc!CqGg
z#X3{Q_??`K9EzjmQAJq2M~NGgHZDLYi`rYQSJ2y)+qiW3B}tb`e6ZnM>mf<9?0=d<
z=rZ`~98`QlJq*8Wc|Z6;jtkP933ZiV5)yY6#iH+ZHb7I2cpY3itNMy=Fn^jDuk_5P
z?Oqf_TG95X6dswj2CX&-WRg*`hOXY^DGB26IWg#$OJ0}BRhCf$lDbviH5KvdPTqDj
zwH8EK<&4YYi=1?6*HPBByxzr>*vI$ckDzM`POw?TNS}V>Og{QFK4yv^X>y}{Ws*Ck
zvrgXO{Ah7Ywxom^>A?9BXn%cK#ag`o2C0l{wQyOipdnTEH95Km^%fcF3om76>UV!^
z+E6Z?r}%Ti3e!oPTcGu+*wM;L8+EN2!&f=%tn!kk169oDmvOB*Xs;SG4O>B+XO+2;
z_eJpZPYL77-ULHMjW=mYftxiw>$!v4@Aeclc%wf?cJ_2r9A?CzqklLzv=!IJgmC8S
z;I-ppF&JF$ZmY>4Qg*cPyVp~x!=?O5>iVf!%CzzFG2@cit^~5Gr`iHE2zRiRM&G6u
zbOMJ4dPDZn%w8L&^XkcS0v?7)U#SMGPxnnEt3&k6i~ZTk>a=zj<#&p%%dlP%dO^>U
zYoR7r#nN5v-I)o{;eWTo9j3dAhn%XEp1OP~$W_^+kA-Dvz6*D;gjJlcYUDcO37B!Q
zO(uZe&t8)o==eLRO=%1q%7lryp2cwEQ>!Rgb+^KeH>izvR<18FZHfH^Q%BPDWbadi
zvXn%7Mme9?VT_KQg|^a|^`3-s@9pl1>#ak(Go1!@Nr$)4EPtu}K!ZD4kr=1far&A{
zS2tC{f^=t6ZP-usX&l>&Uu#9$>&eYoL$zr$omUQ_rF1#>I*(S{EQ6U^Nx=;Fw|kzW
z1~WuYd?Cnua`Qi?x5SWxt2UsYJuqeflbmtC{Ld3Cw<by(bAoDre9uz#5b8o-$r)(F
zTKhc@f`|S_S$~A~Bhl?f?X`3_jAsuf*Br-hVuEY?rXmc?m}}Li7ZLM=Ey0#17Hb|I
z?vglyT{;&T`xRG{<am#xMc|r21rh8Rc(XHWl~*%`@0(=XZH~;rSqqu%nV~AE+eA}}
zCCTXFlm%Xz#erzbmh;f`(Xywwg#2tkJjs3>!MUdaDSs#Kvb$(96@KUh*5+O-?pe{U
zsu844!nW`L!~yESX@W2@7h}7S7~e@ky?g-00FzDTtc1yzm%<=szs$h>m7!!$@Wq%J
zR6>}&M}$dTOrilkdxMh&<@^Ebt#=OgqfT?3v-9XtMXh<J#?Rw77TTJOwvJ2kzUp#M
zTSa?}>whM)8jDy><bBd~q1*M)k8ko`ouvbB<x&-ga@F7U)pv&)={=4UGqG|HszEN1
zmFo0T<0qWY`Yh~&q)WjwEtO^pKh!)oTTxq$HoyAmxkOH()Qnc~1GwS$joK$R-#S^q
z{c2V94h^+sb^PbP{QlYGmu)Y^_4rCZKnDx}Fn<T}@B0(~b8r9Odruo+MkW8kKYCA9
z`xV#e5qJ`7<y|Ot5xAO!%=}4Uig7rVz)W`rA`}i{Xn)eiHA!Uo`luz~;$XpLCqy-M
zuC;c`bvlxv%apG|RVkHZ-0d4r(wPQDEXU&5GPeN%Xc!nU95&RI1UE8IHK#*occ7~@
zzkdsJj$+zcra1<KDbaZq$?@6N;^AG_tZJ&HYc#%(zK5M-KShRAta1PLOh-;(RWuhb
zOfpV$5H!c7EF72d2vAR4_Ux9Gyw|dzMKZd70A($<hhUuo9f0PS(W2=SEYLQj>XyhT
zJ_-r~a8lJTcdJ{{1D?D+J+)YKr^Xct$$uDs#aR-L;y7`dhL{Mq9-o-Pjd$d7(~syG
zqGk#(bRW_Hq@uGQmm4vXbum+yeq~#m0ei?~w@``ksmU3Z6s9$s9zXSUEGkE!isqym
zTw?Ta^=6eQyuSF(x6mp3C{*CG<i%Rf=YQPA!RU~oWyObuma(DX#VFj=I)T|sA%FY1
z=wm@oc~oK`SeX^7gaoI4RuB{+*QbTTLd4pJ<Oyl|HK}n{eNS3Yu709^re~>OU@~{E
zZ!xZ@e4rJ9RPg(`no8sfo42Z3$)EQakPRR>&9eqqJeSz4N6?C5Ru$PBqEy8>09X|A
zw<2{IV97lJuu;Eqrl$sYy$VHeLw}_)vt!<v3G><r2Dmb3=2Lg!!5~6N`SH)CjSQ2`
z_>|?Z1a6Z?Ko2QIh;79dmS@LOBQIOxyfL5y=vC3xPz;rMxsDl1(XH!~N8Ve0SM$8V
zZdepN4bLgGkras<v@n}~oyoMmu82j5YPTQkmUPWMmT~ZLWxySb@3!kt5PyCAJ<tNF
z8@K0{g#E6ytEmnX;$pUI^-^9lUa4u@+hMYAwpi0>SXgi4_NG%Ac=w5YK>aU9py4!;
z;9BWKuI*O@q;o4<Q8Py9gaG0h&AbF->maTld;M+jq+MKYc4ShTd9_n1?b)vuHkTg{
z*9TOZ(k?<WZ;5a3RGOi61%KjVmw8RW&q!ZfU94B#Cj|+4&myHWr%LuXuJK!WP{MOw
zw66L*pO($773$X}_9dr-=b3ufqUH);EW%b)A@j5kR^P*Zkd6KS(pc;4M9!V(<&20A
z3IITh^tW@){;{?EZ%5wzXHP9ifr!*!_~(}3&A+xJ`L%pQrO>79OMlDGUy<g7vPeLK
ztS0~r<AoAHm`Aj<&lV6UMsyN=zhA{B(6p!QgAKQUbD?=WcV5F6^HI;QP$o946fv>%
z#x>V7Vm$Rec*#-8Oe&qoxp)1VQp|}Rl`YP_X408d;RGWiS7NJ4Lnq3fuvann{l)If
zjgBvC$(}goOxJWtKY#OiyCONdA=n_64?Q*+jmNDN58Yr|QY35rO?@uj?`0#rXXA~+
z(MV(HbjmySp>PCP5m_22!rGLs`U4{i?gnLOD{TXG@96+8w^=$sX#;ONnMR~$*WbxK
zD?JO8iZi1u*PkYMW`mZ@k{RpCOV87C1c<#u#f=6ilp$;Z&wqU3JRe$FQ~c!<245IQ
zWOCu@mV&{d9)vt3?-rc)_IUMpf&`;2IV!-L9;RE1NckA_4QA4UKF?rhN2W9#{F-{v
z)9)4$8)jC$PS70EcHb`}@KaZPl$Srv>F9H+W=OGz5d2^sl_OZzoSNMDA_{38tcwC^
zaG7*s39}D<+JEF{hIdnIGqLaZYWQWfRUzJ&-JyyYe*ARAL)Jl01En{)iyPMVtfsMl
znzpo`(vnBaD7Z@eHIy82h8Ht{g6aeOsN11PI+s@@Mfz7Aqa5M4TVt{?b{E^g8hIi)
zmq%lQ`IHyEZCTVdRZ72p^P&e@Tq5NvB!4k5IJz0u7k}KZ(U|E>2=bBv$<S8mV(0MQ
zQqz#QOVbOZ?$~&d50~$lR3$oFwQz)wJ(%+8$;hS)l4|FgcTHLV3A$|U9=B8rBDMav
z0ZCdTa%9fh`@Z!H=^r*;JJ#5&=58qy>60c{6C)Q4@W-0NF=UZnJok`TB3YgYbni>k
zvB$8TZhwxytvwg-KOR=L9)DEm8&nqWy;pqC)#cY|UrLYCV!`;lCjm6ILc(6gaVCEY
z6TW_}*-?B|tbMX^j{D8xymdQ%QY-NVAhb<wjD}Tck1y!J0zd&2p`AP4<e9#q6MzU&
zMaZ&n2<jqRXuNs1)u@yiACPZ*a$j~r<ZbYif`17O1)U}@AU`vQ?-<#OGZ45oqd2u^
zW{N9H4$uPlcW2_-aiIW!SN*2D-#I2`tTw=g>BD)49%M07+>BRUul2Wi7qLtjUsB`Z
zjYgLwSMxWfR_7GBup71!>OX_Yyoa=&X3=-@Bdg7uIMY&(84RgAW|5TGuT&PKA`^~E
z%zqneMB}=BSZT+4s9Py~yUw2Y-DF>PWzLYC0l%7A_GCb=P%K=F3AS>W2^7oeF7^{M
zk;RMY1sg(VJ`>^+Wfg#Z6@=gnt<S0V%eTfb`&Y3CG@OkU`kJ97AZ0eVSQxgNiWjzQ
z2F5i&VX+=`flnjuu2`)|D%5&gypK+COMjsxJme<yd7iCe&!$AXEuQd)t$Iwg9aR#J
zI)3rCzV0fMMQ=H|>%PkAIQ@(=oNl^3AE5=(;^sOgSwip{&nn17TqvFUW^w9GNHo4a
z2=mh|$twiP;z{}Qij;RxKnR3tVt96@iK*i3W++r^a=QN}rL{uxf>TQKm=Wx~)PI`R
z*TnosbrV|t*s+l^`MvchjwN^Mz}UnhC!mzZ?10F<DQ0+x>IK^P0JTWF6GW);P3&9&
ze5(BY@{Okg<C_|68+fw~HfPq{DXHf#A`bVuDFpit5`h%_yC8b0<E}MY``zfiz1bg=
z$e&U`UdY*^*pjb0CvR%b^hUp60)O)I5CFb1c4W*t`p9N+Y<|yc7X+u<M=`?w>%Pwm
zdvfk$wQ8f@KQ2}t`QK&Df4bPe%NpTq5vjlMcOToVzHYnDj^N|!{{fr|FYqo;Y1?{P
zlB`o?3x)E_Hju23NDh#6F2PU|MSMK<Ywl~rcNI=T$6P8_sc1b_ad0<%H-9}U43f9n
zDKtg-S2Q{@_mk{x>FKRP-f(Tv8a<VgB&sB6ww!$uRL%l?PcA(k($R#7>Y^200upgE
z<tYethicCkt9-9dd&cILj$WRM>X3Jc?Uk)9-Ip+K+IZxY&sYUWA4VKRq3=+XM~ZuW
z<n03l{aN9TG9fv;N=2|!<$v$-iPyMjhCPS)7wC?$2xa9LNCjsB3rMMCMS*T<&n|sz
zI~@jZW=48^#pFiXs^8eaOuSrN_sgE>$|@xo8z(~_*9=ICPl&{Qdn7qK-cGPx+93&0
zd9%pOV@;pvbOPWigOVz9<pxRfG!nl-zI{C-1M<|1kw3tzO2q=Ag@0A4Qs==NNK_-^
zQRa-(1b1ZT1T`?VRg&VL32vEhE?4ycbi$6&3oSbg3x2U)-QEXq+)V!}39A&xxMQh8
zn76V}b&ZiOBX>8o)r2g_<DG?7@y`{%fG^VxfoE2XJI@O1Qhb!%X=QDelz<x7Mvn$C
z`6-ZMiy)wRvZ+u9(tnG15{u9fD11|~C|I4FwBrgm?LT9q+U@7JR=kd#Z5wPN5deV4
zUI2vMg-8H~NIB(VRVt_5RRZQ+$pfV*ldlmA)EGu{0|IRWjU7kTpGTAutWuJ;1O;Nl
z(rghIzfEvT!M0p~R=s6)*_lVOgbLePQ1G_n;KNvz<mgjM1%HRRn5oo-IOC)Uz({9d
zK+G*A5ihUQrXh=TS^TP}NK~-Ml;c*DlkNKa%moC4K6Qz$`UvZ+8YVpNWg8ws-(iMJ
z6!XN5thj3<`<~SBb9lGAXBC4u`!sOSr`LN4X+v>S9go24r<K>2Zj`1@Hchjmlh*QK
z$}6E9*NihtK7S}0NolrMjPY#uKF=Q+aPeF_F*%y$<U<{iMEzrLx>fX!smFz)MZ;xV
z?xxvDF@>a{K<1@Yw(jf!PrN~1MD{n^EB+(ZGA)2e@tI|3?w5Cc=G%U2_XZn&z;+YC
zJ?_gyN%K<nbW>yh(}>JI^W_xI=BY_bt*ei8s-MjQZGUbtwoNG|OTJssl+`cJ#n!jc
z%~Qhex<FsCzH;Pma{t_w>&+ex^P%qJwuvMGCNkdj-^RjWupH#LTJKtxna->eJ7S(W
z7Cjj#m7qeepjvtcmAUF1A7o6NYBHWKY?}=x91(pihZxSqLaH_kEgnqPSfOJDOq<3r
z>#<@s`+xqvD?dw@(Vmc0b6>FvISQ=^5Ki`~%hQKg04lyQ{ZZO34K<+i2F|fpK_1*>
z;Vg0<v~Q{gM#*u%OCV1yz<kg5{jU+(j3n@}Sl7;%Z`Vt2JmcK5M>2VIFV$NIen^Y5
z{$yk@R^v0Na;7l3fZI-FM5H7dcSSC_bol&2R)69$5md@<S#}8V0U>{H@jOMwqL@=U
z-1@RGo33WCe_t+a+0K2N9Lx4a!Vtv6?3l`=FOlEsqOtJCx9w^W*O#90<v$(nD_0Jz
zpxAUNWT+e71hC>OwO8y^1ixN&4}&!w&WhUL#>g>eo{gJ=FY-0cJt<F$95Ldy0eNm1
zZhr(XS?>$8AHxbqz^(f9{ZSG7nbO+4gK+iT{~4W%&9t8H_bqTE>;8Q9bT;vd+X0$7
zJN#_r+^viNO+d20*P&b=HjOE?-CQBOUG9-Fx)l(mCxF2$PKGET$*(sRp-#XnHp^8V
zgE^B=!-i++{9Tg2<hP@dzXJAqOxy^?_5$*R_hf$q?8yIh0tSjSuuvtRtD^<dBvI<J
z&sF+io7q?=1uu@{IdA4Qb=wr(Z&TZy9&pFve8&Z}wh#i-USck)GU|LH)tuvL#AXA`
zoNqC|LvFKcDmDFAsIEAcz1g16dreNgtDY0$zGIzVX3StrXB-6b)$E`>1F$Mu9PCg}
zdm4W(Gw}9TfTicdzsPL$j7?5e9v|H<AOHZY|B~AN=gD7xj{*E6;*x*iAE~X%-%{JK
zKdG($jy!cyAB=ujI#3uM#bjTIl2|-jOSrX1k<8x1d1pg5^H|#gPC`_%&ZXD8>Y9wV
z9(pKkpNGvvu%57xFCTA2&|~FjGGHz+!32M<G;)oj8FU*e5tA!X%ng%{>$$kc3}y|L
zIJ;mB(FO2)>S$`%bKEj{%c6;8>c!>$<>zVo=dhqojjxJn4q{5ZBo@MWfN;2?GzXz`
zK$5~Kat^U7O0)Kl!hx@)kzc<$q$l-N#N&2^Me~{bBU93Xg2dl{rI@1rb{doegPni0
zi49rp*Yvg0|6yxuD~#LajKYGI;I!sVOiZqS#ZF8^y%3CEsYW$EF%(pICt@=V-y&Ro
zbCK1E<D6nNP#Y>FyQegX?90&s71`z3F>q<=Gah1Ho#j!Q@O4Ka7>1;U4e5{^$;*R3
zS`fnn#Ozbb$;E0}rcR}RhrL`V?DKzsrQRV&toB|f>Xo&UVbSqXcXjpFS<R7&RaWlB
z?&K;F$GpK<sE3>wB)xvA-v~aM@hn_Ro#s0ZRIubbI_w9>hpL$Qxlq4SY#Er$;)@;q
zlqoIJYt#h2Leyk6FFP^0>e2i|NR?;4I$=d1i|wkPKsLV`V=D310yCJlD1CoWho*&R
zx2U#=$VSIbTMx{VF$`M^Sw99akjcVX^nNTPXO9LaT14y>-qL*Bnc&%l&n?ISBRgBR
znN$5-g-;LK5yQZMd<{pM{es+D0FL-UpWlEKH--5cZoeDj@%~C*VR^O_mMO#AR`!&6
z2lCpG+(}r=*3+M?#+hmx>(_rcS_lo~Yjr@e!#B*~2e{6*&^bpCD9aNE?o!C)fV5o?
zt~_;!-7*2%xtr{{O@voqr=mjV#TlLtc1uiCZdXDvP~(^ndG_>jabvX<=J_to!8Wv|
z*{8qpHSqdpsbz4j%R<3tCvNV?zlfmdG(z?<EPBGfj-2fT{P#T5$=QFv+2S92H}wTP
z#XwVt|6%_=@;q{b|FNyu;Y@xVO7awkdp0s42A6?kx|ji@)A2_c#AB}!IX@L)n)SAq
zFa9W7rtL$h^$kCublefB<*~nKmYxjzE&jMa9PB1%>vv$$9)4E$Z$!cSECMrdAlT7x
zT+s(GxB90NI(YH-o>+f)iyvxCF2&=!Co~ccq{_qTmj?w3oDbk<0#+*no<8|s?w>`?
z2vn;L;mo4&I+tM5P-fE|2m(j!s&>>~g?^N(Efgqbr)<*oy<B95<C|biJq4v%&(j7y
zS6kOwl+sQ}AyW)a)8FRzk@HX?ROAlUPSBCWWO^e%V9>n-8`*zL$W8%Xf?Ab%{Ql(t
zI3F_+E~JW6Oq##`13T!yA06`dle_-zKV0(0B>%!c{D)G%<Jw=PvGk9iGa)h#eYOQ;
zN|HhOk_BL7vRl&9SOjR*pQJHOU>mj9<BXIg_Le?<OAG6zK6Z0A7J5`IpvT2?g$KN!
zS=>Cjda%G7&+32FH=qCw1O1js;RESNcnvVcHGY~Z)y2~vp}sH@6uPAY@4*H(21x`L
z4AAGIHw&%D5?`#j4Jl*)pZ3nOJFXpD*Jh46W@ct)ikaClGcz;CY{$$PGc!YsF*7qW
zGy6Kddv|B=^f`Tgz%38esP)0mn37&eORGxn)LPTJItYJHpHmdJ0mUtr&>-R8mZeN2
zlDYPRCYn<@K9}8EjEVu8h}pMlkdU~Npy*ZDnq2@pjBy7^EMxBi`#wpEvW^$e!~A*X
zpk3bkfE!u0ICB3~;+r!s8cen4yd}nUmsr>jz}743D3h*MBvb}uVM3E|wDkQ_(KXLY
zwqd=Kw{d@-fQ5+{XSI3tEjm`=hpB|314IYIh%$>b^t)77)xb)D#*ua*vbS)iK~l*J
zP}yx(!0`FGttz^2f#ee9MOJ#(;^n4pjPg(XX0eU-(CUZh<?5so?IZ=PBLfBmD|Sl!
ziG;{^*SH)^b8uYb9LPl7qAcWeh+!W>=S3)!0<(V&aRGa{BCE3~dlT);brEBh_4{+3
z5&Ovt&K^+uyp#iLKFW%;WlZB>(dZarrBPN%n^`2GT1NNxD!R2fA?lMtHGw8z-dga>
zXzz~DpaQiPxHF4ig0W$QgG+xRPCUFlh3}U`!|w)lPAKOfV2U*E86o6~vI)=2qoEM`
zhPi)xXUkh2S>|Z+@)TLO>$!^AVsM&+iZbGW%_QqSvj4>TZ^a#X33C>qoJ0V=E6(d(
zaUcIQSO0n1+R)C1+Vow2H1BW!&>SM>kT~)$ZpbIG5;6+>$Uold2<~Yp%JS-{^U6SP
zLLo%?J#1-YP2$loHJir2>h#<LhKJyG>ga!McByD2H%{)8jt5iC6gpdJ*K*~|q%dim
z_{$r+i80ykO`d0_4L^)L$QbPs0i)g1CCkpZe9+mg$qZ7pyP(UGro}i{_uft<*`?=H
z7l=*F_QvzwqqTE+q5+S}+}QYbhQ`h4pBk$+&FT@5A1_CvLTBp;$dU-e372oST(W=p
z9LOYJMBtZARId3J-oJo+`CxdeOO}w(sS1d)L>lLEYGIVrdh=mI6)>@4xcfwZAEqaI
zAWo;A+~g=&k1dTauR1_DsOyNLuWxUB2C4UiQ_V$PQBvluCvh0@j`37#bBFSS^O^C3
zCzOpVnzYDda4&QtTRi}VI35#+e}8`yla|bj&ooY8Z@G?bRXCqE)*0_MKDhpKE0l#a
zXjG<0V1-iex@gQ@e!u&-^;LhW{8ba1M)YQPeV0e7Af>Xyj+iZo=q6p~?`tmax6$8S
zLOD*9ODw9IV4-ivLq3b`?;9;zfd(I9DXq?m+>H3$HI+~W`qv7cgMAy-Bou%01OMW<
zx>$0R67MF_vJNjd6}m?10w*_;b$W(?bxIne4mzX`B5^BaFi$q`@^#iWq1D}aB73VH
zKj#J<L}H^3d*#QX)2VYxZb!yY2d5R<D|OGR_P<^FH{XR66Fp7+5%^t1zh+R8{-mP#
zFN=PFckuxIBB1|MR<A!i^ecb*SwTY&-mlSrTK4}d*$cmcwVolKn5C|<p}e84fvfF+
zAr}AuP{AKY`xXikGDvdBuczsw*PzIsD}DL}K|mum38Ujl9)XEy!Yx7&G6U*_QH4Ph
z%=DO=>1=f+iD*28KB0t?U}z%XWCs912@~D&t1n6$@4D?OL-=M4rw@NGyW^}qj5;qE
zD0EW+;Law|!2~Np4WEGBxd9FVq4}f30;l=Ab5WMlgSP?Iwq7P;l}$5D7n>pDnETJp
zLx`xM3ke4yLf|p-MBbO6s^UBXoH_u8ZdM|pF(eg#uJyn!kaerVe4Iw^a<&%COwMLR
ziVTGUaetI`sK(v^zq@~ExC3L;2P+ITDYPxAR5^C-sHEmOmku~A=@oL!gJ7PXP)koL
zq(D_D0~d0#l74(XJVMA`EGA3jHl94!+!v5rvPFZ2zPH~&tRpmd3+H3#1=LavK0c<}
ztk4$!-Z_;n>&I^s=9fOgDL3oN@?&s{bTYb0V_runm!6lF*VTU(vNoY@-O0Nh=|m?5
zEP8~1oedy^b{=+8ai7<_^tGk_3_#`C%Ow&k9@B^j#?uW$Qt65W-VNn&m)abFo*>3e
zQCxgm*v=)XFDXX$N^qS?`mI=5eyzh7DVsfe9vum?@-1gURjZ$+E`JwmQ5EJO8e!9C
zL59YMlUa?J)?<H)Xft$UwShP2_5@RP0)m)Mj89Q5rHm3&4yPstvPfFQlpLlQ$MZQD
zDz<b)6eOhcj$PULy=y)Wn3lpRo0}o9t$h-Oq0(v#AD&ObVm1!-J5N_1Cne3(crhN8
z1Hzu2L@Z^aF3z8w&c0j~^kKVSSqXG`t63(laU~=tEp>lbESa(H&NrXi;F%A-o}(4@
z!tpb8R?_kXT4dbatDJX7db~#iMJ@G_sE$9PVnClaNpt_a&hC)ZvmFr4{59kUK98r6
znFBJ*%n>ri6X|yV@M`Rbd|~j>|D2X+_iuv=_SZp0|F2O6@jjxU{{N`@|D)>vkE;KD
zRQ>b2FvEW{j*2{#RNMCfvV!|plNm#opD76yt*tHW|J<nL`f7^*EPsx!UNv(&%qE0a
zYULB`^`ga@VLLXWkG+Pevm7xNWlB}05yXkHNes~2K19k_IsoBB<z-j*@DI@x+GHxC
ztUj(6__ilyP~O3USx-m89rR`za{SV;xrpFuh{Auz;USbfdInKg`4?1DsyPO9p@ngh
z?ar@=1sxY;Is6nPmKlYGAHunkVVJEejx<0b%F4<h6;OVZWdU#_>2v5Yh;Cmb8<j%d
zxP6!=!O3UEY7Ahg%o?ip>lCFcPExZ^pHR%Dcb~MP%oql*Axk~a#m*zdsB#KH9Twuy
z7qEXN!LAU&i0EUJ5DqPXjJ^&{?;mLQu)Q3N*dan%#=Q!DaA46F+wVT}#NS`e{L;m>
zUhZ|-{{zf7YSt6>86lBE7wGzRe%|i`T?iH=kAjVnu>NHLks9(t<*?o$VXqZ(DSPDF
zINSY$dSA~o8!OuJZfJ8_5Ka|h2`&#wBWi!8w;@xE^CGr`3n&G{_yl1lPxhBE6AW8m
zCb|U)VL_5n7rPK0?Ffg2k?~KHR|)ta3dy3uDRv8#PKo`<J>MOfEkI+{K-Mb8z$#>-
zv@<(g>}$R6a~gU~HaK@i%Q~n?q(+fH9)7?I5L2>+v@O!ShUAt+x+d)dAp$bPn)ZL_
zV5q1!cV*s&{Aiys%s|YnP|@P4yY<2r9ZKT7Gvm9<BWy)DsqR{u_bsnxL>f#+2RweD
zo5{c#3rVmwDD}LPHe4oFB0;ReWRw9K=a?U3`$;`X7GDW@9A!VH=YTXa(7Is&orsq`
z@*rH43{FxMF@K<*fC(l<+&48kNlbr?RFaodM3x#0Xa-N56rGW-Ff!q`8*bY-0kcOj
zBH!u>IHsXZfVNB(s0ysWU~ZfJK2K#~Kv!2Cnt*!Kr|&y_;dC7LTnVo35DufU<)(Fu
z^HQNaRtKB0osjXd4}XXR0Q4u5UhZz4eK~|u*&qZV$ny=x9?WMOYHU1B=yHFwLK&IZ
zJq@j9Q2!{Gc0}~62<w{cC|Ksw&p=^BC2W^~1JK`8IN;{_n4J7A?kO>gzA3iC1VYCt
z2SEkXV-qETBw!tJ<J^HA0YTFOv4=I<rPF58u6jQ_Z*(V)MFti@OhKGE(^Axv9ak|V
zWQh+Gh~gaWW-XwOJq~<Y`XPVHM24A)6Bs^=fwg&!<wu(hU!sBdiB?UZ4-F43b}}iL
z?VBQmi%#~pCMF>rh996g`M}L0O=d=O(_b1OgESmDz4kUvtv(U<>MKHw-~=>(Nvo1e
z37CAUS~_r;749w!51@~;$|w9TQY((8h-DxZ_huGjRUyZp&}`Niw!(jXpG+Q$Y%(&Z
zgEcomk5zF1U!cZ6)4}TNgF++W6i;F1&sy<GNhveNFCTHT4orKOyJuLvbEEP>R2F(t
zEB!K9#Feh}TN^c_E`IbYe3gU%)qX?n=b~`223~8j4i*D7c;13FgUQcoUWfRqeKk%d
zRel;rPq<%RUO&cxaD;!)zhGBRYHiFNxKJhI_s7(g@dBhkWl9`zbI{^WQ8f*RDMnzw
z27uf56V445ePB=z!?qjaySWB|D)T-VZ}`%2U-n}TO%O<(Sb{_nq~3Hf8MEf-Bvqdi
z=ZFJ$8hnNmyf+pD4F~;`U!t4=mAx+B23KzrB1d36NUo?(K0beREZjj|G^W?U0B1(P
zL7nv%3q5hvs+FU9jw^j)W%78!QO)nOk&NVQ51%S8e0{{sG5DT1M5iEBvP$EeA(89>
z!AOAyd;{%{vjBo^=<d~>lI~tor3+>{4tUy4WIT*@Vg@5Kq2o@x-a_843vi#t9;M$D
z0$*pzLZB+5FMWUOy_T$BYNm=qI|In~(;LM4`?xl!uyXajZziW~QOOrq>rhl1eWp9<
zG@?oAyas3T$>5u8>05ntWY9h2_?T!JV40Wfw{5a>RbdZUY|RCv&&)mpVCY00nc2*}
zR37SPF0*|Igrmso$urq>aQs!~{zlZ>k+bsle1qmWkdlAs+QAYf6aE{vBH)MOm)x-F
zFO8h$HukD$eK81J%%S`<B?RVXZKaxse6rHh$TCV_`FInJ(C8H?Fo&d`{Q@NEDjO}t
zVq2O7S(^3|ljB<W#|Y^R%s-q;(2}J9Godl?8|`EOOU;O3T+$1jHziwt?Gmy?uXm2H
zKm*g+b%uYpSLEZLVGX43Ah(8~tG^0>u~$a4O*+;Q3PM3RN@q&jyMrp~97Q8k$TPYW
zYvCRy=?hlUA2fC2_DR=a+8A?boIBxJT{%Gv1q6QXh`PHt&BQq|X}|KvX2^^A-ZXLz
z@p<atqYNW|c~c6I4c3ejcaWE_zDW!P5Nkd=7IuF=H^VS8I|)7<QeA`u{yt04D$oyH
z2GGb4epzyoQ@y27w{yBG$k|>w)DSn|XY4&mQ<M^t5$@UZe4>18`#`;2-<Y71ZDu@_
z6XM@wj{PRy2Sew8u(?vXqi%#SG|4O{r)q|pL8+oes=YzX2Z3_vOZn~0v=^*-&%)v0
zf{1_7ULE1i>?2i}2jzIDF<XaS{`8hjq+)sB?|R-qq+fu8j&~i7tvWWvoN7)wKeW!=
z@OXifP#CgXejLM6ZFwn=mMM1r#t)|z<anREHm8aykUoyU&Q0h|d)^PV0sx!vF@PS$
znXAp~!FX@neG9}q)K#-^P1kDCL~Dn^;f{Zd=#b$JcJdT;e0)Ty?Do+QnH%~G+5zf^
zTgTA6Dq2}9de+ycvp2;W{RfV8V=#>m7q9k_(G3l3eczMn^M|`YlwcVAZ7KAM@zfe%
zjMBsm6_nOA6K%ZrTnxIAPOC|;cRw!svdT}dM)@bL!bsZNw<^!oBeyR0$-X&fbdP_q
z7-Tbloijl`1M^~bPFFGrwp`Wk-f5aHVPK9&8<&eg#?c+~o6Q$h9UN29s4H7voLQRu
zUK?s1g~NU95CN1Qnc%QTe%jRg8P;oH_rX<C?13^>U42?WC+gVclQ<u;z;$`$-9}vK
z6Bb+LvXK#W_OXK8L;6|X)}B*i?CF2x#Rl44OkiY(MS*+cV%b@;75ANKixJUWP00tR
zp-D>0*&lsC12Jw=1v^X=5RbY8QUD<KA9g#u)UtJTY6mv1@3<*)3Q!Rh;6zYzFygj6
z+Uq)7m4_E8gUUox`0oyL(8{2c2ZXE1M45*7YAPr&zFU!WxOFM6wwl>KeoB96NK?$S
zmfc2Boc5-pSnl%KS%q9aDJU1oi20FmV-+qjZ^9{U4{BP|B8zADsFXVdRCh{Nu`~es
z#lfmKnz*Z(Ot2}`L{q7#RB2U!wQh6<l&}1Gm{xi=gs#?GU#3Vg7u3BqKut**Mo$ZN
zJ*RGff!e5;Sv<mxc_*h^ceQ^rksKOPKZ9zB(gc+l<Ipi~$jbzX2^r*@=}QM7fD-Go
zWwf&d+YOe6OXuh3Cvr&<weWAq`!_)4ROc>qys(--;4^^Jw>Ch{wE-z$US%x_ISdex
zH9lN|uON5mP0!Mg5@7H2GTSN@ni9wcO&I7zGUw)yeFfVj%~^3T(}sWEaHUU}f}z=b
zcvEbP(h<ZnawNR9^86OqU~q1@`Mfh>q?}n=*(?nk5eR(B$|mE?-75D2_wPGb*T7~D
zjg-xBI3NH3Ptd=9y`<;p;9&jlUrwHkVv7GP|IQ2|A+t;e?=v=3k@P6LK92TTiQ+4j
z0JMlWaidMKQ93^T(R_b2_mil%r!f-Q(v0%Q$qXZg<OeResH-8REggRPg>`7hl=Q-(
z3;y<cFY#q|ab^TT?1LiN{K)KV`!Y(@{C$TMwYMB&5@OKhIz_Vlk4HCmDc2j1R+s1Z
zTVM&ZiMo(?QFm~x4d;D&M=hCUsVZG|omqsI1o#SJ(cHbI+wy;q`@~v^S4FbS_LQAN
zI}GMsv`1J*_{wg=n*Jf=hvE>7Im(LV<nl%eD6L1;Gs{K(a#8FRO}5@u3EFPM2MY_y
zT4iscl<H3MGangKn(@b=%&L_}Cd(^G#i1yhXr}k9NspLfL+W=%q`9_$z)Sp)rK(yS
zkhq}TE5)3um=}NS<+n88s@(a)JgR5fi)eJz2)5drLZVMr-Ql;3IgjhBlwhu$FqCzM
z1e8wdrU|>TcIxJZA}?dWv=?G7s6T@v0p{GCJ5k%U9T0Us61!!E*V7|if5Aew!G6Z?
z=B9xt_xMqF^YIzHe&i7+fbn1sj3f!-bi24C_CnMY+HQYmDB^Ll!==f~GIKwbMjh~_
z%4byhauN++K8^%<dy3uueBDO8Ix;2*Xi0|{>2-dHZU|+6*C89v1t|rrEgbUAz{z1=
zj)O}%%Xz&$$a%^Gex7EQu9`aIAfhFyFHlJ22dbxD#R{UK%U~b)uh~LOE533tleml4
z0|Nkj0tbHpAozQh9ZNlHmp?MK)7aQq+Zft8m>T}EGg{Ty6O*kb{g=k#6(y{fgyGw-
zREEnw;6X>EV^jeWKp>(*OtOKcaG(Nr+OZ?55IKi<j^~H2x?jN2c}z}#XWs$b25!C`
z+9WFOba|!=jf`%kTDPMY4GL+F2>DhCEtF@!K?{F337JxTOQw*Yb|DUDzA&|sUGcX#
z<BN-*RGt~e@h9(3Vx)uU+Z3q3Bkp&qE3FC$+{gKDYy%zsDE^i)n)n8{klQ@nRUI(?
z=E)Lb*isD<Z>3V_XV_94VEeTg&<SZn>Fnjg(_@nt&lJj}BgM>qscd^ULBpPyb&iZs
zSNeZqa=6Y;={ZCVl#$dv624L5V`nkMA$>rcKB#I}3tYt**}?9jQ%9_O4&Fx+XNk})
zbPdtR@_+zPSng$+EO{%jN~P1uRhs0g(!O@?!A<DdtSWc-JpZT~HGG3HQ8e@meoeZ<
z)PThVnC2j-ctoc4lV(|FPZ+^4!~`q-jNO0Ay}^2Cry(>C^Hhr3>&A}|mX*f91r_Wn
z(u>ja&Fc7$M>RS;_s{U5nOu6q&^wanST~$eggn+~u_I+TJsWtq0L|EQU-geTYTX(b
zO*Tg$h)1pyfhD!=USD2Uhq}?%+->ilb<Xx%Ub?wov5ZB6M9AGc;k?rGO&U?+^OAq=
z_cD@CSrJ!dG3K2{age3zg_Fovphp9h2okG<&G`A$=+B?U5aQ!{)t8huLZGLTx{{Uk
zXF+K|#%Q)DB~ZnU7nva!SdeinK3sH&wxl{~5<ct{o6WglC13M7RkKd@<4ti%1V)af
zf-oCG%UDecj!~QCP}&yR5v7-YkL!P#I>rek*%TiQpaBNGNDcqit62rop@J|tZ9}qk
zCr(gsqJWPrW*rvHghw<JSISp5qy15oo{3vO=s0#&=c%$1n#ejNw^?anh{GI_g)DRx
z0v#c__9%SS&r!hKpPlBJTvo`CJzY8oLK6H%4jgm<>)Yh86c>C)ZXE-S8eV^cK_rrf
zR}oV_am>9q)0b5@;h^Z}CfTPq<8QCJseTWTbzEUo2{VZWjqVPB;PqT0vW~2NU(8M6
zS4M0aSmuUh74!RULIs`&f^fkZL}-4<arNdo5QFv<SWunz3O?f2*<-am94zbfGOb8s
z%LJ?7X0<AG{HW!Y&gV-UH|l?a|Cl0rrj$r0ZQx<_8Hzn>jYEpJQ$$Jhz=WUldTlG&
zTp0*EgCH<qwo5D`KPL}WmlIM-%vf2}ctVnPTOIVn!Ap!7G*fgF5V5wVD1e^`s3$jZ
z2fm^4A>w>m#6Ash%Kk6Qi)IuL=YTHGbT=gc04dcU4@Um+xY5AS$<Tko+Q!DvKwHoC
zUymK3WV*#a$oxCe7WQXQ4FzjdoI*MdAv96O5Z)F16-{voXJ<;hBDya6gVXnyFyH59
z_2%}YyDk<l)W()G_A%GZE@ve}bSei#2Y848Vp7T?*j88oIDR^YbB!+RN$}RJB(i={
zzl=9egWBC6KqBL529AFkzH9IRIBU_uUsy7H{0pt@#N`X^$>!0R?nRbGobcd@MWyAB
zzs+?;w>M1uSpBhAg)()doLy|hjw7=GNM)iE%Hf-2FzRi;MVouxbIOZcA#w0=Y<_r|
zo@Tz4oy@wTiAwfGEf@Pr7aE(3j|Bw_>l>5o0+;vMj>*Peh3bEdzl1DSR+R!z^Ztn1
zNV3<HD_3+iT+F2Uj=QHv+hOJ@?FW*`IM}0%QfH047zin}mGa%7v)l(9-j&QOuv}i=
z<3b2cMA`LRAse=rgK_IyQN`gf6xU0P;Ov~RQF3bR6?;LHnd!7Lrjs8P!kU@|(o1fa
zY+B9KEFM(N-q?TPlsxOQ9f!*@UkF_=#?8BUpMB}%n`g3Gr-CDh7``&(wcK65%CTvF
zir^z1WxdJs*jVnwBxhy@V)nb8SkvVEgsG;c){}-38iLhCOq`TO9CW1mQTOcW+vAf6
z?}hKf$UtFXVGC#GW3T)XX!;4#CCpx*%!`}>W*Snx!DfH;?d>ftkH<RUN7z`GX%D&O
z@%1|HnEj^hW$(>5k2BAz^g>a}jyaD>r;bf`yC*eOZ`cTN{0!pwq0gFX>}CtT@$oZn
zmDL@+J~IvmTQI(SCW)icMnf9ozKXt6hlh*Phqof_#E&$P^lh!JJqYdem$z2OT9{~<
z<}FLKG&Fw{@+{xcr?l+FWjmIJWN;-mDn|SFZ3;;V@Ko(mmBn`*6|LAarM({w6<Tyu
zNG}@;fS7u;C6AA;wT8Ups(ws#NgjEan3z0nW$&c2T32?PprKo$nw73y&JTE{tyg=y
zHI9soP*YKPNR>2F!eCF8PxCw{MTeZXq%=6J;4FWrmpVH*@wk@}%!fGNkV5P|n-@tt
z7CwzVm`SuvF2o?_$FI5~AKs0qGk*S}9yJJQ(dVwvbdWg){;hx29qZM}t2M1<KKW_8
zc>8@U9JzNOP<JsL`^65NRg+`#rkS^W?K*=(4BUG*m~M8zR!Dh`imtlYN_^>hM)8kr
z?{9xV+u!HW2|s)YQse%ih2-?m7PJ($WVLju9JPAR%E-vLb0Wh-LqjvsU^h4j_CdN&
zGJvU*&{SZ6jY&YDti79qgJUFvRPF^cm>j_V`zft+9TSuC_a^U<MQefmDH0)eHZ}~6
z(k9W#mrN^j%RQIIMmLtxNPS~elrL!L-E)8G_i>b8pSV<7uT*4UmR{NmOSb%xrvekB
zxC{!tmseIC9Yg%_{IsOY%gY%U7&M4P;sb)oM;}8lCyO=2D~;$`Nsa5a%$9<<dYRKq
z<X;`5jI^EtJG={&9$7~LB*j0$Czz?ETz3ZZ7h_;7zsh6|?X9+)d4seoUxHE;j3IyW
zI-i4nC$B29Yd04GK%`(Pn%jj#$5dCRiaSL)gC4Q-|8WB`+uF(%mo@4Q|Ey`6!Z1Tb
z-(pMRGJCa{ttIn8_uc`A7i%o#b+x8+s=vs!>BTA^D^-B4mok8R%ni`LF0ad~9SV(W
z+h>D1^F&BOlbd@=T$DX_c^Vq46Dogm=tTuBz@tcC+QTp7hlG@rRMg#E>Eg#6`%^x3
zVYVOY8JVXcFs<R)_jXQur5J@<1Y>aD+XFIiX&?v%rX788-c`4M2s^`LyEM93Ry%B+
z1~?XBXgIH^0W0xgX$gf&fMV%{6#Y82+dr|m%0IZLrzgOOvYe!$ja<zH@6>;rii(mC
zGmI$|j(c^_n;AC}nB$F+=hd%tqLI@<R~L{kWyMUrID<u3$Vy9Vzs9l5D)$=f{OalH
ziO-+k+iH}B?Aa>(<~ru8G*OOs|A<yb(ua>$mJSoP<jaV|<a~JaUWS;csL{}Mkasn@
z3oSF7gqYaJk7X`Yi{789X(@jY0oEx9r*K1WW=q-%3nd%s3(ILvn@DJAU`4h&4{kk5
zrXWy>us;o2-=#{4mzAE3_H9soY!Q&B4qRffTJRMZKVtG-x$Y~wR@j=34iay!^jcQd
z)Lfah@wmFQwFa3mw{>)MM5c-vVWj1GQS97Ps@{a6rq!RfoPB7K1c85Jy<2eh_ulDO
zGRd&7eQluFJK@=;q*YNb78P}9@NCk)fAbq;eo2?NnakY5;BNB5H#2t!fLRuI@|KsM
zoSBLLIOiuM>QDjMU+BhTUhTt!MdqNdzvVurulm-vzfZ>JV5~)shR)2a@n~PsgJ&U(
z*IipkcD(-@A(5#Jto(m9HYHQS9WPJeY%)b53esKH_{Z4l$;ruqP~SX%&F2+iP9v}{
z%xT-(+lE0$)-Fu@`}-=SC1b`f$ZW`6a8ncn6+m6x-M%$Ls3;%Bj5Aj{^niQ?d$5<R
zsC%HPbw}%H3waI?Pg@{c5uX@`(x0OF#5EE=OadMEpI@obRsw%U=#4C<VAQu?g+af1
zoybd(GhYlRp<^=8P-@t!u_5<a6|*@*(v>1C`Oy1$kpqx*kA6DqQ<H|RJvoe36G8#u
z4j7ATgL|MP^8y~xl8)f>mL^~{nuKC3O{LR2+R%G8sP=F>vvF<!-uxUH_cW9n!-J*e
zJAImv%B}X*_yd0o6E81sOXe5h+uZnw5uUr{g0R#G6R3?b)}jnb9}|NK5xL;p4Wo&m
zv87)AJCEq3K@h=~Ir%krGc&VlwEDa>i|4Fp{!@TZ!TwUp0ofAuK~s7LItGFB>Z^6T
z+qsIB{OX)HJ97$(G!}3#vL5<_+9ybK5|K)#fntR3X)k}z&x<cOM_36#WR+qMB*!iW
z)iawx<|nAGgE_C8dN;SX40Ln=5kkHA+CcL#c)&hZZuL-!*nL4k1uKCJQWAhTT+f<K
z4Gni!dt(XyrBr6=Y)r)}6<QBk*cjc{ZL<P?vX!&AZ}_8dI=F=zdG#wVGjf)e)LHOj
z&h{sns=I%s@s7z5H;2c&RW6AnUT^IOLU}gL`g#VrfDS3j#3#BU+f7xK;~0GAbmepy
z;hKViAx@uv=rhDm^?Ma<lx`hC!_(XwcH0D@|EM0KWAypXCyoZ$Faqy~?-%TtH>klc
zMs7Dg3_|iLB9RC7I7^r&0R?^`OS+!c+1oeScBFr{a2mEZTNbQ_lwx#j47fb&TdkMj
z+oP8;*Go^xS>8MdD&si{fBKosXP)o&{if9M@jsG|5=T>2aDO<_;8Ywg;nGfK!qHl(
z!whEIea9mwCu{Y3n3-T#{g{+Id-PE~V|zQ7DA?2`K`%uo=g2EWnz`u=-~H+EO84e|
z=G1?2C8ztmUv!8>BOB0*n-A$_DN=-;WbLAH$B8ppt^|f8z3sYcM+Q$ASc{Ew$oq}B
z3f&oyOOi>M0O3m+KVIMyL(W`4m_cjk9Rp|xf*(4CH1U@wIeiD0q-bA!1RGdAJyC}2
zDR;OPWEuK_fwweJR@R0FJXcv`7_3p<X#{_p`U!0frdlq`MO<bM9-2)@aY!JavBY95
zEJo{sq79ySLhuCutfX$UB~$<e_^Hk0+-nB}pUlPfdoMxA4Aol=sZV&XqjkJ9^>y4Q
z(ndkX_+GDy;@fn%Vmferphl@GqRVD)D){Gp08hL4^$qn2yxQSF*B!vpMvN$l38#PG
zT-u}6bU)%&7J;^h+$0$H<jSMGqQVFI7Ndm8#oQ_>+n@r(cmoL%BE=&*p30U;6vSPl
z@`WejxgO&suAGH>Q-?B=?uGb%2Ig>?v_q(K%lV|!&KaE?m&j%&$NlzT_Hafs^+LA3
zINRKP4S*;k&QK(oR9iejJwug2U*vy)I7_g<VqZhY=r44OUd5~$SpcX=20cPSfl&ug
zdA&;<V+w@@D<fgQPC!mW!^6fFoDZ)HIhL{tEDgvfF3qnC><vx^SUE;X%P()K6PmE?
ziu7?~yl+R}r=YAcM*jV!pb#4ygntGI{&WLMaXIHh<>nJiUHmZc?c;iIZEb%+#vBE;
zv8OdYW<)us9MQ5M=^UzXuxpEDV8FDZJ4-Nu<?;EfK%L?B=EN-_HFmnWQxtkoQ}Tip
z()Tr-i|(^8nlLc^721HXx%v5E`y@8^&*70QcBhZGjN^jGm8XPJ{`pmvUcn$}@XaS9
zQa->(s2!z&@X^qXAMbg2KS6)5eGLB$0|#>~y(a>f;>iEJ6+)<(W@%~Z=>fuZ5TO&1
zKc%ek7TApdQS;c_N5B}_({dDh-Pm|?^wf8e#7^z^Rh1v!2Y9_2gQqGt>h8xFFladl
z%}DpR^1@)Q6xg>G1?~j$(pE<|YXc7ta8_J?zYw63fI+}xe{7WNTTXugZdD~sY}hz0
zX{(A8XSwLWCU$zGLKcM#NBN2nM%*Hi8Xn&`tmP7HYRP*c%25qLU})mPxqze}((3&9
zdN&5fWMQWF!xCTVHe<Gled8G65&Qf5D=RD8L*?!4$5d?>h;EWm0UTcd(DEesG|2)y
zAS6Mt6Yd9->XIQGH~W9sL;DC0AhqP_>9Ud|htWh{=9GO9iNLa`Y=(S5gSjo><t?Vo
z)#vUI(g?obp=IUi3kn_$mdl&rGS}096(YvOSWwi}kQ~_dj02Mgl~nJ``L(x`#wack
zk^2vV%9D^y79;d@ZFqdN@TB%)Tdt5ip{N4{1y{hI-dShe+*5z-t5n=c?-Yp<Jvbh)
zJ|4Whv>^k2b=I)u>FRS410n~Q!J2Q}<g=ur(l|x-KB+A+9R}d>p$RL*q(g6oCBNRN
zty&A>lzHaTLfgbOKP_9q#bkOY1{%DN#a+SNYLODp!5&lRh^zNI3$XCaB}SPE$+*Bi
z-dtm8@3`wS{sez_Om~`%ug!x;KmZg@3eFC|5mi5TkCIsvR|Dg?*(#`a){tcszZhDJ
zJG*82LPib-&bhvOWiCA~+tZV!!oYX8Fd2QsPp&b0KW8s}(|z^OTaKPzH0wZy9fD!T
z#0%yF155@&jJ9s=;~yygMYC?@8XFs%8<W=&qqh<`R$YHdbL4F_^P`=tAhTguzZbQv
zd_>xt)PsgjvktcRbpC80+IQ_#?yAoyZ4x=am>~0CQO+7;_7g;Ph+jD8bE^^J5yH8F
zvyB2E1sHsbZurUkFLDh(0rTOd;MfCg7cirZh|NDlLn`3D+#hOX0s##mClnovM95+)
z5Hb60WFLRI;|KYLXA8>`k~pXh_&9-~urtCsmyz;58e`AHBsfuk0*huT_)n87>Bec*
zL0e#W@IUK8+$lyQg7vyTNyBsy_*VPrL69CX>D_$-0Ee=8j5vg!XG;=nw>f4Pp~uY+
z1$xB*h}ZX5l>KIZU4-QL(zn4T$ov=sDX4`u?Nfgw=5IW1gy!Twvpq2!o7)t$tR<fU
zQe;bSG_Zm6T|h%SKCMTWJJ0Q$Bl=UNNR=2;g>L~;9#XC$uOX?JG58%_;pPWaHB$@z
znzD0BoyM+K?EUNzLnga^QQ970o3}~_!j>bZ&Q<zk3|#>&G8u?q-;Ueni7$wsuECs)
zuC0HES(`tnq*%31Jm%(?aept%;@#uUU+tX-SF^aK8msa04fULNcZ%nr&8~n|K^XY7
zzKd<MBjrXeeAjO}Rg|}gcMD7oT_S90Fk_cx(ydc#SdKEf1tq)YcJ1%Gf&DpNx*)`b
z4TppW9I_ud0Lax>u$j~+3=2L>8V$dbDWQKC7FG(&_+@*#9z|Yw>((D9Ag%3-Zw$#%
zqkU^LkiDv^nk$DD5BXG4J%ErnNeULF5LRw+$<lT;GZO;?P*Q%uke&D4?#|b*U)eon
zJdKUNN6<4e%IuLZd{%Q!hnw6f$*piWns{_&ftU0BS}2SspTi4uuGL}i_)6dIC+>g6
z=nGFIq@$(A7raV3O@cXrso#~XvJdq3#SndEFwa0W*{RV7YBT_a^Wni;yc6F;YT>Hr
zZL(t+qET^>E)N;@(m6~Nk9;bo3tlR;bx2f>?o_sHd*yl1TA5eze5n=%3+qel=heqv
z<=EA8`8GEn{jTPPG7<)W4q;j%qUnEu$fRQJiz-dii^%YB<j>@wUy4gDK(idbmr)Im
z-pbViuFl#oc*4SODHqhye3t-5WX*W=I$gKxbth%k^n1WbwSkBUn-5Gl*&yHOw{R#<
zFqopET1Smrte9n1x9$zRB@wAwo+-^cq@+KEZbQvd7AF`B%u9cfrA#4g!y13SQ8-`C
zH4hs6I<8<_WT+Hc59ghcB=|y*T}MEx+dA&%&n0Gj&gyz^OD9^+URvR_Y5ejqj`2;u
z+&)(uv)l!Hom$GR9UF5UyyUa01@HwXyw2HYJQ=L1hbKH_Rg7!_fv8jgKcAA);^G{M
zw_#ssExXJqRE^hNr?J*@Loa`=Hg2j!eRrBknl-s$ba5HefCv6ZVwk!860A_o@M##&
z&9Fg^nY=khM9UWA972(ax@U+<qef7Ea**!Jidh_CuDnQ&Y`PKxkfU9K1b+ToReC|i
z$6jp>?ymWuLx(|&;*vE~tJgf~^f(CzGz&63p+^U1K|XkjQB@%KuRDL>QP=2rIPTgO
zygV8APit1aLAtTb$+!9iI~9wE)10{iJ0J*GWxN18xyDBI+Gh{am@VM*-IH=*23kLu
z@^t}R4H(v>y;Fq?c0Z}!iR76P%_S%A&`s`GJ;>lPTH>bF^G0gBW6>%ut%;By%-GsT
zGgLnZy<O_&Ckk`;c=CVtzT{cJX-M9Ttb3zPW~JdS;#SB>O;OYn>L29QxwGX`Cnu?$
z6XHrO;(#f-S(^4@-;@m|4?m*v=d^s0-I+yf=BVeng0De8h|8=^f)ScjO~2|nQWvr-
zPf%P)Zf`5T)@WC8@?uxB7jK7SHO?r}b_oplY;Ql}-n~|9<|Kb8GzxCg7g(+^2n&G8
zd$Q`Ljf(}$M4><+iL+W$^+?;^+-MV=#LnDl<Yam3wEj9Ph6C1?wJQe~w&<MW8;6T9
zH>M@R^BI@T-W-ErFgt4CDbBvkB90b8G#L;tMWxTAdlJTu_e9x1%FqsM?en)gYD1QD
zni4{Bs$gPT#7=+Fc-Iv6PYS1>;qI!cjBH&WJ)4KJ07w?wN`TiUo5vdVPQh!m(|FmY
z*Q`l7akLp&XrWWDeWpCh4pBprYSVo-Og!0ey@vFS4b58sBfpNe14#0$e`RKd{A5si
zgetR`nF$c~Mf~)pKsYv<&QGZ#B84dC^Yr&BZBmk8x~_jk(ZhPleidy~WU5_@R+hWD
zFC1tU(EJfXQB;xFh{8Izf`q}J!6_>*(r>|(?Xzk^j{~>y$TD@~O{*Yl#wK*1&kDa7
zaW>;)W0p=@-khsaF9TSf^}H=Or(fI1Lb0M%nu*fN>hz?c_!vs<R^73am94F<fnPEc
zqv6p21X+KoK-ZT>q}qH>`7C90BDMD>QM14>QFAJgJKw6IA^F7;uFf6|py0x@-4^IJ
zUYl3j5)w@kpq6i03cs|lriE7#yVrjsC1E;&XK}(D{MmAR`jQkN+U@?3M6<Pygz4oo
zx(DVL=tI9FvTpz08Tg)$HNv<285Fp-uvw<NFvovAma|TZfIA1UfG3@ok5u-y!)}8p
zuoxH&bPz4JDs;VD<>7I0aXR!Qq8us98Kh0EJ0ATKUqNB!pU0`(@Ip>cPB|cR`zDJ@
znVN97`!HdY7y)5TOzzhf(ZxzxFav-$UfGU-f`#3vwMH>87%yl;t=qn!(ySH#h{0w*
zuV#OLfb!}}i77)jw+c)V<R|gt#4E;;dB%&|tDUTNe#tyLkit9~C8WVZp3&e-6gKcg
z&v+ygt$*J=YoXF+A)_~JK2n||DJ<lh!9vG+QQNO<d?aDxyD<cccOW&C%a+1~K%YK;
zctu)h<K!{(*%WDMB<!{^y6`QB58pF?+k1b^&nMEr1BGx;f29YhJ{BBMA{f%1nXR8f
zZAcDFhH|Thg5m>4RsQUGbNlT!`NSC}@P$M=!ug&($RQdWRPO|;cSkNV)vkttan1+o
zxFP`)sB31pMb&EFD*3f{>(B<L5Wi&IUInp%x@n9iJ~JTqzQEhr;weIyN@HYX<mP`y
z!P;#i^{O;zYY-0A_0#Hw`yK3v4{PPrH`}5Jjy0&dc#EL#2*}3EP^pTnM|o&-eo74;
zy$Vls{lRoUrV><FbQ$UQK@(6gu0dwIDDU_2Wt(2+4HP1~b|mknAh&duotfD`fa=;+
z>$tnCyUS>w=W<77<U6eC@NoLOo?Cw@EG)5Be5Dg;?g)kL!5?na*jx+NulCh)>^J(p
z4ZN_2(A~&w#~!~Rm7L$&H=1<4a_EHBvE&VBzQ6AROa&A%+4{CTJ3SqDJnsZ87zuG;
zcXY>jCV9Cyxuvh@)~wXY8V9VY$|I1;5$nV$sF(0`=7jA$wt`ATR~r_)kZXTS9+tQ0
zL}kT!(=+eLE4_x*1de{#(dMp!MaLgKmkok>PbqN%`LM>sz}S~S{mA94d&3*!$V^@7
zYf(|O)0lx%(WbccL6+Ik(Q#&`=w<!{TZOX3-aP7X*VWZE1*3FLC&xer1!nhN_D+8;
ze)F0tJRk*hi{Oq=oHmk2T|0k#SQ;Wo>ZC^#t(vU1*lECAE;bcxy&WD~O{3+Gqgmam
zJwMMKH>qf`)udRSdDeistjN@t>m>_=*OZxo%Oi^_JXA1$sWF|p?50zYF*5e4ddvK)
zQPtD53_`-n_G@x5L7stD3$fU^HZ8xf@RH>`&Nrh2kFXXTB;7h`)4G2h2EC;b{Stpf
z#ytPk#sf?g{|~)n?8<M6UVu?e!qIc_lKV=s5Gc>5N;3WncwUNfUd?NoYw98myM}o1
z;o%XGEl~Q3$>cBGr!pE?`CyV4*wLzUDUp<kV}0LJc^QR+lN)P9V$YearBX43Sj_@v
z3-C{DOk49#j25-iI`w~PL+_!g)LbtSv>X%{jw`nL0fCZ>x(5T%cx}m>1*3b?IT%^I
z6G+otJUv*pN~Pw79PdppM2RZw!mOWsCU$j>)Lso79lni&dwTCrlnUW}lnlWQK@<Y@
zlV{}9kil{gxDTE`x?B;-lvpfD;w48QHE+3>pmxb_+ga;D{hohAMds9+EbXma(Uy(^
z{WuoYZRfNr$g?9+T>#tcuf`Ep<xfZnZcbj=l;@g*xY8UV%wYYbsjXsSf~y2SSUq+g
zY?&dC@#AD1jIoArszAHL%au2j`-!`{)^%psGOZ12doPpMwSGpI(8Nw{O+eCBNS#BA
z2ectDIMk~~2r_?YJ;m$T7E(Jab#}xL;Im_u6LV-?b*tVD$5o{0g$hi(P&X6r>s{Kj
zM_CkZ;`3<~4n;=D1p6ym2YY7UKq0;;Bh(kh>^uVX-LGF+hxk0Acel%U=wLsTnAauN
zX&9xm*L#n9pmDz_KpoN*wc6gW^7MI`T{hP((n&5o-GqOKRD-?o^YU_L{-|XMq;esH
z2xS+`!m#dR7(0s`^URE_pyp#PRbpXcQ&j|j{H`?jHI&htoKuBx5bRX;?S}kTc4=!@
zxsEt^i~h;Vq@WRI#0eSs`)f%NPL%AI45&x1p?>AF_7bm|1(nLLzMYC39HU$l+==s3
zb&QOrzQTVoG%h(%s~^+SlbxC2`wE*#)p)IO;Rq=Mg#=h&MUeC6<-T$%xg4{2x>FZ#
zZ9<G!gW*|gDXp%iee6pZaDOIY0q-ph*E<t`+)ktn_T%f=N8%0lkb5%(=j1+8MPfq_
zW2~NQKM&7pd1TT3Bq^z(7_hv-L8E9r9dg`|+NXcDXWzuj#H849=$wg_kN${1K%00}
zZ6+yXiaX*#0?w_K>D3y~CI^X}<>QOqhGDBkjY298&-l1j4R<xaE-`*=yGyKzs;vSz
zgN#R(1>F#m^X(c~d2)D{lIiLzxwl~2_(68f>vIu9RIKY-O5IwE*}{?Wq6G*^aMwAm
zC=-9g84AN!1b5hak0(Ljy__wJ+=_vTh=e_H8q!bAaK~c~nQ@j5sSFnxG{Q0s9G{wA
zN0U*tg6?L+5X0uVjvRs>+I`OYx4SaSB>5QcRQg1jXeSy4ZO%wgmr3h%51YHtPgY<_
zGvm=2AZ;v<mzNco4W6Gr6*N_IQd<0&B2$0FK;Gb{?uuvydmS2X{dPSJBSX&CFSU0O
zk6miulEX}N=;SFm6SU65kMg#-@u)=LwF4AILBp6dJ~h&J6Iww?Op_&!hQG-s;7$6v
zVr3tU)U*=rxPlX{&e4YPDZVJfYs5~524D9AqeBI~;AEMzw4C$0HDyda?oy>B>4tx0
zPGNZ}X(+%BX0Fv&euZAE-B(1Jms0=8Tr-*O$7)V;MNR=@D`lwDl(eh?yv609KkBs<
zr`VFAqlLfU-lzi8+u>Zb5y;gfq45Pi`LcTG<I(j5I(sH+5>zOSmBll2$CI1Q#%0@{
z+)Rt}qt{ha#Wi!s-pRnR2w|8qH7<W8h2;hn4UN9;C!R)6i%dUo^?HXhq3a57>kxV6
z`HB32FSgtKm8~6(@Zhq3+Tn~DWS_+I&2^izpWmkohABEqoRX%Lq;N+0OUwO%S~3SY
zbY3Z>OXl;{M{;N-6$OQ<i6-uoKJvM84Q=ReNsey}@Paq1Tkyy}os;Jxwv~TDhR^Yj
zW3?wk0vL)5nh!ATXZ*$$ev0vOp=*2b=2H(|=%PI!hR4)8aSC^nm@c=cD??9s2u978
zA4Xi5Qfao4OLm9g_!ySqTm~MNzkf~H-9ZT}T$~wV9YcLR7$UnS8%j0U!kDO#QRYq<
z=FJuTw2{5TfTW|1ru-Cs%lm)qIzBE>lx||J9VzJ0@2ryIgfXzm!7h_?afXwAJ9Ft<
z?2rtFzOTA0KKN<7Q}1hyLF*UBw<$;p`enzxZ{O>zv}>#46qM@M0qS%##N}iKY8WuH
z6-o2xBOJ2&yQrEX6z0`Ka*-IneVe(RiD3L%*l<TJ*cbj0B0%o^%o~63)d39samA|5
z(ZY6hKMdqDBEFf!!{bMMRGjlbQR;l`TMY>IVH7&aj!`~oi}Ni@Y(Ny0C3tPlS|qg5
z9+sCXh2vg315-jSl3JnnX}^Z5j)5tysR<cbVgLP`@h3r0;*}=|M~6xuAApyMNsb6}
zSMv$&Vjj{mHbmBHTLXXiM$+Os)9&x|jV@n8h$cU^$tMoP<&BsrhfL`un-fY%_3Sjf
z*tNdP3$=f;6Um0n>#%%S9r1Bl#wEYf`AjS<{}!=b%qUwg*7B^n`q`N+K00DX#xHK%
z{0<j5%tui&mNppQ{-l)SoBt}7(E#qy9d>U|XU7*;3icvY<EMYk)Nd6P6`5;D`mRGA
zPdm~c5)u-U8%F|j5@}im!mL{`3emWF+gdj-@i{tIKLRByT;wV@cySw-pH+%lgc#YS
z0gWcjhXx<1%<#)FHJO4VC_V@ac%w6!23BrE&RJ1DJ~6pIl?oltO7)Xa%*`ps<urXh
zuzE8IlO?28tucRmvC1h$XEnQ+dIp!bnfrV+{1QRsX@z!+MXbQjrqnX1s$uGOP+g4d
z|76X8jE(&5oWNu@clgz}JqFRFCmSPdO<PIA-3@w=nCx4&-sY~;rVaeuHJz$F%a3xI
z$ddg8VU;-P4-2H9VxYa{>xG6I1c)`!6m=JI<NHk?Xsv(g%;GKk!T~%I!|g)G+N#E^
zCtI|qZL41gcR_)qAhJJeW3a|c9MyRc+!W~PwtdKa9+Wo#xw2BbAhO6z{hSrQ)i0%z
z)Grv&-Kmqyr}QX@nMxJ#My6O=b&@UHXeHH=pvraDG7ZXZd$a=87YfeZA^e7fQ;HB0
zBP<&1>Hxn<jOW9DeI<d7EmudsD05vKO@Uyvq?l9h?GTDw>7lW1a#O@TWkl}F9mYTl
z7h2O23f%N?xlJ6r;=BA1H0pGUhvxTjaQ|(grP%$L9{QtkBtz2b^##wXL{2~J_7p-G
zOcJyV4UA!TXH|ZpXmA=B92|xs9|1aLesS8Ihl`7gdlhhh>D*=)T)_$-y|RyxhpQ|3
zem1~t5#1q-N8klA=gzHk*$!3*A%4K4m2G2wI(x0JQ?j=|W%bnevYr=enT4F&+1?XM
zRr;vD4qoarYZTV=MwV?&%W0f_8k%$NvLi38Db59^8YX1BiWFM@1PE5bSNyo8`U^mk
zMMBns8=KaD)flRQxJ-vphJ<HT8v4`KSj9yVS?W0`)!5jeFvF<Fbj7!NqbGN`gPsd)
zsPfPo8s?NcR4ogxfsWEF1?U<_t1I0qL#b(|ArrjwzPtPW{neW%N~nq>5v;_gk*$Z_
z%Yqd#RjCmhZze**t?0*YFjJP$(Th!!I+;e6D-?=<0ACUpxG&(3w}MI)StsdJ)(qfe
z3TkXJ^iSat>T*g4Y5Ngh6579%pRP>3gly?yGlIn4u5ePx^Ay}<oZZcl?hq3j(LLpX
z?Un1)o`oZxjAIIQ>-ar>0N4Hq9i|rZgJ)Z=q@wSL%q^y-)vw^y40A1b(g*q~<;Ii@
zk-~$2oh`*>o-e)08iaDD$E9B3E2-`q40~kknSYP?U{NQXE&r`Ixz`)V4j{2b1W~(-
z(N^`RL}@nm)9DEc>T|CGs@J0A8@dJW=%&X|fyy9ekxnH%0<4#A@cSbiuyd(c%Z0(I
zR*@c<AEpv)K)w)K4TX|q);9}p{980N9hqr=Y1^NB@%^O`65AK86%Lfw1{QaP#(8+m
z<e!o|AY!1Gb|_N6h<;z!YG*eGO-NXXJRqpa)(btHDq^vmlK9N4A3s97g%BKVuzL9#
zc6DXHRNZ%?ccv}S6_9kmnv0NJy0pfPRaajb0r3g~cWYQB@y(Y)QQJr<pS{zKAJA-n
zKOGD!t~f=^=ZUlVdRk1FxG#kw{aYkAuWP4jdCV)npq7}Jw3z9bs(q9>%GfGc`t{vy
zx?E4E-S<+CWkdL*h{4h4`H&$RQnJw$!%_|&_8-R~vRouP@Lea9g40Nj8=GzoO)q!l
zid0srTDqcIc^9i1K^i(&zRY%Vo}H<Gw?S^R2L6{|dSl7k5W}1bTVx*hirpu~Vp|$3
z$wtF;imC10b&Od1eu!n1$;=Gt4=!<93ino0I-$W2%$jiyx^et)R#pRrAW_|&{$;cc
zU!iv+^UTq3h4;Vvg~D<(m>38z#{#h$ensStk8dU7w7`X|&A4VVxp0-A34eKi?DOzc
z*qF>5Xl3X$rQ=YQ+6+1F?WH(nB<acZSsOWIiG?VLMvaoq#_?rO=>lxy8)M--l}8|D
zl-|?Tl{0<4Cs9s59l=l-%`bkI`et;fRT=-CiLF|@ey`4d{ZU-0<$<B4gL8=<?vdp{
zkB<%Jq!;<fL<vjilHp<Lf%u1i-oXCRwfV5?9GacEY%yltej1wZ)nP#$)s}2?tbd)9
z3B7gZ8|bTt{zLB?h#@Jv;1T_45wbcq=vp^R^N<8Lg?z5g1iNuiV+VGw`_e3)+(?WG
ze!0VC4sh>RG_kF<oE7A4&kBsGwXQv~K}3Ta6tBztHX3U}%PRyUtqPfc=W556gxv&E
zC18Qk=ouI<F)JFW!?x$UsjrwM40%iN3VM!Yg1814maHz?I$&H|%C+Fc-gl15iXGE-
zE+^teZ}j1d1^!wMP&^Kam`x2+T@8h)tcrV$kaFy5+k|;Jl?^^}BR+ZBh4-J8FU3;m
zHY6s@_yWufj&qC}H_CK>>DxMSP08E~7do?xvny<q{1p8qlqckZKfWD_e;s`FkB!f{
z7qdK^-HsUyPt8Y#(eqO^P_A6?DRB_meKsHiU18g%ME{89J$_7IHO62g_WF7G0k1~}
zH5Rn{X!Fo6>{u|>mM}SXr_0fyHHXaJnW~k?0V=GIQoJWze1PA7O(hAtoW?RA`_-1G
zn7d}_K3SLZ$`rHRd~I~*7XG-d>OdQ3v+*rNe0}c<-FFbp61HvW8MUYVyK?+sEtSeF
zWhe7gf4ygBY;{BhfBFaexKB7|Y<o;IdLYSt3#1IJ(Cg|!$dFwx@>6wVcZK@h0iF}i
zH(`w@E2vYe*!1szTPdYHix|m0Ma&q{qD7e5K=LkvC3`5!T5Z;aJiN!`IES$8i@|9Z
zk<b+kAj{G&s&AN=@lgw<U!b^1gRjBTGyr+Ol0@3G21qSpvnR=M&kO7HA&b*Jj3-y#
zFLtML*yZUZb+Mq{y61yDN*AhQTa9sP@E0N#m40)3Oc%C)W%iy}lv<m^vKHl86?l;I
z5x+fdt6dCWrJSz?5!AF@3@xH6Z4m?6bfK=fR$5B1duoZt9jxGD#4hdXYDK02ttt-m
z!Ys(<%Pgu}BNhF0L{vZL+ZK}%#8gkf>#Pg}XFO!T=CxtyS~sVMTl@uaxL(JTYXL9)
zB>b(7R@5?onP8c*k>zm7=^E!_Gr`7>;8Et8!}(;vLetpKQjPWN*RK_B4IH&+W6l%M
z^<yzt?u3k*nZ5ZHs}nUiST-y9aORBYxOl$9{?Uc<t|D&B7kjlIP3IMer9AF0yQ;I<
zr#vQYu%prfu43A?Wv6milc>}Lh?=aC!x}6Dme7=ccTO0rV;LAG=3PK&$%BNgV~)F3
zOc@#Sy)zT2UTdj0(qi}-QTjcyPzF+@zwY8}il69y2i;IkLRjqFNM2*gD-K;}j1!|x
z&PW^laOGXnjR8}1Y}o@u9*@b(;@Om{!2YpuwD|l3D&gToy$4_K%wgXU+0n(KC8S@~
zH{O7M!B8a3?s>QU8r{R_Hmgr*=s7+8lKVC!!A<i~P-aY#G@=wg9Nf&dJq^{(Mp0n7
zQW8njfH$eBTA)5l(=+Rx`Hz2}|CD^*b*aEz#D%*g7fw=NEX{)cvWed)1It-KjBW=C
zuEYsM4qmu%93U@g+^gp$>^dXpTjDFw(K?cUymBe3BxiP-j{fvLA26PN?U?&Yt2rqN
zY#GBpJ5JKdbiy0#Nys2o+J$maukW=rTuQT}*>1XH;e#L;_g37LAK5iK^*rDAm{|D)
zDkN5@=U<%62EsmZBC?9^|Fj~q00jU*|IN)(Ti-<2%J|=gW)o`z;y=s3PMj$IVQ5Bw
zs-1l}?kiXpkdO@I#KtF`4lB9w)2h1{C7L*@w$HYsoidpZ%CaCRtySxUr|qs*-mBdd
z#vKT^wgxoQn9-{}X_x+qd|d}`8lc|{4h~eM&iO+clpK0PjBr3*{g`dOz&cD23RGkz
zKf)W~WYADa*iy?8@lhSM=GadU%fz*R1xge%&gF*u5{Mx-;tvoz$NuG~O4OF1Y9Yj=
zS$kdtMuMH@JqamK?PC~s3Ydh9dz4jQvZDbz!^8<n0Y5`kfx#uiCf6ACv!riKiTSaY
zRnd3o-ee*TKW}dfS!_}mhc~BDiM`O2JSB0m5fM$Bh+cniv5T(3a8M#-cjelD%5Cat
zUKi0elH-@vYG^c{{N@p(pHQ=|bYZMwq7M?L9~u0lY#8NBYe#>33g|XnZ#}&)M=p1Y
z$(kk9<_w3Go*CVZIWMNwg*FAMrom>;kKf{WTnyUsY&+8DKh|rtz*NzCv>3lcCl#wu
zm$=<^#D>*to3!nyQJ@op*#s1SD?T#lkdaRla~b&siM3FES1ctmz!QtIdfM*R@4>O}
zlV508!&Cb;59)|9Q*0F#s_hwdQ13Q&(5$P6pq}JOWpKz_KE2ahga}Q&mt2}fw6MxG
z&Vx&`haF|DyziO-RzU>XkP3EA4b=tNePAt=Xr-0GN7MWY@c}A1(&ABniaDmqQw`HC
zAS|p5V)-+=iuSfn`y+3iCgwIM0&$EyIl6X@umjqE>yGIwKc~313TEv4)$@D7`TKE{
zzlzVm!Qda_qss0P|5^SNU*KpJR2LtN&qmw0GusouiB@QsgAGEqCdUAC&y|TAc~gs@
z^;rlR3V7nzjVHkrP4~lpsFy60Tr$NNoM^>~>{7Biid)xNkLW<+))Dp-nJPe@K$LOs
zuQob5^59Oe_^M7zeWQzbCg7qw#pF2@>m*$Ino6C`Plnkhr6tdC!jxU|8164k->2T1
z!@lxdRq%{egUd<)0-*x`VeBEDAI*9ut1!(93;^)6zyo{$`16&2>-+QlAHTbowX-%e
z)OYyf7x$n5z^$=HB1$d*0Dnh?qek5*zGD=BL%9L}6D4NlWNoT%_+L@z6t!nq@Bf7L
z8wvsZ-%%Mj{vV=Je-p~rf5+(m!w%?IlnvBBQHr|u=KqxwyP`&<@zW6v=<gvR!Tyt@
z;Ha-}Xm3wrY-;p>zoNW|R@GeI!}(d@{(`E8|0hcD51YpS78JDPelXoTh3>b?Ss?#O
z(zXBZ9Q+@qZ^G{t`&s@P(K70vl{3_}(>M9Ab#r=Q3+Q;Kbo|y#1{i-v^ge;>{*OKP
z#{m3^a@DJ8fc{xAke{A2zoLw=|B3o!XJ>8qUt?mI%&zi(eFyperlxAVe}ee+^{pMP
z{&zL)1rV~KPF@h20|Ee;|HD=ASCkXcKT%TFPKJ_(M*n81b$R^9u=+NUpPAl2|15uo
z^^OHN@g*ktC+knUJ$-xo|FwqHx^dE}@1K8`zv>{3<d?AiYfEK?KZgA0A?!^0XG^`S
zz|`r#OKP5f0GE#79YgS&G+`<Kl+^ot`d?MxZsty^_<p4Z@b{2xX#UBuF|;$XwzK>n
zYWD}~XXo*qBp7SIx3JD{od-_)ODhRkJ6rwN&SRB?9YJ}o8p>}iRZREi45e%5U}b3c
zzt-?Hl84h<fgii*{fhTJEVRGq0Qg-Re_3|^)Wbi27Myn^oAl3vPk(DPZ(+_K3BYh_
z?~w&U0sx@?1$p;(<UdWp|0E9o!@=pV#0wXG&b9k+JEeET74Tn)xxOiEe<S`gd&-|g
zEtj6(h=WeCth&}s3M21VqCh{_*I$Y39DgI)8(O?CKsNtu&p*L}TPDA?XMQvfXOPjR
zCD1#6DHrJPp{j8Hz4Cudvwsq`<$rI^(sv>><>pD&`;{=@-$VVz^&g3U57qoXfEnYP
zI3$o7o1flEeIP&YZGQ#FaRdC#v-eNtKkjtjnUKjCzcHNy`8juvvOqcBS4n8}pGUKQ
z?fWHOfZvQf&Hk8J4kLf>Btu(Lt^k7dW>qkM003Z=pFW_!!aj@q8)jjxYha-3p!+9{
zIOC_Q{9kGGe)AmL3v!t9@4bQu_V?=EOZ}Vn*WUiKy22m=zeOnTM9MY(RSqrfeR9ei
z|9MpK*9a42|IPeqB&qFUX<=uh|7Vc;1-}RRds3iZgLHQR_>U=qK>tV)^mo|r*-n0c
zjqc1H;6LR)0sSNQ$=_MO+xq{?lK1_M^=Dvz82tYg_PamyueDST`n&S}1^dG(`meCx
zy>|aH;z9xblk@I7>!<VX-&wyq&;DA=_^{vQ`)6c-c+mcp_PeX-U#9#>fd9#36!Z^|
z(Z5gozne?`%9H&H@OP_8&_Apu|IYb;-B0gVPF^g)Z|-`af4J-YCa~Wu#C~o1rv!li
z(NGNZ4@0rP1AljR_!U@}4e%d*9zg%_dH6f*_aptk!XR@2{!a(|LH{`5|9ANBhlGD^
zL*zn$|MAE$=pRRh{|@~9NyD$vzVG_~x91L^e>`{iJM;Hl<gd)6+5fl_|7A}Y3HryL
z@((cRPvb-Y>i55<caF#0&#V6jvm7c91CylvnF$7XlQ&#G39Y!3M*b-dqvU8uRd@gZ
zP)h*<7Xy=!2pA0w00000000000PTT^lcN4m14;`3lWGeelNA3KLEv^LJhBH2*l5lG
z088Zn02TlZ00000000000HlE#DgXduXmW3DWiNDTZh2pDY;|X8ZZ2wJa#d6X00V5O
lMN5+#|1JW`_>)WjEffU?000002LJ~EB?15d*ZTkf005fhJZ%5~


From 926ea1d245e7458caebdb33221efdfb6f19c5ad4 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 29 Mar 2010 16:00:33 +0530
Subject: [PATCH 146/248] [IMP] survey :- change string error to warning

bzr revid: ysa@tinyerp.co.in-20100329103033-y32a82qt96g84i60
---
 addons/survey/survey.py                       | 44 +++++++++----------
 addons/survey/wizard/survey_answer.py         | 36 +++++++--------
 .../survey/wizard/survey_send_invitation.py   |  2 +-
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index a6432ddcb79..83aa399550f 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -93,7 +93,7 @@ class survey(osv.osv):
         return True
 
     def copy(self, cr, uid, id, default=None,context={}):
-        raise osv.except_osv(_('Error !'),_('You cannot duplicate the resource!'))
+        raise osv.except_osv(_('Warning !'),_('You cannot duplicate the resource!'))
 
 survey()
 
@@ -154,7 +154,7 @@ class survey_page(osv.osv):
                 }
 
     def copy(self, cr, uid, id, default=None, context={}):
-        raise osv.except_osv(_('Error !'),_('You cannot duplicate the resource!'))
+        raise osv.except_osv(_('Warning !'),_('You cannot duplicate the resource!'))
 
 survey_page()
 
@@ -318,7 +318,7 @@ class survey_question(osv.osv):
             if que_type in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans',\
                              'matrix_of_drop_down_menus', 'rating_scale']:
                 if not col_len:
-                    raise osv.except_osv(_('Error !'),_("You must enter one or more column heading."))
+                    raise osv.except_osv(_('Warning !'),_("You must enter one or more column heading."))
             ans_len = len(question['answer_choice_ids'])
 
             if vals.has_key('answer_choice_ids'):
@@ -330,7 +330,7 @@ class survey_question(osv.osv):
 
             if que_type not in ['descriptive_text', 'single_textbox', 'comment','table']:
                 if not ans_len:
-                    raise osv.except_osv(_('Error !'),_("You must enter one or more Answer."))
+                    raise osv.except_osv(_('Warning !'),_("You must enter one or more Answer."))
             req_type = ""
 
             if vals.has_key('required_type'):
@@ -344,12 +344,12 @@ class survey_question(osv.osv):
                 if req_type in ['at least', 'at most', 'exactly']:
                     if vals.has_key('req_ans'):
                         if not vals['req_ans'] or  vals['req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("#Required Answer you entered \
+                            raise osv.except_osv(_('Warning !'),_("#Required Answer you entered \
                                     is greater than the number of answer. \
                                     Please use a number that is smaller than %d.") % (ans_len + 1))
                     else:
                         if not question['req_ans'] or  question['req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("#Required Answer you entered is \
+                            raise osv.except_osv(_('Warning !'),_("#Required Answer you entered is \
                                     greater than the number of answer.\
                                     Please use a number that is smaller than %d.") % (ans_len + 1))
 
@@ -359,39 +359,39 @@ class survey_question(osv.osv):
                     if vals.has_key('minimum_req_ans'):
                         minimum_ans = vals['minimum_req_ans']
                         if not vals['minimum_req_ans'] or  vals['minimum_req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("Minimum Required Answer\
+                            raise osv.except_osv(_('Warning !'),_("Minimum Required Answer\
                                      you entered is greater than the number of answer.\
                                     Please use a number that is smaller than %d.") % (ans_len + 1))
                     else:
                         minimum_ans = question['minimum_req_ans']
                         if not question['minimum_req_ans'] or  question['minimum_req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("Minimum Required Answer you\
+                            raise osv.except_osv(_('Warning !'),_("Minimum Required Answer you\
                                      entered is greater than the number of answer. \
                                      Please use a number that is smaller than %d.") % (ans_len + 1))
                     if vals.has_key('maximum_req_ans'):
                         maximum_ans = vals['maximum_req_ans']
                         if not vals['maximum_req_ans'] or vals['maximum_req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("Maximum Required Answer you \
+                            raise osv.except_osv(_('Warning !'),_("Maximum Required Answer you \
                                     entered for your maximum is greater than the number of answer.\
                                      Please use a number that is smaller than %d.") % (ans_len + 1))
                     else:
                         maximum_ans = question['maximum_req_ans']
                         if not question['maximum_req_ans'] or question['maximum_req_ans'] > ans_len:
-                            raise osv.except_osv(_('Error !'),_("Maximum Required Answer you\
+                            raise osv.except_osv(_('Warning !'),_("Maximum Required Answer you\
                                      entered for your maximum is greater than the number of answer.\
                                       Please use a number that is smaller than %d.") % (ans_len + 1))
                     if maximum_ans <= minimum_ans:
-                        raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater \
+                        raise osv.except_osv(_('Warning !'),_("Maximum Required Answer is greater \
                                     than Minimum Required Answer"))
 
             if question['type'] ==  'matrix_of_drop_down_menus' and vals.has_key('column_heading_ids'):
                 for col in vals['column_heading_ids']:
                     if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
-                        raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices\
+                        raise osv.except_osv(_('Warning !'),_("You must enter one or more menu choices\
                                  in column heading"))
                     elif not col[2] or not col[2].has_key('menu_choice') or\
                              col[2]['menu_choice'].strip() == '':
-                        raise osv.except_osv(_('Error !'),_("You must enter one or more menu \
+                        raise osv.except_osv(_('Warning !'),_("You must enter one or more menu \
                                 choices in column heading (white spaces not allowed)"))
 
         return super(survey_question, self).write(cr, uid, ids, vals, context=context)
@@ -401,33 +401,33 @@ class survey_question(osv.osv):
         maximum_ans = 0
         if vals.has_key('answer_choice_ids') and  not len(vals['answer_choice_ids']):
             if vals.has_key('type') and vals['type'] not in ['descriptive_text', 'single_textbox', 'comment','table']:
-                raise osv.except_osv(_('Error !'),_("You must enter one or more answer."))
+                raise osv.except_osv(_('Warning !'),_("You must enter one or more answer."))
 
         if vals.has_key('column_heading_ids') and  not len(vals['column_heading_ids']):
             if vals.has_key('type') and vals['type'] in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale']:
-                raise osv.except_osv(_('Error !'),_("You must enter one or more column heading."))
+                raise osv.except_osv(_('Warning !'),_("You must enter one or more column heading."))
 
         if vals['type'] in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time']:
             if vals.has_key('is_require_answer') and vals.has_key('required_type') and vals['required_type'] in ['at least', 'at most', 'exactly']:
                 if vals.has_key('answer_choice_ids') and vals['req_ans'] > len(vals['answer_choice_ids']) or not vals['req_ans']:
-                    raise osv.except_osv(_('Error !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
+                    raise osv.except_osv(_('Warning !'),_("#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
 
             if vals.has_key('is_require_answer') and vals.has_key('required_type') and vals['required_type'] == 'a range':
                 minimum_ans = vals['minimum_req_ans']
                 maximum_ans = vals['maximum_req_ans']
                 if vals.has_key('answer_choice_ids') or vals['minimum_req_ans'] > len(vals['answer_choice_ids']) or not vals['minimum_req_ans']:
-                    raise osv.except_osv(_('Error !'),_("Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
+                    raise osv.except_osv(_('Warning !'),_("Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
                 if vals.has_key('answer_choice_ids') or vals['maximum_req_ans'] > len(vals['answer_choice_ids']) or not vals['maximum_req_ans']:
-                    raise osv.except_osv(_('Error !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
+                    raise osv.except_osv(_('Warning !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
                 if maximum_ans <= minimum_ans:
-                    raise osv.except_osv(_('Error !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
+                    raise osv.except_osv(_('Warning !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
 
         if vals['type'] ==  'matrix_of_drop_down_menus':
             for col in vals['column_heading_ids']:
                 if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
-                    raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading"))
+                    raise osv.except_osv(_('Warning !'),_("You must enter one or more menu choices in column heading"))
                 elif not col[2] or not col[2].has_key('menu_choice') or col[2]['menu_choice'].strip() == '':
-                    raise osv.except_osv(_('Error !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
+                    raise osv.except_osv(_('Warning !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
 
         res = super(survey_question, self).create(cr, uid, vals, context)
         return res
@@ -576,7 +576,7 @@ class survey_response(osv.osv):
         return res
 
     def copy(self, cr, uid, id, default=None,context={}):
-        raise osv.except_osv(_('Error !'),_('You cannot duplicate the resource!'))
+        raise osv.except_osv(_('Warning !'),_('You cannot duplicate the resource!'))
 
 survey_response()
 
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 3037ae2417e..1d1ca990279 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -677,7 +677,7 @@ class survey_question_wiz(osv.osv_memory):
                                 if error:
                                     for res in resp_id_list:
                                         sur_name_read['store_ans'].pop(res)
-                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
+                                    raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
 
                                 resp_obj.write(cr, uid, resp_id, {'comment':val1})
                                 sur_name_read['store_ans'][resp_id].update({key1:val1})
@@ -716,7 +716,7 @@ class survey_question_wiz(osv.osv_memory):
                             if error:
                                 for res in resp_id_list:
                                     sur_name_read['store_ans'].pop(res)
-                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
+                                raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
 
                             if key1.split('_')[1] == "single" :
                                 resp_obj.write(cr, uid, resp_id, {'single_text':val1})
@@ -736,7 +736,7 @@ class survey_question_wiz(osv.osv_memory):
                                 except:
                                     for res in resp_id_list:
                                         sur_name_read['store_ans'].pop(res)
-                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' \nPlease enter an integer value " ))
+                                    raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "' \nPlease enter an integer value " ))
 
                         elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 3:
                             if type(val1) == type('') or type(val1) == type(u''):
@@ -765,12 +765,12 @@ class survey_question_wiz(osv.osv_memory):
                     if comment_field and comment_value:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
-                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
+                        raise osv.except_osv(_('Warning !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
 
                     if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
-                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
+                        raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
 
                     if not select_count:
                         resp_obj.write(cr, uid, resp_id, {'state':'skip'})
@@ -778,7 +778,7 @@ class survey_question_wiz(osv.osv_memory):
                     if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
-                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
+                        raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
 
                     if que_rec['type'] in ['multiple_textboxes_diff_type', 'multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
                         if matrix_list:
@@ -789,7 +789,7 @@ class survey_question_wiz(osv.osv_memory):
                             (que_rec['required_type'] == 'a range' and (len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):
                                 for res in resp_id_list:
                                     sur_name_read['store_ans'].pop(res)
-                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+                                raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
 
                         elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
                             (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
@@ -798,12 +798,12 @@ class survey_question_wiz(osv.osv_memory):
                             (que_rec['required_type'] == 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):
                             for res in resp_id_list:
                                 sur_name_read['store_ans'].pop(res)
-                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+                            raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
 
                     if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
-                        raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+                        raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
 
         else:
             resp_id_list = []
@@ -877,7 +877,7 @@ class survey_question_wiz(osv.osv_memory):
                                     if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
                                             error = True
                                 if error:
-                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
+                                    raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['comment_valid_err_msg'])))
                                 resp_obj.write(cr, uid, update, {'comment':val,'state': 'done'})
                                 sur_name_read['store_ans'][update].update({key:val})
 
@@ -913,7 +913,7 @@ class survey_question_wiz(osv.osv_memory):
                                 if re.match("^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", val) == None:
                                         error = True
                             if error:
-                                raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
+                                raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "'  \n" + tools.ustr(que_rec['validation_valid_err_msg'])))
                             if key.split('_')[1] == "single" :
                                 resp_obj.write(cr, uid, update, {'single_text':val,'state': 'done'})
                             else:
@@ -931,7 +931,7 @@ class survey_question_wiz(osv.osv_memory):
                                     sur_name_read['store_ans'][update].update({key:val})
                                     select_count += 1
                                 except:
-                                    raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' \n Please enter an integer value " ))
+                                    raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "' \n Please enter an integer value " ))
 
                         elif val and len(key.split('_')) == 3:
                             resp_obj.write(cr, uid, update, {'state': 'done'})
@@ -959,13 +959,13 @@ class survey_question_wiz(osv.osv_memory):
                                 sur_name_read['store_ans'][update].update({key:val})
 
                 if comment_field and comment_value:
-                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
+                    raise osv.except_osv(_('Warning !'), _("'" + que_rec['question']  + "' " + tools.ustr(que_rec['make_comment_field_err_msg'])))
 
                 if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
-                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
+                    raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "\n you cannot select same answer more than one times'"))
 
                 if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
-                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
+                    raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
 
                 if not select_count:
                     resp_obj.write(cr, uid, update, {'state': 'skip'})
@@ -977,17 +977,17 @@ class survey_question_wiz(osv.osv_memory):
                         (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'a range' and (len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):
-                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+                            raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
 
                     elif (que_rec['required_type'] == 'all' and select_count < len(que_rec['answer_choice_ids'])) or \
                         (que_rec['required_type'] == 'at least' and select_count < que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'at most' and select_count > que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'exactly' and select_count != que_rec['req_ans']) or \
                         (que_rec['required_type'] == 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):
-                            raise osv.except_osv(_('Error !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+                            raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
 
                 if que_rec['type'] in ['multiple_choice_only_one_ans','single_textbox','comment'] and  que_rec['is_require_answer'] and select_count <= 0:
-                    raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
+                    raise osv.except_osv(_('Warning !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['req_error_msg'])))
 
         return True
 
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 29ee447ce8a..d099b52d389 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -69,7 +69,7 @@ class survey_send_invitation(osv.osv_memory):
             if sur.state != 'open':
                 msg +=  sur.title + "\n"
         if msg:
-            raise osv.except_osv(_('Error !'), _('%sSurvey is not in open state') % msg)
+            raise osv.except_osv(_('Warning !'), _('%sSurvey is not in open state') % msg)
         data['mail'] = '''Hello %(name)s, \n\n We are inviting you for following survey. \
                     \n  ''' + name + '''\n Your login ID: %(login)s, Your password: %(passwd)s
                     \n link :- http://'''+ str(socket.gethostname()) + ''':8080 \n\n Thanks,'''

From 0c0bb21537f0713e310eb5be42ce0993bd381444 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 29 Mar 2010 16:12:03 +0530
Subject: [PATCH 147/248] [IMP] survey :- add access rules.

bzr revid: ysa@tinyerp.co.in-20100329104203-i303jmibqjybyazf
---
 addons/survey/security/ir.model.access.csv | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index bcfe1263829..b57a67514ea 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -28,4 +28,13 @@
 "access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_user",1,1,1,1
 "access_survey_print_answer","survey.print.answer","model_survey_print_answer","group_survey_manager",1,1,1,1
 "access_survey_print_answer","survey.print.answer","model_survey_print_answer","group_survey_user",1,1,1,1
-
+"access_survey_send_invitation","survey.send.invitation","model_survey_send_invitation","group_survey_manager",1,1,1,1
+"access_survey_send_invitation","survey.send.invitation","model_survey_send_invitation","group_survey_user",1,0,0,0
+"access_survey_send_invitation_log","survey.send.invitation.log","model_survey_send_invitation_log","group_survey_manager",1,1,1,1
+"access_survey_send_invitation_log","survey.send.invitation.log","model_survey_send_invitation_log","group_survey_user",1,0,0,0
+"access_survey_print_statistics","survey.print.statistics","model_survey_print_statistics","group_survey_manager",1,1,1,1
+"access_survey_print_statistics","survey.print.statistics","model_survey_print_statistics","group_survey_user",1,0,0,0
+"access_survey_browse_answer","survey.browse.answer","model_survey_browse_answer","group_survey_manager",1,1,1,1
+"access_survey_browse_answer","survey.browse.answer","model_survey_browse_answer","group_survey_user",1,0,0,0
+"access_survey_print","survey.print","model_survey_print","group_survey_manager",1,1,1,1
+"access_survey_print","survey.print","model_survey_print","group_survey_user",1,0,0,0

From d598aac66fdee1e9ee4e6e73e8e2e9ed32377a21 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 29 Mar 2010 16:44:22 +0530
Subject: [PATCH 148/248] [FIX] auction: auction_lot_cancel issues has been
 fixed

bzr revid: mso@mso-20100329111422-2phkxy7w3f3fz5wx
---
 addons/auction/__terp__.py                         |  2 +-
 addons/auction/wizard/__init__.py                  |  2 +-
 addons/auction/wizard/auction_lots_cancel.py       | 10 ++++------
 addons/auction/wizard/auction_lots_cancel_view.xml | 10 ++++++++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index 867cda476f7..8918a6394aa 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -38,7 +38,7 @@
     'init_xml': ['auction_sequence.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
-        'wizard/auction_lots_cancel_view.xml',
+#        'wizard/auction_lots_cancel_view.xml',
 #        'wizard/auction_transfer_unsold_object_view.xml',
         'wizard/auction_lots_able_view.xml',
         'wizard/auction_lots_enable_view.xml',
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index 9303c86818b..957ab02b053 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -29,7 +29,7 @@ import auction_pay_buy
 import auction_payer_sel
 import auction_lots_sms_send
 import auction_catalog_flagey_report
-import auction_lots_cancel
+#import auction_lots_cancel
 #import auction_transfer_unsold_object
 #import auction_aie_send_result
 import auction_lots_buyer_map
diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py
index 117f9b5eb78..edf530ac8aa 100644
--- a/addons/auction/wizard/auction_lots_cancel.py
+++ b/addons/auction/wizard/auction_lots_cancel.py
@@ -29,7 +29,7 @@ class auction_lots_cancel(osv.osv):
         _name = 'auction.lots.cancel'
         _description = 'To cancel auction lots.'
         
-        def _cancel(self, cr, uid, ids, context):
+        def cancel(self, cr, uid, ids, context):
             """ 
             To cancel the auction lot
     
@@ -45,13 +45,11 @@ class auction_lots_cancel(osv.osv):
             invoice_obj = self.pool.get('account.invoice')
             lot = lots_obj.browse(cr,uid,context['active_id'],context)
             if lot.ach_inv_id:
-                    p = invoice_obj.refund(['lot.ach_inv_id.id'],context)
-            if lot.vnd_inv_id:
-                    p = invoice_obj.refund(['lot.vnd_inv_id.id'],context)
+                    supplier_refund_inv_id = invoice_obj.refund(cr, uid,[lot.ach_inv_id.id])
+            if lot.sel_inv_id:
+                    customer_refund_inv_id = invoice_obj.refund(cr, uid,[lot.sel_inv_id.id])
             return {}
                 
         _columns = {
-                
-                
         }
 auction_lots_cancel()
\ No newline at end of file
diff --git a/addons/auction/wizard/auction_lots_cancel_view.xml b/addons/auction/wizard/auction_lots_cancel_view.xml
index e80222b1e71..77ff6a373b7 100644
--- a/addons/auction/wizard/auction_lots_cancel_view.xml
+++ b/addons/auction/wizard/auction_lots_cancel_view.xml
@@ -10,12 +10,18 @@
                                                             <label string="Are you sure you want to refund this invoice ?"/>
                                                             <button icon='gtk-cancel' special="cancel"
                                                 string="Cancel" />
-                                                <button name="_cancel" string="Cancel Payment"
+                                                <button name="cancel" string="Cancel Payment"
                                                 colspan="1" type="object" icon="gtk-ok" />
                                          </form>
                                   </field>
                         </record>
-                        
+				       <act_window name="Cancel ittttttt"
+				            res_model="auction.lots.cancel"
+				            src_model="auction.lots"
+						    view_mode="form"
+						    target="new"        
+				            key2="client_action_multi"    
+						    id="action_auction_lots_cancel"/>                        
                         
                 </data>
 </openerp>                

From bee4052cb0a24e5c30f5f94ce723603060324266 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 29 Mar 2010 18:28:30 +0530
Subject: [PATCH 149/248] [ADD] mrp: Added remaining wizard after converting to
 osv_memory wizard (Track Production). Added docstring in (Compute
 Procurement).

bzr revid: uco@tinyerp.co.in-20100329125830-eg5o7gobjnj2btmq
---
 addons/mrp/__terp__.py                    |   1 +
 addons/mrp/wizard/__init__.py             |   2 +-
 addons/mrp/wizard/mrp_procurement.py      |   7 ++
 addons/mrp/wizard/mrp_track_prod.py       | 126 ++++++++++++++++++++++
 addons/mrp/wizard/mrp_track_prod_view.xml |  16 +++
 addons/mrp/wizard/wizard_track_prod.py    | 104 ------------------
 6 files changed, 151 insertions(+), 105 deletions(-)
 create mode 100644 addons/mrp/wizard/mrp_track_prod.py
 create mode 100644 addons/mrp/wizard/mrp_track_prod_view.xml
 delete mode 100644 addons/mrp/wizard/wizard_track_prod.py

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 10fadb00bc6..a69e8ce4025 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -67,6 +67,7 @@
         'wizard/orderpoint_procurement_view.xml',
         'wizard/mrp_price_view.xml',
         'wizard/mrp_workcenter_load_view.xml',
+#        'wizard/mrp_track_prod_view.xml',
         'mrp_view.xml',
         'wizard/schedulers_all_view.xml',
         'mrp_wizard.xml',
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 012677a9ca0..045d7f1bd71 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -25,7 +25,7 @@ import mrp_procurement
 import schedulers_all
 import mrp_price
 import mrp_workcenter_load
-import wizard_track_prod
+#import mrp_track_prod
 import change_production_qty
 import make_procurement_product
 
diff --git a/addons/mrp/wizard/mrp_procurement.py b/addons/mrp/wizard/mrp_procurement.py
index 77728c05517..1c3f3dd5c8a 100644
--- a/addons/mrp/wizard/mrp_procurement.py
+++ b/addons/mrp/wizard/mrp_procurement.py
@@ -35,6 +35,13 @@ class procurement_compute(osv.osv_memory):
         return {}
     
     def procure_calculation(self, cr, uid, ids, context):
+        """ 
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of IDs selected 
+         @param context: A standard dictionary 
+        """
         threaded_calculation = threading.Thread(target=self._procure_calculation_procure, args=(cr, uid, ids, context))
         threaded_calculation.start()
         return {}
diff --git a/addons/mrp/wizard/mrp_track_prod.py b/addons/mrp/wizard/mrp_track_prod.py
new file mode 100644
index 00000000000..52e5508317a
--- /dev/null
+++ b/addons/mrp/wizard/mrp_track_prod.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv, fields
+
+class mrp_track_move(osv.osv_memory):
+    _name = 'mrp.production.track'
+    _description = 'Production Track'
+            
+    def view_init(self, cr, uid, fields_list, context=None):
+        """ 
+         Creates view dynamically and adding fields at runtime.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view with new columns.
+        """
+        res = super(mrp_track_move, self).view_init(cr, uid, fields_list, context=context)
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            prod_obj = self.pool.get('mrp.production')
+            try:
+                prod = prod_obj.browse(cr, uid, record_id)
+                for m in [line for line in prod.move_created_ids]:
+                    if 'track%s'%(m.id) not in self._columns:
+                        self._columns['track%s'%(m.id)] = fields.boolean(string=m.product_id.name)
+            except:
+                return res
+        return res
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """ 
+         Changes the view dynamically
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view.
+        """
+        res = super(mrp_track_move, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            prod_obj = self.pool.get('mrp.production')
+            prod = prod_obj.browse(cr, uid, record_id)
+            try:
+                if prod.state != 'done':
+                    res['arch'] = '''<form string="Track lines">
+                                        <label colspan="4" string="You can not split an unfinished production Output." />
+                                        <group col="2" colspan="4">
+                                            <button icon='gtk-cancel' special="cancel"
+                                                string="Exit" />
+                                        </group>
+                                    </form>
+                                    '''
+                else:
+                    arch_lst = ['<form string="Track lines">', '<label colspan="4" string="The field on each line says whether this lot should be tracked or not." />']
+                    for m in [line for line in prod.move_created_ids]:
+                        quantity = m.product_qty
+                        res['fields']['track%s' %m.id] = {'string' : m.product_id.name, 'type' : 'boolean', 'default' : lambda x,y,z: False}
+                        arch_lst.append('<field name="track%s" />\n<newline />' %m.id)
+                    arch_lst.append('<group col="2" colspan="4">')
+                    arch_lst.append('<button icon=\'gtk-cancel\' special="cancel" string="Cancel" />')
+                    arch_lst.append('<button name="track_lines" string="Track" colspan="1" type="object" icon="gtk-ok" />')
+                    arch_lst.append('</group>')
+                    arch_lst.append('</form>')
+                    res['arch'] = '\n'.join(arch_lst)
+            except Exception,e:
+                return res
+        return res
+    
+    def track_lines(self, cr, uid, ids, context):
+        """
+         Tracks Finished products and splits products to finish lines.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of IDs selected 
+         @param context: A standard dictionary 
+         @return: 
+        """
+        record_id = context and context.get('active_id', False) or False
+        assert record_id, 'Active ID not found'
+        data = self.read(cr, uid, ids[0])
+        prod_obj = self.pool.get('mrp.production')
+        prod = prod_obj.browse(cr, uid, record_id)
+        if not prod.move_created_ids and prod.state != 'done':
+            return {}
+        prodlot_obj = self.pool.get('stock.production.lot')
+        move_obj = self.pool.get('stock.move')
+        move_ids = [m.id for m in [line for line in prod.move_created_ids]]
+        for idx, move in enumerate(move_obj.browse(cr, uid, move_ids)):
+            if data['track%s' %move.id]:
+                for idx in range(int(move.product_qty)):
+                    update_val = {'product_qty': 1}
+                    if idx:
+                        current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
+                    else:
+                        current_move = move.id
+                    new_prodlot = prodlot_obj.create(cr, uid, {'name': 'PRODUCTION:%d:LOT:%d' % (record_id, idx+1), 'product_id': move.product_id.id})
+                    update_val['prodlot_id'] = new_prodlot
+                    move_obj.write(cr, uid, [current_move], update_val)
+        return {}
+
+mrp_track_move()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/wizard/mrp_track_prod_view.xml b/addons/mrp/wizard/mrp_track_prod_view.xml
new file mode 100644
index 00000000000..fe2e54026a2
--- /dev/null
+++ b/addons/mrp/wizard/mrp_track_prod_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Track Production -->
+
+        <act_window name="Track Production"		    
+		    res_model="mrp.production.track"
+		    src_model="mrp.production"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="act_production_track"/> 
+		
+	</data>
+</openerp>	
diff --git a/addons/mrp/wizard/wizard_track_prod.py b/addons/mrp/wizard/wizard_track_prod.py
deleted file mode 100644
index c94ce47b8d8..00000000000
--- a/addons/mrp/wizard/wizard_track_prod.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-import time
-from osv import osv
-from tools.misc import UpdateableStr
-
-arch = UpdateableStr()
-fields = {}
-
-def _get_moves(self, cr, uid, data, context):
-    prod_obj = pooler.get_pool(cr.dbname).get('mrp.production')
-    prod = prod_obj.browse(cr, uid, [data['id']])[0]
-    res = {}
-    fields.clear()
-    if prod.state != 'done':
-        arch.string = '''<?xml version="1.0"?><form string="Track lines"><label colspan="4" string="You can not split an unfinished production output" /></form>'''
-        res['moves'] = []
-    else:
-        arch_lst = ['<?xml version="1.0"?>', '<form string="Track lines">', '<label colspan="4" string="The field on each line says if this lot should be tracked or not." />']
-        for m in [line for line in prod.move_created_ids]:
-            quantity = m.product_qty
-            arch_lst.append('<field name="track%s" />\n<newline />' % m.id)
-            fields['track%s' % m.id] = {'string' : m.product_id.name, 'type' : 'boolean', 'default' : lambda x,y,z: False}
-            res.setdefault('moves', []).append(m.id)
-        arch_lst.append('</form>')
-        arch.string = '\n'.join(arch_lst)
-    return res
-
-def _track_lines(self, cr, uid, data, context):
-    if not data['form']['moves']:
-        return {}
-    prodlot_obj = pooler.get_pool(cr.dbname).get('stock.production.lot')
-    lot_obj = pooler.get_pool(cr.dbname).get('stock.lot')
-    move_obj = pooler.get_pool(cr.dbname).get('stock.move')
-
-    new_lot = lot_obj.create(cr, uid, {'name': 'PRODUCTION:%d' % data['id']})
-    for idx, move in enumerate(move_obj.browse(cr, uid, data['form']['moves'])):
-        if data['form']['track%s' % move.id]:
-            for idx in range(move.product_qty):
-                update_val = {'product_qty': 1, 'lot_id': new_lot}
-                if idx:
-                    current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
-                else:
-                    current_move = move.id
-                new_prodlot = prodlot_obj.create(cr, uid, {'name': 'PRODUCTION:%d:LOT:%d' % (data['id'], idx+1)})
-                update_val['prodlot_id'] = new_prodlot
-                move_obj.write(cr, uid, [current_move], update_val)
-    return {}
-
-class wizard_track_move(wizard.interface):
-    def _next(self, cr, uid, data, context):
-        prod_obj = pooler.get_pool(cr.dbname).get('mrp.production')
-        prod = prod_obj.browse(cr, uid, [data['id']])[0]
-        if prod.state != 'done':
-            return 'notrack'
-        else:
-            return 'track'
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'choice', 'next_state': _next}
-        },
-        'notrack':{
-            'actions':[_get_moves],
-            'result':{'type':'form', 'arch':arch, 'fields':fields, 'state':[('end', 'Cancel')]}
-        },
-        'track':{
-            'actions':[_get_moves],
-            'result': {'type':'form', 'arch':arch, 'fields':fields, 'state':[('end','Cancel'),('split','Track')]}
-        },
-        'split': {
-            'actions': [_track_lines],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-
-wizard_track_move('mrp.production.track')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From dc0f22435e375085e8afa220c54ea8e0cb06f3bb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 29 Mar 2010 19:08:08 +0530
Subject: [PATCH 150/248] [IMP] point_of_sale: convert the scan_product wizard
 into osv_memory and remove wizard_default_journal

bzr revid: sbh@tinyerp.com-20100329133808-hrslymp4ki3fccff
---
 addons/point_of_sale/__terp__.py              |   1 +
 addons/point_of_sale/pos_view.xml             |   2 +-
 addons/point_of_sale/wizard/__init__.py       |   3 +-
 .../point_of_sale/wizard/pos_scan_product.py  |  55 ++++++++
 .../wizard/pos_scan_product_view.xml          |  34 +++++
 .../wizard/wizard_default_journal.py          | 128 ------------------
 .../wizard/wizard_scan_product.py             |  71 ----------
 addons/pos_sales_user.py                      |  69 ----------
 8 files changed, 93 insertions(+), 270 deletions(-)
 create mode 100644 addons/point_of_sale/wizard/pos_scan_product.py
 create mode 100644 addons/point_of_sale/wizard/pos_scan_product_view.xml
 delete mode 100644 addons/point_of_sale/wizard/wizard_default_journal.py
 delete mode 100644 addons/point_of_sale/wizard/wizard_scan_product.py
 delete mode 100644 addons/pos_sales_user.py

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 153584f6a26..95228bb044c 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -62,6 +62,7 @@ Main features :
         'wizard/pos_payment_report_user.xml',  
         'wizard/pos_payment_report.xml',
         'wizard/pos_payment.xml',
+        'wizard/pos_scan_product_view.xml',
         'pos_report.xml',
         'pos_wizard.xml',
         'pos_view.xml',
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index f5ce8368bbe..312c9f4726b 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -68,7 +68,7 @@
                                 <button name="%(pos_add_product)d" string="_Add product" type="action" states="draft"/>
                                 -->
 
-                                <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
+                                <button name="%(action_pos_scan_product)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
 
 
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 82d9ea9409a..67729a6a895 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -21,7 +21,7 @@
 ##############################################################################
 
 #import wizard_pos_payment
-import wizard_default_journal
+
 import wizard_scan_product
 
 import wizard_return
@@ -50,6 +50,7 @@ import pos_payment_report_user
 import pos_payment_report_date
 import pos_payment_report
 import pos_payment
+import pos_scan_product
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_scan_product.py b/addons/point_of_sale/wizard/pos_scan_product.py
new file mode 100644
index 00000000000..5998f50b0f7
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_scan_product.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+
+
+
+class pos_scan_product(osv.osv_memory):
+    _name = 'pos.scan.product'
+    _description = 'Scan product'
+    _columns = {
+        'gencod': fields.char('Barcode',size=13,required= True)
+    }
+    def scan(self, cr, uid, ids, context):
+        """ 
+         To get the gencod and scan product         
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return : retrun gencod
+        """
+                
+        data=self.read(cr, uid, ids)[0]
+        record_id = context and context.get('active_id',False)
+        result =self. pool.get('pos.order.line')._scan_product(cr, uid, data['gencod'], 1, record_id)
+        return {'gencod': False}
+
+    
+
+pos_scan_product()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/point_of_sale/wizard/pos_scan_product_view.xml b/addons/point_of_sale/wizard/pos_scan_product_view.xml
new file mode 100644
index 00000000000..3957c6c0415
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_scan_product_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>        
+		<record id="view_pos_scan_product" model="ir.ui.view">
+            <field name="name">Scan product</field>
+            <field name="model">pos.scan.product</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scan product">
+				    <group col="2" colspan="4">
+				    	<label string="Scan Barcode" colspan="4"/>
+						<field name="gencod" colspan="4" nolabel="1"/>
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Close" />
+                		<button name="scan" string="Add"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_pos_scan_product" model="ir.actions.act_window">
+            <field name="name">Scan product</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">pos.scan.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            
+        </record>
+        
+	</data>
+</openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/wizard_default_journal.py b/addons/point_of_sale/wizard/wizard_default_journal.py
deleted file mode 100644
index bfe59251f45..00000000000
--- a/addons/point_of_sale/wizard/wizard_default_journal.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-
-
-def _get_default_journal_selection(self, cr, uid, context):
-    pool = pooler.get_pool(cr.dbname)
-    obj = pool.get('account.journal')
-    ids = obj.search(cr, uid, [('type', '=', 'cash')])
-    res = obj.read(cr, uid, ids, ['id', 'name'], context)
-    res = [(r['id'], r['name']) for r in res]
-    res.insert(0, ('', ''))
-    return res
-
-default_journal_form = '''<?xml version="1.0"?>
-<form string="Select default journals">
-    <field name="default_journal" />
-    <newline />
-    <field name="default_journal_rebate" />
-    <newline />
-    <field name="default_journal_gift" />
-    <newline />
-</form>'''
-
-default_journal_fields = {
-    'default_journal': {'string': 'Default journal', 'type': 'selection',
-        'selection': _get_default_journal_selection,
-    },
-    'default_journal_rebate': {'string': 'Default rebate journal', 'type': 'selection',
-        'selection': _get_default_journal_selection,
-    },
-    'default_journal_gift': {'string': 'Default gift journal', 'type': 'selection',
-        'selection': _get_default_journal_selection,
-    },
-}
-
-
-class wizard_default_journal(wizard.interface):
-
-    def _set_default_journal(self, cr, uid, data, context):
-
-        def _update_default_journal_config(journal_type, journal_code, journal_descr, journal_codes, data):
-            default_journal_id = data.get('form', {}).get(journal_type) or None
-            dico = dict(name=journal_descr, code=journal_code, journal_id=default_journal_id)
-            if default_journal_id:
-                if journal_code in journal_codes:
-                    ids = [obj.id for obj in objs if obj.code == journal_code]
-                    pos_config_journal.write(cr, uid, ids, dico, context)
-                else:
-                    pos_config_journal.create(cr, uid, dico, context)
-            else:
-                ids = [obj.id for obj in objs if obj.code == journal_code]
-                pos_config_journal.write(cr, uid, ids, dico, context)
-
-        pool = pooler.get_pool(cr.dbname)
-        pos_config_journal = pool.get('pos.config.journal')
-        ids = pos_config_journal.search(cr, uid, [])
-        objs = pos_config_journal.browse(cr, uid, ids)
-        journal_codes = [str(obj.code) for obj in objs]
-
-        _update_default_journal_config('default_journal', 'DEFAULT', 'Default journal', journal_codes, data)
-        _update_default_journal_config('default_journal_rebate', 'REBATE', 'Default rebate journal', journal_codes, data)
-        _update_default_journal_config('default_journal_gift', 'GIFT', 'Default gift journal', journal_codes, data)
-
-        return {}
-
-    def _get_defaults(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        pos_config_journal = pool.get('pos.config.journal')
-        ids = pos_config_journal.search(cr, uid, [])
-        objs = pos_config_journal.browse(cr, uid, ids)
-        journal_codes = {}
-        for obj in objs:
-            journal_codes[obj.code] = int(obj.journal_id.id)
-
-        form = data['form']
-        form['default_journal'] = journal_codes.get('DEFAULT') or False
-        form['default_journal_rebate'] = journal_codes.get('REBATE') or False
-        form['default_journal_gift'] = journal_codes.get('GIFT') or False
-
-        return form
-
-    states = {
-        'init': {
-            'actions': [_get_defaults],
-            'result': {
-                'type': 'form',
-                'arch': default_journal_form,
-                'fields': default_journal_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('set_default_journal', 'Define default journals')
-                ]
-            }
-        },
-        'set_default_journal': {
-            'actions': [_set_default_journal],
-            'result': {
-                'type': 'state',
-                'state': "end",
-            }
-        },
-    }
-
-wizard_default_journal('pos.config.journal')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/wizard_scan_product.py b/addons/point_of_sale/wizard/wizard_scan_product.py
deleted file mode 100644
index 40a8a5b1246..00000000000
--- a/addons/point_of_sale/wizard/wizard_scan_product.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    Copyright (c) 2008 Sylëam Info Services. (http://www.syleam.fr) All Rights Reserved.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import pooler
-import wizard
-from osv import osv
-
-form_gencod = """<?xml version="1.0"?>
-<form string="Scan product">
-<label string="Scan Barcode" colspan="4"/>
-<field name="gencod" colspan="4" nolabel="1"/>
-</form>
-"""
-
-fields_gencod = {
-    'gencod': {'string': 'Barcode',
-               'type': 'char',
-               'size': 13,
-               'required': True}
-}
-
-
-def _scan(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    result = pool.get('pos.order.line')._scan_product(cr, uid, data['form']['gencod'], 1, data['id'])
-    return {'gencod': False}
-
-def _pre_init(self, cr, uid, data, context):
-    return {'gencod': False}
-
-class pos_scan_product(wizard.interface):
-    states = {
-        'init' : {'actions' : [_pre_init],
-                'result' : {
-                    'type': 'form',
-                    'arch': form_gencod,
-                    'fields': fields_gencod,
-                    'state': [('end','Cancel','gtk-cancel'),
-                              ('add', 'Add', 'gtk-ok', True)],
-            }
-        },
-        'add' : {'actions' : [_scan],
-                'result' : {
-                    'type': 'state',
-                    'state': 'init',
-                }
-        }
-    }
-
-pos_scan_product('pos.scan_product')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pos_sales_user.py b/addons/pos_sales_user.py
deleted file mode 100644
index 35b83148bbd..00000000000
--- a/addons/pos_sales_user.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields
-from osv import osv
-import time
-import ir
-from mx import DateTime
-import datetime
-import pooler
-from tools import config
-import wizard
-import netsvc
-
-
-sale_forecast_res_form= """<?xml version="1.0"?>
-<form string="Sale by User">
-     <field name="date_start" />
-     <field name="date_end" />
-     <field name="user_id" />
-
-</form>
-"""
-
-sale_forecast_res_field= {
-    'date_start': {'string':'Start Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'date_end': {'string':'End Date','type':'date','required': True,'default': lambda *a: time.strftime('%Y-%m-%d')},
-    'user_id': {'string': 'Salesman', 'type': 'many2many', 'relation': 'res.users', 'required': True},
-
-}
-
-
-class wizard_pos_sales_user(wizard.interface):
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : sale_forecast_res_form,
-                    'fields' : sale_forecast_res_field,
-                    'state' : [('end', 'Cancel','gtk-cancel'),('print_report', 'Print Report','gtk-print') ]}
-        },
-        'print_report' : {
-            'actions' : [],
-            'result' : {'type' : 'print',
-                   'report':'pos.sales.user',
-                    'state' : 'end'}
-        },
-    }
-wizard_pos_sales_user('pos.sales.user')
\ No newline at end of file

From fcfac9cb420c39f1ed8342cadacfa1984a93f19b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 29 Mar 2010 19:14:35 +0530
Subject: [PATCH 151/248] [Fix] point_of_sale: remove the name from init

bzr revid: sbh@tinyerp.com-20100329134435-ymoucvn1r1o4ecew
---
 addons/point_of_sale/wizard/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 67729a6a895..96b0e0f2961 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -22,7 +22,7 @@
 
 #import wizard_pos_payment
 
-import wizard_scan_product
+
 
 import wizard_return
 

From edb338d46c983a8e3a4bb2dd8b9da857704fd511 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 29 Mar 2010 19:19:21 +0530
Subject: [PATCH 152/248] [IMP] point_of_sale: changed the action name

bzr revid: sbh@tinyerp.com-20100329134921-xxy8u31qu7dx4poe
---
 addons/point_of_sale/pos_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 312c9f4726b..fe1c4b9b535 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -68,7 +68,7 @@
                                 <button name="%(pos_add_product)d" string="_Add product" type="action" states="draft"/>
                                 -->
 
-                                <button name="%(action_pos_scan_product)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
+                                <button name="%((action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
 
 

From a8451ac44d63cfaf0cf955f7afe2567552966f45 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 29 Mar 2010 19:24:10 +0530
Subject: [PATCH 153/248] [IMP]point_of_sale: small changed

bzr revid: sbh@tinyerp.com-20100329135410-fchvi6yf73r3mnys
---
 addons/point_of_sale/pos_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index fe1c4b9b535..f5ce8368bbe 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -68,7 +68,7 @@
                                 <button name="%(pos_add_product)d" string="_Add product" type="action" states="draft"/>
                                 -->
 
-                                <button name="%((action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
+                                <button name="%(action_pos_payment)d" string="Ma_ke Payment" icon="gtk-ok" type="action" states="draft,advance" context="{'record_id':'active_id'}" />
                                 <button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
 
 

From 001d95a574dd31a9b0d995f0ac55365b570d3806 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Tue, 30 Mar 2010 11:58:09 +0530
Subject: [PATCH 154/248] [FIX] mrp: print statement removed and doc string
 added in child_compute method

bzr revid: mso@mso-20100330062809-1guub3wi7xl9pcpc
---
 addons/mrp/mrp.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 6864b542396..5da3f0b66e3 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -139,8 +139,8 @@ class mrp_bom(osv.osv):
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
              @param ids: the ID of mrp.production object
-             @param name: 
-             @param arg: 
+             @param name: name of the field
+             @param arg: user defined argument
 
              @return:  True
         
@@ -157,9 +157,6 @@ class mrp_bom(osv.osv):
                 if sids:
                     bom2 = self.pool.get('mrp.bom').browse(cr, uid, sids[0], context=context)
                     result[bom.id] += map(lambda x: x.id, bom2.bom_lines)
-        print "name",name
-        print "arg",arg   
-        print "result",result            
         return result
     def _compute_type(self, cr, uid, ids, field_name, arg, context):
         res = dict(map(lambda x: (x,''), ids))

From 703c633255355721dd6a0f2aec18e7e62a6062ec Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Tue, 30 Mar 2010 12:58:28 +0530
Subject: [PATCH 155/248] [REVIEW]: fix a problem of wizard moved

bzr revid: mga@mga-20100330072828-viksmojrys3h22hf
---
 addons/stock/wizard/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 6f5a83a07b3..0fdf90e16cf 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -23,18 +23,17 @@ import stock_traceability
 import stock_move   
 import stock_partial_picking
 import stock_partial_move
-import wizard_picking_make
+#import stock_picking_make
 import wizard_replacement
 import wizard_return
 import wizard_split_lot_line
 import wizard_ups
-import inventory_merge
+import stock_inventory_merge
 import stock_inventory_set_stock_zero
 import stock_fill_inventory
 import stock_inventory_line_split
 import stock_invoice_onshipping
 import stock_location_product
 import stock_change_standard_price
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From abec91491ef1c7598a102019023a54d409b59270 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Tue, 30 Mar 2010 13:00:44 +0530
Subject: [PATCH 156/248] [FIX]: fix a problem of the wizard renamed

bzr revid: mga@mga-20100330073044-f21vak056uvr4n8k
---
 addons/stock/wizard/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 6f5a83a07b3..0fdf90e16cf 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -23,18 +23,17 @@ import stock_traceability
 import stock_move   
 import stock_partial_picking
 import stock_partial_move
-import wizard_picking_make
+#import stock_picking_make
 import wizard_replacement
 import wizard_return
 import wizard_split_lot_line
 import wizard_ups
-import inventory_merge
+import stock_inventory_merge
 import stock_inventory_set_stock_zero
 import stock_fill_inventory
 import stock_inventory_line_split
 import stock_invoice_onshipping
 import stock_location_product
 import stock_change_standard_price
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 79e654abb82cd92af5a05a8d85dc9fb119020c62 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Tue, 30 Mar 2010 13:01:38 +0530
Subject: [PATCH 157/248] [FIX]: fix problem of wizard rename

bzr revid: mga@mga-20100330073138-9ii6gcsor6ey98e5
---
 addons/stock/wizard/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 6f5a83a07b3..0fdf90e16cf 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -23,18 +23,17 @@ import stock_traceability
 import stock_move   
 import stock_partial_picking
 import stock_partial_move
-import wizard_picking_make
+#import stock_picking_make
 import wizard_replacement
 import wizard_return
 import wizard_split_lot_line
 import wizard_ups
-import inventory_merge
+import stock_inventory_merge
 import stock_inventory_set_stock_zero
 import stock_fill_inventory
 import stock_inventory_line_split
 import stock_invoice_onshipping
 import stock_location_product
 import stock_change_standard_price
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 9e6c71e60a5c1d16d68327a01ba04a33d4d7250c Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 30 Mar 2010 14:50:51 +0530
Subject: [PATCH 158/248] [FIX] Event: date field is mission on registration
 now it will take create_date

bzr revid: mra@tinyerp.com-20100330092051-b2t877x8u469930m
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f257c8df6e4..cd904657acd 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -162,7 +162,7 @@
 			<field name="arch" type="xml">
 				<tree string="Registration">
 					<field name="id"/>
-					<field name="date"/>
+					<field name="create_date"/>
 					<field name="event_id"/>
 					<field name="partner_id"/>
 					<field name="nb_register"/>

From 6f65cd47f2092a0c1a7de8058eebf21a49f3e1e0 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 30 Mar 2010 15:19:24 +0530
Subject: [PATCH 159/248] [ADD] stock: Added an osv_memory wizard 'Make
 Picking'.

bzr revid: uco@tinyerp.co.in-20100330094924-fhhuh7gxemmpu1fd
---
 addons/stock/__terp__.py                      |   1 +
 addons/stock/stock_view.xml                   |   8 +-
 addons/stock/stock_wizard.xml                 |  14 +--
 addons/stock/wizard/__init__.py               |   2 +-
 addons/stock/wizard/stock_picking_make.py     | 119 +++++++-----------
 .../stock/wizard/stock_picking_make_view.xml  |  31 +++++
 6 files changed, 92 insertions(+), 83 deletions(-)
 create mode 100644 addons/stock/wizard/stock_picking_make_view.xml

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index bc951832876..bfbcafd2e28 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -52,6 +52,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_inventory_line_split_view.xml",
         "wizard/stock_change_standard_price_view.xml",
         "wizard/stock_traceability_view.xml",
+        "wizard/stock_picking_make_view.xml",
         "stock_workflow.xml",
         "stock_incoterms.xml",
         "stock_wizard.xml",        
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 877ea313d1b..2335b66cbad 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -585,7 +585,7 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(make_picking)d" 
+                        <button name="%(act_stock_make_picking_wizard)d" 
                             states="confirmed,assigned" 
                             string="Make Picking" 
                             type="action" 
@@ -752,7 +752,7 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(make_picking)d" 
+                        <button name="%(act_stock_make_picking_wizard)d" 
                                 states="assigned" 
                                 string="Make Picking" 
                                 type="action" 
@@ -946,7 +946,7 @@
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="origin" select="2" readonly="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(make_picking)d" 
+                        <button name="%(act_stock_make_picking_wizard)d" 
                                 states="assigned" 
                                 string="Make Picking" 
                                 type="action" 
@@ -1141,7 +1141,7 @@
                         <field name="invoice_state" select="2" string="Invoice Control"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(make_picking)d" 
+                        <button name="%(act_stock_make_picking_wizard)d" 
                                 states="confirmed,assigned" 
                                 string="Make Picking" 
                                 type="action" 
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index f9a2dfc93b0..2ac9c290be6 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -15,13 +15,13 @@
             string="Split move line"/>
         
 
-		<wizard 
-			id="make_picking" 
-			model="stock.picking"
-			menu="False"
-			keyword="client_action_multi"
-			name="stock.picking.make" 
-			string="Make Picking"/>
+<!--		<wizard -->
+<!--			id="make_picking" -->
+<!--			model="stock.picking"-->
+<!--			menu="False"-->
+<!--			keyword="client_action_multi"-->
+<!--			name="stock.picking.make" -->
+<!--			string="Make Picking"/>-->
 
 	    <wizard
 	        id="return_picking"
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 0fdf90e16cf..7c87212571c 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -23,7 +23,7 @@ import stock_traceability
 import stock_move   
 import stock_partial_picking
 import stock_partial_move
-#import stock_picking_make
+import stock_picking_make
 import wizard_replacement
 import wizard_return
 import wizard_split_lot_line
diff --git a/addons/stock/wizard/stock_picking_make.py b/addons/stock/wizard/stock_picking_make.py
index 6ac54ee3bc1..9d26595f00e 100644
--- a/addons/stock/wizard/stock_picking_make.py
+++ b/addons/stock/wizard/stock_picking_make.py
@@ -20,83 +20,60 @@
 ##############################################################################
 
 from osv import fields, osv
-from service import web_services
-from tools.misc import UpdateableStr, UpdateableDict
-from tools.translate import _
 import netsvc
-import pooler
-import time
-import wizard
 
 class stock_picking_make(osv.osv_memory):
-    _name = "stock.picking.make"
-    _description = "Make picking"
+    _name = 'stock.picking.make'
+    _description = "Make Picking"
+    
     _columns = {
-            'pickings': fields.many2many('stock.picking', 'Picking', required=True),
-            }
-
-ARCH = '''<?xml version="1.0"?>
-<form string="Make picking">
-    <field name="pickings" nolabel="1" colspan="4"
-        width="600" height="300"/>
-</form>'''
-
-FIELDS = {
-    'pickings': {
-        'string': 'Picking',
-        'type': 'many2many',
-        'relation': 'stock.picking',
-        'readonly': True,
-    },
-}
-
-def _get_value(obj, cursor, user, data, context):
-    pool = pooler.get_pool(cursor.dbname)
-    picking_obj = pool.get('stock.picking')
-
-    picking_ids = picking_obj.search(cursor, user, [
-        ('id', 'in', data['ids']),
-        ('state', '<>', 'done'),
-        ('state', '<>', 'cancel')], context=context)
-    return {'pickings': picking_ids}
-
-def _make_packing(obj, cursor, user, data, context):
-    wkf_service = netsvc.LocalService('workflow')
-    pool = pooler.get_pool(cursor.dbname)
-    picking_obj = pool.get('stock.picking')
-    ids = data['form']['pickings'][0][2]
-    print"-------ids--------",ids
-    picking_obj.force_assign(cursor, user, ids)
-    picking_obj.action_move(cursor, user, ids)
-    for picking_id in ids:
-        wkf_service.trg_validate(user, 'stock.picking', picking_id,
-                'button_done', cursor)
-    return {}
-
-class stock_picking_make(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_value],
-            'result': {
-                'type': 'form',
-                'arch': ARCH,
-                'fields': FIELDS,
-                'state': [
-                    ('end', 'Cancel', 'gtk-cancel'),
-                    ('make', 'Ok', 'gtk-apply', True)
-                ],
-            },
-        },
-        'make': {
-            'actions': [_make_packing],
-            'result': {
-                'type': 'state',
-                'state':'end',
-            },
-        },
+        'picking_ids': fields.many2many('stock.picking', 'stock_picking_ids', 'parent_id', 'child_id', 'Pickings'),
     }
 
-stock_picking_make('stock.picking.make')
+    def default_get(self, cursor, user, fields, context):
+        """ 
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """ 
+        res = super(stock_picking_make, self).default_get(cursor, user, fields, context=context)
+        record_ids = context and context.get('active_ids',False) or False
+        if record_ids:
+            picking_obj = self.pool.get('stock.picking')
+            picking_ids = picking_obj.search(cursor, user, [
+                ('id', 'in', record_ids),
+                ('state', '<>', 'done'),
+                ('state', '<>', 'cancel')], context=context)
+            res['picking_ids'] = picking_ids
+        return res
+    
+    def make_packing(self, cursor, user, ids, context):
+        """ 
+         Make Picking.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """ 
+        record_ids = context and context.get('active_ids',False) or False
+        wkf_service = netsvc.LocalService('workflow')
+        picking_obj = self.pool.get('stock.picking')
+        data = self.read(cursor, user, ids[0])
+        pick_ids = data['picking_ids']
+        picking_obj.force_assign(cursor, user, pick_ids)
+        picking_obj.action_move(cursor, user, pick_ids)
+        for picking_id in ids:
+            wkf_service.trg_validate(user, 'stock.picking', picking_id,
+                    'button_done', cursor)
+        return {}
+
+stock_picking_make()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_picking_make_view.xml b/addons/stock/wizard/stock_picking_make_view.xml
new file mode 100644
index 00000000000..fa77042c5d8
--- /dev/null
+++ b/addons/stock/wizard/stock_picking_make_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+	    <record id="view_stock_make_picking_wizard" model="ir.ui.view">
+            <field name="name">Make Picking</field>
+            <field name="model">stock.picking.make</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Make Picking">
+				    <field name="picking_ids" nolabel="1" colspan="4"
+				        width="600" height="300"/>
+                	<separator string="" colspan="4" />
+                	<button icon='gtk-cancel' special="cancel"
+                		string="Cancel" />
+                	<button name="make_packing" string="Ok"
+                		type="object" icon="gtk-apply" />
+                </form>
+            </field>
+        </record>
+        
+        <record id="act_stock_make_picking_wizard" model="ir.actions.act_window">
+            <field name="name">Make Picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.picking.make</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+	</data>
+</openerp>

From 6f2be32fcff40b7785fa8df32be0b47315fe3dc4 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Tue, 30 Mar 2010 16:02:08 +0530
Subject: [PATCH 160/248] [IMP] stock:inventory_merge wizard has been converted
 into osv memory

bzr revid: mso@mso-20100330103208-ftvqnm43yujxazku
---
 addons/stock/__terp__.py                      |  1 +
 addons/stock/wizard/stock_inventory_merge.py  | 16 ++++++++---
 .../wizard/stock_inventory_merge_view.xml     | 27 +++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 addons/stock/wizard/stock_inventory_merge_view.xml

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index bfbcafd2e28..4f500f78673 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -48,6 +48,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_inventory_set_stock_zero_view.xml",
         "wizard/stock_fill_inventory_view.xml",
         "wizard/stock_invoice_onshipping_view.xml",
+        "wizard/stock_inventory_merge_view.xml",
         "wizard/stock_location_product_view.xml",
         "wizard/stock_inventory_line_split_view.xml",
         "wizard/stock_change_standard_price_view.xml",
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index 64620054ff8..1c11ad8e2ad 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -36,7 +36,18 @@ class stock_inventory_merge(osv.osv_memory):
             }
 
     def do_merge(self, cr, uid, ids, context):
-
+        """ 
+             To merge selected Inventories.
+            
+             @param self: The object pointer.
+             @param cr: A database cursor
+             @param uid: ID of the user currently logged in
+             @param ids: List of IDs selected 
+             @param context: A standard dictionary 
+             
+             @return: 
+        
+        """ 
         invent_obj = self.pool.get('stock.inventory')
         invent_line_obj = self.pool.get('stock.inventory.line')
 
@@ -46,10 +57,7 @@ class stock_inventory_merge(osv.osv_memory):
             raise osv.except_osv(_('Warning'),
             _('Please select at least two inventories.'))
 
-
-
         for inventory in invent_obj.browse(cr, uid, context['active_ids'], context=context):
-            print"-------active-ids----",context['active_ids']
             if inventory.state == "done":
                 raise osv.except_osv(_('Warning'),
                 _('Merging is only allowed on draft inventories.'))
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
new file mode 100644
index 00000000000..e8af34c0c71
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+	
+		<record id="name_form" model="ir.ui.view">
+		        <field name="name">stock.inventory.merge.form</field>
+		        <field name="model">stock.inventory.merge</field>
+		        <field name="type">form</field>
+		        <field name="arch" type="xml">
+		              <form string="Merge inventories">
+				    <separator colspan="4" string="Merge inventories" />
+				    <label string="Do you want to merge theses inventories ?"/>
+				<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+				<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>				
+				</form>
+			</field>
+		</record>
+		 <act_window name="Merge inventories"		    
+			res_model="stock.inventory.merge"
+			src_model="stock.inventory"
+			view_mode="form"
+			target="new"        
+			key2="client_action_multi"    
+			id="action_view_stock_merge_inventories"/>	
+		
+	</data>
+</openerp>

From 39a282b830a0ec7e186c225c5012b0c1cdbd23bb Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Tue, 30 Mar 2010 17:47:54 +0530
Subject: [PATCH 161/248] [IMP] Event: Event confirm registration wizard
 convert to osv memory type wizard

bzr revid: mra@tinyerp.com-20100330121754-7l3qhu8kggs4yxqi
---
 addons/event/__terp__.py                      |  2 +
 addons/event/event.py                         | 29 ++++++-
 addons/event/event_view.xml                   |  2 +-
 addons/event/event_wizard.xml                 | 21 +----
 addons/event/wizard/__init__.py               |  2 +-
 addons/event/wizard/confirm_registration.py   | 80 -------------------
 .../wizard/event_confirm_registration.py      | 47 +++++++++++
 .../event_confirm_registration_view.xml       | 33 ++++++++
 8 files changed, 112 insertions(+), 104 deletions(-)
 delete mode 100644 addons/event/wizard/confirm_registration.py
 create mode 100644 addons/event/wizard/event_confirm_registration.py
 create mode 100644 addons/event/wizard/event_confirm_registration_view.xml

diff --git a/addons/event/__terp__.py b/addons/event/__terp__.py
index 654492e4ddf..bd61f486a05 100644
--- a/addons/event/__terp__.py
+++ b/addons/event/__terp__.py
@@ -42,12 +42,14 @@
     'init_xml': ['event_data.xml'],
     'update_xml': [
         'event_wizard.xml',
+        'wizard/event_confirm_registration_view.xml',
         'event_view.xml',
         'event_sequence.xml',
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_registration_view.xml',
         'wizard/event_registrations_partner.xml',
+
     ],
     'demo_xml': ['event_demo.xml'],
     'installable': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index e5485edc44e..ffdeb84d15d 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -151,6 +151,31 @@ event()
 
 class event_registration(osv.osv):
 
+    def check_confirm(self, cr, uid, ids, context):
+        mod_obj = self.pool.get('ir.model.data')
+        current_registration = self.browse(cr, uid, [ids[0]])[0]
+        total_confirmed = current_registration.event_id.register_current + current_registration.nb_register
+        if total_confirmed <= current_registration.event_id.register_max or current_registration.event_id.register_max == 0:
+            self.write(cr, uid, [ids[0]], {'state':'open'}, context=context)
+            self._history(cr, uid, [ids[0]], 'Open', history=True)
+            self.mail_user(cr, uid, [ids[0]])
+            return True
+        else:
+            model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_event_confirm_registration')], context=context)
+            resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            context.update({'reg_id': ids[0]})
+            return {
+                'name': _('Confirm Registration'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'event.confirm.registration',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True
+            }
+
     def _history(self, cr, uid,ids,keyword, history=False, email=False, context={}):
         for case in self.browse(cr, uid, ids):
             if not case.case_id:
@@ -244,14 +269,14 @@ class event_registration(osv.osv):
         "invoice_id":fields.many2one("account.invoice","Invoice"),
         'date_closed': fields.datetime('Closed', readonly=True),
         'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),  
+        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
         'categ_id': fields.many2one('crm.case.categ','Category', domain="[('section_id','=',section_id)]"),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
                                                                         " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
         'som': fields.many2one('res.partner.som', 'State of Mind', help="The minds states allow to define a value scale which represents" \
                                                                        "the partner mentality in relation to our services.The scale has" \
                                                                        "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
-                      
+
     }
     _defaults = {
         'nb_register': lambda *a: 1,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index cd904657acd..3655e73afe6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -203,7 +203,7 @@
 						<group col="8" colspan="4">
 							<field name="state" select="1" colspan="2"/>
                             <button name="button_reg_close" string="Registration Invoiced" states="open" type="object" icon="gtk-print"/>
-                            <button name="%(event_confirm_registration)d" string="Confirm Registration" states="draft" type="action" icon="gtk-apply"/>
+                            <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                             <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
 						</group>
 					</page>
diff --git a/addons/event/event_wizard.xml b/addons/event/event_wizard.xml
index 2888bd8587f..7042b4e67b5 100644
--- a/addons/event/event_wizard.xml
+++ b/addons/event/event_wizard.xml
@@ -2,31 +2,12 @@
 <openerp>
     <data>
 
-<!--        <wizard
-            string="Registrations"
-            model="event.event"
-            name="wizard_event_registration"
-            id="wizard_event_registration"/> -->
-
-<!--        <wizard
-            string="List Register Partners"
-            model="event.event"
-            name="event.event_reg_partners"
-            id="wizard_event_reg_partners"/> -->
-
-        <wizard string="Make Invoice"
+       <wizard string="Make Invoice"
             model="event.registration"
             name="event.reg_make_invoice"
             id="event_reg_invoice"
             menu="True"
             />
 
-         <wizard string="Confirm Registration"
-            model="event.registration"
-            name="event.confirm_registration"
-            id="event_confirm_registration"
-            menu="False"
-            />
-
     </data>
 </openerp>
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index f197adebe0a..b151b760d9f 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -22,5 +22,5 @@
 import event_registration
 import make_invoice
 import event_registrations_partner
-import confirm_registration
+import event_confirm_registration
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/confirm_registration.py b/addons/event/wizard/confirm_registration.py
deleted file mode 100644
index 3c0cdac180d..00000000000
--- a/addons/event/wizard/confirm_registration.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import ir
-import pooler
-from osv.osv import except_osv
-from osv import fields,osv
-import netsvc
-
-ARCH = '''<?xml version="1.0"?>
-<form string="Registration Confirmation">
-    <label string="The event limit is reached. What do you want to do?" colspan="4"/>
-</form>'''
-
-ARCH_fields={}
-
-def _confirm(self, cr, uid, data, context):
-    registration_obj = pooler.get_pool(cr.dbname).get('event.registration')
-    current_registration = registration_obj.browse(cr, uid, [data['id']])[0]
-
-    total_confirmed = current_registration.event_id.register_current + current_registration.nb_register
-    if total_confirmed <= current_registration.event_id.register_max or current_registration.event_id.register_max == 0:
-        return 'confirm'
-    return 'split'
-
-
-def _check_confirm(self, cr, uid, data, context):
-    registration_obj = pooler.get_pool(cr.dbname).get('event.registration')
-    registration_obj.write(cr, uid, [data['id']], {'state':'open',})
-    registration_obj._history(cr, uid, [data['id']], 'Open', history=True)
-    registration_obj.mail_user(cr,uid,[data['id']])
-    return {}
-
-
-class confirm_registration(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'choice', 'next_state' : _confirm}
-        },
-
-        'split' : {
-            'actions' : [],
-            'result' : {'type' : 'form',
-                    'arch' : ARCH,'fields':ARCH_fields,
-                    'state' : [('end', 'Cancel'),('confirm', 'Confirm Anyway') ]}
-        },
-
-        'confirm' : {
-            'actions' : [],
-            'result' : {'type' : 'action', 'action': _check_confirm, 'state' : 'end'}
-        },
-        'end' : {
-            'actions' : [],
-            'result': {'type': 'state', 'state': 'end'},
-        },
-    }
-
-confirm_registration('event.confirm_registration')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_confirm_registration.py b/addons/event/wizard/event_confirm_registration.py
new file mode 100644
index 00000000000..f8a9d02de7d
--- /dev/null
+++ b/addons/event/wizard/event_confirm_registration.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class event_confirm_registration(osv.osv_memory):
+    """
+    Confirm Event Registration
+    """
+    _name = "event.confirm.registration"
+    _description = "Event Registraion"
+    _columns = {
+        'msg': fields.text('Message', readonly=True),
+               }
+    _defaults={
+       'msg':lambda *a:'The event limit is reached. What do you want to do?'
+               }
+
+    def confirm(self, cr, uid, ids, context):
+        registration_obj = self.pool.get('event.registration')
+        reg_id = context.get('reg_id', False) or context.get('active_id', False)
+        if reg_id:
+            registration_obj.write(cr, uid, [reg_id], {'state':'open',})
+            registration_obj._history(cr, uid, [reg_id], 'Open', history=True)
+            registration_obj.mail_user(cr,uid,[reg_id])
+        return {}
+
+event_confirm_registration()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_confirm_registration_view.xml b/addons/event/wizard/event_confirm_registration_view.xml
new file mode 100644
index 00000000000..03733d2045d
--- /dev/null
+++ b/addons/event/wizard/event_confirm_registration_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_event_confirm_registration" model="ir.ui.view">
+            <field name="name">Registration Confirmation</field>
+            <field name="model">event.confirm.registration</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Registration Confirmation">
+              	<field name="msg"/>
+              	<separator string="" colspan="4"/>
+                <group colspan="4" col="6">
+            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+            		<button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
+                </group>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_event_confirm_registration" model="ir.actions.act_window">
+            <field name="name">Registrations</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.confirm.registration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_event_confirm_registration"/>
+	        <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+    </data>
+</openerp>
\ No newline at end of file

From 360d4c8847da812d681023b0e4a2296a268868a9 Mon Sep 17 00:00:00 2001
From: tiny <tiny@tiny-desktop>
Date: Tue, 30 Mar 2010 18:17:02 +0530
Subject: [PATCH 162/248] [ADD] Account: wizards convert to osv memory
 (Total:8)--author=aag(OpenERP)

bzr revid: tiny@tiny-desktop-20100330124702-6fuxzmazcmanoo7l
---
 addons/account/__terp__.py                    |   9 +
 addons/account/account_invoice_view.xml       |   2 +-
 addons/account/account_menuitem.xml           |   1 +
 addons/account/account_view.xml               |  18 +-
 addons/account/account_wizard.xml             |  30 ++-
 addons/account/wizard/__init__.py             |  25 +-
 addons/account/wizard/account_chart.py        |  75 ++++++
 addons/account/wizard/account_chart_view.xml  |  40 ++++
 .../wizard/account_fiscalyear_close_state.py  |  65 +++++
 .../wizard/account_fiscalyear_close_state.xml |  39 +++
 .../account/wizard/account_invoice_refund.py  | 191 +++++++++++++++
 .../wizard/account_invoice_refund_view.xml    |  45 ++++
 .../wizard/account_move_bank_reconcile.py     |  63 +++++
 .../account_move_bank_reconcile_view.xml      |  33 +++
 addons/account/wizard/account_move_journal.py |  98 ++++++++
 .../wizard/account_move_journal_view.xml      |  41 ++++
 .../account_move_line_reconcile_select.py     |  58 +++++
 ...ccount_move_line_reconcile_select_view.xml |  41 ++++
 ...> account_move_line_unreconcile_select.py} |  55 ++---
 ...ount_move_line_unreconcile_select_view.xml |  38 +++
 addons/account/wizard/account_period_close.py |  54 +++++
 .../wizard/account_period_close_view.xml      |  45 ++++
 addons/account/wizard/wizard_account_chart.py |  80 -------
 .../account/wizard/wizard_bank_reconcile.py   |  67 ------
 .../wizard/wizard_fiscalyear_close_state.py   |  71 ------
 addons/account/wizard/wizard_journal.py       |  99 --------
 .../account/wizard/wizard_reconcile_select.py |  61 -----
 addons/account/wizard/wizard_refund.py        | 226 ------------------
 .../wizard/wizard_unreconcile_select.py       |  59 -----
 29 files changed, 1008 insertions(+), 721 deletions(-)
 create mode 100644 addons/account/wizard/account_chart.py
 create mode 100644 addons/account/wizard/account_chart_view.xml
 create mode 100644 addons/account/wizard/account_fiscalyear_close_state.py
 create mode 100644 addons/account/wizard/account_fiscalyear_close_state.xml
 create mode 100644 addons/account/wizard/account_invoice_refund.py
 create mode 100644 addons/account/wizard/account_invoice_refund_view.xml
 create mode 100644 addons/account/wizard/account_move_bank_reconcile.py
 create mode 100644 addons/account/wizard/account_move_bank_reconcile_view.xml
 create mode 100644 addons/account/wizard/account_move_journal.py
 create mode 100644 addons/account/wizard/account_move_journal_view.xml
 create mode 100644 addons/account/wizard/account_move_line_reconcile_select.py
 create mode 100644 addons/account/wizard/account_move_line_reconcile_select_view.xml
 rename addons/account/wizard/{wizard_period_close.py => account_move_line_unreconcile_select.py} (50%)
 create mode 100644 addons/account/wizard/account_move_line_unreconcile_select_view.xml
 create mode 100644 addons/account/wizard/account_period_close.py
 create mode 100644 addons/account/wizard/account_period_close_view.xml
 delete mode 100644 addons/account/wizard/wizard_account_chart.py
 delete mode 100644 addons/account/wizard/wizard_bank_reconcile.py
 delete mode 100644 addons/account/wizard/wizard_fiscalyear_close_state.py
 delete mode 100644 addons/account/wizard/wizard_journal.py
 delete mode 100644 addons/account/wizard/wizard_reconcile_select.py
 delete mode 100644 addons/account/wizard/wizard_refund.py
 delete mode 100644 addons/account/wizard/wizard_unreconcile_select.py

diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 6faf8772a67..10ecea48d77 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -46,7 +46,16 @@ module named account_voucherss
         'security/account_security.xml',
         'security/ir.model.access.csv',
         'account_menuitem.xml',
+        'wizard/account_invoice_refund_view.xml',
+        'wizard/account_period_close_view.xml',
+        'wizard/account_fiscalyear_close_state.xml',
+        'wizard/account_chart_view.xml',
+        'wizard/account_move_bank_reconcile_view.xml',
+        'wizard/account_move_line_reconcile_select_view.xml',
+        'wizard/account_move_journal_view.xml',
         'account_wizard.xml',
+        'wizard/account_move_line_unreconcile_select_view.xml',
+
         'account_view.xml',
         'account_end_fy.xml',
         'account_invoice_view.xml',
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index c74868c342c..feeb38dd51b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -153,7 +153,7 @@
                         <field name="period_id" groups="base.group_user"/>
                         <group colspan="2" col="1" groups="base.group_user">
                             <label align="0.0" string="(keep empty to use the current period)"/>
-                        </group>                        
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 260d14e38e8..37d539a4b25 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -24,3 +24,4 @@
 
     </data>
 </openerp>
+
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e43b2249ae5..88462098852 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -668,9 +668,9 @@
             <field eval="True" name="object"/>
         </record>
 
-        <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/>
+ <!--       <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/>
         <menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard" sequence="5"/>
-
+-->
         <!--
     Entries lines
     -->
@@ -1007,9 +1007,9 @@
         <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
 
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
-        <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
+    <!--    <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
         <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
-
+ -->
 
 
         <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
@@ -1079,8 +1079,14 @@
             groups="group_account_user"/>
 
         <menuitem action="action_bank_statement_reconciliation_form" id="menu_action_account_bank_reconcile_tree" parent="next_id_30"/>
-        <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/>
-        <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/>
+  <!--        <wizard id="action_account_bank_reconcile_tree" menu="False" model="account.move.line" name="account.move.bank.reconcile" string="Bank reconciliation"/> -->
+    <!--     <menuitem action="action_account_bank_reconcile_tree" id="menu_action_account_bank_reconcile_check_tree" parent="account.next_id_30" type="wizard"/>   -->
+
+<!--  bank reconsilation  -->
+        <menuitem action="action_account_bank_reconcile_tree"
+        	id="menu_action_account_bank_reconcile_check_tree"
+        	parent="account.next_id_30" />
+
 
         <act_window
             domain="[('account_id', '=', active_id)]"
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index ebfed02eb3c..b17df5b4edb 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -7,7 +7,14 @@
 			name="account.balance.account.balance.report"
 			keyword="client_print_multi"
 			id="wizard_account_balance_compare_report"/>
-        <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Credit Note" groups="base.group_user"/>
+
+     <!--     <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Credit Note" groups="base.group_user"/>   -->
+
+ <!--    <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Credit Note" groups="base.group_user"/>-->
+
+<!--  for test only -->
+
+
 
         <wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice" groups="base.group_user"/>
 
@@ -21,8 +28,9 @@
             type="wizard"
             sequence="1"/>
 
-        <wizard id="wizard_fiscalyear_close_state" menu="False" model="account.fiscalyear" name="account.fiscalyear.close.state" string="Close a Fiscal Year"/>
+  <!--     <wizard id="wizard_fiscalyear_close_state" menu="False" model="account.fiscalyear" name="account.fiscalyear.close.state" string="Close a Fiscal Year"/>
         <menuitem action="wizard_fiscalyear_close_state" id="menu_wizard_fy_close_state" parent="menu_account_end_year_treatments" type="wizard"/>
+ -->
 
         <wizard
             id="wizard_open_closed_fiscalyear"
@@ -35,12 +43,19 @@
             id="menu_wizard_open_closed_fy"
             sequence="2"
             parent="account.menu_account_end_year_treatments" type="wizard"/>
+<!--  period close
 
-        <wizard id="wizard_period_close" model="account.period" name="account.period.close" string="Close a Period"/>
 
+       <wizard id="wizard_period_close" model="account.period" name="account.period.close" string="Close a Period"/>
+
+      <wizard id="action_account_period_close" model="account.period" name="account.period.close" string="Close a Period"/>
+
+
+-->
         <!-- automatic reconcile -->
         <wizard id="wizard_automatic_reconcile" menu="False" model="account.account" name="account.automatic.reconcile" string="Automatic reconciliation"/>
-        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/><menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>
+        <menuitem id="next_id_20" name="Reconciliation" parent="menu_finance_periodical_processing"/>
+        <menuitem action="wizard_automatic_reconcile" id="menu_automatic_reconcile" parent="next_id_20" type="wizard"/>
 
         <!-- Import entry in statement -->
 
@@ -57,19 +72,22 @@
         <wizard id="wizard_reconcile_unreconcile" model="account.move.reconcile" name="account.reconcile.unreconcile" string="Unreconcile Entries"/>
 
 
-        <wizard id="wizard_reconcile_select" menu="False" model="account.move.line" name="account.move.line.reconcile.select" string="Reconcile entries"/>
+ <!--       <wizard id="wizard_reconcile_select" menu="False" model="account.move.line" name="account.move.line.reconcile.select" string="Reconcile entries"/>
         <menuitem action="wizard_reconcile_select" id="menu_reconcile_select" parent="account.next_id_20" type="wizard"/>
+ -->
 
         <!-- unreconcile -->
         <wizard id="wizard_unreconcile" model="account.move.line" name="account.move.line.unreconcile" string="Unreconcile Entries"/>
 
+<!--   unreconcile
+
         <wizard id="wizard_unreconcile_select" menu="False" model="account.move.line" name="account.move.line.unreconcile.select" string="Unreconcile entries"/>
         <menuitem action="wizard_unreconcile_select" id="menu_unreconcile_select" parent="account.next_id_20" type="wizard"/>
+ -->
 
         <!-- subscriptions -->
         <wizard id="wizard_generate_subscription" menu="False" model="account.subscription" name="account.subscription.generate" string="Create subscription entries"/>
         <menuitem action="wizard_generate_subscription" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" type="wizard"/>
-
         <!-- Aged partner balance -->
         <wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged Partner Balance"/>
         <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 7d6e7b1226d..f44be1f804c 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,40 +15,36 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import wizard_automatic_reconcile
-import wizard_reconcile_select
-import wizard_unreconcile_select
+import account_move_line_reconcile_select
+import account_move_line_unreconcile_select
 import wizard_reconcile
 import wizard_unreconcile
-import wizard_refund
+import account_invoice_refund
 import wizard_pay_invoice
-
-import wizard_journal
+import account_move_journal
 import wizard_journal_select
-import wizard_bank_reconcile
+import account_move_bank_reconcile
 import wizard_subscription_generate
-
 import wizard_aged_trial_balance
 import wizard_general_ledger_report
 import wizard_third_party_ledger
 import wizard_account_balance_report
 import wizard_partner_balance_report
-
-import wizard_period_close
+import account_period_close
 import wizard_fiscalyear_close
-import wizard_fiscalyear_close_state
+import account_fiscalyear_close_state
 import wizard_open_closed_fiscalyear
 
 import wizard_vat
 import wizard_compare_account_balance_report
-
 import wizard_invoice_state
 import wizard_account_duplicate
-import wizard_account_chart
+import account_chart
 import wizard_move_line_select
 
 import wizard_validate_account_move
@@ -64,5 +60,4 @@ import wizard_change_currency
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
new file mode 100644
index 00000000000..20c6cb7c858
--- /dev/null
+++ b/addons/account/wizard/account_chart.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_chart(osv.osv_memory):
+    """
+    For Chart of Accounrs
+        """
+    _name = "account.chart"
+    _description = "chart"
+    _columns = {
+       'fiscalyear': fields.many2one('account.fiscalyear', \
+                                'Fiscal year',  \
+                                help = 'Keep empty for all open fiscal years'),
+       'target_move': fields.selection([
+                                            ('all', 'All Entries'),
+                                            ('posted', 'All Posted Entries'),
+                                     ], 'Target Moves', required = True),
+
+              }
+    def _get_defaults(self, cr, uid, context={}):
+            """Return default Fiscalyear value"""
+            fiscalyear_obj = self.pool.get('account.fiscalyear')
+            fiscalyear = fiscalyear_obj.find(cr, uid)
+            return fiscalyear
+
+    def account_chart_open_window(self, cr, uid, ids, context={}):
+            """
+            Opens chart of Accounts
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of account chart’s IDs
+            @return: dictionary of Open account chart window on given fiscalyear and all Entries or posted entries
+            """
+            mod_obj = self.pool.get('ir.model.data')
+            act_obj = self.pool.get('ir.actions.act_window')
+            for data in  self.read(cr, uid, ids,context=context):
+                result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
+                id = mod_obj.read(cr, uid, [result], ['res_id'],context=context)[0]['res_id']
+                result = act_obj.read(cr, uid, [id], context=context)[0]
+                result['context'] = str({'fiscalyear': data['fiscalyear'], \
+                                            'state': data['target_move']})
+                if data['fiscalyear']:
+                    result['name'] += ':' + self.pool.get('account.fiscalyear').read(cr, uid, [data['fiscalyear']],context=context)[0]['code']
+                return result
+
+
+    _defaults = {
+        'fiscalyear': _get_defaults,
+        'target_move': lambda * a: 'all'
+                }
+account_chart()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
new file mode 100644
index 00000000000..66da81d24f6
--- /dev/null
+++ b/addons/account/wizard/account_chart_view.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+  		<record id="view_account_chart" model="ir.ui.view">
+            <field name="name">account.chart.form</field>
+            <field name="model">account.chart</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account charts">
+                	<group colspan="4" >
+                		 <field name="fiscalyear"/>
+              			 <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
+                		 <field name="target_move"/>
+                    </group>
+                       	 <separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    	<button icon="gtk-open" string="Open Charts"
+                    		name="account_chart_open_window" type="object" />
+                    </group>
+                </form>
+            </field>
+  		</record>
+
+        <record id="action_account_chart" model="ir.actions.act_window">
+            <field name="name">Chart of Accounts</field>
+            <field name="res_model">account.chart</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_chart"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem icon="STOCK_INDENT" action="action_account_chart"
+        	id="menu_action_account_tree2"
+        	parent="account.menu_finance_charts" />
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
new file mode 100644
index 00000000000..eeb202a0c82
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_fiscalyear_close_state(osv.osv_memory):
+    """
+    Closes  Account Fiscalyear
+    """
+    _name = "account.fiscalyear.close.state"
+    _description = "Fiscalyear Close state"
+    _columns = {
+       'fy_id': fields.many2one('account.fiscalyear', \
+                                 'Fiscal Year to close', required=True),
+       'sure': fields.boolean('Check this box', required=False)
+              }
+
+    def data_save(self, cr, uid, ids, context={}):
+        """
+        This function close account fiscalyear
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Account fiscalyear close state’s IDs
+
+        """
+        for data in  self.read(cr, uid, ids,context=context):
+            if not data['sure']:
+                raise osv.except_osv(_('UserError'), _('Closing of states \
+cancelled, please check the box !'))
+            fy_id = data['fy_id']
+
+            cr.execute('UPDATE account_journal_period ' \
+                        'SET state = %s ' \
+                        'WHERE period_id IN (SELECT id FROM account_period \
+                        WHERE fiscalyear_id = %s)',
+                    ('done', fy_id))
+            cr.execute('UPDATE account_period SET state = %s ' \
+                    'WHERE fiscalyear_id = %s', ('done', fy_id))
+            cr.execute('UPDATE account_fiscalyear ' \
+                    'SET state = %s WHERE id = %s', ('done', fy_id))
+            return {}
+
+account_fiscalyear_close_state()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
new file mode 100644
index 00000000000..370aacbf2e3
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_fiscalyear_close_state" model="ir.ui.view">
+            <field name="name">account.fiscalyear.close.state.form</field>
+            <field name="model">account.fiscalyear.close.state</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Close states of Fiscal year and periods">
+                	<group colspan="4" >
+                		 <field name="fy_id"  domain = "[('state','=','draft')]"/>
+              			 <separator string="Are you sure you want to close the fiscal year ?" colspan="4"/>
+                		 <field name="sure"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-close" string="Close states" name="data_save" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+        <record id="action_account_fiscalyear_close_state" model="ir.actions.act_window">
+            <field name="name">Close a Fiscal Year</field>
+            <field name="res_model">account.fiscalyear.close.state</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_fiscalyear_close_state"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_account_fiscalyear_close_state"
+        	id="menu_wizard_fy_close_state"
+        	parent="menu_account_end_year_treatments" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
new file mode 100644
index 00000000000..cc69311b2f7
--- /dev/null
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -0,0 +1,191 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+import netsvc
+
+
+class account_invoice_refund(osv.osv_memory):
+
+    """Refunds invoice."""
+
+    _name = "account.invoice.refund"
+    _description = "Invoice Refund"
+    _columns = {
+       'date': fields.date('Operation date', required=False),
+       'period': fields.many2one('account.period', 'Force period', required=False),
+       'description': fields.char('Description', size=150, required=True),
+                }
+
+    def compute_refund(self, cr, uid, ids, mode, context={}):
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: the account invoice refund’s ID or list of IDs
+
+        """
+        inv_obj = self.pool.get('account.invoice')
+        reconcile_obj = self.pool.get('account.move.reconcile')
+        account_m_line_obj = self.pool.get('account.move.line')
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        for form in  self.read(cr, uid, ids,context=context):
+            created_inv = []
+            date = False
+            period = False
+            description = False
+            for inv in inv_obj.browse(cr, uid, context['active_ids'],context=context):
+                if inv.state in ['draft', 'proforma2', 'cancel']:
+                    raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
+                if form['period'] :
+                    period = form['period']
+                else:
+                    period = inv.period_id and inv.period_id.id or False
+
+                if form['date'] :
+                    date = form['date']
+                    if not form['period'] :
+                            cr.execute("select name from ir_model_fields \
+                                            where model = 'account.period' \
+                                            and name = 'company_id'")
+                            result_query = cr.fetchone()
+                            if result_query:
+                                cr.execute("""SELECT id
+                                          from account_period where date('%s')
+                                          between date_start AND  date_stop \
+                                          and company_id = %s limit 1 """,
+                                          (form['date'], self.pool.get('res.users').browse(cr, uid, uid,context=context).company_id.id,))
+                            else:
+                                cr.execute("""SELECT id
+                                        from account_period where date('%s')
+                                        between date_start AND  date_stop  \
+                                        limit 1 """, (form['date'],))
+                            res = cr.fetchone()
+                            if res:
+                                period = res[0]
+                else:
+                    date = inv.date_invoice
+
+                if form['description'] :
+                    description = form['description']
+                else:
+                    description = inv.name
+
+                if not period:
+                    raise osv.except_osv(_('Data Insufficient !'), \
+                                            _('No Period found on Invoice!'))
+
+                refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description)
+                refund = inv_obj.browse(cr, uid, refund_id[0],context=context)
+                inv_obj.write(cr, uid, [refund.id], {'date_due': date,
+                                                'check_total': inv.check_total})
+                inv_obj.button_compute(cr, uid, refund_id)
+
+                created_inv.append(refund_id[0])
+                if mode in ('cancel', 'modify'):
+                    movelines = inv.move_id.line_id
+                    to_reconcile_ids = {}
+                    for line in movelines :
+                        if line.account_id.id == inv.account_id.id :
+                            to_reconcile_ids[line.account_id.id] = [line.id]
+                        if type(line.reconcile_id) != osv.orm.browse_null :
+                            reconcile_obj.unlink(cr, uid, line.reconcile_id.id)
+                    wf_service = netsvc.LocalService('workflow')
+                    wf_service.trg_validate(uid, 'account.invoice', \
+                                        refund.id, 'invoice_open', cr)
+                    refund = inv_obj.browse(cr, uid, refund_id[0],context=context)
+                    for tmpline in  refund.move_id.line_id :
+                        if tmpline.account_id.id == inv.account_id.id :
+                            to_reconcile_ids[tmpline.account_id.id].append(tmpline.id)
+                    for account in to_reconcile_ids :
+                        account_m_line_obj.reconcile(cr, uid, to_reconcile_ids[account],
+                                        writeoff_period_id=period,
+                                        writeoff_journal_id=inv.journal_id.id,
+                                        writeoff_acc_id=inv.account_id.id
+                                        )
+                    if mode == 'modify' :
+                        invoice = inv_obj.read(cr, uid, [inv.id],
+                                    ['name', 'type', 'number', 'reference',
+                                    'comment', 'date_due', 'partner_id',
+                                    'address_contact_id', 'address_invoice_id',
+                                    'partner_insite', 'partner_contact',
+                                    'partner_ref', 'payment_term', 'account_id',
+                                    'currency_id', 'invoice_line', 'tax_line',
+                                    'journal_id', 'period_id'],context=context)
+                        invoice = invoice[0]
+                        del invoice['id']
+                        invoice_lines = self.pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'],context=context)
+                        invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines)
+                        tax_lines = self.pool.get('account.invoice.tax').read(
+                                                        cr, uid, invoice['tax_line'],context=context)
+                        tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines)
+
+                        invoice.update({
+                            'type': inv.type,
+                            'date_invoice': date,
+                            'state': 'draft',
+                            'number': False,
+                            'invoice_line': invoice_lines,
+                            'tax_line': tax_lines,
+                            'period_id': period,
+                            'name': description
+                            })
+
+                        for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
+                                'account_id', 'currency_id', 'payment_term', 'journal_id'):
+                                invoice[field] = invoice[field] and invoice[field][0]
+
+                        inv_id = inv_obj.create(cr, uid, invoice, {})
+                        if inv.payment_term.id:
+                            data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], inv.payment_term.id, date)
+                            if 'value' in data and data['value']:
+                                inv_obj.write(cr, uid, [inv_id], data['value'])
+                        created_inv.append(inv_id)
+
+            if inv.type == 'out_invoice':
+                xml_id = 'action_invoice_tree1'
+            elif inv.type == 'in_invoice':
+                xml_id = 'action_invoice_tree2'
+            elif type == 'out_refund':
+                xml_id = 'action_invoice_tree3'
+            else:
+                xml_id = 'action_invoice_tree4'
+            result = mod_obj._get_id(cr, uid, 'account', xml_id)
+            id = mod_obj.read(cr, uid, result, ['res_id'],context=context)['res_id']
+            result = act_obj.read(cr, uid, id,context=context)
+            result['res_id'] = created_inv
+
+            return result
+
+    def invoice_refund(self, cr, uid, ids, context={}):
+        return self.compute_refund(cr, uid, ids, 'refund', context=context)
+
+    def invoice_cancel(self, cr, uid, ids, context={}):
+        return self.compute_refund(cr, uid, ids, 'cancel', context=context)
+
+    def invoice_modify(self, cr, uid, ids, context={}):
+        return self.compute_refund(cr, uid, ids, 'modify', context=context)
+
+account_invoice_refund()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
new file mode 100644
index 00000000000..7962bb150cf
--- /dev/null
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_account_invoice_refund" model="ir.ui.view">
+            <field name="name">account.invoice.refund.form</field>
+            <field name="model">account.invoice.refund</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Credit Note">
+                	<group colspan="4" >
+                    	 <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
+                    	 <newline/>
+                    	 <field name="date"/>
+                    	 <field name="period"/>
+                    	 <field name="description"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-redo" string="Refund Invoice" name="invoice_refund" type="object"/>
+                    	<button icon="gtk-ok" string="Cancel Invoice" name="invoice_cancel" type="object"/>
+                    	<button icon="gtk-undo" string="Modify Invoice" name="invoice_modify" type="object"/>
+                   </group>
+               </form>
+            </field>
+    	</record>
+
+        <record id="action_account_invoice_refund" model="ir.actions.act_window">
+            <field name="name">Credit Note</field>
+            <field name="res_model">account.invoice.refund</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_invoice_refund"/>
+           <field name="target">new</field>
+        </record>
+
+        <act_window id="action_account_invoice_refund"
+    		key2 = "client_action_multi"   name="Credit Note"
+    		res_model="account.invoice.refund"  src_model="account.invoice"
+    		view_mode="form" target="new"  view_type="form" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
new file mode 100644
index 00000000000..e2329bf09d9
--- /dev/null
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import tools
+from osv import fields, osv
+from tools.translate import _
+
+
+class account_move_bank_reconcile(osv.osv_memory):
+    """
+        Bank Reconciliation
+    """
+    _name = "account.move.bank.reconcile"
+    _description = "Move bank reconcile"
+    _columns = {
+       'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+              }
+
+    def action_open_window(self, cr, uid, ids, context={}):
+            """
+           @param cr: the current row, from the database cursor,
+           @param uid: the current user’s ID for security checks,
+           @param ids: account move bank reconcile’s ID or list of IDs
+           @return: dictionary of  Open  account move line   on given journal_id.
+            """
+            for data in  self.read(cr, uid, ids,context=context):
+                 cr.execute('select default_credit_account_id \
+                                from account_journal where id=%s', (data['journal_id'],))
+                 account_id = cr.fetchone()[0]
+                 if not account_id:
+                     raise osv.except_osv(_('Error'), _('You have to define \
+the bank account\nin the journal definition for reconciliation.'))
+                 return {
+                    'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (data['journal_id'], account_id),
+                    'name': _('Standard Encoding'),
+                    'view_type': 'form',
+                    'view_mode': 'tree,form',
+                    'res_model': 'account.move.line',
+                    'view_id': False,
+                    'context': "{'journal_id': %d}" % (data['journal_id'],),
+                    'type': 'ir.actions.act_window'
+                     }
+
+account_move_bank_reconcile()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
new file mode 100644
index 00000000000..89342803aaf
--- /dev/null
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_move_bank_reconcile" model="ir.ui.view">
+            <field name="name">account.move.bank.reconcile.form</field>
+            <field name="model">account.move.bank.reconcile</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank reconciliation">
+                	<group colspan="4" >
+                		 <field name="journal_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-open" string="Open for bank reconciliation" name="action_open_window" type="object"/>
+                   </group>
+                </form>
+            </field>
+    	</record>
+
+    	<record id="action_account_bank_reconcile_tree" model="ir.actions.act_window">
+            <field name="name">Bank reconciliation</field>
+            <field name="res_model">account.move.bank.reconcile</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_move_bank_reconcile"/>
+           <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
new file mode 100644
index 00000000000..df6e41da566
--- /dev/null
+++ b/addons/account/wizard/account_move_journal.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_move_journal(osv.osv_memory):
+    _name = "account.move.journal"
+    _description = "Move journal"
+
+    _columns = {
+       'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+       'period_id': fields.many2one('account.period', 'Period', required=True),
+                }
+
+
+    def _get_period(self, cr, uid, context={}):
+        """Return  default account period value"""
+        ids = self.pool.get('account.period').find(cr, uid, context=context)
+        period_id = False
+        if len(ids):
+            period_id = ids[0]
+        return period_id
+
+    def action_open_window(self, cr, uid, ids, context={}):
+        """
+        This function Open action move line window on given period and  Journal/Payment Mode
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: account move journal’s ID or list of IDs
+        @return: dictionary of Open action move line window on given period and  Journal/Payment Mode
+
+        """
+        jp = self.pool.get('account.journal.period')
+        mod_obj = self.pool.get('ir.model.data')
+        for data in  self.read(cr, uid, ids, ['journal_id', 'period_id'],context=context):
+            cr.execute('select id,name from ir_ui_view where model=%s and type=%s', ('account.move.line', 'form'))
+            view_res = cr.fetchone()
+            journal_id = data['journal_id']
+            period_id = data['period_id']
+
+            ids = jp.search(cr, uid, [('journal_id', '=', journal_id), \
+                                        ('period_id', '=', period_id)],context=context)
+
+            if not len(ids):
+                name = self.pool.get('account.journal').read(cr, uid, [journal_id])[0]['name']
+                state = self.pool.get('account.period').read(cr, uid, [period_id])[0]['state']
+                if state == 'done':
+                    raise osv.except_osv(_('UserError'), _('This period is already closed !'))
+                company = self.pool.get('account.period').read(cr, uid, [period_id])[0]['company_id'][0]
+                jp.create(cr, uid, {'name': name, 'period_id': period_id, 'journal_id': journal_id, 'company_id': company},context=context)
+
+            ids = jp.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)],context=context)
+            jp = jp.browse(cr, uid, ids, context=context)[0]
+            name = (jp.journal_id.code or '') + ':' + (jp.period_id.code or '')
+
+            result = mod_obj._get_id(cr, uid, 'account', 'view_account_move_line_filter')
+            res = mod_obj.read(cr, uid, result, ['res_id'],context=context)
+
+            return {
+                'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (journal_id, period_id),
+                'name': name,
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'account.move.line',
+                'view_id': view_res,
+                'context': "{'journal_id': %d, 'period_id': %d}" % (journal_id, period_id),
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id']
+                }
+
+
+    _defaults = {
+        'period_id': _get_period
+                }
+
+account_move_journal()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
new file mode 100644
index 00000000000..7a25932bb98
--- /dev/null
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+  		<record id="view_account_move_journal_form" model="ir.ui.view">
+            <field name="name">account.move.journal.form</field>
+            <field name="model">account.move.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Standard entries">
+                	<group colspan="4" >
+                    	<field name="journal_id"/>
+                    	<newline/>
+                    	<field name="period_id" />
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-open" string="Open Journal" name="action_open_window" type="object"/>
+                   	</group>
+               </form>
+            </field>
+        </record>
+
+        <record id="action_account_move_journal_line_form" model="ir.actions.act_window">
+            <field name="name">Entries by Line</field>
+            <field name="res_model">account.move.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_move_journal_form"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem icon="STOCK_JUSTIFY_FILL"
+        	action="action_account_move_journal_line_form"
+        	id="menu_action_move_journal_line_form"
+        	parent="account.menu_finance_entries" sequence="5" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
new file mode 100644
index 00000000000..db0ddb10108
--- /dev/null
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+
+class account_move_line_reconcile_select(osv.osv_memory):
+    _name = "account.move.line.reconcile.select"
+    _description = "Move line reconcile select"
+    _columns = {
+       'account_id': fields.many2one('account.account', 'Account', \
+                            domain = [('reconcile', '=', 1)], required=True),
+              }
+
+    def action_open_window(self, cr, uid, ids, context={}):
+        """
+        This function Open  account move line window for reconcile on given account id
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: account move line reconcile select’s ID or list of IDs
+        @return: dictionary of  Open  account move line window for reconcile on given account id
+
+         """
+        for data in  self.read(cr, uid, ids,context=context):
+
+            return {
+                'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['account_id'],
+                'name': _('Reconciliation'),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'view_id': False,
+                'res_model': 'account.move.line',
+                'type': 'ir.actions.act_window'
+                }
+
+account_move_line_reconcile_select()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
new file mode 100644
index 00000000000..f7fcccddc4c
--- /dev/null
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_move_line_reconcile_select" model="ir.ui.view">
+            <field name="name">account.move.line.reconcile.select.form</field>
+            <field name="model">account.move.line.reconcile.select</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Reconciliation">
+                	<group colspan="4" >
+                		 <field name="account_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
+						<button icon="gtk-open"
+							string="Open for reconciliation" name="action_open_window"
+							type="object" />
+                   </group>
+               </form>
+            </field>
+    	</record>
+
+        <record id="action_account_reconcile_select" model="ir.actions.act_window">
+            <field name="name">Reconcile entries</field>
+            <field name="res_model">account.move.line.reconcile.select</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_move_line_reconcile_select"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem id="next_id_20" name="Reconciliation"
+        	parent="menu_finance_periodical_processing" />
+
+        <menuitem action="action_account_reconcile_select"
+        	id="menu_reconcile_select" parent="account.next_id_20" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/wizard_period_close.py b/addons/account/wizard/account_move_line_unreconcile_select.py
similarity index 50%
rename from addons/account/wizard/wizard_period_close.py
rename to addons/account/wizard/account_move_line_unreconcile_select.py
index d6ba73683f2..07fd0017742 100644
--- a/addons/account/wizard/wizard_period_close.py
+++ b/addons/account/wizard/account_move_line_unreconcile_select.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,42 +15,37 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import wizard
+from osv import fields, osv
+from tools.translate import _
+import tools
 
-_transaction_form = '''<?xml version="1.0"?>
-<form string="Close Period">
-    <separator string="Are you sure ?" colspan="4"/>
-    <field name="sure"/>
-</form>'''
 
-_transaction_fields = {
-    'sure': {'string':'Check this box', 'type':'boolean'},
-}
+class account_move_line_unreconcile_select(osv.osv_memory):
 
-def _data_save(self, cr, uid, data, context):
-    mode = 'done'
-    if data['form']['sure']:
-        for id in data['ids']:
-            cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
-            cr.execute('update account_period set state=%s where id=%s', (mode, id))
-    return {}
+    _name = "account.move.line.unreconcile.select"
+    _description = "Unreconciliation"
+    _columns ={
+       'account_id': fields.many2one('account.account','Account',required=True),
 
-class wiz_journal_close(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('close','Close Period')]}
-        },
-        'close': {
-            'actions': [_data_save],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_journal_close('account.period.close')
+               }
+
+    def action_open_window(self, cr, uid, ids, context={}):
+             for data in self.read(cr, uid, ids):
+                 return {
+                    'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data['account_id'],
+                    'name': 'Unreconciliation',
+                    'view_type': 'form',
+                    'view_mode': 'tree,form',
+                    'view_id': False,
+                    'res_model': 'account.move.line',
+                    'type': 'ir.actions.act_window'
+                }
+
+account_move_line_unreconcile_select()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
new file mode 100644
index 00000000000..06c0a0d1e0e
--- /dev/null
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_account_move_line_unreconcile_select" model="ir.ui.view">
+            <field name="name">account.move.line.unreconcile.select.form</field>
+            <field name="model">account.move.line.unreconcile.select</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Unreconciliation">
+                	<group colspan="4" >
+                		 <field name="account_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
+						<button icon="gtk-open"
+							string="Open for Unreconciliation" name="action_open_window"
+							type="object" />
+                   </group>
+               </form>
+            </field>
+    	</record>
+
+        <record id="action_account_unreconcile_select" model="ir.actions.act_window">
+            <field name="name">Unreconcile entries</field>
+            <field name="res_model">account.move.line.unreconcile.select</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_move_line_unreconcile_select"/>
+           <field name="target">new</field>
+        </record>
+
+        <menuitem action="action_account_unreconcile_select"
+        	id="menu_unreconcile_select" parent="account.next_id_20" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
new file mode 100644
index 00000000000..f4c54263f9a
--- /dev/null
+++ b/addons/account/wizard/account_period_close.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_period_close(osv.osv_memory):
+    """
+        close period
+    """
+    _name = "account.period.close"
+    _description = "period close"
+    _columns = {
+        'sure': fields.boolean('Check this box', required=False),
+              }
+
+    def data_save(self, cr, uid, ids, context={}):
+        """
+        This function close period
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: account period close’s ID or list of IDs
+         """
+
+        mode = 'done'
+        for form in self.read(cr, uid, ids,context=context):
+            if form['sure']:
+                for id in context['active_ids']:
+                    cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
+                    cr.execute('update account_period set state=%s where id=%s', (mode, id))
+            return {}
+
+account_period_close()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
new file mode 100644
index 00000000000..0866e64bdb6
--- /dev/null
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_period_close" model="ir.ui.view">
+            <field name="name">account.period.close.form</field>
+            <field name="model">account.period.close</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Close Period">
+                	<group colspan="4" >
+                    	 <separator string="Are you sure ?" colspan="4"/>
+                    	 <field name="sure"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-close" string="Close Period" name="data_save" type="object"/>
+                   </group>
+               </form>
+            </field>
+        </record>
+
+		<record id="action_account_period_close" model="ir.actions.act_window">
+            <field name="name">Close a Period</field>
+            <field name="res_model">account.period.close</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_account_period_close"/>
+           <field name="target">new</field>
+        </record>
+
+        <record id="action_idea_post_vote_values" model="ir.values">
+	            <field name="model_id" ref="model_account_period" />
+	            <field name="object" eval="1" />
+	            <field name="name"></field>
+	            <field name="key2">client_action_multi</field>
+	            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_period_close'))"/>
+	            <field name="key">action</field>
+	            <field name="model">account.period</field>
+	    </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py
deleted file mode 100644
index ca8153f3ce7..00000000000
--- a/addons/account/wizard/wizard_account_chart.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-class wizard_account_chart(wizard.interface):
-    _account_chart_arch = '''<?xml version="1.0"?>
-    <form string="Account charts">
-        <field name="fiscalyear"/>
-        <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-        <field name="target_move"/>
-    </form>'''
-
-    _account_chart_fields = {
-            'fiscalyear': {
-                'string': 'Fiscal year',
-                'type': 'many2one',
-                'relation': 'account.fiscalyear',
-                'help': 'Keep empty for all open fiscal years',
-        },
-            'target_move': {
-                'string': 'Target Moves',
-                'type': 'selection',
-                'selection': [('all','All Entries'),('posted','All Posted Entries')],
-                'required': True,
-                'default': lambda *a:"all",
-        },
-    }
-
-    def _get_defaults(self, cr, uid, data, context):
-        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-        data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
-        return data['form']
-
-
-    def _account_chart_open_window(self, cr, uid, data, context):
-        mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
-        act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
-
-        result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-        result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['context'] = str({'fiscalyear': data['form']['fiscalyear'],'state':data['form']['target_move']})
-        if data['form']['fiscalyear']:
-            result['name']+=':'+pooler.get_pool(cr.dbname).get('account.fiscalyear').read(cr,uid,[data['form']['fiscalyear']])[0]['code']
-        return result
-
-    states = {
-        'init': {
-            'actions': [_get_defaults],
-            'result': {'type': 'form', 'arch':_account_chart_arch, 'fields':_account_chart_fields, 'state': [('end', 'Cancel'), ('open', 'Open Charts')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action':_account_chart_open_window, 'state':'end'}
-        }
-    }
-wizard_account_chart('account.chart')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_bank_reconcile.py b/addons/account/wizard/wizard_bank_reconcile.py
deleted file mode 100644
index 8770af7c535..00000000000
--- a/addons/account/wizard/wizard_bank_reconcile.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-from tools.translate import _
-
-_journal_form = '''<?xml version="1.0"?>
-<form string="%s">
-    <field name="journal_id"/>
-</form>''' % ('Open Bank reconciliation',)
-
-_journal_fields = {
-    'journal_id': {'string':'Journal', 'type':'many2one', 'relation':'account.journal', 'required':True},
-}
-
-def _action_open_window(self, cr, uid, data, context):
-    form = data['form']
-    cr.execute('select default_credit_account_id from account_journal where id=%s', (form['journal_id'],))
-    account_id = cr.fetchone()[0]
-    if not account_id:
-        raise wizard.except_wizard(_('Error'), _('You have to define the bank account\nin the journal definition for reconciliation.'))
-    return {
-        'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (form['journal_id'],account_id),
-        'name': _('Standard Encoding'),
-
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.move.line',
-        'view_id': False,
-        'context': "{'journal_id':%d}" % (form['journal_id'],),
-        'type': 'ir.actions.act_window'
-    }
-
-class wiz_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel', 'gtk-cancel'),('open','Open', 'gtk-ok')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-wiz_journal('account.move.bank.reconcile')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_fiscalyear_close_state.py b/addons/account/wizard/wizard_fiscalyear_close_state.py
deleted file mode 100644
index 2f8331f2d3e..00000000000
--- a/addons/account/wizard/wizard_fiscalyear_close_state.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import osv
-import pooler
-from tools.translate import _
-
-_transaction_form = '''<?xml version="1.0"?>
-<form string=" Close states of Fiscal year and periods">
-    <field name="fy_id"/>
-    <separator string="Are you sure you want to close the fiscal year ?" colspan="4"/>
-    <field name="sure"/>
-</form>'''
-
-_transaction_fields = {
-    'fy_id': {'string':'Fiscal Year to close', 'type':'many2one', 'relation': 'account.fiscalyear','required':True, 'domain':[('state','=','draft')]},
-    'sure': {'string':'Check this box', 'type':'boolean'},
-}
-
-def _data_save(self, cr, uid, data, context):
-    if not data['form']['sure']:
-        raise wizard.except_wizard(_('UserError'), _('Closing of states cancelled, please check the box !'))
-    pool = pooler.get_pool(cr.dbname)
-
-    fy_id = data['form']['fy_id']
-
-    cr.execute('UPDATE account_journal_period ' \
-            'SET state = %s ' \
-            'WHERE period_id IN (SELECT id FROM account_period WHERE fiscalyear_id = %s)',
-            ('done',fy_id))
-    cr.execute('UPDATE account_period SET state = %s ' \
-            'WHERE fiscalyear_id = %s', ('done',fy_id))
-    cr.execute('UPDATE account_fiscalyear ' \
-            'SET state = %s WHERE id = %s', ('done', fy_id))
-    return {}
-
-class wiz_journal_close_state(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('close','Close states')]}
-        },
-        'close': {
-            'actions': [_data_save],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_journal_close_state('account.fiscalyear.close.state')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_journal.py b/addons/account/wizard/wizard_journal.py
deleted file mode 100644
index 093c22f10e8..00000000000
--- a/addons/account/wizard/wizard_journal.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-from osv import osv
-import pooler
-from tools.translate import _
-
-_journal_form = '''<?xml version="1.0"?>
-<form string="Standard entries">
-    <field name="journal_id"/>
-    <newline/>
-    <field name="period_id"/>
-</form>'''
-
-def _period_get(self, cr, uid, datas, ctx={}):
-    try:
-        pool = pooler.get_pool(cr.dbname)
-        ids = pool.get('account.period').find(cr, uid, context=ctx)
-        return {'period_id': ids[0]}
-    except:
-        return {}
-
-_journal_fields = {
-    'journal_id': {'string':'Journal', 'type':'many2one', 'relation':'account.journal', 'required':True},
-    'period_id': {
-        'string':'Period', 
-        'type':'many2one', 
-        'relation':'account.period', 
-        'required':True,
-    }
-}
-
-def _action_open_window(self, cr, uid, data, context):
-    form = data['form']
-    cr.execute('select id,name from ir_ui_view where model=%s and type=%s', ('account.move.line', 'form'))
-    view_res = cr.fetchone()
-    jp = pooler.get_pool(cr.dbname).get('account.journal.period')
-    ids = jp.search(cr, uid, [('journal_id','=',form['journal_id']), ('period_id','=',form['period_id'])])
-    if not len(ids):
-        name = pooler.get_pool(cr.dbname).get('account.journal').read(cr, uid, [form['journal_id']])[0]['name']
-        state = pooler.get_pool(cr.dbname).get('account.period').read(cr, uid, [form['period_id']])[0]['state']
-        if state == 'done':
-            raise wizard.except_wizard(_('UserError'), _('This period is already closed !'))
-        company = pooler.get_pool(cr.dbname).get('account.period').read(cr, uid, [form['period_id']])[0]['company_id'][0]
-        jp.create(cr, uid, {'name':name, 'period_id': form['period_id'], 'journal_id':form['journal_id'], 'company_id':company})
-    ids = jp.search(cr, uid, [('journal_id','=',form['journal_id']), ('period_id','=',form['period_id'])])
-    jp = jp.browse(cr, uid, ids, context=context)[0]
-    name = (jp.journal_id.code or '') + ':' + (jp.period_id.code or '')
-
-    mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
-    result = mod_obj._get_id(cr, uid, 'account', 'view_account_move_line_filter')
-    id = mod_obj.read(cr, uid, result, ['res_id'])    
-    return {
-        'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (form['journal_id'],form['period_id']),
-        'name': name,
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.move.line',
-        'view_id': view_res,
-        'context': "{'journal_id':%d, 'period_id':%d}" % (form['journal_id'],form['period_id']),
-        'type': 'ir.actions.act_window',
-        'search_view_id': id['res_id']        
-    }
-
-class wiz_journal(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_period_get],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel', 'gtk-cancel'),('open','Open Journal', 'gtk-ok')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-wiz_journal('account.move.journal')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_reconcile_select.py b/addons/account/wizard/wizard_reconcile_select.py
deleted file mode 100644
index 594020debd4..00000000000
--- a/addons/account/wizard/wizard_reconcile_select.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-from tools.translate import _
-
-
-_journal_form = '''<?xml version="1.0"?>
-<form string="%s">
-    <field name="account_id"/>
-</form>''' % ('Reconciliation',)
-
-_journal_fields = {
-    'account_id': {'string':'Account', 'type':'many2one', 'relation':'account.account','domain': [('reconcile','=',1)], 'required':True},
-}
-
-def _action_open_window(self, cr, uid, data, context):
-    return {
-        'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['form']['account_id'],
-        'name': _('Reconciliation'),
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'view_id': False,
-        'res_model': 'account.move.line',
-        'type': 'ir.actions.act_window'
-    }
-
-class wiz_rec_select(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel'),('open','Open for reconciliation')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-wiz_rec_select('account.move.line.reconcile.select')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_refund.py b/addons/account/wizard/wizard_refund.py
deleted file mode 100644
index 42526f3cc0a..00000000000
--- a/addons/account/wizard/wizard_refund.py
+++ /dev/null
@@ -1,226 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-import osv
-import netsvc
-import time
-from tools.translate import _
-
-sur_form = '''<?xml version="1.0"?>
-<form string="Credit Note">
-    <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
-    <newline />
-    <field name="date" />
-    <field name="period" />
-    <field name="description" width="150" />
-</form>'''
-
-sur_fields = {
-    'date': {'string':'Operation date','type':'date', 'required':'False'},
-    'period':{'string': 'Force period', 'type': 'many2one',
-        'relation': 'account.period', 'required': False},
-    'description':{'string':'Description', 'type':'char', 'required':'True'},
-    }
-
-
-class wiz_refund(wizard.interface):
-
-    def _invoice_refund(self, cr, uid, data, context):
-        return self._compute_refund(cr, uid, data, 'refund', context)
-
-    def _invoice_cancel(self, cr, uid, data, context):
-        return self._compute_refund(cr, uid, data, 'cancel', context)
-
-    def _invoice_modify(self, cr, uid, data, context):
-        return self._compute_refund(cr, uid, data, 'modify', context)
-
-    def _compute_refund(self, cr, uid, data, mode, context):
-        form = data['form']
-        pool = pooler.get_pool(cr.dbname)
-        reconcile_obj = pool.get('account.move.reconcile')
-        account_m_line_obj = pool.get('account.move.line')
-        created_inv = []
-        date = False
-        period = False
-        description = False
-        for inv in pool.get('account.invoice').browse(cr, uid, data['ids']):
-            if inv.state in ['draft', 'proforma2', 'cancel']:
-                raise wizard.except_wizard(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
-            if form['period'] :
-                period = form['period']
-            else:
-                period = inv.period_id and inv.period_id.id or False
-
-            if form['date'] :
-                date = form['date']
-                if not form['period'] :
-                    cr.execute("select name from ir_model_fields where model='account.period' and name='company_id'")
-                    result_query = cr.fetchone()
-                    if result_query:
-                        #in multi company mode
-                        cr.execute("""SELECT id
-                                      from account_period where date('%s')
-                                      between date_start AND  date_stop and company_id = %s limit 1 """,
-                                      (form['date'],pool.get('res.users').browse(cr,uid,uid).company_id.id,))
-                    else:
-                        #in mono company mode
-                        cr.execute("""SELECT id
-                                      from account_period where date('%s')
-                                      between date_start AND  date_stop  limit 1 """,
-                                      (form['date'],))
-                    res = cr.fetchone()
-                    if res:
-                        period = res[0]
-            else:
-                date = inv.date_invoice
-
-            if form['description'] :
-                description = form['description']
-            else:
-                description = inv.name
-
-            if not period:
-                raise wizard.except_wizard(_('Data Insufficient !'), _('No Period found on Invoice!'))
-
-            refund_id = pool.get('account.invoice').refund(cr, uid, [inv.id],date, period, description)
-            refund = pool.get('account.invoice').browse(cr, uid, refund_id[0])
-            # we compute due date
-            #!!!due date = date inv date on formdate
-            pool.get('account.invoice').write(cr, uid, [refund.id],{'date_due':date,'check_total':inv.check_total})
-            # to make the taxes calculated
-            pool.get('account.invoice').button_compute(cr, uid, refund_id)
-
-            created_inv.append(refund_id[0])
-            #if inv is paid we unreconcile
-            if mode in ('cancel','modify'):
-                movelines = inv.move_id.line_id
-                #we unreconcile the lines
-                to_reconcile_ids = {}
-                for line in movelines :
-                    #if the account of the line is the as the one in the invoice
-                    #we reconcile
-                    if line.account_id.id == inv.account_id.id :
-                        to_reconcile_ids[line.account_id.id] =[line.id]
-                    if type(line.reconcile_id) != osv.orm.browse_null :
-                        reconcile_obj.unlink(cr,uid, line.reconcile_id.id)
-                #we advance the workflow of the refund to open
-                wf_service = netsvc.LocalService('workflow')
-                wf_service.trg_validate(uid, 'account.invoice', refund.id, 'invoice_open', cr)
-                #we reload the browse record
-                refund = pool.get('account.invoice').browse(cr, uid, refund_id[0])
-                #we match the line to reconcile
-                for tmpline in  refund.move_id.line_id :
-                    if tmpline.account_id.id == inv.account_id.id :
-                        to_reconcile_ids[tmpline.account_id.id].append(tmpline.id)
-                for account in to_reconcile_ids :
-                    account_m_line_obj.reconcile(cr, uid, to_reconcile_ids[account],
-                        writeoff_period_id=period,
-                        writeoff_journal_id=inv.journal_id.id,
-                        writeoff_acc_id=inv.account_id.id
-                    )
-                #we create a new invoice that is the copy of the original
-                if mode == 'modify' :
-                    invoice = pool.get('account.invoice').read(cr, uid, [inv.id],
-                        ['name', 'type', 'number', 'reference',
-                            'comment', 'date_due', 'partner_id', 'address_contact_id',
-                            'address_invoice_id', 'partner_insite','partner_contact',
-                            'partner_ref', 'payment_term', 'account_id', 'currency_id',
-                            'invoice_line', 'tax_line', 'journal_id','period_id'
-                        ]
-                    )
-                    invoice = invoice[0]
-                    del invoice['id']
-                    invoice_lines = pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'])
-                    invoice_lines = pool.get('account.invoice')._refund_cleanup_lines(cr, uid, invoice_lines)
-                    tax_lines = pool.get('account.invoice.tax').read(
-                        cr, uid, invoice['tax_line'])
-                    tax_lines = pool.get('account.invoice')._refund_cleanup_lines(cr, uid, tax_lines)
-
-                    invoice.update({
-                        'type': inv.type,
-                        'date_invoice': date,
-                        'state': 'draft',
-                        'number': False,
-                        'invoice_line': invoice_lines,
-                        'tax_line': tax_lines,
-                        'period_id': period,
-                        'name':description
-                        })
-
-                    #take the id part of the tuple returned for many2one fields
-                    for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
-                        'account_id', 'currency_id', 'payment_term', 'journal_id'):
-                        invoice[field] = invoice[field] and invoice[field][0]
-
-                    # create the new invoice
-                    inv_id = pool.get('account.invoice').create(cr, uid, invoice,{})
-                    # we compute due date
-                    if inv.payment_term.id:
-                        data = pool.get('account.invoice').onchange_payment_term_date_invoice(cr, uid, [inv_id],inv.payment_term.id,date)
-                        if 'value' in data and data['value']:
-                            pool.get('account.invoice').write(cr, uid, [inv_id],data['value'])
-                    created_inv.append(inv_id)
-
-        #we get the view id
-        mod_obj = pool.get('ir.model.data')
-        act_obj = pool.get('ir.actions.act_window')
-        if inv.type == 'out_invoice':
-            xml_id = 'action_invoice_tree5'
-        elif inv.type == 'in_invoice':
-            xml_id = 'action_invoice_tree8'
-        elif type == 'out_refund':
-            xml_id = 'action_invoice_tree10'
-        else:
-            xml_id = 'action_invoice_tree12'
-        #we get the model
-        result = mod_obj._get_id(cr, uid, 'account', xml_id)
-        id = mod_obj.read(cr, uid, result, ['res_id'])['res_id']
-        # we read the act window
-        result = act_obj.read(cr, uid, id)
-        result['res_id'] = created_inv
-
-        return result
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':sur_form, 'fields':sur_fields, 'state':[('end','Cancel'),('refund','Refund Invoice'),('cancel_invoice','Cancel Invoice'),('modify_invoice','Modify Invoice')]}
-        },
-        'refund': {
-            'actions': [],
-            'result': {'type':'action', 'action':_invoice_refund, 'state':'end'},
-        },
-        'cancel_invoice': {
-            'actions': [],
-            'result': {'type':'action', 'action':_invoice_cancel, 'state':'end'},
-        },
-        'modify_invoice': {
-            'actions': [],
-            'result': {'type':'action', 'action':_invoice_modify, 'state':'end'},
-        },
-
-    }
-wiz_refund('account.invoice.refund')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_unreconcile_select.py b/addons/account/wizard/wizard_unreconcile_select.py
deleted file mode 100644
index 998be07a5f2..00000000000
--- a/addons/account/wizard/wizard_unreconcile_select.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-
-_journal_form = '''<?xml version="1.0"?>
-<form string="%s">
-    <field name="account_id"/>
-</form>''' % ('Unreconciliation',)
-
-_journal_fields = {
-    'account_id': {'string':'Account', 'type':'many2one', 'relation':'account.account', 'required':True},
-}
-
-def _action_open_window(self, cr, uid, data, context):
-    return {
-        'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data['form']['account_id'],
-        'name': 'Unreconciliation',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'view_id': False,
-        'res_model': 'account.move.line',
-        'type': 'ir.actions.act_window'
-    }
-
-class wiz_unrec_select(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_journal_form, 'fields':_journal_fields, 'state':[('end','Cancel', 'gtk-cancel'),('open','Open for unreconciliation', 'gtk-ok')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-wiz_unrec_select('account.move.line.unreconcile.select')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 425b2fef610cc865c1d30041da25df72cdd7efa4 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Tue, 30 Mar 2010 17:20:31 +0200
Subject: [PATCH 163/248] [REF] Splitted YAML custom tags definition in itw own
 file (needed by module recorder).

bzr revid: jth@openerp.com-20100330152031-xvq4ve15ju51u7cy
---
 bin/tools/yaml_import.py | 188 ++++-----------------------------------
 bin/tools/yaml_tag.py    | 157 ++++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+), 171 deletions(-)
 create mode 100644 bin/tools/yaml_tag.py

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index fed3e81299e..8808a92820d 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -7,6 +7,7 @@ import pooler
 import netsvc
 import misc
 from config import config
+import yaml_tag
 
 import yaml
 
@@ -18,161 +19,6 @@ class YamlImportException(Exception):
 class YamlImportAbortion(Exception):
     pass
 
-class YamlTag(object):
-    """
-    Superclass for constructors of custom tags defined in yaml file.
-    """
-    def __init__(self, **kwargs):
-        self.__dict__.update(kwargs)
-    def __getitem__(self, key):
-        return getattr(self, key)
-    def __getattr__(self, attr):
-        return None
-    def __repr__(self):
-        return "<%s %s>" % (self.__class__.__name__, sorted(self.__dict__.items()))
-
-class Assert(YamlTag):
-    def __init__(self, model, id, severity=logging.ERROR, string="NONAME", **kwargs):
-        self.model = model
-        self.id = id
-        self.severity = severity
-        self.string = string
-        super(Assert, self).__init__(**kwargs)
-    
-class Record(YamlTag):
-    def __init__(self, model, id, **kwargs):
-        self.model = model
-        self.id = id
-        super(Record, self).__init__(**kwargs)
-    
-class Python(YamlTag):
-    def __init__(self, model, severity=logging.ERROR, name="", **kwargs):
-        self.model= model
-        self.severity = severity
-        self.name = name
-        super(Python, self).__init__(**kwargs)
-
-class Menuitem(YamlTag):
-    def __init__(self, id, name, **kwargs):
-        self.id = id
-        self.name = name
-        super(Menuitem, self).__init__(**kwargs)
-
-class Workflow(YamlTag):
-    def __init__(self, model, action, **kwargs):
-        self.model = model
-        self.action = action
-        super(Workflow, self).__init__(**kwargs)
-
-class ActWindow(YamlTag):
-    def __init__(self, model, action, **kwargs):
-        self.model = model
-        self.action = action
-        super(ActWindow, self).__init__(**kwargs)
-
-class Function(YamlTag):
-    def __init__(self, model, name, **kwargs):
-        self.model = model
-        self.name = name
-        super(Function, self).__init__(**kwargs)
-
-class Report(YamlTag):
-    def __init__(self, model, name, string, **kwargs):
-        self.model = model
-        self.name = name
-        self.string = string
-        super(Report, self).__init__(**kwargs)
-
-class Delete(YamlTag):
-    def __init__(self, model, id, search, **kwargs):
-        self.model = model
-        self.id = id
-        self.search = search
-        super(Delete, self).__init__(**kwargs)
-
-class Context(YamlTag):
-    def __init__(self, **kwargs):
-        super(Context, self).__init__(**kwargs)
-
-class Url(YamlTag):
-    def __init__(self, **kwargs):
-        super(Url, self).__init__(**kwargs)
-
-class Eval(YamlTag):
-    def __init__(self, expression):
-        self.expression = expression
-        super(Eval, self).__init__()
-    
-class IrSet(YamlTag):
-    def __init__(self):
-        super(IrSet, self).__init__()
-
-def assert_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return Assert(**kwargs)
-
-def record_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return Record(**kwargs)
-
-def python_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return Python(**kwargs)
-
-def menuitem_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return Menuitem(**kwargs)
-
-def workflow_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return Workflow(**kwargs)
-
-def act_window_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return ActWindow(**kwargs)
-
-def function_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return Function(**kwargs)
-
-def report_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return Report(**kwargs)
-
-def delete_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return Delete(**kwargs)
-
-def context_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return Context(**kwargs)
-
-def url_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return Url(**kwargs)
-
-def eval_constructor(loader, node):
-    expression = loader.construct_scalar(node)
-    return Eval(expression)
-    
-def ir_set_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
-    return IrSet(**kwargs)
-        
-yaml.add_constructor(u"!assert", assert_constructor)
-yaml.add_constructor(u"!record", record_constructor)
-yaml.add_constructor(u"!python", python_constructor)
-yaml.add_constructor(u"!menuitem", menuitem_constructor)
-yaml.add_constructor(u"!workflow", workflow_constructor)
-yaml.add_constructor(u"!act_window", act_window_constructor)
-yaml.add_constructor(u"!function", function_constructor)
-yaml.add_constructor(u"!report", report_constructor)
-yaml.add_constructor(u"!context", context_constructor)
-yaml.add_constructor(u"!delete", delete_constructor)
-yaml.add_constructor(u"!url", url_constructor)
-yaml.add_constructor(u"!eval", eval_constructor)
-yaml.add_constructor(u"!ir_set", ir_set_constructor)
-
 def _is_yaml_mapping(node, tag_constructor):
     value = isinstance(node, types.DictionaryType) \
         and len(node.keys()) == 1 \
@@ -183,45 +29,45 @@ def is_comment(node):
     return isinstance(node, types.StringTypes)
 
 def is_assert(node):
-    return _is_yaml_mapping(node, Assert)
+    return _is_yaml_mapping(node, yaml_tag.Assert)
 
 def is_record(node):
-    return _is_yaml_mapping(node, Record)
+    return _is_yaml_mapping(node, yaml_tag.Record)
 
 def is_python(node):
-    return _is_yaml_mapping(node, Python)
+    return _is_yaml_mapping(node, yaml_tag.Python)
 
 def is_menuitem(node):
-    return isinstance(node, Menuitem) \
-        or _is_yaml_mapping(node, Menuitem)
+    return isinstance(node, yaml_tag.Menuitem) \
+        or _is_yaml_mapping(node, yaml_tag.Menuitem)
 
 def is_function(node):
-    return isinstance(node, Function) \
-        or _is_yaml_mapping(node, Function)
+    return isinstance(node, yaml_tag.Function) \
+        or _is_yaml_mapping(node, yaml_tag.Function)
 
 def is_report(node):
-    return isinstance(node, Report)
+    return isinstance(node, yaml_tag.Report)
 
 def is_workflow(node):
-    return isinstance(node, Workflow)
+    return isinstance(node, yaml_tag.Workflow)
 
 def is_act_window(node):
-    return isinstance(node, ActWindow)
+    return isinstance(node, yaml_tag.ActWindow)
 
 def is_delete(node):
-    return isinstance(node, Delete)
+    return isinstance(node, yaml_tag.Delete)
 
 def is_context(node):
-    return isinstance(node, Context)
+    return isinstance(node, yaml_tag.Context)
 
 def is_url(node):
-    return isinstance(node, Url)
+    return isinstance(node, yaml_tag.Url)
 
 def is_eval(node):
-    return isinstance(node, Eval)
+    return isinstance(node, yaml_tag.Eval)
     
 def is_ir_set(node):
-    return _is_yaml_mapping(node, IrSet)
+    return _is_yaml_mapping(node, yaml_tag.IrSet)
 
 
 class TestReport(object):
@@ -410,7 +256,7 @@ class YamlInterpreter(object):
             ids = [self.get_id(xml_id) for xml_id in expression]
             value= [(6, 0, ids)]
         else: # scalar field
-            if isinstance(expression, Eval):
+            if isinstance(expression, yaml_tag.Eval):
                 value = eval(expression.expression)
             else:
                 value = expression
diff --git a/bin/tools/yaml_tag.py b/bin/tools/yaml_tag.py
new file mode 100644
index 00000000000..0a5286882ed
--- /dev/null
+++ b/bin/tools/yaml_tag.py
@@ -0,0 +1,157 @@
+import yaml
+import logging
+
+class YamlTag(object):
+    """
+    Superclass for constructors of custom tags defined in yaml file.
+    """
+    def __init__(self, **kwargs):
+        self.__dict__.update(kwargs)
+    def __getitem__(self, key):
+        return getattr(self, key)
+    def __getattr__(self, attr):
+        return None
+    def __repr__(self):
+        return "<%s %s>" % (self.__class__.__name__, sorted(self.__dict__.items()))
+
+class Assert(YamlTag):
+    def __init__(self, model, id, severity=logging.ERROR, string="NONAME", **kwargs):
+        self.model = model
+        self.id = id
+        self.severity = severity
+        self.string = string
+        super(Assert, self).__init__(**kwargs)
+    
+class Record(YamlTag):
+    def __init__(self, model, id, **kwargs):
+        self.model = model
+        self.id = id
+        super(Record, self).__init__(**kwargs)
+    
+class Python(YamlTag):
+    def __init__(self, model, severity=logging.ERROR, name="", **kwargs):
+        self.model= model
+        self.severity = severity
+        self.name = name
+        super(Python, self).__init__(**kwargs)
+
+class Menuitem(YamlTag):
+    def __init__(self, id, name, **kwargs):
+        self.id = id
+        self.name = name
+        super(Menuitem, self).__init__(**kwargs)
+
+class Workflow(YamlTag):
+    def __init__(self, model, action, **kwargs):
+        self.model = model
+        self.action = action
+        super(Workflow, self).__init__(**kwargs)
+
+class ActWindow(YamlTag):
+    def __init__(self, model, action, **kwargs):
+        self.model = model
+        self.action = action
+        super(ActWindow, self).__init__(**kwargs)
+
+class Function(YamlTag):
+    def __init__(self, model, name, **kwargs):
+        self.model = model
+        self.name = name
+        super(Function, self).__init__(**kwargs)
+
+class Report(YamlTag):
+    def __init__(self, model, name, string, **kwargs):
+        self.model = model
+        self.name = name
+        self.string = string
+        super(Report, self).__init__(**kwargs)
+
+class Delete(YamlTag):
+    def __init__(self, model, id, search, **kwargs):
+        self.model = model
+        self.id = id
+        self.search = search
+        super(Delete, self).__init__(**kwargs)
+
+class Context(YamlTag):
+    def __init__(self, **kwargs):
+        super(Context, self).__init__(**kwargs)
+
+class Url(YamlTag):
+    def __init__(self, **kwargs):
+        super(Url, self).__init__(**kwargs)
+
+class Eval(YamlTag):
+    def __init__(self, expression):
+        self.expression = expression
+        super(Eval, self).__init__()
+    
+class IrSet(YamlTag):
+    def __init__(self):
+        super(IrSet, self).__init__()
+
+def assert_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Assert(**kwargs)
+
+def record_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Record(**kwargs)
+
+def python_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Python(**kwargs)
+
+def menuitem_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Menuitem(**kwargs)
+
+def workflow_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Workflow(**kwargs)
+
+def act_window_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return ActWindow(**kwargs)
+
+def function_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Function(**kwargs)
+
+def report_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Report(**kwargs)
+
+def delete_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Delete(**kwargs)
+
+def context_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Context(**kwargs)
+
+def url_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Url(**kwargs)
+
+def eval_constructor(loader, node):
+    expression = loader.construct_scalar(node)
+    return Eval(expression)
+    
+def ir_set_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return IrSet(**kwargs)
+        
+yaml.add_constructor(u"!assert", assert_constructor)
+yaml.add_constructor(u"!record", record_constructor)
+yaml.add_constructor(u"!python", python_constructor)
+yaml.add_constructor(u"!menuitem", menuitem_constructor)
+yaml.add_constructor(u"!workflow", workflow_constructor)
+yaml.add_constructor(u"!act_window", act_window_constructor)
+yaml.add_constructor(u"!function", function_constructor)
+yaml.add_constructor(u"!report", report_constructor)
+yaml.add_constructor(u"!context", context_constructor)
+yaml.add_constructor(u"!delete", delete_constructor)
+yaml.add_constructor(u"!url", url_constructor)
+yaml.add_constructor(u"!eval", eval_constructor)
+yaml.add_constructor(u"!ir_set", ir_set_constructor)

From a6a0a06867a3fe1ece9be829f36ea05a8e9b4e8e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 30 Mar 2010 19:26:03 +0200
Subject: [PATCH 164/248] [ADD] utility methods to split large lists of ids for
 use in IN clauses

bzr revid: odo@openerp.com-20100330172603-gbv1zjcqmqeabfbt
---
 bin/sql_db.py     |  8 +++++++-
 bin/tools/misc.py | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/bin/sql_db.py b/bin/sql_db.py
index 17bfa340653..94336cde69a 100644
--- a/bin/sql_db.py
+++ b/bin/sql_db.py
@@ -63,7 +63,7 @@ re_into = re.compile('.* into "?([a-zA-Z_0-9]+)"? .*$');
 sql_counter = 0
 
 class Cursor(object):
-    IN_MAX = 1000
+    IN_MAX = 1000 # decent limit on size of IN queries - guideline = Oracle limit
     __logger = logging.getLogger('db.cursor')
 
     def check(f):
@@ -142,6 +142,12 @@ class Cursor(object):
                 self.sql_into_log[res_into.group(1)][1] += delay
         return res
 
+
+    def split_for_in_conditions(self, ids):
+        """Split a list of identifiers into one or more smaller tuples
+           safe for IN conditions, after uniquifying them."""
+        return tools.misc.split_every(self.IN_MAX, set(ids))
+
     def print_log(self):
         global sql_counter
         sql_counter += self.sql_log_count
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 284324873de..ff20966857e 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -32,6 +32,7 @@ import zipfile
 import release
 import socket
 import re
+from itertools import islice
 
 if sys.version_info[:2] < (2, 4):
     from threadinglocal import local
@@ -1267,6 +1268,18 @@ def detect_server_timezone():
     return 'UTC'
 
 
+def split_every(n, iterable, piece_maker=tuple):
+    """Splits an iterable into length-n pieces. The last piece will be shorter
+       if ``n`` does not evenly divide the iterable length.
+       @param ``piece_maker``: function to build the pieces
+       from the slices (tuple,list,...)
+    """
+    iterator = iter(iterable)
+    piece = piece_maker(islice(iterator, n))
+    while piece:
+        yield piece
+        piece = piece_maker(islice(iterator, n))
+
 if __name__ == '__main__':
     import doctest
     doctest.testmod()

From 760492db3648aa68b315873382d0aa377ba14940 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 30 Mar 2010 19:28:06 +0200
Subject: [PATCH 165/248] [IMP] refactoring of check_access_rule to avoid SQL
 injection and simplify code

bzr revid: odo@openerp.com-20100330172806-837iforda2zrekmd
---
 bin/osv/orm.py | 70 +++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 697eb01f4e2..32efe32558b 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2572,17 +2572,16 @@ class orm(orm_template):
                 return '"%s"' % (f,)
             fields_pre2 = map(convert_field, fields_pre)
             order_by = self._parent_order or self._order
-            for i in range(0, len(ids), cr.IN_MAX):
-                sub_ids = ids[i:i+cr.IN_MAX]
+            for sub_ids in cr.split_for_in_conditions(ids):
                 if d1:
-                    cr.execute('SELECT %s FROM %s WHERE %s.id = ANY (%%s) AND %s ORDER BY %s' % \
+                    cr.execute('SELECT %s FROM %s WHERE %s.id IN %%s AND %s ORDER BY %s' % \
                             (','.join(fields_pre2 + [self._table + '.id']), ','.join(tables), self._table, ' and '.join(d1),
                                 order_by),[sub_ids,]+d2)
-                    if not cr.rowcount == len({}.fromkeys(sub_ids)):
+                    if cr.rowcount != len(sub_ids):
                         raise except_orm(_('AccessError'),
                                 _('You try to bypass an access rule while reading (Document type: %s).') % self._description)
                 else:
-                    cr.execute('SELECT %s FROM \"%s\" WHERE id = ANY (%%s) ORDER BY %s' %
+                    cr.execute('SELECT %s FROM \"%s\" WHERE id IN %%s ORDER BY %s' %
                                (','.join(fields_pre2 + ['id']), self._table,
                                 order_by), (sub_ids,))
                 res.extend(cr.dictfetchall())
@@ -2734,29 +2733,24 @@ class orm(orm_template):
                     if res and res[0]:
                         raise except_orm('ConcurrencyException', _('Records were modified in the meanwhile'))
 
-    def check_access_rule(self, cr, uid, ids, mode, context=None):
-        d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, uid, self._name, mode, context=context)
-        if d1:
-            d1 = ' and '+' and '.join(d1)
-
-        for i in range(0, len(ids), cr.IN_MAX):
-            sub_ids = ids[i:i+cr.IN_MAX]
-            if d1:
-                cr.execute('SELECT '+self._table+'.id FROM '+','.join(tables)+' ' \
-                        'WHERE '+self._table+'.id IN %s'+d1, (tuple(sub_ids),d2))
-                if not cr.rowcount == len(sub_ids):
+    def check_access_rule(self, cr, uid, ids, operation, context=None):
+        """Verifies that the operation given by ``operation`` is allowed for the user
+           according to ir.rules.
+           @param ``operation``: one of ``'read'``, ``'write'``, ``'unlink'``
+           @raise ``except_orm``: if current ir.rules do not permit this operation.
+           @return: ``None`` if the operation is allowed
+        """
+        where_clause, where_params, tables = self.pool.get('ir.rule').domain_get(cr, uid, self._name, operation, context=context)
+        if where_clause:
+            where_clause = ' and ' + ' and '.join(where_clause)
+            for sub_ids in cr.split_for_in_conditions(ids):
+                cr.execute('SELECT ' + self._table + '.id FROM ' + ','.join(tables) +
+                           ' WHERE ' + self._table + '.id IN %s' + where_clause,
+                           [sub_ids] + where_params)
+                if cr.rowcount != len(sub_ids):
                     raise except_orm(_('AccessError'),
-                                     _('You try to bypass an access rule to '+mode+
-                                    ' (Document type: %s).') % self._name)
-            else:
-                cr.execute('SELECT id FROM "'+self._table+'" WHERE id IN %s',
-                           (tuple(sub_ids),))
-                if not cr.rowcount == len(sub_ids):
-                    raise except_orm(_('AccessError'),
-                                     _('You try to ' +mode+ ' a record that doesn\'t exist (Document type: %s).')
-                                      % self._name)
-        #TODO: this is a SQL injection pattern again, need to refactor it
-        return ','.join(map(str,ids))
+                                     _('Operation prohibited by access rules (Operation: %s, Document type: %s).')
+                                     % (operation, self._name))
 
     def unlink(self, cr, uid, ids, context=None):
         if not ids:
@@ -2787,12 +2781,13 @@ class orm(orm_template):
         #   ids2 = [x[self._inherits[key]] for x in res]
         #   self.pool.get(key).unlink(cr, uid, ids2)
 
-        ids_str = self.check_access_rule(cr, uid, ids, 'unlink', context=context)
-        cr.execute('delete from '+self._table+' ' \
-                    'where id in ('+ids_str+')', ids)
+        self.check_access_rule(cr, uid, ids, 'unlink', context=context)
+        for sub_ids in cr.split_for_in_conditions(ids):
+            cr.execute('delete from ' + self._table + ' ' \
+                       'where id in %s', sub_ids)
 
         for order, object, store_ids, fields in result_store:
-            if object<>self._name:
+            if object != self._name:
                 obj =  self.pool.get(object)
                 cr.execute('select id from '+obj._table+' where id in ('+','.join(map(str, store_ids))+')')
                 rids = map(lambda x: x[0], cr.fetchall())
@@ -2888,9 +2883,10 @@ class orm(orm_template):
             upd1.append(user)
 
         if len(upd0):
-            ids_str = self.check_access_rule(cr, user, ids, 'write', context=context)
-            cr.execute('update '+self._table+' set '+string.join(upd0, ',')+' ' \
-                    'where id in ('+ids_str+')', upd1)
+            self.check_access_rule(cr, user, ids, 'write', context=context)
+            for sub_ids in cr.split_for_in_conditions(ids):
+                cr.execute('update ' + self._table + ' set ' + ','.join(upd0) + ' ' \
+                           'where id in %s', upd1 + [sub_ids])
 
             if totranslate:
                 # TODO: optimize
@@ -2921,11 +2917,9 @@ class orm(orm_template):
         for table in self._inherits:
             col = self._inherits[table]
             nids = []
-            for i in range(0, len(ids), cr.IN_MAX):
-                sub_ids = ids[i:i+cr.IN_MAX]
-                ids_str = string.join(map(str, sub_ids), ',')
+            for sub_ids in cr.split_for_in_conditions(ids):
                 cr.execute('select distinct "'+col+'" from "'+self._table+'" ' \
-                        'where id in ('+ids_str+')', upd1)
+                           'where id in %s', (sub_ids,))
                 nids.extend([x[0] for x in cr.fetchall()])
 
             v = {}

From 3d2a727aacb79304aeaf80535b027185dbeb4340 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 31 Mar 2010 04:54:43 +0100
Subject: [PATCH 166/248] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100331035443-g3goa3jjj1hen5ag
---
 bin/addons/base/i18n/bg.po    |  4 ++--
 bin/addons/base/i18n/hr.po    |  4 ++--
 bin/addons/base/i18n/it.po    | 14 +++++++-------
 bin/addons/base/i18n/ja.po    |  4 ++--
 bin/addons/base/i18n/sv.po    |  4 ++--
 bin/addons/base/i18n/uk.po    |  4 ++--
 bin/addons/base/i18n/zh_CN.po |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 04d5ab798d1..5570b263bec 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-29 10:51+0000\n"
+"PO-Revision-Date: 2010-03-30 04:19+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 9290624ea43..f3739c66bf3 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-29 04:13+0000\n"
+"PO-Revision-Date: 2010-03-30 04:36+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index a1cfce3afdf..3d99b3829d9 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-29 15:30+0000\n"
+"PO-Revision-Date: 2010-03-30 09:53+0000\n"
 "Last-Translator: Carlo Vettore <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -3641,7 +3641,7 @@ msgstr "Crea azione"
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
 msgid "HTML from HTML"
-msgstr ""
+msgstr "HTML da HTML"
 
 #. module: base
 #: selection:ir.actions.report.xml,report_type:0
@@ -3733,12 +3733,12 @@ msgstr "STOCK_ADD"
 #. module: base
 #: field:ir.cron,doall:0
 msgid "Repeat Missed"
-msgstr ""
+msgstr "Ripeti mancato"
 
 #. module: base
 #: help:ir.actions.server,state:0
 msgid "Type of the Action that is to be executed"
-msgstr ""
+msgstr "Tipo dell'azione che deve essere eseguita"
 
 #. module: base
 #: field:ir.server.object.lines,server_id:0
@@ -3783,7 +3783,7 @@ msgstr "Botswana"
 #: model:ir.ui.menu,name:base.menu_partner_title_partner
 #: view:res.partner.title:0
 msgid "Partner Titles"
-msgstr ""
+msgstr "Qualifiche Partner"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
@@ -6722,7 +6722,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.bank,acc_number:0
 msgid "Account Number"
-msgstr ""
+msgstr "Numero conto"
 
 #. module: base
 #: view:res.lang:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index dd3caace65e..9430360cb87 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-29 04:11+0000\n"
+"PO-Revision-Date: 2010-03-30 04:24+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 73c67ea25ef..92102068d0d 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-29 04:09+0000\n"
+"PO-Revision-Date: 2010-03-30 04:18+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 0c8b97a9a71..be9ac9ddeb1 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-29 04:11+0000\n"
+"PO-Revision-Date: 2010-03-30 04:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index fd637aa00f7..795f0a2c33f 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-29 04:11+0000\n"
+"PO-Revision-Date: 2010-03-30 04:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 197f89966ba51d68a406fb4bd5525173913d354e Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 31 Mar 2010 11:02:41 +0530
Subject: [PATCH 167/248] [FIX] convert: set uid variable which are used in
 view domain

bzr revid: hmo@tinyerp.com-20100331053241-o5mb3tfpx7upuwx1
---
 bin/tools/convert.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 75b438cc6ea..1d4b1fd9d0b 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -376,7 +376,7 @@ form: module.record_id""" % (xml_id,)
         usage = rec.get('usage','').encode('utf-8')
         limit = rec.get('limit','').encode('utf-8')
         auto_refresh = rec.get('auto_refresh','').encode('utf-8')
-
+        uid = self.uid
         # def ref() added because , if context has ref('id') eval wil use this ref
 
         active_id=str("active_id") # for further reference in client/bin/tools/__init__.py

From 5e969614cac600338e9f0bef6a52ebed5ee719d3 Mon Sep 17 00:00:00 2001
From: "DSH (Open ERP)" <dsh@tinyerp.com>
Date: Wed, 31 Mar 2010 15:58:36 +0530
Subject: [PATCH 169/248] [FIX] res_lang : if value of thousands_sep is not
 present in language,method will give error- 'moentary' name is not defined

bzr revid: dsh@tinyerp.com-20100331102836-b9sj12crrt7dv3x5
---
 bin/addons/base/res/res_lang.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/res/res_lang.py b/bin/addons/base/res/res_lang.py
index 8a3af7dd175..8427b366703 100644
--- a/bin/addons/base/res/res_lang.py
+++ b/bin/addons/base/res/res_lang.py
@@ -62,7 +62,7 @@ class lang(osv.osv):
     ]
     
     @tools.cache(skiparg=3)
-    def _lang_data_get(self, cr, uid, lang_id):
+    def _lang_data_get(self, cr, uid, lang_id, monetary=False):
         conv = localeconv()
         lang_obj=self.browse(cr,uid,lang_id)
         thousands_sep = lang_obj.thousands_sep or conv[monetary and 'mon_thousands_sep' or 'thousands_sep']
@@ -120,7 +120,7 @@ class lang(osv.osv):
         if percent[0] != '%':
             raise ValueError("format() must be given exactly one %char format specifier")
 
-        lang_grouping, thousands_sep, decimal_point = self._lang_data_get(cr, uid, ids[0])        
+        lang_grouping, thousands_sep, decimal_point = self._lang_data_get(cr, uid, ids[0], monetary)        
 
         formatted = percent % value
         # floats and decimal ints need special action!

From d257d4b5f955f81302806f29e2fdbb940414ada5 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Wed, 31 Mar 2010 14:49:55 +0530
Subject: [PATCH 171/248] [IMP] stock: security rules added

bzr revid: mso@mso-20100331091955-bu08piypp1gst7rs
---
 addons/stock/security/ir.model.access.csv | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 8e7db1c068b..e7269d542f2 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -22,7 +22,8 @@
 "access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,0,0,0
 "access_stock_move_scrap","stock.move.scrap","model_stock_move_scrap","stock.group_stock_user",1,0,0,0
 "access_stock_move_split","stock.move.split","model_stock_move_split","stock.group_stock_user",1,0,0,0
-"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0"access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,0,0,0
+"access_stock_move_split_lines","stock.move.split.lines","model_stock_move_split_lines","stock.group_stock_user",1,0,0,0
+"access_report_products_to_received_planned","report.products.to.received.planned","model_report_products_to_received_planned","stock.group_stock_user",1,0,0,0
 "access_report_delivery_products_planned","report.delivery.products.planned","model_report_delivery_products_planned","stock.group_stock_user",1,0,0,0
 "access_stock_move_track","stock.move.track","model_stock_move_track","stock.group_stock_user",1,0,0,0
 "access_stock_move_consume","stock.move.consume","model_stock_move_consume","stock.group_stock_user",1,0,0,0
@@ -35,3 +36,14 @@
 "access_stock_invoice_onshipping","stock.invoice.onshipping","model_stock_invoice_onshipping","stock.group_stock_user",1,0,0,0
 "access_stock_location_product","stock.location.product","model_stock_location_product","stock.group_stock_user",1,0,0,0
 "access_report_stock_picking","report.stock.picking","model_report_stock_picking","stock.group_stock_user",1,0,0,0
+"access_stock_delivery","stock.delivery","model_stock_delivery","stock.group_stock_user",1,0,0,0
+
+"access_stock_traceability_upstream","stock.traceability.upstream","model_stock_traceability_upstream","stock.group_stock_user",1,0,0,0
+"access_stock_traceability_downstream","stock.traceability.downstream","model_stock_traceability_downstream","stock.group_stock_user",1,0,0,0
+"access_stock_traceability_lot_upstream","stock.traceability.lot.upstream","model_stock_traceability_lot_upstream","stock.group_stock_user",1,0,0,0
+"access_stock_traceability_lot_downstream","stock.traceability.lot.downstream","model_stock_traceability_lot_downstream","stock.group_stock_user",1,0,0,0
+"access_stock_partial_picking",stock.partial.picking","model_stock_partial_picking","stock.group_stock_user",1,0,0,0
+"access_stock_partial_move","stock.partial.move","model_stock_partial_move","stock.group_stock_user",1,0,0,0
+"access_stock_picking_make","stock.picking.make","model_stock_picking_make","stock.group_stock_user",1,0,0,0
+"access_stock_inventory_merge","stock.inventory.merge","model_stock_inventory_merge","stock.group_stock_user",1,0,0,0
+"access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
\ No newline at end of file

From f66af28b305539e31e007e0df2c57f131bc595b6 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Wed, 31 Mar 2010 18:55:26 +0200
Subject: [PATCH 172/248] [IMP] Added search for record relations. [FIX] Record
 creation. [FIX] Ref constructor. [FIX] Safer Eval expression.

bzr revid: jth@openerp.com-20100331165526-5exmbhtx3jt161pm
---
 bin/tools/yaml_import.py | 73 +++++++++++++++++++++++++++++++---------
 bin/tools/yaml_tag.py    | 18 ++++++++--
 2 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 8808a92820d..36eeadd0cf7 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -66,6 +66,10 @@ def is_url(node):
 def is_eval(node):
     return isinstance(node, yaml_tag.Eval)
     
+def is_ref(node):
+    return isinstance(node, yaml_tag.Ref) \
+        or _is_yaml_mapping(node, yaml_tag.Ref)
+    
 def is_ir_set(node):
     return _is_yaml_mapping(node, yaml_tag.IrSet)
 
@@ -122,7 +126,7 @@ class YamlInterpreter(object):
         self.pool = pooler.get_pool(cr.dbname)
         self.uid = 1
         self.context = {} # opererp context
-        self.eval_context = {'ref': self._ref, '_ref': self._ref} # added '_ref' so that record['ref'] is possible
+        self.eval_context = {'ref': self._ref, '_ref': self._ref, 'time': time} # added '_ref' so that record['ref'] is possible
 
     def _ref(self):
         return lambda xml_id: self.get_id(xml_id)
@@ -155,10 +159,11 @@ class YamlInterpreter(object):
             id = self.id_map[xml_id]
         else:
             if '.' in xml_id:
-                module, xml_id = xml_id.split('.', 1)
+                module, checked_xml_id = xml_id.split('.', 1)
             else:
                 module = self.module
-            ir_id = self.pool.get('ir.model.data')._get_id(self.cr, self.uid, module, xml_id)
+                checked_xml_id = xml_id
+            ir_id = self.pool.get('ir.model.data')._get_id(self.cr, self.uid, module, checked_xml_id)
             obj = self.pool.get('ir.model.data').read(self.cr, self.uid, ir_id, ['res_id'])
             id = int(obj['res_id'])
             self.id_map[xml_id] = id
@@ -224,19 +229,39 @@ class YamlInterpreter(object):
             else: # all tests were successful for this assertion tag (no break)
                 self.assert_report.record(True, assertion.severity)
 
+    def _coerce_bool(self, value, default=False):
+        if isinstance(value, types.BooleanType):
+            b = value
+        if isinstance(value, types.StringTypes):
+            b = value.strip().lower() not in ('0', 'false', 'off', 'no')
+        elif isinstance(value, types.IntType):
+            b = bool(value)
+        else:
+            b = default
+        return b 
+    
     def process_record(self, node):
         record, fields = node.items()[0]
 
         self.validate_xml_id(record.id)
         if self.isnoupdate(record) and self.mode != 'init':
-            model = self.get_model(record.model)
-            record_dict = self._create_record(model, fields)
-            self.logger.debug("RECORD_DICT %s" % record_dict)
-            id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
-                    self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode)
-            self.id_map[record.id] = int(id)
-            if config.get('import_partial', False):
-                self.cr.commit()
+            id = self.pool.get('ir.model.data')._update_dummy(self.cr, self.uid, record.model, self.module, record.id)
+            # check if the resource already existed at the last update
+            if id:
+                self.id_map[record] = int(id)
+                return None
+            else:
+                if not self._coerce_bool(record.forcecreate):
+                    return None
+
+        model = self.get_model(record.model)
+        record_dict = self._create_record(model, fields)
+        self.logger.debug("RECORD_DICT %s" % record_dict)
+        id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
+                self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode)
+        self.id_map[record.id] = int(id)
+        if config.get('import_partial', False):
+            self.cr.commit()
     
     def _create_record(self, model, fields):
         record_dict = {}
@@ -247,17 +272,35 @@ class YamlInterpreter(object):
     
     def _eval_field(self, model, field_name, expression):
         column = model._columns[field_name]
-        if column._type == "many2one":
+        if is_ref(expression):
+            if expression.model:
+                other_model_name = expression.model
+            else:
+                other_model_name = column._obj
+            other_model = self.get_model(other_model_name)
+            if expression.search:
+                q = eval(expression.search, self.eval_context)
+                ids = other_model.search(self.cr, self.uid, q)
+                if expression.use:
+                    instances = other_model.browse(self.cr, self.uid, ids)
+                    elements = [inst[expression.use] for inst in instances]
+                else:
+                    elements = ids
+                if column._type in ("many2many", "one2many"):
+                    value = [(6, 0, elements)]
+                else: # many2one
+                    value = elements[0]
+        elif column._type == "many2one":
             value = self.get_id(expression)
         elif column._type == "one2many":
             other_model = self.get_model(column._obj)
             value = [(0, 0, self._create_record(other_model, fields)) for fields in expression]
         elif column._type == "many2many":
             ids = [self.get_id(xml_id) for xml_id in expression]
-            value= [(6, 0, ids)]
+            value = [(6, 0, ids)]
         else: # scalar field
-            if isinstance(expression, yaml_tag.Eval):
-                value = eval(expression.expression)
+            if is_eval(expression):
+                value = eval(expression.expression, self.eval_context)
             else:
                 value = expression
             # raise YamlImportException('Unsupported column "%s" or value %s:%s' % (field_name, type(expression), expression))
diff --git a/bin/tools/yaml_tag.py b/bin/tools/yaml_tag.py
index 0a5286882ed..83f6dde9c8d 100644
--- a/bin/tools/yaml_tag.py
+++ b/bin/tools/yaml_tag.py
@@ -23,7 +23,7 @@ class Assert(YamlTag):
         super(Assert, self).__init__(**kwargs)
     
 class Record(YamlTag):
-    def __init__(self, model, id, **kwargs):
+    def __init__(self, model, id, use='id', **kwargs):
         self.model = model
         self.id = id
         super(Record, self).__init__(**kwargs)
@@ -86,6 +86,12 @@ class Eval(YamlTag):
         self.expression = expression
         super(Eval, self).__init__()
     
+class Ref(YamlTag):
+    # 'model' parameter is optional since it defaults to the column type
+    def __init__(self, search):
+        self.search = search
+        super(Ref, self).__init__()
+    
 class IrSet(YamlTag):
     def __init__(self):
         super(IrSet, self).__init__()
@@ -138,10 +144,17 @@ def eval_constructor(loader, node):
     expression = loader.construct_scalar(node)
     return Eval(expression)
     
+def ref_constructor(loader, node):
+    kwargs = loader.construct_mapping(node)
+    return Ref(**kwargs)
+    
 def ir_set_constructor(loader, node):
     kwargs = loader.construct_mapping(node)
     return IrSet(**kwargs)
-        
+    
+# Registers constructors for custom tags.
+# Constructors are actually defined globally: do not redefined them in another
+# class/file/package.  This means that module recorder need import this file.
 yaml.add_constructor(u"!assert", assert_constructor)
 yaml.add_constructor(u"!record", record_constructor)
 yaml.add_constructor(u"!python", python_constructor)
@@ -154,4 +167,5 @@ yaml.add_constructor(u"!context", context_constructor)
 yaml.add_constructor(u"!delete", delete_constructor)
 yaml.add_constructor(u"!url", url_constructor)
 yaml.add_constructor(u"!eval", eval_constructor)
+yaml.add_constructor(u"!ref", ref_constructor)
 yaml.add_constructor(u"!ir_set", ir_set_constructor)

From cdc23c6119902b70173d5eea3053995af36624dc Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 1 Apr 2010 10:38:48 +0530
Subject: [PATCH 173/248] [ADD] stock: Added osv_memory wizards: (1) Return
 Picking and (2) Split Moves.

bzr revid: uco@tinyerp.co.in-20100401050848-ugxbxzloaqtrit2y
---
 addons/stock/__terp__.py                      |   2 +
 addons/stock/stock_view.xml                   |  14 +-
 addons/stock/stock_wizard.xml                 |  25 --
 addons/stock/wizard/__init__.py               |   4 +-
 addons/stock/wizard/stock_return_picking.py   | 221 ++++++++++++++++++
 .../wizard/stock_return_picking_view.xml      |  17 ++
 addons/stock/wizard/stock_split_move.py       | 125 ++++++++++
 addons/stock/wizard/stock_split_move_view.xml |  17 ++
 addons/stock/wizard/wizard_return.py          | 156 -------------
 addons/stock/wizard/wizard_split_lot_line.py  |  80 -------
 10 files changed, 391 insertions(+), 270 deletions(-)
 create mode 100644 addons/stock/wizard/stock_return_picking.py
 create mode 100644 addons/stock/wizard/stock_return_picking_view.xml
 create mode 100644 addons/stock/wizard/stock_split_move.py
 create mode 100644 addons/stock/wizard/stock_split_move_view.xml
 delete mode 100644 addons/stock/wizard/wizard_return.py
 delete mode 100644 addons/stock/wizard/wizard_split_lot_line.py

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 4f500f78673..ad751807bd7 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -54,6 +54,8 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_change_standard_price_view.xml",
         "wizard/stock_traceability_view.xml",
         "wizard/stock_picking_make_view.xml",
+        "wizard/stock_return_picking_view.xml",
+        "wizard/stock_split_move_view.xml",
         "stock_workflow.xml",
         "stock_incoterms.xml",
         "stock_wizard.xml",        
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2335b66cbad..abf22dcac5f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -591,7 +591,7 @@
                             type="action" 
                             icon="gtk-go-forward"
                             help="Make Picking" colspan="2"/>
-                        <button name="%(return_picking)d" 
+                        <button name="%(act_stock_return_picking)d" 
                             states="done" 
                             string="Return Picking" 
                             type="action"
@@ -664,7 +664,7 @@
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="6"/>
-                                <button name="%(move_split)d" string="Split Entry Lines in two" type="action" icon="gtk-justify-fill"/>
+                                <button name="%(act_split_moves)d" string="Split Entry Lines in two" type="action" icon="gtk-justify-fill"/>
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
@@ -758,7 +758,7 @@
                                 type="action" 
                                 icon="gtk-go-forward" 
                                 help="Make Picking" colspan="2"/>
-                        <button name="%(return_picking)d" 
+                        <button name="%(act_stock_return_picking)d" 
                                 states="done" 
                                 string="Return Picking" 
                                 type="action" 
@@ -825,7 +825,7 @@
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="6"/>
-                                <button name="%(move_split)d" string="Split in Two" type="action" states="assigned,confirmed,draft,auto" icon="gtk-justify-fill"/>
+                                <button name="%(act_split_moves)d" string="Split in Two" type="action" states="assigned,confirmed,draft,auto" icon="gtk-justify-fill"/>
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
@@ -952,7 +952,7 @@
                                 type="action" 
                                 icon="gtk-go-forward" 
                                 help="Make Picking" colspan="2"/>
-                        <button name="%(return_picking)d" 
+                        <button name="%(act_stock_return_picking)d" 
                                 states="done" 
                                 string="Return Picking" 
                                 type="action" 
@@ -1022,7 +1022,7 @@
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="6"/>
-                                <button name="%(move_split)d" string="Split in Two" type="action" icon="gtk-justify-fill"/>
+                                <button name="%(act_split_moves)d" string="Split in Two" type="action" icon="gtk-justify-fill"/>
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
@@ -1147,7 +1147,7 @@
                                 type="action" 
                                 icon="gtk-go-forward" 
                                 help="Make Picking" colspan="2"/>
-                        <button name="%(return_picking)d" 
+                        <button name="%(act_stock_return_picking)d" 
                                 states="done" 
                                 string="Return Picking" 
                                 type="action" 
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 2ac9c290be6..e2f525f9c15 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -6,31 +6,6 @@
         <wizard string="UPS xml file" model="stock.move.lot" name="stock.ups_xml" />
         -->
 
-
-        <wizard
-            id="move_split"
-            model="stock.picking"
-            multi="True"
-            name="stock.move.split"
-            string="Split move line"/>
-        
-
-<!--		<wizard -->
-<!--			id="make_picking" -->
-<!--			model="stock.picking"-->
-<!--			menu="False"-->
-<!--			keyword="client_action_multi"-->
-<!--			name="stock.picking.make" -->
-<!--			string="Make Picking"/>-->
-
-	    <wizard
-	        id="return_picking"
-	        model="stock.picking"
-	        menu="False"
-			keyword="client_action_multi"
-	        name="stock.return.picking"
-	        string="Return picking"/>	
-
     <wizard
         id="split_inventory_lots"
         model="stock.inventory.line"
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 7c87212571c..acdbd004354 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -25,8 +25,8 @@ import stock_partial_picking
 import stock_partial_move
 import stock_picking_make
 import wizard_replacement
-import wizard_return
-import wizard_split_lot_line
+import stock_return_picking
+import stock_split_move
 import wizard_ups
 import stock_inventory_merge
 import stock_inventory_set_stock_zero
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
new file mode 100644
index 00000000000..b0f15406ddb
--- /dev/null
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -0,0 +1,221 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import netsvc
+import time
+
+from osv import osv,fields
+from tools.translate import _
+
+class stock_return_picking(osv.osv_memory):
+    _name = 'stock.return.picking'
+    _description = 'Return Picking'
+
+    def default_get(self, cr, uid, fields, context):
+        """ 
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """ 
+        res = super(stock_return_picking, self).default_get(cr, uid, fields, context=context)
+        record_id = context and context.get('active_id', False) or False
+        pick_obj = self.pool.get('stock.picking')
+        pick = pick_obj.browse(cr, uid, record_id)
+        for m in [line for line in pick.move_lines]:
+            res['return%s'%(m.id)] = m.product_qty
+            if pick.invoice_state=='invoiced':
+                res['invoice_state'] = '2binvoiced'
+            else:
+                res['invoice_state'] = 'none'
+        return res
+    
+    def view_init(self, cr, uid, fields_list, context=None):
+        """ 
+         Creates view dynamically and adding fields at runtime.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view with new columns.
+        """
+        res = super(stock_return_picking, self).view_init(cr, uid, fields_list, context=context)
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            pick_obj = self.pool.get('stock.picking')
+            try:
+                pick = pick_obj.browse(cr, uid, record_id)
+                for m in [line for line in pick.move_lines]:
+                    if 'return%s'%(m.id) not in self._columns:
+                        self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
+                    if 'invoice_state' not in self._columns:
+                        self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)    
+            except Exception, e:
+                return res
+        return res
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
+                        context=None, toolbar=False, submenu=False):
+        """ 
+         Changes the view dynamically
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view.
+        """
+        res = super(stock_return_picking, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        record_id = context and context.get('active_id', False) or False
+        assert record_id,'Active ID not found'
+        if record_id:
+            pick_obj = self.pool.get('stock.picking')
+            pick = pick_obj.browse(cr, uid, record_id)
+            
+            try:
+                if pick.state != 'done':
+                    raise osv.except_osv(_('Warning !'), _("The Picking is not completed yet!\nYou cannot return picking which is not in 'Done' state!"))
+            
+                return_history = {}
+                for m_line in pick.move_lines:
+                    return_history[m_line.id] = 0
+                    for rec in m_line.move_stock_return_history:
+                        return_history[m_line.id] += rec.product_qty
+            
+                res['fields'].clear()
+                arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Provide the quantities of the returned products.')]
+                for m in [line for line in pick.move_lines]:
+                    quantity = m.product_qty
+                    if quantity > return_history[m.id] and (quantity - return_history[m.id])>0:
+                        arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
+                        res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True} 
+                        res.setdefault('returns', []).append(m.id)
+                if not res.get('returns',False):
+                    raise osv.except_osv(_('Warning!'),_('There is no product to return!'))
+            
+                arch_lst.append('<field name="invoice_state"/>\n<newline/>')
+                if pick.invoice_state=='invoiced':
+                    new_invoice_state='2binvoiced'
+                else:
+                    new_invoice_state=pick.invoice_state
+                res['fields']['invoice_state']={'string':_('Invoice state'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To Be Invoiced')), ('none', _('None'))]}
+                arch_lst.append('<group col="2" colspan="4">')
+                arch_lst.append('<button icon="gtk-cancel" special="cancel" string="Cancel" />')
+                arch_lst.append('<button name="action_open_window" string="Return" colspan="1" type="object" icon="gtk-apply" />')
+                arch_lst.append('</group>')
+                arch_lst.append('</form>')
+                res['arch'] = '\n'.join(arch_lst)
+            except Exception,e:
+                return res
+        return res
+
+    def _create_returns(self, cr, uid, ids, context):
+        """ 
+         Creates return picking.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of ids selected 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """ 
+        record_id = context and context.get('active_id', False) or False
+        move_obj = self.pool.get('stock.move')
+        pick_obj = self.pool.get('stock.picking')
+        uom_obj = self.pool.get('product.uom')
+        wf_service = netsvc.LocalService("workflow")
+    
+        pick = pick_obj.browse(cr, uid, record_id)
+        data = self.read(cr, uid, ids[0])
+        new_picking = None
+        date_cur = time.strftime('%Y-%m-%d %H:%M:%S')
+    
+        move_ids = [m.id for m in [line for line in pick.move_lines]]
+        set_invoice_state_to_none = True
+        for move in move_obj.browse(cr, uid, move_ids):
+            if not new_picking:
+                if pick.type=='out':
+                    new_type = 'in'
+                elif pick.type=='in':
+                    new_type = 'out'
+                else:
+                    new_type = 'internal'
+                new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
+                        'move_lines':[], 'state':'draft', 'type':new_type,
+                        'date':date_cur, 'invoice_state':data['invoice_state'],})
+            new_location=move.location_dest_id.id
+    
+            new_qty = data['return%s' % move.id]
+            returned_qty = move.product_qty
+    
+            for rec in move.move_stock_return_history:
+                returned_qty -= rec.product_qty
+    
+            if returned_qty != new_qty:
+                set_invoice_state_to_none = False
+    
+            new_move=move_obj.copy(cr, uid, move.id, {
+                'product_qty': new_qty,
+                'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
+                    new_qty, move.product_uos.id),
+                'picking_id':new_picking, 'state':'draft',
+                'location_id':new_location, 'location_dest_id':move.location_id.id,
+                'date':date_cur, 'date_planned':date_cur,})
+            move_obj.write(cr, uid, [move.id], {'move_stock_return_history':[(4,new_move)]})
+    
+        if set_invoice_state_to_none:
+            pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'})
+    
+        if new_picking:
+            if new_picking:
+                wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
+            pick_obj.force_assign(cr, uid, [new_picking], context)
+        return new_picking
+    
+    def action_open_window(self, cr, uid, ids, context):
+        """ 
+         Opens return picking list.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of ids selected 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """ 
+        res = self._create_returns(cr, uid, ids, context)
+        if not res:
+            return {}
+        return {
+            'domain': "[('id', 'in', ["+str(res)+"])]",
+            'name': 'Picking List',
+            'view_type':'form',
+            'view_mode':'tree,form',
+            'res_model':'stock.picking',
+            'view_id':False,
+            'type':'ir.actions.act_window',
+        }
+    
+stock_return_picking()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
new file mode 100644
index 00000000000..005c3a05b07
--- /dev/null
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Return Picking -->
+        
+        <record id="act_stock_return_picking" model="ir.actions.act_window">
+            <field name="name">Return Picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.return.picking</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>  
+		
+	</data>
+</openerp>	
diff --git a/addons/stock/wizard/stock_split_move.py b/addons/stock/wizard/stock_split_move.py
new file mode 100644
index 00000000000..0092656f83d
--- /dev/null
+++ b/addons/stock/wizard/stock_split_move.py
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import osv, fields
+
+class stock_split_move_line(osv.osv_memory):
+    _name = 'stock.move.line.split'
+    _description = "Split Moves"
+    
+    def default_get(self, cr, uid, fields, context):
+        """ 
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """ 
+        res = super(stock_split_move_line, self).default_get(cr, uid, fields, context=context)
+        record_id = context and context.get('active_id', False) or False
+        pick_obj = self.pool.get('stock.picking')
+        pick = pick_obj.browse(cr, uid, record_id)
+        for m in [line for line in pick.move_lines]:
+            res['move%s'%(m.id)] = m.product_qty
+        return res
+    
+    def view_init(self, cr, uid, fields_list, context=None):
+        """ 
+         Creates view dynamically and adding fields at runtime.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view with new columns.
+        """
+        res = super(stock_split_move_line, self).view_init(cr, uid, fields_list, context=context)
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            pick_obj = self.pool.get('stock.picking')
+            try:
+                pick = pick_obj.browse(cr, uid, record_id)
+                for m in [line for line in pick.move_lines]:
+                    if 'move%s' % m.id not in self._columns:
+                        self._columns['move%s' % m.id] = fields.float(string=m.product_id.name)
+            except:
+                return res
+        return res
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
+                        context=None, toolbar=False, submenu=False):
+        """ 
+         Changes the view dynamically
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param context: A standard dictionary 
+         @return: New arch of view.
+        """
+        res = super(stock_split_move_line, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        record_id = context and context.get('active_id', False) or False
+        assert record_id,'Active ID not found'
+        pick_obj = self.pool.get('stock.picking')
+        pick = pick_obj.browse(cr, uid, record_id)
+        arch_lst = ['<?xml version="1.0"?>', '<form string="Split lines">', '<label string="Indicate here the quantity of the new line. A quantity of zero will not split the line." colspan="4"/>']
+        for m in [line for line in pick.move_lines]:
+            quantity = m.product_qty
+            arch_lst.append('<field name="move%s" />\n<newline />' % (m.id,))
+            res['fields']['move%s' % m.id] = {'string' : m.product_id.name, 'type' : 'float', 'required' : True}
+        arch_lst.append('<group col="2" colspan="4">')
+        arch_lst.append('<button icon="gtk-cancel" special="cancel" string="Cancel" />')
+        arch_lst.append('<button name="split_lines" string="Split" colspan="1" type="object" icon="gtk-apply" />')
+        arch_lst.append('</group>')
+        arch_lst.append('</form>')
+        res['arch'] = '\n'.join(arch_lst)
+        return res
+    
+    def split_lines(self, cr, uid, ids, context):
+        """ 
+         Splits moves in quantity given in the wizard.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of ids selected 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
+        """ 
+        move_obj = self.pool.get('stock.move')
+        record_id = context and context.get('active_id', False) or False
+        pick_obj = self.pool.get('stock.picking')
+        pick = pick_obj.browse(cr, uid, record_id)
+        data = self.read(cr, uid, ids[0])
+        move_ids = [m.id for m in [line for line in pick.move_lines]]
+        for move in move_obj.browse(cr, uid, move_ids):
+            quantity = data['move%s' % move.id]
+            if 0 < quantity < move.product_qty:
+                new_qty = move.product_qty - quantity
+                new_uos_qty = new_qty / move.product_qty * move.product_uos_qty
+                new_obj = move_obj.copy(cr, uid, move.id, {'product_qty' : new_qty, 'product_uos_qty': new_uos_qty, 'state':move.state})
+                uos_qty = quantity / move.product_qty * move.product_uos_qty
+                move_obj.write(cr, uid, [move.id], {'product_qty' : quantity, 'product_uos_qty': uos_qty})
+        return {}
+    
+stock_split_move_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/stock/wizard/stock_split_move_view.xml b/addons/stock/wizard/stock_split_move_view.xml
new file mode 100644
index 00000000000..de89f83cb32
--- /dev/null
+++ b/addons/stock/wizard/stock_split_move_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Split Moves -->
+        
+        <record id="act_split_moves" model="ir.actions.act_window">
+            <field name="name">Split Moves</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.move.line.split</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>  
+		
+	</data>
+</openerp>	
diff --git a/addons/stock/wizard/wizard_return.py b/addons/stock/wizard/wizard_return.py
deleted file mode 100644
index a681f19cf9b..00000000000
--- a/addons/stock/wizard/wizard_return.py
+++ /dev/null
@@ -1,156 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-from tools.misc import UpdateableStr
-
-import netsvc
-import time
-
-from tools.translate import _
-
-arch=UpdateableStr()
-fields={}
-
-def make_default(val):
-    def fct(obj, cr, uid):
-        return val
-    return fct
-
-def _get_returns(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    pick_obj = pool.get('stock.picking')
-    pick = pick_obj.browse(cr, uid, [data['id']])[0]
-
-    if pick.state != 'done':
-        raise wizard.except_wizard(_('Warning !'), _("The Picking is not completed yet!\nYou cannot return picking which is not in 'Done' state!"))
-    res = {}
-
-    return_history = {}
-    for m_line in pick.move_lines:
-        return_history[m_line.id] = 0
-        for rec in m_line.move_stock_return_history:
-            return_history[m_line.id] += rec.product_qty
-
-    fields.clear()
-    arch_lst=['<?xml version="1.0"?>', '<form string="%s">' % _('Return lines'), '<label string="%s" colspan="4"/>' % _('Provide the quantities of the returned products.')]
-    for m in [line for line in pick.move_lines]:
-        quantity = m.product_qty
-        if quantity > return_history[m.id] and (quantity - return_history[m.id])>0:
-            arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
-            fields['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True, 'default':make_default(quantity - return_history[m.id])}
-            res.setdefault('returns', []).append(m.id)
-
-    if not res.get('returns',False):
-        raise  wizard.except_wizard(_('Warning!'),_('There is no product to return!'))
-
-    arch_lst.append('<field name="invoice_state"/>\n<newline/>')
-    if pick.invoice_state=='invoiced':
-        new_invoice_state='2binvoiced'
-    else:
-        new_invoice_state=pick.invoice_state
-    fields['invoice_state']={'string':_('Invoice state'), 'type':'selection', 'default':make_default(new_invoice_state), 'required':True, 'selection':[('2binvoiced', _('to be invoiced')), ('none', _('None'))]}
-    arch_lst.append('</form>')
-    arch.string='\n'.join(arch_lst)
-    return res
-
-def _create_returns(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    move_obj = pool.get('stock.move')
-    pick_obj = pool.get('stock.picking')
-    uom_obj = pool.get('product.uom')
-
-    pick=pick_obj.browse(cr, uid, [data['id']])[0]
-    new_picking=None
-    date_cur=time.strftime('%Y-%m-%d %H:%M:%S')
-
-    set_invoice_state_to_none = True
-    for move in move_obj.browse(cr, uid, data['form'].get('returns',[])):
-        if not new_picking:
-            if pick.type=='out':
-                new_type='in'
-            elif pick.type=='in':
-                new_type='out'
-            else:
-                new_type='internal'
-            new_picking=pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
-                    'move_lines':[], 'state':'draft', 'type':new_type,
-                    'date':date_cur, 'invoice_state':data['form']['invoice_state'],})
-        new_location=move.location_dest_id.id
-
-        new_qty = data['form']['return%s' % move.id]
-        returned_qty = move.product_qty
-
-        for rec in move.move_stock_return_history:
-            returned_qty -= rec.product_qty
-
-        if returned_qty != new_qty:
-            set_invoice_state_to_none = False
-
-        new_move=move_obj.copy(cr, uid, move.id, {
-            'product_qty': new_qty,
-            'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
-                new_qty, move.product_uos.id),
-            'picking_id':new_picking, 'state':'draft',
-            'location_id':new_location, 'location_dest_id':move.location_id.id,
-            'date':date_cur, 'date_planned':date_cur,})
-        move_obj.write(cr, uid, [move.id], {'move_stock_return_history':[(4,new_move)]})
-
-    if set_invoice_state_to_none:
-        pick_obj.write(cr, uid, [pick.id], {'invoice_state':'none'})
-
-    if new_picking:
-        wf_service = netsvc.LocalService("workflow")
-        if new_picking:
-            wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
-        pick_obj.force_assign(cr, uid, [new_picking], context)
-    return new_picking
-
-def _action_open_window(self, cr, uid, data, context):
-    res=_create_returns(self, cr, uid, data, context)
-    if not res:
-        return {}
-    return {
-        'domain': "[('id', 'in', ["+str(res)+"])]",
-        'name': 'Picking List',
-        'view_type':'form',
-        'view_mode':'tree,form',
-        'res_model':'stock.picking',
-        'view_id':False,
-        'type':'ir.actions.act_window',
-    }
-
-class wizard_return_picking(wizard.interface):
-    states={
-        'init':{
-            'actions':[_get_returns],
-            'result':{'type':'form', 'arch':arch, 'fields':fields, 'state':[('end','Cancel','gtk-cancel'),('return','Return','gtk-apply',True)]}
-        },
-        'return':{
-            'actions':[],
-            'result':{'type':'action', 'action':_action_open_window, 'state':'end'}
-        }
-    }
-wizard_return_picking('stock.return.picking')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/wizard_split_lot_line.py b/addons/stock/wizard/wizard_split_lot_line.py
deleted file mode 100644
index 6c05d9a48cc..00000000000
--- a/addons/stock/wizard/wizard_split_lot_line.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-import time
-from osv import osv
-from tools.misc import UpdateableStr
-
-arch = UpdateableStr()
-fields = {}
-
-def make_default(val):
-    def fct(obj, cr, uid):
-        return val
-    return fct
-
-def _get_moves(self, cr, uid, data, context):
-    pick_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    pick = pick_obj.browse(cr, uid, [data['id']])[0]
-    res = {}
-    fields.clear()
-    arch_lst = ['<?xml version="1.0"?>', '<form string="Split lines">', '<label string="Indicate here the quantity of the new line. A quantity of zero will not split the line." colspan="4"/>']
-    for m in [line for line in pick.move_lines]:
-        quantity = m.product_qty
-        arch_lst.append('<field name="move%s" />\n<newline />' % (m.id,))
-        fields['move%s' % m.id] = {'string' : m.product_id.name, 'type' : 'float', 'required' : True, 'default' : make_default(quantity)}
-        res.setdefault('moves', []).append(m.id)
-    arch_lst.append('</form>')
-    arch.string = '\n'.join(arch_lst)
-    return res
-
-def _split_lines(self, cr, uid, data, context):
-    move_obj = pooler.get_pool(cr.dbname).get('stock.move')
-    for move in move_obj.browse(cr, uid, data['form']['moves']):
-        quantity = data['form']['move%s' % move.id]
-        if 0 < quantity < move.product_qty:
-            new_qty = move.product_qty - quantity
-            new_uos_qty = new_qty / move.product_qty * move.product_uos_qty
-            new_obj = move_obj.copy(cr, uid, move.id, {'product_qty' : new_qty, 'product_uos_qty': new_uos_qty, 'state':move.state})
-            uos_qty = quantity / move.product_qty * move.product_uos_qty
-            move_obj.write(cr, uid, [move.id], {'product_qty' : quantity, 'product_uos_qty': uos_qty})
-    return {}
-
-class wizard_split_move(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_get_moves],
-            'result': {'type':'form', 'arch':arch, 'fields':fields, 'state':[('end','Cancel','gtk-cancel'),('split','Split','gtk-apply',True)]}
-        },
-        'split': {
-            'actions': [_split_lines],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-wizard_split_move('stock.move.split')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From e54e6fea1b028fafa4748f137bd7f2e4fd7cdda9 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 1 Apr 2010 10:53:38 +0530
Subject: [PATCH 174/248] [ADD] Event: Conver osv memory wizard create invoice
 from registration to osv memory type wizard

bzr revid: mra@tinyerp.com-20100401052338-ja6bzhgi8wush7xe
---
 addons/event/__terp__.py                      |   3 +-
 addons/event/event_wizard.xml                 |  13 --
 addons/event/wizard/__init__.py               |   2 +-
 addons/event/wizard/event_make_invoice.py     | 140 ++++++++++++++++
 .../event/wizard/event_make_invoice_view.xml  |  39 +++++
 addons/event/wizard/make_invoice.py           | 158 ------------------
 6 files changed, 181 insertions(+), 174 deletions(-)
 delete mode 100644 addons/event/event_wizard.xml
 create mode 100644 addons/event/wizard/event_make_invoice.py
 create mode 100644 addons/event/wizard/event_make_invoice_view.xml
 delete mode 100644 addons/event/wizard/make_invoice.py

diff --git a/addons/event/__terp__.py b/addons/event/__terp__.py
index bd61f486a05..3e76b9d19a2 100644
--- a/addons/event/__terp__.py
+++ b/addons/event/__terp__.py
@@ -41,7 +41,6 @@
     'depends': ['crm', 'base_contact', 'account'],
     'init_xml': ['event_data.xml'],
     'update_xml': [
-        'event_wizard.xml',
         'wizard/event_confirm_registration_view.xml',
         'event_view.xml',
         'event_sequence.xml',
@@ -49,7 +48,7 @@
         'security/ir.model.access.csv',
         'wizard/event_registration_view.xml',
         'wizard/event_registrations_partner.xml',
-
+        'wizard/event_make_invoice_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
     'installable': True,
diff --git a/addons/event/event_wizard.xml b/addons/event/event_wizard.xml
deleted file mode 100644
index 7042b4e67b5..00000000000
--- a/addons/event/event_wizard.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-
-       <wizard string="Make Invoice"
-            model="event.registration"
-            name="event.reg_make_invoice"
-            id="event_reg_invoice"
-            menu="True"
-            />
-
-    </data>
-</openerp>
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index b151b760d9f..81191b5a2f9 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import event_registration
-import make_invoice
+import event_make_invoice
 import event_registrations_partner
 import event_confirm_registration
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
new file mode 100644
index 00000000000..1df4d2f2277
--- /dev/null
+++ b/addons/event/wizard/event_make_invoice.py
@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields, osv
+
+class event_make_invoice(osv.osv_memory):
+    """
+    Make Invoices
+    """
+    _name = "event.make.invoice"
+    _description = "Event Make Invoice"
+    _columns = {
+        'inv_created': fields.char('Invoice Created', size=32, readonly=True),
+        'inv_rejected': fields.char('Invoice Rejected', size=32, readonly=True),
+        'inv_rej_reason': fields.text('Error Messages', readonly=True),
+#        'invoice_ids': fields.char('Invoice Ids', size=128), # Improve me
+               }
+
+    def _makeInvoices(self, cr, uid, context={}):
+        invoices = {}
+        invoice_ids = []
+        create_ids=[]
+        tax_ids=[]
+        inv_create = 0
+        inv_reject = 0
+        inv_rej_reason = ""
+        list_inv = []
+        obj_event_reg = self.pool.get('event.registration')
+        obj_lines = self.pool.get('account.invoice.line')
+        inv_obj = self.pool.get('account.invoice')
+        data_event_reg = obj_event_reg.browse(cr,uid, context['active_ids'], context=context)
+
+        for reg in data_event_reg:
+            if reg.state=='draft':
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Invoice cannot be created if the registration is in draft state. \n"
+                continue
+            if (not reg.tobe_invoiced):
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Registration is set as 'Cannot be invoiced'. \n"
+                continue
+            if reg.invoice_id:
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Registration already has an invoice linked. \n"
+                continue
+            if not reg.event_id.product_id:
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Event related doesn't have any product defined. \n"
+                continue
+            if not reg.partner_invoice_id:
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Registration doesn't have any partner to invoice. \n"
+                continue
+            partner_address_list = reg.partner_invoice_id and self.pool.get('res.partner').address_get(cr, uid, [reg.partner_invoice_id.id], adr_pref=['invoice'])
+            partner_address_id = partner_address_list['invoice']
+            if not partner_address_id:
+                inv_reject = inv_reject + 1
+                inv_rej_reason += "ID "+str(reg.id)+": Registered partner doesn't have an address to make the invoice. \n"
+                continue
+
+            inv_create = inv_create + 1
+            value = obj_lines.product_id_change(cr, uid, [], reg.event_id.product_id.id,uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
+            data_product = self.pool.get('product.product').browse(cr,uid,[reg.event_id.product_id.id])
+            for tax in data_product[0].taxes_id:
+                tax_ids.append(tax.id)
+
+            vals = value['value']
+            vals.update({
+                'name': reg.name,
+                'price_unit': reg.unit_price,
+                'quantity': reg.nb_register,
+                'product_id':reg.event_id.product_id.id,
+                'invoice_line_tax_id': [(6, 0, tax_ids)],
+            })
+            inv_line_ids = obj_event_reg._create_invoice_lines(cr, uid, [reg.id], vals)
+
+            inv = {
+                'name': reg.invoice_label,
+                'origin': reg.invoice_label,
+                'type': 'out_invoice',
+                'reference': False,
+                'account_id': reg.partner_invoice_id.property_account_receivable.id,
+                'partner_id': reg.partner_invoice_id.id,
+                'address_invoice_id':partner_address_id,
+                'address_contact_id':partner_address_id,
+                'invoice_line': [(6,0,[inv_line_ids])],
+                'currency_id' :reg.partner_invoice_id.property_product_pricelist.currency_id.id,
+                'comment': "",
+                'payment_term':reg.partner_invoice_id.property_payment_term.id,
+                'fiscal_position': reg.partner_invoice_id.property_account_position.id
+            }
+
+            inv_id = inv_obj.create(cr, uid, inv)
+            list_inv.append(inv_id)
+            obj_event_reg.write(cr, uid, reg.id, {'invoice_id': inv_id, 'state': 'done'})
+            obj_event_reg._history(cr, uid, [reg.id], 'Invoiced', history=True)
+
+#        {'inv_created' : str(inv_create) , 'inv_rejected' : str(inv_reject), 'invoice_ids': str(list_inv), 'inv_rej_reason': inv_rej_reason}
+        return {'inv_created' : str(inv_create) , 'inv_rejected' : str(inv_reject), 'inv_rej_reason': inv_rej_reason}
+
+    def default_get(self, cr, uid, fields_list, context=None):
+        res = super(event_make_invoice, self).default_get(cr, uid, fields_list, context)
+        res.update(self._makeInvoices(cr, uid, context=context))
+        return res
+
+    def confirm(self, cr, uid, ids, context={}):
+        obj_model = self.pool.get('ir.model.data')
+        data_inv = self.read(cr, uid, ids, [], context)[0]
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
+        resource_id = obj_model.read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+        return {
+#            'domain': "[('id','in', ["+','.join(map(str,data_inv['invoice_ids']))+"])]",
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'views': [(False,'tree'),(resource_id,'form')],
+            'context': "{'type':'out_invoice'}",
+            'type': 'ir.actions.act_window'
+        }
+
+event_make_invoice()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_make_invoice_view.xml b/addons/event/wizard/event_make_invoice_view.xml
new file mode 100644
index 00000000000..0f4c7c9c152
--- /dev/null
+++ b/addons/event/wizard/event_make_invoice_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_event_make_invoice" model="ir.ui.view">
+            <field name="name">event.make.invoice</field>
+            <field name="model">event.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="Make Invoices">
+              		<field name="inv_created" />
+              		<field name="inv_rejected" />
+              		<field name="inv_rej_reason" colspan="4"/>
+              		<group colspan="4" col="6">
+            			<button  icon="gtk-cancel" special="cancel" string="_Ok"/>
+            			<button icon="gtk-ok" name="confirm" string="Open" type="object"/>
+                	</group>
+				</form>
+            </field>
+		</record>
+
+		<record id="action_event_confirm_registration" model="ir.actions.act_window">
+            <field name="name">Make Invoices</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">event.make.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_event_make_invoice"/>
+	        <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+        <act_window id="action_make_invoices"
+    		key2 = "client_action_multi"   name="Make Invoice"
+    		res_model="event.make.invoice"  src_model="event.registration"
+    		view_mode="form" target="new"  view_type="form" />
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/event/wizard/make_invoice.py b/addons/event/wizard/make_invoice.py
deleted file mode 100644
index 7df7fc2b6f0..00000000000
--- a/addons/event/wizard/make_invoice.py
+++ /dev/null
@@ -1,158 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-from osv import fields, osv
-form = """<?xml version="1.0"?>
-<form string="Create Invoices">
-    <newline />
-    <field name="inv_created"/>
-    <newline />
-    <field name="inv_rejected"/>
-    <newline />
-    <field name="inv_rej_reason" width="400"/>
-</form>
-"""
-fields = {
-    'inv_created': {'string':'Invoice Created', 'type':'char', 'readonly':True},
-    'inv_rejected': {'string':'Invoice Rejected', 'type':'char', 'readonly':True},
-    'inv_rej_reason': {'string':'Error Messages', 'type':'text', 'readonly':True},
-}
-
-def _makeInvoices(self, cr, uid, data, context):
-    invoices = {}
-    invoice_ids = []
-    create_ids=[]
-    tax_ids=[]
-    pool_obj=pooler.get_pool(cr.dbname)
-
-    inv_create = 0
-    inv_reject = 0
-    inv_rej_reason = ""
-    list_inv = []
-    obj_event_reg=pool_obj.get('event.registration')
-    data_event_reg=obj_event_reg.browse(cr,uid,data['ids'])
-    obj_lines=pool_obj.get('account.invoice.line')
-
-    for reg in data_event_reg:
-        if reg.state=='draft':
-            inv_reject = inv_reject + 1
-            inv_rej_reason += "ID "+str(reg.id)+": Invoice cannot be created if the registration is in draft state. \n"
-            continue
-        if (not reg.tobe_invoiced):
-            inv_reject = inv_reject + 1
-            inv_rej_reason += "ID "+str(reg.id)+": Registration is set as 'Cannot be invoiced'. \n"
-            continue
-        if reg.invoice_id:
-            inv_reject = inv_reject + 1
-            inv_rej_reason += "ID "+str(reg.id)+": Registration already has an invoice linked. \n"
-            continue
-        if not reg.event_id.product_id:
-            inv_reject = inv_reject + 1
-            inv_rej_reason += "ID "+str(reg.id)+": Event related doesn't have any product defined. \n"
-            continue
-        if not reg.partner_invoice_id:
-            inv_reject = inv_reject + 1
-            inv_rej_reason += "ID "+str(reg.id)+": Registration doesn't have any partner to invoice. \n"
-            continue
-        partner_address_list = reg.partner_invoice_id and pool_obj.get('res.partner').address_get(cr, uid, [reg.partner_invoice_id.id], adr_pref=['invoice'])
-        partner_address_id = partner_address_list['invoice']
-        if not partner_address_id:
-            inv_reject = inv_reject + 1
-            inv_rej_reason += "ID "+str(reg.id)+": Registered partner doesn't have an address to make the invoice. \n"
-            continue
-
-        inv_create = inv_create + 1
-        value=obj_lines.product_id_change(cr, uid, [], reg.event_id.product_id.id,uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
-        data_product=pool_obj.get('product.product').browse(cr,uid,[reg.event_id.product_id.id])
-        for tax in data_product[0].taxes_id:
-            tax_ids.append(tax.id)
-
-        vals = value['value']
-        vals.update({
-            'name': reg.name,
-            'price_unit': reg.unit_price,
-            'quantity': reg.nb_register,
-            'product_id':reg.event_id.product_id.id,
-            'invoice_line_tax_id': [(6,0,tax_ids)],
-        })
-        inv_line_ids = obj_event_reg._create_invoice_lines(cr, uid, [reg.id], vals)
-
-        inv = {
-            'name': reg.invoice_label,
-            'origin': reg.invoice_label,
-            'type': 'out_invoice',
-            'reference': False,
-            'account_id': reg.partner_invoice_id.property_account_receivable.id,
-            'partner_id': reg.partner_invoice_id.id,
-            'address_invoice_id':partner_address_id,
-            'address_contact_id':partner_address_id,
-            'invoice_line': [(6,0,[inv_line_ids])],
-            'currency_id' :reg.partner_invoice_id.property_product_pricelist.currency_id.id,
-            'comment': "",
-            'payment_term':reg.partner_invoice_id.property_payment_term.id,
-            'fiscal_position': reg.partner_invoice_id.property_account_position.id
-        }
-
-        inv_obj = pool_obj.get('account.invoice')
-        inv_id = inv_obj.create(cr, uid, inv)
-        list_inv.append(inv_id)
-        obj_event_reg.write(cr, uid,reg.id, {'invoice_id' : inv_id,'state':'done'})
-        obj_event_reg._history(cr, uid,[reg.id], 'Invoiced', history=True)
-
-    return {'inv_created' : str(inv_create) , 'inv_rejected' : str(inv_reject) , 'invoice_ids':  list_inv, 'inv_rej_reason': inv_rej_reason}
-
-class make_invoice(wizard.interface):
-
-    def _list_invoice(self, cr, uid, data, context):
-        pool_obj = pooler.get_pool(cr.dbname)
-        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
-        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
-        return {
-            'domain': "[('id','in', ["+','.join(map(str,data['form']['invoice_ids']))+"])]",
-            'name': 'Invoices',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.invoice',
-            'views': [(False,'tree'),(resource_id,'form')],
-            'context': "{'type':'out_invoice'}",
-            'type': 'ir.actions.act_window'
-        }
-
-    states = {
-        'init' : {
-               'actions' : [_makeInvoices],
-               'result': {'type': 'form', 'arch': form, 'fields': fields, 'state':[('end','Ok'),('open','Open')]}
-            },
-
-        'open': {
-            'actions': [],
-            'result': {'type':'action', 'action':_list_invoice, 'state':'end'}
-        }
-
-    }
-
-make_invoice("event.reg_make_invoice")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 7611e71be04b77ebabac09f7292906ac1ff26971 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 1 Apr 2010 11:23:04 +0530
Subject: [PATCH 175/248] [IMP] point_of_sale: add the access rules and remove
 the unused code

bzr revid: sbh@tinyerp.com-20100401055304-dn647u7jj6e2cmjn
---
 addons/point_of_sale/security/ir.model.access.csv   | 11 ++++++++++-
 addons/point_of_sale/wizard/pos_details.xml         |  8 +-------
 addons/point_of_sale/wizard/pos_receipt_view.xml    | 13 +++----------
 addons/point_of_sale/wizard/pos_sales_user.xml      |  4 ++--
 .../wizard/pos_sales_user_current_user.xml          |  8 +-------
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index a761e78c362..0cfc0fae9b7 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -27,4 +27,13 @@
 "access_pos_open_statement","pos.close.statement","model_pos_close_statement","point_of_sale.group_pos_user",1,0,0,0
 "acess_pos_box_entries ","pos.box.entries ","model_pos_box_entries","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_box_out","pos.box.out","model_pos_box_out","point_of_sale.group_pos_user",1,0,0,0
-"acess_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sale_user","pos.sale.user","model_pos_sale_user","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sale_user","pos.sales.user.today","model_pos_sales_user_today","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sales_user_today_current_user","pos.sales.user.today.current_user","model_pos_sales_user_today_current_user","point_of_sale.group_pos_user",1,0,0,0
+"access_all_closed_cashbox_of_the_day","all.closed.cashbox.of.the.day","model_all_closed_cashbox_of_the_day","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_receipt","pos.receipt ","model_pos_receipt","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_payment_report_user","pos.payment.report.user","model_pos_payment_report_user","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_payment_report_date ","pos.payment.report.date ","model_pos_payment_report_date","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_make_payment","pos.make.payment","model_pos_make_payment","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_scan_product","pos.scan.product","model_pos_scan_product","point_of_sale.group_pos_user",1,0,0,0
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 7d6dd346c12..077e2ed89dc 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -31,13 +31,7 @@
             <field name="target">new</field>
             <field name="context">{'record_id' : active_id}</field>
         </record>
-<!--    <act_window name="POS Details"
-            res_model="pos.details"
-            src_model="pos.order"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_report_pos_details"/>   -->
+
         
 	</data>
 </openerp>	        
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index c046259bef6..fe7c3c1d2ba 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -13,26 +13,19 @@
           <button icon='gtk-cancel' special="cancel"
                   string="Close" />
           <button name="print_report" string="Print Report"
-                  colspan="1" type="object" icon="gtk-ok" />
+                  colspan="1" type="object" icon="gtk-print" />
         </form>
       </field>
     </record>
 
-    <act_window name="Print Receipt"
-        res_model="pos.receipt"
-        src_model="pos.order"
-        view_mode="form"
-        target="new"
-        key2="client_action_multi"
-        id="action_report_pos_receipt"/>
 
-      <!--record id="action_report_pos_receipt" model="ir.actions.act_window">
+     <record id="action_report_pos_receipt" model="ir.actions.act_window">
             <field name="name">Receipt</field>
             <field name="res_model">pos.receipt</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
              <field name="target">new</field>
-        </record-->
+        </record>
 
 </data>
 </openerp>
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
index 0fc46f81aac..cedd800fc39 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.xml
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>        
-        <!--   pos.details -->
+        <!--   pos sales user -->
         
 		<record id="view_pos_sale_user" model="ir.ui.view">
             <field name="name">Sale By User</field>
             <field name="model">pos.sale.user</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="POS Details :">
+                <form string="Sale By User">
 				    <group col="2" colspan="4">
 				    	<field name="date_start"/>
 				    	<field name="date_end"/>
diff --git a/addons/point_of_sale/wizard/pos_sales_user_current_user.xml b/addons/point_of_sale/wizard/pos_sales_user_current_user.xml
index 5625b70770f..e51ecfee760 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_current_user.xml
+++ b/addons/point_of_sale/wizard/pos_sales_user_current_user.xml
@@ -28,13 +28,7 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-<!--    <act_window name="POS Details"
-            res_model="pos.details"
-            src_model="pos.order"
-		    view_mode="form"
-		    target="new"        
-            key2="client_action_multi"    
-		    id="action_report_pos_details"/>   -->
+
         
 	</data>
 </openerp>	        
\ No newline at end of file

From 3ebd4313d94faa3dfb77a7b6b9e6d81889b9d114 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 1 Apr 2010 12:10:13 +0200
Subject: [PATCH 176/248] [IMP] Warn if an assertion has not been evaluated.

bzr revid: jth@openerp.com-20100401101013-gi2zpo47iu7pbpn4
---
 bin/tools/yaml_import.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 36eeadd0cf7..6b098289611 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -202,6 +202,7 @@ class YamlInterpreter(object):
         assertion, expressions = node.items()[0]
 
         if self.isnoupdate(assertion) and self.mode != 'init':
+            self.logger.warn('This assertion was not evaluated ("%s").' % assertion.string)
             return
         model = self.get_model(assertion.model)
         ids = self._get_assertion_id(assertion)

From 8a7b0972e76207a702810bdbbf3314d80c68c591 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Thu, 1 Apr 2010 16:10:45 +0530
Subject: [PATCH 177/248] [FIX] sale: change in sale_line_invoice.xml

bzr revid: mso@mso-20100401104045-809287leykc9osc9
---
 addons/sale/wizard/sale_line_invoice.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index a9ea13ea900..90bdf2a6828 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -11,7 +11,7 @@
     			<field name="grouped" />
              	<separator string="" colspan="6" />
               	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               	<button name="makeInvoices" string="Create Invoices" type="object" icon="gtk-ok"/>
+               	<button name="make_invoices" string="Create Invoices" type="object" icon="gtk-ok"/>
              </form>
             </field>
 		</record>

From b0ada2f850d7c25935262b0c0b5091224563027e Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 1 Apr 2010 16:13:47 +0530
Subject: [PATCH 178/248] [FIX] stock: Fill Inventory wizard option 'Include
 all child for the location' is now working.

bzr revid: uco@tinyerp.co.in-20100401104347-3pqhd11py5o9fagp
---
 addons/stock/wizard/stock_fill_inventory.py | 54 ++++++++++-----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index c96638c8d52..3247628657a 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -68,35 +68,35 @@ class stock_fill_inventory(osv.osv_memory):
                 res = location_obj._product_get(cr, uid,
                             fill_inventory.location_id.id, context=context)
                 res_location[fill_inventory.location_id.id] = res
+        
+        product_ids = []
+        for location in res_location.keys():
+            res = res_location[location]
+            for product_id in res.keys():
+                prod = product_obj.browse(cr, uid, [product_id])[0]
+                uom = prod.uom_id.id
+                context.update({'uom': uom})
+                amount = stock_location_obj._product_get(cr, uid,
+                         location, [product_id], context=context)[product_id]
 
-                product_ids = []
-                for location in res_location.keys():
-                    res = res_location[location]
-                    for product_id in res.keys():
-                        prod = product_obj.browse(cr, uid, [product_id])[0]
-                        uom = prod.uom_id.id
-                        context.update({'uom': uom})
-                        amount = stock_location_obj._product_get(cr, uid,
-                                 location, [product_id], context=context)[product_id]
+                if(amount):
+                    line_ids=inventory_line_obj.search(cr, uid,
+                        [('inventory_id', '=', context['active_ids']),
+                         ('location_id', '=', location),
+                         ('product_id', '=', product_id),
+                         ('product_uom', '=', uom),
+                        ('product_qty', '=', amount)])
+                    if not len(line_ids):
+                        inventory_line = {'inventory_id': context['active_ids'][0],
+                                        'location_id': location,
+                                        'product_id': product_id,
+                                        'product_uom': uom,
+                                        'product_qty': amount}
+                        inventory_line_obj.create(cr, uid, inventory_line)
+                    product_ids.append(product_id)
 
-                        if(amount):
-                            line_ids=inventory_line_obj.search(cr, uid,
-                                [('inventory_id', '=', context['active_ids']),
-                                 ('location_id', '=', location),
-                                 ('product_id', '=', product_id),
-                                 ('product_uom', '=', uom),
-                                ('product_qty', '=', amount)])
-                            if not len(line_ids):
-                                inventory_line = {'inventory_id': context['active_ids'][0],
-                                                'location_id': location,
-                                                'product_id': product_id,
-                                                'product_uom': uom,
-                                                'product_qty': amount}
-                                inventory_line_obj.create(cr, uid, inventory_line)
-                            product_ids.append(product_id)
-
-                if(len(product_ids) == 0):
-                    raise osv.except_osv(_('Message !'), _('No product in this location.'))
+        if(len(product_ids) == 0):
+            raise osv.except_osv(_('Message !'), _('No product in this location.'))
         return {}
 
 stock_fill_inventory()

From 60e601b49a0ccd670ade65dfe13553a978b7dfeb Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Thu, 1 Apr 2010 16:15:15 +0530
Subject: [PATCH 179/248] [FIX] mrp_repair: Fixed browse record error for wrong
 ids in 'Cancel Repair' wizard.

bzr revid: uco@tinyerp.co.in-20100401104515-0em4bbe08zizg48o
---
 addons/mrp_repair/wizard/cancel_repair.py | 25 +++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 91df6fb01ef..7977a8b2195 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -68,17 +68,20 @@ class repair_cancel(osv.osv_memory):
         record_id = context and context.get('active_id', False) or False        
         res = super(repair_cancel, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         if record_id:
-            repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
-            if not repair_order.invoiced:
-                res['arch'] = """ <form string="Cancel Repair" colspan="4">
-                                <group col="2" colspan="2">
-                                    <label string="Do you want to continue?" colspan="4"/>
-                                    <separator colspan="4"/>
-                                    <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
-                                    <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
-                                </group>
-                            </form>                             
-                        """
+            try:
+                repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
+                if not repair_order.invoiced:
+                    res['arch'] = """ <form string="Cancel Repair" colspan="4">
+                                    <group col="2" colspan="2">
+                                        <label string="Do you want to continue?" colspan="4"/>
+                                        <separator colspan="4"/>
+                                        <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
+                                        <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
+                                    </group>
+                                </form>                             
+                            """
+            except:
+                return res
         return res
 
 repair_cancel()

From 80a2d0463f261e39ce77e3d8c0128e529133111b Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 1 Apr 2010 17:01:30 +0530
Subject: [PATCH 180/248] [IMP]: crm: Apply some changes and add function

bzr revid: ksa@tinyerp.co.in-20100401113130-48zf5bsafdt1x3p6
---
 addons/crm/__init__.py                        |   5 +-
 addons/crm/__terp__.py                        | 108 ++++++------
 addons/crm/crm_opportunity.py                 |  53 ++++++
 addons/crm/crm_opportunity_view.xml           |   8 +-
 addons/crm/crm_phonecall.py                   |  54 +++++-
 addons/crm/crm_phonecall_view.xml             |   7 +-
 addons/crm/security/ir.model.access.csv       |   2 -
 addons/crm/wizard/__init__.py                 |   8 +-
 .../crm/wizard/crm_opportunity_to_meeting.py  | 156 ------------------
 .../crm_opportunity_to_meeting_view.xml       |  46 ------
 10 files changed, 172 insertions(+), 275 deletions(-)
 delete mode 100644 addons/crm/wizard/crm_opportunity_to_meeting.py
 delete mode 100644 addons/crm/wizard/crm_opportunity_to_meeting_view.xml

diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index b3142be7c2f..1c0cc81dd38 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,6 @@ import crm_claim
 import crm_fundraising
 import crm_helpdesk
 
-
 import report
 import wizard
 
diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 90d2a63e09a..a1e09f63df8 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -41,84 +41,82 @@ appropriate staff, and making sure all future correspondence gets to the right
 place.
 
 The CRM module has a email gateway for the synchronisation interface
-between mails and Open ERP.""", 
-    'author': 'Tiny', 
-    'website': 'http://www.openerp.com', 
-    'depends': ['base', 'base_action_rule',                         
-                        'process', 
-                        'mail_gateway', 
+between mails and Open ERP.""",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ['base', 'base_action_rule',
+                        'process',
+                        'mail_gateway',
                         'base_calendar',
-                    ], 
-    'init_xml': ['crm_data.xml', 
-                'crm_meeting_data.xml', 
-                 'crm_claims_data.xml', 
-                 'crm_fund_data.xml', 
-                 'crm_helpdesk_data.xml', 
-                 'crm_lead_data.xml', 
-                 'crm_meeting_data.xml', 
-                 'crm_opportunity_data.xml', 
-                 'crm_phonecall_data.xml', 
-    ], 
+                    ],
+    'init_xml': ['crm_data.xml',
+                'crm_meeting_data.xml',
+                 'crm_claims_data.xml',
+                 'crm_fund_data.xml',
+                 'crm_helpdesk_data.xml',
+                 'crm_lead_data.xml',
+                 'crm_meeting_data.xml',
+                 'crm_opportunity_data.xml',
+                 'crm_phonecall_data.xml',
+    ],
 
     'update_xml': [
         'wizard/crm_lead_to_partner_view.xml',
         'wizard/crm_lead_to_opportunity_view.xml',
 
         'wizard/crm_phonecall_to_phonecall_view.xml',
-        'wizard/crm_phonecall_to_meeting_view.xml',
         'wizard/crm_phonecall_to_partner_view.xml',
         'wizard/crm_phonecall_to_opportunity_view.xml',
 
-        'wizard/crm_opportunity_to_meeting_view.xml',
         'wizard/crm_opportunity_to_phonecall_view.xml',
         'wizard/crm_partner_to_opportunity_view.xml',
-        
-        'wizard/crm_send_email_view.xml', 
-        'wizard/crm_email_add_cc_view.xml',  
-        'crm_wizard.xml', 
+
+        'wizard/crm_send_email_view.xml',
+        'wizard/crm_email_add_cc_view.xml',
+        'crm_wizard.xml',
         'crm_view.xml',
-         
-        'crm_action_rule_view.xml', 
-        'crm_lead_view.xml', 
-        'crm_lead_menu.xml', 
-        'crm_meeting_view.xml', 
-        'crm_meeting_menu.xml', 
-        'crm_phonecall_view.xml', 
-        'crm_phonecall_menu.xml',         
-        'crm_opportunity_view.xml', 
-        'crm_opportunity_menu.xml', 
-        'crm_fund_view.xml', 
-        'crm_fund_menu.xml', 
-        'crm_claims_view.xml', 
-        'crm_claims_menu.xml', 
+
+        'crm_action_rule_view.xml',
+        'crm_lead_view.xml',
+        'crm_lead_menu.xml',
+        'crm_meeting_view.xml',
+        'crm_meeting_menu.xml',
+        'crm_phonecall_view.xml',
+        'crm_phonecall_menu.xml',
+        'crm_opportunity_view.xml',
+        'crm_opportunity_menu.xml',
+        'crm_fund_view.xml',
+        'crm_fund_menu.xml',
+        'crm_claims_view.xml',
+        'crm_claims_menu.xml',
 
         'crm_helpdesk_view.xml',
-        'crm_helpdesk_menu.xml', 
-         
-        'security/crm_security.xml', 
-        'security/ir.model.access.csv', 
+        'crm_helpdesk_menu.xml',
+
+        'security/crm_security.xml',
+        'security/ir.model.access.csv',
 
         'report/crm_report_view.xml',
         'report/crm_claim_report_view.xml',
         'report/crm_lead_report_view.xml',
         'report/crm_fundraising_report_view.xml',
-        'report/crm_opportunity_report_view.xml' ,       
+        'report/crm_opportunity_report_view.xml' ,
         'report/crm_phonecall_report_view.xml',
-        
+
         'process/crm_configuration_process.xml',
-        
+
     ],
     'demo_xml': [
-        'crm_demo.xml', 
-        'crm_claims_demo.xml', 
-        'crm_fund_demo.xml', 
-        'crm_helpdesk_demo.xml', 
-        'crm_lead_demo.xml', 
-        'crm_meeting_demo.xml', 
-        'crm_opportunity_demo.xml', 
-        'crm_phonecall_demo.xml'], 
-    'installable': True, 
-    'active': False, 
-    'certificate': '0079056041421', 
+        'crm_demo.xml',
+        'crm_claims_demo.xml',
+        'crm_fund_demo.xml',
+        'crm_helpdesk_demo.xml',
+        'crm_lead_demo.xml',
+        'crm_meeting_demo.xml',
+        'crm_opportunity_demo.xml',
+        'crm_phonecall_demo.xml'],
+    'installable': True,
+    'active': False,
+    'certificate': '0079056041421',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 58c3c551638..407df221340 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -21,6 +21,7 @@
 
 from datetime import datetime
 from osv import fields,osv,orm
+from tools.translate import _
 import crm
 
 AVAILABLE_STATES = [
@@ -166,5 +167,57 @@ class crm_opportunity(osv.osv):
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
+    def action_makeMeeting(self, cr, uid, ids, context=None):
+        """
+        This opens Meeting's calendar view to schedule meeting on current Opportunity
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Opportunity to Meeting IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Meeting view
+        """
+        value = {}
+        for opp in self.browse(cr, uid, ids):
+            data_obj = self.pool.get('ir.model.data')
+
+            # Get meeting views
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            if id1:
+                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+            context = {
+                'default_opportunity_id': opp.id,
+                'default_partner_id': opp.partner_id and opp.partner_id.id or False,
+                'default_section_id': opp.section_id and opp.section_id.id or False,
+                'default_email_from': opp.email_from,
+                'default_state': 'open',
+                'default_name': opp.name
+            }
+            value = {
+                'name': _('Meetings'),
+                'domain': "[('user_id','=',%s)]" % (uid),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'calendar,form,tree',
+                'res_model': 'crm.meeting',
+                'view_id': False,
+                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id'],
+                'nodestroy': True
+            }
+
+        return value
+
 crm_opportunity()
 
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 2d2e249cd69..4e37620839d 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -71,8 +71,10 @@
                         	type="object" icon="gtk-go-forward" string="" />
                     </group>
                     <field name="user_id"/>
-                    <button string="Schedule Meeting"
-                        name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
+
+                       <button name="action_makeMeeting" type="object"
+                		string="Schedule Meeting" icon="gtk-redo" />
+
                     <field name="planned_revenue"/>
                     <field name="probability"/>
                     <field name="date_deadline" string="Expected Closing"/>
@@ -151,7 +153,7 @@
                             <separator string="Action Information" colspan="4"/>
                             <field name="name" colspan="4"/>
                             <field name="date"/>
-                            <field name="user_id"/>                           
+                            <field name="user_id"/>
                         </form>
                     </field>
                 </page>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 962a3883d62..3b0d627c058 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 import crm
 import time
 
@@ -48,7 +49,7 @@ class crm_phonecall(osv.osv):
                          the canall which is this opportunity source."),
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
-        'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),
+        'opportunity_id': fields.many2one ('crm.opportunity', 'Opportunity'),
     }
 
     _defaults = {
@@ -56,6 +57,57 @@ class crm_phonecall(osv.osv):
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
+    def action_make_meeting(self, cr, uid, ids, context=None):
+        """
+        This opens Meeting's calendar view to schedule meeting on current Phonecall
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Meeting IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Meeting view
+        """
+        value = {}
+        for phonecall in self.browse(cr, uid, ids):
+            data_obj = self.pool.get('ir.model.data')
+
+            # Get meeting views
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            if id1:
+                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+            context = {
+                        'default_phonecall_id': phonecall.id,
+                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
+                        'default_email': phonecall.email_from ,
+                        'default_name': phonecall.name
+                    }
+
+            value = {
+                'name': _('Meetings'),
+                'domain' : "[('user_id','=',%s)]" % (uid),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'calendar,form,tree',
+                'res_model': 'crm.meeting',
+                'view_id': False,
+                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id'],
+                'nodestroy': True
+                }
+
+        return value
+
 crm_phonecall()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 7e1e51349a9..42692eee9ce 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -53,7 +53,7 @@
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
                     states="draft,open,pending"
-                    name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
+                     name="action_make_meeting" type="action" />
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -76,9 +76,10 @@
                     <field name="date" string="Planned Date"/>
                     <field name="user_id"/>
                     <button string="Schedule a Meeting"
-                        name="%(wizard_crm_phonecall_meeting_set)d"
+                        name="action_make_meeting"
                         icon="gtk-redo"
-                        type="action" />
+                        type="object" />
+
                     <field name="partner_phone"/>
                     <field name="duration"/>
                     <field name="section_id" colspan="1" widget="selection" />
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 531d9e867de..12e9d2557f1 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -34,11 +34,9 @@
 "access_report_crm_case_service_dashboard","report.crm.case.service.dashboard","model_report_crm_case_service_dashboard","crm.group_crm_user",1,0,0,0
 "access_crm_lead2partner","crm.lead2partner","model_crm_lead2partner","crm.group_crm_user",1,1,1,1
 "access_crm_lead2opportunity","crm.lead2opportunity","model_crm_lead2opportunity","crm.group_crm_user",1,1,1,1
-"access_crm_opportunity2meeting","crm.opportunity2meeting","model_crm_opportunity2meeting","crm.group_crm_user",1,1,1,1
 "access_crm_opportunity2phonecall","crm.opportunity2phonecall","model_crm_opportunity2phonecall","crm.group_crm_user",1,1,1,1
 "access_crm_phonecall2phonecall","crm.phonecall2phonecall","model_crm_phonecall2phonecall","crm.group_crm_user",1,1,1,1
 "access_crm_phonecall2partner","crm.phonecall2partner","model_crm_phonecall2partner","crm.group_crm_user",1,1,1,1
-"access_crm_phonecall2meeting","crm.phonecall2meeting","model_crm_phonecall2meeting","crm.group_crm_user",1,1,1,1
 "access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,1,1,1
 "access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
 "access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 927467dfb54..f3d92447acd 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,13 +24,9 @@ import crm_email_add_cc
 
 import crm_lead_to_partner
 import crm_lead_to_opportunity
-
-import crm_opportunity_to_meeting
 import crm_opportunity_to_phonecall
-
 import crm_phonecall_to_phonecall
 import crm_phonecall_to_partner
-import crm_phonecall_to_meeting
 import crm_phonecall_to_opportunity
 import crm_partner_to_opportunity
 
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting.py b/addons/crm/wizard/crm_opportunity_to_meeting.py
deleted file mode 100644
index 3d2d59babe6..00000000000
--- a/addons/crm/wizard/crm_opportunity_to_meeting.py
+++ /dev/null
@@ -1,156 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv
-from tools.translate import _
-import wizard
-import pooler
-
-#===============================================================================
-# Put original wizard because of action in init
-# Remove it after solution foraction in init
-#===============================================================================
-
-class opportunity2meeting(wizard.interface):
-
-    def _makeMeeting(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        opportunity_case_obj = pool.get('crm.opportunity')                
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-        id = data_obj.read(cr, uid, result, ['res_id'])
-        id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-        if id1:
-            id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        opportunity = opportunity_case_obj.browse(cr, uid, data['id'], context=context)
-        partner_id = opportunity.partner_id and opportunity.partner_id.id or False
-        name = opportunity.name
-        email = opportunity.email_from
-        section_id = opportunity.section_id and opportunity.section_id.id or False
-        return {            
-            'name': _('Meetings'),
-            'domain' : "[('user_id','=',%s), ('opportunity_id', '=', %s)]"%(uid, data['id']),  
-            'context': {'default_partner_id': partner_id, 
-                        'default_opportunity_id': data['id'], 
-                        'default_section_id': section_id, 
-                        'default_email_from': email, 
-                        'default_state':'open', 'default_name':name},
-            'view_type': 'form',
-            'view_mode': 'tree,form,calendar',
-            'res_model': 'crm.meeting',
-            'view_id': False,
-            'views': [(id1, 'calendar'), (id3, 'tree'), (id2, 'form')], 
-            'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']
-            }
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
-        },
-        'order': {
-            'actions': [],
-            'result': {'type': 'state', 'state': 'end'}
-        }
-    }
-opportunity2meeting('crm.opportunity.meeting_set')
-
-class crm_opportunity2meeting(osv.osv_memory):
-    _name = 'crm.opportunity2meeting'
-    _description = 'Opportunity To Meeting'
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        """
-        Closes Opportunity to Meeting form
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Opportunity to Meeting IDs
-        @param context: A standard dictionary for contextual values
-
-        """
-        return {'type': 'ir.actions.act_window_close'}
-
-    def action_makeMeeting(self, cr, uid, ids, context=None):
-        """
-        This opens Meeting's calendar view to schedule meeting on current Opportunity
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Opportunity to Meeting IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Meeting view
-        """
-        value = {}
-        record_id = context and context.get('active_id', False) or False
-        if record_id:
-            opp_obj = self.pool.get('crm.opportunity')
-            data_obj = self.pool.get('ir.model.data')
-            
-            # Get meeting views
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            if id1:
-                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-            opp = opp_obj.browse(cr, uid, record_id, context=context)
-            context = {
-                'default_opportunity_id': opp.id, 
-                'default_partner_id': opp.partner_id and opp.partner_id.id or False, 
-                'default_section_id': opp.section_id and opp.section_id.id or False, 
-                'default_email_from': opp.email_from, 
-                'default_state': 'open', 
-                'default_name': opp.name
-            }
-                    
-            value = {
-                'name': _('Meetings'), 
-                'domain' : "[('user_id','=',%s)]" % (uid), 
-                'context': context, 
-                'view_type': 'form', 
-                'view_mode': 'calendar,form,tree', 
-                'res_model': 'crm.meeting', 
-                'view_id': False, 
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')], 
-                'type': 'ir.actions.act_window', 
-                'search_view_id': res['res_id']
-            }
-
-        return value
-
-crm_opportunity2meeting()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_opportunity_to_meeting_view.xml b/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
deleted file mode 100644
index 9fdf506d313..00000000000
--- a/addons/crm/wizard/crm_opportunity_to_meeting_view.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    
-<!--  Old wizard -->
-
-	<wizard
-            id="wizard_crm_opportunity_meeting_set"
-            keyword="client_action_multi"
-            model="crm.opportunity"
-			name="crm.opportunity.meeting_set"
-			menu="False"
-            string="Schedule Meeting"/>	
-
-	    <!-- Opportunity to meeting view -->
-
-        <record model="ir.ui.view" id="opportunity2meeting_view">
-            <field name="name">crm.opportunity2meeting.form</field>
-            <field name="model">crm.opportunity2meeting</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Convert To Meeting">
-                	<label string="Are you sure to schedule a meeting for this Opportunity?" colspan="4"/>
-                	<newline/>
-                	<separator colspan="4" string=""/>
-                	<button name="action_cancel" string="_Cancel"
-                		icon="gtk-cancel" special="cancel" />
-                	<button name="action_makeMeeting" type="object"
-                		string="_Schedule" icon="gtk-go-forward" />
-                </form>
-            </field>
-        </record>
-		
-		<!-- Opportunity to meeting action -->
-
-        <record model="ir.actions.act_window" id="opportunity2meeting_act">
-            <field name="name">Convert To Meeting</field>
-            <field name="res_model">crm.opportunity2meeting</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="opportunity2meeting_view"/>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>   
\ No newline at end of file

From 8d62e97ff5030095ea3ab415a09fe5d8062d5cf0 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 1 Apr 2010 15:26:03 +0200
Subject: [PATCH 181/248] [FIX] Assertion expressions list is a direct child of
 !assert block.

bzr revid: jth@openerp.com-20100401132603-2ar1hsmi62c0vs3p
---
 bin/tools/yaml_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 6b098289611..df273103130 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -217,7 +217,7 @@ class YamlInterpreter(object):
             context = self.get_context(assertion, self.eval_context)
             for id in ids:
                 record = model.browse(self.cr, self.uid, id, context)
-                for test in expressions.get('test', ''):
+                for test in expressions:
                     try:
                         success = eval(test, self.eval_context, RecordDictWrapper(record))
                     except Exception, e:

From 44f6ef941a26abbdc5bc9528390c2d03a9e7e1dc Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 1 Apr 2010 15:26:51 +0200
Subject: [PATCH 182/248] [FIX] Logs the stack trace.

bzr revid: jth@openerp.com-20100401132651-dgcz26yhw152f4sh
---
 bin/tools/yaml_import.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index df273103130..0136bcf69e0 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -607,9 +607,9 @@ class YamlInterpreter(object):
             try:
                 self._process_node(node)
             except YamlImportException, e:
-                self.logger.log(logging.ERROR, e)
+                self.logger.exception(e)
             except Exception, e:
-                self.logger.log(logging.ERROR, e)
+                self.logger.exception(e)
                 raise e
     
     def _process_node(self, node):

From 51f8a94d874c0eebd9e404078a02e787e2a14198 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 1 Apr 2010 15:27:09 +0200
Subject: [PATCH 183/248] [FIX] Workflow transition takes the model name, not
 the model object.

bzr revid: jth@openerp.com-20100401132709-1tyxfoh9550za6y1
---
 bin/tools/yaml_import.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 0136bcf69e0..06dfb151cc9 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -336,7 +336,6 @@ class YamlInterpreter(object):
         workflow, values = node.items()[0]
         if self.isnoupdate(workflow) and self.mode != 'init':
             return
-        model = self.get_model(workflow.model)
         if workflow.ref:
             id = self.get_id(workflow.ref)
         else:
@@ -357,7 +356,7 @@ class YamlInterpreter(object):
         else:
             uid = self.uid
         wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, model, id, workflow.action, self.cr)
+        wf_service.trg_validate(uid, workflow.model, id, workflow.action, self.cr)
         
     def process_function(self, node):
         function, values = node.items()[0]

From be891597ed79c405a11d9039d7d4c4daa6018247 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Thu, 1 Apr 2010 19:08:12 +0530
Subject: [PATCH 184/248] [ADD] l10n_be: convert vat_listing and vat_intra
 wizard to osv_memory wizard

bzr revid: psi@tinyerp.co.in-20100401133812-zive4kwxdgwtirc4
---
 addons/l10n_be/__terp__.py                    |   2 +
 addons/l10n_be/l10n_be_wizard.xml             |  81 -------
 addons/l10n_be/wizard/__init__.py             |   4 +-
 ...sting.py => l10_be_partner_vat_listing.py} | 199 ++++++++----------
 .../l10n_be_account_vat_declaration_view.xml  |   2 +-
 .../wizard/l10n_be_partner_vat_listing.xml    | 110 ++++++++++
 ...zard_vat_intra.py => l10n_be_vat_intra.py} | 163 ++++++--------
 .../l10n_be/wizard/l10n_be_vat_intra_view.xml |  61 ++++++
 8 files changed, 335 insertions(+), 287 deletions(-)
 rename addons/l10n_be/wizard/{partner_vat_listing.py => l10_be_partner_vat_listing.py} (54%)
 create mode 100644 addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
 rename addons/l10n_be/wizard/{wizard_vat_intra.py => l10n_be_vat_intra.py} (58%)
 create mode 100644 addons/l10n_be/wizard/l10n_be_vat_intra_view.xml

diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index 618367dfef7..d8f2c22b78a 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -51,6 +51,8 @@
                 'account_pcmn_belgium.xml',
                 'l10n_be_wizard.xml',
                 'wizard/l10n_be_account_vat_declaration_view.xml',
+                'wizard/l10n_be_vat_intra_view.xml',
+                'wizard/l10n_be_partner_vat_listing.xml',
                 'l10n_be_sequence.xml',
                 'fiscal_templates.xml',
                 'security/ir.model.access.csv'
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index 86c4d828b70..317effd19b7 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -2,90 +2,9 @@
 <openerp>
     <data>
 
-    <menuitem
-        id="menu_finance_belgian_statement"
-        name="Belgium Statements"
-        parent="account.menu_finance_legal_statement"/>
-
-    <wizard
-        string="Annual Listing of VAT-Subjected Customers"
-        model="res.partner"
-        name="list.vat.detail"
-        menu="False"
-        id="partner_wizard_vat"/>
-
-    <menuitem
-        name="Annual Listing of VAT-Subjected Customers"
-        parent="menu_finance_belgian_statement"
-        action="partner_wizard_vat"
-        type="wizard"
-        id="partner_wizard_vat_menu"/>
-
-<!--    <wizard
-        string="Periodical VAT Declaration"
-        name="wizard.account.xml.vat.declaration"
-        menu="False"
-        id="wizard_xml_vat_declaration"/>
-
-    <menuitem
-        name="Periodical VAT Declaration"
-        parent="menu_finance_belgian_statement"
-        action="wizard_xml_vat_declaration"
-        type="wizard"
-        id="account_wizard_vat_declaration"/> -->
-
-   	<wizard
-        string="Partner VAT intra"
-        model="res.partner"
-        name="vat.intra.xml"
-        menu="False"
-        id="partner_vat_intra"/>
-
-    <menuitem
-        name="Partner VAT intra"
-        parent="menu_finance_belgian_statement"
-        action="partner_vat_intra"
-        type="wizard"
-        id="partner_intra_vat_menu"/>
-
     <record id="config_call_account_template" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
     </record>
 
-	<!-- osv_memory for vat listing of clients -->
-	     <record id="view_vat_listing" model="ir.ui.view">
-            <field name="name">step.vat.listing</field>
-            <field name="model">vat.listing.clients</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="VAT listing">
-	                <field name="name"/>
-                    <field name="vat"/>
-                    <newline/>
-                    <field name="country"/>
-                    <newline/>
-                    <field name="amount"/>
-                    <field name="turnover"/>
-                </form>
-            </field>
-        </record>
-
-		<record id="view_vat_listing" model="ir.ui.view">
-            <field name="name">step.vat.listing</field>
-            <field name="model">vat.listing.clients</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="VAT listing">
-	                <field name="name"/>
-                    <field name="vat"/>
-                    <newline/>
-                    <field name="country"/>
-                    <newline/>
-                    <field name="amount"/>
-                    <field name="turnover"/>
-                </tree>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/l10n_be/wizard/__init__.py b/addons/l10n_be/wizard/__init__.py
index 88fb82f2d71..9db9b1ec853 100644
--- a/addons/l10n_be/wizard/__init__.py
+++ b/addons/l10n_be/wizard/__init__.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-import partner_vat_listing
-import wizard_vat_intra
+import l10_be_partner_vat_listing
+import l10n_be_vat_intra
 import l10n_be_account_vat_declaration
 
 
diff --git a/addons/l10n_be/wizard/partner_vat_listing.py b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
similarity index 54%
rename from addons/l10n_be/wizard/partner_vat_listing.py
rename to addons/l10n_be/wizard/l10_be_partner_vat_listing.py
index ba5620a0b4e..ecec9369ede 100644
--- a/addons/l10n_be/wizard/partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
@@ -1,3 +1,6 @@
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
@@ -18,14 +21,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 import datetime
 import base64
-from tools.translate import _
-import tools
 
-import wizard
-import pooler
 from tools.translate import _
 import tools
 from osv import fields, osv
@@ -33,7 +33,7 @@ from osv import fields, osv
 class vat_listing_clients(osv.osv_memory):
     _name = 'vat.listing.clients'
     _columns = {
-        'name': fields.char('Cleint Name', size=64),
+        'name': fields.char('Client Name', size=64),
         'vat': fields.char('VAT', size=64),
         'country': fields.char('Country', size=64),
         'amount': fields.float('Amount'),
@@ -42,66 +42,23 @@ class vat_listing_clients(osv.osv_memory):
 
 vat_listing_clients()
 
-form = """<?xml version="1.0"?>
-<form string="Select Fiscal Year">
-    <label string="This wizard will create an XML file for Vat details and total invoiced amounts per partner."  colspan="4"/>
-    <newline/>
-    <field name="fyear" />
-    <newline/>
-    <field name="mand_id" help="Should be provided when subscription of INTERVAT service is done"/>
-    <newline/>
-    <field name="limit_amount" help="Limit under which the partners will not be included into the listing"/>
-    <newline/>
-    <field name="test_xml" help="Sets the XML output as test file"/>
-</form>"""
+class partner_vat(osv.osv_memory):
+    """ Vat Listing """
+    _name = "partner.vat"
 
-fields = {
-    'fyear': {'string': 'Fiscal Year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True,},
-    'mand_id':{'string':'MandataireId','type':'char','size':'30','required': True,},
-    'limit_amount':{'string':'Limit Amount','type':'integer','required': True, },
-    'test_xml': {'string':'Test XML file', 'type':'boolean', },
-   }
-
-client_form = """<?xml version="1.0"?>
-<form string="Select Fiscal Year">
-    <label string="You can remove clients/partners which you do not want in exported xml file"  colspan="4"/>
-    <separator string="Clients" colspan="4"/>
-    <field name="partners" colspan="4" width="600" height="250" widget="one2many" nolabel="1"/>
-</form>"""
-
-client_fields = {
-    'partners': {'string': 'Cleints', 'type': 'many2many', 'relation': 'vat.listing.clients', 'required': False, 'help': 'You can remove clients/partners which you do not want to show in xml file'},
-                 }
-
-msg_form = """<?xml version="1.0"?>
-<form string="Notification">
-    <separator string="XML File has been Created."  colspan="4"/>
-    <field name="msg" colspan="4" nolabel="1"/>
-    <field name="name"/>
-    <newline/>
-    <field name="file_save" />
-</form>"""
-
-msg_fields = {
-  'name': {'string': 'File name', 'type':'char', 'size':'32'},
-  'msg': {'string':'File created', 'type':'text', 'size':'100','readonly':True},
-  'file_save':{'string': 'Save File',
-        'type': 'binary',
-        'readonly': True,},
-}
-
-class wizard_vat(wizard.interface):
-
-    def _get_partner(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        period = pool.get('account.period').search(cr, uid, [('fiscalyear_id', '=', data['form']['fyear'])])
-        p_id_list = pool.get('res.partner').search(cr,uid,[('vat_subjected','!=',False)])
+    def get_partner(self, cursor, user, ids, context={}):
+        obj_period = self.pool.get('account.period')
+        obj_partner = self.pool.get('res.partner')
+        obj_vat_lclient = self.pool.get('vat.listing.clients')
+        obj_model_data = self.pool.get('ir.model.data')
+        data  = self.read(cursor, user, ids)[0]
+        period = obj_period.search(cursor, user, [('fiscalyear_id', '=', data['fyear'])], context=context)
+        p_id_list = obj_partner.search(cursor, user, [('vat_subjected','!=',False)], context=context)
         if not p_id_list:
-             raise wizard.except_wizard(_('Data Insufficient!'),_('No partner has a VAT Number asociated with him.'))
+             raise osv.except_osv(_('Data Insufficient!'),_('No partner has a VAT Number asociated with him.'))
         partners = []
         records = []
-        for obj_partner in pool.get('res.partner').browse(cr, uid, p_id_list):
-        
+        for obj_partner in obj_partner.browse(cursor, user, p_id_list, context=context):
             record = {} # this holds record per partner
 
             #This listing is only for customers located in belgium, that's the
@@ -114,8 +71,8 @@ class wizard_vat(wizard.interface):
                     break
             if not go_ahead:
                 continue
-            cr.execute('select b.code,sum(credit)-sum(debit) from account_move_line l left join account_account a on (l.account_id=a.id) left join account_account_type b on (a.user_type=b.id) where b.code in %s and l.partner_id=%s and l.period_id=ANY(%s) group by b.code',(('produit','tax'),obj_partner.id,period,))
-            line_info = cr.fetchall()
+            cursor.execute('select b.code, sum(credit)-sum(debit) from account_move_line l left join account_account a on (l.account_id=a.id) left join account_account_type b on (a.user_type=b.id) where b.code in %s and l.partner_id=%s and l.period_id=ANY(%s) group by b.code',(('produit','tax'),obj_partner.id,period,))
+            line_info = cursor.fetchall()
             if not line_info:
                 continue
 
@@ -127,7 +84,7 @@ class wizard_vat(wizard.interface):
             #~addr = pool.get('res.partner').address_get(cr, uid, [obj_partner.id], ['invoice'])
 
             #~ if addr.get('invoice',False):
-                #~ads=pool.get('res.partner.address').browse(cr,uid,[addr['invoice']])[0]
+                #~ads=pool.get('res.partner.address').browse(cr, uid, [addr['invoice']])[0]
 
                 #~ if ads.country_id:
                     #~ record.append(ads.country_id.code)
@@ -141,38 +98,77 @@ class wizard_vat(wizard.interface):
             record['amount'] = 0
             record['turnover'] = 0
             record['name'] = obj_partner.name
-
             for item in line_info:
                 if item[0]=='produit':
                     record['turnover'] += item[1]
                 else:
                     record['amount'] += item[1]
-            id_client = pool.get('vat.listing.clients').create(cr, uid, record)
+            id_client = obj_vat_lclient.create(cursor, user, record, context=context)
             partners.append(id_client)
             records.append(record)
+        context.update({'partner_ids': partners, 'fyear': data['fyear'], 'limit_amount': data['limit_amount'], 'mand_id':data['mand_id']})
+        model_data_ids = obj_model_data.search(cursor, user, [('model','=','ir.ui.view'), ('name','=','view_vat_listing')])
+        resource_id = obj_model_data.read(cursor, user, model_data_ids, fields=['res_id'])[0]['res_id']
+        return {
+#            'domain': "[('id','in', ["+','.join(map(str,data['form']['invoice_ids']))+"])]",
+            'name': 'Vat Listing',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'partner.vat.list',
+            'views': [(resource_id,'form')],
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            }
 
-        return {'partners':partners}
+    _columns = {
+        'fyear': fields.many2one('account.fiscalyear','Fiscal Year', required=True),
+        'mand_id': fields.char('MandataireId', size=14, required=True,  help="This identifies the representative of the sending company. This is a string of 14 characters"),
+        'limit_amount': fields.integer('Limit Amount', required=True),
+        'test_xml': fields.boolean('Test XML file', help="Sets the XML output as test file"),
+        }
+partner_vat()
 
-    def _create_xml(self, cr, uid, data, context):
+class partner_vat_list(osv.osv_memory):
+
+    """ Partner Vat Listing """
+    _name = "partner.vat.list"
+    _columns = {
+        'partner_ids': fields.many2many('vat.listing.clients', 'vat_partner_rel', 'vat_id', 'partner_id', 'Clients', required=False, help='You can remove clients/partners which you do not want to show in xml file'),
+        'name': fields.char('File Name', size=32),
+        'msg': fields.text('File created', size=64, readonly=True),
+        'file_save' : fields.binary('Save File', readonly=True),
+        }
+
+    def get_partners(self, cursor, user, context={}):
+        return context.get('partner_ids', [])
+
+    def create_xml(self, cursor, user, ids, context={}):
         datas=[]
-        pool = pooler.get_pool(cr.dbname)
-        seq_controlref = pool.get('ir.sequence').get(cr, uid,'controlref')
-        seq_declarantnum = pool.get('ir.sequence').get(cr, uid,'declarantnum')
-        obj_cmpny = pool.get('res.users').browse(cr, uid, uid).company_id
+        obj_sequence = self.pool.get('ir.sequence')
+        obj_users = self.pool.get('res.users')
+        obj_partner = self.pool.get('res.partner')
+        obj_fyear = self.pool.get('account.fiscalyear')
+        obj_addr = self.pool.get('res.partner.address')
+        obj_vat_lclient = self.pool.get('vat.listing.clients')
+        obj_model_data = self.pool.get('ir.model.data')
+
+        seq_controlref = obj_sequence.get(cursor, user, 'controlref')
+        seq_declarantnum = obj_sequence.get(cursor, user, 'declarantnum')
+        obj_cmpny = obj_users.browse(cursor, user, user, context=context).company_id
         company_vat = obj_cmpny.partner_id.vat
         if not company_vat:
-            raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
+            raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
 
         cref = company_vat + seq_controlref
         dnum = cref + seq_declarantnum
-
-        obj_year=pool.get('account.fiscalyear').browse(cr,uid,data['form']['fyear'])
+        obj_year= obj_fyear.browse(cursor, user, context['fyear'], context=context)
         street = zip_city = country = ''
-        addr = pool.get('res.partner').address_get(cr, uid, [obj_cmpny.partner_id.id], ['invoice'])
+        addr = obj_partner.address_get(cursor, user, [obj_cmpny.partner_id.id], ['invoice'])
         if addr.get('invoice',False):
-            ads=pool.get('res.partner.address').browse(cr,uid,[addr['invoice']])[0]
+            ads = obj_addr.browse(cursor, user, [addr['invoice']], context=context)[0]
 
-            zip_city = pool.get('res.partner.address').get_city(cr,uid,ads.id)
+            zip_city = obj_addr.get_city(cursor, user, ads.id)
             if not zip_city:
                 zip_city = ''
             if ads.street:
@@ -185,8 +181,8 @@ class wizard_vat(wizard.interface):
         sender_date = time.strftime('%Y-%m-%d')
 
         data_file = '<?xml version="1.0"?>\n<VatList xmlns="http://www.minfin.fgov.be/VatList" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.minfin.fgov.be/VatList VatList.xml" RecipientId="VAT-ADMIN" SenderId="'+ str(company_vat) + '"'
-        data_file +=' ControlRef="'+ cref + '" MandataireId="'+ tools.ustr(data['form']['mand_id']) + '" SenderDate="'+ str(sender_date)+ '"'
-        if data['form']['test_xml']:
+        data_file +=' ControlRef="'+ cref + '" MandataireId="'+ tools.ustr(context['mand_id']) + '" SenderDate="'+ str(sender_date)+ '"'
+        if ['test_xml']:
             data_file += ' Test="0"'
         data_file += ' VersionTech="1.2">'
         data_file += '\n<AgentRepr DecNumber="1">\n\t<CompanyInfo>\n\t\t<VATNum>'+str(company_vat)+'</VATNum>\n\t\t<Name>'+tools.ustr(obj_cmpny.name)+'</Name>\n\t\t<Street>'+ tools.ustr(street) +'</Street>\n\t\t<CityAndZipCode>'+ tools.ustr(zip_city) +'</CityAndZipCode>'
@@ -194,25 +190,24 @@ class wizard_vat(wizard.interface):
         data_comp = '\n<CompanyInfo>\n\t<VATNum>'+str(company_vat)+'</VATNum>\n\t<Name>'+tools.ustr(obj_cmpny.name)+'</Name>\n\t<Street>'+ tools.ustr(street) +'</Street>\n\t<CityAndZipCode>'+ tools.ustr(zip_city) +'</CityAndZipCode>\n\t<Country>'+ tools.ustr(country) +'</Country>\n</CompanyInfo>'
         data_period = '\n<Period>'+ tools.ustr(obj_year.date_stop[:4]) +'</Period>'
         error_message = []
-
-        for partner in data['form']['partners']:
+        data = self.read(cursor, user, ids)[0]
+        for partner in data['partner_ids']:
             if isinstance(partner, list) and partner:
                 datas.append(partner[2])
             else:
-                client_data = pool.get('vat.listing.clients').read(cr, uid, partner, context=context)
+                client_data = obj_vat_lclient.read(cursor, user, partner, context=context)
                 datas.append(client_data)
-
         seq=0
         data_clientinfo=''
         sum_tax=0.00
         sum_turnover=0.00
         if len(error_message):
-            data['form']['msg']='Exception : \n' +'-'*50+'\n'+ '\n'.join(error_message)
-            return data['form']
+            msg ='Exception : \n' +'-'*50+'\n'+ '\n'.join(error_message)
+            return msg
         for line in datas:
             if not line:
                 continue
-            if line['turnover'] < data['form']['limit_amount']:
+            if line['turnover'] < context['limit_amount']:
                 continue
             seq +=1
             sum_tax +=line['amount']
@@ -221,28 +216,16 @@ class wizard_vat(wizard.interface):
 
         data_decl ='\n<DeclarantList SequenceNum="1" DeclarantNum="'+ dnum + '" ClientNbr="'+ str(seq) +'" TurnOverSum="'+ str(int(sum_turnover * 100)) +'" TaxSum="'+ str(int(sum_tax * 100)) +'" />'
         data_file += tools.ustr(data_decl) + tools.ustr(data_comp) + tools.ustr(data_period) + tools.ustr(data_clientinfo) + '\n</VatList>'
+        msg = 'Save the File with '".xml"' extension.'
+        file_save = base64.encodestring(data_file.encode('utf8'))
 
-        data['form']['msg'] = 'Save the File with '".xml"' extension.'
-        data['form']['file_save'] = base64.encodestring(data_file.encode('utf8'))
-        data['form']['name'] = 'vat_list.xml'
-        return data['form']
+        self.write(cursor, user, ids, {'file_save':file_save, 'msg':msg, 'name':'vat_list.xml'}, context=context)
+        return True
 
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel', 'gtk-cancel'),('go_step','View Clients', 'gtk-ok')]},
-        },
-        'go_step': {
-            'actions': [_get_partner],
-            'result': {'type':'form', 'arch':client_form, 'fields':client_fields, 'state':[('end','Cancel', 'gtk-cancel'),('go','Create XML', 'gtk-ok')]},
-        },
-        'go': {
-            'actions': [_create_xml],
-            'result': {'type':'form', 'arch':msg_form, 'fields':msg_fields, 'state':[('end','Ok', 'gtk-cancel')]},
-        }
+    _defaults={
+        'partner_ids': get_partners
+            }
 
-    }
+partner_vat_list()
 
-wizard_vat('list.vat.detail')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index f0c19198bf3..1c3ae12ca06 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -15,7 +15,7 @@
 			<form string="Select Period">
                	<group  colspan="4" >
 					<field name="period_id" select="1"/>
-              		<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1"/>
+              		<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1" icon="gtk-execute"/>
               	 </group>
               	 <separator string="XML Flie has been Created." colspan="4"/>
               	 <group colspan="4" >
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
new file mode 100644
index 00000000000..d04c9bf29ad
--- /dev/null
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<menuitem
+        id="menu_finance_belgian_statement"
+        name="Belgium Statements"
+        parent="account.menu_finance_legal_statement"/>
+
+    	<record id="view_partner_vat_listing" model="ir.ui.view">
+            <field name="name">Partner VAT Listing</field>
+            <field name="model">partner.vat</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Select Fiscal Year">
+			    <label string="This wizard will create an XML file for Vat details and total invoiced amounts per partner." colspan="4"/>
+				    <newline/>
+				    <field name="fyear" />
+				    <newline/>
+				    <field name="mand_id"/>
+				    <newline/>
+				    <field name="limit_amount"/>
+				    <newline/>
+				    <field name="test_xml"/>
+	           	 	<separator colspan="4"/>
+	               	<group colspan="4" >
+	               		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+						<button colspan="1" name="get_partner" string="View Client" type="object" default_focus="1" icon="terp-partner"/>
+				    </group>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_partner_vat_listing" model="ir.actions.act_window">
+            <field name="name">Partner VAT Listing</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">partner.vat</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_partner_vat_listing"/>
+            <field name="target">new</field>
+    	</record>
+
+	    <menuitem
+	        name="Annual Listing of VAT-Subjected Customers"
+	        parent="menu_finance_belgian_statement"
+	        action="action_partner_vat_listing"
+	        id="partner_vat_listing"/>
+
+	    <record id="view_vat_listing" model="ir.ui.view">
+            <field name="name">Vat Listing</field>
+            <field name="model">partner.vat.list</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Select Fiscal Year" >
+                	<label string="You can remove clients/partners which you do not want in exported xml file" colspan="4"/>
+                	<separator string="Clients" colspan="4"/>
+                	<field name="partner_ids" colspan="4" nolabel="1"/>
+                	<separator colspan="4"/>
+                	<group colspan="4" >
+						<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1" icon="gtk-execute"/>
+				    </group>
+					<separator string="XML File has been Created." colspan="4"/>
+					<field name="msg" colspan="4" nolabel="1"/>
+					<field name="name"/>
+					<newline/>
+					<field name="file_save" />
+					<separator colspan="4"/>
+					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                </form>
+            </field>
+        </record>
+
+         <!-- osv_memory for vat listing of clients -->
+	     <record id="view_vat_listing_form" model="ir.ui.view">
+            <field name="name">step.vat.listing</field>
+            <field name="model">vat.listing.clients</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="VAT listing">
+	                <field name="name"/>
+                    <field name="vat"/>
+                    <newline/>
+                    <field name="country"/>
+                    <newline/>
+                    <field name="amount"/>
+                    <field name="turnover"/>
+                </form>
+            </field>
+        </record>
+
+		<record id="view_vat_listing_tree" model="ir.ui.view">
+            <field name="name">step.vat.listing</field>
+            <field name="model">vat.listing.clients</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="VAT listing">
+	                <field name="name"/>
+                    <field name="vat"/>
+                    <newline/>
+                    <field name="country"/>
+                    <newline/>
+                    <field name="amount"/>
+                    <field name="turnover"/>
+                </tree>
+            </field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/wizard_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
similarity index 58%
rename from addons/l10n_be/wizard/wizard_vat_intra.py
rename to addons/l10n_be/wizard/l10n_be_vat_intra.py
index e29e2d9dcea..437cea03b5a 100644
--- a/addons/l10n_be/wizard/wizard_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,92 +15,72 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import wizard
+from osv import osv, fields
 import time
 import datetime
-import pooler
 import base64
 
-form_intra = """<?xml version="1.0"?>
-<form string="Partner VAT Intra">
-    <notebook>
-    <page string="General Information">
-    <label string="This wizard will create an XML file for Vat Intra" colspan="4"/>
-    <newline/>
-    <field name="fyear" />
-    <newline/>
-    <field name="mand_id" help="This identifies the representative of the sending company. This is a string of 14 characters"/>
-    <newline/>
-    <field name="trimester" help="It will be the first digit of period" />
-    <newline/>
-    <field name="test_xml" help="Sets the XML output as test file"/>
-    </page>
-    <page string="European Countries">
-    <field name="country_ids" colspan="4" nolabel="1" />
-    </page>
-    </notebook>
-</form>"""
-fields_intra = {
-    'trimester': {'string': 'Trimester Number', 'type': 'selection', 'selection':[
-            ('1','Jan/Feb/Mar'),
-            ('2','Apr/May/Jun'),
-            ('3','Jul/Aug/Sep'),
-            ('4','Oct/Nov/Dec')], 'required': True},
-    'test_xml': {'string':'Test XML file', 'type':'boolean'},
-    'mand_id':{'string':'MandataireId','type':'char','size':'14','required': True},
-    'fyear': {'string': 'Fiscal Year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True},
-    'country_ids': {
-        'string': 'European Countries',
-        'type': 'many2many',
-        'relation': 'res.country',
-        'required': False
-    },
-   }
 
-msg_form = """<?xml version="1.0"?>
-<form string="Notification">
-    <separator string="XML File has been Created."  colspan="4"/>
-    <field name="msg" colspan="4" nolabel="1"/>
-    <field name="file_save" />
-</form>"""
-msg_fields = {
-  'msg': {'string':'File created', 'type':'text', 'size':'100','readonly':True},
-  'file_save':{'string': 'Save File',
-        'type': 'binary',
-        'readonly': True,},
-}
+class partner_vat_intra(osv.osv_memory):
 
-class parter_vat_intra(wizard.interface):
+    """ Partner Vat Intra"""
+    _name = "partner.vat.intra"
 
-    def _get_europe_country(self, cr, uid, data, context):
-        country_ids = pooler.get_pool(cr.dbname).get('res.country').search(cr, uid, [('code', 'in', ['AT', 'BG', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'GB'])])
-        return {'country_ids': country_ids}
+    def _get_europe_country(self, cursor, user, context={}):
+        obj_country = self.pool.get('res.country')
+        country_ids = obj_country.search(cursor, user, [('code', 'in', ['AT', 'BG', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'GB'])])
+        return country_ids
+
+    _columns = {
+        'trimester': fields.selection(
+                                      [('1','Jan/Feb/Mar'),
+                                       ('2','Apr/May/Jun'),
+                                       ('3','Jul/Aug/Sep'),
+                                       ('4','Oct/Nov/Dec')],
+                                        'Trimester Number', required=True, help="It will be the first digit of period"),
+        'test_xml': fields.boolean('Test XML file', help="Sets the XML output as test file"),
+        'mand_id' : fields.char('MandataireId', size=14, required=True,  help="This identifies the representative of the sending company. This is a string of 14 characters"),
+        'fyear': fields.many2one('account.fiscalyear','Fiscal Year', required=True),
+        'msg': fields.text('File created', size=64, readonly=True),
+        'file_save' : fields.binary('Save File', readonly=True),
+        'country_ids': fields.many2many('res.country', 'vat_country_rel', 'vat_id', 'country_id', 'European Countries'),
+    }
+
+    _defaults = {
+        'country_ids': _get_europe_country,
+    }
+
+    def create_xml(self, cursor, user, ids, context):
+        obj_user = self.pool.get('res.users')
+        obj_fyear = self.pool.get('account.fiscalyear')
+        obj_sequence = self.pool.get('ir.sequence')
+        obj_partner = self.pool.get('res.partner')
+        obj_partner_add = self.pool.get('res.partner.address')
+
+        data_cmpny = obj_user.browse(cursor, user, user).company_id
+        data  = self.read(cursor, user, ids)[0]
+        data_fiscal = obj_fyear.browse(cursor, user, data['fyear'], context=context)
 
-    def _create_xml(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        data_cmpny = pool.get('res.users').browse(cr, uid, uid).company_id
-        data_fiscal = pool.get('account.fiscalyear').browse(cr,uid,data['form']['fyear'])
         company_vat = data_cmpny.partner_id.vat
-
         if not company_vat:
-            raise wizard.except_wizard('Data Insufficient','No VAT Number Associated with Main Company!')
+            raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
 
-        seq_controlref = pool.get('ir.sequence').get(cr, uid,'controlref')
-        seq_declarantnum = pool.get('ir.sequence').get(cr, uid,'declarantnum')
+        seq_controlref = obj_sequence.get(cursor, user, 'controlref')
+        seq_declarantnum = obj_sequence.get(cursor, user, 'declarantnum')
         cref = company_vat + seq_controlref
         dnum = cref + seq_declarantnum
         if len(data_fiscal.date_start.split('-')[0]) < 4:
-            raise wizard.except_wizard('Data Insufficient','Trimester year should be length of 4 digits!')
-        period_trimester = data['form']['trimester'] + data_fiscal.date_start.split('-')[0]
+            raise osv.except_osv(_('Data Insufficient'),_('Trimester year should be length of 4 digits!'))
+        period_trimester = data['trimester'] + data_fiscal.date_start.split('-')[0]
 
         street = zip_city = country = ''
-        addr = pool.get('res.partner').address_get(cr, uid, [data_cmpny.partner_id.id], ['invoice'])
+        addr = obj_partner.address_get(cursor, user, [data_cmpny.partner_id.id], ['invoice'])
         if addr.get('invoice',False):
-            ads = pool.get('res.partner.address').browse(cr,uid,[addr['invoice']])[0]
+            ads = obj_partner_add.browse(cursor, user, [addr['invoice']])[0]
             zip_city = (ads.city or '') + ' ' + (ads.zip or '')
             if zip_city== ' ':
                 zip_city = ''
@@ -114,8 +94,8 @@ class parter_vat_intra(wizard.interface):
 
         sender_date = time.strftime('%Y-%m-%d')
         data_file = '<?xml version="1.0"?>\n<VatIntra xmlns="http://www.minfin.fgov.be/VatIntra" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RecipientId="VAT-ADMIN" SenderId="' + str(company_vat) + '"'
-        data_file +=' ControlRef="' + cref + '" MandataireId="' + data['form']['mand_id'] + '" SenderDate="'+ str(sender_date)+ '"'
-        if data['form']['test_xml']:
+        data_file +=' ControlRef="' + cref + '" MandataireId="' + data['mand_id'] + '" SenderDate="'+ str(sender_date)+ '"'
+        if data['test_xml']:
             data_file += ' Test="1"'
         data_file += ' VersionTech="1.2">'
         data_file +='\n\t<AgentRepr DecNumber="1">\n\t\t<CompanyInfo>\n\t\t\t<VATNum>' + str(company_vat)+'</VATNum>\n\t\t\t<Name>'+str(data_cmpny.name)+'</Name>\n\t\t\t<Street>'+ str(street) +'</Street>\n\t\t\t<CityAndZipCode>'+ str(zip_city) +'</CityAndZipCode>'
@@ -127,35 +107,35 @@ class parter_vat_intra(wizard.interface):
         error_message = []
         seq = 0
         amount_sum = 0
-        p_id_list = pool.get('res.partner').search(cr,uid,[('vat','!=',False)])
+        p_id_list = obj_partner.search(cursor, user, [('vat','!=',False)])
         if not p_id_list:
-            raise wizard.except_wizard('Data Insufficient!','No partner has a VAT Number asociated with him.')
+            raise osv.except_osv(_('Data Insufficient!'),_('No partner has a VAT Number asociated with him.'))
 
         nb_period = len(data_fiscal.period_ids)
         fiscal_periods = data_fiscal.period_ids
 
-        if data['form']['trimester'] == '1':
+        if data['trimester'] == '1':
             if nb_period == 12:
                 start_date = fiscal_periods[0].date_start
                 end_date = fiscal_periods[2].date_stop
             elif nb_period == 4:
                 start_date = fiscal_periods[0].date_start
                 end_date = fiscal_periods[0].date_stop
-        elif data['form']['trimester'] == '2':
+        elif data['trimester'] == '2':
             if nb_period == 12:
                 start_date = fiscal_periods[3].date_start
                 end_date = fiscal_periods[5].date_stop
             elif nb_period == 4:
                 start_date = fiscal_periods[1].date_start
                 end_date = fiscal_periods[1].date_stop
-        elif data['form']['trimester'] == '3':
+        elif data['trimester'] == '3':
             if nb_period == 12:
                 start_date = fiscal_periods[6].date_start
                 end_date = fiscal_periods[8].date_stop
             elif nb_period == 4:
                 start_date = fiscal_periods[2].date_start
                 end_date = fiscal_periods[2].date_stop
-        elif data['form']['trimester'] == '4':
+        elif data['trimester'] == '4':
             if nb_period == 12:
                 start_date = fiscal_periods[9].date_start
                 end_date = fiscal_periods[11].date_stop
@@ -168,19 +148,19 @@ class parter_vat_intra(wizard.interface):
 
         for p_id in p_id_list:
             list_partner = []
-            partner = pool.get('res.partner').browse(cr, uid, p_id)
+            partner = obj_partner.browse(cursor, user, p_id, context=context)
             go_ahead = False
             country_code = ''
             for ads in partner.address:
-                if ads.type == 'default' and (ads.country_id and ads.country_id.id in data['form']['country_ids'][0][2]):
+                if ads.type == 'default' and (ads.country_id and ads.country_id.id in data['country_ids']):
                     go_ahead = True
                     country_code = ads.country_id.code
                     break
             if not go_ahead:
                 continue
 
-            cr.execute('select sum(debit)-sum(credit) as amount from account_move_line l left join account_account a on (l.account_id=a.id) where a.type in ('"'receivable'"') and l.partner_id=%%s and l.date between %s' % (period,), (p_id,))
-            res = cr.dictfetchall()
+            cursor.execute('select sum(debit)-sum(credit) as amount from account_move_line l left join account_account a on (l.account_id=a.id) where a.type in ('"'receivable'"') and l.partner_id=%%s and l.date between %s' % (period,), (p_id,))
+            res = cursor.dictfetchall()
             list_partner.append(res[0]['amount'])
             list_partner.append('T') #partner.ref ...should be check
             list_partner.append(partner.vat)
@@ -202,8 +182,8 @@ class parter_vat_intra(wizard.interface):
             record[p_id] = list_partner
 
         if len(error_message):
-            data['form']['msg'] = 'Exception : \n' +'-'*50+'\n'+ '\n'.join(error_message)
-            return data['form']
+            data['msg'] = 'Exception : \n' +'-'*50+'\n'+ '\n'.join(error_message)
+            return data['msg']
         data_clientinfo = ''
 
         for r in record:
@@ -215,18 +195,11 @@ class parter_vat_intra(wizard.interface):
         amount_sum = int(amount_sum)
         data_decl = '\n\t<DeclarantList SequenceNum="1" DeclarantNum="'+ dnum + '" ClientNbr="'+ str(seq) +'" AmountSum="'+ str(amount_sum) +'" >'
         data_file += str(data_decl) + str(data_comp) + str(data_period) + str(data_clientinfo) + '\n\t</DeclarantList>\n</VatIntra>'
-        data['form']['msg'] = 'Save the File with '".xml"' extension.'
-        data['form']['file_save'] = base64.encodestring(data_file)
-        return data['form']
+        data['msg'] = 'XML Flie has been Created. Save the File with '".xml"' extension.'
+        data['file_save'] = base64.encodestring(data_file)
+        self.write(cursor, user, ids, {'file_save':data['file_save'], 'msg':data['msg']}, context=context)
+        return True
 
-    states = {
-        'init': {
-            'actions': [_get_europe_country],
-            'result': {'type': 'form', 'arch':form_intra, 'fields': fields_intra, 'state':[('end','Cancel', 'gtk-cancel'),('go','Create XML', 'gtk-ok') ]}
-                },
-         'go': {
-            'actions': [_create_xml],
-            'result': {'type':'form', 'arch':msg_form, 'fields':msg_fields, 'state':[('end','Ok', 'gtk-cancel')]},
-                }
-             }
-parter_vat_intra('vat.intra.xml')
+partner_vat_intra()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
new file mode 100644
index 00000000000..6f25bb7a59b
--- /dev/null
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<menuitem
+        id="menu_finance_belgian_statement"
+        name="Belgium Statements"
+        parent="account.menu_finance_legal_statement"/>
+
+    	<record id="view_vat_intra" model="ir.ui.view">
+            <field name="name">Partner VAT intra</field>
+            <field name="model">partner.vat.intra</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+				<form string="Partner VAT intra">
+					    <notebook>
+						    <page string="General Information">
+							    <label string="This wizard will create an XML file for Vat Intra" colspan="4"/>
+							    <newline/>
+							    <field name="fyear" />
+							    <newline/>
+							    <field name="mand_id"/>
+							    <newline/>
+							    <field name="trimester"/>
+							    <newline/>
+							    <field name="test_xml"/>
+						    </page>
+						    <page string="European Countries">
+						    	<field name="country_ids" colspan="4" nolabel="1" />
+						    </page>
+						</notebook>
+						<newline/>
+						<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1" icon="gtk-execute"/>
+		           	 	<separator colspan="4"/>
+		              	<group colspan="4" >
+							<field name="msg" nolabel="1" colspan="4"/>
+					    	<field name="file_save" readonly="True"/>
+					    </group>
+		              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+				</form>
+            </field>
+		</record>
+
+		<record id="action_vat_intra" model="ir.actions.act_window">
+            <field name="name">Partner Vat Intra</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">partner.vat.intra</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_vat_intra"/>
+            <field name="target">new</field>
+    	</record>
+
+	    <menuitem
+	        name="Partner VAT intra"
+	        parent="menu_finance_belgian_statement"
+	        action="action_vat_intra"
+	        id="l10_be_vat_intra"/>
+
+    </data>
+</openerp>
\ No newline at end of file

From 41fc8c369af3cb3562b6ce44e333befda15837c8 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 1 Apr 2010 19:22:27 +0200
Subject: [PATCH 185/248] [FIX] Added support for string and constant (int)
 logging level.

bzr revid: jth@openerp.com-20100401172227-q5geonsglidfsuqa
---
 bin/tools/yaml_import.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 06dfb151cc9..2f48ca51618 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -182,10 +182,16 @@ class YamlInterpreter(object):
         return node
 
     def _log_assert_failure(self, severity, msg, *args):
-        self.assert_report.record(False, severity)
-        self.logger.log(severity, msg, *args)
-        if severity >= config['assert_exit_level']:
-            raise YamlImportAbortion('Severe assertion failure (%s), aborting.' % logging.getLevelName(severity))
+        if isinstance(severity, types.StringTypes):
+            levelname = severity.strip().upper()
+            level = logging.getLevelName(levelname)
+        else:
+            level = severity
+            levelname = logging.getLevelName(level)
+        self.assert_report.record(False, levelname)
+        self.logger.log(level, msg, *args)
+        if level >= config['assert_exit_level']:
+            raise YamlImportAbortion('Severe assertion failure (%s), aborting.' % levelname)
         return
 
     def _get_assertion_id(self, assertion):

From 0eb45de95c08a189b997b3af307bedb4407769b5 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 1 Apr 2010 21:17:49 +0200
Subject: [PATCH 186/248] [FIX] Removed ANSI output in logging level.

ANSI output changed the builtin log level name.  This actually broke tests as we
rely on the log level name for assertion report.  See comments for indications
to a more appropriate implementation.

bzr revid: jth@openerp.com-20100401191749-j562qu28o0a066m1
---
 bin/netsvc.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/netsvc.py b/bin/netsvc.py
index 475bbc33ba7..6aaff59ead3 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -205,7 +205,10 @@ def init_logger():
 
         for level, (fg, bg) in mapping.items():
             msg = "\x1b[%dm\x1b[%dm%s\x1b[0m" % (foreground(fg), background(bg), level)
-            logging.addLevelName(getattr(logging, level), msg)
+# jth: we should not override default level name
+# jth: use this instead http://stackoverflow.com/questions/384076/how-can-i-make-the-python-logging-output-to-be-colored
+# jth: also, do not output ANSI if terminal doesn't support it (test it in Eclipse console and on windows)
+            #logging.addLevelName(getattr(logging, level), msg)
 
 
 class Logger(object):

From f1b72c67438c626e33fd124307e4d540c40967cd Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 1 Apr 2010 21:24:14 +0200
Subject: [PATCH 187/248] [FIX] Fixed eval context.

bzr revid: jth@openerp.com-20100401192414-s6mfpwtkph3rxsn8
---
 bin/tools/yaml_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 2f48ca51618..4e974720c6c 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -126,7 +126,7 @@ class YamlInterpreter(object):
         self.pool = pooler.get_pool(cr.dbname)
         self.uid = 1
         self.context = {} # opererp context
-        self.eval_context = {'ref': self._ref, '_ref': self._ref, 'time': time} # added '_ref' so that record['ref'] is possible
+        self.eval_context = {'ref': self._ref(), '_ref': self._ref(), 'time': time} # added '_ref' so that record['ref'] is possible
 
     def _ref(self):
         return lambda xml_id: self.get_id(xml_id)

From 7043023dd859943a2cf5fa3e3e86652ad427f6e5 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 1 Apr 2010 21:25:02 +0200
Subject: [PATCH 188/248] [FIX] Safer assignment to many2one.

bzr revid: jth@openerp.com-20100401192502-zojg3dxhup49oz1m
---
 bin/tools/yaml_import.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 4e974720c6c..b4278abd5c8 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -178,6 +178,15 @@ class YamlInterpreter(object):
     def isnoupdate(self, node):
         return self.noupdate or node.noupdate or False
     
+    def _get_first_result(self, results, default=False):
+        if len(results):
+            value = results[0]
+            if isinstance(value, types.TupleType):
+                value = value[0]
+        else:
+            value = default
+        return value
+    
     def process_comment(self, node):
         return node
 
@@ -296,7 +305,7 @@ class YamlInterpreter(object):
                 if column._type in ("many2many", "one2many"):
                     value = [(6, 0, elements)]
                 else: # many2one
-                    value = elements[0]
+                    value = self._get_first_result(elements)
         elif column._type == "many2one":
             value = self.get_id(expression)
         elif column._type == "one2many":

From 60cd823fa36df6749813124441c9c36d3eb493a7 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Thu, 1 Apr 2010 21:26:47 +0200
Subject: [PATCH 189/248] [FIX] Fixed function evaluation.

bzr revid: jth@openerp.com-20100401192647-4ew1sci1l34q8ft3
---
 bin/tools/yaml_import.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index b4278abd5c8..8fe1d634764 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -374,23 +374,30 @@ class YamlInterpreter(object):
         wf_service.trg_validate(uid, workflow.model, id, workflow.action, self.cr)
         
     def process_function(self, node):
-        function, values = node.items()[0]
+        function, params = node.items()[0]
         if self.isnoupdate(function) and self.mode != 'init':
             return
+        model = self.get_model(function.model)
         context = self.get_context(function, self.eval_context)
         args = []
         if function.eval:
             args = eval(function.eval, self.eval_context)
-        for value in values:
-            if not 'model' in value and (not 'eval' in value or not 'search' in value):
-                raise YamlImportException('You must provide a "model" and an "eval" or "search" to evaluate.')
-            value_model = self.get_model(value['model'])
-            local_context = {'obj': lambda x: value_model.browse(self.cr, self.uid, x, context=context)}
-            local_context.update(self.id_map)
-            id = eval(value['eval'], self.eval_context, local_context)
-            if id != None:
-                args.append(id)
-        model = self.get_model(function.model)
+        for i, param in enumerate(params):
+            if 'model' in param:
+                param_model = self.get_model(param['model'])
+            else:
+                param_model = model
+            if 'search' in param:
+                q = eval(param['search'], self.eval_context)
+                ids = param_model.search(cr, uid, q)
+                value = self._get_first_result(ids)
+            elif 'eval' in param:
+                local_context = {'obj': lambda x: value_model.browse(self.cr, self.uid, x, context)}
+                local_context.update(self.id_map)
+                value = eval(param['eval'], self.eval_context, local_context)
+            else:
+                raise YamlImportException('You must provide at least a "eval" or a "search" to function parameter #%d.' % i)
+            args.append(value)
         method = function.name
         getattr(model, method)(self.cr, self.uid, *args)
     

From 43caafbd4a8eee876053b3f3cef95c82858edf59 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Fri, 2 Apr 2010 10:02:42 +0530
Subject: [PATCH 190/248] [IMP] l10n_BE: Clean

bzr revid: mra@tinyerp.com-20100402043242-29pd8u2p9v92xiot
---
 .../wizard/l10n_be_account_vat_declaration.py      | 11 ++++-------
 addons/l10n_be/wizard/l10n_be_vat_intra.py         | 14 ++++++--------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index e68a17b2123..87bfbf525c5 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -18,10 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 import time
 import datetime
 import base64
+
 from osv import osv, fields
 from tools.translate import _
 
@@ -33,8 +33,8 @@ class l10n_be_vat_declaration(osv.osv_memory):
     _columns = {
         'period_id': fields.many2one('account.period','Period', required=True),
         'msg': fields.text('File created', size=64, readonly=True),
-        'file_save' : fields.binary('Save File'),
-    }
+        'file_save': fields.binary('Save File'),
+                }
 
     _defaults = {
         'msg': lambda *a:'''Save the File with '".xml"' extension.''',
@@ -66,8 +66,6 @@ class l10n_be_vat_declaration(osv.osv_memory):
             address = post_code = city = ''
 
         city, post_code, address = obj_comp._get_default_ad(obj_company.partner_id.address)
-
-
         year_id = obj_fyear.find(cr, uid)
 
         account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
@@ -98,7 +96,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
         for item in tax_info:
             if item['code']:
                 if item['code'] == '71-72':
-                    item['code']='71'
+                    item['code'] = '71'
                 if item['code'] in list_of_tags:
                     data_of_file +='\n\t\t\t\t<D'+str(int(item['code'])) +'>' + str(int(item['sum_period']*100)) +  '</D'+str(int(item['code'])) +'>'
 
@@ -107,7 +105,6 @@ class l10n_be_vat_declaration(osv.osv_memory):
         self.write(cr, uid, ids, {'file_save':data['file_save']}, context=context)
         return True
 
-
 l10n_be_vat_declaration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index 437cea03b5a..a5617e21017 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -18,26 +18,24 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-from osv import osv, fields
 import time
 import datetime
 import base64
 
+from osv import osv, fields
 
 class partner_vat_intra(osv.osv_memory):
 
     """ Partner Vat Intra"""
     _name = "partner.vat.intra"
+    _description = 'Partner VAT Intra'
 
     def _get_europe_country(self, cursor, user, context={}):
         obj_country = self.pool.get('res.country')
-        country_ids = obj_country.search(cursor, user, [('code', 'in', ['AT', 'BG', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'GB'])])
-        return country_ids
+        return obj_country.search(cursor, user, [('code', 'in', ['AT', 'BG', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GR', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'GB'])])
 
     _columns = {
-        'trimester': fields.selection(
-                                      [('1','Jan/Feb/Mar'),
+        'trimester': fields.selection( [('1','Jan/Feb/Mar'),
                                        ('2','Apr/May/Jun'),
                                        ('3','Jul/Aug/Sep'),
                                        ('4','Oct/Nov/Dec')],
@@ -48,13 +46,13 @@ class partner_vat_intra(osv.osv_memory):
         'msg': fields.text('File created', size=64, readonly=True),
         'file_save' : fields.binary('Save File', readonly=True),
         'country_ids': fields.many2many('res.country', 'vat_country_rel', 'vat_id', 'country_id', 'European Countries'),
-    }
+        }
 
     _defaults = {
         'country_ids': _get_europe_country,
     }
 
-    def create_xml(self, cursor, user, ids, context):
+    def create_xml(self, cursor, user, ids, context={}):
         obj_user = self.pool.get('res.users')
         obj_fyear = self.pool.get('account.fiscalyear')
         obj_sequence = self.pool.get('ir.sequence')

From 336f0e40a43a5a7f7dc6511417b839ce8a06ec2a Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Fri, 2 Apr 2010 10:08:55 +0200
Subject: [PATCH 191/248] [REF] Cleanup of delete tag.

bzr revid: jth@openerp.com-20100402080855-8pvhqcspi9mhojpa
---
 bin/import_xml.rng       | 6 ++++--
 bin/tools/yaml_import.py | 8 ++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/bin/import_xml.rng b/bin/import_xml.rng
index e637d42f123..c852d421e17 100644
--- a/bin/import_xml.rng
+++ b/bin/import_xml.rng
@@ -148,8 +148,10 @@
     <rng:define name="delete">
         <rng:element name="delete">
             <rng:attribute name="model" />
-            <rng:optional><rng:attribute name="id" /> </rng:optional>
-            <rng:optional><rng:attribute name="search" /></rng:optional>
+                <rng:choice>
+                    <rng:attribute name="id" />
+                    <rng:attribute name="search" />
+                </rng:choice>
             </rng:element>
     </rng:define>
 
diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 8fe1d634764..0a5d8d7e09b 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -535,14 +535,10 @@ class YamlInterpreter(object):
         # TODO add remove ir.model.data
 
     def process_delete(self, node):
-        ids = []
         if len(node.search):
             ids = self.pool.get(node.model).search(self.cr, self.uid, eval(node.search, self.eval_context))
-        if len(node.id):
-            try:
-                ids.append(self.get_id(node.id))
-            except:
-                pass
+        else:
+            ids = [self.get_id(node.id)]
         if len(ids):
             self.pool.get(node.model).unlink(self.cr, self.uid, ids)
             self.pool.get('ir.model.data')._unlink(self.cr, self.uid, node.model, ids, direct=True)

From 3f8b66799f6cf768320045aca6131b7d8eb6dc5c Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Fri, 2 Apr 2010 10:15:46 +0200
Subject: [PATCH 192/248] [REF] Cleanup ir_model_data._unlink

bzr revid: jth@openerp.com-20100402081546-deiqbx40q2hkucck
---
 bin/addons/base/ir/ir_model.py | 8 ++++----
 bin/tools/convert.py           | 2 +-
 bin/tools/yaml_import.py       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index db03cef116f..a4afff1973d 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -548,10 +548,10 @@ class ir_model_data(osv.osv):
                                 table.replace('.', '_'))] = (table, inherit_id)
         return res_id
 
-    def _unlink(self, cr, uid, model, ids, direct=False):
-        for id in ids:
-            self.unlink_mark[(model, id)]=False
-            cr.execute('delete from ir_model_data where res_id=%s and model=%s', (id, model))
+    def _unlink(self, cr, uid, model, res_ids):
+        for res_id in res_ids:
+            self.unlink_mark[(model, res_id)] = False
+            cr.execute('delete from ir_model_data where res_id=%s and model=%s', (res_id, model))
         return True
 
     def ir_set(self, cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=None, xml_id=False):
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 1d4b1fd9d0b..36f2740dbc9 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -251,7 +251,7 @@ form: module.record_id""" % (xml_id,)
                 pass
         if ids:
             self.pool.get(d_model).unlink(cr, self.uid, ids)
-            self.pool.get('ir.model.data')._unlink(cr, self.uid, d_model, ids, direct=True)
+            self.pool.get('ir.model.data')._unlink(cr, self.uid, d_model, ids)
 
     def _tag_report(self, cr, rec, data_node=None):
         res = {}
diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 0a5d8d7e09b..cd1a1a34fd6 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -541,7 +541,7 @@ class YamlInterpreter(object):
             ids = [self.get_id(node.id)]
         if len(ids):
             self.pool.get(node.model).unlink(self.cr, self.uid, ids)
-            self.pool.get('ir.model.data')._unlink(self.cr, self.uid, node.model, ids, direct=True)
+            self.pool.get('ir.model.data')._unlink(self.cr, self.uid, node.model, ids)
     
     def process_url(self, node):
         self.validate_xml_id(node.id)

From 4b61fc1a7dc8292709e4c2a8d9c248d4404a9ad3 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Fri, 2 Apr 2010 17:14:59 +0530
Subject: [PATCH 193/248] [IMP] l10n_BE: Improve and clean

bzr revid: mra@tinyerp.com-20100402114459-48rcp0jz7grm05rv
---
 addons/l10n_be/__init__.py                    |  6 ++--
 addons/l10n_be/__terp__.py                    | 17 +++++------
 addons/l10n_be/wizard/__init__.py             |  1 -
 .../wizard/l10_be_partner_vat_listing.py      | 29 +++++++++----------
 .../wizard/l10n_be_account_vat_declaration.py | 12 ++++----
 .../l10n_be_account_vat_declaration_view.xml  | 12 ++++----
 .../wizard/l10n_be_partner_vat_listing.xml    | 16 +++++-----
 addons/l10n_be/wizard/l10n_be_vat_intra.py    |  5 ++--
 .../l10n_be/wizard/l10n_be_vat_intra_view.xml | 19 ++++++------
 9 files changed, 55 insertions(+), 62 deletions(-)

diff --git a/addons/l10n_be/__init__.py b/addons/l10n_be/__init__.py
index 444b6e3c625..1b2677d295e 100644
--- a/addons/l10n_be/__init__.py
+++ b/addons/l10n_be/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,11 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import company
 import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index d8f2c22b78a..6c13990fc45 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -18,10 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-
-{
-    'name': 'Belgium - Plan Comptable Minimum Normalise',
+{   'name': 'Belgium - Plan Comptable Minimum Normalise',
     'version': '1.1',
     'category': 'Localisation/Account Charts',
     'description': """
@@ -34,8 +31,12 @@
     * This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
 
     Wizards provided by this module:
-    * Enlist the partners with their related VAT  and invoiced amounts.Prepares an XML file format.Path to access : Financial Management/Reporting/Listing of VAT Customers.
-    * Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.Path to access : Financial Management/Reporting/Listing of VAT Customers.
+    * Partner VAT Intra: Enlist the partners with their related VAT and invoiced amounts.Prepares an XML file format.
+                           Path to access : Financial Management/Reporting//Legal Statements/Belgium Statements/Partner VAT Listing
+    * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.
+                           Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Periodical VAT Declaration
+    * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.Based on Fiscal year
+                           Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of VAT-Subjected Customers
 
     """,
     'author': 'Tiny',
@@ -57,9 +58,7 @@
                 'fiscal_templates.xml',
                 'security/ir.model.access.csv'
                    ],
-    'demo_xml': [
-                    'account.report.report.csv'
-                ],
+    'demo_xml': ['account.report.report.csv'],
     'installable': True,
     'certificate': '0031977724637',
 }
diff --git a/addons/l10n_be/wizard/__init__.py b/addons/l10n_be/wizard/__init__.py
index 9db9b1ec853..2e09bbb17db 100644
--- a/addons/l10n_be/wizard/__init__.py
+++ b/addons/l10n_be/wizard/__init__.py
@@ -23,5 +23,4 @@ import l10_be_partner_vat_listing
 import l10n_be_vat_intra
 import l10n_be_account_vat_declaration
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
index ecec9369ede..049a625830b 100644
--- a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
@@ -21,9 +21,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 import time
-import datetime
 import base64
 
 from tools.translate import _
@@ -38,7 +36,7 @@ class vat_listing_clients(osv.osv_memory):
         'country': fields.char('Country', size=64),
         'amount': fields.float('Amount'),
         'turnover': fields.float('Turnover'),
-                }
+            }
 
 vat_listing_clients()
 
@@ -53,9 +51,9 @@ class partner_vat(osv.osv_memory):
         obj_model_data = self.pool.get('ir.model.data')
         data  = self.read(cursor, user, ids)[0]
         period = obj_period.search(cursor, user, [('fiscalyear_id', '=', data['fyear'])], context=context)
-        p_id_list = obj_partner.search(cursor, user, [('vat_subjected','!=',False)], context=context)
+        p_id_list = obj_partner.search(cursor, user, [('vat_subjected', '!=', False)], context=context)
         if not p_id_list:
-             raise osv.except_osv(_('Data Insufficient!'),_('No partner has a VAT Number asociated with him.'))
+             raise osv.except_osv(_('Data Insufficient!'), _('No partner has a VAT Number asociated with him.'))
         partners = []
         records = []
         for obj_partner in obj_partner.browse(cursor, user, p_id_list, context=context):
@@ -99,7 +97,7 @@ class partner_vat(osv.osv_memory):
             record['turnover'] = 0
             record['name'] = obj_partner.name
             for item in line_info:
-                if item[0]=='produit':
+                if item[0] == 'produit':
                     record['turnover'] += item[1]
                 else:
                     record['amount'] += item[1]
@@ -140,9 +138,13 @@ class partner_vat_list(osv.osv_memory):
         'file_save' : fields.binary('Save File', readonly=True),
         }
 
-    def get_partners(self, cursor, user, context={}):
+    def _get_partners(self, cursor, user, context={}):
         return context.get('partner_ids', [])
 
+    _defaults={
+        'partner_ids': _get_partners
+            }
+
     def create_xml(self, cursor, user, ids, context={}):
         datas=[]
         obj_sequence = self.pool.get('ir.sequence')
@@ -197,10 +199,10 @@ class partner_vat_list(osv.osv_memory):
             else:
                 client_data = obj_vat_lclient.read(cursor, user, partner, context=context)
                 datas.append(client_data)
-        seq=0
-        data_clientinfo=''
-        sum_tax=0.00
-        sum_turnover=0.00
+        seq = 0
+        data_clientinfo = ''
+        sum_tax = 0.00
+        sum_turnover = 0.00
         if len(error_message):
             msg ='Exception : \n' +'-'*50+'\n'+ '\n'.join(error_message)
             return msg
@@ -218,14 +220,9 @@ class partner_vat_list(osv.osv_memory):
         data_file += tools.ustr(data_decl) + tools.ustr(data_comp) + tools.ustr(data_period) + tools.ustr(data_clientinfo) + '\n</VatList>'
         msg = 'Save the File with '".xml"' extension.'
         file_save = base64.encodestring(data_file.encode('utf8'))
-
         self.write(cursor, user, ids, {'file_save':file_save, 'msg':msg, 'name':'vat_list.xml'}, context=context)
         return True
 
-    _defaults={
-        'partner_ids': get_partners
-            }
-
 partner_vat_list()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 87bfbf525c5..9dd5ea5b269 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -18,15 +18,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
-import datetime
 import base64
 
 from osv import osv, fields
 from tools.translate import _
 
 class l10n_be_vat_declaration(osv.osv_memory):
-    """ Vat Declaration """
+    """ Periodical VAT Declaration """
     _name = "l1on_be.vat.declaration"
     _description = "Vat Declaration"
 
@@ -38,7 +36,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
 
     _defaults = {
         'msg': lambda *a:'''Save the File with '".xml"' extension.''',
-    }
+                }
 
     def create_xml(self, cr, uid, ids, context={}):
         obj_fyear = self.pool.get('account.fiscalyear')
@@ -87,9 +85,9 @@ class l10n_be_vat_declaration(osv.osv_memory):
             #starting month and ending month of selected period are not the same
             #it means that the accounting isn't based on periods of 1 month but on quarters
             quarter = str(((int(starting_month) - 1) / 3) + 1)
-            data_of_file += '<QUARTER>'+quarter+'</QUARTER>\n\t\t\t'
+            data_of_file += '<QUARTER>' + quarter + '</QUARTER>\n\t\t\t'
         else:
-            data_of_file += '<MONTH>'+starting_month+'</MONTH>\n\t\t\t'
+            data_of_file += '<MONTH>' + starting_month + '</MONTH>\n\t\t\t'
         data_of_file += '<YEAR>' + str(account_period.date_stop[:4]) + '</YEAR>\n\t\t</DPERIODE>\n\t\t<ASK RESTITUTION="NO" PAYMENT="NO"/>'
         data_of_file +='\n\t\t<DATA>\n\t\t\t<DATA_ELEM>'
 
@@ -98,7 +96,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
                 if item['code'] == '71-72':
                     item['code'] = '71'
                 if item['code'] in list_of_tags:
-                    data_of_file +='\n\t\t\t\t<D'+str(int(item['code'])) +'>' + str(int(item['sum_period']*100)) +  '</D'+str(int(item['code'])) +'>'
+                    data_of_file +='\n\t\t\t\t<D' + str(int(item['code'])) +'>' + str(int(item['sum_period']*100)) +  '</D'+str(int(item['code'])) +'>'
 
         data_of_file +='\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
         data['file_save'] = base64.encodestring(data_of_file)
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 1c3ae12ca06..56f8b6477f9 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -3,9 +3,9 @@
     <data>
 
     	<menuitem
-        id="menu_finance_belgian_statement"
-        name="Belgium Statements"
-        parent="account.menu_finance_legal_statement"/>
+	        id="menu_finance_belgian_statement"
+	        name="Belgium Statements"
+	        parent="account.menu_finance_legal_statement"/>
 
     	<record id="view_vat_declaration" model="ir.ui.view">
             <field name="name">Select Period</field>
@@ -13,9 +13,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Select Period">
-               	<group  colspan="4" >
-					<field name="period_id" select="1"/>
-              		<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1" icon="gtk-execute"/>
+               	<group colspan="4" >
+					<field name="period_id" select="1" default_focus="1"/>
+              		<button colspan="1" name="create_xml" string="Create XML" type="object" icon="gtk-execute"/>
               	 </group>
               	 <separator string="XML Flie has been Created." colspan="4"/>
               	 <group colspan="4" >
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index d04c9bf29ad..e49492a8eee 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -3,9 +3,9 @@
     <data>
 
     	<menuitem
-        id="menu_finance_belgian_statement"
-        name="Belgium Statements"
-        parent="account.menu_finance_legal_statement"/>
+	        id="menu_finance_belgian_statement"
+	        name="Belgium Statements"
+	        parent="account.menu_finance_legal_statement"/>
 
     	<record id="view_partner_vat_listing" model="ir.ui.view">
             <field name="name">Partner VAT Listing</field>
@@ -15,7 +15,7 @@
 			<form string="Select Fiscal Year">
 			    <label string="This wizard will create an XML file for Vat details and total invoiced amounts per partner." colspan="4"/>
 				    <newline/>
-				    <field name="fyear" />
+				    <field name="fyear" default_focus="1"/>
 				    <newline/>
 				    <field name="mand_id"/>
 				    <newline/>
@@ -25,7 +25,7 @@
 	           	 	<separator colspan="4"/>
 	               	<group colspan="4" >
 	               		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button colspan="1" name="get_partner" string="View Client" type="object" default_focus="1" icon="terp-partner"/>
+						<button colspan="1" name="get_partner" string="View Client" type="object"  icon="terp-partner"/>
 				    </group>
 			</form>
             </field>
@@ -42,7 +42,7 @@
     	</record>
 
 	    <menuitem
-	        name="Annual Listing of VAT-Subjected Customers"
+	        name="Annual Listing Of VAT-Subjected Customers"
 	        parent="menu_finance_belgian_statement"
 	        action="action_partner_vat_listing"
 	        id="partner_vat_listing"/>
@@ -55,10 +55,10 @@
                 <form string="Select Fiscal Year" >
                 	<label string="You can remove clients/partners which you do not want in exported xml file" colspan="4"/>
                 	<separator string="Clients" colspan="4"/>
-                	<field name="partner_ids" colspan="4" nolabel="1"/>
+                	<field name="partner_ids" colspan="4" nolabel="1" default_focus="1"/>
                 	<separator colspan="4"/>
                 	<group colspan="4" >
-						<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1" icon="gtk-execute"/>
+						<button colspan="1" name="create_xml" string="Create XML" type="object"  icon="gtk-execute"/>
 				    </group>
 					<separator string="XML File has been Created." colspan="4"/>
 					<field name="msg" colspan="4" nolabel="1"/>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index a5617e21017..d7869a7c197 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 import time
-import datetime
 import base64
 
 from osv import osv, fields
@@ -42,7 +41,7 @@ class partner_vat_intra(osv.osv_memory):
                                         'Trimester Number', required=True, help="It will be the first digit of period"),
         'test_xml': fields.boolean('Test XML file', help="Sets the XML output as test file"),
         'mand_id' : fields.char('MandataireId', size=14, required=True,  help="This identifies the representative of the sending company. This is a string of 14 characters"),
-        'fyear': fields.many2one('account.fiscalyear','Fiscal Year', required=True),
+        'fyear': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True),
         'msg': fields.text('File created', size=64, readonly=True),
         'file_save' : fields.binary('Save File', readonly=True),
         'country_ids': fields.many2many('res.country', 'vat_country_rel', 'vat_id', 'country_id', 'European Countries'),
@@ -50,7 +49,7 @@ class partner_vat_intra(osv.osv_memory):
 
     _defaults = {
         'country_ids': _get_europe_country,
-    }
+                }
 
     def create_xml(self, cursor, user, ids, context={}):
         obj_user = self.pool.get('res.users')
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index 6f25bb7a59b..8e5025c058e 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -17,26 +17,27 @@
 						    <page string="General Information">
 							    <label string="This wizard will create an XML file for Vat Intra" colspan="4"/>
 							    <newline/>
-							    <field name="fyear" />
+							    <field name="fyear" default_focus="1" />
 							    <newline/>
 							    <field name="mand_id"/>
 							    <newline/>
 							    <field name="trimester"/>
 							    <newline/>
 							    <field name="test_xml"/>
+							    <newline/>
+								<button colspan="4" name="create_xml" string="Create XML" type="object" icon="gtk-execute"/>
+				           	 	<separator colspan="4"/>
+				              	<group colspan="4" >
+									<field name="msg" nolabel="1" colspan="4"/>
+							    	<field name="file_save" readonly="True"/>
+							    </group>
+				              	<button special="cancel" colspan="4" string="Cancel" icon="gtk-cancel"/>
 						    </page>
 						    <page string="European Countries">
 						    	<field name="country_ids" colspan="4" nolabel="1" />
 						    </page>
 						</notebook>
 						<newline/>
-						<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1" icon="gtk-execute"/>
-		           	 	<separator colspan="4"/>
-		              	<group colspan="4" >
-							<field name="msg" nolabel="1" colspan="4"/>
-					    	<field name="file_save" readonly="True"/>
-					    </group>
-		              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
 				</form>
             </field>
 		</record>
@@ -52,7 +53,7 @@
     	</record>
 
 	    <menuitem
-	        name="Partner VAT intra"
+	        name="Partner VAT Intra"
 	        parent="menu_finance_belgian_statement"
 	        action="action_vat_intra"
 	        id="l10_be_vat_intra"/>

From 163246cf7dd7f08bb056a6fc25f364e1bb4bbfd2 Mon Sep 17 00:00:00 2001
From: "aag(OpenERP)" <>
Date: Fri, 2 Apr 2010 17:52:32 +0530
Subject: [PATCH 194/248] [ADD] Account: wizard convert to osv memory(Total:2)
 => Create subcription entries and analytic entry by lines

bzr revid: tiny@tiny-desktop-20100402122232-2lizazewbp8bn2v1
---
 addons/account/__terp__.py                    |  3 +-
 addons/account/account_wizard.xml             |  2 +
 addons/account/project/project_view.xml       |  8 +-
 addons/account/project/wizard/__init__.py     |  6 +-
 .../wizard/project_account_analytic_line.py   | 58 +++++++++++++
 .../project_account_analytic_line_view.xml    | 36 ++++++++
 .../wizard/wizard_account_analytic_line.py    | 84 -------------------
 addons/account/wizard/__init__.py             |  2 +-
 .../wizard/account_subscription_generate.py   | 44 ++++++++++
 .../account_subscription_generate_view.xml    | 38 +++++++++
 .../wizard/wizard_subscription_generate.py    | 61 --------------
 11 files changed, 190 insertions(+), 152 deletions(-)
 create mode 100644 addons/account/project/wizard/project_account_analytic_line.py
 create mode 100644 addons/account/project/wizard/project_account_analytic_line_view.xml
 delete mode 100644 addons/account/project/wizard/wizard_account_analytic_line.py
 create mode 100644 addons/account/wizard/account_subscription_generate.py
 create mode 100644 addons/account/wizard/account_subscription_generate_view.xml
 delete mode 100644 addons/account/wizard/wizard_subscription_generate.py

diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 10ecea48d77..1fe6bd355bd 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -55,7 +55,8 @@ module named account_voucherss
         'wizard/account_move_journal_view.xml',
         'account_wizard.xml',
         'wizard/account_move_line_unreconcile_select_view.xml',
-
+        'wizard/account_subscription_generate_view.xml',
+        'project/wizard/project_account_analytic_line_view.xml',
         'account_view.xml',
         'account_end_fy.xml',
         'account_invoice_view.xml',
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index b17df5b4edb..1597ec8898e 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -86,8 +86,10 @@
  -->
 
         <!-- subscriptions -->
+        <!--
         <wizard id="wizard_generate_subscription" menu="False" model="account.subscription" name="account.subscription.generate" string="Create subscription entries"/>
         <menuitem action="wizard_generate_subscription" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" type="wizard"/>
+         -->
         <!-- Aged partner balance -->
         <wizard id="wizard_aged_trial_balance" menu="False" model="res.partner" name="account.aged.trial.balance" string="Aged Partner Balance"/>
         <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e53047b8718..e0854f8d65d 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -204,10 +204,14 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_account_analytic_line_tree"/>
         </record>
-        <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/>
+       <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries by Line"/>
         <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>
-        <menuitem type="wizard" icon="STOCK_JUSTIFY_FILL" action="action_account_analytic_line" id="account_entries_analytic_entries" parent="next_id_41"/>
+          <!-- Entries by Line -->
 
+         <menuitem  icon="STOCK_JUSTIFY_FILL"
+          action="action_project_account_analytic_line_form"
+          id="account_entries_analytic_entries"
+          parent="next_id_41"/>
 
         <record id="action_account_tree1" model="ir.actions.act_window">
             <field name="name">Analytic Entries</field>
diff --git a/addons/account/project/wizard/__init__.py b/addons/account/project/wizard/__init__.py
index 21a811ebe5f..f11fa936960 100644
--- a/addons/account/project/wizard/__init__.py
+++ b/addons/account/project/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@ import wizard_account_analytic_inverted_balance_report
 import wizard_account_analytic_cost_ledger_report
 import wizard_account_analytic_cost_ledger_for_journal_report
 import wizard_account_analytic_analytic_check
-import wizard_account_analytic_line
+import project_account_analytic_line
 import wizard_analytic_account_chart
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py
new file mode 100644
index 00000000000..a7fbe0a8254
--- /dev/null
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class project_account_analytic_line(osv.osv_memory):
+     _name = "project.account.analytic.line"
+     _description = "Analytic Entries by line"
+     _columns = {
+         'from_date': fields.date('From'),
+         'to_date': fields.date('To'),
+                }
+
+     def action_open_window(self, cr, uid, ids, context={}):
+          mod_obj =self.pool.get('ir.model.data')
+          domain = []
+          for data in self.read(cr, uid, ids,context=context):
+              from_date =data['from_date']
+              to_date =data['to_date']
+              if from_date and to_date:
+                    domain = [('date','>=',from_date), ('date','<=',to_date)]
+              elif from_date:
+                    domain = [('date','>=',from_date)]
+              elif to_date:
+                    domain = [('date','<=',to_date)]
+              result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter')
+              id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+              return {
+                    'name': _('Analytic Entries by line'),
+                    'view_type': 'form',
+                    "view_mode": 'tree,form',
+                    'res_model': 'account.analytic.line',
+                    'type': 'ir.actions.act_window',
+                    'domain': domain,
+                    'search_view_id': id['res_id'],}
+
+project_account_analytic_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
new file mode 100644
index 00000000000..30cc9998cb5
--- /dev/null
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+  		<record id="view_project_account_analytic_line_form" model="ir.ui.view">
+            <field name="name">project.account.analytic.line.form</field>
+            <field name="model">project.account.analytic.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="View Account Analytic Lines">
+                	<group colspan="4" >
+                    	<field name="from_date"/>
+                    	<newline/>
+                    	<field name="to_date" />
+                    </group>
+                         <label string ="(Keep empty to open the current situation)" />
+                       	 <separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	 <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	 <button icon="gtk-execute" string="Open Entries" name="action_open_window" type="object"/>
+                   	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_project_account_analytic_line_form" model="ir.actions.act_window">
+            <field name="name">Entries by Line</field>
+            <field name="res_model">project.account.analytic.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_project_account_analytic_line_form"/>
+           <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account/project/wizard/wizard_account_analytic_line.py b/addons/account/project/wizard/wizard_account_analytic_line.py
deleted file mode 100644
index 4d63aff05f5..00000000000
--- a/addons/account/project/wizard/wizard_account_analytic_line.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-from tools.translate import _
-
-def _action_open_window(self, cr, uid, data, context): 
-    domain = []
-    from_date = data['form']['from_date']
-    to_date = data['form']['to_date']
-    if from_date and to_date:
-        domain = [('date','>=',from_date),('date','<=',to_date)]
-    elif from_date:
-        domain = [('date','>=',from_date)]
-    elif to_date:
-        domain = [('date','<=',to_date)]
-    mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
-    result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter')
-    id = mod_obj.read(cr, uid, result, ['res_id'])        
-
-    return {
-        'name': _('Analytic Entries by line'),
-        'view_type': 'form',
-        "view_mode": 'tree,form',
-        'res_model': 'account.analytic.line',
-        'type': 'ir.actions.act_window',
-        'domain': domain,
-        'search_view_id': id['res_id'],}
-
-
-class account_analytic_line(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="View Account Analytic Lines">
-        <separator string="Account Analytic Lines Analysis" colspan="4"/>
-        <field name="from_date"/>
-        <newline/>
-        <field name="to_date"/>
-        <newline/>
-        <label string=""/>
-        <label string="(Keep empty to open the current situation)" align="0.0" colspan="3"/>
-    </form>'''
-    form1_fields = {
-             'from_date': {
-                'string': 'From',
-                'type': 'date',
-        },
-             'to_date': {
-                'string': 'To',
-                'type': 'date',
-        },
-    }
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Entries','gtk-ok')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-account_analytic_line('account.analytic.line')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index f44be1f804c..f3a05ebe184 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -29,7 +29,7 @@ import wizard_pay_invoice
 import account_move_journal
 import wizard_journal_select
 import account_move_bank_reconcile
-import wizard_subscription_generate
+import account_subscription_generate
 import wizard_aged_trial_balance
 import wizard_general_ledger_report
 import wizard_third_party_ledger
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
new file mode 100644
index 00000000000..5c44a611b0d
--- /dev/null
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+
+class account_subscription_generate(osv.osv_memory):
+
+    _name = "account.subscription.generate"
+    _description = "Subscription Compute"
+    _columns = {
+       'date': fields.date('Date', required=True),
+              }
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+                }
+    def action_generate(self, cr, uid, ids, context={}):
+        for data in  self.read(cr, uid, ids,context=context):
+             cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
+             ids = map(lambda x: x[0], cr.fetchall())
+             self.pool.get('account.subscription.line').move_create(cr, uid, ids)
+             return {}
+
+account_subscription_generate()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
new file mode 100644
index 00000000000..ce4438198d4
--- /dev/null
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+  		<record id="view_account_subscription_generate" model="ir.ui.view">
+            <field name="name">account.subscription.generate.form</field>
+            <field name="model">account.subscription.generate</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Subscription Compute">
+                	<group colspan="4" >
+                		 <separator string="Generate entries before:" colspan="4"/>
+              			 <field name="date"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                       	<label string ="" colspan="2"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    	<button icon="gtk-execute" string="Compute Entry Dates"
+                    		name="action_generate" type="object" />
+                    </group>
+               </form>
+            </field>
+  		</record>
+
+        <record id="action_account_subscription_generate" model="ir.actions.act_window">
+            <field name="name">Create subscription entries</field>
+            <field name="res_model">account.subscription.generate</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           	<field name="view_id" ref="view_account_subscription_generate"/>
+           	<field name="target">new</field>
+        </record>
+
+        <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_periodical_processing" />
+
+    </data>
+</openerp>
diff --git a/addons/account/wizard/wizard_subscription_generate.py b/addons/account/wizard/wizard_subscription_generate.py
deleted file mode 100644
index 1df25b219cd..00000000000
--- a/addons/account/wizard/wizard_subscription_generate.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import time
-import wizard
-import pooler
-
-#
-# TODO: add an intermediate screen for checks
-#
-
-_subscription_form = '''<?xml version="1.0"?>
-<form string="%s">
-    <separator string="Generate entries before:" colspan="4"/>
-    <field name="date"/>
-</form>''' % ('Subscription Compute',)
-
-_subscription_fields = {
-    'date': {'string':'Date', 'type':'date', 'default':lambda *a: time.strftime('%Y-%m-%d'), 'required':True},
-}
-
-class wiz_subscription(wizard.interface):
-    def _action_generate(self, cr, uid, data, context={}):
-        cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['form']['date'],))
-        ids = map(lambda x: x[0], cr.fetchall())
-        pooler.get_pool(cr.dbname).get('account.subscription.line').move_create(cr, uid, ids)
-        return {}
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':_subscription_form, 'fields':_subscription_fields, 'state':[('end','Cancel', 'gtk-cancel'),('generate','Compute', 'gtk-ok')]}
-        },
-        'generate': {
-            'actions': [_action_generate],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-wiz_subscription('account.subscription.generate')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 5abd46a43bad0e32950c031e794f802194b63e32 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 2 Apr 2010 18:21:24 +0530
Subject: [PATCH 195/248] [REM]: stock: Remove moved file

bzr revid: sbh@tinyerp.com-20100402125124-0cq5ttwnhs6iwol6
---
 .../stock_inventory_merge_view.xml.moved      | 27 ----------------
 .../wizard/stock_picking_make_view.xml.moved  | 31 -------------------
 2 files changed, 58 deletions(-)
 delete mode 100644 addons/stock/wizard/stock_inventory_merge_view.xml.moved
 delete mode 100644 addons/stock/wizard/stock_picking_make_view.xml.moved

diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml.moved b/addons/stock/wizard/stock_inventory_merge_view.xml.moved
deleted file mode 100644
index e8af34c0c71..00000000000
--- a/addons/stock/wizard/stock_inventory_merge_view.xml.moved
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-	
-		<record id="name_form" model="ir.ui.view">
-		        <field name="name">stock.inventory.merge.form</field>
-		        <field name="model">stock.inventory.merge</field>
-		        <field name="type">form</field>
-		        <field name="arch" type="xml">
-		              <form string="Merge inventories">
-				    <separator colspan="4" string="Merge inventories" />
-				    <label string="Do you want to merge theses inventories ?"/>
-				<button special="cancel" string="Cancel" icon='gtk-cancel'/>
-				<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>				
-				</form>
-			</field>
-		</record>
-		 <act_window name="Merge inventories"		    
-			res_model="stock.inventory.merge"
-			src_model="stock.inventory"
-			view_mode="form"
-			target="new"        
-			key2="client_action_multi"    
-			id="action_view_stock_merge_inventories"/>	
-		
-	</data>
-</openerp>
diff --git a/addons/stock/wizard/stock_picking_make_view.xml.moved b/addons/stock/wizard/stock_picking_make_view.xml.moved
deleted file mode 100644
index fa77042c5d8..00000000000
--- a/addons/stock/wizard/stock_picking_make_view.xml.moved
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-	    <record id="view_stock_make_picking_wizard" model="ir.ui.view">
-            <field name="name">Make Picking</field>
-            <field name="model">stock.picking.make</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Make Picking">
-				    <field name="picking_ids" nolabel="1" colspan="4"
-				        width="600" height="300"/>
-                	<separator string="" colspan="4" />
-                	<button icon='gtk-cancel' special="cancel"
-                		string="Cancel" />
-                	<button name="make_packing" string="Ok"
-                		type="object" icon="gtk-apply" />
-                </form>
-            </field>
-        </record>
-        
-        <record id="act_stock_make_picking_wizard" model="ir.actions.act_window">
-            <field name="name">Make Picking</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.picking.make</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-	</data>
-</openerp>

From 790f32d9d0327945f9f1741b58bfb6979923539e Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Fri, 2 Apr 2010 16:03:23 +0200
Subject: [PATCH 196/248] [REF] function, ref, eval nodes. [IMP] YAML multi
 constructor for ref tag.

bzr revid: jth@openerp.com-20100402140323-qmki5mvns0vxwmdm
---
 bin/tools/yaml_import.py | 96 +++++++++++++++++++++++++---------------
 bin/tools/yaml_tag.py    | 16 ++++---
 2 files changed, 69 insertions(+), 43 deletions(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index cd1a1a34fd6..e77999a49f1 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -286,26 +286,39 @@ class YamlInterpreter(object):
             record_dict[field_name] = field_value
         return record_dict        
     
+    def process_ref(self, node, column=None):
+        if node.search:
+            if node.model:
+                model_name = node.model
+            elif column:
+                model_name = column._obj
+            else:
+                raise YamlImportException('You need to give a model for the search, or a column to infer it.')
+            model = self.get_model(model_name)
+            q = eval(node.search, self.eval_context)
+            ids = model.search(self.cr, self.uid, q)
+            if node.use:
+                instances = model.browse(self.cr, self.uid, ids)
+                value = [inst[node.use] for inst in instances]
+            else:
+                value = ids
+        elif node.id:
+            value = self.get_id(node.id)
+        else:
+            value = None
+        return value
+    
+    def process_eval(self, node):
+        return eval(node.expression, self.eval_context)
+    
     def _eval_field(self, model, field_name, expression):
         column = model._columns[field_name]
         if is_ref(expression):
-            if expression.model:
-                other_model_name = expression.model
-            else:
-                other_model_name = column._obj
-            other_model = self.get_model(other_model_name)
-            if expression.search:
-                q = eval(expression.search, self.eval_context)
-                ids = other_model.search(self.cr, self.uid, q)
-                if expression.use:
-                    instances = other_model.browse(self.cr, self.uid, ids)
-                    elements = [inst[expression.use] for inst in instances]
-                else:
-                    elements = ids
-                if column._type in ("many2many", "one2many"):
-                    value = [(6, 0, elements)]
-                else: # many2one
-                    value = self._get_first_result(elements)
+            elements = self.process_ref(expression)
+            if column._type in ("many2many", "one2many"):
+                value = [(6, 0, elements)]
+            else: # many2one
+                value = self._get_first_result(elements)
         elif column._type == "many2one":
             value = self.get_id(expression)
         elif column._type == "one2many":
@@ -316,7 +329,7 @@ class YamlInterpreter(object):
             value = [(6, 0, ids)]
         else: # scalar field
             if is_eval(expression):
-                value = eval(expression.expression, self.eval_context)
+                value = self.process_eval(expression)
             else:
                 value = expression
             # raise YamlImportException('Unsupported column "%s" or value %s:%s' % (field_name, type(expression), expression))
@@ -372,6 +385,32 @@ class YamlInterpreter(object):
             uid = self.uid
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, workflow.model, id, workflow.action, self.cr)
+    
+    def _eval_params(self, model, params):
+        args = []
+        for i, param in enumerate(params):
+            if isinstance(param, types.ListType):
+                value = self._eval_params(model, param)
+            elif is_ref(param):
+                value = self.process_ref(param)
+            elif is_eval(param):
+                value = self.process_eval(param)
+            elif isinstance(param, types.DictionaryType): # supports XML syntax
+                param_model = self.get_model(param.get('model', model))
+                if 'search' in param:
+                    q = eval(param['search'], self.eval_context)
+                    ids = param_model.search(cr, uid, q)
+                    value = self._get_first_result(ids)
+                elif 'eval' in param:
+                    local_context = {'obj': lambda x: param_model.browse(self.cr, self.uid, x, context)}
+                    local_context.update(self.id_map)
+                    value = eval(param['eval'], self.eval_context, local_context)
+                else:
+                    raise YamlImportException('You must provide either a !ref or at least a "eval" or a "search" to function parameter #%d.' % i)
+            else:
+                value = param # scalar value
+            args.append(value)
+        return args
         
     def process_function(self, node):
         function, params = node.items()[0]
@@ -379,25 +418,10 @@ class YamlInterpreter(object):
             return
         model = self.get_model(function.model)
         context = self.get_context(function, self.eval_context)
-        args = []
         if function.eval:
-            args = eval(function.eval, self.eval_context)
-        for i, param in enumerate(params):
-            if 'model' in param:
-                param_model = self.get_model(param['model'])
-            else:
-                param_model = model
-            if 'search' in param:
-                q = eval(param['search'], self.eval_context)
-                ids = param_model.search(cr, uid, q)
-                value = self._get_first_result(ids)
-            elif 'eval' in param:
-                local_context = {'obj': lambda x: value_model.browse(self.cr, self.uid, x, context)}
-                local_context.update(self.id_map)
-                value = eval(param['eval'], self.eval_context, local_context)
-            else:
-                raise YamlImportException('You must provide at least a "eval" or a "search" to function parameter #%d.' % i)
-            args.append(value)
+            args = self.process_eval(function.eval)
+        else:
+            args = self._eval_params(function.model, params)
         method = function.name
         getattr(model, method)(self.cr, self.uid, *args)
     
diff --git a/bin/tools/yaml_tag.py b/bin/tools/yaml_tag.py
index 83f6dde9c8d..1d36dc17a5b 100644
--- a/bin/tools/yaml_tag.py
+++ b/bin/tools/yaml_tag.py
@@ -87,10 +87,9 @@ class Eval(YamlTag):
         super(Eval, self).__init__()
     
 class Ref(YamlTag):
-    # 'model' parameter is optional since it defaults to the column type
-    def __init__(self, search):
-        self.search = search
-        super(Ref, self).__init__()
+    def __init__(self, *args, **kwargs):
+        print "kwargs %s" % kwargs
+        super(Ref, self).__init__(*args, **kwargs)
     
 class IrSet(YamlTag):
     def __init__(self):
@@ -144,8 +143,11 @@ def eval_constructor(loader, node):
     expression = loader.construct_scalar(node)
     return Eval(expression)
     
-def ref_constructor(loader, node):
-    kwargs = loader.construct_mapping(node)
+def ref_constructor(loader, tag_suffix, node):
+    if tag_suffix == "id":
+        kwargs = {"id": loader.construct_scalar(node)}
+    else:
+        kwargs = loader.construct_mapping(node)
     return Ref(**kwargs)
     
 def ir_set_constructor(loader, node):
@@ -167,5 +169,5 @@ yaml.add_constructor(u"!context", context_constructor)
 yaml.add_constructor(u"!delete", delete_constructor)
 yaml.add_constructor(u"!url", url_constructor)
 yaml.add_constructor(u"!eval", eval_constructor)
-yaml.add_constructor(u"!ref", ref_constructor)
+yaml.add_multi_constructor(u"!ref", ref_constructor)
 yaml.add_constructor(u"!ir_set", ir_set_constructor)

From 60c9ef812af254af5fdfcbed62256c26ade2a9c5 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Sun, 4 Apr 2010 04:52:50 +0100
Subject: [PATCH 197/248] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100403035450-1a0crehvyycoac7u
bzr revid: codehost@crowberry-20100404035250-4v739eu3p7xs13kr
---
 addons/account/i18n/cs.po         |  2 +-
 addons/account/i18n/de.po         |  4 +--
 addons/account/i18n/ru.po         | 18 +++++------
 addons/base_contact/i18n/ko.po    | 32 +++++++++----------
 addons/crm/i18n/fi.po             | 52 +++++++++++++++----------------
 addons/report_purchase/i18n/ko.po |  8 ++---
 addons/sale/i18n/bg.po            |  2 +-
 addons/scrum/i18n/ko.po           | 38 +++++++++++-----------
 8 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index cdaf9f2aad9..faff571118c 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 67e71fd81a4..deca642f62a 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-01 17:22+0000\n"
+"PO-Revision-Date: 2010-04-02 07:16+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index de27f983cc7..abc9d069167 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-02 15:44+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"PO-Revision-Date: 2010-04-03 16:42+0000\n"
+"Last-Translator: Alexandr Mitev <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -323,7 +323,7 @@ msgstr "Происхождение"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Имя перемещения"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -355,7 +355,7 @@ msgstr "Налог"
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Дебитовая сделка"
 
 #. module: account
 #: field:account.analytic.line,account_id:0
@@ -608,7 +608,7 @@ msgstr ""
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "Контроль проводки"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -642,7 +642,7 @@ msgstr "Условия платежа партнера"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Согласование проводки по счету"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
@@ -734,7 +734,7 @@ msgstr "Строки финансового документа"
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "Analytic Invoice"
-msgstr ""
+msgstr "Аналитический счет"
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -981,7 +981,7 @@ msgstr "Проводки по выражениям"
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr ""
+msgstr "aналитический счет"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index 08a837a039c..c9788ecc136 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/i18n/ko.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:58+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-04-04 03:13+0000\n"
+"Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -31,7 +31,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
@@ -81,12 +81,12 @@ msgstr ""
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "액션 정의에서 유효하지 않은 모델 이름"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "파트너 주소"
 
 #. module: base_contact
 #: view:res.partner.address:0
@@ -126,7 +126,7 @@ msgstr "연락처와 기능 정의"
 #. module: base_contact
 #: field:res.partner.contact,title:0
 msgid "Title"
-msgstr "타이틀"
+msgstr "제목"
 
 #. module: base_contact
 #: view:res.partner.job:0
@@ -189,12 +189,12 @@ msgstr "주업"
 #. module: base_contact
 #: view:res.partner:0
 msgid "Categories"
-msgstr "카테고리"
+msgstr "항목"
 
 #. module: base_contact
 #: field:res.partner.contact,function_id:0
 msgid "Main Function"
-msgstr ""
+msgstr "주요 기능"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
@@ -204,7 +204,7 @@ msgstr "파트너와 주소 정의"
 #. module: base_contact
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "유효하지 않은 아키텍처를 위한 XML 보기!"
 
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
@@ -219,17 +219,17 @@ msgstr "시퀀스"
 #. module: base_contact
 #: field:res.partner.job,extension:0
 msgid "Extension"
-msgstr "익스텐션"
+msgstr "확장기능"
 
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
-msgstr "모바일"
+msgstr "휴대전화"
 
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr "내부/외부 익스텐션 전화 번호"
+msgstr "내부/외부 확장 전화 번호"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
@@ -239,7 +239,7 @@ msgstr "함께 일하는 사람들"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Extra Information"
-msgstr "기타 정보"
+msgstr "추가 정보"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -255,7 +255,7 @@ msgstr "활성"
 #. module: base_contact
 #: field:res.partner.job,contact_id:0
 msgid "Contact"
-msgstr "연락"
+msgstr "연락처"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
@@ -270,7 +270,7 @@ msgstr "주 고용자"
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "기능 주소"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 0c83df25abc..f8617b8ea6b 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-04-01 15:06+0000\n"
+"PO-Revision-Date: 2010-04-03 13:35+0000\n"
 "Last-Translator: smii <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -2950,12 +2950,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.categ2_fund4
 msgid "Demand Draft"
-msgstr ""
+msgstr "Vaatimusluonnos"
 
 #. module: crm
 #: field:crm.case,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm
 #: field:crm.case,log_ids:0
@@ -2966,7 +2966,7 @@ msgstr "Lokihistoriat"
 #: wizard_field:crm.lead.opportunity_set,opportunity,name:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0
 msgid "Opportunity Summary"
-msgstr ""
+msgstr "Mahdollisuuksien yhteenveto"
 
 #. module: crm
 #: view:crm.case:0
@@ -2997,22 +2997,22 @@ msgstr "Viimeisin tapahtuma"
 #. module: crm
 #: field:crm.case,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Kesto"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage
 msgid "Cases by section, Category and stage"
-msgstr ""
+msgstr "Tapahtumat osion, kategorian ja vaiheen mukaan"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Hired"
-msgstr ""
+msgstr "Ehdokas palkattu"
 
 #. module: crm
 #: field:crm.menu.config_wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Rekrytointiprosessi"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_52
@@ -3052,12 +3052,12 @@ msgstr ""
 #: view:crm.segmentation:0
 #: field:crm.segmentation.line,segmentation_id:0
 msgid "Segmentation"
-msgstr ""
+msgstr "Segmentointi"
 
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Form"
-msgstr ""
+msgstr "Varat -lomake"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3073,12 +3073,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Yritys"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "In Process"
-msgstr ""
+msgstr "Työn alla"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3094,18 +3094,18 @@ msgstr ""
 #: wizard_field:crm.job.reschedule_phone_call,init,note:0
 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0
 msgid "Goals"
-msgstr ""
+msgstr "Tavoitteet"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Type"
-msgstr ""
+msgstr "Tapahtumat osion ja tyypin mukaan"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Jälkimyyntipalvelut"
 
 #. module: crm
 #: wizard_button:caldav.crm.export,init,end:0
@@ -3113,12 +3113,12 @@ msgstr ""
 #: wizard_button:caldav.crm.subscribe,display,end:0
 #: view:crm.email.add.cc:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: crm
 #: wizard_field:caldav.crm.export,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Tiedostonimi"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3148,7 +3148,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job
 msgid "All Jobs Requests"
-msgstr ""
+msgstr "Kaikki työpaikkapyynnöt"
 
 #. module: crm
 #: selection:crm.case,state:0
@@ -3160,7 +3160,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,state:0
 #: selection:report.crm.case.section.stage,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Peruutettu"
 
 #. module: crm
 #: view:crm.job:0
@@ -3177,7 +3177,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Relevant"
-msgstr ""
+msgstr "Oleellinen"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0
@@ -3192,7 +3192,7 @@ msgstr ""
 #. module: crm
 #: wizard_view:caldav.crm.import,init:0
 msgid "Import ICS"
-msgstr ""
+msgstr "Tuo ICS-tiedosto"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -3212,7 +3212,7 @@ msgstr "Kommunikaatio Historia"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ
 msgid "Cases by Opportunities and Type"
-msgstr ""
+msgstr "Tapahtumat mahdollisuuden ja tyypin mukaan"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -3256,7 +3256,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
 msgid "New"
-msgstr ""
+msgstr "Uusi"
 
 #. module: crm
 #: field:crm.case,description:0
@@ -3275,7 +3275,7 @@ msgstr "Sähköposti"
 #: field:crm.case,canal_id:0
 #: field:crm.case.log,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Kanava"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_email:0
@@ -3295,7 +3295,7 @@ msgstr "Sähköpostimuistuttajat (sisältää asiasisällön)"
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_stage
 msgid "Cases by Leads and Stage"
-msgstr ""
+msgstr "Tapahtumat ohjauksen ja vaiheen mukaan"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po
index 980b91c42e4..b5e7f12c500 100644
--- a/addons/report_purchase/i18n/ko.po
+++ b/addons/report_purchase/i18n/ko.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:26+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-04-04 01:33+0000\n"
+"Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
@@ -50,7 +50,7 @@ msgstr "상품 별 구매"
 #. module: report_purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "액션 정의에서 유효하지 않은 모델 이름"
 
 #. module: report_purchase
 #: model:ir.ui.menu,name:report_purchase.next_id_75
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index aa551a7ace7..efd28c0d903 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-02 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po
index bf43af36bf3..46f3063bc3d 100644
--- a/addons/scrum/i18n/ko.po
+++ b/addons/scrum/i18n/ko.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:49+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-04-04 01:39+0000\n"
+"Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
@@ -52,7 +52,7 @@ msgstr "백로그로부터 과제 생성"
 #. module: scrum
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "액션 정의에서 유효하지 않은 모델 이름"
 
 #. module: scrum
 #: model:ir.module.module,shortdesc:scrum.module_meta_information
@@ -138,7 +138,7 @@ msgstr "매우 긴급"
 #. module: scrum
 #: field:scrum.sprint,retrospective:0
 msgid "Sprint Retrospective"
-msgstr ""
+msgstr "스프린트 회고"
 
 #. module: scrum
 #: field:scrum.sprint,name:0
@@ -299,7 +299,7 @@ msgstr "스크럼 데이터"
 #: selection:scrum.product.backlog,priority:0
 #: selection:scrum.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "중간"
 
 #. module: scrum
 #: field:scrum.project,total_hours:0
@@ -342,7 +342,7 @@ msgstr "프로젝트"
 #. module: scrum
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "유효하지 않은 아키텍처를 위한 XML 보기!"
 
 #. module: scrum
 #: field:scrum.task,history:0
@@ -629,18 +629,18 @@ msgstr "이 프로젝트에 관련된 모든 과제의 계획 시간 합계"
 #. module: scrum
 #: field:scrum.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "파트너에게 알림"
 
 #. module: scrum
 #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4
 #: model:ir.ui.menu,name:scrum.menu_action_sprint_open_tree4
 msgid "My Sprints (Product Owner)"
-msgstr ""
+msgstr "나의 스프린트 (상품 소유자)"
 
 #. module: scrum
 #: field:scrum.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "과제 요약"
 
 #. module: scrum
 #: help:scrum.project,category_id:0
@@ -649,6 +649,8 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"프로젝트에 대한 재무 관리가 필요하면 이 프로젝트를 분석 계정에 링크하십시오. 예산, 계획, 원가 및 수입 분석, 프로젝트 타임시트 등을 "
+"수행할 수 있습니다."
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
@@ -656,18 +658,18 @@ msgstr ""
 #: selection:scrum.sprint,state:0
 #: selection:scrum.task,state:0
 msgid "Done"
-msgstr ""
+msgstr "완료"
 
 #. module: scrum
 #: wizard_button:scrum.product.backlog.task.create,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "취소"
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
 #: selection:scrum.sprint,state:0
 msgid "Open"
-msgstr ""
+msgstr "열기"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
@@ -676,17 +678,17 @@ msgstr ""
 #: view:scrum.sprint:0
 #: field:scrum.sprint,effective_hours:0
 msgid "Effective hours"
-msgstr ""
+msgstr "효과적인 시간"
 
 #. module: scrum
 #: field:scrum.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "매니저에게 알림"
 
 #. module: scrum
 #: selection:scrum.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "진행중"
 
 #. module: scrum
 #: field:scrum.sprint,review:0
@@ -697,7 +699,7 @@ msgstr "스프린트 검토"
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
 
 #. module: scrum
 #: field:scrum.task,remaining_hours:0
@@ -781,7 +783,7 @@ msgstr "오늘 어떤 일을 하셨습니까?"
 #. module: scrum
 #: selection:scrum.project,state:0
 msgid "Running"
-msgstr ""
+msgstr "실행 중"
 
 #. module: scrum
 #: field:scrum.product.backlog,progress:0

From 22dae2b3f861f5b3931e0a1d5a1f0125b205ac12 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 4 Apr 2010 20:48:44 +0200
Subject: [PATCH 198/248] merge

bzr revid: fp@tinyerp.com-20100404184844-uilt8otxhmd0z1vi
---
 addons/crm/report/crm_opportunity_report.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index 5aa2a91e555..2c117d396f2 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -2,10 +2,9 @@ from osv import fields,osv
 import tools
 
 class crm_opportunity_report(osv.osv):
-    _name = "crm.opportunity.report"    
+    _name = "crm.opportunity.report"
     _auto = False
-    _inherit = "crm.case.report"    
-    
+    _inherit = "crm.case.report"
     _columns = {
         'probability': fields.float('Avg. Probability', readonly=True),
         'amount_revenue': fields.float('Est.Revenue', readonly=True),        
@@ -35,13 +34,20 @@ class crm_opportunity_report(osv.osv):
                     0 as avg_answers,
                     0.0 as perc_done,
                     0.0 as perc_cancel,
-                    sum(planned_revenue) as amount_revenue,                    
+                    sum(planned_revenue) as amount_revenue,
                     sum((planned_revenue*probability)/100.0)::decimal(16,2) as amount_revenue_prob,
                     avg(probability)::decimal(16,2) as probability,
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     crm_opportunity c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.stage_id,c.categ_id,c.partner_id,company_id
+                group by
+                    to_char(c.create_date, 'YYYY'),
+                    to_char(c.create_date, 'MM'),
+                    c.state,
+                    c.user_id,
+                    c.section_id,
+                    c.stage_id,
+                    c.categ_id,
+                    c.partner_id,company_id
             )""")
 crm_opportunity_report()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From cf8f80e6d9782cc55487e29a9c27ef5d2a8792a7 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 5 Apr 2010 04:53:38 +0100
Subject: [PATCH 199/248] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100405035338-cxxkjo59wa75rg2v
---
 addons/base_contact/i18n/ko.po    |  2 +-
 addons/crm/i18n/fi.po             | 79 ++++++++++++++++---------------
 addons/report_purchase/i18n/ko.po |  2 +-
 addons/scrum/i18n/ko.po           |  2 +-
 4 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index c9788ecc136..ef55adcec9e 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index f8617b8ea6b..c2643ad5e8a 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-04-03 13:35+0000\n"
+"PO-Revision-Date: 2010-04-04 12:10+0000\n"
 "Last-Translator: smii <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -3315,7 +3315,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.next_id_64
 msgid "Reporting"
-msgstr ""
+msgstr "Raportointi"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3336,7 +3336,7 @@ msgstr ""
 #: selection:report.crm.case.section.stage,state:0
 #, python-format
 msgid "Pending"
-msgstr ""
+msgstr "Odottaa"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -3346,12 +3346,12 @@ msgstr ""
 #. module: crm
 #: view:crm.job:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "Oletettu palkka"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Asetukset"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail
@@ -3361,7 +3361,7 @@ msgstr ""
 #. module: crm
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Virheelliset argumentit"
 
 #. module: crm
 #: field:crm.meeting,transparent:0
@@ -3377,43 +3377,43 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_lead7
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Word of mouth"
-msgstr ""
+msgstr "Suusanallinen"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Subject"
-msgstr ""
+msgstr "Ohjausaihe"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Muunna mahdollisuudeksi"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_phone1
 msgid "Planned"
-msgstr ""
+msgstr "Suunniteltu"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet3
 msgid "Customer Office"
-msgstr ""
+msgstr "Asiakkaan toimisto"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Email"
-msgstr ""
+msgstr "Ehdokkaan sähköposti"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Sales Stage: "
-msgstr ""
+msgstr "Myyntien vaihe: "
 
 #. module: crm
 #: view:crm.claim:0
 msgid "Type of Action"
-msgstr ""
+msgstr "Toiminnon tyyppi"
 
 #. module: crm
 #: field:crm.case.rule,act_user_id:0
@@ -3423,7 +3423,7 @@ msgstr "Aseta vastaava"
 #. module: crm
 #: view:crm.job:0
 msgid "Meeting With Candidates"
-msgstr ""
+msgstr "Ehdokkaiden tapaaminen"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3447,7 +3447,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "December"
-msgstr ""
+msgstr "Joulukuu"
 
 #. module: crm
 #: view:report.crm.case.section.categ.categ2:0
@@ -3467,7 +3467,7 @@ msgstr "Lähetä sähköpostia"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "Funds Tree"
-msgstr ""
+msgstr "Varojen puu"
 
 #. module: crm
 #: field:crm.case.rule,act_method:0
@@ -3477,24 +3477,24 @@ msgstr "Kutsu objektia"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1
 msgid "All Funds"
-msgstr ""
+msgstr "Kaikki varat"
 
 #. module: crm
 #: field:crm.case.section,calendar:0
 #: view:crm.meeting:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
 msgid "Calendar"
-msgstr ""
+msgstr "Kalenteri"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job1
 msgid "Salesman"
-msgstr ""
+msgstr "Myyjä"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support_help
 msgid "HelpDesk"
-msgstr ""
+msgstr "HelpDesk"
 
 #. module: crm
 #: field:crm.case,ref2:0
@@ -3511,12 +3511,12 @@ msgstr "Ostomyynti"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Ajoita tapaaminen"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Taide ja Kulttuuri"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3524,7 +3524,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Outbound"
-msgstr ""
+msgstr "Lähtevä"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3535,7 +3535,7 @@ msgstr "Historioi"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Vahvistettu"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -3547,7 +3547,7 @@ msgstr "Ei toiminnassa"
 #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Onnistunut mahdollisuus"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3585,7 +3585,7 @@ msgstr "Aseta osio"
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaali"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3594,6 +3594,7 @@ msgstr ""
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
 msgstr ""
+"Sinun täytyy laittaa kumppanin sähköpostiosoite käyttääksesi tätä toimintoa!"
 
 #. module: crm
 #: wizard_view:crm.job.partner_create,init:0
@@ -3602,7 +3603,7 @@ msgstr ""
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Sinun täytyy varmistaa ettei tämä kumppani ole jo olemassa."
 
 #. module: crm
 #: view:crm.job:0
@@ -3622,14 +3623,14 @@ msgstr ""
 #: field:report.crm.case.section.categ2,user_id:0
 #: field:report.crm.case.section.stage,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree
 #: view:report.crm.case.section.categ.categ2:0
 msgid "Cases by Section, Category and Type"
-msgstr ""
+msgstr "Tapahtumat osion, kategorian ja tyypin mukaan"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3637,12 +3638,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "November"
-msgstr ""
+msgstr "Marraskuu"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_job2
 msgid "Licenced"
-msgstr ""
+msgstr "Lisensöity"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -3658,7 +3659,7 @@ msgstr "Yläosio"
 #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call
 #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Ajoita puhelinsoitto"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -3666,6 +3667,8 @@ msgstr ""
 msgid ""
 "Can not send mail with empty body,you should have description in the body"
 msgstr ""
+"Sähköpostia ei voi lähettää tyhjällä viesti -kentällä. Sinulla tulisi olla "
+"kuvaus viesti -kentässä"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -3673,7 +3676,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "January"
-msgstr ""
+msgstr "Tammikuu"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
@@ -3693,7 +3696,7 @@ msgstr "Suunniteltu tuotto"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund3
 msgid "Healthcare"
-msgstr ""
+msgstr "Terveydenhoito"
 
 #. module: crm
 #: view:crm.case:0
@@ -3717,7 +3720,7 @@ msgstr "Kumppanin Yhteystiedot"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet1
 msgid "Office"
-msgstr ""
+msgstr "Toimisto"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_fundraising
@@ -3727,7 +3730,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Tapahtuman vaihe"
 
 #. module: crm
 #: view:crm.case:0
diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po
index b5e7f12c500..20f71776b41 100644
--- a/addons/report_purchase/i18n/ko.po
+++ b/addons/report_purchase/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po
index 46f3063bc3d..f4595a6011e 100644
--- a/addons/scrum/i18n/ko.po
+++ b/addons/scrum/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum

From 470ee954cd870735f73e487d76cb503ad09921b0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 5 Apr 2010 11:42:50 +0530
Subject: [PATCH 200/248] [IMP]: crm: Improvement in Days to open, days to
 close function in lead

bzr revid: rpa@tinyerp.com-20100405061250-3rl3rd0ku8qzdnbb
---
 addons/crm/__terp__.py       |   1 +
 addons/crm/crm.py            |  18 +++--
 addons/crm/crm_lead.py       | 134 ++++++++++++++++-------------------
 addons/crm/crm_lead_view.xml |   9 +--
 addons/crm/crm_view.xml      |   5 +-
 5 files changed, 79 insertions(+), 88 deletions(-)

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index a1e09f63df8..232c8383361 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -48,6 +48,7 @@ between mails and Open ERP.""",
                         'process',
                         'mail_gateway',
                         'base_calendar',
+                        'resource',
                     ],
     'init_xml': ['crm_data.xml',
                 'crm_meeting_data.xml',
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index e2e3ddc6f36..c9b78008245 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -63,6 +63,7 @@ class crm_case_section(osv.osv):
                         in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Section'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'),
+        'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
     }
 
     _defaults = {
@@ -130,7 +131,7 @@ class crm_case_categ(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'object_id': fields.many2one('ir.model', 'Object Name'),
     }
-    
+
     def _find_object_id(self, cr, uid, context=None):
 
         """
@@ -143,8 +144,8 @@ class crm_case_categ(osv.osv):
         object_id = context and context.get('object_id', False) or False
         ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)])
         return ids and ids[0]
-        
-    _defaults = {        
+
+    _defaults = {
         'object_id' : _find_object_id
     }
 #
@@ -163,7 +164,7 @@ class crm_case_resource_type(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'object_id': fields.many2one('ir.model', 'Object Name'),
     }
-    
+
     def _find_object_id(self, cr, uid, context=None):
         """
         @param self: The object pointer
@@ -203,7 +204,7 @@ class crm_case_stage(osv.osv):
                          help="Change Probability on next and previous stages."),
         'requirements': fields.text('Requirements')
     }
-    
+
     def _find_object_id(self, cr, uid, context=None):
 
         """
@@ -352,7 +353,7 @@ class crm_case(osv.osv):
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
-    
+
     def _get_default_partner_address(self, cr, uid, context):
 
         """
@@ -687,7 +688,6 @@ class crm_case(osv.osv):
         return {'value': data}
 
     def case_close(self, cr, uid, ids, *args):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -707,7 +707,6 @@ class crm_case(osv.osv):
         return True
 
     def case_escalate(self, cr, uid, ids, *args):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -734,7 +733,6 @@ class crm_case(osv.osv):
 
 
     def case_open(self, cr, uid, ids, *args):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -749,13 +747,13 @@ class crm_case(osv.osv):
             data = {'state': 'open', 'active': True}
             if not case.user_id:
                 data['user_id'] = uid
+            data.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
             self.write(cr, uid, ids, data)
         self._action(cr, uid, cases, 'open')
         return True
 
 
     def case_cancel(self, cr, uid, ids, *args):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 0119b5ce1ac..c1a9d9b5b1b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -33,8 +33,7 @@ class crm_lead(osv.osv):
     _order = "priority desc, id desc"
     _inherit = ['res.partner.address', 'crm.case']
 
-    def _compute_openday(self, cr, uid, ids, name, args, context={}):
-
+    def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -42,77 +41,68 @@ class crm_lead(osv.osv):
         @return: difference between current date and log date
         @param context: A standard dictionary for contextual values
         """
+        log_obj = self.pool.get('crm.case.log')
+        model_obj = self.pool.get('ir.model')
+        cal_obj = self.pool.get('resource.calendar')
 
-        result = {}
-        for r in self.browse(cr, uid, ids , context):
-            result[r.id] = 0
-            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.lead')])
-            log_obj = self.pool.get('crm.case.log')
-            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
-                                                     ('res_id', '=', r.id), \
-                                                     ('name', '=', 'Open')])
+        model_ids = model_obj.search(cr, uid, [('model', '=', self._name)])
+        model_id = False
+        if len(model_ids):
+            model_id = model_ids[0]
 
-            if hist_id:
-                # Considering last log for opening case
-                log = log_obj.browse(cr, uid, hist_id[-1])
-                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
-                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
-                ans = date_lead_open - date_log_open
-                duration =  float(ans.days) + (float(ans.seconds) / 86400)
-                result[r.id] = abs(int(duration))
-        return result
+        res = {}
+        for lead in self.browse(cr, uid, ids , context):
+            for field in fields:
+                res[lead.id] = {}
+                duration = 0
+                if field == 'day_open':
+                    if lead.date_open:
+                        date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_open = datetime.strptime(lead.date_open, "%Y-%m-%d %H:%M:%S")
 
-    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+                        ans = date_open - date_create
+                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
 
-        """
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of closeday’s IDs
-        @param context: A standard dictionary for contextual values
-        @return: difference between current date and closed date
-        """
+                elif field == 'day_close':
+                    if lead.date_closed:
+                        date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_close = datetime.strptime(lead.date_closed, "%Y-%m-%d %H:%M:%S")
 
-        result = {}
-        for r in self.browse(cr, uid, ids , context):
-            result[r.id] = 0
-
-            if r.date_closed:
-                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
-                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
-                ans = date_close - date_create
-                duration =  float(ans.days) + (float(ans.seconds) / 86400)
-                result[r.id] = abs(int(duration))
-        return result
+                        ans = date_close - date_create
+                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                res[lead.id][field] = abs(int(duration))
+        return res
 
     _columns = {
 
         'categ_id': fields.many2one('crm.case.categ', 'Lead Source', \
                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.opportunity')]"), 
+                        ('object_id.model', '=', 'crm.opportunity')]"),
         'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', \
                          domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.lead')]"), 
-        'partner_name': fields.char("Contact Name", size=64), 
+                        ('object_id.model', '=', 'crm.lead')]"),
+        'partner_name': fields.char("Contact Name", size=64),
 
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
-        'date_closed': fields.datetime('Closed', readonly=True), 
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage', \
                             domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.lead')]"), 
-        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'), 
+                            ('object_id.model', '=', 'crm.lead')]"),
+        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
 
-        'user_id': fields.many2one('res.users', 'Salesman'), 
-        'referred': fields.char('Referred By', size=32), 
-        'day_open': fields.function(_compute_openday, string='Days to Open', \
-                                method=True, type="integer", store=True), 
-        'day_close': fields.function(_compute_closeday, string='Days to Close', \
-                                method=True, type="integer", store=True), 
-        'function_name' : fields.char('Function', size=64), 
+        'user_id': fields.many2one('res.users', 'Salesman'),
+        'referred': fields.char('Referred By', size=32),
+        'date_open': fields.datetime('Opened', readonly=True), 
+        'day_open': fields.function(_compute_day, string='Days to Open', \
+                                method=True, multi='day_open', type="integer", store=True), 
+        'day_close': fields.function(_compute_day, string='Days to Close', \
+                                method=True, multi='day_close', type="integer", store=True), 
+        'function_name': fields.char('Function', size=64),
         }
 
     _defaults = {
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
 
@@ -144,29 +134,29 @@ class crm_lead(osv.osv):
                 if data_id:
                     view_id1 = data_obj.browse(cr, uid, data_id, context=context).res_id
                 value = {
-                        'name': _('Create Partner'), 
-                        'view_type': 'form', 
-                        'view_mode': 'form,tree', 
-                        'res_model': 'crm.lead2opportunity.partner', 
-                        'view_id': False, 
-                        'context': context,  
-                        'views': [(view_id1, 'form')], 
-                        'type': 'ir.actions.act_window', 
-                        'target': 'new', 
+                        'name': _('Create Partner'),
+                        'view_type': 'form',
+                        'view_mode': 'form,tree',
+                        'res_model': 'crm.lead2opportunity.partner',
+                        'view_id': False,
+                        'context': context,
+                        'views': [(view_id1, 'form')],
+                        'type': 'ir.actions.act_window',
+                        'target': 'new',
                         'nodestroy': True
                         }
                 break
             else:
                 value = {
-                        'name': _('Create Opportunity'), 
-                        'view_type': 'form', 
-                        'view_mode': 'form,tree', 
-                        'res_model': 'crm.lead2opportunity', 
-                        'view_id': False, 
-                        'context': context,  
-                        'views': [(view_id, 'form')], 
-                        'type': 'ir.actions.act_window', 
-                        'target': 'new', 
+                        'name': _('Create Opportunity'),
+                        'view_type': 'form',
+                        'view_mode': 'form,tree',
+                        'res_model': 'crm.lead2opportunity',
+                        'view_id': False,
+                        'context': context,
+                        'views': [(view_id, 'form')],
+                        'type': 'ir.actions.act_window',
+                        'target': 'new',
                         'nodestroy': True
                         }
         return value
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 13a9abe2cfd..6805f8cac16 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -45,8 +45,8 @@
                             name="convert_opportunity"
                             string="Convert"
                             help="Convert into Opportunity"
-                            icon="gtk-index"   
-                            type="object"                         
+                            icon="gtk-index"
+                            type="object"
                             attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                     <newline />
                     <field name="section_id" colspan="1"
@@ -131,8 +131,8 @@
                         <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
-                                <field name="email_to"/>  
-                                <field name="email_from"/>                                
+                                <field name="email_to"/>
+                                <field name="email_from"/>
                                 <button
                                      string="Add a CC"
                                                name="%(crm.action_view_crm_email_add_cc_wizard)d"
@@ -174,6 +174,7 @@
                         <field name="create_date"/>
                         <field name="write_date"/>
                         <field name="date_closed"/>
+                        <field name="date_open"/>
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Statistics" colspan="2" col="2"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a87a67e3e1c..2d987839302 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -20,6 +20,7 @@
                             <field name="parent_id" select="2" widget="selection"/>
                             <field name="allow_unlink" select="2"/>
                             <field name="reply_to" select="2"/>
+                            <field name="resource_calendar_id"/>
                         </page>
                     </notebook>
                 </form>
@@ -363,7 +364,7 @@
                                     <separator colspan="4" string="Action Information"/>
                                     <field colspan="4" name="name"/>
                                     <field name="date" select="2"/>
-                                    <field name="user_id" select="2"/>                                    
+                                    <field name="user_id" select="2"/>
                                 </form>
                             </field>
                         </page>
@@ -376,7 +377,7 @@
                                    <group col="7" colspan="4">
                                        <field name="date"/>
                                        <field name="email_to"/>
-                                       <field name="email_from"/>                                       
+                                       <field name="email_from"/>
                                        <button
                                      string="Add a CC"
                                                name="%(crm.action_view_crm_email_add_cc_wizard)d"

From 36665685e23532eb36dc3d6eed0e404207cdbb1b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 5 Apr 2010 12:00:31 +0530
Subject: [PATCH 201/248] [Fix] point_of_sale: Remove the moved fiel

bzr revid: sbh@tinyerp.com-20100405063031-kscug9rb88p2z4qg
---
 .../wizard/pos_scan_product_view.xml.moved    | 34 -------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 addons/point_of_sale/wizard/pos_scan_product_view.xml.moved

diff --git a/addons/point_of_sale/wizard/pos_scan_product_view.xml.moved b/addons/point_of_sale/wizard/pos_scan_product_view.xml.moved
deleted file mode 100644
index 3957c6c0415..00000000000
--- a/addons/point_of_sale/wizard/pos_scan_product_view.xml.moved
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>        
-		<record id="view_pos_scan_product" model="ir.ui.view">
-            <field name="name">Scan product</field>
-            <field name="model">pos.scan.product</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Scan product">
-				    <group col="2" colspan="4">
-				    	<label string="Scan Barcode" colspan="4"/>
-						<field name="gencod" colspan="4" nolabel="1"/>
-                		<button icon='gtk-cancel' special="cancel"
-                			string="Close" />
-                		<button name="scan" string="Add"
-                			colspan="1" type="object" icon="gtk-ok" />
-                	</group>
-                </form>
-            </field>
-        </record>
-
-
-        <record id="action_pos_scan_product" model="ir.actions.act_window">
-            <field name="name">Scan product</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">pos.scan.product</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            
-        </record>
-        
-	</data>
-</openerp>	        
\ No newline at end of file

From 27da74e37085fc488436cd0b935a7e4d15df74c1 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 5 Apr 2010 12:09:51 +0530
Subject: [PATCH 202/248] [IMP] stock: improvement in change_standard_price
 wizard

bzr revid: mso@mso-20100405063951-ohy32l6s57uy9tg1
---
 .../wizard/stock_change_standard_price.py     | 89 ++-----------------
 1 file changed, 9 insertions(+), 80 deletions(-)

diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index b5b66f8f758..75a449cbfa4 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -98,88 +98,17 @@ class change_standard_price(osv.osv_memory):
         
         """
         rec_id = context and context.get('active_id', False)
-        prod_obj = self.pool.get('product.template')
-        location_obj = self.pool.get('stock.location')
-        lot_obj = self.pool.get('stock.report.prodlots')
-        move_obj = self.pool.get('account.move')
-        move_line_obj = self.pool.get('account.move.line')
-        data_obj = self.pool.get('ir.model.data')
-        
-        res = self.read(cr, uid, ids[0], ['new_price'])
-        new_price = res.get('new_price',[])
-        data = prod_obj.browse(cr, uid, rec_id)
-        diff = data.standard_price - new_price
-        prod_obj.write(cr, uid, rec_id, {'standard_price': new_price})
-        
-        loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
-        lot_ids = lot_obj.search(cr, uid, [('location_id', 'in', loc_ids),('product_id','=',rec_id)])
-        qty = 0
-        debit = 0.0
-        credit = 0.0
-        stock_input_acc = data.property_stock_account_input.id or data.categ_id.property_stock_account_input_categ.id
-        stock_output_acc = data.property_stock_account_output.id or data.categ_id.property_stock_account_output_categ.id
-            
-        for lots in lot_obj.browse(cr, uid, lot_ids):
-            qty += lots.name
-        
-        if stock_input_acc and stock_output_acc and lot_ids:
-            move_id = move_obj.create(cr, uid, {'journal_id': data.categ_id.property_stock_journal.id})
-            if diff > 0:
-                credit = qty * diff
-                move_line_obj.create(cr, uid, {
-                                'name': data.name,
-                                'account_id': stock_input_acc,
-                                'credit': credit,
-                                'move_id': move_id
-                                })
-                for lots in lot_obj.browse(cr, uid, lot_ids):
-                    credit = lots.name * diff
-                    move_line_obj.create(cr, uid, {
-                                    'name': 'Expense',
-                                    'account_id': lots.location_id.account_id.id,
-                                    'debit': credit,
-                                    'move_id': move_id
-                                    })
-            elif diff < 0:
-                debit = qty * -diff
-                move_line_obj.create(cr, uid, {
-                                'name': data.name,
-                                'account_id': stock_output_acc,
-                                'debit': debit,
-                                'move_id': move_id
-                                })
-                for lots in lot_obj.browse(cr, uid, lot_ids):
-                    debit = lots.name * -diff
-                    move_line_obj.create(cr, uid, {
-                                    'name': 'Income',
-                                    'account_id': lots.location_id.account_id.id,
-                                    'credit': debit,
-                                    'move_id': move_id
-                                    })
-            else:
-                raise osv.except_osv(_('Warning!'),_('No Change in Price.'))
-        else:
-            raise osv.except_osv(_('Warning!'),_('No Accounts are defined for ' 
-                        'this product on its location.\nCan\'t create Move.'))
-        
-        id2 = data_obj._get_id(cr, uid, 'account', 'view_move_tree')
-        id3 = data_obj._get_id(cr, uid, 'account', 'view_move_form')
-        
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        
-        return {
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'account.move',
-                'res_id' : move_id,
-                'views': [(id3,'form'),(id2,'tree')],
-                'type': 'ir.actions.act_window',
+        assert rec_id, _('Active ID is not set in Context')
+        prod_obj = self.pool.get('product.product')
+        res = self.browse(cr, uid, ids)        
+        datas = {
+            'new_price' : res[0].new_price,
+            'stock_output_account' : res[0].stock_account_output.id,
+            'stock_input_account' : res[0].stock_account_input.id,
+            'stock_journal' : res[0].stock_journal.id
         }
         prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
-        return {}        
+        return {}      
 
 change_standard_price()
 

From c537d51792837a370cd94ef7eb7067d7965565f0 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 5 Apr 2010 12:33:10 +0530
Subject: [PATCH 203/248] [FIX] mrp: print statement removed

bzr revid: mso@mso-20100405070310-48htuzrjy97c2cvp
---
 addons/mrp/product.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index b4cc4214d33..7ddc9a65f3a 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -41,11 +41,9 @@ class product_product(osv.osv):
 #                    price += _compute_price(sbom) * sbom.product_qty                    
 #            else:
             parent_bom = bom_obj.search(cr, uid, [('bom_id', '=', False)])
-            print "========", bom.product_id.name
             for p in parent_bom:
                 test_obj = bom_obj.browse(cr, uid, p)
                 print test_obj
-                print "XXXXXXXXXXXXX", p, test_obj.child_ids
                 
 #            if no_child_bom and bom.id not in no_child_bom:
 #                other_bom = bom_obj.browse(cr, uid, no_child_bom)[0]

From e069d37fb1a47c9278cf9be48d42e11174e93f5a Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Mon, 5 Apr 2010 12:46:45 +0530
Subject: [PATCH 204/248] [FIX] stock: correction after merging the branch

bzr revid: mso@mso-20100405071645-m05ncua7pfcwg20m
---
 .../wizard/stock_change_standard_price.py     | 90 ++-----------------
 1 file changed, 9 insertions(+), 81 deletions(-)

diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index b5b66f8f758..fb8f9b66e3f 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -98,89 +98,17 @@ class change_standard_price(osv.osv_memory):
         
         """
         rec_id = context and context.get('active_id', False)
-        prod_obj = self.pool.get('product.template')
-        location_obj = self.pool.get('stock.location')
-        lot_obj = self.pool.get('stock.report.prodlots')
-        move_obj = self.pool.get('account.move')
-        move_line_obj = self.pool.get('account.move.line')
-        data_obj = self.pool.get('ir.model.data')
-        
-        res = self.read(cr, uid, ids[0], ['new_price'])
-        new_price = res.get('new_price',[])
-        data = prod_obj.browse(cr, uid, rec_id)
-        diff = data.standard_price - new_price
-        prod_obj.write(cr, uid, rec_id, {'standard_price': new_price})
-        
-        loc_ids = location_obj.search(cr, uid, [('account_id','<>',False),('usage','=','internal')])
-        lot_ids = lot_obj.search(cr, uid, [('location_id', 'in', loc_ids),('product_id','=',rec_id)])
-        qty = 0
-        debit = 0.0
-        credit = 0.0
-        stock_input_acc = data.property_stock_account_input.id or data.categ_id.property_stock_account_input_categ.id
-        stock_output_acc = data.property_stock_account_output.id or data.categ_id.property_stock_account_output_categ.id
-            
-        for lots in lot_obj.browse(cr, uid, lot_ids):
-            qty += lots.name
-        
-        if stock_input_acc and stock_output_acc and lot_ids:
-            move_id = move_obj.create(cr, uid, {'journal_id': data.categ_id.property_stock_journal.id})
-            if diff > 0:
-                credit = qty * diff
-                move_line_obj.create(cr, uid, {
-                                'name': data.name,
-                                'account_id': stock_input_acc,
-                                'credit': credit,
-                                'move_id': move_id
-                                })
-                for lots in lot_obj.browse(cr, uid, lot_ids):
-                    credit = lots.name * diff
-                    move_line_obj.create(cr, uid, {
-                                    'name': 'Expense',
-                                    'account_id': lots.location_id.account_id.id,
-                                    'debit': credit,
-                                    'move_id': move_id
-                                    })
-            elif diff < 0:
-                debit = qty * -diff
-                move_line_obj.create(cr, uid, {
-                                'name': data.name,
-                                'account_id': stock_output_acc,
-                                'debit': debit,
-                                'move_id': move_id
-                                })
-                for lots in lot_obj.browse(cr, uid, lot_ids):
-                    debit = lots.name * -diff
-                    move_line_obj.create(cr, uid, {
-                                    'name': 'Income',
-                                    'account_id': lots.location_id.account_id.id,
-                                    'credit': debit,
-                                    'move_id': move_id
-                                    })
-            else:
-                raise osv.except_osv(_('Warning!'),_('No Change in Price.'))
-        else:
-            raise osv.except_osv(_('Warning!'),_('No Accounts are defined for ' 
-                        'this product on its location.\nCan\'t create Move.'))
-        
-        id2 = data_obj._get_id(cr, uid, 'account', 'view_move_tree')
-        id3 = data_obj._get_id(cr, uid, 'account', 'view_move_form')
-        
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        
-        return {
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'account.move',
-                'res_id' : move_id,
-                'views': [(id3,'form'),(id2,'tree')],
-                'type': 'ir.actions.act_window',
+        assert rec_id, _('Active ID is not set in Context')
+        prod_obj = self.pool.get('product.product')
+        res = self.browse(cr, uid, ids)        
+        datas = {
+            'new_price' : res[0].new_price,
+            'stock_output_account' : res[0].stock_account_output.id,
+            'stock_input_account' : res[0].stock_account_input.id,
+            'stock_journal' : res[0].stock_journal.id
         }
         prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
-        return {}        
-
+        return {}            
 change_standard_price()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 06560539e9d7719aa07ff074de72cf3db96e52cc Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Mon, 5 Apr 2010 10:17:47 +0200
Subject: [PATCH 205/248] [IMP] Removed print.

bzr revid: jth@openerp.com-20100405081747-spggk7u9xe7t8bur
---
 bin/tools/yaml_tag.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/tools/yaml_tag.py b/bin/tools/yaml_tag.py
index 1d36dc17a5b..97b29db1ac0 100644
--- a/bin/tools/yaml_tag.py
+++ b/bin/tools/yaml_tag.py
@@ -88,7 +88,6 @@ class Eval(YamlTag):
     
 class Ref(YamlTag):
     def __init__(self, *args, **kwargs):
-        print "kwargs %s" % kwargs
         super(Ref, self).__init__(*args, **kwargs)
     
 class IrSet(YamlTag):

From 59be5d42e2163f12eec054441fe4a1d6dc724cbc Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 5 Apr 2010 14:10:54 +0530
Subject: [PATCH 206/248] [IMP]: crm project_issue: implement compute day
 function in this module

bzr revid: ksa@tinyerp.co.in-20100405084054-vdc6tz5i8dtr1it9
---
 addons/crm/crm.py                           | 28 ++++----
 addons/crm/crm_lead.py                      |  7 +-
 addons/crm/crm_opportunity.py               | 76 +++++++++-----------
 addons/crm/crm_opportunity_view.xml         |  2 +
 addons/project_issue/project_issue.py       | 77 ++++++++++++---------
 addons/project_issue/project_issue_view.xml |  8 ++-
 6 files changed, 104 insertions(+), 94 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index c9b78008245..8271ab025d2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -503,8 +503,8 @@ class crm_case(osv.osv):
                 s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
                 if st in s[section]:
                     self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
-        return True    
-    
+        return True
+
     def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}):
         """
         @param self: The object pointer
@@ -552,7 +552,7 @@ class crm_case(osv.osv):
                         (case.section_id and case.section_id.reply_to) or \
                         (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or tools.config.get('email_from',False)
-            res = obj.create(cr, uid, data, context)            
+            res = obj.create(cr, uid, data, context)
         return True
     _history = __history
 
@@ -631,7 +631,7 @@ class crm_case(osv.osv):
         self.__history(cr, uid, cases, _('Send'), history=True, email=False)
         for case in cases:
             self.write(cr, uid, [case.id], {
-                'description': False,                
+                'description': False,
                 })
             emails = [case.email_from] + (case.email_cc or '').split(',')
             emails = filter(None, emails)
@@ -645,11 +645,11 @@ class crm_case(osv.osv):
                         _("No E-Mail ID Found for your Company address!"))
 
             tools.email_send(
-                emailfrom, 
-                emails, 
-                '[' + str(case.id) + '] ' + case.name, 
-                self.format_body(body), 
-                reply_to = case.section_id.reply_to, 
+                emailfrom,
+                emails,
+                '[' + str(case.id) + '] ' + case.name,
+                self.format_body(body),
+                reply_to = case.section_id.reply_to,
                 openobject_id = str(case.id)
             )
             self.__history(cr, uid, [case], _('Send'), history=True, email=emails, details=body, email_from=emailfrom)
@@ -814,11 +814,11 @@ class crm_case_log(osv.osv):
     _order = "id desc"
     _columns = {
         'name': fields.char('Status', size=64),
-        'date': fields.datetime('Date'), 
-        'section_id': fields.many2one('crm.case.section', 'Section'), 
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
-        'model_id': fields.many2one('ir.model', "Model"), 
-        'res_id': fields.integer('Resource ID'), 
+        'date': fields.datetime('Date'),
+        'section_id': fields.many2one('crm.case.section', 'Section'),
+        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
+        'model_id': fields.many2one('ir.model', "Model"),
+        'res_id': fields.integer('Resource ID'),
     }
 
     _defaults = {
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index c1a9d9b5b1b..73fd420aa63 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -23,6 +23,7 @@ from osv import fields, osv, orm
 from datetime import datetime, timedelta
 import crm
 import math
+from mx import DateTime
 from tools.translate import _
 
 class crm_lead(osv.osv):
@@ -92,11 +93,11 @@ class crm_lead(osv.osv):
 
         'user_id': fields.many2one('res.users', 'Salesman'),
         'referred': fields.char('Referred By', size=32),
-        'date_open': fields.datetime('Opened', readonly=True), 
+        'date_open': fields.datetime('Opened', readonly=True),
         'day_open': fields.function(_compute_day, string='Days to Open', \
-                                method=True, multi='day_open', type="integer", store=True), 
+                                method=True, multi='day_open', type="integer", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
-                                method=True, multi='day_close', type="integer", store=True), 
+                                method=True, multi='day_close', type="integer", store=True),
         'function_name': fields.char('Function', size=64),
         }
 
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 1625d39fdde..7d9a0efec0e 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -40,8 +40,7 @@ class crm_opportunity(osv.osv):
     _order = "id desc"
     _inherit = 'crm.case'
 
-    def _compute_openday(self, cr, uid, ids, name, args, context={}):
-
+    def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -49,45 +48,37 @@ class crm_opportunity(osv.osv):
         @return: difference between current date and log date
         @param context: A standard dictionary for contextual values
         """
-        result = {}
-        for r in self.browse(cr, uid, ids , context):
-            result[r.id] = 0
-            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.opportunity')])
-            log_obj = self.pool.get('crm.case.log')
-            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
-                                                     ('res_id', '=', r.id), \
-                                                     ('name', '=', 'Open')])
+        log_obj = self.pool.get('crm.case.log')
+        model_obj = self.pool.get('ir.model')
+        cal_obj = self.pool.get('resource.calendar')
 
-            if hist_id:
-                # Considering last log for opening case
-                log = log_obj.browse(cr, uid, hist_id[-1])
-                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
-                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
-                ans = date_lead_open - date_log_open
-                duration =  float(ans.days) + (float(ans.seconds) / 86400)
-                result[r.id] = abs(int(duration))
-        return result
+        model_ids = model_obj.search(cr, uid, [('model', '=', self._name)])
+        model_id = False
+        if len(model_ids):
+            model_id = model_ids[0]
 
-    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+        res = {}
+        for lead in self.browse(cr, uid, ids , context):
+            for field in fields:
+                res[lead.id] = {}
+                duration = 0
+                if field == 'day_open':
+                    if lead.date_open:
+                        date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_open = datetime.strptime(lead.date_open, "%Y-%m-%d %H:%M:%S")
 
-        """
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of closeday’s IDs
-        @return: difference between current date and closed date
-        @param context: A standard dictionary for contextual values
-        """
-        result = {}
-        for r in self.browse(cr, uid, ids , context):
-            result[r.id] = 0
+                        ans = date_open - date_create
+                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
 
-            if r.date_closed:
-                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
-                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
-                ans = date_close - date_create
-                duration =  float(ans.days) + (float(ans.seconds) / 86400)
-                result[r.id] = abs(int(duration))
-        return result
+                elif field == 'day_close':
+                    if lead.date_closed:
+                        date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_close = datetime.strptime(lead.date_closed, "%Y-%m-%d %H:%M:%S")
+
+                        ans = date_close - date_create
+                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                res[lead.id][field] = abs(int(duration))
+        return res
 
     _columns = {
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
@@ -113,11 +104,12 @@ class crm_opportunity(osv.osv):
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
 
-        'day_open': fields.function(_compute_openday, string='Days to Open', \
-                                method=True, type="integer", store=True),
-        'day_close': fields.function(_compute_closeday, string='Days to Close', \
-                                method=True, type="integer", store=True),
-       }
+        'date_open': fields.datetime('Opened', readonly=True),
+        'day_open': fields.function(_compute_day, string='Days to Open', \
+                                method=True, multi='day_open', type="integer", store=True),
+        'day_close': fields.function(_compute_day, string='Days to Close', \
+                                method=True, multi='day_close', type="integer", store=True),
+         }
 
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
 
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4e37620839d..fb2a9eaba5f 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -138,12 +138,14 @@
                         <field name="create_date"/>
                         <field name="write_date"/>
                         <field name="date_closed"/>
+                        <field name="date_open"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Misc" colspan="2"/>
                         <field name="active"/>
                         <field name="day_open"/>
                         <field name="day_close"/>
+
                     </group>
                     <separator colspan="4" string="References"/>
                     <field name="ref"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 03ecfdcc778..0248a6ee7a5 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -37,37 +37,45 @@ class project_issue(osv.osv):
     _order = "priority, id desc"
     _inherit = 'crm.case'
 
-    def _compute_openday(self, cr, uid, ids, name, args, context={}):
-        result = {}
-        for r in self.browse(cr, uid, ids , context):
-            result[r.id] = 0
-            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'project.issue')])
-            log_obj = self.pool.get('crm.case.log')
-            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
-                                                     ('res_id', '=', r.id), \
-                                                     ('name', '=', 'Open')])
+    def _compute_day(self, cr, uid, ids, fields, args, context={}):
+        """
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Openday’s IDs
+        @return: difference between current date and log date
+        @param context: A standard dictionary for contextual values
+        """
+        log_obj = self.pool.get('crm.case.log')
+        model_obj = self.pool.get('ir.model')
+        cal_obj = self.pool.get('resource.calendar')
 
-            if hist_id:
-                # Considering last log for opening case
-                log = log_obj.browse(cr, uid, hist_id[-1])
-                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
-                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
-                ans = date_lead_open - date_log_open
-                duration =  float(ans.days) + (float(ans.seconds) / 86400)
-                result[r.id] = abs(int(duration))
-        return result
+        model_ids = model_obj.search(cr, uid, [('model', '=', self._name)])
+        model_id = False
+        if len(model_ids):
+            model_id = model_ids[0]
 
-    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
-        result = {}
-        for r in self.browse(cr, uid, ids , context):
-            result[r.id] = 0
-            if r.date_closed:
-                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
-                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
-                ans = date_close - date_create
-                duration =  float(ans.days) + (float(ans.seconds) / 86400)
-                result[r.id] = abs(int(duration))
-        return result
+        res = {}
+        for lead in self.browse(cr, uid, ids , context):
+            for field in fields:
+                res[lead.id] = {}
+                duration = 0
+                if field == 'day_open':
+                    if lead.date_open:
+                        date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_open = datetime.strptime(lead.date_open, "%Y-%m-%d %H:%M:%S")
+
+                        ans = date_open - date_create
+                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
+
+                elif field == 'day_close':
+                    if lead.date_closed:
+                        date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_close = datetime.strptime(lead.date_closed, "%Y-%m-%d %H:%M:%S")
+
+                        ans = date_close - date_create
+                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                res[lead.id][field] = abs(int(duration))
+        return res
 
     _columns = {
         'date_closed': fields.datetime('Closed', readonly=True),
@@ -84,11 +92,12 @@ class project_issue(osv.osv):
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
-        'day_open': fields.function(_compute_openday, string='Days to Open', \
-                                method=True, type="integer", store=True),
-        'day_close': fields.function(_compute_closeday, string='Days to Close', \
-                                method=True, type="integer", store=True),
-        'assigned_to' : fields.many2one('res.users', 'Assigned to'),
+        'date_open': fields.datetime('Opened', readonly=True),
+        'day_open': fields.function(_compute_day, string='Days to Open', \
+                                method=True, multi='day_open', type="integer", store=True),
+        'day_close': fields.function(_compute_day, string='Days to Close', \
+                                method=True, multi='day_close', type="integer", store=True),
+       'assigned_to' : fields.many2one('res.users', 'Assigned to'),
         'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
         'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
                                                 domain="[('partner_id', '=', partner_id)]",
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f09643c2590..1da031fa52e 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -77,7 +77,13 @@
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Date"/>
                                 <field name="date_closed"/>
+                                <field name="date_open"/>
                             </group>
+                            <group colspan="2" col="2">
+                        		<separator string="Statistics" colspan="2" col="2"/>
+                        		<field name="day_open"/>
+                        		<field name="day_close"/>
+                    		</group>
                             <group col="2" colspan="2">
                                 <separator string="References" colspan="2"/>
                                 <field name="id"/>
@@ -88,7 +94,7 @@
                                     <separator string="Action Information" colspan="4"/>
                                     <field name="name" colspan="4"/>
                                     <field name="date" />
-                                    <field name="user_id" />                                    
+                                    <field name="user_id" />
                                 </form>
                             </field>
                         </page>

From 84c1940f7bf4c06a731f81bcff828ec45e85ab91 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 5 Apr 2010 14:14:37 +0530
Subject: [PATCH 207/248] [ADD] Project: Osv memory wizard convert (Close Task)

bzr revid: mra@tinyerp.com-20100405084437-7309p0p0p1lg9g0m
---
 addons/project/__terp__.py                    |   3 +-
 addons/project/project.py                     |  19 +++
 addons/project/project_view.xml               |   6 +-
 addons/project/project_wizard.xml             |   2 +-
 addons/project/wizard/__init__.py             |   2 +-
 addons/project/wizard/close_task.py           | 114 ------------------
 addons/project/wizard/project_close_task.py   |  87 +++++++++++++
 .../wizard/project_close_task_view.xml        |  34 ++++++
 8 files changed, 148 insertions(+), 119 deletions(-)
 delete mode 100644 addons/project/wizard/close_task.py
 create mode 100644 addons/project/wizard/project_close_task.py
 create mode 100644 addons/project/wizard/project_close_task_view.xml

diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py
index 2af0ba122bf..65e3c58fb5e 100644
--- a/addons/project/__terp__.py
+++ b/addons/project/__terp__.py
@@ -40,7 +40,8 @@ works done on tasks, eso. It is able to render planning, order tasks, eso.
         "project_report.xml",
         "process/task_process.xml",
         "project_installer.xml",
-        "report/project_report_view.xml"
+        "report/project_report_view.xml",
+        "wizard/project_close_task_view.xml",
     ],
     'demo_xml': [
         'project_demo.xml'
diff --git a/addons/project/project.py b/addons/project/project.py
index 0c6cc839f6d..278646e097a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -358,6 +358,8 @@ class task(osv.osv):
         return res
 
     def do_close(self, cr, uid, ids, *args):
+        mail_send = False
+        mod_obj = self.pool.get('ir.model.data')
         request = self.pool.get('res.request')
         tasks = self.browse(cr, uid, ids)
         for task in tasks:
@@ -373,6 +375,9 @@ class task(osv.osv):
                         'ref_doc1': 'project.task,%d'% (task.id,),
                         'ref_doc2': 'project.project,%d'% (project.id,),
                     })
+                elif project.warn_manager:
+                    task_id = ids[0]
+                    mail_send = True
             self.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
             for parent_id in task.parent_ids:
                 if parent_id.state in ('pending','draft'):
@@ -382,6 +387,20 @@ class task(osv.osv):
                             reopen = False
                     if reopen:
                         self.do_reopen(cr, uid, [parent_id.id])
+        if mail_send:
+            model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_project_close_task')])
+            resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
+            return {
+                'name': _('Email Send to Customer'),
+                'view_type': 'form',
+                'context': {'task_id': task_id,}, # improve me
+                'view_mode': 'tree,form',
+                'res_model': 'close.task',
+                'views': [(resource_id,'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True
+                    }
         return True
 
     def do_reopen(self, cr, uid, ids, *args):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b910515c950..47cdefe3cee 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -271,7 +271,8 @@
                                 <button name="%(action_config_compute_remaining)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                 <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
+                                <!--<button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>-->
+                                <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-jump-to"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -350,7 +351,8 @@
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
-                    <button name="%(wizard_close_task)d" states="draft,pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
+                    <!--<button name="%(wizard_close_task)d" states="draft,pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>-->
+                    <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-jump-to" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>
             </field>
diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml
index e2b7442f26e..0e9a5c8b3c1 100644
--- a/addons/project/project_wizard.xml
+++ b/addons/project/project_wizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <wizard id="wizard_close_task" menu="False" model="project.task" name="project.task.close" string="Close Task"/>
+        <!--<wizard id="wizard_close_task" menu="False" model="project.task" name="project.task.close" string="Close Task"/>-->
         <wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>
         <wizard
             id="wizard_duplicate_template"
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index e4dd881af98..5fd475d781d 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import close_task
+import project_close_task
 import task_delegate
 import duplicate_template_wizard
 
diff --git a/addons/project/wizard/close_task.py b/addons/project/wizard/close_task.py
deleted file mode 100644
index 89e4409f643..00000000000
--- a/addons/project/wizard/close_task.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-from tools import email_send as email
-import pooler
-from osv import osv
-from tools.translate import _
-
-mail_form = """<?xml version="1.0" ?>
-<form string="Send mail to customer">
-    <field name="email" colspan="4"/>
-    <field name="description" colspan="4"/>
-</form>"""
-
-mail_fields = {
-    'email': {'string': 'E-Mails', 'type': 'char', 'required': 'True', 'size':64},
-    'description': {'string':'Description', 'type':'text', 'required':'True'},
-}
-
-def email_send(cr, uid, ids, to_adr, description, context={}):
-    pool = pooler.get_pool(cr.dbname)
-    for task in pool.get('project.task').browse(cr, uid, ids, context=context):
-        project = task.project_id
-        subject = "Task '%s' closed" % task.name
-        if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
-            from_adr = task.user_id.address_id.email
-            signature = task.user_id.signature
-        else:
-            raise wizard.except_wizard(_('Error'), _("Couldn't send mail because your email address is not configured!"))
-        if to_adr:
-            val = {
-                'name': task.name,
-                'user_id': task.user_id.name,
-                'task_id': "%d/%d" % (project.id, task.id),
-                'date_start': task.date_start,
-                'date_close': task.date_close,
-                'state': task.state
-            }
-            header = (project.warn_header or '') % val
-            footer = (project.warn_footer or '') % val
-            body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature)
-            email(from_adr, [to_adr], subject, body.encode('utf-8'), email_bcc=[from_adr])
-        else:
-            raise wizard.except_wizard(_('Error'), _("Couldn't send mail because the contact for this task (%s) has no email address!") % contact.name)
-
-class wizard_close(wizard.interface):
-    def _check_complete(self, cr, uid, data, context):
-        task = pooler.get_pool(cr.dbname).get('project.task').browse(cr, uid, data['ids'])[0]
-        if not (task.project_id and task.project_id.warn_customer):
-            return 'close'
-        return 'mail_ask'
-
-    def _get_data(self, cr, uid, data, context):
-        email = ''
-        task = pooler.get_pool(cr.dbname).get('project.task').browse(cr, uid, data['ids'][0])
-        partner_id = task.partner_id or task.project_id.partner_id
-        if partner_id and partner_id.address[0].email:
-            email = partner_id.address[0].email
-        return {'description': task.description or task.name, 'email':email}
-
-    def _data_send(self, cr, uid, data, context):
-        task_obj = pooler.get_pool(cr.dbname).get('project.task')
-        if data['form']['email']:
-            description = data['form'].get('description', False)
-            email_send(cr, uid, data['ids'], data['form']['email'], data['form']['description'])
-        return {}
-
-    def _do_close(self, cr, uid, data, context):
-        task_obj = pooler.get_pool(cr.dbname).get('project.task')
-        task_obj.do_close(cr, uid, data['ids'], context)
-        return {}
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type':'choice', 'next_state':_check_complete}
-        },
-        'mail_ask': {
-            'actions': [_get_data],
-            'result': {'type':'form', 'arch':mail_form, 'fields':mail_fields, 'state':[('end', 'Cancel'), ('close', 'Quiet close'), ('mail_send', 'Send Message')]},
-        },
-        'mail_send': {
-            'actions': [_data_send],
-            'result': {'type':'state', 'state':'close'},
-        },
-        'close': {
-            'actions': [_do_close],
-            'result': {'type':'state', 'state':'end'},
-        },
-    }
-wizard_close('project.task.close')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project/wizard/project_close_task.py b/addons/project/wizard/project_close_task.py
new file mode 100644
index 00000000000..947806224f4
--- /dev/null
+++ b/addons/project/wizard/project_close_task.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+from tools.translate import _
+from tools import email_send as email
+
+class project_close_task(osv.osv_memory):
+    """
+    Close Task
+    """
+    _name = "close.task"
+    _description = "Project Close Task"
+    _columns = {
+        'email': fields.char('E-Mails', size=64,),
+        'description': fields.text('Description',),
+               }
+
+    def _get_email(self, cr, uid, context={}):
+        email = ''
+        task = self.pool.get('project.task').browse(cr, uid, context['active_ids'][0])
+        partner_id = task.partner_id or task.project_id.partner_id
+        if partner_id and partner_id.address[0].email:
+            email = partner_id.address[0].email
+        return email
+
+    def _get_desc(self, cr, uid, context={}):
+        task = self.pool.get('project.task').browse(cr, uid, context['active_ids'][0])
+        return task.description or task.name
+
+    _defaults={
+       'email': _get_email,
+       'description': _get_desc,
+               }
+
+    def confirm(self, cr, uid, ids, context={}):
+        if not 'task_id' in context:
+            return {}
+        close_task = self.read(cr, uid, ids[0], [])
+        to_adr = close_task['email']
+        description = close_task['description']
+        for task in self.pool.get('project.task').browse(cr, uid, [context['task_id']], context=context):
+            project = task.project_id
+            subject = "Task '%s' closed" % task.name
+            if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
+                from_adr = task.user_id.address_id.email
+                signature = task.user_id.signature
+            else:
+                raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!"))
+            if to_adr:
+                val = {
+                    'name': task.name,
+                    'user_id': task.user_id.name,
+                    'task_id': "%d/%d" % (project.id, task.id),
+                    'date_start': task.date_start,
+                    'date_end': task.date_end,
+                    'state': task.state
+                }
+                header = (project.warn_header or '') % val
+                footer = (project.warn_footer or '') % val
+                body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature)
+                email(from_adr, [to_adr], subject, body.encode('utf-8'), email_bcc=[from_adr])
+            else:
+                raise osv.except_osv(_('Error'), _("Couldn't send mail because the contact for this task (%s) has no email address!") % contact.name)
+        return {}
+
+project_close_task()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project/wizard/project_close_task_view.xml b/addons/project/wizard/project_close_task_view.xml
new file mode 100644
index 00000000000..534312d7629
--- /dev/null
+++ b/addons/project/wizard/project_close_task_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_project_close_task" model="ir.ui.view">
+            <field name="name">Project Close Task</field>
+            <field name="model">close.task</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="Project Close Task">
+		              <field name="email" />
+		              <newline/>
+		              <field name="description" />
+		              <group colspan="4" col="6">
+		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		            		<button icon="gtk-ok" name="confirm" string="Send Mail" type="object"/>
+		              </group>
+			  	</form>
+            </field>
+		</record>
+
+		<record id="action_project_close_task" model="ir.actions.act_window">
+	           <field name="name">Project Close Task</field>
+	           <field name="type">ir.actions.act_window</field>
+	           <field name="res_model">close.task</field>
+	           <field name="view_type">form</field>
+	           <field name="view_mode">form</field>
+	           <field name="view_id" ref="view_project_close_task"/>
+		       <field name="context">{'record_id' : active_id}</field>
+	           <field name="target">new</field>
+    	</record>
+
+    </data>
+</openerp>
\ No newline at end of file

From be875a903ca3458ee3a6ea5a04a80de400459e30 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 5 Apr 2010 14:24:12 +0530
Subject: [PATCH 208/248] [IMP]: crm project_issue: Give proper name for
 variable

bzr revid: ksa@tinyerp.co.in-20100405085412-spn6kaek65g3lvus
---
 addons/crm/crm_opportunity.py         | 18 +++++++++---------
 addons/project_issue/project_issue.py | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 7d9a0efec0e..e11aaedee09 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -58,26 +58,26 @@ class crm_opportunity(osv.osv):
             model_id = model_ids[0]
 
         res = {}
-        for lead in self.browse(cr, uid, ids , context):
+        for opportunity in self.browse(cr, uid, ids , context):
             for field in fields:
-                res[lead.id] = {}
+                res[opportunity.id] = {}
                 duration = 0
                 if field == 'day_open':
-                    if lead.date_open:
-                        date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
-                        date_open = datetime.strptime(lead.date_open, "%Y-%m-%d %H:%M:%S")
+                    if opportunity.date_open:
+                        date_create = datetime.strptime(opportunity.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_open = datetime.strptime(opportunity.date_open, "%Y-%m-%d %H:%M:%S")
 
                         ans = date_open - date_create
                         duration =  float(ans.days) + (float(ans.seconds) / 86400)
 
                 elif field == 'day_close':
-                    if lead.date_closed:
-                        date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
-                        date_close = datetime.strptime(lead.date_closed, "%Y-%m-%d %H:%M:%S")
+                    if opportunity.date_closed:
+                        date_create = datetime.strptime(opportunity.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_close = datetime.strptime(opportunity.date_closed, "%Y-%m-%d %H:%M:%S")
 
                         ans = date_close - date_create
                         duration =  float(ans.days) + (float(ans.seconds) / 86400)
-                res[lead.id][field] = abs(int(duration))
+                res[opportunity.id][field] = abs(int(duration))
         return res
 
     _columns = {
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 0248a6ee7a5..248122ad854 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -55,26 +55,26 @@ class project_issue(osv.osv):
             model_id = model_ids[0]
 
         res = {}
-        for lead in self.browse(cr, uid, ids , context):
+        for project in self.browse(cr, uid, ids , context):
             for field in fields:
-                res[lead.id] = {}
+                res[project.id] = {}
                 duration = 0
                 if field == 'day_open':
-                    if lead.date_open:
-                        date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
-                        date_open = datetime.strptime(lead.date_open, "%Y-%m-%d %H:%M:%S")
+                    if project.date_open:
+                        date_create = datetime.strptime(project.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_open = datetime.strptime(project.date_open, "%Y-%m-%d %H:%M:%S")
 
                         ans = date_open - date_create
                         duration =  float(ans.days) + (float(ans.seconds) / 86400)
 
                 elif field == 'day_close':
-                    if lead.date_closed:
-                        date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
-                        date_close = datetime.strptime(lead.date_closed, "%Y-%m-%d %H:%M:%S")
+                    if project.date_closed:
+                        date_create = datetime.strptime(project.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_close = datetime.strptime(project.date_closed, "%Y-%m-%d %H:%M:%S")
 
                         ans = date_close - date_create
                         duration =  float(ans.days) + (float(ans.seconds) / 86400)
-                res[lead.id][field] = abs(int(duration))
+                res[project.id][field] = abs(int(duration))
         return res
 
     _columns = {

From 2b0fa9790c8fda4970b6d40126c7b7f1a09a087b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 5 Apr 2010 14:51:36 +0530
Subject: [PATCH 209/248] [REM]: crm: Removed unused fields in demo data,
 Removed wizard file

bzr revid: rpa@tinyerp.com-20100405092136-9slq640gkhucb8t0
---
 addons/crm/__terp__.py              |  1 -
 addons/crm/crm_lead_demo.xml        | 34 ++++++++++++-----------------
 addons/crm/crm_opportunity_demo.xml | 10 ---------
 addons/crm/crm_opportunity_view.xml |  2 +-
 addons/crm/crm_wizard.xml           |  6 -----
 5 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 addons/crm/crm_wizard.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 232c8383361..f84d5bd5b69 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -74,7 +74,6 @@ between mails and Open ERP.""",
 
         'wizard/crm_send_email_view.xml',
         'wizard/crm_email_add_cc_view.xml',
-        'crm_wizard.xml',
         'crm_view.xml',
 
         'crm_action_rule_view.xml',
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index ab2ad042bce..bc6638601c2 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -13,13 +13,12 @@
             <field eval="'Luc Latour'" name="name"/>
             <field eval="'open'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Michel Lafont'" name="partner_name2"/>
-            <field eval="'(726) 782-0636'" name="partner_mobile"/>
+            <field eval="'(726) 782-0636'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="'The Oil Company'" name="partner_name"/>
-            <field eval="'(769) 703-274'" name="partner_phone"/>
+            <field eval="'(769) 703-274'" name="phone"/>
         </record>
         <record id="crm_case_electonicgoodsdealer0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead7"/>
@@ -28,13 +27,12 @@
             <field eval="'Marc Dufour'" name="name"/>
             <field eval="'open'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Luc Latour'" name="partner_name2"/>
-            <field eval="'(392) 895-7917'" name="partner_mobile"/>
+            <field eval="'(392) 895-7917'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
             <field eval="'Le Club SARL'" name="partner_name"/>
-            <field eval="'(956) 293-2595'" name="partner_phone"/>
+            <field eval="'(956) 293-2595'" name="phone"/>
         </record>
         <record id="crm_case_developingwebapplications0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead5"/>
@@ -43,13 +41,12 @@
             <field eval="'Fabien Pinckaers'" name="name"/>
             <field eval="'done'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Mike Gardner'" name="partner_name2"/>
-            <field eval="'(820) 167-3208'" name="partner_mobile"/>
+            <field eval="'(820) 167-3208'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="'TheKompany'" name="partner_name"/>
-            <field eval="'(079) 681-2139'" name="partner_phone"/>
+            <field eval="'(079) 681-2139'" name="phone"/>
             <field eval="'contact@tecsas.fr'" name="email_from"/>
         </record>
         <record id="crm_case_qrecorp0" model="crm.lead">
@@ -59,12 +56,12 @@
             <field eval="'Henry Mc Coy'" name="name"/>
             <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'(077) 582-4035'" name="partner_mobile"/>
+            <field eval="'(077) 582-4035'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="'The Gas Company'" name="partner_name"/>
-            <field eval="'(514) 698-4118'" name="partner_phone"/>
+            <field eval="'(514) 698-4118'" name="phone"/>
         </record>
         <record id="crm_case_itdeveloper0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead4"/>
@@ -73,13 +70,12 @@
             <field eval="'Carrie Helle'" name="name"/>
             <field eval="'pending'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Sam Stone'" name="partner_name2"/>
-            <field eval="'(333) 715-1450'" name="partner_mobile"/>
+            <field eval="'(333) 715-1450'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="'Stonage IT'" name="partner_name"/>
-            <field eval="'(855) 924-4364'" name="partner_phone"/>
+            <field eval="'(855) 924-4364'" name="phone"/>
         </record>
         <record id="crm_case_mgroperations0" model="crm.lead">
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
@@ -91,12 +87,11 @@
             <field eval="'Tina Pinero'" name="name"/>
             <field eval="'cancel'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Benoit Mortier'" name="partner_name2"/>
-            <field eval="'(468) 017-2684'" name="partner_mobile"/>
+            <field eval="'(468) 017-2684'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor8"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="'Opensides SPRL'" name="partner_name"/>
-            <field eval="'(373) 907-1009'" name="partner_phone"/>
+            <field eval="'(373) 907-1009'" name="phone"/>
             <field eval="'info@opensides.be'" name="email_from"/>
         </record>
         <record id="crm_case_vpoperations0" model="crm.lead">
@@ -107,12 +102,11 @@
             <field eval="'Wendi Baltz'" name="name"/>
             <field eval="'done'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="'Will Smith'" name="partner_name2"/>
-            <field eval="'(463) 014-1208'" name="partner_mobile"/>
+            <field eval="'(463) 014-1208'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="'Gardner Group'" name="partner_name"/>
-            <field eval="'(282) 603-7489'" name="partner_phone"/>
+            <field eval="'(282) 603-7489'" name="phone"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index 08976720a0f..e88e0f1ec8e 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -11,13 +11,11 @@
             <field eval="60" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_zen"/>
             <field eval="1" name="active"/>
-            <field eval="17.0" name="duration"/>
             <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;open&quot;" name="state"/>
-            <field eval="75000.0" name="planned_cost"/>
             <field eval="85000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-07 10:05:15')" name="date"/>
@@ -33,10 +31,8 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
-            <field eval="30000.0" name="planned_cost"/>
             <field eval="45000.0" name="planned_revenue"/>
             <field eval="50" name="probability"/>
-            <field eval="8.0" name="duration"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-05 12:25:15')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
@@ -52,10 +48,8 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;pending&quot;" name="state"/>
-            <field eval="50000.0" name="planned_cost"/>
             <field eval="55000.0" name="planned_revenue"/>
             <field eval="70" name="probability"/>
-            <field eval="10.0" name="duration"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-14 13:55:10')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor7"/>
@@ -72,9 +66,7 @@
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
-            <field eval="50000.0" name="planned_cost"/>
             <field eval="45000.0" name="planned_revenue"/>
-            <field eval="24.0" name="duration"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-23 16:32:23')" name="date"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
@@ -86,12 +78,10 @@
             <field eval="80" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_wong"/>
             <field eval="1" name="active"/>
-            <field eval="2.25" name="duration"/>
             <field name="partner_id" ref="base.res_partner_maxtor"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
-            <field eval="25000.0" name="planned_cost"/>
             <field eval="42000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="time.strftime('%Y-%m-25 16:05:15')" name="date"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index fb2a9eaba5f..c208a91832b 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -248,7 +248,7 @@
         <field name="arch" type="xml">
             <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
                 <field name="categ_id"/>
-                <field name="planned_cost" operator="+"/>
+                <field name="planned_revenue" operator="+"/>
                 <field name="state" group="True"/>
             </graph>
         </field>
diff --git a/addons/crm/crm_wizard.xml b/addons/crm/crm_wizard.xml
deleted file mode 100644
index abcb8520c66..00000000000
--- a/addons/crm/crm_wizard.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        
-    </data>
-</openerp>

From 568eedfc95ba22b3eea2a190f3c3a4ee28bce5a2 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 5 Apr 2010 15:20:29 +0530
Subject: [PATCH 210/248] [IMP]: crm project_issue: Apply some changes and
 function

bzr revid: ksa@tinyerp.co.in-20100405095029-mc4vh0k66c8zfj6m
---
 addons/crm/crm.py                     |  1 -
 addons/crm/crm_lead.py                | 20 ++++++++++++++++++++
 addons/crm/crm_opportunity.py         | 19 +++++++++++++++++++
 addons/project_issue/project_issue.py | 19 +++++++++++++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 8271ab025d2..3cebf30f3c3 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -747,7 +747,6 @@ class crm_case(osv.osv):
             data = {'state': 'open', 'active': True}
             if not case.user_id:
                 data['user_id'] = uid
-            data.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
             self.write(cr, uid, ids, data)
         self._action(cr, uid, cases, 'open')
         return True
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 73fd420aa63..8863791a28c 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -23,6 +23,7 @@ from osv import fields, osv, orm
 from datetime import datetime, timedelta
 import crm
 import math
+import time
 from mx import DateTime
 from tools.translate import _
 
@@ -34,6 +35,25 @@ class crm_lead(osv.osv):
     _order = "priority desc, id desc"
     _inherit = ['res.partner.address', 'crm.case']
 
+    def case_open(self, cr, uid, ids, *args):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
+        cases = self.browse(cr, uid, ids)
+        for case in cases:
+            data = {'state': 'open', 'active': True}
+            if not case.user_id:
+                data['user_id'] = uid
+            data.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+            self.write(cr, uid, ids, data)
+        self._action(cr, uid, cases, 'open')
+        return True
+
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
         @param cr: the current row, from the database cursor,
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index e11aaedee09..0e635886e1c 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -40,6 +40,25 @@ class crm_opportunity(osv.osv):
     _order = "id desc"
     _inherit = 'crm.case'
 
+    def case_open(self, cr, uid, ids, *args):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
+        cases = self.browse(cr, uid, ids)
+        for case in cases:
+            data = {'state': 'open', 'active': True}
+            if not case.user_id:
+                data['user_id'] = uid
+            data.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+            self.write(cr, uid, ids, data)
+        self._action(cr, uid, cases, 'open')
+        return True
+
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
         @param cr: the current row, from the database cursor,
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 248122ad854..f566e357dfd 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -37,6 +37,25 @@ class project_issue(osv.osv):
     _order = "priority, id desc"
     _inherit = 'crm.case'
 
+    def case_open(self, cr, uid, ids, *args):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+
+        cases = self.browse(cr, uid, ids)
+        for case in cases:
+            data = {'state': 'open', 'active': True}
+            if not case.user_id:
+                data['user_id'] = uid
+            data.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+            self.write(cr, uid, ids, data)
+        self._action(cr, uid, cases, 'open')
+        return True
+
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
         @param cr: the current row, from the database cursor,

From edeff81c49cfefe130127c4b8b61ee976019f310 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 5 Apr 2010 15:44:12 +0530
Subject: [PATCH 211/248] [IMP] auction: Code optimization and improvements.

bzr revid: uco@tinyerp.co.in-20100405101412-9vemft1la0018i46
---
 addons/auction/auction.py                     | 40 +++++-----
 .../wizard/auction_catalog_flagey_report.py   | 18 ++++-
 .../wizard/auction_lots_auction_move.py       | 24 +++---
 addons/auction/wizard/auction_lots_enable.py  | 12 +--
 .../wizard/auction_lots_make_invoice.py       | 77 +++++++++----------
 .../wizard/auction_lots_make_invoice_buyer.py | 63 +++++++--------
 addons/auction/wizard/auction_pay_buy.py      | 62 +++++++--------
 addons/auction/wizard/auction_pay_sel.py      | 30 +++-----
 addons/auction/wizard/auction_payer_sel.py    |  7 --
 addons/auction/wizard/auction_taken.py        |  6 +-
 .../wizard/auction_transfer_unsold_object.py  | 22 +++---
 11 files changed, 165 insertions(+), 196 deletions(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 854c917ee68..cf5f27775df 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -96,15 +96,16 @@ class auction_dates(osv.osv):
         """
         # objects vendus mais non factures
         #TODO: convert this query to tiny API
+        lots_obj = self.pool.get('auction.lots')
         cr.execute('select count(*) as c from auction_lots where auction_id =ANY(%s) and state=%s and obj_price>0', (ids,'draft',))
         nbr = cr.fetchone()[0]
         ach_uids = {}
         cr.execute('select id from auction_lots where auction_id =ANY(%s) and state=%s and obj_price>0', (ids,'draft',))
-        r=self.pool.get('auction.lots').lots_invoice(cr, uid, [x[0] for x in cr.fetchall()],{},None)
+        r = lots_obj.lots_invoice(cr, uid, [x[0] for x in cr.fetchall()],{},None)
         cr.execute('select id from auction_lots where auction_id =ANY(%s) and obj_price>0',(ids,))
         ids2 = [x[0] for x in cr.fetchall()]
     #   for auction in auction_ids:
-        c=self.pool.get('auction.lots').seller_trans_create(cr, uid, ids2,{})
+        c = lots_obj.seller_trans_create(cr, uid, ids2,{})
         self.write(cr, uid, ids, {'state':'closed'}) #close the auction
         return True
 auction_dates()
@@ -509,14 +510,14 @@ class auction_lots(osv.osv):
 ##CHECKME: est-ce que ca vaudrait la peine de faire des groupes de lots qui ont les memes couts pour passer des listes de lots a compute?
         taxes = []
         amount=0.0
-    #   pt_tax=pool.get('account.tax')
+        pt_tax = self.pool.get('account.tax')
         for lot in lots:
             taxes = lot.product_id.taxes_id
             if lot.author_right:
                 taxes.append(lot.author_right)
             elif lot.auction_id:
                 taxes += lot.auction_id.buyer_costs
-            tax=self.pool.get('account.tax').compute(cr,uid,taxes,lot.obj_price,1)
+            tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1)
             for t in tax:
                 amount+=t['amount']
             #amount+=lot.obj_price*0.2
@@ -631,18 +632,20 @@ class auction_lots(osv.osv):
 
     def buyer_proforma(self,cr,uid,ids,context):
         invoices = {}
-        inv_ref=self.pool.get('account.invoice')
+        inv_ref = self.pool.get('account.invoice')
+        partner_r = self.pool.get('res.partner')
+        inv_line_obj = self.pool.get('account.invoice.line')
+        wf_service = netsvc.LocalService('workflow')
 #       acc_receiv=self.pool.get('account.account').search([cr,uid,[('code','=','4010')]])
         for lot in self.browse(cr,uid,ids,context):
             if not lot.obj_price>0:
                 continue
-            partner_r=self.pool.get('res.partner')
             if not lot.ach_uid.id:
                 raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,))
             else:
                 partner_ref =lot.ach_uid.id
                 lot_name = lot.obj_num
-                res = self.pool.get('res.partner').address_get(cr, uid, [partner_ref], ['contact', 'invoice'])
+                res = partner_r.address_get(cr, uid, [partner_ref], ['contact', 'invoice'])
                 contact_addr_id = res['contact']
                 invoice_addr_id = res['invoice']
                 if not invoice_addr_id:
@@ -676,12 +679,11 @@ class auction_lots(osv.osv):
                     'account_id': lot.auction_id.acc_income.id,
                     'price_unit': lot.obj_price,
                 }
-                self.pool.get('account.invoice.line').create(cr, uid, inv_line,context)
+                inv_line_obj.create(cr, uid, inv_line,context)
             #   inv_ref.button_compute(cr, uid, [inv_id])
             #   wf_service = netsvc.LocalService('workflow')
             #   wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
             inv_ref.button_compute(cr, uid, invoice.values())
-            wf_service = netsvc.LocalService('workflow')
             wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma', cr)
         return invoices.values()
 
@@ -695,6 +697,9 @@ class auction_lots(osv.osv):
         # use each list of object in turn
         invoices = {}
         inv_ref=self.pool.get('account.invoice')
+        partner_obj = self.pool.get('res.partner')
+        inv_line_obj = self.pool.get('account.invoice.line')
+        wf_service = netsvc.LocalService('workflow')
         for lot in self.browse(cr,uid,ids,context):
             partner_id = lot.bord_vnd_id.partner_id.id
             if not lot.auction_id.id:
@@ -703,7 +708,7 @@ class auction_lots(osv.osv):
             if lot.bord_vnd_id.id in invoices:
                 inv_id = invoices[lot.bord_vnd_id.id]
             else:
-                res = self.pool.get('res.partner').address_get(cr, uid, [lot.bord_vnd_id.partner_id.id], ['contact', 'invoice'])
+                res = partner_obj.address_get(cr, uid, [lot.bord_vnd_id.partner_id.id], ['contact', 'invoice'])
                 contact_addr_id = res['contact']
                 invoice_addr_id = res['invoice']
                 inv = {
@@ -735,13 +740,12 @@ class auction_lots(osv.osv):
                 'account_id': lot.auction_id.acc_expense.id,
                 'price_unit': lot.obj_price,
             }
-            self.pool.get('account.invoice.line').create(cr, uid, inv_line,context)
+            inv_line_obj.create(cr, uid, inv_line,context)
             inv_ref.button_compute(cr, uid, invoices.values())
         for inv in inv_ref.browse(cr, uid, invoices.values(), context):
             inv_ref.write(cr, uid, [inv.id], {
                 'check_total': inv.amount_total
             })
-            wf_service = netsvc.LocalService('workflow')
             wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_open', cr)
         return invoices.values()
 
@@ -757,13 +761,15 @@ class auction_lots(osv.osv):
             RETURN: id of generated invoice
         """
         dt = time.strftime('%Y-%m-%d')
-        inv_ref=self.pool.get('account.invoice')
+        inv_ref = self.pool.get('account.invoice')
+        partner_r = self.pool.get('res.partner')
+        inv_line_obj = self.pool.get('account.invoice.line')
+        wf_service = netsvc.LocalService('workflow')
         invoices={}
         for lot in self.browse(cr, uid, ids,context):
         #   partner_ref = lot.ach_uid.id
             if not lot.auction_id.id:
                 continue
-            partner_r=self.pool.get('res.partner')
             if not lot.ach_uid.id:
                 raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,))
             if (lot.auction_id.id,lot.ach_uid.id) in invoices:
@@ -774,13 +780,12 @@ class auction_lots(osv.osv):
                     raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Invoice Address.'))
                 price = lot.obj_price or 0.0
                 lot_name =lot.obj_num
-                inv={
+                inv = {
                     'name':lot.auction_id.name or '',
                     'reference': lot.ach_login,
                     'journal_id': lot.auction_id.journal_id.id,
                     'partner_id': lot.ach_uid.id,
                     'type': 'out_invoice',
-
                 }
                 if invoice_number:
                     inv['number'] = invoice_number
@@ -805,12 +810,11 @@ class auction_lots(osv.osv):
                 'account_id': lot.auction_id.acc_income.id,
                 'price_unit': lot.obj_price,
             }
-            self.pool.get('account.invoice.line').create(cr, uid, inv_line,context)
+            inv_line_obj.create(cr, uid, inv_line,context)
     #   inv_ref.button_compute(cr, uid, [inpq tu dis cav_id])
     #       inv_ref.button_compute(cr, uid, [inv_id])
             inv_ref.button_compute(cr, uid, [inv_id])
         for l in  inv_ref.browse(cr, uid, invoices.values(), context):
-            wf_service = netsvc.LocalService('workflow')
         #   wf_service.trg_validate(uid, 'account.invoice',l.id, 'invoice_proforma', cr)
             wf_service.trg_validate(uid, 'account.invoice',l.id, 'invoice_open', cr)
         return invoices.values()
diff --git a/addons/auction/wizard/auction_catalog_flagey_report.py b/addons/auction/wizard/auction_catalog_flagey_report.py
index 119c3273ee0..d8fec4b6d95 100644
--- a/addons/auction/wizard/auction_catalog_flagey_report.py
+++ b/addons/auction/wizard/auction_catalog_flagey_report.py
@@ -40,9 +40,21 @@ class auction_catalog_flagey(osv.osv_memory):
         return res
     
     def view_init(self, cr, uid, fields, context):
-        current_auction = self.pool.get('auction.dates').browse(cr,uid,context.get('active_ids', []))
-        v_lots = self.pool.get('auction.lots').search(cr,uid,[('auction_id','=',current_auction.id)])
-        v_ids = self.pool.get('auction.lots').browse(cr,uid,v_lots)
+        """ 
+         Creates view dynamically, adding fields at runtime, raises exception
+         at the time of initialization of view.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values
+         @param context: A standard dictionary 
+         @return: New arch of view with new columns.
+        """
+        lots_obj = self.pool.get('auction.lots')
+        auc_dates_obj = self.pool.get('auction.dates')
+        current_auction = auc_dates_obj.browse(cr,uid,context.get('active_ids', []))
+        v_lots = lots_obj.search(cr,uid,[('auction_id','=',current_auction.id)])
+        v_ids = lots_obj.browse(cr,uid,v_lots)
         for ab in v_ids:
             if not ab.auction_id :
                 raise osv.except_osv('Error!','No Lots belong to this Auction Date')
diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py
index 24b2604d1d7..d1303be0887 100644
--- a/addons/auction/wizard/auction_lots_auction_move.py
+++ b/addons/auction/wizard/auction_lots_auction_move.py
@@ -32,16 +32,16 @@ class auction_lots_auction_move(osv.osv_memory):
     _name = "auction.lots.auction.move"
     _description = "Auction move "
     _columns= {
-               'auction_id':fields.many2one('auction.dates', 'Auction Date', required=True), 
-               }
+        'auction_id':fields.many2one('auction.dates', 'Auction Date', required=True), 
+    }
     
-    def _top(self, cr, uid, ids, context={}):
-        refs = self.pool.get('auction.lots')
-        rec_ids = refs.browse(cr, uid, context['active_ids'])
-        for rec in rec_ids:
-            if not rec.auction_id:
-                raise osv.except_osv('Error !', 'You can not move a lot that has no auction date')
-        return {}
+#    def _top(self, cr, uid, ids, context={}):
+#        refs = self.pool.get('auction.lots')
+#        rec_ids = refs.browse(cr, uid, context['active_ids'])
+#        for rec in rec_ids:
+#            if not rec.auction_id:
+#                raise osv.except_osv('Error !', 'You can not move a lot that has no auction date')
+#        return {}
     
     def auction_move_set(self, cr, uid, ids, context={}):
         """
@@ -56,13 +56,13 @@ class auction_lots_auction_move(osv.osv_memory):
         auction_bid_line_obj = self.pool.get('auction.bid_line')
         auction_lot_history_obj = self.pool.get('auction.lot.history')
         auction_lots_obj = self.pool.get('auction.lots')
+        rec_ids = refs.browse(cr, uid, context['active_ids'])
         for datas in self.read(cr, uid, ids):
             if not (datas['auction_id'] and len(context['active_ids'])) :
                 return {}
             
-            rec_ids = refs.browse(cr, uid, context['active_ids'])
-            line_ids = auction_bid_line_obj.search(cr, uid, [('lot_id', 'in', context['active_ids'])])
-        #   pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
+#           line_ids = auction_bid_line_obj.search(cr, uid, [('lot_id', 'in', context['active_ids'])])
+#           pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
             for rec in rec_ids:
                 new_id = auction_lot_history_obj.create(cr, uid, {
                     'auction_id': rec.auction_id.id, 
diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py
index e8aa5edadf5..65cb0c4d49e 100644
--- a/addons/auction/wizard/auction_lots_enable.py
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -19,20 +19,14 @@
 #
 ##############################################################################
 from osv import fields, osv
-from tools.translate import _
-import netsvc
-import pooler
-import time
-import tools
-import wizard
 
 class auction_lots_enable(osv.osv_memory):
-   
     _name = "auction.lots.enable"
     _description = "Lots Enable"
+    
     _columns= {
-               'confirm_en':fields.integer('Catalog Number')
-               }
+        'confirm_en':fields.integer('Catalog Number')
+    }
     
     def confirm_enable(self, cr, uid, ids, context={}):
         """
diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index 6be49f7336a..8cda461e186 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -27,20 +27,29 @@ import tools
 import wizard
 
 class auction_lots_make_invoice(osv.osv_memory):
+    _name = "auction.lots.make.invoice"
+    _description = "Make invoice"
     
+    _columns = {
+       'amount': fields.float('Invoiced Amount', required =True, readonly=True), 
+       'objects':fields.integer('# of objects', required =True, readonly=True), 
+       'number':fields.char('Invoice Number', size=64), 
+              
+    }
+    
+    _defaults = {
+       'number': lambda *a: False, 
+    }
     
     def default_get(self, cr, uid, fields, context):
         """ 
-              To get default values for the object.
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param fields: List of fields for which we want default values 
-             @param context: A standard dictionary 
-             
-             @return: A dictionary which of fields with values. 
-        
+        To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values 
+        @param context: A standard dictionary 
+        @return: A dictionary which of fields with values. 
         """        
         res = super(auction_lots_make_invoice, self).default_get(cr, uid, fields, context=context) 
         for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
@@ -53,7 +62,7 @@ class auction_lots_make_invoice(osv.osv_memory):
     
     def makeInvoices(self, cr, uid, ids, context):
         """
-        seller invoice :Create an invoice.
+        Seller invoice :Create an invoice.
         @param cr: the current row, from the database cursor.
         @param uid: the current user’s ID for security checks.
         @param ids: List of Auction lots make invoice’s IDs
@@ -61,36 +70,20 @@ class auction_lots_make_invoice(osv.osv_memory):
         """
         order_obj = self.pool.get('auction.lots')
         mod_obj = self.pool.get('ir.model.data') 
-    
-        for data in self.read(cr, uid, ids):
-            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-            id = mod_obj.read(cr, uid, result, ['res_id'])
-            newinv = []
-            ids = order_obj.seller_trans_create(cr, uid, context['active_ids'], context)
-            cr.commit()
-            return {
-                'domain': "[('id','in', ["+','.join(map(str, ids))+"])]", 
-                'name': 'Seller invoices', 
-                'view_type': 'form', 
-                'view_mode': 'tree,form', 
-                'res_model': 'account.invoice', 
-                'view_id': False, 
-                'context': "{'type':'out_refund'}", 
-                'type': 'ir.actions.act_window', 
-                'search_view_id': id['res_id']        
-                }
+        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+        lots_ids = order_obj.seller_trans_create(cr, uid, context['active_ids'], context)
+        cr.commit()
+        return {
+            'domain': "[('id','in', ["+','.join(map(str, lots_ids))+"])]", 
+            'name': 'Seller invoices', 
+            'view_type': 'form', 
+            'view_mode': 'tree,form', 
+            'res_model': 'account.invoice', 
+            'view_id': False, 
+            'context': "{'type':'out_refund'}", 
+            'type': 'ir.actions.act_window', 
+            'search_view_id': id['res_id']        
+        }
             
-    _name = "auction.lots.make.invoice"
-    _description = "Make invoice"
-    _columns= {
-               'amount': fields.float('Invoiced Amount', required =True, readonly=True), 
-               'objects':fields.integer('# of objects', required =True, readonly=True), 
-               'number':fields.char('Invoice Number', size=64), 
-              
-               }
-    _defaults={
-               'number':lambda *a: False, 
-               
-               }
-
 auction_lots_make_invoice()
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index 53c3519d225..5d2e370a81e 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -19,27 +19,31 @@
 #
 ##############################################################################
 from osv import fields, osv
-from tools.translate import _
-import netsvc
-import pooler
-import time
-import tools
-import wizard
 
 class auction_lots_make_invoice_buyer(osv.osv_memory):
+    _name = "auction.lots.make.invoice.buyer"
+    _description = "Make invoice buyer "
+    
+    _columns= {
+       'amount': fields.float('Invoiced Amount', required =True, readonly=True), 
+       'objects':fields.integer('# of objects', required =True, readonly=True), 
+       'number':fields.char('Invoice Number', size=64), 
+       'buyer_id':fields.many2one('res.partner', 'Buyer', required=True), 
+    }
+
+    _defaults={
+       'number': lambda *a: False,
+    }
     
     def default_get(self, cr, uid, fields, context):
         """ 
-             To get default values for the object.
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param fields: List of fields for which we want default values 
-             @param context: A standard dictionary 
-             
-             @return: A dictionary which of fields with values. 
-        
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
         """        
         res = super(auction_lots_make_invoice_buyer, self).default_get(cr, uid, fields, context=context)
         for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
@@ -59,22 +63,19 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
         @param ids: List of Auction lots make invoice buyer’s IDs
         @return: dictionary of  account invoice form.
         """    
-        newinv = []
-
         order_obj = self.pool.get('auction.lots')
         mod_obj = self.pool.get('ir.model.data') 
-        
+        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+        id = mod_obj.read(cr, uid, result, ['res_id'])
+        lots = order_obj.browse(cr, uid, context['active_ids'])
         for data in self.read(cr, uid, ids):            
-            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-            id = mod_obj.read(cr, uid, result, ['res_id'])
-            lots = order_obj.browse(cr, uid, context['active_ids'])
             invoice_number = data['number']
             for lot in lots:
-                up_auction = order_obj.write(cr, uid, [lot.id], {'ach_uid':data['buyer_id']})
-            ids = order_obj.lots_invoice(cr, uid, context['active_ids'], context, data['number'])
+                up_auction = order_obj.write(cr, uid, [lot.id], {'ach_uid': data['buyer_id']})
+            lots_ids = order_obj.lots_invoice(cr, uid, context['active_ids'], context, data['number'])
             cr.commit()
             return  {
-                'domain': "[('id','in', ["+','.join(map(str, ids))+"])]", 
+                'domain': "[('id','in', ["+','.join(map(str, lots_ids))+"])]", 
                 'name': 'Buyer invoices', 
                 'view_type': 'form', 
                 'view_mode': 'tree,form', 
@@ -84,17 +85,5 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
                 'type': 'ir.actions.act_window', 
                 'search_view_id': id['res_id']         
             }
-            
-    _name = "auction.lots.make.invoice.buyer"
-    _description = "Make invoice buyer "
-    _columns= {
-               'amount': fields.float('Invoiced Amount', required =True, readonly=True), 
-               'objects':fields.integer('# of objects', required =True, readonly=True), 
-               'number':fields.char('Invoice Number', size=64), 
-               'buyer_id':fields.many2one('res.partner', 'Buyer', required=True), 
-               }
-    _defaults={
-               'number':lambda *a: False,
-               }
 
 auction_lots_make_invoice_buyer()
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index 8f16ea9e7de..28028f45538 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -21,26 +21,33 @@
 
 from osv import fields, osv
 from tools.translate import _
-import netsvc
-import pooler
 import time
 import tools
-import wizard
 
 class auction_pay_buy(osv.osv_memory):
+    _name = "auction.pay.buy"
+    _description = "Pay buy"
+    
+    _columns= {
+       'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
+       'buyer_id':fields.many2one('res.partner', 'Buyer'), 
+       'statement_id1':fields.many2one('account.bank.statement', 'Statement', required=True), 
+       'amount2': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
+       'statement_id2':fields.many2one('account.bank.statement', 'Statement'), 
+       'amount3': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy']))), 
+       'statement_id3':fields.many2one('account.bank.statement', 'Statement'), 
+       'total': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy'])), readonly =True), 
+    }
     
     def default_get(self, cr, uid, fields, context):
         """ 
-             To get default values for the object.
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param fields: List of fields for which we want default values 
-             @param context: A standard dictionary 
-             
-             @return: A dictionary which of fields with values. 
-        
+         To get default values for the object.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param fields: List of fields for which we want default values 
+         @param context: A standard dictionary 
+         @return: A dictionary which of fields with values. 
         """        
         res = super(auction_pay_buy, self).default_get(cr, uid, fields, context=context)       
         for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
@@ -54,13 +61,12 @@ class auction_pay_buy(osv.osv_memory):
     
     def pay_and_reconcile(self, cr, uid, ids, context):
         """
-            Pay and Reconcile
-            
-            @param cr: the current row, from the database cursor.
-            @param uid: the current user’s ID for security checks.
-            @param ids: the ID or list of IDs
-            @param context: A standard dictionary 
-            @return: 
+        Pay and Reconcile
+        @param cr: the current row, from the database cursor.
+        @param uid: the current user’s ID for security checks.
+        @param ids: the ID or list of IDs
+        @param context: A standard dictionary 
+        @return: 
         """        
         lot_obj = self.pool.get('auction.lots')
         bank_statement_line_obj = self.pool.get('account.bank.statement.line')
@@ -94,22 +100,8 @@ class auction_pay_buy(osv.osv_memory):
                     for lot in lots:
                         lot_obj.write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]})
             return {}
-   
-    _name = "auction.pay.buy"
-    _description = "Pay buy"
-    _columns= {
-               'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
-               'buyer_id':fields.many2one('res.partner', 'Buyer'), 
-               'statement_id1':fields.many2one('account.bank.statement', 'Statement', required=True), 
-               'amount2': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
-               'statement_id2':fields.many2one('account.bank.statement', 'Statement'), 
-               'amount3': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy']))), 
-               'statement_id3':fields.many2one('account.bank.statement', 'Statement'), 
-               'total': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy'])), readonly =True), 
-               }
+    
 auction_pay_buy()
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index df7b4a794f3..6873092c7e9 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -20,33 +20,27 @@
 ##############################################################################
 from osv import fields, osv
 from tools.translate import _
-import netsvc
-import pooler
-import time
 import tools
-import wizard
 
 class auction_pay_sel(osv.osv_memory):
-   
     _name = "auction.pay.sel"
     _description = "Pay Invoice"
+    
     _columns= {
-               'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy'])), required=True), 
-               'dest_account_id':fields.many2one('account.account', 'Payment to Account', required=True, domain= [('type', '=', 'cash')]), 
-               'journal_id':fields.many2one('account.journal', 'Journal', required=True), 
-               'period_id':fields.many2one('account.period', 'Period', required=True), 
-               }
+       'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy'])), required=True), 
+       'dest_account_id':fields.many2one('account.account', 'Payment to Account', required=True, domain= [('type', '=', 'cash')]), 
+       'journal_id':fields.many2one('account.journal', 'Journal', required=True), 
+       'period_id':fields.many2one('account.period', 'Period', required=True), 
+    }
     
     def pay_and_reconcile(self, cr, uid, ids, context):
-        
         """
-            Pay and Reconcile
-            
-            @param cr: the current row, from the database cursor.
-            @param uid: the current user’s ID for security checks.
-            @param ids: the ID or list of IDs
-            @param context: A standard dictionary 
-            @return: 
+        Pay and Reconcile
+        @param cr: the current row, from the database cursor.
+        @param uid: the current user’s ID for security checks.
+        @param ids: the ID or list of IDs
+        @param context: A standard dictionary 
+        @return: 
         """          
         lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context)
         invoice_obj = self.pool.get('account.invoice')
diff --git a/addons/auction/wizard/auction_payer_sel.py b/addons/auction/wizard/auction_payer_sel.py
index 349f10d4dec..c422ee91857 100644
--- a/addons/auction/wizard/auction_payer_sel.py
+++ b/addons/auction/wizard/auction_payer_sel.py
@@ -20,15 +20,8 @@
 ##############################################################################
 
 from osv import fields, osv
-from tools.translate import _
-import netsvc
-import pooler
-import time
-import tools
-import wizard
 
 class auction_payer(osv.osv_memory):
-
     _name = "auction.payer"
     _description = "Auction payer"
     
diff --git a/addons/auction/wizard/auction_taken.py b/addons/auction/wizard/auction_taken.py
index 63c3db7583c..005fd042646 100644
--- a/addons/auction/wizard/auction_taken.py
+++ b/addons/auction/wizard/auction_taken.py
@@ -32,10 +32,10 @@ class auction_taken(osv.osv_memory):
     """
     _name = "auction.taken"
     _description = "Auction taken"
+    
     _columns = {
-              'lot_ids':fields.many2many('auction.lots', 'auction_taken_rel', 'taken_id', 'lot_id', 'Lots Emportes'), 
-              
-              }
+        'lot_ids':fields.many2many('auction.lots', 'auction_taken_rel', 'taken_id', 'lot_id', 'Lots Emportes'), 
+    }
     
     def _to_xml(s):
         return s.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py
index 9beb4893560..47aadc25d59 100644
--- a/addons/auction/wizard/auction_transfer_unsold_object.py
+++ b/addons/auction/wizard/auction_transfer_unsold_object.py
@@ -29,10 +29,18 @@ class auction_transfer_unsold_object(osv.osv):
         _name = 'auction.transfer.unsold.object'
         _description = 'To transfer unsold objects'
         
+        _columns = {
+                'auction_id_from':fields.many2one('auction.dates', 'From Auction Date', required=True),
+                'auction_id_to':fields.many2one('auction.dates', 'To Auction Date', required=True),
+        }
+
+        _defaults = {
+            'auction_id_from': _start,
+        }
+        
         def _start(self, cr, uid, context):
             """ 
             To initialize auction_id_from
-    
             @param self: The object pointer.
             @param cr: A database cursor
             @param uid: ID of the user currently logged in
@@ -48,14 +56,12 @@ class auction_transfer_unsold_object(osv.osv):
         def transfer_unsold_object(self, cr, uid, ids, context):
             """ 
             To Transfer the unsold object
-    
             @param self: The object pointer.
             @param cr: A database cursor
             @param uid: ID of the user currently logged in
             @param ids: List of IDs selected 
             @param context: A standard dictionary 
             @return: 
-    
             """
             bid_line_obj = self.pool.get('auction.bid_line')
             lots_obj = self.pool.get('auction.lots')
@@ -76,13 +82,5 @@ class auction_transfer_unsold_object(osv.osv):
                                                                                                 'sel_inv_id':None,
                                                                                                 'state':'draft'})
             return {}    
-    
-        _columns = {
-                'auction_id_from':fields.many2one('auction.dates', 'From Auction Date', required=True),
-                'auction_id_to':fields.many2one('auction.dates', 'To Auction Date', required=True),
-        }
-
-        _defaults = {
-            'auction_id_from': _start,
-        }
+        
 auction_transfer_unsold_object()
\ No newline at end of file

From ddfd414eebb87321c548d4d96d1dcb2a4b414e67 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 5 Apr 2010 15:45:37 +0530
Subject: [PATCH 212/248] [IMP]: crm: Apply some changes

bzr revid: ksa@tinyerp.co.in-20100405101537-x56v01knl23elpdw
---
 addons/crm/crm_opportunity.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 0e635886e1c..a13eade4427 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -23,6 +23,7 @@ from datetime import datetime
 from osv import fields,osv,orm
 from tools.translate import _
 import crm
+import time
 
 AVAILABLE_STATES = [
     ('draft','New'),

From d0ccd0209e2d9b07f2db9b438ec0f1ed3490452c Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 5 Apr 2010 15:47:04 +0530
Subject: [PATCH 213/248] [REM] Project: New Project Based on Template removed
 (Merge with osv object no need to wizard file) [IMP] Project: modify
 duplicate template method on project to return new created project form
 (Removed old wizard)

bzr revid: mra@tinyerp.com-20100405101704-npqhhsl4x6q15rvb
---
 addons/project/project.py                     | 26 ++++++-
 addons/project/project_view.xml               |  6 +-
 addons/project/project_wizard.xml             |  4 +-
 addons/project/wizard/__init__.py             |  1 -
 .../wizard/duplicate_template_wizard.py       | 71 -------------------
 5 files changed, 31 insertions(+), 77 deletions(-)
 delete mode 100644 addons/project/wizard/duplicate_template_wizard.py

diff --git a/addons/project/project.py b/addons/project/project.py
index 278646e097a..e34474233bb 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -190,10 +190,11 @@ class project(osv.osv):
 
     def duplicate_template(self, cr, uid, ids, context={}):
         project_obj = self.pool.get('project.project')
+        data_obj = self.pool.get('ir.model.data')
         task_obj = self.pool.get('project.task')
         result = []
         for proj in self.browse(cr, uid, ids, context=context):
-            parent_id = context.get('parent_id',False)
+            parent_id = context.get('parent_id',False) # check me where to pass context for parent id ??
             new_id = project_obj.copy(cr, uid, proj.id, default = {
                                     'name': proj.name +_(' (copy)'),
                                     'state':'open',
@@ -208,7 +209,28 @@ class project(osv.osv):
             child_ids = self.search(cr, uid, [('parent_id','=', proj.id)], context=context)
             if child_ids:
                 self.duplicate_template(cr, uid, child_ids, context={'parent_id': new_id})
-        return result
+
+        if result and len(result):
+            res_id = result[0]
+            form_view_id = data_obj._get_id(cr, uid, 'project', 'edit_project')
+            form_view = data_obj.read(cr, uid, form_view_id, ['res_id'])
+            tree_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_list')
+            tree_view = data_obj.read(cr, uid, tree_view_id, ['res_id'])
+            search_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_project_filter')
+            search_view = data_obj.read(cr, uid, search_view_id, ['res_id'])
+            return {
+                'name': _('Projects'),
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'project.project',
+                'view_id': False,
+                'res_id' : res_id,
+                'views': [(form_view['res_id'],'form'),(tree_view['res_id'],'tree')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': search_view['res_id'],
+                'nodestroy': True
+                }
+#        return result
 
     # set active value for a project, its sub projects and its tasks
     def setActive(self, cr, uid, ids, value=True, context={}):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 47cdefe3cee..91568f953ab 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -49,9 +49,13 @@
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                                <button
+                                <!--<button
                                     string="New Project Based on Template"
                                     name="%(wizard_duplicate_template)d"  type="action"
+                                    states="template" icon="gtk-new"/>-->
+								<button
+                                    string="New Project Based on Template"
+                                    name="duplicate_template"  type="object"
                                     states="template" icon="gtk-new"/>
                             </group>
                         </page>
diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml
index 0e9a5c8b3c1..934fa57ee9c 100644
--- a/addons/project/project_wizard.xml
+++ b/addons/project/project_wizard.xml
@@ -3,11 +3,11 @@
     <data>
         <!--<wizard id="wizard_close_task" menu="False" model="project.task" name="project.task.close" string="Close Task"/>-->
         <wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>
-        <wizard
+        <!--<wizard
             id="wizard_duplicate_template"
             menu="False"
             model="project.project"
             name="project.duplicate.template" string="Duplicate Template"/>
-
+-->
     </data>
 </openerp>
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index 5fd475d781d..6d48d9d45dd 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -21,7 +21,6 @@
 
 import project_close_task
 import task_delegate
-import duplicate_template_wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project/wizard/duplicate_template_wizard.py b/addons/project/wizard/duplicate_template_wizard.py
deleted file mode 100644
index 27a4ec4bd7d..00000000000
--- a/addons/project/wizard/duplicate_template_wizard.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from mx.DateTime import now
-
-import wizard
-import netsvc
-import ir
-import pooler
-import time
-
-from tools.translate import _
-
-class project_duplicate_template(wizard.interface):
-
-    def duplicate_template(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        project_obj = pool.get('project.project')
-        res = project_obj.duplicate_template(cr, uid, data['ids'])        
-        if res and len(res):
-            res_id = res[0]        
-            data_obj = pool.get('ir.model.data')                        
-            form_view_id = data_obj._get_id(cr, uid, 'project', 'edit_project')
-            form_view = data_obj.read(cr, uid, form_view_id, ['res_id']) 
-            tree_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_list')
-            tree_view = data_obj.read(cr, uid, tree_view_id, ['res_id']) 
-            search_view_id = data_obj._get_id(cr, uid, 'project', 'view_project_project_filter')
-            search_view = data_obj.read(cr, uid, search_view_id, ['res_id'])                        
-            return {            
-                'name': _('Projects'),
-                'view_type': 'form',
-                'view_mode': 'form,tree',
-                'res_model': 'project.project',
-                'view_id': False,
-                'res_id' : res_id,
-                'views': [(form_view['res_id'],'form'),(tree_view['res_id'],'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': search_view['res_id']
-                }
-        return {}
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': duplicate_template, 'state': 'order'}
-        },
-        'order': {
-            'actions': [],
-            'result': {'type': 'state', 'state': 'end'}
-        }
-    }
-project_duplicate_template('project.duplicate.template')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 329032007f155547697375811e3e3dd4701f7548 Mon Sep 17 00:00:00 2001
From: "KSA (OpenERP)" <>
Date: Mon, 5 Apr 2010 16:07:31 +0530
Subject: [PATCH 214/248] [IMP]: base_calendar: Implemented function that set
 rrule fields data based on rrule string

bzr revid: rpa@tinyerp.com-20100405103731-hajow02t4j444ur6
---
 addons/base_calendar/base_calendar.py | 107 +++++++++++++++++++++++---
 1 file changed, 95 insertions(+), 12 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index c639035ca0b..bcbe7aa95fd 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -37,12 +37,17 @@ months = {
 
 def get_recurrent_dates(rrulestring, exdate, startdate=None):
     """
-    Get recurrent dates
+    Get recurrent dates based on Rule string considering exdate and start date
+    @param rrulestring: Rulestring
+    @param exdate: List of exception dates for rrule
+    @param startdate: Startdate for computing recurrent dates
+    @return: List of Recurrent dates
     """
 
     def todate(date):
         val = parser.parse(''.join((re.compile('\d')).findall(date)))
         return val
+
     if not startdate:
         startdate = datetime.now()
     rset1 = rrule.rrulestr(rrulestring, dtstart=startdate, forceset=True)
@@ -55,12 +60,14 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None):
 
 def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
     """
-    Convert base calendar id into real id.
-    @return: base calendar id
+    This function converts virtual event id into real id of actual event
+    @param base_calendar_id: Id of calendar
+    @param with_date: If value passed to this param it will return dates based on value of withdate + base_calendar_id
     """
 
     if base_calendar_id and isinstance(base_calendar_id, (str, unicode)):
         res = base_calendar_id.split('-')
+
         if len(res) >= 2:
             real_id = res[0]
             if with_date:
@@ -70,11 +77,14 @@ def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
                 end = start + timedelta(hours=with_date)
                 return (int(real_id), real_date, end.strftime("%Y-%m-%d %H:%M:%S"))
             return int(real_id)
+
     return base_calendar_id and int(base_calendar_id) or base_calendar_id
 
 def real_id2base_calendar_id(real_id, recurrent_date):
     """
-    Convert  real id into base_calendar_id.
+    Convert  real id of record into virtual id using recurrent_date
+    e.g. real id is 1 and recurrent_date is 01-12-2009 10:00:00 then it will return
+        1-20091201100000
     @return: real id with recurrent date.
     """
 
@@ -609,6 +619,7 @@ are both optional, but if one occurs, so MUST the other"""),
                 cr.execute('Update %s set base_calendar_alarm_id=%s, alarm_id=%s \
                                         where id=%s' % (model_obj._table, \
                                         alarm_id, basic_alarm.id, data.id))
+        cr.commit()
         return True
 
     def do_alarm_unlink(self, cr, uid, ids, model, context={}):
@@ -812,6 +823,77 @@ class calendar_event(osv.osv):
             value['date_deadline'] = end.strftime("%Y-%m-%d %H:%M:%S")
         return {'value': value}
 
+    def _set_rrulestring(self, cr, uid, id, name, value, arg, context):
+        """
+        Set rule string.
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param id: List of  calendar event's ids.
+        @param context: A standard dictionary for contextual values
+        @return: dictionary of rrule value.
+        """
+        cr.execute("UPDATE %s set freq='',interval=0,count=0,end_date=Null,\
+                    mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\
+                    day=0,select1=False,month_list=0 ,byday=False where id=%s" % (self._table, id))
+        if not value:
+            return True
+        val = {}
+        for part in value.split(';'):
+            if part.lower().__contains__('freq') and len(value.split(';')) <=2:
+                rrule_type = part.lower()[5:]
+                break
+            else:
+                rrule_type = 'custom'
+                break
+        ans = value.split(';')
+        for i in ans:
+            val[i.split('=')[0].lower()] = i.split('=')[1].lower()
+
+        qry = "UPDATE %(table)s set rrule_type=\'%(rule_type)s\' "
+        new_val = val.copy()
+        for k, v in val.items():
+            if  val['freq'] == 'weekly' and val.get('byday'):
+                for day in val['byday'].split(','):
+                    new_val[day] = True
+                val.pop('byday')
+
+            if val.get('until'):
+                until = parser.parse(''.join((re.compile('\d')).findall(val.get('until'))))
+                new_val['end_date'] = until.strftime('%Y-%m-%d')
+                val.pop('until')
+                new_val.pop('until')
+
+            if val.get('bymonthday'):
+                new_val['day'] = val.get('bymonthday')
+                val.pop('bymonthday')
+                new_val.pop('bymonthday')
+
+            if val.get('byday'):
+                d = val.get('byday')
+                new_val['byday'] = d[:1]
+                new_val['week_list'] = d[1:].upper()
+                new_val['select1'] = 'day'
+
+            if val.get('bymonth'):
+                new_val['month_list'] = val.get('bymonth')
+                val.pop('bymonth')
+                new_val.pop('bymonth')
+
+        for k, v in new_val.items():
+            temp = ", %s='%s'" % (k, v)
+
+
+            qry += temp
+        whr = " where id=%(id)s"
+        qry = qry + whr
+        val.update({
+                    'table': self._table,
+                    'rule_type': rrule_type,
+                    'id': id,
+                    })
+        cr.execute(qry % val)
+        return True
+
     def _get_rulestring(self, cr, uid, ids, name, arg, context=None):
         """
         Get rule string.
@@ -823,7 +905,7 @@ class calendar_event(osv.osv):
         """
         result = {}
         for event in ids:
-
+            
             datas = self.read(cr, uid, event)
             if datas.get('rrule_type'):
                 if datas.get('rrule_type') == 'none':
@@ -859,7 +941,7 @@ class calendar_event(osv.osv):
         'exrule': fields.char('Exception Rule', size=352, help="defines a \
                     rule or repeating pattern for anexception to a recurrence set"),
         'rrule': fields.function(_get_rulestring, type='char', size=124, method=True,\
-                     string='Recurrent Rule', store=True),
+                     string='Recurrent Rule', store=True, fnct_inv=_set_rrulestring),
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
                             ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
                             ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'),
@@ -1060,9 +1142,12 @@ class calendar_event(osv.osv):
         freq = datas.get('freq')
         if freq == 'None':
             return ''
+        
+        if datas.get('interval') < 1:
+                raise osv.except_osv(_('Error!'), ("Please select proper Interval"))
 
         if freq == 'weekly':
-            
+
             byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
             if byday:
                 weekstring = ';BYDAY=' + ','.join(byday)
@@ -1096,6 +1181,7 @@ class calendar_event(osv.osv):
 #        End logic
         return rrule_string
 
+
     def search(self, cr, uid, args, offset=0, limit=100, order=None,
             context=None, count=False):
         """
@@ -1446,10 +1532,8 @@ class virtual_report_spool(web_services.report_spool):
         new_ids = []
         for id in ids:
             new_ids.append(base_calendar_id2real_id(id))
-        if datas is None:
-            datas = {}
-        if datas.get('id',False):
-            datas['id'] = base_calendar_id2real_id(datas['id'])        
+        if datas.get('id', False):
+            datas['id'] = base_calendar_id2real_id(datas['id'])
         return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
 
 virtual_report_spool()
@@ -1506,4 +1590,3 @@ class res_users(osv.osv):
 res_users()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 2334fd27acf7e3d48a3db990f3bd10d0563b4934 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 5 Apr 2010 17:07:31 +0530
Subject: [PATCH 215/248] [IMP]: base_calendar: Improvement in rrule set
 function

bzr revid: rpa@tinyerp.com-20100405113731-z9dknksjqw5bwk1u
---
 addons/base_calendar/base_calendar.py | 75 ++++++++++++++-------------
 addons/crm/crm_meeting_view.xml       |  6 +--
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index bcbe7aa95fd..f7608219b9d 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -835,6 +835,7 @@ class calendar_event(osv.osv):
         cr.execute("UPDATE %s set freq='',interval=0,count=0,end_date=Null,\
                     mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\
                     day=0,select1=False,month_list=0 ,byday=False where id=%s" % (self._table, id))
+        
         if not value:
             return True
         val = {}
@@ -848,48 +849,52 @@ class calendar_event(osv.osv):
         ans = value.split(';')
         for i in ans:
             val[i.split('=')[0].lower()] = i.split('=')[1].lower()
+        if int(val.get('interval')) > 1: #If interval is other than 1 rule is custom
+            rrule_type = 'custom'
 
         qry = "UPDATE %(table)s set rrule_type=\'%(rule_type)s\' "
-        new_val = val.copy()
-        for k, v in val.items():
-            if  val['freq'] == 'weekly' and val.get('byday'):
-                for day in val['byday'].split(','):
-                    new_val[day] = True
-                val.pop('byday')
 
-            if val.get('until'):
-                until = parser.parse(''.join((re.compile('\d')).findall(val.get('until'))))
-                new_val['end_date'] = until.strftime('%Y-%m-%d')
-                val.pop('until')
-                new_val.pop('until')
+        if rrule_type == 'custom':
+            new_val = val.copy()
+            for k, v in val.items():
+                if  val['freq'] == 'weekly' and val.get('byday'):
+                    for day in val['byday'].split(','):
+                        new_val[day] = True
+                    val.pop('byday')
+    
+                if val.get('until'):
+                    until = parser.parse(''.join((re.compile('\d')).findall(val.get('until'))))
+                    new_val['end_date'] = until.strftime('%Y-%m-%d')
+                    val.pop('until')
+                    new_val.pop('until')
+    
+                if val.get('bymonthday'):
+                    new_val['day'] = val.get('bymonthday')
+                    val.pop('bymonthday')
+                    new_val['select1'] = 'date'
+                    new_val.pop('bymonthday')
+    
+                if val.get('byday'):
+                    d = val.get('byday')
+                    new_val['byday'] = d[:1]
+                    new_val['week_list'] = d[1:].upper()
+                    new_val['select1'] = 'day'
+    
+                if val.get('bymonth'):
+                    new_val['month_list'] = val.get('bymonth')
+                    val.pop('bymonth')
+                    new_val.pop('bymonth')
+            
+            for k, v in new_val.items():
+                temp = ", %s='%s'" % (k, v)
+                qry += temp
 
-            if val.get('bymonthday'):
-                new_val['day'] = val.get('bymonthday')
-                val.pop('bymonthday')
-                new_val.pop('bymonthday')
-
-            if val.get('byday'):
-                d = val.get('byday')
-                new_val['byday'] = d[:1]
-                new_val['week_list'] = d[1:].upper()
-                new_val['select1'] = 'day'
-
-            if val.get('bymonth'):
-                new_val['month_list'] = val.get('bymonth')
-                val.pop('bymonth')
-                new_val.pop('bymonth')
-
-        for k, v in new_val.items():
-            temp = ", %s='%s'" % (k, v)
-
-
-            qry += temp
         whr = " where id=%(id)s"
         qry = qry + whr
         val.update({
-                    'table': self._table,
-                    'rule_type': rrule_type,
-                    'id': id,
+                    'table': self._table, 
+                    'rule_type': rrule_type, 
+                    'id': id, 
                     })
         cr.execute(qry % val)
         return True
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5fb6653eb6a..6d6402b9fdb 100755
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -55,10 +55,8 @@
                     <group col="8" colspan="4">
                         <field name="freq" />
                         <field name="interval" />
-                        <field name="count"
-                            attrs="{'required' : [('end_date','=',False)]}" />
-                        <field name="end_date"
-                            attrs="{'required' : [('count','&lt;=',0), ('freq', '!=', 'None')]}" />
+                        <field name="count" />
+                        <field name="end_date" />
                     </group>
                     <group col="14" colspan="4" name="Select weekdays"
                         attrs="{'invisible' : [('freq','!=','weekly')]}">

From 9f8cd4092848f1c7d0a1f7fd7f4727945005f32d Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 5 Apr 2010 17:10:05 +0530
Subject: [PATCH 216/248] [IMP] Project: clean

bzr revid: mra@tinyerp.com-20100405114005-kv7i7r4y1k2x10za
---
 addons/project/project_view.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 91568f953ab..5e7b4fa7549 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -49,10 +49,6 @@
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                                <!--<button
-                                    string="New Project Based on Template"
-                                    name="%(wizard_duplicate_template)d"  type="action"
-                                    states="template" icon="gtk-new"/>-->
 								<button
                                     string="New Project Based on Template"
                                     name="duplicate_template"  type="object"
@@ -275,7 +271,6 @@
                                 <button name="%(action_config_compute_remaining)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                 <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                <!--<button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>-->
                                 <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-jump-to"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
@@ -355,7 +350,6 @@
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
-                    <!--<button name="%(wizard_close_task)d" states="draft,pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>-->
                     <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-jump-to" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>

From 3f3f8d463a44d90dd7f5a017e557ca868713ac51 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Mon, 5 Apr 2010 17:29:01 +0530
Subject: [PATCH 217/248] [IMP] survey :- change string response to answer.

bzr revid: ysa@tinyerp.co.in-20100405115901-r1x3a77bkvuo5434
---
 .../survey/report/survey_analysis_report.py   | 22 ++++++-------
 .../survey/report/survey_browse_response.py   | 20 ++++++------
 addons/survey/survey.py                       | 31 +++++++++----------
 addons/survey/wizard/survey_answer.py         | 10 +++---
 addons/survey/wizard/survey_browse_answer.py  |  2 +-
 addons/survey/wizard/survey_browse_answer.xml |  2 +-
 addons/survey/wizard/survey_print_answer.py   |  2 +-
 addons/survey/wizard/survey_selection.py      |  2 +-
 addons/survey/wizard/survey_selection.xml     |  2 +-
 .../survey/wizard/survey_send_invitation.py   |  2 +-
 10 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index 25f553551a9..da724586a4f 100755
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -95,7 +95,7 @@ class survey_analysis(report_rml):
                   </stylesheet>
                   <images/>
                   <story>
-                    <para style="Title"><u>Response Summary</u></para>
+                    <para style="Title"><u>Answer Summary</u></para>
                     <para style="Standard"><font></font></para>
                     <para style="P2">
                       <font color="white"> </font>
@@ -158,7 +158,7 @@ class survey_analysis(report_rml):
                         rml += """<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
                         for mat_col in range(0, len(matrix_ans)):
                             rml+="""<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
-                        rml += """<td><para style="response-bold">Response Count</para></td>
+                        rml += """<td><para style="response-bold">Answer Count</para></td>
                                 </tr>"""
                         last_col = cols_widhts[-1]
 
@@ -194,8 +194,8 @@ class survey_analysis(report_rml):
                         rml += """<blockTable colWidths="240.0,210,50.0" style="Table1">"""
                         rml += """ <tr>
                              <td> <para style="Standard"> </para></td>
-                             <td> <para style="terp_default_Center_heading">Response Percentage</para></td>
-                             <td> <para style="response-bold">Response Count</para></td>
+                             <td> <para style="terp_default_Center_heading">Answer Percentage</para></td>
+                             <td> <para style="response-bold">Answer Count</para></td>
                          </tr>"""
 
                         for ans in que.answer_choice_ids:
@@ -238,7 +238,7 @@ class survey_analysis(report_rml):
                         rml += """<blockTable colWidths="400.0,100.0" style="Table1">
                              <tr>
                                  <td> <para style="Standard"> </para></td>
-                                 <td> <para style="response-bold">Response Count</para></td>
+                                 <td> <para style="response-bold">Answer Count</para></td>
                              </tr>
                             <tr><td><para style="answer"></para></td>
                                 <td><para style="answer_right">""" + tools.ustr(cr.fetchone()[0]) + """ </para></td></tr>
@@ -249,7 +249,7 @@ class survey_analysis(report_rml):
                         rml += """<blockTable colWidths="400.0,100.0" style="Table1">
                              <tr>
                                  <td> <para style="Standard"> </para></td>
-                                 <td> <para style="response-bold">Response Count</para></td>
+                                 <td> <para style="response-bold">Answer Count</para></td>
                              </tr>
                             <tr><td><para style="answer"></para></td>
                                 <td><para style="answer_right">""" + tools.ustr(cr.fetchone()[0]) + """ </para></td></tr>
@@ -269,7 +269,7 @@ class survey_analysis(report_rml):
                         for mat_col in range(0,len(matrix_ans)):
                             rml += """<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
                         rml += """<td><para style="response-bold">Rating Average</para></td>
-                                <td><para style="response-bold">Response Count</para></td>
+                                <td><para style="response-bold">Answer Count</para></td>
                                 </tr>"""
 
                         for ans in que.answer_choice_ids:
@@ -325,7 +325,7 @@ class survey_analysis(report_rml):
 
                             for menu in menu_choices:
                                 rml += """<td><para style="response">""" + to_xml(tools.ustr(menu)) + """</para></td>"""
-                            rml += """<td><para style="response-bold">Response Count</para></td></tr>"""
+                            rml += """<td><para style="response-bold">Answer Count</para></td></tr>"""
                             cr.execute("select count(id), sra.answer_id from survey_response_answer sra \
                                      where sra.column_id='%s' group by sra.answer_id "  % (column.id))
                             res_count = cr.dictfetchall()
@@ -363,9 +363,9 @@ class survey_analysis(report_rml):
                              <tr>
                              <td> <para style="Standard"> </para></td>
                              <td> <para style="Standard"> </para></td>
-                             <td> <para style="response">Response Average</para></td>
-                             <td> <para style="response">Response Total</para></td>
-                             <td> <para style="response-bold">Response Count</para></td>
+                             <td> <para style="response">Answer Average</para></td>
+                             <td> <para style="response">Answer Total</para></td>
+                             <td> <para style="response-bold">Answer Count</para></td>
                          </tr>"""
                         for ans in que.answer_choice_ids:
                             cr.execute("select answer from survey_response_answer where answer_id=%d group by answer" % ans.id)
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 48d56126a8f..8063e6183a9 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -51,8 +51,8 @@ class survey_browse_response(report_rml):
         _frame_width = tools.ustr(_pageSize[0])
         _frame_height = tools.ustr(float(_pageSize[1].replace('cm','')) - float(1.90))+'cm'
         _tbl_widths = tools.ustr(float(_pageSize[0].replace('cm','')) - float(2.10))+'cm'
-        rml ="""<document filename="Survey Response Report.pdf">
-                <template pageSize="("""+_pageSize[0]+""","""+_pageSize[1]+""")" title='Survey Response.pdf' author="Martin Simon" allowSplitting="20" >
+        rml ="""<document filename="Survey Answer Report.pdf">
+                <template pageSize="("""+_pageSize[0]+""","""+_pageSize[1]+""")" title='Survey Answer.pdf' author="Martin Simon" allowSplitting="20" >
                     <pageTemplate id="first">
                         <frame id="first" x1="0.0cm" y1="1.0cm" width='"""+_frame_width+"""' height='"""+_frame_height+"""'/>
                         <pageGraphics>
@@ -203,10 +203,10 @@ class survey_browse_response(report_rml):
                 colwidth =  "4.6cm,5cm," + str(tbl_width - 16.4) +"cm,4cm,3cm"
                 rml += """<blockTable colWidths='""" + colwidth + """' style="Table_heading">
                           <tr>
-                            <td><para style="terp_tblheader_General_Centre">Response Create Date:- </para></td>
+                            <td><para style="terp_tblheader_General_Centre">Answer Create Date:- </para></td>
                             <td><para style="terp_tblheader_General_Centre_simple">""" + to_xml(time.strftime('%d-%m-%Y %I:%M:%S %p', time.strptime(response.date_create.split('.')[0], '%Y-%m-%d %H:%M:%S'))) + """</para></td>
                             <td><para style="terp_tblheader_General_Centre"></para></td>
-                            <td><para style="terp_tblheader_General_right">Response By:- </para></td>
+                            <td><para style="terp_tblheader_General_right">Answer By:- </para></td>
                             <td><para style="terp_tblheader_General_right_simple">""" + to_xml(response.user_id.login) + """</para></td>
                           </tr>
                         </blockTable><para style="P2"></para>"""
@@ -289,7 +289,7 @@ class survey_browse_response(report_rml):
 
                             else:
                                 rml +="""<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
-                                             <tr><td> <para style="response">No Response</para></td> </tr>
+                                             <tr><td> <para style="response">No Answer</para></td> </tr>
                                         </blockTable>"""
 
                         elif que.type in ['multiple_choice_only_one_ans','multiple_choice_multiple_ans']:
@@ -363,7 +363,7 @@ class survey_browse_response(report_rml):
                                                 <td><para style="answer">""" + to_xml(tools.ustr(answer[0].comment)) + """</para></td></tr></blockTable>"""
                             else:
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
-                                             <tr><td> <para style="response">No Response</para></td> </tr>
+                                             <tr><td> <para style="response">No Answer</para></td> </tr>
                                           </blockTable>"""
 
                         elif que.type in ['multiple_textboxes_diff_type','multiple_textboxes','date','date_and_time','numerical_textboxes','multiple_textboxes_diff_type']:
@@ -390,7 +390,7 @@ class survey_browse_response(report_rml):
                                                 </blockTable>"""
                             else:
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
-                                         <tr>  <td> <para style="response">No Response</para></td> </tr>
+                                         <tr>  <td> <para style="response">No Answer</para></td> </tr>
                                         </blockTable>"""
 
                         elif que.type in ['single_textbox']:
@@ -400,7 +400,7 @@ class survey_browse_response(report_rml):
                                         </blockTable>"""
                             else:
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
-                                         <tr>  <td> <para style="response">No Response</para></td> </tr>
+                                         <tr>  <td> <para style="response">No Answer</para></td> </tr>
                                         </blockTable>"""
 
                         elif que.type in ['comment']:
@@ -410,7 +410,7 @@ class survey_browse_response(report_rml):
                                         </blockTable>"""
                             else:
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
-                                         <tr>  <td> <para style="response">No Response</para></td> </tr>
+                                         <tr>  <td> <para style="response">No Answer</para></td> </tr>
                                         </blockTable>"""
 
                         elif que.type in ['matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans', 'rating_scale', 'matrix_of_drop_down_menus']:
@@ -507,7 +507,7 @@ class survey_browse_response(report_rml):
                                             <td><para style="answer">""" + to_xml(tools.ustr(answer[0].comment or '')) + """</para></td></tr></blockTable>"""
                             else:
                                 rml += """<blockTable colWidths='""" + str(_tbl_widths) + """' style="simple_table">
-                                         <tr><td> <para style="response">No Response</para></td> </tr>
+                                         <tr><td> <para style="response">No Answer</para></td> </tr>
                                         </blockTable>"""
 
                 if datas.has_key('form') and not datas['form']['without_pagebreak']:
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 83aa399550f..f7bb9329436 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -55,9 +55,9 @@ class survey(osv.osv):
         'page_ids': fields.one2many('survey.page', 'survey_id', 'Page'),
         'date_open': fields.datetime('Survey Open Date', readonly=1),
         'date_close': fields.datetime('Survey Close Date', readonly=1),
-        'max_response_limit': fields.integer('Maximum Response Limit'),
-        'response_user': fields.integer('Maximum Response per User',
-                     help="Set to one if  you require only one response per user"),
+        'max_response_limit': fields.integer('Maximum Answer Limit'),
+        'response_user': fields.integer('Maximum Answer per User',
+                     help="Set to one if  you require only one Answer per user"),
         'state': fields.selection([('draft', 'Draft'), ('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
         'responsible_id': fields.many2one('res.users', 'Responsible'),
         'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
@@ -65,7 +65,7 @@ class survey(osv.osv):
         'note': fields.text('Description', size=128),
         'history': fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True),
         'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
-        'send_response': fields.boolean('E-mail Notification on Response'),
+        'send_response': fields.boolean('E-mail Notification on Answer'),
         'type': fields.many2one('survey.type', 'Type'),
     }
     _defaults = {
@@ -183,7 +183,6 @@ class survey_question(osv.osv):
         'page_id': fields.many2one('survey.page', 'Survey Page', ondelete='cascade', required=1),
         'question':  fields.char('Question', size=128, required=1),
         'answer_choice_ids': fields.one2many('survey.answer', 'question_id', 'Answer'),
-        'response_ids': fields.one2many('survey.response.line', 'question_id', 'Response', readonly=1),
         'is_require_answer': fields.boolean('Require Answer to Question (optional)'),
         'required_type': fields.selection([('all','All'), ('at least','At Least'), ('at most','At Most'), ('exactly','Exactly'), ('a range','A Range')], 'Respondent must answer'),
         'req_ans': fields.integer('#Required Answer'),
@@ -192,7 +191,7 @@ class survey_question(osv.osv):
         'req_error_msg': fields.text('Error Message'),
         'allow_comment': fields.boolean('Allow Comment Field'),
         'sequence': fields.integer('Sequence'),
-        'tot_resp': fields.function(_calc_response, method=True, string="Total Response"),
+        'tot_resp': fields.function(_calc_response, method=True, string="Total Answer"),
         'survey': fields.related('page_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'descriptive_text': fields.text('Descriptive Text', size=255),
         'column_heading_ids': fields.one2many('survey.question.column.heading', 'question_id',' Column heading'),
@@ -245,7 +244,7 @@ class survey_question(osv.osv):
         'validation_valid_err_msg': fields.text('Error message'),
         'numeric_required_sum': fields.integer('Sum of all choices'),
         'numeric_required_sum_err_msg': fields.text('Error message'),
-        'rating_allow_one_column_require': fields.boolean('Allow Only One Response per Column (Forced Ranking)'),
+        'rating_allow_one_column_require': fields.boolean('Allow Only One Answer per Column (Forced Ranking)'),
         'in_visible_rating_weight': fields.boolean('Is Rating Scale Invisible?'),
         'in_visible_menu_choice': fields.boolean('Is Menu Choice Invisible?'),
         'in_visible_answer_type': fields.boolean('Is Answer Type Invisible?'),
@@ -524,7 +523,7 @@ class survey_answer(osv.osv):
         'question_id': fields.many2one('survey.question', 'Question', ondelete='cascade'),
         'answer': fields.char('Answer', size=128, required=1),
         'sequence': fields.integer('Sequence'),
-        'response': fields.function(_calc_response_avg, method=True, string="#Response", multi='sums'),
+        'response': fields.function(_calc_response_avg, method=True, string="#Answer", multi='sums'),
         'average': fields.function(_calc_response_avg, method=True, string="#Avg", multi='sums'),
         'type': fields.selection([('char','Character'),('date','Date'),('datetime','Date & Time'),\
                     ('integer','Integer'),('float','Float'),('selection','Selection'),\
@@ -555,8 +554,8 @@ class survey_response(osv.osv):
         'date_create' : fields.datetime('Create Date', required=1),
         'user_id' : fields.many2one('res.users', 'User'),
         'response_type' : fields.selection([('manually', 'Manually'), ('link', 'Link')], \
-                                    'Response Type', required=1, readonly=1),
-        'question_ids' : fields.one2many('survey.response.line', 'response_id', 'Response Answer'),
+                                    'Answer Type', required=1, readonly=1),
+        'question_ids' : fields.one2many('survey.response.line', 'response_id', 'Answer'),
         'state' : fields.selection([('done', 'Finished '),('skip', 'Not Finished')], \
                             'Status', readonly=True),
     }
@@ -585,16 +584,16 @@ class survey_response_line(osv.osv):
     _description = 'Survey Response Line'
     _rec_name = 'date_create'
     _columns = {
-        'response_id': fields.many2one('survey.response', 'Response', ondelete='cascade'),
+        'response_id': fields.many2one('survey.response', 'Answer', ondelete='cascade'),
         'date_create': fields.datetime('Create Date', required=1),
         'state': fields.selection([('draft', 'Draft'), ('done', 'Answered'),('skip', 'Skiped')],\
                                    'Status', readonly=True),
         'question_id': fields.many2one('survey.question', 'Question'),
         'page_id': fields.related('question_id', 'page_id', type='many2one', \
                                   relation='survey.page', string='Page'),
-        'response_answer_ids': fields.one2many('survey.response.answer', 'response_id', 'Response Answer'),
+        'response_answer_ids': fields.one2many('survey.response.answer', 'response_id', 'Answer'),
         'response_table_ids': fields.one2many('survey.tbl.column.heading', \
-                                    'response_table_id', 'Response Answer'),
+                                    'response_table_id', 'Answer'),
         'comment': fields.text('Notes'),
         'single_text': fields.char('Text', size=255),
     }
@@ -611,17 +610,17 @@ class survey_tbl_column_heading(osv.osv):
         'name': fields.integer('Row Number'),
         'column_id': fields.many2one('survey.question.column.heading', 'Column'),
         'value': fields.char('Value', size = 255),
-        'response_table_id': fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
+        'response_table_id': fields.many2one('survey.response.line', 'Answer', ondelete='cascade'),
     }
 
 survey_tbl_column_heading()
 
 class survey_response_answer(osv.osv):
     _name = 'survey.response.answer'
-    _description = 'Survey Response Answer'
+    _description = 'Survey Answer'
     _rec_name = 'response_id'
     _columns = {
-        'response_id': fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
+        'response_id': fields.many2one('survey.response.line', 'Answer', ondelete='cascade'),
         'answer_id': fields.many2one('survey.answer', 'Answer', required=1, ondelete='cascade'),
         'column_id': fields.many2one('survey.question.column.heading','Column'),
         'answer': fields.char('Value', size =255),
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 1d1ca990279..2bc48cf339d 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -113,7 +113,7 @@ class survey_question_wiz(osv.osv_memory):
                             user_limit = survey_obj.browse(cr, uid, survey_id)
                             user_limit = user_limit.response_user
                             if user_limit and res >= user_limit:
-                                raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
+                                raise osv.except_osv(_('Warning !'),_("You can not give answer for this survey more than %s times") % (user_limit))
 
                         if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey and not sur_name_rec.page_no + 1:
                             survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
@@ -411,11 +411,11 @@ class survey_question_wiz(osv.osv_memory):
                         if user_email and resp_email:
                             user_name = user_obj.browse(cr, uid, uid).name
                             mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " Give Response Of " + survey_data.title + " Survey.\n\n Thanks,"
-                            tools.email_send(user_email, [resp_email], "Survey Response Of " + str(user_name) , mail, attach = attachments)
+                            tools.email_send(user_email, [resp_email], "Survey Answer Of " + str(user_name) , mail, attach = attachments)
 
-                    xml_form = etree.Element('form', {'string': _('Complete Survey Response')})
+                    xml_form = etree.Element('form', {'string': _('Complete Survey Answer')})
                     etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
-                    etree.SubElement(xml_form, 'label', {'string': 'Thanks for your response'})
+                    etree.SubElement(xml_form, 'label', {'string': 'Thanks for your Answer'})
                     etree.SubElement(xml_form, 'newline')
                     etree.SubElement(xml_form, 'button', {'icon': "gtk-go-forward", 'special':"cancel",'string':"OK",'colspan':"2"})
                     root = xml_form.getroottree()
@@ -426,7 +426,7 @@ class survey_question_wiz(osv.osv_memory):
 
     def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
         """
-        If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Response' set True in survey  then send mail on responsible person of this survey and attach survey answer report in pdf format.
+        If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Answer' set True in survey  then send mail on responsible person of this survey and attach survey answer report in pdf format.
 
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index a401a07709d..3f4fb753fa3 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -46,7 +46,7 @@ class survey_browse_answer(osv.osv_memory):
 
     _columns = {
         'survey_id': fields.selection(_get_survey, "Survey", required="1"),
-        'response_id': fields.many2one("survey.response", "Survey Response"),
+        'response_id': fields.many2one("survey.response", "Survey Answer"),
     }
 
     def action_next(self, cr, uid, ids, context=None):
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index ae689bece25..f08d4d7185b 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -12,7 +12,7 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Survey">
-					<separator colspan="4"  string =  "Select Survey and related response"/>
+					<separator colspan="4"  string =  "Select Survey and related answer"/>
 					<field name="survey_id" width="250"/>
 					<field name="response_id" domain="[('survey_id','=', survey_id)]"/>
 					<separator colspan="4" />
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
index 97a6d6c7453..a456f89056d 100644
--- a/addons/survey/wizard/survey_print_answer.py
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -28,7 +28,7 @@ class survey_print_answer(osv.osv_memory):
     _name = 'survey.print.answer'
     _columns = {
         'response_ids': fields.many2many('survey.response','survey_print_response',\
-                            'response_id','print_id', "Response", required="1"),
+                            'response_id','print_id', "Answer", required="1"),
         'orientation': fields.selection([('vertical','Portrait(Vertical)'),\
                             ('horizontal','Landscape(Horizontal)')], 'Orientation'),
         'paper_size': fields.selection([('letter','Letter (8.5" x 11")'),\
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index b6c1ca55567..002faa6f431 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -80,7 +80,7 @@ class survey_name_wiz(osv.osv_memory):
         'page': fields.char('Page Position',size = 12),
         'transfer': fields.boolean('Page Transfer'),
         'store_ans': fields.text('Store Answer'),
-        'response': fields.char('Response',size=16)
+        'response': fields.char('Answer',size=16)
     }
     _defaults = {
         'page_no': lambda * a: - 1,
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index d3c039aa5c3..a72566f7888 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -34,7 +34,7 @@
 
 		<record id="action_view_survey_name"
 			model="ir.actions.act_window">
-			<field name="name">Give Survey Response</field>
+			<field name="name">Give Survey Answer</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">survey.name.wiz</field>
 			<field name="view_type">form</field>
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index d099b52d389..1e5a0e01831 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -38,7 +38,7 @@ class survey_send_invitation(osv.osv_memory):
     _name = 'survey.send.invitation'
     _columns = {
         'partner_ids': fields.many2many('res.partner','survey_res_partner','partner_id',\
-                                'survey_id', "Response", required=1),
+                                'survey_id', "Answer", required=1),
         'send_mail': fields.boolean('Send mail for new user'),
         'send_mail_existing': fields.boolean('Send reminder for existing user'),
         'mail_subject': fields.char('Subject', size=256, required=1),

From 916934225b10e593b5208f4e8fd3cad9daadc6b6 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 5 Apr 2010 17:51:06 +0530
Subject: [PATCH 218/248] [FIX] Project: Close task

bzr revid: mra@tinyerp.com-20100405122106-8y8149yifeatqigt
---
 addons/project/project.py                   |  3 +-
 addons/project/wizard/project_close_task.py | 62 +++++++++++----------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index e34474233bb..727f210a488 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -412,10 +412,11 @@ class task(osv.osv):
         if mail_send:
             model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_project_close_task')])
             resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
+            args[0].update({'task_id': task_id})
             return {
                 'name': _('Email Send to Customer'),
                 'view_type': 'form',
-                'context': {'task_id': task_id,}, # improve me
+                'context': args[0], # improve me
                 'view_mode': 'tree,form',
                 'res_model': 'close.task',
                 'views': [(resource_id,'form')],
diff --git a/addons/project/wizard/project_close_task.py b/addons/project/wizard/project_close_task.py
index 947806224f4..16784be6783 100644
--- a/addons/project/wizard/project_close_task.py
+++ b/addons/project/wizard/project_close_task.py
@@ -37,15 +37,18 @@ class project_close_task(osv.osv_memory):
 
     def _get_email(self, cr, uid, context={}):
         email = ''
-        task = self.pool.get('project.task').browse(cr, uid, context['active_ids'][0])
-        partner_id = task.partner_id or task.project_id.partner_id
-        if partner_id and partner_id.address[0].email:
-            email = partner_id.address[0].email
+        if 'task_id' in context:
+            task = self.pool.get('project.task').browse(cr, uid, context['task_id'])
+            partner_id = task.partner_id or task.project_id.partner_id
+            if partner_id and partner_id.address[0].email:
+                email = partner_id.address[0].email
         return email
 
     def _get_desc(self, cr, uid, context={}):
-        task = self.pool.get('project.task').browse(cr, uid, context['active_ids'][0])
-        return task.description or task.name
+        if 'task_id' in context:
+            task = self.pool.get('project.task').browse(cr, uid, context['task_id'])
+            return task.description or task.name
+        return ''
 
     _defaults={
        'email': _get_email,
@@ -58,29 +61,30 @@ class project_close_task(osv.osv_memory):
         close_task = self.read(cr, uid, ids[0], [])
         to_adr = close_task['email']
         description = close_task['description']
-        for task in self.pool.get('project.task').browse(cr, uid, [context['task_id']], context=context):
-            project = task.project_id
-            subject = "Task '%s' closed" % task.name
-            if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
-                from_adr = task.user_id.address_id.email
-                signature = task.user_id.signature
-            else:
-                raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!"))
-            if to_adr:
-                val = {
-                    'name': task.name,
-                    'user_id': task.user_id.name,
-                    'task_id': "%d/%d" % (project.id, task.id),
-                    'date_start': task.date_start,
-                    'date_end': task.date_end,
-                    'state': task.state
-                }
-                header = (project.warn_header or '') % val
-                footer = (project.warn_footer or '') % val
-                body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature)
-                email(from_adr, [to_adr], subject, body.encode('utf-8'), email_bcc=[from_adr])
-            else:
-                raise osv.except_osv(_('Error'), _("Couldn't send mail because the contact for this task (%s) has no email address!") % contact.name)
+        if 'task_id' in context:
+            for task in self.pool.get('project.task').browse(cr, uid, [context['task_id']], context=context):
+                project = task.project_id
+                subject = "Task '%s' closed" % task.name
+                if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
+                    from_adr = task.user_id.address_id.email
+                    signature = task.user_id.signature
+                else:
+                    raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!"))
+                if to_adr:
+                    val = {
+                        'name': task.name,
+                        'user_id': task.user_id.name,
+                        'task_id': "%d/%d" % (project.id, task.id),
+                        'date_start': task.date_start,
+                        'date_end': task.date_end,
+                        'state': task.state
+                    }
+                    header = (project.warn_header or '') % val
+                    footer = (project.warn_footer or '') % val
+                    body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature)
+                    email(from_adr, [to_adr], subject, body.encode('utf-8'), email_bcc=[from_adr])
+                else:
+                    raise osv.except_osv(_('Error'), _("Couldn't send mail because the contact for this task (%s) has no email address!") % contact.name)
         return {}
 
 project_close_task()

From f2117bf48215482aa4b8efc8b96e37645c0bc726 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 5 Apr 2010 17:58:03 +0530
Subject: [PATCH 219/248] [ADD, IMP] mrp: Added doc strings in functions and
 classes. Improve spacing in docstrings of wizard files.

bzr revid: uco@tinyerp.co.in-20100405122803-lvkh410ncgj2tte6
---
 addons/mrp/mrp.py                             | 260 +++++++++++++++---
 addons/mrp/stock.py                           |  36 ++-
 addons/mrp/wizard/change_production_qty.py    |  35 +--
 addons/mrp/wizard/make_procurement_product.py |  54 ++--
 addons/mrp/wizard/mrp_price.py                |  15 +-
 addons/mrp/wizard/mrp_product_produce.py      |  32 +--
 addons/mrp/wizard/mrp_track_prod.py           |   9 +-
 addons/mrp/wizard/mrp_workcenter_load.py      |  15 +-
 addons/mrp/wizard/orderpoint_procurement.py   |  21 +-
 addons/mrp/wizard/schedulers_all.py           |  20 +-
 10 files changed, 337 insertions(+), 160 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index a238658302c..9ca9fee3e91 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -65,6 +65,9 @@ mrp_workcenter()
 
 
 class mrp_property_group(osv.osv):
+    """
+    Group of mrp properties.
+    """
     _name = 'mrp.property.group'
     _description = 'Property Group'
     _columns = {
@@ -74,6 +77,9 @@ class mrp_property_group(osv.osv):
 mrp_property_group()
 
 class mrp_property(osv.osv):
+    """
+    Properties of mrp.
+    """
     _name = 'mrp.property'
     _description = 'Property'
     _columns = {
@@ -88,6 +94,9 @@ class mrp_property(osv.osv):
 mrp_property()
 
 class mrp_routing(osv.osv):
+    """
+    For specifying the routings of workcenters.
+    """
     _name = 'mrp.routing'
     _description = 'Routing'
     _columns = {
@@ -110,6 +119,9 @@ class mrp_routing(osv.osv):
 mrp_routing()
 
 class mrp_routing_workcenter(osv.osv):
+    """
+    Defines working cycles and hours of a workcenter using routings.
+    """
     _name = 'mrp.routing.workcenter'
     _description = 'Routing workcenter usage'
     _columns = {
@@ -131,19 +143,22 @@ class mrp_routing_workcenter(osv.osv):
 mrp_routing_workcenter()
 
 class mrp_bom(osv.osv):
+    """
+    Defines bills of material for a product.
+    """
     _name = 'mrp.bom'
     _description = 'Bills of Material'
+    
     def _child_compute(self, cr, uid, ids, name, arg, context={}):
-        """ 
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: the ID of mrp.production object
-             @param name: name of the field
-             @param arg: user defined argument
-
-             @return:  True
-        
+        """ Gets child bom.
+        @param self: The object pointer
+        @param cr: The current row, from the database cursor,
+        @param uid: The current user ID for security checks
+        @param ids: List of selected IDs
+        @param name: Name of the field
+        @param arg: User defined argument
+        @param context: A standard dictionary for contextual values
+        @return:  Dictionary of values
         """  
         result = {}
         for bom in self.browse(cr, uid, ids, context=context):
@@ -158,7 +173,13 @@ class mrp_bom(osv.osv):
                     result[bom.id] += map(lambda x: x.id, bom2.bom_lines)                 
 
         return result
+    
     def _compute_type(self, cr, uid, ids, field_name, arg, context):
+        """ Sets particular method for the selected bom type.
+        @param field_name: Name of the field
+        @param arg: User defined argument
+        @return:  Dictionary of values
+        """  
         res = dict(map(lambda x: (x,''), ids))
         for line in self.browse(cr, uid, ids):
             if line.type=='phantom' and not line.bom_id:
@@ -172,6 +193,7 @@ class mrp_bom(osv.osv):
                 else:
                     res[line.id] = 'order'
         return res
+    
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'code': fields.char('Code', size=16),
@@ -234,6 +256,11 @@ class mrp_bom(osv.osv):
 
 
     def onchange_product_id(self, cr, uid, ids, product_id, name, context={}):
+        """ Changes UoM and name if product_id changes.
+        @param name: Name of the field
+        @param product_id: Changed product_id
+        @return:  Dictionary of changed values
+        """
         if product_id:
             prod=self.pool.get('product.product').browse(cr,uid,[product_id])[0]
             v = {'product_uom':prod.uom_id.id}
@@ -243,6 +270,12 @@ class mrp_bom(osv.osv):
         return {}
 
     def _bom_find(self, cr, uid, product_id, product_uom, properties=[]):
+        """ Finds BoM for particular product and product uom.
+        @param product_id: Selected product.
+        @param product_uom: Unit of measure of a product.
+        @param properties: List of related properties.
+        @return: False or BoM id.
+        """
         bom_result = False
         # Why searching on BoM without parent ?
         cr.execute('select id from mrp_bom where product_id=%s and bom_id is null order by sequence', (product_id,))
@@ -260,6 +293,15 @@ class mrp_bom(osv.osv):
         return result
 
     def _bom_explode(self, cr, uid, bom, factor, properties, addthis=False, level=0):
+        """ Finds Products and Workcenters for related BoM for manufacturing order.
+        @param bom: BoM of particular product.
+        @param factor: Factor of product UoM.
+        @param properties: A dictionary for contextual values.
+        @param addthis: If BoM found then True else False.
+        @param level: Depth level to find BoM lines starts from 10.
+        @return: result: List of dictionaries containing product details.
+                 result2: List of dictionaries containing workcenter details.
+        """
         factor = factor / (bom.product_efficiency or 1.0)
         factor = rounding(factor, bom.product_rounding)
         if factor<bom.product_rounding:
@@ -307,6 +349,9 @@ class mrp_bom(osv.osv):
         return result, result2
 
     def set_indices(self, cr, uid, ids, context = {}):
+        """ Sets Indices.
+        @return: True
+        """
         if not ids or (ids and not ids[0]):
             return True
         res = self.read(cr, uid, ids, ['revision_ids', 'revision_type'])
@@ -389,11 +434,19 @@ class one2many_domain(fields.one2many):
         return res
 
 class mrp_production(osv.osv):
+    """
+    Production Orders / Manufacturing Orders
+    """
     _name = 'mrp.production'
     _description = 'Production'
     _date_name  = 'date_planned'    
 
     def _production_calc(self, cr, uid, ids, prop, unknow_none, context={}):
+        """ Calculates total hours and total no. of cycles for a production order.
+        @param prop: 
+        @param unknow_none: 
+        @return: Dictionary of values.
+        """
         result = {}
         for prod in self.browse(cr, uid, ids, context=context):
             result[prod.id] = {
@@ -406,18 +459,33 @@ class mrp_production(osv.osv):
         return result
 
     def _production_date_end(self, cr, uid, ids, prop, unknow_none, context={}):
+        """ Finds production end date.
+        @param prop: Name of field.
+        @param unknow_none: 
+        @return: Dictionary of values.
+        """
         result = {}
         for prod in self.browse(cr, uid, ids, context=context):
             result[prod.id] = prod.date_planned
         return result
 
     def _production_date(self, cr, uid, ids, prop, unknow_none, context={}):
+        """ Finds production planned date.
+        @param prop: Name of field.
+        @param unknow_none:  
+        @return: Dictionary of values.
+        """
         result = {}
         for prod in self.browse(cr, uid, ids, context=context):
             result[prod.id] = prod.date_planned[:10]
         return result
 
     def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context={}):
+        """ Finds reference sale order for production order.
+        @param field_names: Names of fields.
+        @param arg: User defined arguments
+        @return: Dictionary of values.
+        """
         res = {}
         for f in field_names:
             for order_id in ids:
@@ -499,6 +567,11 @@ class mrp_production(osv.osv):
         return super(mrp_production, self).copy(cr, uid, id, default, context)
 
     def location_id_change(self, cr, uid, ids, src, dest, context={}):
+        """ Changes destination location if source location is changed.
+        @param src: Source location id.
+        @param dest: Destination location id.
+        @return: Dictionary of values.
+        """
         if dest:
             return {}
         if src:
@@ -506,6 +579,10 @@ class mrp_production(osv.osv):
         return {}
 
     def product_id_change(self, cr, uid, ids, product):
+        """ Finds UoM of changed product.
+        @param product: Id of changed product.
+        @return: Dictionary of values.
+        """
         if not product:
             return {}
         res = self.pool.get('product.product').read(cr, uid, [product], ['uom_id'])[0]
@@ -514,6 +591,10 @@ class mrp_production(osv.osv):
         return {'value':result}
 
     def bom_id_change(self, cr, uid, ids, product):
+        """ Finds routing for changed BoM.
+        @param product: Id of product.
+        @return: Dictionary of values.
+        """
         if not product:
             return {}
         res = self.pool.get('mrp.bom').read(cr, uid, [product], ['routing_id'])[0]
@@ -522,10 +603,17 @@ class mrp_production(osv.osv):
         return {'value':result}
 
     def action_picking_except(self, cr, uid, ids):
+        """ Changes the state to Exception.
+        @return: True 
+        """
         self.write(cr, uid, ids, {'state':'picking_except'})
         return True
 
     def action_compute(self, cr, uid, ids, properties=[]):
+        """ Computes bills of material of a product.
+        @param properties: List containing dictionaries of properties.
+        @return: No. of products.
+        """
         results = []
         bom_obj = self.pool.get('mrp.bom')
         prod_line_obj = self.pool.get('mrp.production.product.line')
@@ -561,6 +649,9 @@ class mrp_production(osv.osv):
         return len(results)
 
     def action_cancel(self, cr, uid, ids):
+        """ Cancels the production order and related stock moves.
+        @return: True
+        """
         move_obj = self.pool.get('stock.move')
         for production in self.browse(cr, uid, ids):
             if production.move_created_ids:
@@ -572,6 +663,9 @@ class mrp_production(osv.osv):
     #XXX: may be a bug here; lot_lines are unreserved for a few seconds;
     #     between the end of the picking list and the call to this function
     def action_ready(self, cr, uid, ids):
+        """ Changes the production state to Ready and location id of stock move.
+        @return: True
+        """
         move_obj = self.pool.get('stock.move')
         self.write(cr, uid, ids, {'state':'ready'})
         for production in self.browse(cr, uid, ids):
@@ -581,11 +675,17 @@ class mrp_production(osv.osv):
         return True
 
     def action_production_end(self, cr, uid, ids):
+        """ Changes production state to Finish and writes finished date.
+        @return: True
+        """
         for production in self.browse(cr, uid, ids):
             self._costs_generate(cr, uid, production)
         return self.write(cr,  uid, ids, {'state': 'done', 'date_finnished': time.strftime('%Y-%m-%d %H:%M:%S')})
 
     def test_production_done(self, cr, uid, ids):
+        """ Tests whether production is done or not.
+        @return: True or False
+        """
         res = True
         for production in self.browse(cr, uid, ids):            
             if production.move_lines:                
@@ -596,21 +696,14 @@ class mrp_production(osv.osv):
         return res
 
     def action_produce(self, cr, uid, production_id, production_qty, production_mode, context=None):
-        """ 
-            To produce final product base on production mode (consume/consume&produce).
-            If Production mode is consume, all stock move lines of raw materials will be done/consumed.
-            If Production mode is consume & produce, all stock move lines of raw materials will be done/consumed
-            and stock move lines of final product will be also done/produced.
-        
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param production_id: the ID of mrp.production object
-             @param production_qty: specify qty to produce
-             @param production_mode: specify production mode (consume/consume&produce).
-
-             @return:  True
-        
+        """ To produce final product base on production mode (consume/consume&produce).
+        If Production mode is consume, all stock move lines of raw materials will be done/consumed.
+        If Production mode is consume & produce, all stock move lines of raw materials will be done/consumed
+        and stock move lines of final product will be also done/produced.
+        @param production_id: the ID of mrp.production object
+        @param production_qty: specify qty to produce
+        @param production_mode: specify production mode (consume/consume&produce).
+        @return: True
         """              
         stock_mov_obj = self.pool.get('stock.move')
         production = self.browse(cr, uid, production_id)
@@ -679,6 +772,10 @@ class mrp_production(osv.osv):
         return True
 
     def _costs_generate(self, cr, uid, production):
+        """ Calculates total costs at the end of the production.
+        @param production: Id of production order.
+        @return: Calculated amount.
+        """
         amount = 0.0
         analytic_line_obj = self.pool.get('account.analytic.line')
         for wc_line in production.workcenter_lines:
@@ -712,11 +809,17 @@ class mrp_production(osv.osv):
         return amount
 
     def action_in_production(self, cr, uid, ids):
+        """ Changes state to In Production and writes starting date.
+        @return: True 
+        """
         move_ids = []        
         self.write(cr, uid, ids, {'state': 'in_production','date_start':time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def test_if_product(self, cr, uid, ids):
+        """
+        @return: True or False
+        """
         res = True
         for production in self.browse(cr, uid, ids):
             if not production.product_lines:
@@ -728,6 +831,9 @@ class mrp_production(osv.osv):
         return True
 
     def action_confirm(self, cr, uid, ids):
+        """ Confirms production order.
+        @return: Newly generated picking Id.
+        """
         picking_id=False
         proc_ids = []
         seq_obj = self.pool.get('ir.sequence')
@@ -835,6 +941,10 @@ class mrp_production(osv.osv):
         return picking_id
 
     def force_production(self, cr, uid, ids, *args):
+        """ Assigns products.
+        @param *args: Arguments
+        @return: True
+        """
         pick_obj = self.pool.get('stock.picking')
         pick_obj.force_assign(cr, uid, [prod.picking_id.id for prod in self.browse(cr, uid, ids)])
         return True
@@ -882,6 +992,9 @@ mrp_production_product_line()
 #     then wizard for picking lists & move
 #
 class mrp_procurement(osv.osv):
+    """
+    Procument Orders / Requisitions
+    """
     _name = "mrp.procurement"
     _description = "Procurement"
     _order = 'priority,date_planned'
@@ -948,6 +1061,10 @@ class mrp_procurement(osv.osv):
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
     def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+        """ Finds UoM and UoS of changed product.
+        @param product_id: Changed id of product.
+        @return: Dictionary of values.
+        """
         if product_id:
             w=self.pool.get('product.product').browse(cr,uid,product_id, context)
             v = {
@@ -958,12 +1075,18 @@ class mrp_procurement(osv.osv):
         return {}
 
     def check_product(self, cr, uid, ids):
+        """ Checks product type.
+        @return: True or False 
+        """
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_id.type in ('product', 'consu'):
                 return True
         return False
 
     def check_move_cancel(self, cr, uid, ids, context={}):
+        """ Checks if move is cancelled or not.
+        @return: True or False. 
+        """
         res = True
         ok = False
         for procurement in self.browse(cr, uid, ids, context):
@@ -974,6 +1097,9 @@ class mrp_procurement(osv.osv):
         return res and ok
 
     def check_move_done(self, cr, uid, ids, context={}):
+        """ Checks if move is done or not.
+        @return: True or False. 
+        """
         res = True
         for proc in self.browse(cr, uid, ids, context):
             if proc.move_id:
@@ -986,12 +1112,20 @@ class mrp_procurement(osv.osv):
     # for computing their own purpose
     #
     def _quantity_compute_get(self, cr, uid, proc, context={}):
+        """ Finds sold quantity of product.
+        @param proc: Current procurement.
+        @return: Quantity or False.
+        """
         if proc.product_id.type=='product':
             if proc.move_id.product_uos:
                 return proc.move_id.product_uos_qty
         return False
 
     def _uom_compute_get(self, cr, uid, proc, context={}):
+        """ Finds UoS if product is Stockable Product. 
+        @param proc: Current procurement.
+        @return: UoS or False.
+        """
         if proc.product_id.type=='product':
             if proc.move_id.product_uos:
                 return proc.move_id.product_uos.id
@@ -1002,6 +1136,9 @@ class mrp_procurement(osv.osv):
     # different from the planned quantity
     #
     def quantity_get(self, cr, uid, id, context={}):
+        """ Finds quantity of product used in procurement.
+        @return: Quantity of product. 
+        """
         proc = self.browse(cr, uid, id, context)
         result = self._quantity_compute_get(cr, uid, proc, context)
         if not result:
@@ -1009,6 +1146,9 @@ class mrp_procurement(osv.osv):
         return result
 
     def uom_get(self, cr, uid, id, context=None):
+        """ Finds UoM of product used in procurement.
+        @return: UoM of product. 
+        """
         proc = self.browse(cr, uid, id, context)
         result = self._uom_compute_get(cr, uid, proc, context)
         if not result:
@@ -1016,6 +1156,9 @@ class mrp_procurement(osv.osv):
         return result
 
     def check_waiting(self, cr, uid, ids, context=[]):
+        """ Checks state of move.
+        @return: True or False 
+        """
         for procurement in self.browse(cr, uid, ids, context=context):
             if procurement.move_id and procurement.move_id.state=='auto':
                 return True
@@ -1025,6 +1168,10 @@ class mrp_procurement(osv.osv):
         return True
 
     def check_produce_product(self, cr, uid, procurement, context=[]):
+        """ Finds BoM of a product if not found writes exception message.
+        @param procurement: Current procurement.
+        @return: True or False.
+        """
         properties = [x.id for x in procurement.property_ids]
         bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
         if not bom_id:
@@ -1033,6 +1180,9 @@ class mrp_procurement(osv.osv):
         return True
 
     def check_make_to_stock(self, cr, uid, ids, context={}):
+        """ Checks product type.
+        @return: True or False 
+        """
         ok = True
         for procurement in self.browse(cr, uid, ids, context=context):
             if procurement.product_id.type=='service':
@@ -1042,6 +1192,9 @@ class mrp_procurement(osv.osv):
         return ok
 
     def check_produce(self, cr, uid, ids, context={}):
+        """ Checks product type.
+        @return: True or Product Id.
+        """
         res = True
         user = self.pool.get('res.users').browse(cr, uid, uid)
         for procurement in self.browse(cr, uid, ids):
@@ -1061,6 +1214,9 @@ class mrp_procurement(osv.osv):
         return res
 
     def check_buy(self, cr, uid, ids):
+        """ Checks product type.
+        @return: True or Product Id.
+        """
         user = self.pool.get('res.users').browse(cr, uid, uid)
         partner_obj = self.pool.get('res.partner')
         for procurement in self.browse(cr, uid, ids):
@@ -1080,12 +1236,18 @@ class mrp_procurement(osv.osv):
         return True
 
     def test_cancel(self, cr, uid, ids):
+        """ Tests whether state of move is cancelled or not. 
+        @return: True or False
+        """
         for record in self.browse(cr, uid, ids):
             if record.move_id and record.move_id.state=='cancel':
                 return True
         return False
 
     def action_confirm(self, cr, uid, ids, context={}):
+        """ Confirms procurement and writes exception message if any.
+        @return: True
+        """
         move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_qty <= 0.00:
@@ -1115,6 +1277,9 @@ class mrp_procurement(osv.osv):
         return True
 
     def action_move_assigned(self, cr, uid, ids, context={}):
+        """ Changes procurement state to Running and writes message.
+        @return: True 
+        """
         self.write(cr, uid, ids, {'state':'running','message':_('from stock: products assigned.')})
         return True
 
@@ -1122,6 +1287,10 @@ class mrp_procurement(osv.osv):
         return True
 
     def _check_make_to_stock_product(self, cr, uid, procurement, context={}):
+        """ Checks procurement move state.
+        @param procurement: Current procurement.
+        @return: True or move id.
+        """
         ok = True
         if procurement.move_id:
             id = procurement.move_id.id
@@ -1133,24 +1302,24 @@ class mrp_procurement(osv.osv):
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context={}):
+        """ Changes procurement state to Running.
+        @return: True 
+        """
         for procurement in self.browse(cr, uid, ids):
             self.write(cr, uid, [procurement.id], {'state':'running'})
         return True
 
     def action_produce_assign_product(self, cr, uid, ids, context={}):
-        """
-        This is action which call from workflow to assign production order to procuments
-        @return  : True
+        """ This is action which call from workflow to assign production order to procurements
+        @return: True
         """
         res = self.make_mo(cr, uid, ids, context=context)
         res = res.values()
         return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
 
     def make_mo(self, cr, uid, ids, context={}):
-        """
-        Make Manufecturing(production) order from procurement
-        
-        @return : New created Production Orders procurement wise 
+        """ Make Manufecturing(production) order from procurement
+        @return: New created Production Orders procurement wise 
         """
         res = {}
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
@@ -1186,19 +1355,16 @@ class mrp_procurement(osv.osv):
         return res
     
     def action_po_assign(self, cr, uid, ids, context={}):
-        """
-        This is action which call from workflow to assign purchase order to procuments
-        @return  : True
+        """ This is action which call from workflow to assign purchase order to procuments
+        @return: True
         """
         res = self.make_po(cr, uid, ids, context=context)
         res = res.values()
         return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
 
     def make_po(self, cr, uid, ids, context={}):
-        """
-        Make purchase order from procurement
-        
-        @return : New created Purchase Orders procurement wise
+        """ Make purchase order from procurement
+        @return: New created Purchase Orders procurement wise
         """
         res = {}
         company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
@@ -1263,6 +1429,9 @@ class mrp_procurement(osv.osv):
         return res
 
     def action_cancel(self, cr, uid, ids):
+        """ Cancels procurement and writes move state to Assigned.
+        @return: True 
+        """
         todo = []
         todo2 = []
         move_obj = self.pool.get('stock.move')
@@ -1287,6 +1456,9 @@ class mrp_procurement(osv.osv):
         return self.check_move_done(cr, uid, ids)
 
     def action_check(self, cr, uid, ids):
+        """ Checks procurement move state whether assigned or done. 
+        @return: True 
+        """
         ok = False
         for procurement in self.browse(cr, uid, ids):
             if procurement.move_id.state=='assigned' or procurement.move_id.state=='done':
@@ -1295,10 +1467,16 @@ class mrp_procurement(osv.osv):
         return ok
 
     def action_ready(self, cr, uid, ids):
+        """ Changes procurement state to Ready.
+        @return: True 
+        """
         res = self.write(cr, uid, ids, {'state':'ready'})
         return res
 
     def action_done(self, cr, uid, ids):
+        """ Changes procurement state to Done and writes Closed date.
+        @return: True 
+        """
         move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids):
             if procurement.move_id:
@@ -1311,8 +1489,8 @@ class mrp_procurement(osv.osv):
         return res
 
     def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
-        '''
-        use_new_cursor: False or the dbname
+        ''' Runs through scheduler.
+        @param use_new_cursor: False or the dbname
         '''
         if not context:
             context={}
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 4ddfddf6d90..d395214b87a 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -29,6 +29,9 @@ import time
 
 
 class stock_warehouse_orderpoint(osv.osv):
+    """
+    Defines Minimum stock rules.
+    """
     _name = "stock.warehouse.orderpoint"
     _description = "Orderpoint minimum rule"
     _columns = {
@@ -59,12 +62,20 @@ class stock_warehouse_orderpoint(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
     }
     def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
+        """ Finds location id for changed warehouse.
+        @param warehouse_id: Changed id of warehouse.
+        @return: Dictionary of values.
+        """
         if warehouse_id:
             w=self.pool.get('stock.warehouse').browse(cr,uid,warehouse_id, context)
             v = {'location_id':w.lot_stock_id.id}
             return {'value': v}
         return {}
     def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+        """ Finds UoM for changed product.
+        @param product_id: Changed id of product.
+        @return: Dictionary of values.
+        """
         if product_id:
             prod=self.pool.get('product.product').browse(cr,uid,product_id)
             v = {'product_uom':prod.uom_id.id}
@@ -91,6 +102,10 @@ class StockMove(osv.osv):
         return super(StockMove, self).copy(cr, uid, id, default, context)
 
     def _action_explode(self, cr, uid, move, context={}):
+        """ Explodes pickings.
+        @param move: Stock moves
+        @return: True
+        """
         if move.product_id.supply_method=='produce' and move.product_id.procure_method=='make_to_order':
             bis = self.pool.get('mrp.bom').search(cr, uid, [
                 ('product_id','=',move.product_id.id),
@@ -151,7 +166,12 @@ class StockMove(osv.osv):
         return True
     
     
-    def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None):        
+    def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None): 
+        """ Consumed product with specific quatity from specific source location.
+        @param product_qty: Consumed product quantity
+        @param location_id: Source location
+        @return: Consumed lines
+        """       
         res = []
         production_obj = self.pool.get('mrp.production')
         wf_service = netsvc.LocalService("workflow")
@@ -168,6 +188,11 @@ class StockMove(osv.osv):
         return res
     
     def action_scrap(self, cr, uid, ids, product_qty, location_id, context=None):
+        """ Move the scrap/damaged product into scrap location
+        @param product_qty: Scraped product quantity
+        @param location_id: Scrap location
+        @return: Scraped lines
+        """  
         res = []
         production_obj = self.pool.get('mrp.production')
         wf_service = netsvc.LocalService("workflow")
@@ -202,6 +227,11 @@ class StockPicking(osv.osv):
     # Explode picking by replacing phantom BoMs
     #
     def action_explode(self, cr, uid, picks, *args):
+        """ Explodes picking by replacing phantom BoMs
+        @param picks: Picking ids. 
+        @param *args: Arguments
+        @return: Picking ids.
+        """  
         for move in self.pool.get('stock.move').browse(cr, uid, picks):
             self.pool.get('stock.move')._action_explode(cr, uid, move)
         return picks
@@ -212,6 +242,10 @@ StockPicking()
 class spilt_in_production_lot(osv.osv_memory):
     _inherit = "stock.move.split"
     def split(self, cr, uid, ids, move_ids, context=None):
+        """ Splits move lines into given quantities.
+        @param move_ids: Stock moves.
+        @return: List of new moves.
+        """  
         production_obj = self.pool.get('mrp.production')
         move_obj = self.pool.get('stock.move')  
         res = []      
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 7f1496dd6a1..5f7aa0754e1 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -35,17 +35,13 @@ class change_production_qty(osv.osv_memory):
     }
 
     def default_get(self, cr, uid, fields, context):
-        """ 
-             To get default values for the object.
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param fields: List of fields for which we want default values 
-             @param context: A standard dictionary 
-             
-             @return: A dictionary which of fields with values. 
-        
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values 
+        @param context: A standard dictionary 
+        @return: A dictionary which of fields with values. 
         """        
         res = super(change_production_qty, self).default_get(cr, uid, fields, context=context)        
         prod_obj = self.pool.get('mrp.production')
@@ -56,16 +52,13 @@ class change_production_qty(osv.osv_memory):
         
     def change_prod_qty(self, cr, uid, ids, context):
         """ 
-             Changes the Quantity of Product.
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: List of IDs selected 
-             @param context: A standard dictionary 
-             
-             @return:  
-        
+        Changes the Quantity of Product.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected 
+        @param context: A standard dictionary 
+        @return:  
         """
         record_id = context and context.get('active_id',False)
         assert record_id, _('Active Id is not found')
diff --git a/addons/mrp/wizard/make_procurement_product.py b/addons/mrp/wizard/make_procurement_product.py
index a549d9f24b2..a2dd62327bb 100644
--- a/addons/mrp/wizard/make_procurement_product.py
+++ b/addons/mrp/wizard/make_procurement_product.py
@@ -29,17 +29,13 @@ class make_procurement(osv.osv_memory):
     _description = 'Make Procurements'
     
     def onchange_product_id(self, cr, uid, ids, prod_id):
-        """ 
-             On Change of Product ID getting the value of related UoM.
-        
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: List of IDs selected 
-             @param prod_id: Changed ID of Product 
-             
-             @return: A dictionary which gives the UoM of the changed Product 
-        
+        """ On Change of Product ID getting the value of related UoM.
+         @param self: The object pointer.
+         @param cr: A database cursor
+         @param uid: ID of the user currently logged in
+         @param ids: List of IDs selected 
+         @param prod_id: Changed ID of Product 
+         @return: A dictionary which gives the UoM of the changed Product 
         """
         product = self.pool.get('product.product').browse(cr, uid, prod_id)
         return {'value': {'uom_id': product.uom_id.id}}
@@ -58,17 +54,13 @@ class make_procurement(osv.osv_memory):
     }
     
     def make_procurement(self, cr, uid, ids, context=None):
-        """ 
-             Creates procurement order for selected product.
-        
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: List of IDs selected 
-             @param context: A standard dictionary 
-             
-             @return: A dictionary which loads Procurement form view. 
-        
+        """ Creates procurement order for selected product.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected 
+        @param context: A standard dictionary 
+        @return: A dictionary which loads Procurement form view. 
         """
         user = self.pool.get('res.users').browse(cr, uid, uid, context).login
         wh_obj = self.pool.get('stock.warehouse')
@@ -109,17 +101,13 @@ class make_procurement(osv.osv_memory):
          }
     
     def default_get(self, cr, uid, fields, context=None):
-        """ 
-             To get default values for the object.
-            
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param fields: List of fields for which we want default values 
-             @param context: A standard dictionary 
-             
-             @return: A dictionary which of fields with values. 
-        
+        """ To get default values for the object.
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param fields: List of fields for which we want default values 
+        @param context: A standard dictionary 
+        @return: A dictionary which of fields with values. 
         """
         record_id = context and context.get('active_id', False) or False
 
diff --git a/addons/mrp/wizard/mrp_price.py b/addons/mrp/wizard/mrp_price.py
index 5d3c16cbaa5..55393a4371c 100644
--- a/addons/mrp/wizard/mrp_price.py
+++ b/addons/mrp/wizard/mrp_price.py
@@ -29,15 +29,12 @@ class mrp_price(osv.osv_memory):
     }
     
     def print_report(self, cr, uid, ids, context=None):
-        """ 
-             To print the report of Product cost structure
-                        
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             
-             @return : Report
+        """ To print the report of Product cost structure
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param context: A standard dictionary 
+        @return : Report
         """        
         datas = {'ids' : context.get('active_ids',[])}
         res = self.read(cr, uid, ids, ['number'])
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 7c77dfdee94..b64567a407a 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -34,15 +34,12 @@ class mrp_product_produce(osv.osv_memory):
     }
 
     def _get_product_qty(self, cr, uid, context):
-        """ 
-             To obtain product quantity
-        
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary
-             @return: quantity 
-        
+        """ To obtain product quantity
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param context: A standard dictionary
+        @return: Quantity 
         """        
         prod = self.pool.get('mrp.production').browse(cr, uid, 
                                 context['active_id'], context=context)
@@ -57,16 +54,13 @@ class mrp_product_produce(osv.osv_memory):
                  }
 
     def do_produce(self, cr, uid, ids, context={}):
-        """ 
-             To check the product type
-        
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: the ID or list of IDs if we want more than one 
-             @param context: A standard dictionary
-             @return:  
-        
+        """ To check the product type
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: the ID or list of IDs if we want more than one 
+        @param context: A standard dictionary
+        @return:  
         """               
         prod_obj = self.pool.get('mrp.production')
         move_ids = context['active_ids']
diff --git a/addons/mrp/wizard/mrp_track_prod.py b/addons/mrp/wizard/mrp_track_prod.py
index 52e5508317a..11e1ec32ec6 100644
--- a/addons/mrp/wizard/mrp_track_prod.py
+++ b/addons/mrp/wizard/mrp_track_prod.py
@@ -26,8 +26,7 @@ class mrp_track_move(osv.osv_memory):
     _description = 'Production Track'
             
     def view_init(self, cr, uid, fields_list, context=None):
-        """ 
-         Creates view dynamically and adding fields at runtime.
+        """ Creates view dynamically and adding fields at runtime.
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
@@ -48,8 +47,7 @@ class mrp_track_move(osv.osv_memory):
         return res
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        """ 
-         Changes the view dynamically
+        """ Changes the view dynamically
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
@@ -88,8 +86,7 @@ class mrp_track_move(osv.osv_memory):
         return res
     
     def track_lines(self, cr, uid, ids, context):
-        """
-         Tracks Finished products and splits products to finish lines.
+        """ Tracks Finished products and splits products to finish lines.
          @param self: The object pointer.
          @param cr: A database cursor
          @param uid: ID of the user currently logged in
diff --git a/addons/mrp/wizard/mrp_workcenter_load.py b/addons/mrp/wizard/mrp_workcenter_load.py
index 1b5478dcbeb..db08b170ee1 100644
--- a/addons/mrp/wizard/mrp_workcenter_load.py
+++ b/addons/mrp/wizard/mrp_workcenter_load.py
@@ -31,15 +31,12 @@ class mrp_workcenter_load(osv.osv_memory):
     }
 
     def print_report(self, cr, uid, ids, context=None):
-        """ 
-             To print the report of Work Center Load
-                        
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param context: A standard dictionary 
-             
-             @return : Report
+        """ To print the report of Work Center Load
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param context: A standard dictionary 
+        @return : Report
         """        
         datas = {'ids' : context.get('active_ids',[])}
         res = self.read(cr, uid, ids, ['time_unit','measure_unit'])
diff --git a/addons/mrp/wizard/orderpoint_procurement.py b/addons/mrp/wizard/orderpoint_procurement.py
index 731c3fca440..56302660939 100644
--- a/addons/mrp/wizard/orderpoint_procurement.py
+++ b/addons/mrp/wizard/orderpoint_procurement.py
@@ -41,11 +41,11 @@ class procurement_compute(osv.osv_memory):
     
     def _procure_calculation_orderpoint(self, cr, uid, ids, context):
         """ 
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: List of IDs selected 
-             @param context: A standard dictionary 
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected 
+        @param context: A standard dictionary 
         """        
         proc_obj = self.pool.get('mrp.procurement')
         for proc in self.browse(cr, uid, ids):
@@ -55,12 +55,11 @@ class procurement_compute(osv.osv_memory):
     
     def procure_calculation(self, cr, uid, ids, context):
         """ 
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: List of IDs selected 
-             @param context: A standard dictionary 
-        
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected 
+        @param context: A standard dictionary 
         """
         threaded_calculation = threading.Thread(target=self._procure_calculation_orderpoint, args=(cr, uid, ids, context))
         threaded_calculation.start()
diff --git a/addons/mrp/wizard/schedulers_all.py b/addons/mrp/wizard/schedulers_all.py
index 62497564905..ad67b1330d0 100644
--- a/addons/mrp/wizard/schedulers_all.py
+++ b/addons/mrp/wizard/schedulers_all.py
@@ -37,11 +37,11 @@ class procurement_compute(osv.osv_memory):
     
     def _procure_calculation_all(self, cr, uid, ids, context):
         """ 
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: List of IDs selected 
-             @param context: A standard dictionary 
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected 
+        @param context: A standard dictionary 
         """
         proc_obj = self.pool.get('mrp.procurement')
         for proc in self.browse(cr, uid, ids):
@@ -51,11 +51,11 @@ class procurement_compute(osv.osv_memory):
     
     def procure_calculation(self, cr, uid, ids, context):
         """ 
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: List of IDs selected 
-             @param context: A standard dictionary 
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected 
+        @param context: A standard dictionary 
         """
         threaded_calculation = threading.Thread(target=self._procure_calculation_all, args=(cr, uid, ids, context))
         threaded_calculation.start()

From eeff7f200e0fb00f32daf5fe54302b8ff628bdb2 Mon Sep 17 00:00:00 2001
From: mso <mso@mso>
Date: Wed, 5 May 2010 15:31:17 +0530
Subject: [PATCH 220/248] [IMP] stock,mrp: change_standard_price modification

bzr revid: mso@mso-20100505100117-3og5779kkfvg4vqu
---
 addons/mrp/product.py                         | 93 ++++++++++++-------
 addons/stock/product.py                       |  7 +-
 .../wizard/stock_change_standard_price.py     | 19 ++--
 3 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 7ddc9a65f3a..50900742041 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,50 +26,71 @@ from tools.translate import _
 class product_product(osv.osv):
     _inherit = "product.product"    
 
+    def get_product_accounts(self, cr, uid, product_id, context={}):
+        
+        """ 
+             To get the stock input account, stock output account and stock journal related to product.
+            
+             @param product_id : product id            
+             @return:  dictionary which contains information regarding stock input account, stock output account and stock journal
+        
+        """           
+        product_obj = self.pool.get('product.product').browse(cr, uid, product_id, False)
+        
+        stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False 
+        if not stock_input_acc:
+            stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
+        
+        stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
+        if not stock_output_acc:
+            stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
+
+        journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
+        
+        res = {}
+        res.update({'stock_account_input': stock_input_acc})
+        res.update({'stock_account_output': stock_output_acc})
+        res.update({'stock_journal': journal_id})  
+        
+        return res
+    
     def do_change_standard_price(self, cr, uid, ids, datas, context={}):
+        """ 
+             Changes the Standard Price of Product and parent products and creates an account move accordingly.
+            
+             @param datas : dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
+             @param context: A standard dictionary 
+             
+             @return:  
+        
+        """           
         #TODO : TO Check 
         res = super(product_product, self).do_change_standard_price(cr, uid, ids, datas, context=context)
         bom_obj = self.pool.get('mrp.bom')
-        product_uom_obj = self.pool.get('product.uom')
 
-        def _compute_price(bom):       
-            print bom.product_id
-            price = 0
-#            if bom.bom_lines:
-#                for sbom in bom.bom_lines:
-#                    print "--->>>" , sbom.name
-#                    price += _compute_price(sbom) * sbom.product_qty                    
-#            else:
-            parent_bom = bom_obj.search(cr, uid, [('bom_id', '=', False)])
-            for p in parent_bom:
-                test_obj = bom_obj.browse(cr, uid, p)
-                print test_obj
-                
-#            if no_child_bom and bom.id not in no_child_bom:
-#                other_bom = bom_obj.browse(cr, uid, no_child_bom)[0]
-#                if not other_bom.product_id.calculate_price:
-#                    price += _compute_price(other_bom) * other_bom.product_qty
-#                else:
-#                    price += other_bom.product_id.standard_price
-#            else:
-#                price += bom.product_id.standard_price
-#
-#            if bom.routing_id:
-#                for wline in bom.routing_id.workcenter_lines:
-#                    wc = wline.workcenter_id
-#                    cycle = wline.cycle_nbr
-#                    hour = (wc.time_start + wc.time_stop + cycle * wc.time_cycle) *  (wc.time_efficiency or 1.0)
-#                    price += wc.costs_cycle * cycle + wc.costs_hour * hour
-#                    price = product_uom_obj._compute_price(cr, uid, bom.product_uom.id, price, bom.product_id.uom_id.id)
-#            if bom.bom_lines:
-#                self.write(cr, uid, [bom.product_id.id], {'standard_price' : price/bom.product_qty})
-#            if bom.product_uom.id != bom.product_id.uom_id.id:
-#                price = product_uom_obj._compute_price(cr, uid, bom.product_uom.id, price, bom.product_id.uom_id.id)
-#            return price
+        def _compute_price(bom):
+            price = 0.0
+            if bom.bom_id :
+                if bom.bom_id.bom_lines :
+                    for bom_line in bom.bom_id.bom_lines :
+                        prod_price = self.read(cr, uid, bom_line.product_id.id, ['standard_price'])['standard_price']
+                        price += bom_line.product_qty *  prod_price
 
+                    accounts = self.get_product_accounts(cr, uid, bom.bom_id.product_id.id , context)
+                    
+                    datas = {
+                        'new_price' : price,
+                        'stock_output_account' : accounts['stock_account_output'],
+                        'stock_input_account' : accounts['stock_account_input'],
+                        'stock_journal' : accounts['stock_journal']
+                    }
+                    super(product_product, self).do_change_standard_price(cr, uid, [bom.bom_id.product_id.id], datas, context)
+                _compute_price(bom.bom_id)
+            return price
         
         bom_ids = bom_obj.search(cr, uid, [('product_id', 'in', ids)])
+        
         for bom in bom_obj.browse(cr, uid, bom_ids):
             _compute_price(bom)
-        return res    
+
 product_product()
diff --git a/addons/stock/product.py b/addons/stock/product.py
index d771815a4d4..ce933686760 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -28,13 +28,8 @@ class product_product(osv.osv):
 
     def do_change_standard_price(self, cr, uid, ids, datas, context={}):
         """ 
-             Changes the Standard Price of Product. 
-             And creates an account move accordingly.
+             Changes the Standard Price of Product and creates an account move accordingly.
             
-             @param self: The object pointer.
-             @param cr: A database cursor
-             @param uid: ID of the user currently logged in
-             @param ids: List of IDs selected 
              @param datas : dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
              @param context: A standard dictionary 
              
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index fb8f9b66e3f..9b39957df77 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -46,31 +46,24 @@ class change_standard_price(osv.osv_memory):
          @return: A dictionary which of fields with values. 
         
         """ 
-        product_obj = self.pool.get('product.product').browse(cr, uid, context.get('active_id', False))
+        product_pool = self.pool.get('product.product')
+        product_obj = product_pool.browse(cr, uid, context.get('active_id', False))
         res = super(change_standard_price, self).default_get(cr, uid, fields, context=context)   
         
-        stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False 
-        if not stock_input_acc:
-            stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
+        accounts = product_pool.get_product_accounts(cr, uid, context.get('active_id', False), context={})
         
-        stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
-        if not stock_output_acc:
-            stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
-
         price = product_obj.standard_price
-        journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
         
         if 'new_price' in fields:
             res.update({'new_price': price})
         if 'stock_account_input' in fields:
-            res.update({'stock_account_input': stock_input_acc})         
+            res.update({'stock_account_input': accounts['stock_account_input']})         
         if 'stock_account_output' in fields:
-            res.update({'stock_account_output': stock_output_acc})         
+            res.update({'stock_account_output': accounts['stock_account_output']})         
         if 'stock_journal' in fields:
-            res.update({'stock_journal': journal_id})  
+            res.update({'stock_journal': accounts['stock_journal']})  
         if 'enable_stock_in_out_acc' in fields:
             res.update({'enable_stock_in_out_acc': True})              
-                 
                      
         return res
     

From 09a575a05ed473af3da97fd489731da67c6f4b61 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 5 Apr 2010 18:44:56 +0530
Subject: [PATCH 221/248] [IMP] point_of_sale,product: add the view_init in
 pos_discount and  fix the problem of price

bzr revid: sbh@tinyerp.com-20100405131456-rryojlpix96y62d0
---
 addons/point_of_sale/wizard/pos_discount.py | 10 +++++++++-
 addons/point_of_sale/wizard/pos_payment.py  |  2 +-
 addons/product/pricelist.py                 |  2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index f85a9d233ce..8b0f4b45fa4 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -35,6 +35,14 @@ class pos_discount(osv.osv_memory):
         'discount': lambda *a: 5,
     }
 
+        
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(pos_discount, self).view_init(cr, uid, fields_list, context=context)
+        record_id = context and context.get('active_id', False) or False        
+        order = self.pool.get('pos.order').browse(cr, uid, record_id)
+        if not order.lines:
+                raise osv.except_osv('Error!','No Order Lines ')
+        True
     def apply_discount(self, cr, uid, ids, context):
         """
          To give the discount of  product and check the.
@@ -52,7 +60,7 @@ class pos_discount(osv.osv_memory):
 
         order_ref = self.pool.get('pos.order')
         order_line_ref = self.pool.get('pos.order.line')
-
+            
         for order in order_ref.browse(cr, uid, record_id, context=context):
 
             for line in order.lines:
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index c7b0da38168..c34e7fad9e1 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -84,7 +84,7 @@ class pos_make_payment(osv.osv_memory):
         record_id = context and context.get('active_id', False) or False        
         order = self.pool.get('pos.order').browse(cr, uid, record_id)
         if not order.lines:
-                raise osv.except_osv('Error!','No Order Lines ')
+                raise osv.except_osv('Error!','No order lines defined for this sale ')
         True
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 001bee74055..bfd987d6f3d 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -136,6 +136,8 @@ class product_pricelist(osv.osv):
             'date': Date of the pricelist (%Y-%m-%d),
         }
         '''
+        price=False
+        item_id=0
         context = context or {}
         currency_obj = self.pool.get('res.currency')
         product_obj = self.pool.get('product.product')

From 1b3c687e4bd1d823c389b0302ecbd1bd8dba81de Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Mon, 5 Apr 2010 23:14:19 +0200
Subject: [PATCH 222/248] [REF] Extract some functions before adding new
 things.

bzr revid: jth@openerp.com-20100405211419-yokve9t42fna43n3
---
 bin/addons/__init__.py | 70 +++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index e07fdd07bbc..e3550cd7018 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -591,6 +591,43 @@ class MigrationManager(object):
 
 
 def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
+    
+    def process_sql_file(cr, file):
+        queries = fp.read().split(';')
+        for query in queries:
+            new_query = ' '.join(query.split())
+            if new_query:
+                cr.execute(new_query)
+   
+    def load_init_update_xml(cr, m, idref, mode, kind):
+        for filename in package.data.get('%s_xml' % kind, []):
+            logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, filename))
+            _, ext = os.path.splitext(filename)
+            fp = tools.file_open(opj(m, filename))
+            if ext == '.csv':
+                noupdate = (kind == 'init')
+                tools.convert_csv_import(cr, m, os.path.basename(filename), fp.read(), idref, mode=mode, noupdate=noupdate)
+            elif ext == '.sql':
+                process_sql_file(cr, fp)
+            elif ext == '.yml':
+                tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
+            else:
+                tools.convert_xml_import(cr, m, fp, idref, mode=mode, **kwargs)
+            fp.close()
+
+    def load_demo_xml(cr, m, idref, mode):
+        for xml in package.data.get('demo_xml', []):
+            name, ext = os.path.splitext(xml)
+            logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, xml))
+            fp = tools.file_open(opj(m, xml))
+            if ext == '.csv':
+                tools.convert_csv_import(cr, m, os.path.basename(xml), fp.read(), idref, mode=mode, noupdate=True)
+            elif ext == '.yml':
+                tools.convert_yaml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
+            else:
+                tools.convert_xml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
+            fp.close()
+    
     # **kwargs is passed directly to convert_xml_import
     if not status:
         status = {}
@@ -647,39 +684,10 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
                     'license': package.data.get('license', 'GPL-2'),
                     'certificate': package.data.get('certificate') or None,
                     })
-                for filename in package.data.get('%s_xml' % kind, []):
-                    logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, filename))
-                    name, ext = os.path.splitext(filename)
-                    fp = tools.file_open(opj(m, filename))
-                    if ext == '.csv':
-                        noupdate=False
-                        if kind == 'init':
-                            noupdate=True
-                        tools.convert_csv_import(cr, m, os.path.basename(filename), fp.read(), idref, mode=mode, noupdate=noupdate)
-                    elif ext == '.sql':
-                        queries = fp.read().split(';')
-                        for query in queries:
-                            new_query = ' '.join(query.split())
-                            if new_query:
-                                cr.execute(new_query)
-                    elif ext == '.yml':
-                        tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
-                    else:
-                        tools.convert_xml_import(cr, m, fp, idref, mode=mode, **kwargs)
-                    fp.close()
+                load_init_update_xml(cr, m, idref, mode, kind)
             if hasattr(package, 'demo') or (package.dbdemo and package.state != 'installed'):
                 status['progress'] = (float(statusi)+0.75) / len(graph)
-                for xml in package.data.get('demo_xml', []):
-                    name, ext = os.path.splitext(xml)
-                    logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading %s' % (m, xml))
-                    fp = tools.file_open(opj(m, xml))
-                    if ext == '.csv':
-                        tools.convert_csv_import(cr, m, os.path.basename(xml), fp.read(), idref, mode=mode, noupdate=True)
-                    elif ext == '.yml':
-                        tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
-                    else:
-                        tools.convert_xml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
-                    fp.close()
+                load_demo_xml(cr, m, idref, mode)
                 cr.execute('update ir_module_module set demo=%s where id=%s', (True, mid))
             package_todo.append(package.name)
 

From 1982e4bf3c559de1da266618e9b5de75eca9f14e Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 6 Apr 2010 12:32:31 +0530
Subject: [PATCH 223/248] [REVIEW]: code review

bzr revid: mga@tinyerp.com-20100406070231-zurxtsmvqk0szjv7
---
 addons/survey/survey.py | 101 +++++++++++++++++++---------------------
 1 file changed, 48 insertions(+), 53 deletions(-)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index f7bb9329436..a1db5bdcc86 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -97,7 +97,6 @@ class survey(osv.osv):
 
 survey()
 
-
 class survey_history(osv.osv):
     _name = 'survey.history'
     _description = 'Survey History'
@@ -110,7 +109,6 @@ class survey_history(osv.osv):
     _defaults = {
          'date': lambda * a: datetime.datetime.now()
     }
-
 survey_history()
 
 class survey_page(osv.osv):
@@ -144,14 +142,14 @@ class survey_page(osv.osv):
         surv_name_wiz = self.pool.get('survey.name.wiz')
         surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',0) })
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id': search_id[0],
-                'context': context
-                }
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'search_view_id': search_id[0],
+            'context': context
+        }
 
     def copy(self, cr, uid, id, default=None, context={}):
         raise osv.except_osv(_('Warning !'),_('You cannot duplicate the resource!'))
@@ -196,28 +194,28 @@ class survey_question(osv.osv):
         'descriptive_text': fields.text('Descriptive Text', size=255),
         'column_heading_ids': fields.one2many('survey.question.column.heading', 'question_id',' Column heading'),
         'type': fields.selection([('multiple_choice_only_one_ans','Multiple Choice (Only One Answer)'),
-                                     ('multiple_choice_multiple_ans','Multiple Choice (Multiple Answer)'),
-                                     ('matrix_of_choices_only_one_ans','Matrix of Choices (Only One Answers Per Row)'),
-                                     ('matrix_of_choices_only_multi_ans','Matrix of Choices (Multiple Answers Per Row)'),
-                                     ('matrix_of_drop_down_menus','Matrix of Drop-down Menus'),
-                                     ('rating_scale','Rating Scale'),('single_textbox','Single Textbox'),
-                                     ('multiple_textboxes','Multiple Textboxes'),
-                                     ('multiple_textboxes_diff_type','Multiple Textboxes With Different Type'),
-                                     ('comment','Comment/Essay Box'),
-                                     ('numerical_textboxes','Numerical Textboxes'),('date','Date'),
-                                     ('date_and_time','Date and Time'),('descriptive_text','Descriptive Text'),
-                                     ('table','Table'),
-                                    ], 'Question Type',  required=1,),
+             ('multiple_choice_multiple_ans','Multiple Choice (Multiple Answer)'),
+             ('matrix_of_choices_only_one_ans','Matrix of Choices (Only One Answers Per Row)'),
+             ('matrix_of_choices_only_multi_ans','Matrix of Choices (Multiple Answers Per Row)'),
+             ('matrix_of_drop_down_menus','Matrix of Drop-down Menus'),
+             ('rating_scale','Rating Scale'),('single_textbox','Single Textbox'),
+             ('multiple_textboxes','Multiple Textboxes'),
+             ('multiple_textboxes_diff_type','Multiple Textboxes With Different Type'),
+             ('comment','Comment/Essay Box'),
+             ('numerical_textboxes','Numerical Textboxes'),('date','Date'),
+             ('date_and_time','Date and Time'),('descriptive_text','Descriptive Text'),
+             ('table','Table'),
+            ], 'Question Type',  required=1,),
         'is_comment_require': fields.boolean('Add Comment Field (optional)'),
         'comment_label': fields.char('Field Label', size = 255),
         'comment_field_type': fields.selection([('char', 'Single Line Of Text'), ('text', 'Paragraph of Text')], 'Comment Field Type'),
         'comment_valid_type': fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''),
-                                                 ('must_be_specific_length', 'Must Be Specific Length'),
-                                                 ('must_be_whole_number', 'Must Be A Whole Number'),
-                                                 ('must_be_decimal_number', 'Must Be A Decimal Number'),
-                                                 ('must_be_date', 'Must Be A Date'),
-                                                 ('must_be_email_address', 'Must Be An Email Address'),
-                                                 ], 'Text Validation'),
+             ('must_be_specific_length', 'Must Be Specific Length'),
+             ('must_be_whole_number', 'Must Be A Whole Number'),
+             ('must_be_decimal_number', 'Must Be A Decimal Number'),
+             ('must_be_date', 'Must Be A Date'),
+             ('must_be_email_address', 'Must Be An Email Address'),
+             ], 'Text Validation'),
         'comment_minimum_no': fields.integer('Minimum number'),
         'comment_maximum_no': fields.integer('Maximum number'),
         'comment_minimum_float': fields.float('Minimum decimal number'),
@@ -229,12 +227,12 @@ class survey_question(osv.osv):
         'make_comment_field_err_msg': fields.text('Error message'),
         'is_validation_require': fields.boolean('Validate Text (optional)'),
         'validation_type': fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''),\
-                                                 ('must_be_specific_length', 'Must Be Specific Length'),\
-                                                 ('must_be_whole_number', 'Must Be A Whole Number'),\
-                                                 ('must_be_decimal_number', 'Must Be A Decimal Number'),\
-                                                 ('must_be_date', 'Must Be A Date'),\
-                                                 ('must_be_email_address', 'Must Be An Email Address')\
-                                                 ], 'Text Validation'),
+             ('must_be_specific_length', 'Must Be Specific Length'),\
+             ('must_be_whole_number', 'Must Be A Whole Number'),\
+             ('must_be_decimal_number', 'Must Be A Decimal Number'),\
+             ('must_be_date', 'Must Be A Date'),\
+             ('must_be_email_address', 'Must Be An Email Address')\
+             ], 'Text Validation'),
         'validation_minimum_no': fields.integer('Minimum number'),
         'validation_maximum_no': fields.integer('Maximum number'),
         'validation_minimum_float': fields.float('Minimum decimal number'),
@@ -437,14 +435,14 @@ class survey_question(osv.osv):
         surv_name_wiz = self.pool.get('survey.name.wiz')
         surv_name_wiz.write(cr, uid, [context.get('sur_name_id',False)], {'transfer':True, 'page_no' : context.get('page_number',False) })
         return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'survey.question.wiz',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'search_view_id': search_id[0],
-                'context': context
-                }
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'search_view_id': search_id[0],
+            'context': context
+        }
 
     def default_get(self, cr, uid, fields, context={}):
         data = super(survey_question, self).default_get(cr, uid, fields, context)
@@ -453,7 +451,7 @@ class survey_question(osv.osv):
                 data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
 
         if context.has_key('page_id'):
-            data['page_id']= context.get('page_id',False)
+            data['page_id']= context.get('page_id', False)
         return data
 
 survey_question()
@@ -465,11 +463,11 @@ class survey_question_column_heading(osv.osv):
     _rec_name = 'title'
 
     def _get_in_visible_rating_weight(self,cr, uid, context={}):
-        if context.get('in_visible_rating_weight',False):
+        if context.get('in_visible_rating_weight', False):
             return context['in_visible_rating_weight']
         return False
     def _get_in_visible_menu_choice(self,cr, uid, context={}):
-        if context.get('in_visible_menu_choice',False):
+        if context.get('in_visible_menu_choice', False):
             return context['in_visible_menu_choice']
         return False
 
@@ -485,7 +483,6 @@ class survey_question_column_heading(osv.osv):
        'in_visible_rating_weight': _get_in_visible_rating_weight,
        'in_visible_menu_choice': _get_in_visible_menu_choice,
     }
-
 survey_question_column_heading()
 
 class survey_answer(osv.osv):
@@ -496,7 +493,7 @@ class survey_answer(osv.osv):
 
     def _calc_response_avg(self, cr, uid, ids, field_name, arg, context):
         val = {}
-        for rec in self.browse(cr, uid, ids):
+        for rec in self.browse(cr, uid, ids, context):
             cr.execute("select count(question_id) ,(select count(answer_id) \
                 from survey_response_answer sra, survey_response_line sa \
                 where sra.response_id = sa.id and sra.answer_id = %d \
@@ -515,9 +512,7 @@ class survey_answer(osv.osv):
         return val
 
     def _get_in_visible_answer_type(self,cr, uid, context={}):
-        if context.get('in_visible_answer_type',False):
-            return context.get('in_visible_answer_type',False)
-        return False
+        return context.get('in_visible_answer_type', False)
 
     _columns = {
         'question_id': fields.many2one('survey.question', 'Question', ondelete='cascade'),
@@ -526,8 +521,8 @@ class survey_answer(osv.osv):
         'response': fields.function(_calc_response_avg, method=True, string="#Answer", multi='sums'),
         'average': fields.function(_calc_response_avg, method=True, string="#Avg", multi='sums'),
         'type': fields.selection([('char','Character'),('date','Date'),('datetime','Date & Time'),\
-                    ('integer','Integer'),('float','Float'),('selection','Selection'),\
-                    ('email','Email')], "Type of Answer",required=1),
+            ('integer','Integer'),('float','Float'),('selection','Selection'),\
+            ('email','Email')], "Type of Answer",required=1),
         'menu_choice': fields.text('Menu Choices'),
         'in_visible_answer_type': fields.boolean('Is Answer Type Invisible??')
     }
@@ -539,7 +534,7 @@ class survey_answer(osv.osv):
 
     def default_get(self, cr, uid, fields, context={}):
         data = super(survey_answer, self).default_get(cr, uid, fields, context)
-        if context.get('line_order',False):
+        if context.get('line_order', False):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
                 data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
         return data

From 59e15ebce0e9c5f70378adef965a046c48703189 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Tue, 6 Apr 2010 14:31:56 +0530
Subject: [PATCH 224/248] [REVIEW]: code review

bzr revid: mga@tinyerp.com-20100406090156-3wesrbw3ue8g739f
---
 addons/base_calendar/base_calendar.py | 339 +++++++++++++-------------
 1 file changed, 169 insertions(+), 170 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index f7608219b9d..6a29b023301 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -31,9 +31,10 @@ import time
 import tools
 
 months = {
-        1: "January", 2: "February", 3: "March", 4: "April", \
-        5: "May", 6: "June", 7: "July", 8: "August", 9: "September", \
-        10: "October", 11: "November", 12: "December"}
+    1: "January", 2: "February", 3: "March", 4: "April", \
+    5: "May", 6: "June", 7: "July", 8: "August", 9: "September", \
+    10: "October", 11: "November", 12: "December"
+}
 
 def get_recurrent_dates(rrulestring, exdate, startdate=None):
     """
@@ -94,7 +95,6 @@ def real_id2base_calendar_id(real_id, recurrent_date):
         return '%d-%s' % (real_id, recurrent_date)
     return real_id
 
-
 def _links_get(self, cr, uid, context={}):
     """
     Get request link.
@@ -385,9 +385,11 @@ request was delegated to"),
     response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
 
     def msg_new(self, cr, uid, msg):
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks, """
+        """ 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks, 
+        """
         return False
 
     def msg_act_get(self, msg):
@@ -446,25 +448,25 @@ request was delegated to"),
                              (att2.partner_id and att2.partner_id.name) or \
                                 att2.email) +  ' - Status: ' + att2.state.title())
             body_vals = {'name': res_obj.name,
-                        'start_date': res_obj.date,
-                        'end_date': res_obj.date_deadline or False,
-                        'description': res_obj.description or '-',
-                        'location': res_obj.location or '-',
-                        'attendees': '<br>'.join(att_infos),
-                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User',
-                        'sign': sign,
-                        'company': company
+                'start_date': res_obj.date,
+                'end_date': res_obj.date_deadline or False,
+                'description': res_obj.description or '-',
+                'location': res_obj.location or '-',
+                'attendees': '<br>'.join(att_infos),
+                'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User',
+                'sign': sign,
+                'company': company
             }
             body = html_invitation % body_vals
             if mail_to and email_from:
                 tools.email_send(
-                        email_from,
-                        mail_to,
-                        sub,
-                        body,
-                        subtype='html',
-                        reply_to=email_from
-                    )
+                    email_from,
+                    mail_to,
+                    sub,
+                    body,
+                    subtype='html',
+                    reply_to=email_from
+                )
             return True
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
         """
@@ -507,7 +509,6 @@ request was delegated to"),
         for vals in self.browse(cr, uid, ids, context=context):
             user = vals.user_id
             if user:
-
                 mod_obj = self.pool.get(vals.ref._name)
                 if vals.ref:
                     if vals.ref.user_id.id != user.id:
@@ -562,9 +563,7 @@ class res_alarm(osv.osv):
 are both optional, but if one occurs, so MUST the other"""),
         'repeat': fields.integer('Repeat'),
         'active': fields.boolean('Active', help="If the active field is set to \
-                    true, it will allow you to hide the event alarm information without removing it."),
-
-
+                    true, it will allow you to hide the event alarm information without removing it.")
     }
     _defaults = {
         'trigger_interval':  lambda *x: 'minutes',
@@ -590,10 +589,10 @@ are both optional, but if one occurs, so MUST the other"""),
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
 
         model_obj = self.pool.get(model)
-        for data in model_obj.browse(cr, uid, ids):
+        for data in model_obj.browse(cr, uid, ids, context):
 
             basic_alarm = data.alarm_id
-            if not context.get('alarm_id'):
+            if not context.get('alarm_id', False):
                 self.do_alarm_unlink(cr, uid, [data.id], model)
                 return True
             self.do_alarm_unlink(cr, uid, [data.id], model)
@@ -636,7 +635,7 @@ are both optional, but if one occurs, so MUST the other"""),
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
         model_obj = self.pool.get(model)
-        for datas in model_obj.browse(cr, uid, ids):
+        for datas in model_obj.browse(cr, uid, ids, context):
             alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', datas.id)])
             if alarm_ids:
                 alarm_obj.unlink(cr, uid, alarm_ids)
@@ -654,35 +653,35 @@ class calendar_alarm(osv.osv):
     __attribute__ = {}
 
     _columns = {
-            'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'),
-            'name': fields.char('Summary', size=124, help="""Contains the text to be \
-                         used as the message subject for email \
-                         or contains the text to be used for display"""),
-            'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
-                    ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
-                    required=True, help="Defines the action to be invoked when an alarm is triggered"),
-            'description': fields.text('Description', help='Provides a more complete \
-                                description of the calendar component, than that \
-                                provided by the "SUMMARY" property'),
-            'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
-                                          'alarm_id', 'attendee_id', 'Attendees', readonly=True),
-            'attach': fields.binary('Attachment', help="""* Points to a sound resource,\
-                         which is rendered when the alarm is triggered for audio,
-                        * File which is intended to be sent as message attachments for email,
-                        * Points to a procedure resource, which is invoked when\
-                          the alarm is triggered for procedure."""),
-            'res_id': fields.integer('Resource ID'),
-            'model_id': fields.many2one('ir.model', 'Model'),
-            'user_id': fields.many2one('res.users', 'Owner'),
-            'event_date': fields.datetime('Event Date'),
-            'event_end_date': fields.datetime('Event End Date'),
-            'trigger_date': fields.datetime('Trigger Date', readonly="True"),
-            'state':fields.selection([
-                        ('draft', 'Draft'),
-                        ('run', 'Run'),
-                        ('stop', 'Stop'),
-                        ('done', 'Done'),
-                    ], 'State', select=True, readonly=True),
+        'alarm_id': fields.many2one('res.alarm', 'Basic Alarm', ondelete='cascade'),
+        'name': fields.char('Summary', size=124, help="""Contains the text to be \
+                     used as the message subject for email \
+                     or contains the text to be used for display"""),
+        'action': fields.selection([('audio', 'Audio'), ('display', 'Display'), \
+                ('procedure', 'Procedure'), ('email', 'Email') ], 'Action', \
+                required=True, help="Defines the action to be invoked when an alarm is triggered"),
+        'description': fields.text('Description', help='Provides a more complete \
+                            description of the calendar component, than that \
+                            provided by the "SUMMARY" property'),
+        'attendee_ids': fields.many2many('calendar.attendee', 'alarm_attendee_rel', \
+                                      'alarm_id', 'attendee_id', 'Attendees', readonly=True),
+        'attach': fields.binary('Attachment', help="""* Points to a sound resource,\
+                     which is rendered when the alarm is triggered for audio,
+                    * File which is intended to be sent as message attachments for email,
+                    * Points to a procedure resource, which is invoked when\
+                      the alarm is triggered for procedure."""),
+        'res_id': fields.integer('Resource ID'),
+        'model_id': fields.many2one('ir.model', 'Model'),
+        'user_id': fields.many2one('res.users', 'Owner'),
+        'event_date': fields.datetime('Event Date'),
+        'event_end_date': fields.datetime('Event End Date'),
+        'trigger_date': fields.datetime('Trigger Date', readonly="True"),
+        'state':fields.selection([
+                    ('draft', 'Draft'),
+                    ('run', 'Run'),
+                    ('stop', 'Stop'),
+                    ('done', 'Done'),
+                ], 'State', select=True, readonly=True),
      }
 
     _defaults = {
@@ -717,15 +716,14 @@ class calendar_alarm(osv.osv):
     def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, \
                        context=None):
         """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of calendar alarm’s IDs.
-            @param use_new_cursor: False or the dbname
-            @param context: A standard dictionary for contextual values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar alarm’s IDs.
+        @param use_new_cursor: False or the dbname
+        @param context: A standard dictionary for contextual values
         """
 
-
         if not context:
             context = {}
         current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
@@ -793,7 +791,6 @@ class calendar_event(osv.osv):
     def _tz_get(self, cr, uid, context={}):
         return [(x.lower(), x) for x in pytz.all_timezones]
 
-
     def onchange_dates(self, cr, uid, ids, start_date, duration=False, end_date=False, context={}):
         """
         @param self: The object pointer
@@ -892,10 +889,10 @@ class calendar_event(osv.osv):
         whr = " where id=%(id)s"
         qry = qry + whr
         val.update({
-                    'table': self._table, 
-                    'rule_type': rrule_type, 
-                    'id': id, 
-                    })
+            'table': self._table, 
+            'rule_type': rrule_type, 
+            'id': id, 
+        })
         cr.execute(qry % val)
         return True
 
@@ -909,9 +906,7 @@ class calendar_event(osv.osv):
         @return: dictionary of rrule value.
         """
         result = {}
-        for event in ids:
-            
-            datas = self.read(cr, uid, event)
+        for datas in self.read(cr, uid, ids):
             if datas.get('rrule_type'):
                 if datas.get('rrule_type') == 'none':
                     result[event] = False
@@ -935,11 +930,10 @@ class calendar_event(osv.osv):
         'duration': fields.float('Duration'),
         'description': fields.text('Your action'),
         'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
-                 ('confidential', 'Confidential')], 'Mark as'),
+             ('confidential', 'Confidential')], 'Mark as'),
         'location': fields.char('Location', size=264, help="Location of Event"),
         'show_as': fields.selection([('free', 'Free'), \
-                                  ('busy', 'Busy')],
-                                   'Show as'),
+              ('busy', 'Busy')], 'Show as'),
         'base_calendar_url': fields.char('Caldav URL', size=264),
         'exdate': fields.text('Exception Date/Times', help="This property \
                     defines the list of date/time exceptions for arecurring calendar component."),
@@ -948,8 +942,8 @@ class calendar_event(osv.osv):
         'rrule': fields.function(_get_rulestring, type='char', size=124, method=True,\
                      string='Recurrent Rule', store=True, fnct_inv=_set_rrulestring),
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
-                            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'),
+            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
+            ('yearly', 'Yearly'), ('custom', 'Custom')], 'Recurrency'),
         'alarm_id': fields.many2one('res.alarm', 'Alarm'),
         'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
         'recurrent_uid': fields.integer('Recurrent ID'),
@@ -958,13 +952,13 @@ class calendar_event(osv.osv):
                          string='Timezone', store=True),
         'user_id': fields.many2one('res.users', 'Responsible'),
         'freq': fields.selection([('None', 'No Repeat'), \
-                            ('secondly', 'Secondly'), \
-                            ('minutely', 'Minutely'), \
-                            ('hourly', 'Hourly'), \
-                            ('daily', 'Daily'), \
-                            ('weekly', 'Weekly'), \
-                            ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly')], 'Frequency'),
+            ('secondly', 'Secondly'), \
+            ('minutely', 'Minutely'), \
+            ('hourly', 'Hourly'), \
+            ('daily', 'Daily'), \
+            ('weekly', 'Weekly'), \
+            ('monthly', 'Monthly'), \
+            ('yearly', 'Yearly')], 'Frequency'),
         'interval': fields.integer('Interval'),
         'count': fields.integer('Count'),
         'mo': fields.boolean('Mon'),
@@ -975,19 +969,18 @@ class calendar_event(osv.osv):
         'sa': fields.boolean('Sat'),
         'su': fields.boolean('Sun'),
         'select1': fields.selection([('date', 'Date of month'), \
-                            ('day', 'Day of month')], 'Option'),
+            ('day', 'Day of month')], 'Option'),
         'day': fields.integer('Date of month'),
         'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
-                                   ('WE', 'Wednesday'), ('TH', 'Thursday'), \
-                                   ('FR', 'Friday'), ('SA', 'Saturday'), \
-                                   ('SU', 'Sunday')], 'Weekday'),
+           ('WE', 'Wednesday'), ('TH', 'Thursday'), \
+           ('FR', 'Friday'), ('SA', 'Saturday'), \
+           ('SU', 'Sunday')], 'Weekday'),
         'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
-                                   ('3', 'Third'), ('4', 'Fourth'), \
-                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'),
+           ('3', 'Third'), ('4', 'Fourth'), \
+           ('5', 'Fifth'), ('-1', 'Last')], 'By day'),
         'month_list': fields.selection(months.items(), 'Month'),
         'end_date': fields.date('Repeat Until')
     }
-
     _defaults = {
          'class': lambda *a: 'public',
          'show_as': lambda *a: 'busy',
@@ -1011,11 +1004,11 @@ class calendar_event(osv.osv):
         event_id = base_calendar_id2real_id(event_id)
         datas = self.read(cr, uid, event_id, context=context)
         defaults.update({
-               'recurrent_uid': base_calendar_id2real_id(datas['id']),
-               'recurrent_id': defaults.get('date') or real_date,
-               'rrule_type': 'none',
-               'rrule': ''
-                    })
+           'recurrent_uid': base_calendar_id2real_id(datas['id']),
+           'recurrent_id': defaults.get('date') or real_date,
+           'rrule_type': 'none',
+           'rrule': ''
+        })
         exdate = datas['exdate'] and datas['exdate'].split(',') or []
         if real_date and defaults.get('date'):
             exdate.append(real_date)
@@ -1031,7 +1024,7 @@ class calendar_event(osv.osv):
         @param event_ids: List of crm meeting’s IDs.
         @return: True
         """
-        #start Loop
+        
         for event_id in event_ids:
             event_id = base_calendar_id2real_id(event_id)
 
@@ -1046,7 +1039,7 @@ class calendar_event(osv.osv):
                 qry += ", location = '%(location)s'"
             qry += "WHERE id = %s" % (event_id)
             cr.execute(qry %(defaults))
-            #End Loop
+            
         return True
 
     def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100):
@@ -1143,7 +1136,7 @@ class calendar_event(osv.osv):
         weekstring = ''
         monthstring = ''
         yearstring = ''
-#    logic for computing rrule string
+
         freq = datas.get('freq')
         if freq == 'None':
             return ''
@@ -1183,7 +1176,6 @@ class calendar_event(osv.osv):
         rrule_string = 'FREQ=' + freq.upper() +  weekstring + ';INTERVAL=' + \
                 str(datas.get('interval')) + enddate + monthstring + yearstring
 
-#        End logic
         return rrule_string
 
 
@@ -1376,13 +1368,14 @@ class calendar_todo(osv.osv):
     _description = "Calendar Task"
 
     def _get_date(self, cr, uid, ids, name, arg, context):
-        """ Get Date
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of calendar todo's IDs.
-            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
-            @param context: A standard dictionary for contextual values
+        """ 
+        Get Date
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar todo's IDs.
+        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+        @param context: A standard dictionary for contextual values
         """
 
         res = {}
@@ -1391,14 +1384,15 @@ class calendar_todo(osv.osv):
         return res
 
     def _set_date(self, cr, uid, id, name, value, arg, context):
-        """ Set Date
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param id: calendar's ID.
-            @param value: Get Value
-            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
-            @param context: A standard dictionary for contextual values
+        """ 
+        Set Date
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param id: calendar's ID.
+        @param value: Get Value
+        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+        @param context: A standard dictionary for contextual values
         """
 
         event = self.browse(cr, uid, id, context=context)
@@ -1422,11 +1416,12 @@ class ir_attachment(osv.osv):
     _inherit = 'ir.attachment'
 
     def search_count(self, cr, user, args, context=None):
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param user: the current user’s ID for security checks,
-            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
-            @param context: A standard dictionary for contextual values
+        """ 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param user: the current user’s ID for security checks,
+        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+        @param context: A standard dictionary for contextual values
         """
 
         args1 = []
@@ -1436,14 +1431,14 @@ class ir_attachment(osv.osv):
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
-            @param offset: The Number of Results to pass,
-            @param limit: The Number of Results to Return,
-            @param context: A standard dictionary for contextual values
+        """ 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+        @param offset: The Number of Results to pass,
+        @param limit: The Number of Results to Return,
+        @param context: A standard dictionary for contextual values
         """
 
         new_args = args
@@ -1460,12 +1455,13 @@ class ir_values(osv.osv):
 
     def set(self, cr, uid, key, key2, name, models, value, replace=True, \
             isobject=False, meta=False, preserve_user=False, company=False):
-
-        """ set IR Values
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param model: Get The Model """
+        """ 
+        Set IR Values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param model: Get The Model 
+        """
 
         new_model = []
         for data in models:
@@ -1478,12 +1474,13 @@ class ir_values(osv.osv):
 
     def get(self, cr, uid, key, key2, models, meta=False, context={}, \
              res_id_req=False, without_user=True, key2_req=True):
-
-        """ Get IR Values
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param model: Get The Model """
+        """ 
+        Get IR Values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param model: Get The Model 
+        """
 
         new_model = []
         for data in models:
@@ -1502,14 +1499,14 @@ class ir_model(osv.osv):
 
     def read(self, cr, uid, ids, fields=None, context={},
             load='_classic_read'):
-
-        """ Read IR Model
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of IR Model’s IDs.
-            @param context: A standard dictionary for contextual values """
-
+        """ 
+        Read IR Model
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of IR Model’s IDs.
+        @param context: A standard dictionary for contextual values 
+        """
 
         data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
                         context=context, load=load)
@@ -1523,13 +1520,13 @@ ir_model()
 class virtual_report_spool(web_services.report_spool):
 
     def exp_report(self, db, uid, object, ids, datas=None, context=None):
-
-        """ Export Report
-            @param self: The object pointer
-            @param db: get the current database,
-            @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
-
+        """ 
+        Export Report
+        @param self: The object pointer
+        @param db: get the current database,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values 
+        """
 
         if object == 'printscreen.list':
             return super(virtual_report_spool, self).exp_report(db, uid, \
@@ -1547,13 +1544,14 @@ class res_users(osv.osv):
     _inherit = 'res.users'
 
     def _get_user_avail(self, cr, uid, ids, context=None):
-
-        """ Get USer Availability
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of res user’s IDs.
-            @param context: A standard dictionary for contextual values """
+        """ 
+        Get USer Availability
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of res user’s IDs.
+        @param context: A standard dictionary for contextual values 
+        """
 
         current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         res = {}
@@ -1577,13 +1575,14 @@ class res_users(osv.osv):
         return res
 
     def _get_user_avail_fun(self, cr, uid, ids, name, args, context=None):
-
-        """ Get USer Availability Function
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of res user’s IDs.
-            @param context: A standard dictionary for contextual values """
+        """ 
+        Get USer Availability Function
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of res user’s IDs.
+        @param context: A standard dictionary for contextual values 
+        """
 
         return self._get_user_avail(cr, uid, ids, context=context)
 

From f29491458bee47fa1c2e1770f6ac0d291936c3d8 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Tue, 6 Apr 2010 12:24:45 +0200
Subject: [PATCH 225/248] [ADD] Tests declared in 'test' section of __terp__
 are rolled back at the end of the module processing. [FIX] Removed an
 unnecessary commit in ir_sequence.get_id (replaced by SELECT ... FOR UPDATE
 NOWAIT):         commit was actually breaking the test rollback behaviour.

bzr revid: jth@openerp.com-20100406102445-le227exvrphahbx5
---
 bin/addons/__init__.py            | 35 +++++++++++++++++++++++++++++++
 bin/addons/base/ir/ir_sequence.py | 21 ++++++++-----------
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index e3550cd7018..2b0f90bc5cf 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -589,6 +589,7 @@ class MigrationManager(object):
                         if mod:
                             del mod
 
+log = logging.getLogger('init')
 
 def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
     
@@ -628,6 +629,35 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
                 tools.convert_xml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
             fp.close()
     
+    def load_data(cr, module_name, id_map, mode):
+        _load_data(cr, module_name, id_map, mode, 'data')
+    
+    def load_demo(cr, module_name, id_map, mode):
+        _load_data(cr, module_name, id_map, mode, 'demo')
+    
+    def load_test(cr, module_name, id_map, mode):
+        cr.commit()
+        try:
+            _load_data(cr, module_name, id_map, mode, 'test')
+        finally:
+            cr.rollback()
+    
+    def _load_data(cr, module_name, id_map, mode, kind):
+        noupdate = (kind == 'demo')
+        for filename in package.data.get(kind, []):
+            _, ext = os.path.splitext(filename)
+            log.info("module %s: loading %s", module_name, filename)
+            pathname = os.path.join(module_name, filename)
+            file = tools.file_open(pathname)
+            # TODO manage .csv file with noupdate == (kind == 'init')
+            if ext == '.sql':
+                process_sql_file(cr, fp)
+            elif ext == '.yml':
+                tools.convert_yaml_import(cr, module_name, file, id_map, mode, noupdate)
+            else:
+                tools.convert_xml_import(cr, module_name, file, id_map, mode, noupdate)
+            file.close()
+    
     # **kwargs is passed directly to convert_xml_import
     if not status:
         status = {}
@@ -685,10 +715,15 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
                     'certificate': package.data.get('certificate') or None,
                     })
                 load_init_update_xml(cr, m, idref, mode, kind)
+            load_data(cr, m, idref, mode)
             if hasattr(package, 'demo') or (package.dbdemo and package.state != 'installed'):
                 status['progress'] = (float(statusi)+0.75) / len(graph)
                 load_demo_xml(cr, m, idref, mode)
+                load_demo(cr, m, idref, mode)                    
                 cr.execute('update ir_module_module set demo=%s where id=%s', (True, mid))
+            
+            load_test(cr, m, idref, mode)
+            
             package_todo.append(package.name)
 
             migrations.migrate_module(package, 'post')
diff --git a/bin/addons/base/ir/ir_sequence.py b/bin/addons/base/ir/ir_sequence.py
index 8b0e7795a7c..fcc197116a1 100644
--- a/bin/addons/base/ir/ir_sequence.py
+++ b/bin/addons/base/ir/ir_sequence.py
@@ -73,18 +73,15 @@ class ir_sequence(osv.osv):
         }
 
     def get_id(self, cr, uid, sequence_id, test='id', context=None):
-        try:
-            assert test in ('code','id')
-            cr.execute('SELECT id, number_next, prefix, suffix, padding FROM ir_sequence WHERE '+test+'=%s AND active=%s FOR UPDATE', (sequence_id, True))
-            res = cr.dictfetchone()
-            if res:
-                cr.execute('UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s AND active=%s', (res['id'], True))
-                if res['number_next']:
-                    return self._process(res['prefix']) + '%%0%sd' % res['padding'] % res['number_next'] + self._process(res['suffix'])
-                else:
-                    return self._process(res['prefix']) + self._process(res['suffix'])
-        finally:
-            cr.commit()
+        assert test in ('code','id')
+        cr.execute('SELECT id, number_next, prefix, suffix, padding FROM ir_sequence WHERE '+test+'=%s AND active=%s FOR UPDATE NOWAIT', (sequence_id, True))
+        res = cr.dictfetchone()
+        if res:
+            cr.execute('UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s AND active=%s', (res['id'], True))
+            if res['number_next']:
+                return self._process(res['prefix']) + '%%0%sd' % res['padding'] % res['number_next'] + self._process(res['suffix'])
+            else:
+                return self._process(res['prefix']) + self._process(res['suffix'])
         return False
 
     def get(self, cr, uid, code):

From 8326caf5de58ff62c0fd18239e0a7ec7ccceb9b3 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 6 Apr 2010 16:39:53 +0530
Subject: [PATCH 226/248] [IMP] service: pass db parameter in checkRequest for
 http

bzr revid: hmo@tinyerp.com-20100406110953-5x0h9b3jlytnkty6
---
 bin/service/http_server.py | 14 +++++++-------
 bin/service/websrv_lib.py  |  3 +++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bin/service/http_server.py b/bin/service/http_server.py
index fe3d98a0004..47ae6c35ae8 100644
--- a/bin/service/http_server.py
+++ b/bin/service/http_server.py
@@ -251,12 +251,11 @@ class OerpAuthProxy(AuthProxy):
         self.auth_tries = 0
         self.last_auth = None
 
-    def checkRequest(self,handler,path = '/'):
-        if self.auth_creds:
-            return True
+    def checkRequest(self,handler,path, db=False):        
         auth_str = handler.headers.get('Authorization',False)
         try:
-            db = handler.get_db_from_path(path)
+            if not db:
+                db = handler.get_db_from_path(path)
             print "Got db:",db
         except:
             if path.startswith('/'):
@@ -267,8 +266,9 @@ class OerpAuthProxy(AuthProxy):
             else:
                 #FIXME!
                 self.provider.log("Wrong path: %s, failing auth" %path)
-                raise AuthRejectedExc("Authorization failed. Wrong sub-path.")
-
+                raise AuthRejectedExc("Authorization failed. Wrong sub-path.") 
+        if self.auth_creds.get(db):
+            return True 
         if auth_str and auth_str.startswith('Basic '):
             auth_str=auth_str[len('Basic '):]
             (user,passwd) = base64.decodestring(auth_str).split(':')
@@ -276,7 +276,7 @@ class OerpAuthProxy(AuthProxy):
             acd = self.provider.authenticate(db,user,passwd,handler.client_address)
             if acd != False:
                 self.auth_creds[db] = acd
-                self.last_auth=db
+                self.last_auth = db
                 return True
         if self.auth_tries > 5:
             self.provider.log("Failing authorization after 5 requests w/o password")
diff --git a/bin/service/websrv_lib.py b/bin/service/websrv_lib.py
index 354311eaa64..464c41ca356 100644
--- a/bin/service/websrv_lib.py
+++ b/bin/service/websrv_lib.py
@@ -234,6 +234,9 @@ class MultiHTTPHandler(FixSendError,BaseHTTPRequestHandler):
         if fore.close_connection:
             # print "Closing connection because of handler"
             self.close_connection = fore.close_connection
+        if hasattr(fore, '_flush'):
+            fore._flush()
+
 
     def parse_rawline(self):
         """Parse a request (internal).

From 24d873fdbecf7444b861d59e8a7a4bcea1fc0f92 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Tue, 6 Apr 2010 14:33:25 +0200
Subject: [PATCH 227/248] [MERGE] Fixed previous merges.

bzr revid: jth@openerp.com-20100406123325-219p7klnjaen82h2
---
 bin/addons/base/i18n/bg.po    | 16 ----------------
 bin/addons/base/i18n/hr.po    | 32 --------------------------------
 bin/addons/base/i18n/it.po    |  9 ---------
 bin/addons/base/i18n/ja.po    | 32 --------------------------------
 bin/addons/base/i18n/sv.po    | 32 --------------------------------
 bin/addons/base/i18n/uk.po    | 32 --------------------------------
 bin/addons/base/i18n/zh_CN.po | 32 --------------------------------
 7 files changed, 185 deletions(-)

diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po
index 7061cf9d069..297b2d31301 100644
--- a/bin/addons/base/i18n/bg.po
+++ b/bin/addons/base/i18n/bg.po
@@ -7,29 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:19+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 08:05+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-01 04:11+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
-=======
-"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 1f286953955..51a7f1d772a 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,45 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:36+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 06:01+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:15+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:32+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-05 04:33+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
-=======
-"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "X-Launchpad-Export-Date: 2010-04-06 04:00+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 8a9a054c1dd..f98e352340b 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -7,22 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 09:53+0000\n"
-"Last-Translator: Carlo Vettore <Unknown>\n"
-=======
 "PO-Revision-Date: 2010-03-31 05:14+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
->>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
-=======
 "X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index ad273b86073..f55114223a5 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,45 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:24+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 05:47+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:13+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:34+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-05 04:34+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
-=======
-"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-04 03:51+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "X-Launchpad-Export-Date: 2010-04-06 04:00+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 58aab09492b..04fc6b3d022 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,45 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:18+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 04:49+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:09+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:28+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-05 04:37+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
-=======
-"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "X-Launchpad-Export-Date: 2010-04-06 04:01+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index a1612c6d22d..2557ca954df 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,45 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:37+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 05:27+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:14+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:31+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-05 04:31+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
-=======
-"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "X-Launchpad-Export-Date: 2010-04-06 04:01+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 9f124f629d9..3010205f573 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,45 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"PO-Revision-Date: 2010-03-30 04:19+0000\n"
-=======
-"PO-Revision-Date: 2010-03-31 05:03+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-01 04:12+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"PO-Revision-Date: 2010-04-03 04:30+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "PO-Revision-Date: 2010-04-05 04:30+0000\n"
->>>>>>> MERGE-SOURCE
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-<<<<<<< TREE
-"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
-=======
-"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
->>>>>>> MERGE-SOURCE
-=======
-"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
->>>>>>> MERGE-SOURCE
-=======
 "X-Launchpad-Export-Date: 2010-04-06 04:01+0000\n"
->>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 4fcdc4055eff4420943e91476c0874f7381ff0c4 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 6 Apr 2010 17:20:04 +0200
Subject: [PATCH 228/248] [FIX] l10n_be: periodical vat declaration, compliancy
 with version 5.1.0 of Intervat

bzr revid: qdp-launchpad@tinyerp.com-20100406152004-pad9ocx398bpiowa
---
 addons/l10n_be/company.py                     |  8 +++--
 .../wizard/l10n_be_account_vat_declaration.py | 30 +++++++++----------
 .../l10n_be_account_vat_declaration_view.xml  |  5 +++-
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
index 4395f13380e..1a29940ada6 100644
--- a/addons/l10n_be/company.py
+++ b/addons/l10n_be/company.py
@@ -25,7 +25,7 @@ class res_company(osv.osv):
     _description = 'res.company'
 
     def _get_default_ad(self, addresses):
-        city = post_code = address = ""
+        city = post_code = address = country_code = ""
         for ads in addresses:
             if ads.type == 'default':
                 city = ads.city or ""
@@ -34,7 +34,9 @@ class res_company(osv.osv):
                     address = ads.street or ""
                 if ads.street2:
                     address += " " + ads.street2
-        return city, post_code, address
+                if ads.country_id:
+                    country_code = ads.country_id and ads.country_id.code or ""
+        return city, post_code, address, country_code
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 9dd5ea5b269..b1674293291 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -32,6 +32,9 @@ class l10n_be_vat_declaration(osv.osv_memory):
         'period_id': fields.many2one('account.period','Period', required=True),
         'msg': fields.text('File created', size=64, readonly=True),
         'file_save': fields.binary('Save File'),
+        'ask_resitution': {'type': 'boolean', 'string': 'Ask Restitution',},
+        'ask_payment': {'type': 'boolean', 'string': 'Ask Payment',},
+        'client_nihil': {'type': 'boolean', 'string': 'Last Declaration of Entreprise', 'help': 'Thick this case only if it concerns only the last statement on the civil or cessation of activity'},
                 }
 
     _defaults = {
@@ -46,7 +49,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
         obj_comp = self.pool.get('res.company')
         obj_data = self.pool.get('ir.model.data')
 
-        list_of_tags=['00','01','02','03','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','91']
+        list_of_tags=['00','01','02','03','44','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','88','91']
         obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
         user_cmpny = obj_company.name
         vat_no=obj_company.partner_id.vat
@@ -59,26 +62,19 @@ class l10n_be_vat_declaration(osv.osv_memory):
         ctx['period_id'] = data['period_id'] #added context here
         tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
-        address = post_code = city = ''
-        if not obj_company.partner_id.address:
-            address = post_code = city = ''
-
-        city, post_code, address = obj_comp._get_default_ad(obj_company.partner_id.address)
+        address = post_code = city = country_code = ''
+        city, post_code, address, country_code = obj_comp._get_default_ad(obj_company.partner_id.address)
         year_id = obj_fyear.find(cr, uid)
 
         account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
-        current_year = account_period.fiscalyear_id.name
         period_code = account_period.code
 
-        send_ref = user_cmpny
-        if period_code:
-            send_ref = send_ref + period_code
-
+        send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
         data_of_file='<?xml version="1.0"?>\n<VATSENDING xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MultiDeclarationTVA-NoSignature-14.xml">'
         data_of_file +='\n\t<DECLARER>\n\t\t<VATNUMBER>'+str(vat_no)+'</VATNUMBER>\n\t\t<NAME>'+str(obj_company.name)+'</NAME>\n\t\t<ADDRESS>'+address+'</ADDRESS>'
-        data_of_file +='\n\t\t<POSTCODE>'+post_code+'</POSTCODE>\n\t\t<CITY>'+city+'</CITY>\n\t\t<SENDINGREFERENCE>'+send_ref+'</SENDINGREFERENCE>\n\t</DECLARER>'
-        data_of_file +='\n\t<VATRECORD>\n\t\t<RECNUM>1</RECNUM>\n\t\t<VATNUMBER>'+str(vat_no)+'</VATNUMBER>\n\t\t<DPERIODE>\n\t\t\t'
-
+        data_of_file +='\n\t\t<POSTCODE>'+post_code+'</POSTCODE>\n\t\t<CITY>'+city+'</CITY>\n\t\t<COUNTRY>'+country_code+'</COUNTRY>\n\t\t<SENDINGREFERENCE>'+send_ref+'</SENDINGREFERENCE>\n\t</DECLARER>'
+        data_of_file +='\n\t<VATRECORD>\n\t\t<RECNUM>1</RECNUM>\n\t\t<VATNUMBER>'+str(vat_no[2:])+'</VATNUMBER>\n\t\t<DPERIODE>\n\t\t\t'
+ 
         starting_month = account_period.date_start[5:7]
         ending_month = account_period.date_stop[5:7]
         if starting_month != ending_month:
@@ -89,14 +85,16 @@ class l10n_be_vat_declaration(osv.osv_memory):
         else:
             data_of_file += '<MONTH>' + starting_month + '</MONTH>\n\t\t\t'
         data_of_file += '<YEAR>' + str(account_period.date_stop[:4]) + '</YEAR>\n\t\t</DPERIODE>\n\t\t<ASK RESTITUTION="NO" PAYMENT="NO"/>'
+        data_of_file += '\n\t\t<ClientListingNihil>'+ (data['form']['client_nihil'] and 'YES' or 'NO') +'</ClientListingNihil>'
         data_of_file +='\n\t\t<DATA>\n\t\t\t<DATA_ELEM>'
 
         for item in tax_info:
             if item['code']:
+
                 if item['code'] == '71-72':
                     item['code'] = '71'
                 if item['code'] in list_of_tags:
-                    data_of_file +='\n\t\t\t\t<D' + str(int(item['code'])) +'>' + str(int(item['sum_period']*100)) +  '</D'+str(int(item['code'])) +'>'
+                    data_of_file +='\n\t\t\t\t<D'+str(int(item['code'])) +'>' + str(abs(int(item['sum_period']*100))) +  '</D'+str(int(item['code'])) +'>'
 
         data_of_file +='\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
         data['file_save'] = base64.encodestring(data_of_file)
@@ -105,4 +103,4 @@ class l10n_be_vat_declaration(osv.osv_memory):
 
 l10n_be_vat_declaration()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 56f8b6477f9..3f33448f8d3 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -15,6 +15,9 @@
 			<form string="Select Period">
                	<group colspan="4" >
 					<field name="period_id" select="1" default_focus="1"/>
+            <field name="ask_resitution"/>
+            <field name="ask_payment"/>
+            <field name="client_nihil"/>
               		<button colspan="1" name="create_xml" string="Create XML" type="object" icon="gtk-execute"/>
               	 </group>
               	 <separator string="XML Flie has been Created." colspan="4"/>
@@ -44,4 +47,4 @@
 	        id="l10_be_vat_declaration"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From d9a506bb4c58761bc66236bb90196a882ab5322d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 6 Apr 2010 18:15:10 +0200
Subject: [PATCH 229/248] merge

bzr revid: fp@tinyerp.com-20100406161510-u7t9vi4kxlm30l6y
---
 .../report/account_invoice_report_view.xml    |   22 +-
 addons/analytic/project.py                    |    2 +-
 addons/crm/crm_claims_view.xml                |  102 +-
 addons/crm/crm_fund_view.xml                  |  197 +-
 addons/crm/crm_helpdesk_view.xml              |  116 +-
 addons/crm/crm_lead_view.xml                  |  178 +-
 addons/crm/crm_opportunity_view.xml           |  151 +-
 addons/crm/crm_phonecall_view.xml             |   69 +-
 addons/crm/crm_view.xml                       |  200 +-
 .../crm/wizard/crm_lead_to_partner_view.xml   |   88 +-
 addons/hr/hr_view.xml                         |    2 -
 addons/hr_expense/hr_expense_view.xml         |   36 +-
 addons/hr_holidays/__terp__.py                |    2 +-
 addons/hr_holidays/hr_holidays.py             |   22 +-
 .../wizard/holidays_summary_employees.py      |    4 -
 addons/hr_timesheet/hr_timesheet_view.xml     |   19 +-
 .../hr_timesheet_invoice_report_view.xml      |  106 +-
 .../hr_timesheet_sheet_view.xml               |   31 +-
 addons/mrp/mrp.py                             |    1 -
 addons/mrp/mrp_view.xml                       |  149 +-
 addons/product/product.py                     |    2 +-
 addons/project/project_view.xml               |    3 +-
 addons/project/report/project_report.py       |   10 +-
 addons/project/report/project_report_view.xml |   49 +-
 addons/project_issue/project_feature_menu.xml |   31 -
 addons/project_issue/project_issue.py         |    3 +-
 addons/project_issue/project_issue_view.xml   |    6 +-
 addons/project_long_term/project_long_term.py |   17 +-
 .../project_long_term_view.xml                |  193 +-
 addons/resource/resource_view.xml             |   60 +-
 addons/sale/sale_view.xml                     |    4 +-
 .../wizard/stock_change_standard_price.py     |   23 +-
 addons/survey/survey_demo.xml                 | 4357 ++++++++---------
 33 files changed, 3086 insertions(+), 3169 deletions(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index de046de6211..47b6ebf3110 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -58,6 +58,9 @@
                 <filter icon="terp-account"
                     string="Invoices"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                <filter icon="terp-account"
+                    string="Paid"
+                    domain="[('state','=','paid')]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
                 <field name="user_id" widget="selection">
@@ -71,17 +74,19 @@
                 <newline/>
                 <group expand="1" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-account"
-                    		string="Customer Invoices"
-                    		domain="[('type','=','out_invoice')]"/>
+                        string="Customer Invoices"
+                        domain="[('type','=','out_invoice')]"
+                        default="1"/>
                     <filter icon="terp-account"
-                    		string="Supplier Invoices"
-                    		domain="[('type','=','in_invoice')]"/>
+                        string="Customer Refunds"
+                        domain="[('type','=','out_refund')]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-account"
-                    		string="Customer Refunds"
-                    		domain="[('type','=','out_refund')]"/>
+                        string="Supplier Invoices"
+                        domain="[('type','=','in_invoice')]"/>
                     <filter icon="terp-account"
-                    		string="Supplier Refunds"
-                    		domain="[('type','=','in_refund')]"/>
+                        string="Supplier Refunds"
+                        domain="[('type','=','in_refund')]"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
@@ -90,6 +95,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
                     <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
+                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
                     <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Month" icon="terp-account" context="{'group_by':'date'}"/>
diff --git a/addons/analytic/project.py b/addons/analytic/project.py
index e9558f7a101..0c3c46690ac 100644
--- a/addons/analytic/project.py
+++ b/addons/analytic/project.py
@@ -204,7 +204,7 @@ class account_analytic_account(osv.osv):
         'date': fields.date('Date End'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'),
-        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True,readonly=True,
+        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,readonly=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
                                   \n* If any pending balance is there it can be in \'Pending\'. \
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 6677bf7184b..f791a1b86cc 100755
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -14,7 +14,7 @@
     </record>
 
     <menuitem action="crm_claim_categ_action"
-    	id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
 
     <!-- Claim Stages -->
 
@@ -28,7 +28,7 @@
     </record>
 
     <menuitem action="crm_claim_stage_act"
-        	id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
+            id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
 
     <!-- Claim Resource Type -->
 
@@ -42,8 +42,8 @@
     </record>
 
     <menuitem action="crm_claim_resource_act"
-        	id="menu_crm_claim_stage_act"
-        	parent="crm.menu_crm_case_resource_type" />
+            id="menu_crm_claim_stage_act"
+            parent="crm.menu_crm_case_resource_type" />
 
         <!-- Claims    -->
 
@@ -57,26 +57,26 @@
                 <field name="name"/>
                 <field name="partner_id"/>
                 <field name="user_id" />
-                <field name="section_id" string="Section" />
+                <field name="section_id"/>
                 <field name="date" string="Claim Date"/>
                 <field name="date_deadline" string="Deadline"/>
                 <field name="date_closed" string="Closure Date"/>
                 <field name="categ_id" string="Type" select="1"/>
                 <field name="state"/>
                 <button name="case_open" string="Open"
-                	states="draft,pending" type="object"
-                	icon="gtk-go-forward" />
+                    states="draft,pending" type="object"
+                    icon="gtk-go-forward" />
                 <button name="case_pending" string="Pending"
-                	states="draft,open" type="object"
-                	icon="gtk-media-pause" />
+                    states="draft,open" type="object"
+                    icon="gtk-media-pause" />
                 <button name="case_close" string="Close"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-close" />
+                    states="open,draft,pending" type="object"
+                    icon="gtk-close" />
                 <button name="case_cancel" string="Cancel"
-                	states="draft,open,pending" type="object"
-                	icon="gtk-cancel" />
+                    states="draft,open,pending" type="object"
+                    icon="gtk-cancel" />
                 <button name="case_reset" string="Reset to Draft"
-                	states="done,cancel" type="object" icon="gtk-convert" />
+                    states="done,cancel" type="object" icon="gtk-convert" />
             </tree>
         </field>
     </record>
@@ -132,20 +132,20 @@
                     <group col="8" colspan="4">
                         <field name="state" select="1"/>
                         <button name="case_close" string="Done"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-jump-to" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-jump-to" />
                         <button name="case_open" string="Open"
-                        	states="draft,pending" type="object"
-                        	icon="gtk-go-forward" />
+                            states="draft,pending" type="object"
+                            icon="gtk-go-forward" />
                         <button name="case_cancel" string="Cancel"
-                        	states="draft,open,pending" type="object"
-                        	icon="gtk-cancel" />
+                            states="draft,open,pending" type="object"
+                            icon="gtk-cancel" />
                         <button name="case_pending" string="Pending"
-                        	states="draft,open" type="object"
-                        	icon="gtk-media-pause" />
+                            states="draft,open" type="object"
+                            icon="gtk-media-pause" />
                         <button name="case_reset"
-                        	string="Reset to Draft" states="done,cancel"
-                        	type="object" icon="gtk-convert" />
+                            string="Reset to Draft" states="done,cancel"
+                            type="object" icon="gtk-convert" />
                     </group>
                 </page>
                 <page string="History" groups="base.group_extended">
@@ -183,10 +183,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.claim'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.claim'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -195,9 +195,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.claim'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.claim'}"
+                               icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
 
@@ -206,7 +206,7 @@
         </field>
     </record>
 
-	<!-- Claim Calendar view -->
+    <!-- Claim Calendar view -->
 
     <record model="ir.ui.view" id="crm_case_claims_calendar_view">
         <field name="name">CRM - Claims Calendar</field>
@@ -222,7 +222,7 @@
         </field>
     </record>
 
-	<!-- Claim Graph view -->
+    <!-- Claim Graph view -->
 
     <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
         <field name="name">CRM -Graph</field>
@@ -237,7 +237,7 @@
         </field>
     </record>
 
-	<!-- Crm claim Search view -->
+    <!-- Crm claim Search view -->
 
     <record id="view_crm_case_claims_filter" model="ir.ui.view">
             <field name="name">CRM - Claims Search</field>
@@ -263,28 +263,28 @@
                    <field name="name" select='1'/>
                    <field name="partner_id" select="1"/>
                    <field name="user_id" select="1" widget="selection">
-	                   	<filter icon="terp-partner"
-	                   		domain="[('user_id','=',uid)]" help="My Claims"
-	                   		default="1" />
-	                   	<filter icon="terp-partner"
-	                   		domain="[('user_id','=', False)]"
-	                   		help="Unassigned Claims" />
+                           <filter icon="terp-partner"
+                               domain="[('user_id','=',uid)]" help="My Claims"
+                               default="1" />
+                           <filter icon="terp-partner"
+                               domain="[('user_id','=', False)]"
+                               help="Unassigned Claims" />
                    </field>
                    <field name="section_id" select="1"
-                   	widget="selection" string="Section"
-                   	default="context.get('section_id', False)">
-                   	<filter icon="terp-crm"
-                   		domain="[('section_id','=',context.get('section_id',False))]"
-                   		help="My section" />
+                       widget="selection"
+                       default="context.get('section_id', False)">
+                       <filter icon="terp-crm"
+                           domain="[('section_id','=',context.get('section_id',False))]"
+                           help="My section" />
                    </field>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="10" col="20">
-	                   	<filter string="Deadline" icon="terp-crm"
-                       	domain="[]"
-                       	context="{'group_by':'date_deadline'}" />
-                        <filter string="Closure" icon="terp-crm"
-                       	domain="[]"
-                       	context="{'group_by':'date_closed'}" />
+                       <filter string="Deadline" icon="terp-crm"
+                           domain="[]"
+                           context="{'group_by':'date_deadline'}" />
+                       <filter string="Closure" icon="terp-crm"
+                           domain="[]"
+                           context="{'group_by':'date_closed'}" />
                    </group>
                </search>
            </field>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 170e7f9b4a0..ec4f0d49236 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -8,29 +8,29 @@
         <field name="name">Fundraising Categories</field>
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
- 		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-		<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-		<field name="context">{'object_id':'crm.fundraising'}</field>
+         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+        <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
+        <field name="context">{'object_id':'crm.fundraising'}</field>
     </record>
 
     <menuitem action="crm_fund_categ_action"
-    	id="menu_crm_case_fundraising-act"
-    	parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_fundraising-act"
+        parent="crm.menu_crm_case_categ" />
 
 <!-- Fund Stage Form View -->
 
-	    <record id="crm_fundraising_stage_act" model="ir.actions.act_window">
-	        <field name="name">Fundraising Stages</field>
-	        <field name="res_model">crm.case.stage</field>
-	        <field name="view_type">form</field>
-	        <field name="view_id" ref="crm.crm_case_stage_tree"/>
-   			<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-   			<field name="context">{'object_id':'crm.fundraising'}</field>
-	    </record>
+        <record id="crm_fundraising_stage_act" model="ir.actions.act_window">
+            <field name="name">Fundraising Stages</field>
+            <field name="res_model">crm.case.stage</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_stage_tree"/>
+               <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
+               <field name="context">{'object_id':'crm.fundraising'}</field>
+        </record>
 
-	    <menuitem action="crm_fundraising_stage_act"
-	    	id="menu_crm_fundraising_stage_act"
-	    	parent="crm.menu_crm_case_stage" />
+        <menuitem action="crm_fundraising_stage_act"
+            id="menu_crm_fundraising_stage_act"
+            parent="crm.menu_crm_case_stage" />
 
 <!-- Fund  Resource Type Form View -->
 
@@ -39,13 +39,13 @@
             <field name="res_model">crm.case.resource.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-   			<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-   			<field name="context">{'object_id':'crm.fundraising'}</field>
+               <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
+               <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
         <menuitem action="crm_fundraising_resource_act"
-        	id="menu_crm_fundraising_resource_act"
-        	parent="crm.menu_crm_case_resource_type" />
+            id="menu_crm_fundraising_resource_act"
+            parent="crm.menu_crm_case_resource_type" />
 
 
 <!-- Fund Raising Tree View -->
@@ -56,31 +56,31 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Funds Tree"
-            	colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-            	<field name="id" />
-            	<field name="name" string="Fund Description" />
-            	<field name="categ_id" />
-            	<field name="type_id" string="Payment Mode" />
-            	<field name="planned_cost" string="Amount" />
-            	<field name="probability" />
-            	<field name="user_id" />
-            	<field name="state" />
-            	<button name="case_close" string="Done"
-            		states="open,draft,pending" type="object"
-            		icon="gtk-close" />
-            	<button name="case_open" string="Open"
-            		states="draft,pending" type="object"
-            		icon="gtk-go-forward" />
-            	<button name="case_cancel" string="Cancel"
-            		states="draft,open,pending" type="object"
-            		icon="gtk-cancel" />
-            	<button name="case_pending" string="Pending"
-            		states="draft,open" type="object" icon="gtk-media-pause" />
-            	<button name="case_escalate" string="Escalate"
-            		states="open,draft,pending" type="object"
-            		icon="gtk-go-up" />
-            	<button name="case_reset" string="Reset to Draft"
-            		states="done,cancel" type="object" icon="gtk-convert" />
+                colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <field name="id" />
+                <field name="name" string="Fund Description" />
+                <field name="categ_id" />
+                <field name="type_id" string="Payment Mode" />
+                <field name="planned_cost" string="Amount" />
+                <field name="probability" />
+                <field name="user_id" />
+                <field name="state" />
+                <button name="case_close" string="Done"
+                    states="open,draft,pending" type="object"
+                    icon="gtk-close" />
+                <button name="case_open" string="Open"
+                    states="draft,pending" type="object"
+                    icon="gtk-go-forward" />
+                <button name="case_cancel" string="Cancel"
+                    states="draft,open,pending" type="object"
+                    icon="gtk-cancel" />
+                <button name="case_pending" string="Pending"
+                    states="draft,open" type="object" icon="gtk-media-pause" />
+                <button name="case_escalate" string="Escalate"
+                    states="open,draft,pending" type="object"
+                    icon="gtk-go-up" />
+                <button name="case_reset" string="Reset to Draft"
+                    states="done,cancel" type="object" icon="gtk-convert" />
             </tree>
         </field>
     </record>
@@ -96,20 +96,20 @@
                 <group colspan="4" col="4">
                     <field name="name" select="1" string="Name"/>
                     <field name="type_id" string="Payment Mode" select="1" widget="selection"
-                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
+                            domain="[('object_id.model', '=', 'crm.fundraising')]" />
                 </group>
                 <notebook colspan="4">
                 <page string="Funds">
-                	<separator colspan="4" string="Communication"/>
-                	<group colspan="4" col="4">
-	                    <field name="partner_id" select="1"
-	                    	on_change="onchange_partner_id(partner_id, email_from)"
-	                    	colspan="2" />
-	                    <field name="partner_address_id"
-	                    	string="Contact"
-	                    	on_change="onchange_partner_address_id(partner_address_id, email_from)"
-	                    	colspan="1" />
-	                    <field name="email_from" colspan="2"/>
+                    <separator colspan="4" string="Communication"/>
+                    <group colspan="4" col="4">
+                        <field name="partner_id" select="1"
+                            on_change="onchange_partner_id(partner_id, email_from)"
+                            colspan="2" />
+                        <field name="partner_address_id"
+                            string="Contact"
+                            on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                            colspan="1" />
+                        <field name="email_from" colspan="2"/>
                     </group>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_cost"/>
@@ -117,13 +117,13 @@
                     <field name="probability"/>
                     <separator colspan="4" string="Categorization"/>
                     <group colspan="4" col="6">
-                    	<field name="user_id" select="2" string="Responsible"/>
+                        <field name="user_id" select="2" string="Responsible"/>
                         <field name="section_id" colspan="1" widget="selection"/>
-                    	<field name="categ_id" select="1"
-                    		widget="selection"
-                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
-                    	<field name="date"/>
-	                    <field name="duration"/>
+                        <field name="categ_id" select="1"
+                            widget="selection"
+                            domain="[('object_id.model', '=', 'crm.fundraising')]" />
+                        <field name="date"/>
+                        <field name="duration"/>
                     </group>
                     <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
@@ -131,23 +131,23 @@
                     <group col="8" colspan="4">
                         <field name="state" select="2"/>
                         <button name="case_close" string="Done"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-close" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-close" />
                         <button name="case_open" string="Open"
-                        	states="draft,pending" type="object"
-                        	icon="gtk-go-forward" />
+                            states="draft,pending" type="object"
+                            icon="gtk-go-forward" />
                         <button name="case_cancel" string="Cancel"
-                        	states="draft,open,pending" type="object"
-                        	icon="gtk-cancel" />
+                            states="draft,open,pending" type="object"
+                            icon="gtk-cancel" />
                         <button name="case_pending" string="Pending"
-                        	states="draft,open" type="object"
-                        	icon="gtk-media-pause" />
+                            states="draft,open" type="object"
+                            icon="gtk-media-pause" />
                         <button name="case_escalate" string="Escalate"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-go-up" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-go-up" />
                         <button name="case_reset"
-                        	string="Reset to Draft" states="done,cancel"
-                        	type="object" icon="gtk-convert" />
+                            string="Reset to Draft" states="done,cancel"
+                            type="object" icon="gtk-convert" />
                     </group>
                 </page>
                 <page string="History" groups="base.group_extended">
@@ -191,10 +191,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.fundraising'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.fundraising'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -203,9 +203,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.fundraising'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.fundraising'}"
+                               icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
@@ -256,32 +256,33 @@
                            separator="1"
                            help="Funds Related to Current User"
                            />
+                       <separator orientation="vertical" />
                        <filter icon="gtk-new" string="Current Funds"
-                       	domain="[('state','in',('draft', 'open'))]"
-                       	help="Current Funds" />
+                           domain="[('state','in',('draft', 'open'))]"
+                           help="Current Funds" />
                        <filter icon="gtk-yes" string="Open Funds"
-                       	domain="[('state','=','open')]"
-                       	help="Open Funds" />
+                           domain="[('state','=','open')]"
+                           help="Open Funds" />
                        <filter icon="gtk-media-pause"
-                       	string="Pending Funds"
-                       	domain="[('state','=','pending')]"
-                       	help="Pending Funds" />
+                           string="Pending Funds"
+                           domain="[('state','=','pending')]"
+                           help="Pending Funds" />
                        <separator orientation="vertical" />
                        <field name="state" select="1" />
                        <field name="name" select='1'
-                       	string="Fund Description" />
+                           string="Fund Description" />
                        <field name="user_id" select="1"
-                       	widget="selection">
-                       	<filter icon="terp-partner"
-                       		domain="[('user_id','=', False)]"
-                       		help="Unassigned" />
+                           widget="selection">
+                           <filter icon="terp-partner"
+                               domain="[('user_id','=', False)]"
+                               help="Unassigned" />
                        </field>
                        <field name="section_id" select="1"
-                       	widget="selection" string="Section"
-                       	default="context.get('section_id', False)">
-                       	<filter icon="terp-crm"
-                       		domain="[('section_id','=',context.get('section_id',False))]"
-                       		help="My section" />
+                           widget="selection"
+                           default="context.get('section_id', False)">
+                           <filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section" />
                        </field>
                    </group>
                </search>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 542b37d69ab..6bb356bacfb 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -8,13 +8,13 @@
         <field name="name">Helpdesk Categories</field>
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
- 		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
         <field name="domain">[('object_id.model', '=', 'crm.helpdesk')]</field>
-		<field name="context">{'object_id':'crm.helpdesk'}</field>
+        <field name="context">{'object_id':'crm.helpdesk'}</field>
     </record>
 
     <menuitem action="crm_helpdesk_categ_action"
-    	id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
 
 <!--  Helpdesk Support Form View -->
 
@@ -31,20 +31,20 @@
                 </group>
                 <notebook colspan="4">
                     <page string="General">
-                    	<separator colspan="4" string="Communication"/>
+                        <separator colspan="4" string="Communication"/>
                         <group col="7" colspan="4">
                             <field name="partner_id"
-                            	on_change="onchange_partner_id(partner_id, email_from)"
-                            	select="1" />
+                                on_change="onchange_partner_id(partner_id, email_from)"
+                                select="1" />
                             <field name="partner_address_id"
-                            	on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                            	select="2" />
+                                on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                select="2" />
 
                             <field name="email_from" select="2" />
                             <button name="remind_partner"
-                            	states="open,pending"
-                            	string="Send Reminder" type="object"
-                            	icon="gtk-go-forward" />
+                                states="open,pending"
+                                string="Send Reminder" type="object"
+                                icon="gtk-go-forward" />
 
                         </group>
                         <separator colspan="4" string="Categorization"/>
@@ -53,37 +53,37 @@
                             <field name="section_id" widget="selection"/>
                             <field name="user_id" select="1"/>
                             <button name="remind_user"
-                            	states="open,pending"
-                            	string="Send Reminder" type="object"
-                            	icon="gtk-go-forward" />
+                                states="open,pending"
+                                string="Send Reminder" type="object"
+                                icon="gtk-go-forward" />
                         </group>
 
                         <separator colspan="4" string="Details"/>
                         <field name="description" colspan="4"
-                            	nolabel="1" widget="text_tag" readonly="1" />
+                                nolabel="1" widget="text_tag" readonly="1" />
                         <separator colspan="4"/>
                         <group col="8" colspan="4">
                             <field name="state" select="1"/>
                             <button name="case_close"
-                            	states="open,draft,pending" string="Close"
-                            	type="object" icon="gtk-close" />
+                                states="open,draft,pending" string="Close"
+                                type="object" icon="gtk-close" />
                             <button name="case_open"
-                            	states="draft,pending" string="Open"
-                            	type="object" icon="gtk-go-forward" />
+                                states="draft,pending" string="Open"
+                                type="object" icon="gtk-go-forward" />
                             <button name="case_cancel"
-                            	states="draft,open,pending" string="Cancel"
-                            	type="object" icon="gtk-cancel" />
+                                states="draft,open,pending" string="Cancel"
+                                type="object" icon="gtk-cancel" />
                             <button name="case_pending"
-                            	states="draft,open" string="Pending"
-                            	type="object" icon="gtk-media-pause" />
+                                states="draft,open" string="Pending"
+                                type="object" icon="gtk-media-pause" />
                             <button name="case_escalate"
-                            	states="open,draft,pending"
-                            	string="Escalate" type="object"
-                            	icon="gtk-go-up" />
+                                states="open,draft,pending"
+                                string="Escalate" type="object"
+                                icon="gtk-go-up" />
                             <button name="case_reset"
-                            	states="done,cancel"
-                            	string="Reset to Draft" type="object"
-                            	icon="gtk-convert" />
+                                states="done,cancel"
+                                string="Reset to Draft" type="object"
+                                icon="gtk-convert" />
                         </group>
                     </page>
                     <page string="History" groups="base.group_extended">
@@ -126,10 +126,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.helpdesk'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.helpdesk'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -138,9 +138,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.helpdesk'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.helpdesk'}"
+                               icon="gtk-go-forward" type="action" />
                     </page>
                 </notebook>
             </form>
@@ -162,25 +162,25 @@
                 <field name="date" string="Date"/>
                 <field name="date_deadline"/>
                 <field name="user_id"/>
-                <field name="section_id" string="Section" />
+                <field name="section_id"/>
                 <field name="state"/>
                 <button name="case_close" string="Done"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-close" />
+                    states="open,draft,pending" type="object"
+                    icon="gtk-close" />
                 <button name="case_open" string="Open"
-                	states="draft,pending" type="object"
-                	icon="gtk-go-forward" />
+                    states="draft,pending" type="object"
+                    icon="gtk-go-forward" />
                 <button name="case_cancel" string="Cancel"
-                	states="draft,open,pending" type="object"
-                	icon="gtk-cancel" />
+                    states="draft,open,pending" type="object"
+                    icon="gtk-cancel" />
                 <button name="case_pending" string="Pending"
-                	states="draft,open" type="object"
-                	icon="gtk-media-pause" />
+                    states="draft,open" type="object"
+                    icon="gtk-media-pause" />
                 <button name="case_escalate" string="Escalate"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-go-up" />
+                    states="open,draft,pending" type="object"
+                    icon="gtk-go-up" />
                 <button name="case_reset" string="Reset to Draft"
-                	states="done,cancel" type="object" icon="gtk-convert" />
+                    states="done,cancel" type="object" icon="gtk-convert" />
             </tree>
         </field>
     </record>
@@ -224,24 +224,24 @@
                 <field name="partner_id" />
                 <field name="user_id" select="1" widget="selection">
                     <filter icon="terp-partner"
-                    	domain="[('user_id','=',uid)]"
-                    	help="My Helpdesk Requests" default="1" />
+                        domain="[('user_id','=',uid)]"
+                        help="My Helpdesk Requests" default="1" />
                 </field>
                 <field name="section_id"
-                	default="context.get('section_id', False)" select="1"
-                	widget="selection" string="Section">
-                	<filter icon="terp-crm"
-                		domain="[('section_id','=',context.get('section_id',False))]"
-                		help="My section" />
+                    default="context.get('section_id', False)" select="1"
+                    widget="selection" string="Section">
+                    <filter icon="terp-crm"
+                        domain="[('section_id','=',context.get('section_id',False))]"
+                        help="My section" />
                 </field>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="12" col="20">
                     <filter string="Customer" icon="terp-crm"
-                    	domain="[]" context="{'group_by':'partner_id'}" />
+                        domain="[]" context="{'group_by':'partner_id'}" />
                     <filter string="State" icon="terp-crm" domain="[]"
-                    	context="{'group_by':'state'}" />
+                        context="{'group_by':'state'}" />
                     <filter string="Priority" icon="terp-crm"
-                    	domain="[]" context="{'group_by':'priority'}" />
+                        domain="[]" context="{'group_by':'priority'}" />
                 </group>
             </search>
         </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 13a9abe2cfd..dd8373538ba 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,7 +13,7 @@
         <field name="context">{'object_id':'crm.lead'}</field>
     </record>
     <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act"
-    	parent="crm.menu_crm_case_stage" />
+        parent="crm.menu_crm_case_stage" />
 
     <!--  Resource Type Form View -->
 
@@ -22,12 +22,12 @@
             <field name="res_model">crm.case.resource.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-    	    <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-	        <field name="context">{'object_id':'crm.lead'}</field>
+            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+            <field name="context">{'object_id':'crm.lead'}</field>
         </record>
         <menuitem action="crm_lead_resource_act"
-        	id="menu_crm_lead_resource_act"
-        	parent="crm.menu_crm_case_resource_type" />
+            id="menu_crm_lead_resource_act"
+            parent="crm.menu_crm_case_resource_type" />
 
 <!-- CRM Lead Form View  -->
 
@@ -50,18 +50,18 @@
                             attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                     <newline />
                     <field name="section_id" colspan="1"
-                    	widget="selection" />
+                        widget="selection" />
                     <field name="user_id" />
                     <field name="stage_id" widget="selection"
-                    	readonly="1"
-                    	domain="[('object_id.model', '=', 'crm.lead')]" />
+                        readonly="1"
+                        domain="[('object_id.model', '=', 'crm.lead')]" />
                     <group col="2" colspan="1">
-                    	<button name="stage_previous" string="Previous"
-                    		states="open,pending" type="object"
-                    		icon="gtk-go-back" />
-                    	<button name="stage_next" string="Next"
-                    		states="open,pending" type="object"
-                    		icon="gtk-go-forward" />
+                        <button name="stage_previous" string="Previous"
+                            states="open,pending" type="object"
+                            icon="gtk-go-back" />
+                        <button name="stage_next" string="Next"
+                            states="open,pending" type="object"
+                            icon="gtk-go-forward" />
                     </group>
                 </group>
                 <notebook colspan="4">
@@ -104,65 +104,31 @@
                     <group col="8" colspan="4">
                         <field name="state" select="2"/>
                         <button name="case_close" string="Close"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-close" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-close" />
                         <button name="case_open" string="Open"
-                        	states="draft,pending" type="object"
-                        	icon="gtk-go-forward" />
+                            states="draft,pending" type="object"
+                            icon="gtk-go-forward" />
                         <button name="case_cancel" string="Cancel"
-                        	states="draft,open,pending" type="object"
-                        	icon="gtk-cancel" />
+                            states="draft,open,pending" type="object"
+                            icon="gtk-cancel" />
                         <button name="case_pending" string="Pending"
-                        	states="draft,open" type="object"
-                        	icon="gtk-media-pause" />
+                            states="draft,open" type="object"
+                            icon="gtk-media-pause" />
                         <button name="case_escalate" string="Escalate"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-go-up" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-go-up" />
                         <button name="case_reset"
-                        	string="Reset to Draft" states="done,cancel"
-                        	type="object" icon="gtk-convert" />
+                            string="Reset to Draft" states="done,cancel"
+                            type="object" icon="gtk-convert" />
                     </group>
                  </page>
-                 <page string="Emails" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
-                   </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
-                        <form string="Communication history">
-                            <group col="7" colspan="4">
-                                <field name="date"/>
-                                <field name="email_to"/>  
-                                <field name="email_from"/>                                
-                                <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.lead'}"
-                                   	icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
-                           <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.lead'}"
-                           	icon="gtk-go-forward" type="action" />
-                 </page>
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
                         <separator string="Categories" colspan="2" col="2"/>
                         <field name="company_id"
-                        	groups="base.group_multi_company"
-                        	widget="selection" colspan="2" />
+                            groups="base.group_multi_company"
+                            widget="selection" colspan="2" />
                         <field name="categ_id"
                             widget="selection"
                             domain="[('object_id.model', '=', 'crm.opportunity')]" />
@@ -181,6 +147,41 @@
                         <field name="day_close"/>
                     </group>
                  </page>
+                 <page string="Emails" groups="base.group_extended">
+                   <group colspan="4">
+                       <field colspan="4" name="email_cc" string="CC"/>
+                   </group>
+                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                        <form string="Communication history">
+                            <group col="7" colspan="4">
+                                <field name="date"/>
+                                <field name="email_to"/>
+                                <field name="email_from"/>
+                                <button
+                                     string="Add a CC"
+                                     name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                     icon="gtk-add" type="action"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4" nolabel="1"/>
+                            <button colspan="4"
+                                string="Reply to Last Email"
+                                name="%(action_crm_send_mail)d"
+                                context="{'mail':'reply', 'model': 'crm.lead'}"
+                                icon="gtk-undo" type="action" />
+                        </form>
+                        <tree string="Communication history">
+                            <field name="description"/>
+                            <field name="email_to"/>
+                            <field name="date"/>
+                        </tree>
+                    </field>
+                    <button colspan="4" string="Send New Email"
+                        name="%(action_crm_send_mail)d"
+                        context="{'mail':'new', 'model': 'crm.lead'}"
+                        icon="gtk-go-forward" type="action" />
+                 </page>
+
                 </notebook>
             </form>
         </field>
@@ -206,30 +207,30 @@
 
                 <field name="stage_id"/>
                 <button name="stage_previous" string="Previous"
-                	states="open,pending" type="object" icon="gtk-go-back" />
+                    states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next"
-                	states="open,pending" type="object"
-                	icon="gtk-go-forward" />
+                    states="open,pending" type="object"
+                    icon="gtk-go-forward" />
                 <field name="section_id"
-                	invisible="context.get('invisible_section', True)" />
+                    invisible="context.get('invisible_section', True)" />
                 <field name="user_id" />
                 <field name="state" />
                 <button name="case_open" string="Open"
-                	states="draft,pending" type="object"
-                	icon="gtk-go-forward" />
+                    states="draft,pending" type="object"
+                    icon="gtk-go-forward" />
                 <button name="case_close" string="Close"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-close" />
+                    states="open,draft,pending" type="object"
+                    icon="gtk-close" />
                 <button string="Convert to Opportunity"
-                	name="%(action_crm_lead2opportunity)d"
-                	states="draft,open,pending" icon="gtk-index"
-                	type="action" />
+                    name="%(action_crm_lead2opportunity)d"
+                    states="draft,open,pending" icon="gtk-index"
+                    type="action" />
                 <button name="case_escalate" string="Escalate"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-go-up" />
+                    states="open,draft,pending" type="object"
+                    icon="gtk-go-up" />
                 <button name="case_cancel" string="Cancel"
-                	states="draft,open,pending" type="object"
-                	icon="gtk-cancel" />
+                    states="draft,open,pending" type="object"
+                    icon="gtk-cancel" />
             </tree>
         </field>
     </record>
@@ -243,11 +244,11 @@
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
             <calendar string="Meeting For Leads Generation"
-            	date_start="create_date" color="user_id"
-            	date_delay="duration">
-            	<field name="name" />
-            	<field name="partner_name" />
-            	<field name="partner_contact" />
+                date_start="create_date" color="user_id"
+                date_delay="duration">
+                <field name="name" />
+                <field name="partner_name" />
+                <field name="partner_contact" />
             </calendar>
         </field>
     </record>
@@ -273,9 +274,9 @@
 
                 <separator orientation="vertical"/>
                 <filter icon="gtk-home" string="Today"
-                	domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), \
-                			('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
-                	help="Todays' Opportunities" />
+                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), \
+                            ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
+                    help="Todays' Opportunities" />
                 <filter icon="gtk-media-rewind" string="7 Days"
                     help="Opportunities during last 7 days"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
@@ -289,6 +290,9 @@
                         domain="[('user_id','=',uid)]"
                         help="My Leads" default="1"
                     />
+                    <filter icon="terp-partner"
+                        domain="[('user_id','=', False)]"
+                        help="Unassigned Leads" />
                 </field>
                 <field name="section_id" default="context.get('section_id', False)" widget="selection"
                     context="{'invisible_section': False}">
@@ -299,7 +303,7 @@
                     <filter icon="terp-crm"
                         context="{'invisible_section': False}"
                         domain="[]"
-                        help="Show Sections"/>
+                        help="Show Sales Team"/>
                 </field>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="14">
@@ -313,7 +317,7 @@
                     <filter string="Referrer" icon="terp-crm" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Creation" icon="terp-project"
-                    	domain="[]" context="{'group_by':'create_date'}" />
+                        domain="[]" context="{'group_by':'create_date'}" />
                 </group>
            </search>
         </field>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4e37620839d..caf4e0bf101 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,8 +14,8 @@
     </record>
 
     <menuitem action="crm_opportunity_categ_action"
-    	id="menu_crm_case_opportunity-act"
-    	parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_opportunity-act"
+        parent="crm.menu_crm_case_categ" />
 
 <!-- Opportunity Stages Form View-->
 
@@ -29,8 +29,8 @@
         </record>
 
         <menuitem action="crm_opportunity_stage_act"
-        	id="menu_crm_opportunity_stage_act"
-        	parent="crm.menu_crm_case_stage" />
+            id="menu_crm_opportunity_stage_act"
+            parent="crm.menu_crm_case_stage" />
 
 <!-- Opportunity Resource Type Form View -->
 
@@ -44,8 +44,8 @@
         </record>
 
         <menuitem action="crm_opportunity_resource_act"
-        	id="menu_crm_opportunity_resource_act"
-        	parent="crm.menu_crm_case_resource_type" />
+            id="menu_crm_opportunity_resource_act"
+            parent="crm.menu_crm_case_resource_type" />
 
 
 <!-- Opportunities Form View -->
@@ -61,19 +61,19 @@
                     <label string="Stage:" align="1.0"/>
                     <group colspan="1" col="4">
                         <field name="stage_id" nolabel="1"
-                        	on_change="onchange_stage_id(stage_id)"
-                        	widget="selection"
-                        	domain="[('object_id.model', '=', 'crm.opportunity')]" />
+                            on_change="onchange_stage_id(stage_id)"
+                            widget="selection"
+                            domain="[('object_id.model', '=', 'crm.opportunity')]" />
                         <button name="stage_previous"
-                        	states="open,pending" type="object"
-                        	icon="gtk-go-back" string="" />
+                            states="open,pending" type="object"
+                            icon="gtk-go-back" string="" />
                         <button name="stage_next" states="open,pending"
-                        	type="object" icon="gtk-go-forward" string="" />
+                            type="object" icon="gtk-go-forward" string="" />
                     </group>
                     <field name="user_id"/>
 
                        <button name="action_makeMeeting" type="object"
-                		string="Schedule Meeting" icon="gtk-redo" />
+                        string="Schedule Meeting" icon="gtk-redo" />
 
                     <field name="planned_revenue"/>
                     <field name="probability"/>
@@ -84,14 +84,14 @@
                 <notebook colspan="4">
                 <page string="Opportunity">
                     <group col="3" colspan="2">
-                        <separator colspan="3" string="Contacts"/>
+                        <separator colspan="4" string="Contacts"/>
                         <field name="partner_id" select="1"
-                        	on_change="onchange_partner_id(partner_id, email_from)"
-                        	colspan="2" />
+                            on_change="onchange_partner_id(partner_id, email_from)"
+                            colspan="2" />
                         <field name="partner_address_id"
-                        	string="Contact"
-                        	on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                        	colspan="1" />
+                            string="Contact"
+                            on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                            colspan="1" />
                         <field name="email_from" string="Email" />
                         <field name="phone"/>
                     </group>
@@ -101,8 +101,8 @@
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="priority" string="Priority"/>
                         <field name="categ_id" select="1"
-                        	string="Category" widget="selection"
-                        	domain="[('object_id.model', '=', 'crm.opportunity')]" />
+                            string="Category" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.opportunity')]" />
                     </group>
 
                     <separator colspan="4" string="Details"/>
@@ -112,23 +112,23 @@
                     <group col="8" colspan="4">
                         <field name="state" select="2"/>
                         <button name="case_open" string="Open"
-                        	states="draft,pending" type="object"
-                        	icon="gtk-go-forward" />
+                            states="draft,pending" type="object"
+                            icon="gtk-go-forward" />
                         <button name="case_escalate" string="Escalate"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-go-up" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-go-up" />
                         <button name="case_pending" string="Pending"
-                        	states="draft,open" type="object"
-                        	icon="gtk-media-pause" />
+                            states="draft,open" type="object"
+                            icon="gtk-media-pause" />
                         <button name="case_close" string="Mark Won"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-close" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-close" />
                         <button name="case_cancel" string="Mark Lost"
-                        	states="draft,open,pending" type="object"
-                        	icon="gtk-cancel" />
+                            states="draft,open,pending" type="object"
+                            icon="gtk-cancel" />
                         <button name="case_reset" string="Reset to New"
-                        	states="done,cancel" type="object"
-                        	icon="gtk-convert" />
+                            states="done,cancel" type="object"
+                            icon="gtk-convert" />
                     </group>
                 </page>
 
@@ -175,10 +175,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.opportunity'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.opportunity'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -187,9 +187,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.opportunity'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.opportunity'}"
+                               icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
@@ -211,10 +211,10 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <button name="stage_previous" string="Previous"
-                	states="open,pending" type="object" icon="gtk-go-back" />
+                    states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next"
-                	states="open,pending" type="object"
-                	icon="gtk-go-forward" />
+                    states="open,pending" type="object"
+                    icon="gtk-go-forward" />
                 <field name="planned_revenue" sum="Total of Planned Revenue"/>
                 <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
                 <field name="date_deadline" string="Excepted Closing"/>
@@ -222,17 +222,17 @@
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Open"
-                	states="draft,pending" type="object"
-                	icon="gtk-go-forward" />
+                    states="draft,pending" type="object"
+                    icon="gtk-go-forward" />
                 <button name="case_close" string="Won"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-close" />
+                    states="open,draft,pending" type="object"
+                    icon="gtk-close" />
                 <button name="case_pending" string="Pending"
-                	states="open,draft" type="object"
-                	icon="gtk-media-pause" />
+                    states="open,draft" type="object"
+                    icon="gtk-media-pause" />
                 <button name="case_cancel" string="Lost"
-                	states="draft,open,pending" type="object"
-                	icon="gtk-cancel" />
+                    states="draft,open,pending" type="object"
+                    icon="gtk-cancel" />
             </tree>
         </field>
     </record>
@@ -260,14 +260,24 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
+                <filter icon="terp-project"
+                    string="Current"
+                    default="1"
+                    domain="[('state','in',('draft','open'))]"/>
+                <filter icon="terp-project"
+                    string="Open"
+                    domain="[('state','=','open')]"/>
+                <filter icon="terp-project"
+                    string="Pending"
+                    domain="[('state','=','pending')]"/>
+                <separator orientation="vertical"/>
                 <filter icon="gtk-home" string="Today"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
                     help="Todays' Opportunities" />
-
                 <filter icon="gtk-media-rewind" string="7 Days"
                     help="Opportunities during last 7 days"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
-                    	 ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                         ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                 />
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity"/>
@@ -277,44 +287,41 @@
                         domain="[('user_id','=',uid)]"
                         help="My Opportunities" default="1"
                     />
+                    <filter icon="terp-partner"
+                        domain="[('user_id','=', False)]"
+                        help="Unassigned Opportunities" />
                 </field>
                 <field name="section_id"
-                	default="context.get('section_id', False)" select="1"
-                	widget="selection">
-                	<filter icon="terp-crm"
-                		domain="[('section_id','=',context.get('section_id',False))]"
-                		help="My section" />
-                </field>
-                <field name="state">
-                    <filter icon="gtk-media-rewind"
-                        help="New and open opportunities"
-                        default="1"
-                        domain="[('state','in',('draft','open'))]" />
+                    default="context.get('section_id', False)" select="1"
+                    widget="selection">
+                    <filter icon="terp-crm"
+                        domain="[('section_id','=',context.get('section_id',False))]"
+                        help="My section" />
                 </field>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="4">
+                <group expand="1" string="Group By..." colspan="16">
                     <filter string="Stage" icon="terp-crm" domain="[]"
-                    	context="{'group_by':'stage_id'}" />
+                        context="{'group_by':'stage_id'}" />
 
                     <filter string="Category" icon="terp-crm"
-                    	domain="[]" context="{'group_by':'categ_id'}" />
+                        domain="[]" context="{'group_by':'categ_id'}" />
 
                     <filter string="Campaign" icon="terp-crm"
-                    	domain="[]" context="{'group_by':'type_id'}" />
+                        domain="[]" context="{'group_by':'type_id'}" />
 
                     <separator orientation="vertical" />
                     <filter string="Partner" icon="terp-crm" domain="[]"
-                    	context="{'group_by':'partner_id'}" />
+                        context="{'group_by':'partner_id'}" />
 
                     <filter string="Salesman" icon="terp-crm"
-                    	domain="[]" context="{'group_by':'user_id'}" />
+                        domain="[]" context="{'group_by':'user_id'}" />
 
                     <separator orientation="vertical" />
                     <filter string="Creation" icon="terp-project"
-                    	domain="[]" context="{'group_by':'create_date'}" />
+                        domain="[]" context="{'group_by':'create_date'}" />
 
                     <filter string="Exp.Closing" icon="terp-project"
-                    	domain="[]" context="{'group_by':'date_deadline'}" />
+                        domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
            </search>
         </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 42692eee9ce..ec773cf78ef 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -14,7 +14,7 @@
     </record>
 
     <menuitem action="crm_phonecall_categ_action"
-    	id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ" />
 
 <!-- ResourceType Form View -->
 
@@ -23,13 +23,13 @@
             <field name="res_model">crm.case.resource.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-	        <field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
-	        <field name="context">{'object_id':'crm.phonecall'}</field>
+            <field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
+            <field name="context">{'object_id':'crm.phonecall'}</field>
         </record>
 
     <menuitem action="crm_phonecall_resource_act"
-    	id="menu_crm_phonecall_resource_act"
-    	parent="crm.menu_crm_case_resource_type" />
+        id="menu_crm_phonecall_resource_act"
+        parent="crm.menu_crm_case_resource_type" />
 
 
 <!--  PhoneCalls Tree View -->
@@ -87,9 +87,9 @@
                         name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-					<label colspan="6"  string=""/>
-	                <button string="Schedule Other Call"
-	                 icon="gtk-redo"
+                    <label colspan="6"  string=""/>
+                    <button string="Schedule Other Call"
+                     icon="gtk-redo"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
 
@@ -97,7 +97,7 @@
                 <group col="3" colspan="2">
                     <separator colspan="3" string="Contacts" />
                     <field name="partner_id"
-                    	on_change="onchange_partner_id(partner_id, email_from)" />
+                        on_change="onchange_partner_id(partner_id, email_from)" />
                     <button string="Create a Partner"
                         icon="terp-crm"
                         name="%(action_crm_phonecall2partner)d"
@@ -105,7 +105,7 @@
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
                     <newline/>
                     <field name="partner_address_id" string="Contact"
-                    	on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+                        on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                     <newline/>
                     <field name="partner_mobile" />
                 </group>
@@ -120,19 +120,19 @@
                 <group col="8" colspan="4">
                     <field name="state" select="1" />
                     <button name="case_cancel" string="Cancel"
-                    	states="draft,open,pending" type="object"
-                    	icon="gtk-cancel" />
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
                     <button name="case_open" string="Open"
-                    	states="draft,pending" type="object"
-                    	icon="gtk-go-forward" />
+                        states="draft,pending" type="object"
+                        icon="gtk-go-forward" />
                     <button name="case_pending" string="Not Held"
-                    	states="open" type="object" icon="gtk-undo" />
+                        states="open" type="object" icon="gtk-undo" />
                     <button name="case_close" string="Held"
-                    	states="open,draft,pending" type="object"
-                    	icon="gtk-jump-to" />
+                        states="open,draft,pending" type="object"
+                        icon="gtk-jump-to" />
                     <button name="case_reset" string="Reset to Draft"
-                    	states="done,cancel" type="object"
-                    	icon="gtk-convert" />
+                        states="done,cancel" type="object"
+                        icon="gtk-convert" />
                 </group>
             </form>
         </field>
@@ -177,35 +177,30 @@
                <field name="partner_id"/>
                <field name="user_id" widget="selection">
                    <filter icon="terp-partner"
-                   	domain="[('user_id','=',uid)]" help="My Phonecalls"
-                   	default="1" />
+                       domain="[('user_id','=',uid)]" help="My Phonecalls"
+                       default="1" />
                    <filter icon="terp-partner"
-                   	domain="[('user_id','=',False)]"
-                   	help="Unassigned Phonecalls" />
-               </field>
-               <field name="state">
-                   <filter icon="gtk-index"
-                   	domain="[('state','in',('open','draft' ))]"
-                   	help="Current" default="1" />
+                       domain="[('user_id','=',False)]"
+                       help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
-               	default="context.get('section_id', False)" select="1"
-               	widget="selection" string="Section">
-               	<filter icon="terp-crm"
-               		domain="[('section_id','=',context.get('section_id',False))]"
-               		help="My section" />
+                   default="context.get('section_id', False)" select="1"
+                   widget="selection" string="Section">
+                   <filter icon="terp-crm"
+                       domain="[('section_id','=',context.get('section_id',False))]"
+                       help="My section" />
                </field>
                <newline/>
                <group expand="1" string="Group By..." colspan="4">
                    <filter string="Partner" icon="terp-crm" domain="[]"
-                   	context="{'group_by':'partner_id'}" />
+                       context="{'group_by':'partner_id'}" />
                    <filter string="Responsible" icon="terp-crm"
-                   	domain="[]" context="{'group_by':'user_id'}" />
+                       domain="[]" context="{'group_by':'user_id'}" />
                    <separator orientation="vertical" />
                    <filter string="Creation" icon="terp-project"
-                   	domain="[]" context="{'group_by':'create_date'}" />
+                       domain="[]" context="{'group_by':'create_date'}" />
                    <filter string="Date" icon="terp-project" domain="[]"
-                   	context="{'group_by':'date'}" />
+                       context="{'group_by':'date'}" />
                </group>
            </search>
         </field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a87a67e3e1c..f0a44c56c8c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -141,8 +141,8 @@
         <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration"/>
 
         <menuitem action="crm_case_section_act"
-        	id="menu_crm_case_section_act"
-        	parent="crm.menu_crm_configuration" />
+            id="menu_crm_case_section_act"
+            parent="crm.menu_crm_configuration" />
 
 
 <!-- Resource Type of case Tree View -->
@@ -184,7 +184,7 @@
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
         <menuitem id="menu_crm_case_resource_type" name="Resource Type"
-        	parent="crm.menu_crm_configuration" />
+            parent="crm.menu_crm_configuration" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
@@ -241,11 +241,11 @@
             <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="create_date"
-                	date_stop="date_deadline" day_length="12"
-                	string="Cases">
-                	<field name="name" />
-                	<field name="partner_id" />
-                	<field name="state" />
+                    date_stop="date_deadline" day_length="12"
+                    string="Cases">
+                    <field name="name" />
+                    <field name="partner_id" />
+                    <field name="state" />
                 </calendar>
             </field>
         </record>
@@ -267,22 +267,22 @@
                     <field name="user_id"/>
                     <field name="state"/>
                     <button name="case_close"
-                    	states="open,draft,pending" string="Close"
-                    	type="object" icon="gtk-close" />
+                        states="open,draft,pending" string="Close"
+                        type="object" icon="gtk-close" />
                     <button name="case_open" states="draft,pending"
-                    	string="Open" type="object" icon="gtk-go-forward" />
+                        string="Open" type="object" icon="gtk-go-forward" />
                     <button name="case_cancel"
-                    	states="draft,open,pending" string="Cancel"
-                    	type="object" icon="gtk-cancel" />
+                        states="draft,open,pending" string="Cancel"
+                        type="object" icon="gtk-cancel" />
                     <button name="case_pending" states="draft,open"
-                    	string="Pending" type="object"
-                    	icon="gtk-media-pause" />
+                        string="Pending" type="object"
+                        icon="gtk-media-pause" />
                     <button name="case_escalate"
-                    	states="open,draft,pending" string="Escalate"
-                    	type="object" icon="gtk-go-up" />
+                        states="open,draft,pending" string="Escalate"
+                        type="object" icon="gtk-go-up" />
                     <button name="case_reset" states="done,cancel"
-                    	string="Reset to Draft" type="object"
-                    	icon="gtk-convert" />
+                        string="Reset to Draft" type="object"
+                        icon="gtk-convert" />
                 </tree>
             </field>
         </record>
@@ -305,24 +305,24 @@
                         <page string="General">
                             <group col="8" colspan="4">
                                 <field colspan="4" name="partner_id"
-                                	on_change="onchange_partner_id(partner_id, email_from)"
-                                	select="1" />
+                                    on_change="onchange_partner_id(partner_id, email_from)"
+                                    select="1" />
                                 <field colspan="3"
-                                	name="partner_address_id"
-                                	on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                	select="2" />
+                                    name="partner_address_id"
+                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                    select="2" />
                                 <newline />
                                 <field colspan="3" name="email_from"
-                                	select="2" />
+                                    select="2" />
                                 <button name="remind_partner"
-                                	states="open,pending"
-                                	string="Send Reminder" type="object"
-                                	icon="gtk-go-forward" />
+                                    states="open,pending"
+                                    string="Send Reminder" type="object"
+                                    icon="gtk-go-forward" />
                                 <field name="user_id" select="1" />
                                 <button name="remind_user"
-                                	states="open,pending"
-                                	string="Send Reminder" type="object"
-                                	icon="gtk-go-forward" />
+                                    states="open,pending"
+                                    string="Send Reminder" type="object"
+                                    icon="gtk-go-forward" />
                             </group>
                             <separator colspan="4" string="Description"/>
                             <field name="description" colspan="4" nolabel="1"/>
@@ -330,27 +330,27 @@
                             <group col="8" colspan="4">
                                 <field name="state" select="1"/>
                                 <button name="case_close"
-                                	states="open,draft,pending"
-                                	string="Close" type="object"
-                                	icon="gtk-close" />
+                                    states="open,draft,pending"
+                                    string="Close" type="object"
+                                    icon="gtk-close" />
                                 <button name="case_open"
-                                	states="draft,pending" string="Open"
-                                	type="object" icon="gtk-go-forward" />
+                                    states="draft,pending" string="Open"
+                                    type="object" icon="gtk-go-forward" />
                                 <button name="case_cancel"
-                                	states="draft,open,pending"
-                                	string="Cancel" type="object"
-                                	icon="gtk-cancel" />
+                                    states="draft,open,pending"
+                                    string="Cancel" type="object"
+                                    icon="gtk-cancel" />
                                 <button name="case_pending"
-                                	states="draft,open" string="Pending"
-                                	type="object" icon="gtk-media-pause" />
+                                    states="draft,open" string="Pending"
+                                    type="object" icon="gtk-media-pause" />
                                 <button name="case_escalate"
-                                	states="open,draft,pending"
-                                	string="Escalate" type="object"
-                                	icon="gtk-go-up" />
+                                    states="open,draft,pending"
+                                    string="Escalate" type="object"
+                                    icon="gtk-go-up" />
                                 <button name="case_reset"
-                                	states="done,cancel"
-                                	string="Reset to Draft" type="object"
-                                	icon="gtk-convert" />
+                                    states="done,cancel"
+                                    string="Reset to Draft" type="object"
+                                    icon="gtk-convert" />
                             </group>
                         </page>
                         <page string="History" groups="base.group_extended">
@@ -385,10 +385,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.case'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.case'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -397,9 +397,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.case'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.case'}"
+                               icon="gtk-go-forward" type="action" />
                         </page>
                     </notebook>
                 </form>
@@ -414,28 +414,28 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Case">
-                	<group col='6' colspan='4'>
-                		<filter icon="terp-partner" string="My Cases"
-                			domain="[('user_id','=',uid)]" separator="1"
-                			default="1" help="Cases Related to Current User" />
-                		<field name="state" select="1">
-                			<filter icon="gtk-new"
-                				domain="[('state','in',('draft', 'open'))]"
-                				help="Current Cases" />
-                			<filter icon="gtk-yes"
-                				domain="[('state','=','open')]" help="Open Cases" />
-                			<filter icon="gtk-media-pause"
-                				domain="[('state','=','pending')]"
-                				help="Pending Cases" />
-                		</field>
-                		<separator orientation="vertical" />
-                		<field name="name" select='1' />
-                		<field name="user_id" select="1"
-                			widget="selection" />
-                	</group>
-                	<field name="section_id"
-                		default="context.get('section_id', False)" select="1"
-                		widget="selection" string="Section" />
+                    <group col='6' colspan='4'>
+                        <filter icon="terp-partner" string="My Cases"
+                            domain="[('user_id','=',uid)]" separator="1"
+                            default="1" help="Cases Related to Current User" />
+                        <field name="state" select="1">
+                            <filter icon="gtk-new"
+                                domain="[('state','in',('draft', 'open'))]"
+                                help="Current Cases" />
+                            <filter icon="gtk-yes"
+                                domain="[('state','=','open')]" help="Open Cases" />
+                            <filter icon="gtk-media-pause"
+                                domain="[('state','=','pending')]"
+                                help="Pending Cases" />
+                        </field>
+                        <separator orientation="vertical" />
+                        <field name="name" select='1' />
+                        <field name="user_id" select="1"
+                            widget="selection" />
+                    </group>
+                    <field name="section_id"
+                        default="context.get('section_id', False)" select="1"
+                        widget="selection"/>
                 </search>
             </field>
         </record>
@@ -453,7 +453,7 @@
             <field name="res_model">crm.case</field>
             <field name="view_type">form</field>
             <field name="domain">
-            	[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]
+                [('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]
             </field>
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
@@ -503,15 +503,15 @@
         <field name="arch" type="xml">
                 <search string="Search Histories">
                        <filter icon="terp-crm" string="My Histories"
-                       	domain="[('user_id','=',uid)]"
-                       	help="My Histories" />
+                           domain="[('user_id','=',uid)]"
+                           help="My Histories" />
                        <separator orientation="vertical"/>
                      <group col="6" colspan="2">
                        <field name="date" select="1"/>
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="section_id"
-                    	default="context.get('section_id', False)"
-                    	select="1" widget="selection" string="Section" />
+                        default="context.get('section_id', False)"
+                        select="1" widget="selection"/>
                      </group>
                 </search>
             </field>
@@ -573,11 +573,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner Segmentation">
-                	<group col="6" colspan="4">
-	                    <field name="name" select="1"/>
-	                    <field name="categ_id" select="2"/>
-	                    <field name="exclusif"/>
-	                </group>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="categ_id" select="2"/>
+                        <field name="exclusif"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Sales Purchase">
                             <field name="sales_purchase_active"/>
@@ -590,21 +590,21 @@
                             <field colspan="4" name="segmentation_line" widget="one2many_list" nolabel="1"/>
                         </page>
                         <page string="Description">
-       	                    <field colspan="4" name="description" select="2" nolabel="1"/>
-       	                </page>
+                               <field colspan="4" name="description" select="2" nolabel="1"/>
+                           </page>
                     </notebook>
                     <field name="state"/>
                     <group col="3" colspan="2">
                         <button name="process_start"
-                        	states="not running"
-                        	string="Compute Segmentation" type="object"
-                        	icon="gtk-execute" />
+                            states="not running"
+                            string="Compute Segmentation" type="object"
+                            icon="gtk-execute" />
                         <button name="process_stop" states="running"
-                        	string="Stop Process" type="object"
-                        	icon="gtk-cancel" />
+                            string="Stop Process" type="object"
+                            icon="gtk-cancel" />
                         <button name="process_continue" states="running"
-                        	string="Continue Process" type="object"
-                        	icon="gtk-go-forward" />
+                            string="Continue Process" type="object"
+                            icon="gtk-go-forward" />
                     </group>
                 </form>
             </field>
@@ -639,8 +639,8 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="crm_segmentation_tree-act"
-        	id="menu_crm_segmentation-act"
-        	parent="crm.menu_crm_configuration" />
+            id="menu_crm_segmentation-act"
+            parent="crm.menu_crm_configuration" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
@@ -650,8 +650,8 @@
             <field name="arch" type="xml">
                 <page string="Current Activity" position="inside">
                     <field name="context_section_id" completion="1"
-                    	widget="selection"
-                    	context="{'user_prefence':True}" />
+                        widget="selection"
+                        context="{'user_prefence':True}" />
                 </page>
             </field>
         </record>
@@ -671,7 +671,7 @@
 
 <!-- Inherit View From Partner  -->
 
-		<record id="view_partners_form_crm1" model="ir.ui.view">
+        <record id="view_partners_form_crm1" model="ir.ui.view">
                 <field name="name">view.res.partner.form.crm.inherited1</field>
                 <field name="model">res.partner</field>
                 <field name="type">form</field>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index e4729b78cad..53d4f1b5476 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -1,53 +1,53 @@
 <openerp>
-  	<data>
+      <data>
 
-		<!-- Lead to partner confirmation form -->
+        <!-- Lead to partner confirmation form -->
 
-  		<record id="view_crm_lead2partner_create" model="ir.ui.view">
-	      <field name="name">crm.lead2partner.view.create</field>
-	      <field name="model">crm.lead2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner?">
-	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        		<separator string="" colspan="4" />
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-	      			<button name="open_create_partner" string="Create _Partner" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
+          <record id="view_crm_lead2partner_create" model="ir.ui.view">
+          <field name="name">crm.lead2partner.view.create</field>
+          <field name="model">crm.lead2partner</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+              <form string="Create a Partner?">
+                  <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+                <label string="You may have to verify that this partner does not exist already." colspan="4"/>
+                <separator string="" colspan="4" />
+                  <group col="4" colspan="4">
+                      <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                      <button name="open_create_partner" string="Create _Partner" type="object" icon="gtk-ok"/>
+                  </group>
+              </form>
+          </field>
+       </record>
 
-	   <!-- Lead to Partner form view -->
+       <!-- Lead to Partner form view -->
 
-	   <record id="view_crm_lead2partner" model="ir.ui.view">
-	      <field name="name">crm.lead2partner.view</field>
-	      <field name="model">crm.lead2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<field name="action"/>
-	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
-		        </group>
-		        <separator string="" colspan="4" />
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
+       <record id="view_crm_lead2partner" model="ir.ui.view">
+          <field name="name">crm.lead2partner.view</field>
+          <field name="model">crm.lead2partner</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+              <form string="Create a Partner">
+                  <field name="action"/>
+                  <group attrs="{'invisible':[('action','!=','exist')]}">
+                    <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+                </group>
+                <separator string="" colspan="4" />
+                  <group col="4" colspan="4">
+                      <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                      <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+                  </group>
+              </form>
+          </field>
+       </record>
 
-	   <!-- Lead to Partner wizard -->
+       <!-- Lead to Partner wizard -->
 
-	   <act_window id="action_crm_lead2partner"
-    		key2="client_action_multi" name="Create a Partner"
-    		res_model="crm.lead2partner" src_model="crm.lead"
-    		view_id="view_crm_lead2partner_create"
-    		view_mode="form" target="new" view_type="form" />
+       <act_window id="action_crm_lead2partner"
+            key2="client_action_multi" name="Create a Partner"
+            res_model="crm.lead2partner" src_model="crm.lead"
+            view_id="view_crm_lead2partner_create"
+            view_mode="form" target="new" view_type="form" />
 
- 	</data>
+     </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 3df61afbcab..057d049af9c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -88,7 +88,6 @@
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>
-                    <field name="ssnid"/>
                     <field name="work_phone"/>
                     <field name="work_email"/>
                     <field name="department_id"/>
@@ -106,7 +105,6 @@
                     <filter icon="terp-partner" domain="[('parent_id','child_of',uid),('id', '!=', uid)]" string ="My Employees"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
-                    <field name="ssnid"/>
                     <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
                     <field name="parent_id" widget="selection" />
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index aef696dc676..49a7d83d239 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -156,32 +156,16 @@
                         <filter icon="terp-hr"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
-                        <separator orientation="vertical" />
-                        <filter
-                            icon="terp-hr"
-                            domain="[('state','=','draft')]"
-                            string="Draft"
-                            help="Draft Expense"/>
-                        <filter
-                            icon="terp-hr"
-                            domain="[('state','=','confirm')]"
-                            string="To Validate"
-                            help="Confirmed Expense"/>
-                        <filter
-                            icon="terp-hr"
-                            domain="[('state','=','accepted')]"
-                            string="To Pay"
-                            help="Expenses to Invoice"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id" select="1" widget="selection" />
-                        <field name="name" select='1'/>
-                        <field name="department_id" widget="selection" />
-                        <field name="state" select="1"/>
-                    </group>
-                    <newline />
-                    <group expand="1" string="Group By..." colspan="11" col="11">
-                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
-                    </group>
+                      </field>
+                      <field name="department_id" widget="selection" />
+                </group>
+                <newline />
+                <group expand="1" string="Group By..." colspan="11" col="11">
+                    <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
+                </group>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 472061e2789..bdd902923eb 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -47,7 +47,7 @@
 """,
     'author': 'Tiny & Axelor',
     'website': 'http://www.openerp.com',
-    'depends': ['hr', 'crm', 'process'],
+    'depends': ['hr', 'crm', 'process', 'resource'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index efd0e8438a0..6c11cbdf7a6 100755
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -224,6 +224,16 @@ class hr_holidays(osv.osv):
         else:
             raise osv.except_osv(_('Warning !'),_('Either there is no Employee defined, or no User attached with it.'))
         self.write(cr, uid, ids, vals)
+
+        vals= {
+               'name':record.name,
+               'date_from':record.date_from,
+               'date_to':record.date_to,
+               'calendar_id':record.employee_id.calendar_id.id,
+               'company_id':record.employee_id.company_id.id,
+               'resource_id':record.employee_id.resource_id.id
+             }
+        self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
         return True
 
     def holidays_confirm(self, cr, uid, ids, *args):
@@ -246,17 +256,7 @@ class hr_holidays(osv.osv):
                 'number_of_days': nb,
                 'user_id': user_id
             })
-            #vals= {
-            #       'name':record.name,
-            #       'date_from':record.date_from,
-            #       'date_to':record.date_to,
-            #       'calendar_id':record.employee_id.calendar_id.id,
-            #       'company_id':record.employee_id.company_id.id,
-            #       'resource_id':record.employee_id.resource_id.id
-            #     }
-            #self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
-
-        return True
+       return True
 
     def holidays_refuse(self, cr, uid, ids, *args):
         vals = {
diff --git a/addons/hr_holidays/wizard/holidays_summary_employees.py b/addons/hr_holidays/wizard/holidays_summary_employees.py
index f5a84a5b649..bdc5664abfb 100644
--- a/addons/hr_holidays/wizard/holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/holidays_summary_employees.py
@@ -67,11 +67,7 @@ class wizard_report(wizard.interface):
     states={
         'init':{
             'actions':[_check],
-<<<<<<< TREE
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel', 'gtk-cancel'), ('checkemp', 'Print', 'gtk-ok')]}
-=======
             'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel','gtk-cancel'), ('checkemp', 'Print', 'gtk-print')]}
->>>>>>> MERGE-SOURCE
         },
         'checkemp': {
             'actions': [],
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 9144d3b0ca3..d8f318d148b 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.analytic.timesheet</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree editable="bottom" string="Timesheet Line">
+                <tree editable="bottom" string="Timesheet Lines">
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
                     <field name="date" on_change="on_change_date(date)"/>
                     <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id"/>
@@ -50,12 +50,12 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group col='8' colspan='4'>
-	                    <filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
-	                    <filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="user_id" select="1" widget="selection"/>
-	                    <field name="account_id" select="1" widget="selection"/>
-	                    <field name="date" select="1"/>
+                        <filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
+                        <filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="account_id" select="1" widget="selection"/>
+                        <field name="date" select="1"/>
                     </group>
                 </search>
             </field>
@@ -83,11 +83,6 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
-      <!--  <menuitem
-            action="act_hr_timesheet_line_evry1_all_form"
-            id="menu_act_hr_timesheet_line_evry1_all_form"
-            parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"
-            groups="hr.group_hr_manager"/>-->
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 79086640262..c895250284e 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -68,16 +68,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                	<group col="10" colspan="4">
-                		<filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets"/>
-						<separator orientation="vertical"/>
-	                	<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
-		            	<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
-						<separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="user_id" select="1"/>
-                	</group>
+                    <group col="10" colspan="4">
+                        <filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
+                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="month" select="1"/>
+                        <field name="user_id" select="1"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -124,8 +124,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by invoice">
-                	<filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets to invoice"/>
-					<separator orientation="vertical"/>
+                    <filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets to invoice"/>
+                    <separator orientation="vertical"/>
                     <field name="account_id" select="1"/>
                     <field name="manager_id" select="1"/>
                     <field name="user_id" select="1"/>
@@ -207,17 +207,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
-                	<group col="10" colspan="4">
-                		<filter icon="terp-hr" string="My Daily Timesheets" domain="[('user_id','=',uid)]" help="My Daily Timesheets by account"/>
-						<separator orientation="vertical"/>
-	                	<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
-		            	<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="account_id" select="1"/>
-	                    <field name="user_id" select="1"/>
-					</group>
+                    <group col="10" colspan="4">
+                        <filter icon="terp-hr" string="My Daily Timesheets" domain="[('user_id','=',uid)]" help="My Daily Timesheets by account"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
+                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="month" select="1"/>
+                        <field name="account_id" select="1"/>
+                        <field name="user_id" select="1"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -281,17 +281,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <form string="Timesheet by account">
-                	<group col="10" colspan="4">
-                		<filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets by account"/>
-						<separator orientation="vertical"/>
-	                	<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
-		            	<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="account_id" select="1"/>
-	                    <field name="user_id" select="1"/>
-					</group>
+                    <group col="10" colspan="4">
+                        <filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets by account"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
+                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="month" select="1"/>
+                        <field name="account_id" select="1"/>
+                        <field name="user_id" select="1"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -323,15 +323,15 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Random Timesheets">
-                	<field name="analytic_account_id" select="1"/>
-                	<field name="name" select="1"/>
-                	<field name="quantity" select="2" />
-                	<field name="date" select="1"/>
+                    <field name="analytic_account_id" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="quantity" select="2" />
+                    <field name="date" select="1"/>
                 </tree>
             </field>
-    	</record>
+        </record>
 
-		<record model="ir.actions.act_window" id="action_random_timesheet_board">
+        <record model="ir.actions.act_window" id="action_random_timesheet_board">
             <field name="name">Random Timesheet</field>
             <field name="res_model">report.random.timesheet</field>
             <field name="view_type">form</field>
@@ -347,21 +347,21 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Random Timesheets Lines">
-                	<field name="date" select="1"/>
-                	<field name="user_id" />
-                	<field name="name" select="1"/>
-                	<field name="quantity" />
-                	<field name="product_id" select="1"/>
-                	<field name="analytic_account_id" select="1"/>
-                	<field name="uom_id" />
-                	<field name="amount" />
-                	<field name="to_invoice" select="1"/>
-                	<field name="general_account_id" />
+                    <field name="date" select="1"/>
+                    <field name="user_id" />
+                    <field name="name" select="1"/>
+                    <field name="quantity" />
+                    <field name="product_id" select="1"/>
+                    <field name="analytic_account_id" select="1"/>
+                    <field name="uom_id" />
+                    <field name="amount" />
+                    <field name="to_invoice" select="1"/>
+                    <field name="general_account_id" />
                 </tree>
             </field>
-    	</record>
+        </record>
 
-		<record model="ir.actions.act_window" id="action_random_timesheet_lines_board">
+        <record model="ir.actions.act_window" id="action_random_timesheet_lines_board">
             <field name="type">ir.actions.act_window</field>
             <field name="name">Timesheet Lines</field>
             <field name="res_model">random.timesheet.lines</field>
@@ -376,7 +376,7 @@
              name="Time Tracking"
              parent="base.menu_main_pm" sequence="3"/>
         <menuitem action="action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="base.menu_project_management_time_tracking" sequence="7"/>
-	  <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
+      <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
             parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
        <menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board" name="Timesheets Lines"
             parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 21f4775386a..580fc64638f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Editable current timesheet used  in dashboard-->
         <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
@@ -10,10 +9,10 @@
                 <tree string="Timesheets"
                     colors="blue:state == 'draft';grey:state == 'done'">
                     <field name="user_id"/>
-                    <field name="department_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="name"/>
+                    <field name="department_id"/>
                     <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
                     <field name="total_timesheet"/>
                     <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
@@ -182,14 +181,13 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group col="10" colspan="4">
-                        <filter icon="terp-crm" string="Unvalidated" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
-                        <filter icon="terp-crm" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Timesheets"/>
+                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My" default="1"/>
                         <separator orientation="vertical"/>
-                        <field name="state" />
-                        <field name="name" select="1"/>
-                        <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Timesheet"/>
-                        </field>
+                        <filter icon="terp-crm" string="In Progress" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
+                        <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirmed')]" help="Confirmed Timesheets"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="date_from"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-crm"
                                 domain="[('department_id','=',context.get('department_id',False))]"
@@ -197,10 +195,10 @@
                         </field>
                     </group>
                     <newline/>
-                   	<group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By..." colspan="4" col="20">
                         <filter string="Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
-                   	</group>
+                    </group>
                 </search>
             </field>
         </record>
@@ -308,17 +306,6 @@
                 </field>
             </field>
         </record>
-        <record id="view_attendance_tree_who" model="ir.ui.view">
-            <field name="name">hr.attendance.tree</field>
-            <field name="model">hr.attendance</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="hr_attendance.view_attendance_who"/>
-            <field name="arch" type="xml">
-                <field name="action_desc" position="after">
-                    <field name="sheet_id"/>
-                </field>
-            </field>
-        </record>
 
         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_day" name="Timesheet by Account" res_model="hr_timesheet_sheet.sheet.account" src_model="hr_timesheet_sheet.sheet"/>
 <!--         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/>  -->
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index a238658302c..eb80bb512f6 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -198,7 +198,6 @@ class mrp_bom(osv.osv):
         'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
         'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
         'revision_type': fields.selection([('numeric','numeric indices'),('alpha','alphabetical indices')], 'Index type'),
-        'child_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
         'child_complete_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
         'company_id': fields.many2one('res.company','Company',required=True),
         'multi_level_bom': fields.boolean('Multi-level BoM'),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 15729a8c985..3614ebf67bb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -242,21 +242,21 @@
             <field name="arch" type="xml">
                 <form string="Bill of Material">
                     <group colspan="4" col="6">
-	                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-	                    <field name="name" select="1"/>
-	                    <field name="code" select="1"/>
-	                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <newline/>
+                        <field name="product_uom"/>
+                        <field name="product_qty"/>
+                        <field name="routing_id" select="2" groups="base.group_extended"/>
+                        <newline/>
+                        <field name="product_uos" groups="product.group_uos"/>
+                        <field name="product_uos_qty" groups="product.group_uos"/>
+                        <newline/>
+                        <field name="multi_level_bom" invisible="1"/>
+                        <field name="type" groups="base.group_extended"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <newline/>
-                    <field name="product_uos" groups="product.group_uos"/>
-                    <field name="product_uos_qty" groups="product.group_uos"/>
-                    <field name="routing_id" select="2" groups="base.group_extended"/>
-                    <field name="type" groups="base.group_extended"/>
-                    <group colspan="4" col="6">
-	                    <field name="product_uom"/>
-	                   	<field name="product_qty"/>
-	                    <field name="multi_level_bom"/>
-	                </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list"/>
@@ -276,9 +276,6 @@
                             <field name="product_efficiency"/>
                             <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
                         </page>
-                        <page string="Multi-Level BoM" attrs="{'invisible':[('multi_level_bom','=',False)]}">
-                        	<field colspan="4" name="child_ids" nolabel="1" string="BoM Hierarchy"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
@@ -291,7 +288,7 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree string="BoM Structure" colors="blue:method">
-					<field name="sequence" invisible="1"/>
+                    <field name="sequence" invisible="1"/>
                     <field name="name"/>
                     <field name="code"/>
                     <field name="product_id"/>
@@ -461,8 +458,8 @@
                         <group colspan="2" col="3">
                         <field name="product_uom"/>
                         <button type="action"
-                        	name="%(mrp.action_change_production_qty)d"
-                        	string="Change Qty" states="ready,confirmed" />
+                            name="%(mrp.action_change_production_qty)d"
+                            string="Change Qty" states="ready,confirmed" />
                         </group>
                         <label string="" colspan="2"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
@@ -484,45 +481,45 @@
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Consume">
                                     <field name="product_id" />
-				                    <field name="product_qty"  string="Qty"/>
-				                    <field name="product_uom"  string="UOM"/>
+                                    <field name="product_qty"  string="Qty"/>
+                                    <field name="product_uom"  string="UOM"/>
                                     <field name="location_id"  string="Source Loc."/>
 
                                     <field name="state" invisible="1"/>
-				                    <button name="%(stock.move_consume)d"
-				                    	string="Consume Products" type="action"
-				                    	icon="gtk-go-forward" context="{'consume': True}"
-				                    	states="draft,waiting,confirmed,assigned" />
-				                    <button name="%(stock.move_scrap)d"
-				                    	string="Scrap Products" type="action"
-				                    	icon="gtk-convert" context="{'scrap': True}"
-				                    	states="draft,waiting,confirmed,assigned" />				                    
+                                    <button name="%(stock.move_consume)d"
+                                        string="Consume Products" type="action"
+                                        icon="gtk-go-forward" context="{'consume': True}"
+                                        states="draft,waiting,confirmed,assigned" />
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" />                                    
                                 </tree>
                             </field>
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
-                           			widget="one2many_list" mode="tree,form" height="275">
-                           		<tree string="Consumed Products" editable="bottom" colors="red:scraped==True">
-                           			<field name="product_id" readonly="1"/>
-                           			<field name="product_qty" readonly="1" string="Qty"/>
-				                    <field name="product_uom" readonly="1" string="UOM"/>                                    
+                                       widget="one2many_list" mode="tree,form" height="275">
+                                   <tree string="Consumed Products" editable="bottom" colors="red:scraped==True">
+                                       <field name="product_id" readonly="1"/>
+                                       <field name="product_qty" readonly="1" string="Qty"/>
+                                    <field name="product_uom" readonly="1" string="UOM"/>                                    
                                     <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
-				                    <field name="prodlot_id" />
+                                    <field name="prodlot_id" />
                                     <field name="state" invisible="1"/>
                                     <field name="scraped" invisible="1"/>
-                           			<button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="done,cancel" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="Scrap Products" type="action"
-                           				icon="gtk-convert"
-                           				states="done,cancel" />                          			
-				                    
-                           		</tree>
-                           	</field>
+                                       <button
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="done,cancel" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="Scrap Products" type="action"
+                                           icon="gtk-convert"
+                                           states="done,cancel" />                                      
+                                    
+                                   </tree>
+                               </field>
 
                             <group col="9" colspan="4">
                                 <field name="state" select="2"/>
@@ -540,38 +537,38 @@
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
-				                    <field name="product_qty"  string="Qty"/>
-				                    <field name="product_uom"  string="UOM"/>
+                                    <field name="product_qty"  string="Qty"/>
+                                    <field name="product_uom"  string="UOM"/>
                                     <field name="location_id"  string="Source Loc."/>
                                     <field name="state" invisible="1"/>
-				                    <button name="%(stock.move_consume)d"
-				                    	string="Consume Products" type="action"
-				                    	icon="gtk-go-forward" context="{'consume': True}"
-				                    	states="draft,waiting,confirmed,assigned" />
-				                    <button name="%(stock.move_scrap)d"
-				                    	string="Scrap Products" type="action"
-				                    	icon="gtk-convert" context="{'scrap': True}"
-				                    	states="draft,waiting,confirmed,assigned" />				                    
+                                    <button name="%(stock.move_consume)d"
+                                        string="Consume Products" type="action"
+                                        icon="gtk-go-forward" context="{'consume': True}"
+                                        states="draft,waiting,confirmed,assigned" />
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" />                                    
                                 </tree>
                             </field>
 
                             <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
-                           			widget="one2many_list" mode="tree,form" height="275">
-                           		<tree string="Finished Products" editable="bottom" colors="red:scraped==True">
-                           			<field name="product_id" readonly="1"/>
-                           			<field name="product_qty" readonly="1" string="Qty"/>
-				                    <field name="product_uom" readonly="1" string="UOM"/>
+                                       widget="one2many_list" mode="tree,form" height="275">
+                                   <tree string="Finished Products" editable="bottom" colors="red:scraped==True">
+                                       <field name="product_id" readonly="1"/>
+                                       <field name="product_qty" readonly="1" string="Qty"/>
+                                    <field name="product_uom" readonly="1" string="UOM"/>
                                     <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
-                           			<field name="prodlot_id" />
+                                       <field name="prodlot_id" />
                                     <field name="state" invisible="1"/>
                                     <field name="scraped" invisible="1"/>
-                           			<button name="%(stock.track_line)d"
+                                       <button name="%(stock.track_line)d"
                                             string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
-                           			<button name="%(stock.move_scrap)d"
-                           				string="Scrap Products" type="action" icon="gtk-convert"
-                           				states="done,cancel" />
-                           		</tree>
-                           	</field>
+                                       <button name="%(stock.move_scrap)d"
+                                           string="Scrap Products" type="action" icon="gtk-convert"
+                                           states="done,cancel" />
+                                   </tree>
+                               </field>
                         </page>
                         <page string="Work Orders">
                             <field colspan="4" name="workcenter_lines" nolabel="1">
@@ -1039,12 +1036,12 @@
             res_model="mrp.bom"
             src_model="product.product"/>
 
-		<!-- Menu for Resource for MRP-->
-		<menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/>
+        <!-- Menu for Resource for MRP-->
+        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/>
         <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root" sequence="2"/>
-		<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
-		<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
-    	<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index d51d0733e81..72fcfa5afd2 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -444,7 +444,7 @@ class product_product(osv.osv):
         'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock'),
         'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming'),
         'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing'),
-        'price': fields.function(_product_price, method=True, type='float', string='Customer Price', digits_compute=dp.get_precision('Sale Price')),
+        'price': fields.function(_product_price, method=True, type='float', string='Pricelist', digits_compute=dp.get_precision('Sale Price')),
         'lst_price' : fields.function(_product_lst_price, method=True, type='float', string='List Price', digits_compute=dp.get_precision('Sale Price')),
         'code': fields.function(_product_code, method=True, type='char', string='Code'),
         'partner_ref' : fields.function(_product_partner_ref, method=True, type='char', string='Customer ref'),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b910515c950..e7191045118 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -110,7 +110,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-project" string="Open" domain="[('state', '=', 'open')]" help="Open Projects" default="1"/>
+                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" default="1"/>
                        <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
@@ -121,7 +121,6 @@
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager"/>
                        <field name="partner_id" string="Partner"/>
-                       <field name="state"/>
                    </group>
                </search>
             </field>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 20d65aec356..5c28d106c22 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -41,11 +41,11 @@ class report_project_task_user(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                           ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'state': fields.selection([('draft', 'Draft'),
-                                   ('open', 'In Progress'),
-                                   ('pending', 'Pending'),
-                                   ('cancelled', 'Cancelled'),
-                                   ('done', 'Done')],
-                                'State', readonly=True),
+               ('open', 'In Progress'),
+               ('pending', 'Pending'),
+               ('cancelled', 'Cancelled'),
+               ('done', 'Done')],
+            'State', readonly=True),
 
     }
     _order = 'name desc, project_id'
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index dd271ee97da..deb89d3c747 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	    <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
+        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
             <field name="name">report.project.task.user.tree</field>
@@ -31,30 +31,29 @@
             <field name="model">report.project.task.user</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Tasks">
-	            		<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
-	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
-	            		<separator orientation="vertical"/>
-	            		<filter string="Start" icon="terp-project" domain="[('date_start','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                 		<filter string="End" icon="terp-project" domain="[('date_end','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                 	    <filter string="Deadline" icon="terp-project" domain="[('date_deadline','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                 	    <filter string="Closed" icon="terp-project" domain="[('state','=','done')]"/>
-	            		<separator orientation="vertical"/>
-	            		<field name="project_id"/>
-	                    <field name="user_id" widget="selection">
-	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
-                		</field>
-	                    <newline/>
-                		<group expand="1" string="Group By..." colspan="10" col="11">
-                    		<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
-                    		<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
-                 			<separator orientation="vertical"/>
-                 			<filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
-   							<separator orientation="vertical"/>
-                    		<filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
-                    		<filter string="Year" icon="terp-project" context="{'group_by':'name'}"/>
-                		</group>
-            	</search>
+                <search string="Tasks">
+                    <filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
+                    <filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
+                    <separator orientation="vertical"/>
+                    <filter string="In Progress" icon="terp-project" domain="[('state','=','open')]"/>
+                    <filter string="Pending" icon="terp-project" domain="[('state','=','pending')]"/>
+                    <filter string="Closed" icon="terp-project" domain="[('state','=','done')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="project_id"/>
+                    <field name="user_id" widget="selection">
+                        <filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
+                    </field>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="10" col="11">
+                        <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
+                        <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-project" context="{'group_by':'name'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/project_issue/project_feature_menu.xml b/addons/project_issue/project_feature_menu.xml
index caf533efb7d..1c757a73909 100644
--- a/addons/project_issue/project_feature_menu.xml
+++ b/addons/project_issue/project_feature_menu.xml
@@ -3,36 +3,5 @@
 <data noupdate="1">
 
 
-    ######################## Feature Request (menu) ###########################
-
-    <record model="ir.actions.act_window" id="action_project_feature">
-        <field name="name">Feature Requests</field>
-        <field name="res_model">project.issue</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="project_feature_tree_view"/>
-        <field name="domain" eval="[('categ_id','=',ref('feature_request_categ'))]"/>
-        <field name="search_view_id" ref="view_project_feature_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_project_feature_tree_view0">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="project_feature_tree_view"/>
-        <field name="act_window_id" ref="action_project_feature"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_project_feature_calendar_view0">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="project_issue_calendar_view"/>
-        <field name="act_window_id" ref="action_project_feature"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_project_feature_form_view0">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="project_issue_form_view"/>
-        <field name="act_window_id" ref="action_project_feature"/>
-    </record>
-
-    <menuitem name="Feature Requests" id="menu_project_issue_feature_request"  parent="project.menu_project_management" action="action_project_feature"/>
 </data>
 </openerp>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 03ecfdcc778..8e3c891657b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -91,8 +91,7 @@ class project_issue(osv.osv):
         'assigned_to' : fields.many2one('res.users', 'Assigned to'),
         'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
         'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
-                                                domain="[('partner_id', '=', partner_id)]",
-                                                required=True),
+                                                domain="[('partner_id', '=', partner_id)]"),
     }
 
     def _get_project(self, cr, uid, context):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f09643c2590..579a426bdff 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -27,7 +27,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Issue Tracker Form">
-                    <group colspan="4" col="8">
+                    <group colspan="4" col="6">
                         <field name="name"/>
                         <field name="user_id"/>
                         <field name="assigned_to" />
@@ -38,8 +38,6 @@
                         </group>
                         <field name="project_id" required="True"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                        <field name="create_date"/>
-                        <field name="write_date" />
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -76,6 +74,8 @@
                         <page string="History" groups="base.group_extended">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Date"/>
+                                <field name="create_date"/>
+                                <field name="write_date" />
                                 <field name="date_closed"/>
                             </group>
                             <group col="2" colspan="2">
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 0ac0f902220..deff634aa68 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -66,9 +66,9 @@ class project_phase(osv.osv):
          return True
 
     def _check_dates(self, cr, uid, ids, context={}):
-         phase = self.read(cr, uid, ids[0], ['date_start', 'date_end'], context=context)
-         if phase['date_start'] and phase['date_end'] and phase['date_start'] > phase['date_end']:
-             return False
+         for phase in self.read(cr, uid, ids, ['date_start', 'date_end'], context=context):
+             if phase['date_start'] and phase['date_end'] and phase['date_start'] > phase['date_end']:
+                 return False
          return True
 
     def _check_constraint_start(self, cr, uid, ids, context={}):
@@ -104,16 +104,15 @@ class project_phase(osv.osv):
      }
     _defaults = {
         'responsible_id': lambda obj,cr,uid,context: uid,
-        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
         'state': lambda *a: 'draft',
         'sequence': lambda *a: 10,
     }
     _order = "name"
     _constraints = [
-        (_check_recursion,'Error ! Loops In Phases Not Allowed',['next_phase_ids', 'previous_phase_ids']),
-        (_check_dates, 'Error! Phase start-date must be lower then Phase end-date.', ['date_start', 'date_end']),
-        (_check_constraint_start, 'Error! Phase must start-after Constraint Start Date.', ['date_start', 'constraint_date_start']),
-        (_check_constraint_end, 'Error! Phase must end-before Constraint End Date.', ['date_end', 'constraint_date_end']),
+        (_check_recursion,'Loops in phases not allowed',['next_phase_ids', 'previous_phase_ids']),
+        (_check_dates, 'Phase start-date must be lower than phase end-date.', ['date_start', 'date_end']),
+        #(_check_constraint_start, 'Phase must start-after constraint start Date.', ['date_start', 'constraint_date_start']),
+        #(_check_constraint_end, 'Phase must end-before constraint end Date.', ['date_end', 'constraint_date_end']),
     ]
 
     def onchange_project(self, cr, uid, ids, project, context={}):
@@ -369,4 +368,4 @@ class task(osv.osv):
         return super(task, self).write(cr, uid, ids, vals, context=context)
 
 task()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 53eaba2e4a9..af4bc26ba88 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -32,7 +32,7 @@
             </field>
         </record>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Project Phase
     # ------------------------------------------------------
 
@@ -46,38 +46,43 @@
                         <field name="name" select="1"/>
                         <field name="project_id" on_change="onchange_project(project_id)"/>
                         <field name="responsible_id"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="duration" widget="float_time"/>
-                        <field name="product_uom"/>
                     </group>
                     <notebook colspan="4">
-                    	<page string="Resource Allocation Detail">
-                            <separator colspan="4" string="Resource Allocation"/>
+                        <page string="Resource Allocation Detail">
+                            <group colspan="2" col="2">
+                                <separator colspan="2" string="Duration"/>
+                                <field name="duration" widget="float_time"/>
+                                <field name="product_uom"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator colspan="2" string="Dates"/>
+                                <field name="date_start"/>
+                                <field name="date_end"/>
+                            </group>
                             <field colspan="4" name="resource_ids" nolabel="1">
-                            	 <tree editable="bottom" string="Project Resource Allocation">
+                                 <tree editable="bottom" string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
-                    				<field name="useability"/>
+                                    <field name="useability"/>
                                   </tree>
                                   <form string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
-                    				<field name="useability"/>
+                                    <field name="useability"/>
                                   </form>
                              </field>
                             <group col="12" colspan="4">
-                            	<field name="state" select="1"/>
-                            	<button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                            	<button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
+                                <field name="state" select="1"/>
+                                <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
+                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
                                 <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-jump-to"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
-								<button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
+                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Other Info">
                            <group colspan="2" col="2">
                                 <separator string="Constraints" colspan="2"/>
                                 <field name="constraint_date_start"/>
-                        		<field name="constraint_date_end"/>
+                                <field name="constraint_date_end"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Scheduling" colspan="2"/>
@@ -91,46 +96,46 @@
                         <page string="Task Detail">
                             <separator colspan="4" string="Project's Tasks"/>
                             <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
-                            	 <tree editable="bottom" string="Project's Tasks">
+                                 <tree editable="bottom" string="Project's Tasks">
                                     <field name="name"/>
                                     <field name="project_id"/>
                                     <field name="user_id"/>
-                    				<field name="date_start"/>
-                                  	<field name="date_deadline"/>
-                                  	<field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
-									<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-									<field name="effective_hours" invisible="1"/>
-									<field name="state"/>
-									<field name="occupation_rate"/>
+                                    <field name="date_start"/>
+                                      <field name="date_deadline"/>
+                                      <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
+                                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                    <field name="effective_hours" invisible="1"/>
+                                    <field name="state"/>
+                                    <field name="occupation_rate"/>
                                   </tree>
                                   <form string="Project's Tasks">
-                                  	<notebook colspan="4">
-                                  		<page string="Task Detail">
-                                  			<group colspan="4" col="4">
-		                                    	<field name="name"/>
-		                                    	<field name="project_id"/>
-		                                    	<field name="user_id"/>
-		                                    </group>
-		                    				<group colspan="2" col="2">
-		                                  		<separator string="Dates" colspan="2"/>
-		                                  		<field name="date_start"/>
-		                                  		<field name="date_deadline"/>
-		                                  		<field name="occupation_rate"/>
-		                                    </group>
-		                                    <group colspan="2" col="2">
-		                                  		<separator string="Planning" colspan="2"/>
-		                                  		<field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
-												<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-												<field name="effective_hours" invisible="1"/>
-		                                    </group>
-		                                    <group colspan="6" col="4">
-												<field name="state"/>
-											</group>
-										</page>
-									</notebook>
+                                      <notebook colspan="4">
+                                          <page string="Task Detail">
+                                              <group colspan="4" col="4">
+                                                <field name="name"/>
+                                                <field name="project_id"/>
+                                                <field name="user_id"/>
+                                            </group>
+                                            <group colspan="2" col="2">
+                                                  <separator string="Dates" colspan="2"/>
+                                                  <field name="date_start"/>
+                                                  <field name="date_deadline"/>
+                                                  <field name="occupation_rate"/>
+                                            </group>
+                                            <group colspan="2" col="2">
+                                                  <separator string="Planning" colspan="2"/>
+                                                  <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
+                                                <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                                <field name="effective_hours" invisible="1"/>
+                                            </group>
+                                            <group colspan="6" col="4">
+                                                <field name="state"/>
+                                            </group>
+                                        </page>
+                                    </notebook>
                                   </form>
                              </field>
-                           	<button name="%(wizard_schedule_task)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
+                               <button name="%(wizard_schedule_task)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
                     </notebook>
                     <newline/>
@@ -194,15 +199,15 @@
                         <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
-	                    <field name="name"/>
-	                    <field name="project_id" widget="selection">
-		                    <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
-						</field>
-	                    <field name="responsible_id" widget="selection">
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="project_id" widget="selection">
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                        </field>
+                        <field name="responsible_id" widget="selection">
                             <filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" default="1"/>
                         </field>
-	                    <field name="date_start"/>
-	                    <!--<field name="date_end"/>-->
+                        <field name="date_start"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
@@ -223,51 +228,51 @@
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Project
     # ------------------------------------------------------
 
         <record id="view_phase_project_form1" model="ir.ui.view">
-			<field name="name">phase.project.form1</field>
-			<field name="model">project.project</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="project.edit_project"/>
-			<field name="arch" type="xml">
-				<field name="priority" position="before">
-					<field name="resource_calendar_id"/>
-				</field>
+            <field name="name">phase.project.form1</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <field name="priority" position="before">
+                    <field name="resource_calendar_id"/>
+                </field>
 
-			</field>
-	   </record>
+            </field>
+       </record>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Project Task
     # ------------------------------------------------------
 
-    	<record id="view_project_phase_task_form1" model="ir.ui.view">
-			<field name="name">project.phase.task.form1</field>
-			<field name="model">project.task</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="project.view_task_form2"/>
-			<field name="arch" type="xml">
-				<field name="planned_hours" position="replace">
-					<field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours, date_start, occupation_rate)"/>
-				</field>
+        <record id="view_project_phase_task_form1" model="ir.ui.view">
+            <field name="name">project.phase.task.form1</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <field name="planned_hours" position="replace">
+                    <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours, date_start, occupation_rate)"/>
+                </field>
 
-			</field>
-	   </record>
+            </field>
+       </record>
 
-		<record id="view_project_phase_task_form2" model="ir.ui.view">
-			<field name="name">project.phase.task.form2</field>
-			<field name="model">project.task</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="project.view_task_form2"/>
-			<field name="arch" type="xml">
-				<field name="date_end" position = "after">
-		  			<field name="occupation_rate"/>
-				</field>
-			</field>
-	   </record>
+        <record id="view_project_phase_task_form2" model="ir.ui.view">
+            <field name="name">project.phase.task.form2</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <field name="date_end" position = "after">
+                      <field name="occupation_rate"/>
+                </field>
+            </field>
+       </record>
 
         <act_window
         id="project_phase_task_list"
@@ -286,16 +291,16 @@
         view_mode="tree,form"
         view_type="form" />
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Menu Items
     # ------------------------------------------------------
 
         <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
-		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="menu_pm_resources_project1" name="Resources" parent="base.menu_main_pm" sequence="2"/>
-		<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
-		<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
-		<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index f08b03600f8..4fbcdd1c284 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -2,27 +2,26 @@
 <openerp>
     <data>
 
-    	<!-- Search Views -->
+        <!-- Search Views -->
 
-	<record id="view_resource_resource_search" model="ir.ui.view">
+        <record id="view_resource_resource_search" model="ir.ui.view">
             <field name="name">resource.resource.search</field>
             <field name="model">resource.resource</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Resource">
                    <group col='15' colspan='4'>
-                       <field name="name" string="Resource Name"/>
-                       <field name="code" string="Code"/>
+                       <field name="name"/>
                        <field name="user_id" string="User" widget="selection">
-	                       <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" default="1"/>
-	                   </field>
-                       <field name="calendar_id" string="Working Calendar" widget="selection"/>
-                       <field name="resource_type" string="Resource Type"/>
-                       <field name="company_id" string="Company" widget="selection"/>
+                           <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" default="1"/>
+                       </field>
+                       <field name="resource_type"/>
+                       <field name="company_id" widget="selection"/>
                    </group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Resouce Type" icon="terp-project" domain="[]" context="{'group_by':'resource_type'}"/>
+                        <filter string="Type" icon="terp-project" domain="[]" context="{'group_by':'resource_type'}"/>
+                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
@@ -37,10 +36,9 @@
             <field name="arch" type="xml">
                 <search string="Search Working Period">
                    <group col='15' colspan='4'>
-                   	   <field name="name" string="Name"/>
-               <!--     <field name="name" string="Working Calendar"/> -->
-                       <field name="manager" string="Workgroup Manager" widget="selection"/>
-                       <field name="company_id" string="Company" widget="selection"/>
+                       <field name="name" string="Name"/>
+                       <field name="manager" widget="selection"/>
+                       <field name="company_id" widget="selection"/>
                    </group>
                </search>
             </field>
@@ -71,7 +69,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string="Working Period">
+                <form string="Working Period">
                     <field name="name" select="1"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1"/>
@@ -86,7 +84,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Working Period">
+                <tree string="Working Period">
                     <field name="name"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1"/>
@@ -131,7 +129,7 @@
             </field>
         </record>
 
-		<record id="view_resource_calendar" model="ir.ui.view">
+        <record id="view_resource_calendar" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.calendar</field>
             <field name="model">resource.calendar.leaves</field>
             <field name="type">calendar</field>
@@ -143,20 +141,20 @@
         </record>
 
         <act_window
-        id="resource_calendar_closing_days"
-        name="Closing Days"
-        res_model="resource.calendar.leaves"
-        src_model="resource.calendar"
-        view_mode="calendar,tree,form"
-        domain="[('calendar_id','=',active_id), ('resource_id','=',False)]"/>
+            id="resource_calendar_closing_days"
+            name="Closing Days"
+            res_model="resource.calendar.leaves"
+            src_model="resource.calendar"
+            view_mode="calendar,tree,form"
+            domain="[('calendar_id','=',active_id), ('resource_id','=',False)]"/>
 
         <act_window
-        id="resource_calendar_resources_leaves"
-        name="Resources Leaves"
-        res_model="resource.calendar.leaves"
-        src_model="resource.calendar"
-        view_mode="calendar,tree,form"
-        domain="[('calendar_id','=',active_id), ('resource_id','!=',False)]"/>
+            id="resource_calendar_resources_leaves"
+            name="Resources Leaves"
+            res_model="resource.calendar.leaves"
+            src_model="resource.calendar"
+            view_mode="calendar,tree,form"
+            domain="[('calendar_id','=',active_id), ('resource_id','!=',False)]"/>
 
         <record id="resource_resource_form" model="ir.ui.view">
             <field name="name">resource.resource.form</field>
@@ -166,7 +164,7 @@
                 <form string="Resource">
                     <field name="name" />
                     <field name="active"/>
-                    <field name="company_id" />
+                    <field name="company_id" widget="selection"/>
                     <field name="calendar_id" />
                     <field name="resource_type" />
                     <field name="user_id" attrs="{'required':[('resource_type','=','user')]}"/>
@@ -203,7 +201,7 @@
             <field name="arch" type="xml">
                 <form string="Leave Detail">
                     <field name="name" />
-                    <field name="company_id" />
+                    <field name="company_id"  widget="selection"/>
                     <field name="calendar_id" />
                     <field name="date_from" />
                     <field name="date_to" />
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 073d95dac27..0dea85ae81b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -448,15 +448,15 @@
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"  default="1"
                         separator="1" />
                     <separator orientation="vertical"/>
-                    <field name="product_id" select="1"/>
                     <field name="order_id" select="1"/>
                     <field name="order_partner_id" select="1"/>
+                    <field name="product_id" select="1"/>
                     <field name="state" select="1"/>
                     <newline />
                     <group expand="1" string="Group By..." colspan="9" col="8">
                         <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
-<!--                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'order_partner_id'}"/>-->
                         <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index b5b66f8f758..e812f7a65d8 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -159,27 +159,8 @@ class change_standard_price(osv.osv_memory):
             else:
                 raise osv.except_osv(_('Warning!'),_('No Change in Price.'))
         else:
-            raise osv.except_osv(_('Warning!'),_('No Accounts are defined for ' 
-                        'this product on its location.\nCan\'t create Move.'))
-        
-        id2 = data_obj._get_id(cr, uid, 'account', 'view_move_tree')
-        id3 = data_obj._get_id(cr, uid, 'account', 'view_move_form')
-        
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        
-        return {
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'account.move',
-                'res_id' : move_id,
-                'views': [(id3,'form'),(id2,'tree')],
-                'type': 'ir.actions.act_window',
-        }
-        prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
-        return {}        
+            pass
+        return {}
 
 change_standard_price()
 
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 1e7f7fc5080..3eca378f150 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -2,29 +2,29 @@
 <openerp>
     <data noupdate="1">
 
-		<record model="survey.type" id="survey_type1">
-		    <field name="name">Human Resources</field>
-		    <field name="code">Human Resources</field>
-		</record>
-		<record model="survey.type" id="survey_type2">
-		    <field name="name">Customer Feeback</field>
-		    <field name="code">Customer Feeback</field>
-		</record>
-		<record model="survey.type" id="survey_type3">
-		    <field name="name">Supplier Selection</field>
-		    <field name="code">Supplier Selection</field>
-		</record>
+        <record model="survey.type" id="survey_type1">
+            <field name="name">Human Resources</field>
+            <field name="code">Human Resources</field>
+        </record>
+        <record model="survey.type" id="survey_type2">
+            <field name="name">Customer Feeback</field>
+            <field name="code">Customer Feeback</field>
+        </record>
+        <record model="survey.type" id="survey_type3">
+            <field name="name">Supplier Selection</field>
+            <field name="code">Supplier Selection</field>
+        </record>
 
-    	<!--  Partner Feedback Demo data -->
+        <!--  Partner Feedback Demo data -->
         <record model="survey" id="survey_partner_feedback">
-	        <field name="title">Open ERP Partner Feedback</field>
-	        <field name="responsible_id" ref="base.user_root"/>
-	        <field name="max_response_limit">20</field>
-	        <field name="type" ref="survey_type2"/>
-	        <field name="state">open</field>
-	        <field name="tot_comp_survey">1</field>
-	        <field name="tot_start_survey">1</field>
-   		</record>
+            <field name="title">Open ERP Partner Feedback</field>
+            <field name="responsible_id" ref="base.user_root"/>
+            <field name="max_response_limit">20</field>
+            <field name="type" ref="survey_type2"/>
+            <field name="state">open</field>
+            <field name="tot_comp_survey">1</field>
+            <field name="tot_start_survey">1</field>
+           </record>
 
         <record id="survey_page_who_are_you" model="survey.page">
             <field name="title">Who are you?</field>
@@ -94,11 +94,11 @@
             <field name="sequence" eval="7"/>
         </record>
         <record id="survey_question_company_size" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_located" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Where are you located?</field>
             <field name="page_id" ref="survey_page_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -135,14 +135,14 @@
             <field name="question_id" ref="survey_question_located" />
             <field name="sequence" eval="5"/>
         </record>
-       	<record id="survey_question_located" model="survey.question">
+           <record id="survey_question_located" model="survey.question">
             <field name="required_type">at least</field>
             <field eval="1" name="req_ans"/>
             <field name="req_error_msg">This question requires an answer.</field>
         </record>
 
         <record id="survey_question_offical_partner" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">When did you become an OpenERP official partner?</field>
             <field name="page_id" ref="survey_page_who_are_you" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -180,11 +180,11 @@
             <field name="sequence" eval="5"/>
         </record>
         <record id="survey_question_offical_partner" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_your_customers" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">What kind of solutions do you sell to your customers? </field>
             <field name="page_id" ref="survey_page_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -218,7 +218,7 @@
         </record>
 
         <record id="survey_question_partnership_contract" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">What do you think about the partnership contract?</field>
             <field name="page_id" ref="survey_page_Contracts" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -250,11 +250,11 @@
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_question_partnership_contract" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_contract_customers" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">When do you propose a maintenance contract to your customers?</field>
             <field name="page_id" ref="survey_page_Contracts" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -283,11 +283,11 @@
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_contract_customers" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_sell_to_your_customers" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Which maintenance contract do you sell to your customers.</field>
             <field name="page_id" ref="survey_page_Contracts" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -313,7 +313,7 @@
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_sell_to_your_customers" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_page_communication" model="survey.page">
@@ -323,7 +323,7 @@
         </record>
 
         <record id="survey_question_launchpad_reporting" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Give your opinion about Launchpad reporting :</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -372,8 +372,8 @@
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
         </record>
- 		<record id="survey_question_Leads" model="survey.question">
- 			<field name="in_visible_answer_type">1</field>
+         <record id="survey_question_Leads" model="survey.question">
+             <field name="in_visible_answer_type">1</field>
             <field name="question">Leads</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -423,7 +423,7 @@
         </record>
 
         <record id="survey_question_partners_about" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">How is Tiny's communication with partners about...</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -473,14 +473,14 @@
             <field name="in_visible_menu_choice">1</field>
         </record>
         <record id="survey_question_partners_about" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="required_type">at least</field>
             <field eval="1" name="req_ans"/>
             <field name="req_error_msg">This question requires an answer.</field>
         </record>
 
         <record id="survey_question_partners_on_which_subjects" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">In your opinion, how could Tiny better communicate with partners and on which subjects?</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">comment</field>
@@ -489,16 +489,16 @@
             <field eval="4" name="sequence"/>
         </record>
 
-    	<!--  Partner Feedback Demo data -->
+        <!--  Partner Feedback Demo data -->
         <record model="survey" id="survey_odoo_feedback">
-	        <field name="title">Odoo Feedback</field>
-	        <field name="responsible_id" ref="base.user_demo"/>
-	        <field name="max_response_limit">20</field>
-	        <field name="type" ref="survey_type2"/>
-	        <field name="state">open</field>
-	        <field name="tot_comp_survey">1</field>
-	        <field name="tot_start_survey">1</field>
-   		</record>
+            <field name="title">Odoo Feedback</field>
+            <field name="responsible_id" ref="base.user_demo"/>
+            <field name="max_response_limit">20</field>
+            <field name="type" ref="survey_type2"/>
+            <field name="state">open</field>
+            <field name="tot_comp_survey">1</field>
+            <field name="tot_start_survey">1</field>
+           </record>
 
         <record id="survey_page_odoo_who_are_you" model="survey.page">
             <field name="title">Who are you?</field>
@@ -507,7 +507,7 @@
         </record>
 
         <record id="survey_question_odoo_company_name" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">What is your company's name?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">single_textbox</field>
@@ -517,7 +517,7 @@
         </record>
 
         <record id="survey_question_odoo_company_sector" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">What is your company's sector?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -645,7 +645,7 @@
          </record>
 
          <record id="survey_question_odoo_mange_with_odoo" model="survey.question">
-         	<field name="in_visible_answer_type">1</field>
+             <field name="in_visible_answer_type">1</field>
             <field name="question">Which activities do you plan to manage with Odoo ?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -707,7 +707,7 @@
         </record>
 
         <record id="survey_question_odoo_discover_odoo" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">How did you discover Odoo ?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -763,7 +763,7 @@
         </record>
 
         <record id="survey_question_odoo_subscribe_to_odoo" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Why did you subscribe to Odoo?</field>
             <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -802,7 +802,7 @@
         </record>
 
         <record id="survey_question_odoo_configure_the_application" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">How much time did you spend to configure the application?</field>
             <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -871,7 +871,7 @@
         </record>
 
         <record id="survey_question_odoo_continue_using_odoo" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Do you plan to continue using Odoo?</field>
             <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -894,7 +894,7 @@
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_odoo_continue_using_odoo" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_page_odoo_using_odoo" model="survey.page">
@@ -903,7 +903,7 @@
             <field eval="3" name="sequence"/>
         </record>
         <record id="survey_question_odoo_would_you_prefer_use" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Which interface would you prefer to use?</field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -929,11 +929,11 @@
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_odoo_would_you_prefer_use" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_odoo_give_your_opinion" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Give your opinion :</field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -1003,7 +1003,7 @@
         </record>
 
         <record id="survey_question_odoo_you_think_about" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">What do you think about ... </field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -1073,14 +1073,14 @@
             <field name="in_visible_menu_choice">1</field>
         </record>
         <record id="survey_question_odoo_you_think_about" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="required_type">at least</field>
             <field eval="1" name="req_ans"/>
             <field name="req_error_msg">This question requires an answer.</field>
         </record>
 
         <record id="survey_question_odoo_modules_are_missing_in_odoo" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">In your opinion, which modules are missing in Odoo? Give examples :</field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">single_textbox</field>
@@ -1097,7 +1097,7 @@
         </record>
 
         <record id="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">How often would you prefer to receive your prepaid bill?</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -1123,11 +1123,11 @@
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_odoo_dms" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Do you plan to use the document management system?</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -1150,11 +1150,11 @@
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_odoo_dms" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_odoo_support_services" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">How satisfied are you with Odoo's support services :</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -1210,7 +1210,7 @@
         </record>
 
         <record id="survey_question_offer_opinion_about_odoo" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Give your opinion about Odoo's</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -1272,7 +1272,7 @@
         </record>
 
         <record id="survey_question_offer_comments_them_here" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">If you have any additional comments, write them here :</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">comment</field>
@@ -1280,2167 +1280,2166 @@
             <field name="sequence" eval="2"/>
         </record>
      </data>
-   	 <data>
-		<record id="survey_0" model="survey">
-			<field eval="&quot;&quot;&quot;OpenERP Feedback&quot;&quot;&quot;" name="title"/>
-			<field name="responsible_id" ref="base.user_demo"/>
-	        <field name="max_response_limit">20</field>
-	        <field name="type" ref="survey_type2"/>
-	        
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_0" model="survey.page">
-			<field eval="&quot;&quot;&quot;About your OpenERP usage&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_1" model="survey.page">
-			<field eval="&quot;&quot;&quot;These questions relates to the ergonomy and ease of use of OpenERP. Try to remind your firsts days on OpenERP and what have been your difficulties.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Ergonomy and ease of use - 1&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-<!--	<data>-->
-<!--		<record id="survey_page_2" model="survey.page">-->
-<!--			<field eval="&quot;&quot;&quot;Ergonomy and ease of use - 2&quot;&quot;&quot;" name="title"/>-->
-<!--			<field name="survey_id" ref="survey_0"/>-->
-<!--			<field eval="3" name="sequence"/>-->
-<!--		</record>-->
-<!--	</data>-->
-<!--	<data>-->
-<!--		<record id="survey_page_3" model="survey.page">-->
-<!--			<field eval="&quot;&quot;&quot;Ergonomy and ease of use - 3&quot;&quot;&quot;" name="title"/>-->
-<!--			<field name="survey_id" ref="survey_0"/>-->
-<!--			<field eval="4" name="sequence"/>-->
-<!--		</record>-->
-<!--	</data>-->
-	<data>
-		<record id="survey_page_4" model="survey.page">
-			<field eval="&quot;&quot;&quot;Ergonomy of the clients&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_5" model="survey.page">
-			<field eval="&quot;&quot;&quot;Features&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_6" model="survey.page">
-			<field eval="&quot;&quot;&quot;Community and contributors&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_7" model="survey.page">
-			<field eval="&quot;&quot;&quot;If you do not contribute and develop in OpenERP, skip this page.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Questions for developers&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="6" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_0" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="1" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;What do you think about the documentation available on doc.openerp.com ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        <data>
+        <record id="survey_0" model="survey">
+            <field eval="&quot;&quot;&quot;OpenERP Feedback&quot;&quot;&quot;" name="title"/>
+            <field name="responsible_id" ref="base.user_demo"/>
+            <field name="max_response_limit">20</field>
+            <field name="type" ref="survey_type2"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_0" model="survey.page">
+            <field eval="&quot;&quot;&quot;About your OpenERP usage&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_1" model="survey.page">
+            <field eval="&quot;&quot;&quot;These questions relates to the ergonomy and ease of use of OpenERP. Try to remind your firsts days on OpenERP and what have been your difficulties.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Ergonomy and ease of use - 1&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+<!--    <data>-->
+<!--        <record id="survey_page_2" model="survey.page">-->
+<!--            <field eval="&quot;&quot;&quot;Ergonomy and ease of use - 2&quot;&quot;&quot;" name="title"/>-->
+<!--            <field name="survey_id" ref="survey_0"/>-->
+<!--            <field eval="3" name="sequence"/>-->
+<!--        </record>-->
+<!--    </data>-->
+<!--    <data>-->
+<!--        <record id="survey_page_3" model="survey.page">-->
+<!--            <field eval="&quot;&quot;&quot;Ergonomy and ease of use - 3&quot;&quot;&quot;" name="title"/>-->
+<!--            <field name="survey_id" ref="survey_0"/>-->
+<!--            <field eval="4" name="sequence"/>-->
+<!--        </record>-->
+<!--    </data>-->
+    <data>
+        <record id="survey_page_4" model="survey.page">
+            <field eval="&quot;&quot;&quot;Ergonomy of the clients&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_5" model="survey.page">
+            <field eval="&quot;&quot;&quot;Features&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_6" model="survey.page">
+            <field eval="&quot;&quot;&quot;Community and contributors&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_7" model="survey.page">
+            <field eval="&quot;&quot;&quot;If you do not contribute and develop in OpenERP, skip this page.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Questions for developers&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="6" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_0" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="1" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;What do you think about the documentation available on doc.openerp.com ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_1" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="2" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;What do you think about the process views of OpenERP, available in the web client ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_1" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="2" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;What do you think about the process views of OpenERP, available in the web client ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_2" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="1" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;Are you using OpenERP on a daily basis ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_0"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_2" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="1" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;Are you using OpenERP on a daily basis ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_0"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
+        </record>
+    </data>
 
-	<data>
-		<record id="survey_question_3" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="3" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;Do you have suggestions on how to improve the process view ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+    <data>
+        <record id="survey_question_3" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="3" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;Do you have suggestions on how to improve the process view ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_4" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="4" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;What do you think about the structure of the menus (multiple answers allowed) ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_4" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="4" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;What do you think about the structure of the menus (multiple answers allowed) ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_5" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="2" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;If yes, which interface are you using ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_0"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_5" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="2" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;If yes, which interface are you using ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_0"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_6" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="3" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;Which modules are you using/testing?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_0"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_6" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="3" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;Which modules are you using/testing?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_0"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_7" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="1" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;How do you develop your new features ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_7"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_7" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="1" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;How do you develop your new features ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_7"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_8" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="1" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;How do you contribute or plan to contribute to OpenERP ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_6"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_8" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="1" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;How do you contribute or plan to contribute to OpenERP ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_6"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_9" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="5" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;What do you think about the groups of users?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_9" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="5" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;What do you think about the groups of users?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_10" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="2" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;Do you have a proposition to help people to contribute ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_6"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_10" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="2" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;Do you have a proposition to help people to contribute ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_6"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_11" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="3" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;Do you have a proposition to attract new contributors ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_6"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_11" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="3" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;Do you have a proposition to attract new contributors ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_6"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_12" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="6" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;About the groups of users installed by default&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_12" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="6" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;About the groups of users installed by default&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_13" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="7" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;What do you think about configuration wizards?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_13" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="7" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;What do you think about configuration wizards?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_0" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_0"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_0" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_0"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_1" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_0"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_1" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_0"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_2" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_0"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_2" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_0"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_3" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_0"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_3" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_0"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_4" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_1"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_4" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_1"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_5" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_1"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_5" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_1"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_6" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_1"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_6" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_1"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_7" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_1"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_7" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_1"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_8" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Disagree	&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_9"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_8" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Disagree    &quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_9"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_9" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_9"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_9" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_9"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_10" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_9"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_10" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_9"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_11" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_9"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_11" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_9"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_12" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_13"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_12" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_13"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_13" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_13"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_13" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_13"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_14" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_13"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_14" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_13"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_15" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_13"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_15" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_13"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_0" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I participate to discussion and forums&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_8"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_1" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I'd like to contribute but I don't know how ?&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_8"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_2" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;There is too many groups defined, security is too complex to set&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_12"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_3" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;There is too few groups defined, security isn't accurate enough&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_12"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_4" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The number of groups is good&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_12"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_5" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The GTK client&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_5"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_6" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The web interface&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_5"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_7" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The KDE client&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_5"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_8" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;At least two of them&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_5"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_9" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Yes, I use a version &lt; 5.0&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_2"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_10" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Yes, I use the 5.0 version, installed locally&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_2"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_11" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Yes, I use the latest version on Odoo&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_2"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_12" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;No, I just tested it&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_2"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_13" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Sales Management&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_14" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Purchases Management&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_15" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Financial Management&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_16" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;CRM / SRM&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_17" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Project Management&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_18" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Human Ressources&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="6" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_19" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Descriptions and help tooltips are clear enough&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_13"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_20" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Configuration wizard exists for each important setting&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_13"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_21" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Extra modules proposed are relevant&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_13"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_22" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The current menu structure is good&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_4"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_23" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It can be improved&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_4"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_24" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;They are too much menus, it's complex to understand&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_4"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_25" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I develop new features&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_8"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_26" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I help to translate&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_8"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_27" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I write documentations&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_8"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_28" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Running the configuration wizards is a good way to spare time&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_13"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_29" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I use Launchpad, like all official OpenERP projects&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_7"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_30" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The security rules defined on groups are helpfull&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_31" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;They are covering all objects&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_32" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Those security rules are standard and can be used out-of-the-box in most cases&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_33" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The 'Usability/Extended View' group helps in daily work&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_34" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The 'Usability/Extended View' group hides only optional fields&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_35" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The groups set on menu items are relevant&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="6" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_36" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It is up-to-date&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_0"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_37" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It helps in the beginning&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_0"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_38" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I use the contextual help in OpenERP&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_0"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_39" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It is complete&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_0"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_40" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It is clear&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_0"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_41" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;They help new users to understand OpenERP&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_1"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_42" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;They are clean and correct&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_1"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_43" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;They are useful on a daily usage&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_1"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_44" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;A process is defined for all enterprise flows&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_1"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_45" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It's easy to find the process you need&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_1"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_46" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I use another repository system (sourceforge, ...)&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_7"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_47" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I host on my own website&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_7"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_48" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I don't publish my developments&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_7"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_0" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I participate to discussion and forums&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_8"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_1" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I'd like to contribute but I don't know how ?&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_8"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_2" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;There is too many groups defined, security is too complex to set&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_12"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_3" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;There is too few groups defined, security isn't accurate enough&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_12"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_4" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The number of groups is good&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_12"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_5" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The GTK client&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_5"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_6" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The web interface&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_5"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_7" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The KDE client&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_5"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_8" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;At least two of them&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_5"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_9" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Yes, I use a version &lt; 5.0&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_2"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_10" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Yes, I use the 5.0 version, installed locally&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_2"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_11" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Yes, I use the latest version on Odoo&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_2"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_12" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;No, I just tested it&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_2"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_13" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Sales Management&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_14" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Purchases Management&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_15" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Financial Management&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_16" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;CRM / SRM&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_17" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Project Management&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_18" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Human Ressources&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="6" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_19" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Descriptions and help tooltips are clear enough&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_13"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_20" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Configuration wizard exists for each important setting&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_13"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_21" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Extra modules proposed are relevant&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_13"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_22" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The current menu structure is good&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_4"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_23" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It can be improved&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_4"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_24" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;They are too much menus, it's complex to understand&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_4"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_25" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I develop new features&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_8"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_26" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I help to translate&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_8"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_27" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I write documentations&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_8"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_28" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Running the configuration wizards is a good way to spare time&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_13"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_29" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I use Launchpad, like all official OpenERP projects&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_7"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_30" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The security rules defined on groups are helpfull&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_31" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;They are covering all objects&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_32" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Those security rules are standard and can be used out-of-the-box in most cases&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_33" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The 'Usability/Extended View' group helps in daily work&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_34" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The 'Usability/Extended View' group hides only optional fields&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_35" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The groups set on menu items are relevant&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="6" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_36" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It is up-to-date&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_0"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_37" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It helps in the beginning&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_0"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_38" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I use the contextual help in OpenERP&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_0"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_39" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It is complete&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_0"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_40" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It is clear&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_0"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_41" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;They help new users to understand OpenERP&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_1"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_42" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;They are clean and correct&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_1"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_43" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;They are useful on a daily usage&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_1"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_44" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;A process is defined for all enterprise flows&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_1"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_45" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It's easy to find the process you need&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_1"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_46" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I use another repository system (sourceforge, ...)&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_7"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_47" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I host on my own website&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_7"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_48" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I don't publish my developments&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_7"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
 
 
 
-	<data noupdate="1">
-		<record id="survey_0_Community" model="survey">
-			<field name="title">Community Survey</field>
-			<field name="note">Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.</field>
-			<field eval="1" name="response_user"/>
-			<field name="state">draft</field>
-			<field name="responsible_id" ref="base.user_root"/>
-			<field eval="1" name="send_response"/>
-			<field eval="[(6,0,[])]" name="users"/>
-			<field name="type" ref="survey_type3"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_0_Community" model="survey.page">
-			<field name="title">Service Characteristics</field>
-			<field name="survey_id" ref="survey_0_Community"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_1_Community" model="survey.page">
-			<field name="title">Performance Indicator</field>
-			<field name="survey_id" ref="survey_0_Community"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_2_Community" model="survey.page">
-			<field name="title">Client Information</field>
-			<field name="survey_id" ref="survey_0_Community"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_0_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="1" name="sequence"/>
-			<field name="question">Please rank, your criteria for choosing an organization.</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">matrix_of_choices_only_one_ans</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_0_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_1_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="2" name="sequence"/>
-			<field name="question">Please rate the following questions.</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">matrix_of_choices_only_one_ans</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_0_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_2_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="3" name="sequence"/>
-			<field name="question">How would you prefer for us to provide most communications?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="1" name="is_comment_require"/>
-			<field name="type">multiple_choice_only_one_ans</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_0_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_3_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="4" name="sequence"/>
-			<field name="question">What should we improve on (please be specific)?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">comment</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_1_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_4_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="5" name="sequence"/>
-			<field name="question">What do we do well?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">comment</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_1_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_5_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="6" name="sequence"/>
-			<field name="question">What are the most important challenges facing your organization this year?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">comment</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_1_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_6_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="7" name="sequence"/>
-			<field name="question">How can we help you do your job better?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">comment</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_1_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_7_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="8" name="sequence"/>
-			<field name="question">Please provide any additional comments.</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">comment</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_1_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_8_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="9" name="sequence"/>
-			<field name="question">Contact information</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">multiple_textboxes_diff_type</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_2_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_9_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="10" name="sequence"/>
-			<field name="question">How many years have you been a client?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">multiple_choice_only_one_ans</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_2_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_0_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Most Important</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_0_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_1_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Very Important</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_0_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_2_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Important</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_0_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_3_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Less Important</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_0_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_4_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Not Important</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_0_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_5_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Excellent</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_6_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Above Average</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_7_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Average</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_8_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Below Average</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_9_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Poor</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_10_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">N/A</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_0_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Email</field>
-			<field name="question_id" ref="survey_question_2_Community"/>
-			<field name="type">char</field>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_1_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">The quality of our responses to your questions and concerns.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_2_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">0 - 2 years</field>
-			<field name="question_id" ref="survey_question_9_Community"/>
-			<field name="type">char</field>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_3_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Name</field>
-			<field name="question_id" ref="survey_question_8_Community"/>
-			<field name="type">char</field>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_4_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Industry/marketplace knowledge</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_5_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Phone</field>
-			<field name="question_id" ref="survey_question_2_Community"/>
-			<field name="type">char</field>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_6_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">3 - 5 years</field>
-			<field name="question_id" ref="survey_question_9_Community"/>
-			<field name="type">char</field>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_7_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Length of time in business</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_8_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">The timeliness of our Representatives' response to your needs.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_9_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Company</field>
-			<field name="question_id" ref="survey_question_8_Community"/>
-			<field name="type">char</field>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_10_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">The knowledge level of your Representative.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_11_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Mail</field>
-			<field name="question_id" ref="survey_question_2_Community"/>
-			<field name="type">char</field>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_12_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Phone number</field>
-			<field name="question_id" ref="survey_question_8_Community"/>
-			<field name="type">char</field>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_13_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Consultative capabilities</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_14_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">6 - 10 years</field>
-			<field name="question_id" ref="survey_question_9_Community"/>
-			<field name="type">char</field>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_15_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">10 + years</field>
-			<field name="question_id" ref="survey_question_9_Community"/>
-			<field name="type">char</field>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_16_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Your Representative keeps you informed of changes.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_17_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Face-to-Face</field>
-			<field name="question_id" ref="survey_question_2_Community"/>
-			<field name="type">char</field>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_18_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Technology and Tools provided</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_19_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Email address</field>
-			<field name="question_id" ref="survey_question_8_Community"/>
-			<field name="type">email</field>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_20_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Other</field>
-			<field name="question_id" ref="survey_question_2_Community"/>
-			<field name="type">char</field>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_21_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Personal Referral</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_22_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">How is our ability to anticipate your needs and provide assistance pro actively.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_23_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Lowest rate</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="6" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_24_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Our products and services we provide meet your objectives.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="6" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_25_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Responsiveness to requests</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="7" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_26_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">We are easy to work with.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="7" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_27_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Value-added services</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="8" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_28_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Overall, how do you rank our services to you.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="8" name="sequence"/>
-		</record>
-	</data>
-	
-	<!--  Survey Response -->
-	
-	<data noupdate="1">
-		<record id="survey_history_0" model="survey.history">
-			<field name="date">2010-03-03 14:25:03</field>
-			<field name="survey_id" ref="survey.survey_partner_feedback"/>
-			<field name="user_id" ref="base.user_root"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_history_1" model="survey.history">
-			<field name="date">2010-03-03 14:29:36</field>
-			<field name="survey_id" ref="survey.survey_odoo_feedback"/>
-			<field name="user_id" ref="base.user_root"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_0" model="survey.response">
-			<field name="date_create">2010-03-03 14:25:03.603599</field>
-			<field name="state">done</field>
-			<field name="survey_id" ref="survey.survey_partner_feedback"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field name="response_type">link</field>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_1" model="survey.response">
-			<field name="date_create">2010-03-03 14:29:36.247905</field>
-			<field name="state">done</field>
-			<field name="survey_id" ref="survey.survey_odoo_feedback"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field name="response_type">link</field>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_0" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:03.631622</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_your_customers"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_1" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:03.653849</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_located"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_2" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:03.671836</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_company_size"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_3" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:03.689999</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_offical_partner"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_4" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:03.706175</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="single_text">Tiny ERP</field>
-			<field name="question_id" ref="survey.survey_question_company_name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_5" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:29.087116</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_partnership_contract"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_6" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:29.107571</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_contract_customers"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_7" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:29.126023</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_sell_to_your_customers"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_8" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:26:14.844451</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_partners_about"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_9" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:26:14.872224</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_launchpad_reporting"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_10" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:26:14.897764</field>
-			<field name="state">skip</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_partners_on_which_subjects"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_11" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:26:14.918989</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_Leads"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_12" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:29:36.27459</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_discover_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_13" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:29:36.301461</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_company_sector"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_14" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:29:36.33203</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="single_text">Tiny ERP</field>
-			<field name="question_id" ref="survey.survey_question_odoo_company_name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_15" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:29:36.35911</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_mange_with_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_16" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:30:11.376172</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_continue_using_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_17" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:30:11.397675</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_subscribe_to_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_18" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:30:11.414119</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_configure_the_application"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_19" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:31:18.637519</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_would_you_prefer_use"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_20" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:31:18.653091</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="single_text">survey</field>
-			<field name="question_id" ref="survey.survey_question_odoo_modules_are_missing_in_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_21" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:31:18.669619</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_give_your_opinion"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_22" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:31:18.691933</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_you_think_about"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_23" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:32:08.47899</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_dms"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_24" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:32:08.501274</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_offer_opinion_about_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_25" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:32:08.523878</field>
-			<field name="state">skip</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_offer_comments_them_here"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_26" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:32:08.538988</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_would_you_prefer_receive_your_prepaid_bill"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_27" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:32:08.555196</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_support_services"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_0" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_0"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_answer_saas_services"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_1" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_0"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_answer_specific_devlopments"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_2" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_0"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_answer_with_specific_devlopments"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_3" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_1"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_company_size_Europ"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_4" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_1"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_company_size_Asia"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_5" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_2"/>
-			<field name="answer_id" ref="survey.survey_question_company_size_51"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_6" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_3"/>
-			<field name="answer_id" ref="survey.survey_question_company_size_before_2006"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_7" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_5"/>
-			<field name="answer_id" ref="survey.survey_answer_Clear"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_8" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_6"/>
-			<field name="answer_id" ref="survey.survey_answer_sometimes"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_9" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_7"/>
-			<field name="answer_id" ref="survey.survey_answer_maintenance_contract"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_10" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Good"/>
-			<field name="response_id" ref="survey_response_line_8"/>
-			<field name="answer_id" ref="survey.survey_answer_Maintenance_contracts"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_11" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Very_Good"/>
-			<field name="response_id" ref="survey_response_line_8"/>
-			<field name="answer_id" ref="survey.survey_answer_partner_Leads"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_12" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Very_Good"/>
-			<field name="response_id" ref="survey_response_line_8"/>
-			<field name="answer_id" ref="survey.survey_answer_Training_sessions"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_13" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_yes_but_could_better"/>
-			<field name="response_id" ref="survey_response_line_9"/>
-			<field name="answer_id" ref="survey.survey_answer_modify_a_translation"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_14" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_No"/>
-			<field name="response_id" ref="survey_response_line_9"/>
-			<field name="answer_id" ref="survey.survey_answer_bug_or_blueprint"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_15" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_yes_but_could_better"/>
-			<field name="response_id" ref="survey_response_line_9"/>
-			<field name="answer_id" ref="survey.survey_answer_find_openobject_website1"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_16" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Easy"/>
-			<field name="response_id" ref="survey_response_line_11"/>
-			<field name="answer_id" ref="survey.survey_answer_converted_in_customers"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_17" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Very_Easy"/>
-			<field name="response_id" ref="survey_response_line_11"/>
-			<field name="answer_id" ref="survey.survey_answer_find_openobject_website"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_18" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_12"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_OpenERP_website"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_19" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_13"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Other_sector"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_20" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_13"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Services"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_21" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_13"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_HR"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_22" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_13"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Engineering"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_23" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Customer_Accounting_Finance"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_24" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Customer_Relationship_Management"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_25" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Sales_Purchases"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_26" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Customer_Human_Resources"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_27" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Other_odoo_mange_with_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_28" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Project_Management"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_29" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Customer_inventory_Management"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_30" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_16"/>
-			<field name="answer_id" ref="survey.survey_answer_yes"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_31" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_17"/>
-			<field name="answer_id" ref="survey.survey_answer_switch_to_online_offer1"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_32" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_couple_of_hours"/>
-			<field name="response_id" ref="survey_response_line_18"/>
-			<field name="answer_id" ref="survey.survey_answer_importing_my_data"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_33" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_couple_of_minutes"/>
-			<field name="response_id" ref="survey_response_line_18"/>
-			<field name="answer_id" ref="survey.survey_answer_initial_data"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_34" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_couple_of_minutes"/>
-			<field name="response_id" ref="survey_response_line_18"/>
-			<field name="answer_id" ref="survey.survey_answer_switch_to_online_offer"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_35" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_couple_of_hours"/>
-			<field name="response_id" ref="survey_response_line_18"/>
-			<field name="answer_id" ref="survey.survey_answer_configuring_the_modules"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_36" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_couple_of_hours"/>
-			<field name="response_id" ref="survey_response_line_18"/>
-			<field name="answer_id" ref="survey.survey_answer_adding_modules_need"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_37" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_19"/>
-			<field name="answer_id" ref="survey.survey_answer_both_interface"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_38" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_yes_but_be_better"/>
-			<field name="response_id" ref="survey_response_line_21"/>
-			<field name="answer_id" ref="survey.survey_answer_faq_clear_and_choicese"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_39" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_no_opinion"/>
-			<field name="response_id" ref="survey_response_line_21"/>
-			<field name="answer_id" ref="survey.survey_answer_webclient_simple_and_useful"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_40" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Absolutely"/>
-			<field name="response_id" ref="survey_response_line_21"/>
-			<field name="answer_id" ref="survey.survey_answer_control_center_user_friendly"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_41" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_no_opinion"/>
-			<field name="response_id" ref="survey_response_line_21"/>
-			<field name="answer_id" ref="survey.survey_answer_appropriately_structured"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_42" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_think_Easy"/>
-			<field name="response_id" ref="survey_response_line_22"/>
-			<field name="answer_id" ref="survey.survey_answer_downloadin_your_backups"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_43" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_think_Difficult"/>
-			<field name="response_id" ref="survey_response_line_22"/>
-			<field name="answer_id" ref="survey.survey_answer_duplicating_database"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_44" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_think_Easy"/>
-			<field name="response_id" ref="survey_response_line_22"/>
-			<field name="answer_id" ref="survey.survey_answer_database_new_version"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_45" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_23"/>
-			<field name="answer_id" ref="survey.survey_answer_No"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_46" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_pricing_No_Opinion"/>
-			<field name="response_id" ref="survey_response_line_24"/>
-			<field name="answer_id" ref="survey.survey_answer_pricing_understanding"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_47" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_pricing_Very_Good"/>
-			<field name="response_id" ref="survey_response_line_24"/>
-			<field name="answer_id" ref="survey.survey_answer_pricing_available_modules"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_48" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_pricing_Good"/>
-			<field name="response_id" ref="survey_response_line_24"/>
-			<field name="answer_id" ref="survey.survey_answer_pricing_criteria"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_49" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_26"/>
-			<field name="answer_id" ref="survey.survey_answer_Monthly"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_50" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_offer_Very_Good"/>
-			<field name="response_id" ref="survey_response_line_27"/>
-			<field name="answer_id" ref="survey.survey_answer_pertinence_our_answer"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_51" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_offer_Good"/>
-			<field name="response_id" ref="survey_response_line_27"/>
-			<field name="answer_id" ref="survey.survey_answer_our_answer_is"/>
-		</record>
-	</data>
+    <data noupdate="1">
+        <record id="survey_0_Community" model="survey">
+            <field name="title">Community Survey</field>
+            <field name="note">Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.</field>
+            <field eval="6" name="response_user"/>
+            <field name="state">draft</field>
+            <field name="responsible_id" ref="base.user_root"/>
+            <field eval="1" name="send_response"/>
+            <field eval="[(6,0,[])]" name="users"/>
+            <field name="type" ref="survey_type3"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_0_Community" model="survey.page">
+            <field name="title">Service Characteristics</field>
+            <field name="survey_id" ref="survey_0_Community"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_1_Community" model="survey.page">
+            <field name="title">Performance Indicator</field>
+            <field name="survey_id" ref="survey_0_Community"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_2_Community" model="survey.page">
+            <field name="title">Client Information</field>
+            <field name="survey_id" ref="survey_0_Community"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_0_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="1" name="sequence"/>
+            <field name="question">Please rank, your criteria for choosing an organization.</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_0_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_1_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="2" name="sequence"/>
+            <field name="question">Please rate the following questions.</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_0_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_2_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="3" name="sequence"/>
+            <field name="question">How would you prefer for us to provide most communications?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="1" name="is_comment_require"/>
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_0_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_3_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="4" name="sequence"/>
+            <field name="question">What should we improve on (please be specific)?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">comment</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_1_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_4_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="5" name="sequence"/>
+            <field name="question">What do we do well?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">comment</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_1_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_5_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="6" name="sequence"/>
+            <field name="question">What are the most important challenges facing your organization this year?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">comment</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_1_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_6_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="7" name="sequence"/>
+            <field name="question">How can we help you do your job better?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">comment</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_1_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_7_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="8" name="sequence"/>
+            <field name="question">Please provide any additional comments.</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">comment</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_1_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_8_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="9" name="sequence"/>
+            <field name="question">Contact information</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">multiple_textboxes_diff_type</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_2_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_9_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="10" name="sequence"/>
+            <field name="question">How many years have you been a client?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_2_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_0_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Most Important</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_0_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_1_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Very Important</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_0_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_2_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Important</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_0_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_3_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Less Important</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_0_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_4_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Not Important</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_0_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_5_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Excellent</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_6_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Above Average</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_7_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Average</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_8_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Below Average</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_9_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Poor</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_10_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">N/A</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_0_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Email</field>
+            <field name="question_id" ref="survey_question_2_Community"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_1_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">The quality of our responses to your questions and concerns.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_2_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">0 - 2 years</field>
+            <field name="question_id" ref="survey_question_9_Community"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_3_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Name</field>
+            <field name="question_id" ref="survey_question_8_Community"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_4_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Industry/marketplace knowledge</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_5_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Phone</field>
+            <field name="question_id" ref="survey_question_2_Community"/>
+            <field name="type">char</field>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_6_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">3 - 5 years</field>
+            <field name="question_id" ref="survey_question_9_Community"/>
+            <field name="type">char</field>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_7_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Length of time in business</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_8_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">The timeliness of our Representatives' response to your needs.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_9_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Company</field>
+            <field name="question_id" ref="survey_question_8_Community"/>
+            <field name="type">char</field>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_10_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">The knowledge level of your Representative.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_11_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Mail</field>
+            <field name="question_id" ref="survey_question_2_Community"/>
+            <field name="type">char</field>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_12_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Phone number</field>
+            <field name="question_id" ref="survey_question_8_Community"/>
+            <field name="type">char</field>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_13_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Consultative capabilities</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_14_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">6 - 10 years</field>
+            <field name="question_id" ref="survey_question_9_Community"/>
+            <field name="type">char</field>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_15_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">10 + years</field>
+            <field name="question_id" ref="survey_question_9_Community"/>
+            <field name="type">char</field>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_16_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Your Representative keeps you informed of changes.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_17_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Face-to-Face</field>
+            <field name="question_id" ref="survey_question_2_Community"/>
+            <field name="type">char</field>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_18_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Technology and Tools provided</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_19_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Email address</field>
+            <field name="question_id" ref="survey_question_8_Community"/>
+            <field name="type">email</field>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_20_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Other</field>
+            <field name="question_id" ref="survey_question_2_Community"/>
+            <field name="type">char</field>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_21_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Personal Referral</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_22_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">How is our ability to anticipate your needs and provide assistance pro actively.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_23_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Lowest rate</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="6" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_24_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Our products and services we provide meet your objectives.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="6" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_25_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Responsiveness to requests</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="7" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_26_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">We are easy to work with.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="7" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_27_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Value-added services</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="8" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_28_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Overall, how do you rank our services to you.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="8" name="sequence"/>
+        </record>
+    </data>
+    
+    <!--  Survey Response -->
+    
+    <data noupdate="1">
+        <record id="survey_history_0" model="survey.history">
+            <field name="date">2010-03-03 14:25:03</field>
+            <field name="survey_id" ref="survey.survey_partner_feedback"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_history_1" model="survey.history">
+            <field name="date">2010-03-03 14:29:36</field>
+            <field name="survey_id" ref="survey.survey_odoo_feedback"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_0" model="survey.response">
+            <field name="date_create">2010-03-03 14:25:03.603599</field>
+            <field name="state">done</field>
+            <field name="survey_id" ref="survey.survey_partner_feedback"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="response_type">link</field>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_1" model="survey.response">
+            <field name="date_create">2010-03-03 14:29:36.247905</field>
+            <field name="state">done</field>
+            <field name="survey_id" ref="survey.survey_odoo_feedback"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="response_type">link</field>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_0" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:03.631622</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_your_customers"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_1" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:03.653849</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_located"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_2" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:03.671836</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_company_size"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_3" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:03.689999</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_offical_partner"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_4" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:03.706175</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="single_text">Tiny ERP</field>
+            <field name="question_id" ref="survey.survey_question_company_name"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_5" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:29.087116</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_partnership_contract"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_6" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:29.107571</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_contract_customers"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_7" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:29.126023</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_sell_to_your_customers"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_8" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:26:14.844451</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_partners_about"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_9" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:26:14.872224</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_launchpad_reporting"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_10" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:26:14.897764</field>
+            <field name="state">skip</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_partners_on_which_subjects"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_11" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:26:14.918989</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_Leads"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_12" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:29:36.27459</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_discover_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_13" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:29:36.301461</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_company_sector"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_14" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:29:36.33203</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="single_text">Tiny ERP</field>
+            <field name="question_id" ref="survey.survey_question_odoo_company_name"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_15" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:29:36.35911</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_mange_with_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_16" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:30:11.376172</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_continue_using_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_17" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:30:11.397675</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_subscribe_to_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_18" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:30:11.414119</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_configure_the_application"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_19" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:31:18.637519</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_would_you_prefer_use"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_20" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:31:18.653091</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="single_text">survey</field>
+            <field name="question_id" ref="survey.survey_question_odoo_modules_are_missing_in_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_21" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:31:18.669619</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_give_your_opinion"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_22" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:31:18.691933</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_you_think_about"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_23" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:32:08.47899</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_dms"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_24" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:32:08.501274</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_offer_opinion_about_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_25" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:32:08.523878</field>
+            <field name="state">skip</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_offer_comments_them_here"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_26" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:32:08.538988</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_would_you_prefer_receive_your_prepaid_bill"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_27" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:32:08.555196</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_support_services"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_0" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_0"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_answer_saas_services"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_1" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_0"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_answer_specific_devlopments"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_2" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_0"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_answer_with_specific_devlopments"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_3" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_1"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_company_size_Europ"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_4" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_1"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_company_size_Asia"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_5" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_2"/>
+            <field name="answer_id" ref="survey.survey_question_company_size_51"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_6" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_3"/>
+            <field name="answer_id" ref="survey.survey_question_company_size_before_2006"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_7" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_5"/>
+            <field name="answer_id" ref="survey.survey_answer_Clear"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_8" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_6"/>
+            <field name="answer_id" ref="survey.survey_answer_sometimes"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_9" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_7"/>
+            <field name="answer_id" ref="survey.survey_answer_maintenance_contract"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_10" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Good"/>
+            <field name="response_id" ref="survey_response_line_8"/>
+            <field name="answer_id" ref="survey.survey_answer_Maintenance_contracts"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_11" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Very_Good"/>
+            <field name="response_id" ref="survey_response_line_8"/>
+            <field name="answer_id" ref="survey.survey_answer_partner_Leads"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_12" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Very_Good"/>
+            <field name="response_id" ref="survey_response_line_8"/>
+            <field name="answer_id" ref="survey.survey_answer_Training_sessions"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_13" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_yes_but_could_better"/>
+            <field name="response_id" ref="survey_response_line_9"/>
+            <field name="answer_id" ref="survey.survey_answer_modify_a_translation"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_14" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_No"/>
+            <field name="response_id" ref="survey_response_line_9"/>
+            <field name="answer_id" ref="survey.survey_answer_bug_or_blueprint"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_15" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_yes_but_could_better"/>
+            <field name="response_id" ref="survey_response_line_9"/>
+            <field name="answer_id" ref="survey.survey_answer_find_openobject_website1"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_16" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Easy"/>
+            <field name="response_id" ref="survey_response_line_11"/>
+            <field name="answer_id" ref="survey.survey_answer_converted_in_customers"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_17" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Very_Easy"/>
+            <field name="response_id" ref="survey_response_line_11"/>
+            <field name="answer_id" ref="survey.survey_answer_find_openobject_website"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_18" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_12"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_OpenERP_website"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_19" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Other_sector"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_20" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Services"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_21" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_HR"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_22" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Engineering"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_23" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Customer_Accounting_Finance"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_24" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Customer_Relationship_Management"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_25" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Sales_Purchases"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_26" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Customer_Human_Resources"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_27" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Other_odoo_mange_with_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_28" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Project_Management"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_29" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Customer_inventory_Management"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_30" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_16"/>
+            <field name="answer_id" ref="survey.survey_answer_yes"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_31" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_17"/>
+            <field name="answer_id" ref="survey.survey_answer_switch_to_online_offer1"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_32" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_couple_of_hours"/>
+            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="answer_id" ref="survey.survey_answer_importing_my_data"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_33" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_couple_of_minutes"/>
+            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="answer_id" ref="survey.survey_answer_initial_data"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_34" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_couple_of_minutes"/>
+            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="answer_id" ref="survey.survey_answer_switch_to_online_offer"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_35" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_couple_of_hours"/>
+            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="answer_id" ref="survey.survey_answer_configuring_the_modules"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_36" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_couple_of_hours"/>
+            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="answer_id" ref="survey.survey_answer_adding_modules_need"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_37" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_19"/>
+            <field name="answer_id" ref="survey.survey_answer_both_interface"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_38" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_yes_but_be_better"/>
+            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="answer_id" ref="survey.survey_answer_faq_clear_and_choicese"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_39" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_no_opinion"/>
+            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="answer_id" ref="survey.survey_answer_webclient_simple_and_useful"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_40" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Absolutely"/>
+            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="answer_id" ref="survey.survey_answer_control_center_user_friendly"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_41" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_no_opinion"/>
+            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="answer_id" ref="survey.survey_answer_appropriately_structured"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_42" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_think_Easy"/>
+            <field name="response_id" ref="survey_response_line_22"/>
+            <field name="answer_id" ref="survey.survey_answer_downloadin_your_backups"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_43" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_think_Difficult"/>
+            <field name="response_id" ref="survey_response_line_22"/>
+            <field name="answer_id" ref="survey.survey_answer_duplicating_database"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_44" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_think_Easy"/>
+            <field name="response_id" ref="survey_response_line_22"/>
+            <field name="answer_id" ref="survey.survey_answer_database_new_version"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_45" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_23"/>
+            <field name="answer_id" ref="survey.survey_answer_No"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_46" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_pricing_No_Opinion"/>
+            <field name="response_id" ref="survey_response_line_24"/>
+            <field name="answer_id" ref="survey.survey_answer_pricing_understanding"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_47" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_pricing_Very_Good"/>
+            <field name="response_id" ref="survey_response_line_24"/>
+            <field name="answer_id" ref="survey.survey_answer_pricing_available_modules"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_48" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_pricing_Good"/>
+            <field name="response_id" ref="survey_response_line_24"/>
+            <field name="answer_id" ref="survey.survey_answer_pricing_criteria"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_49" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_26"/>
+            <field name="answer_id" ref="survey.survey_answer_Monthly"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_50" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_offer_Very_Good"/>
+            <field name="response_id" ref="survey_response_line_27"/>
+            <field name="answer_id" ref="survey.survey_answer_pertinence_our_answer"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_51" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_offer_Good"/>
+            <field name="response_id" ref="survey_response_line_27"/>
+            <field name="answer_id" ref="survey.survey_answer_our_answer_is"/>
+        </record>
+    </data>
 
-</openerp>
\ No newline at end of file
+</openerp>

From d6f25f5155707638fd63f715ed12c51a681005d3 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 7 Apr 2010 04:46:30 +0100
Subject: [PATCH 230/248] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100407034630-qmsnzcle2lwkqxey
---
 bin/addons/base/i18n/hr.po    | 4 ++--
 bin/addons/base/i18n/ja.po    | 4 ++--
 bin/addons/base/i18n/sv.po    | 4 ++--
 bin/addons/base/i18n/uk.po    | 4 ++--
 bin/addons/base/i18n/zh_CN.po | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 51a7f1d772a..0069d26fd4f 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-05 04:33+0000\n"
+"PO-Revision-Date: 2010-04-06 04:41+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-06 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index f55114223a5..98ee2ba6b7b 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-05 04:34+0000\n"
+"PO-Revision-Date: 2010-04-06 04:39+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-06 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 04fc6b3d022..26ba50df07c 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-05 04:37+0000\n"
+"PO-Revision-Date: 2010-04-06 04:37+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-06 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 2557ca954df..15eb8509852 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-05 04:31+0000\n"
+"PO-Revision-Date: 2010-04-06 04:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-06 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 3010205f573..fa885c2f0df 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-05 04:30+0000\n"
+"PO-Revision-Date: 2010-04-06 04:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-06 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 919f6bef68c2ff5241d1af2779af74e5f1f6fc8e Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 7 Apr 2010 04:46:56 +0100
Subject: [PATCH 231/248] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100407034656-mcbveze6ejh8essk
---
 addons/base_contact/i18n/ko.po    | 2 +-
 addons/crm/i18n/fi.po             | 2 +-
 addons/hr_timesheet/i18n/de.po    | 6 +++---
 addons/report_purchase/i18n/ko.po | 2 +-
 addons/scrum/i18n/ko.po           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index ef55adcec9e..698c28484c7 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index c2643ad5e8a..f06b2d047d3 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index 6fd9ba3a577..acb4bc52b66 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-22 19:08+0000\n"
+"PO-Revision-Date: 2010-04-06 23:02+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -351,7 +351,7 @@ msgstr "März"
 #: xsl:hr.analytical.timesheet:0
 #: xsl:hr.analytical.timesheet_users:0
 msgid "Total"
-msgstr "Betrag gesammt"
+msgstr "Betrag gesamt"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po
index 20f71776b41..956f97ff5a9 100644
--- a/addons/report_purchase/i18n/ko.po
+++ b/addons/report_purchase/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po
index f4595a6011e..aad7e238eae 100644
--- a/addons/scrum/i18n/ko.po
+++ b/addons/scrum/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-05 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum

From 90f0071acb93e05f743f05e5e54c1d2541d570fc Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 7 Apr 2010 08:55:02 +0200
Subject: [PATCH 232/248] Merge and FIX VAT declaration basing on stable
 sources

bzr revid: nel@tinyerp.com-20100407065502-62cik4iamvtzm4te
---
 addons/board_crm_configuration/__terp__.py    |  2 +-
 addons/event/wizard/event_registration.py     | 11 +++-
 addons/l10n_be/company.py                     |  6 ++-
 .../wizard/l10n_be_account_vat_declaration.py | 52 ++++++++++---------
 .../l10n_be_account_vat_declaration_view.xml  | 17 +++---
 5 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__terp__.py
index 3c303ee2d1c..09bd6e25bc1 100644
--- a/addons/board_crm_configuration/__terp__.py
+++ b/addons/board_crm_configuration/__terp__.py
@@ -34,7 +34,7 @@ This module implements a dashboard for CRM that includes:
     * Jobs Tracking (graph)
     """,
     'author': 'Tiny',
-    'depends': ['board', 'crm', 'report_crm'],
+    'depends': ['board', 'crm'],
     'update_xml': ['board_crm_statistical_view.xml', 'board_crm_view.xml'],
     'demo_xml': ['board_crm_demo.xml'],
     'installable': True,
diff --git a/addons/event/wizard/event_registration.py b/addons/event/wizard/event_registration.py
index e7252a1a63d..d8087b7a569 100644
--- a/addons/event/wizard/event_registration.py
+++ b/addons/event/wizard/event_registration.py
@@ -27,6 +27,15 @@ class event_registration_list(osv.osv_memory):
     _description = "List Event Registrations"
 
     def open_registration(self, cr, uid, ids, context={}):
+        if not context.get('active_id', None):
+            return {
+            'name': 'Event Registrations',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'event.registration',
+            'type': 'ir.actions.act_window'
+            }
+
         cr.execute('SELECT section_id FROM event_event WHERE id = %s', (context['active_id'],))
         res = cr.fetchone()
         return {
@@ -40,4 +49,4 @@ class event_registration_list(osv.osv_memory):
 
 event_registration_list()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
index 4395f13380e..30435f0fc49 100644
--- a/addons/l10n_be/company.py
+++ b/addons/l10n_be/company.py
@@ -25,7 +25,7 @@ class res_company(osv.osv):
     _description = 'res.company'
 
     def _get_default_ad(self, addresses):
-        city = post_code = address = ""
+        city = post_code = address = country_code = ""
         for ads in addresses:
             if ads.type == 'default':
                 city = ads.city or ""
@@ -34,7 +34,9 @@ class res_company(osv.osv):
                     address = ads.street or ""
                 if ads.street2:
                     address += " " + ads.street2
-        return city, post_code, address
+                if ads.country_id:
+                    country_code = ads.country_id and ads.country_id.code or ""
+        return city, post_code, address, country_code
 res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 9dd5ea5b269..4b531438171 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -18,25 +18,31 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import base64
 
+import time
+import datetime
+import base64
 from osv import osv, fields
 from tools.translate import _
 
 class l10n_be_vat_declaration(osv.osv_memory):
-    """ Periodical VAT Declaration """
+    """ Vat Declaration """
     _name = "l1on_be.vat.declaration"
     _description = "Vat Declaration"
 
     _columns = {
         'period_id': fields.many2one('account.period','Period', required=True),
         'msg': fields.text('File created', size=64, readonly=True),
-        'file_save': fields.binary('Save File'),
-                }
+        'file_save' : fields.binary('Save File'),
+        'ask_resitution': fields.boolean('Ask Restitution'),
+        'ask_payment': fields.boolean('Ask Payment'),
+        'client_nihil': fields.boolean('Last Declaration of Entreprise', help = 'Thick this case only if it concerns only the last statement on the civil or cessation of activity')
+
+    }
 
     _defaults = {
         'msg': lambda *a:'''Save the File with '".xml"' extension.''',
-                }
+    }
 
     def create_xml(self, cr, uid, ids, context={}):
         obj_fyear = self.pool.get('account.fiscalyear')
@@ -46,12 +52,12 @@ class l10n_be_vat_declaration(osv.osv_memory):
         obj_comp = self.pool.get('res.company')
         obj_data = self.pool.get('ir.model.data')
 
-        list_of_tags=['00','01','02','03','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','91']
+        list_of_tags=['00','01','02','03','44','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','88','91']
         obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
         user_cmpny = obj_company.name
         vat_no=obj_company.partner_id.vat
         if not vat_no:
-            raise osv.except_osv(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
+            raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
 
         tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
         ctx = context.copy()
@@ -59,50 +65,46 @@ class l10n_be_vat_declaration(osv.osv_memory):
         ctx['period_id'] = data['period_id'] #added context here
         tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
-        address = post_code = city = ''
-        if not obj_company.partner_id.address:
-            address = post_code = city = ''
+        address = post_code = city = country_code = ''
+        city, post_code, address, country_code = pooler.get_pool(cr.dbname).get('res.company')._get_default_ad(obj_company.partner_id.address)
+
 
-        city, post_code, address = obj_comp._get_default_ad(obj_company.partner_id.address)
         year_id = obj_fyear.find(cr, uid)
 
         account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
-        current_year = account_period.fiscalyear_id.name
         period_code = account_period.code
 
-        send_ref = user_cmpny
-        if period_code:
-            send_ref = send_ref + period_code
-
+        send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
         data_of_file='<?xml version="1.0"?>\n<VATSENDING xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MultiDeclarationTVA-NoSignature-14.xml">'
         data_of_file +='\n\t<DECLARER>\n\t\t<VATNUMBER>'+str(vat_no)+'</VATNUMBER>\n\t\t<NAME>'+str(obj_company.name)+'</NAME>\n\t\t<ADDRESS>'+address+'</ADDRESS>'
-        data_of_file +='\n\t\t<POSTCODE>'+post_code+'</POSTCODE>\n\t\t<CITY>'+city+'</CITY>\n\t\t<SENDINGREFERENCE>'+send_ref+'</SENDINGREFERENCE>\n\t</DECLARER>'
-        data_of_file +='\n\t<VATRECORD>\n\t\t<RECNUM>1</RECNUM>\n\t\t<VATNUMBER>'+str(vat_no)+'</VATNUMBER>\n\t\t<DPERIODE>\n\t\t\t'
-
+        data_of_file +='\n\t\t<POSTCODE>'+post_code+'</POSTCODE>\n\t\t<CITY>'+city+'</CITY>\n\t\t<COUNTRY>'+country_code+'</COUNTRY>\n\t\t<SENDINGREFERENCE>'+send_ref+'</SENDINGREFERENCE>\n\t</DECLARER>'
+        data_of_file +='\n\t<VATRECORD>\n\t\t<RECNUM>1</RECNUM>\n\t\t<VATNUMBER>'+str(vat_no[2:])+'</VATNUMBER>\n\t\t<DPERIODE>\n\t\t\t'
+ 
         starting_month = account_period.date_start[5:7]
         ending_month = account_period.date_stop[5:7]
         if starting_month != ending_month:
             #starting month and ending month of selected period are not the same
             #it means that the accounting isn't based on periods of 1 month but on quarters
             quarter = str(((int(starting_month) - 1) / 3) + 1)
-            data_of_file += '<QUARTER>' + quarter + '</QUARTER>\n\t\t\t'
+            data_of_file += '<QUARTER>'+quarter+'</QUARTER>\n\t\t\t'
         else:
-            data_of_file += '<MONTH>' + starting_month + '</MONTH>\n\t\t\t'
+            data_of_file += '<MONTH>'+starting_month+'</MONTH>\n\t\t\t'
         data_of_file += '<YEAR>' + str(account_period.date_stop[:4]) + '</YEAR>\n\t\t</DPERIODE>\n\t\t<ASK RESTITUTION="NO" PAYMENT="NO"/>'
+        data_of_file += '\n\t\t<ClientListingNihil>'+ (data['form']['client_nihil'] and 'YES' or 'NO') +'</ClientListingNihil>'
         data_of_file +='\n\t\t<DATA>\n\t\t\t<DATA_ELEM>'
 
         for item in tax_info:
             if item['code']:
                 if item['code'] == '71-72':
-                    item['code'] = '71'
+                    item['code']='71'
                 if item['code'] in list_of_tags:
-                    data_of_file +='\n\t\t\t\t<D' + str(int(item['code'])) +'>' + str(int(item['sum_period']*100)) +  '</D'+str(int(item['code'])) +'>'
+                    data_of_file +='\n\t\t\t\t<D'+str(int(item['code'])) +'>' + str(abs(int(item['sum_period']*100))) +  '</D'+str(int(item['code'])) +'>'
 
         data_of_file +='\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
         data['file_save'] = base64.encodestring(data_of_file)
         self.write(cr, uid, ids, {'file_save':data['file_save']}, context=context)
-        return True
+
 
 l10n_be_vat_declaration()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 56f8b6477f9..62399ae1cba 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -3,9 +3,9 @@
     <data>
 
     	<menuitem
-	        id="menu_finance_belgian_statement"
-	        name="Belgium Statements"
-	        parent="account.menu_finance_legal_statement"/>
+        id="menu_finance_belgian_statement"
+        name="Belgium Statements"
+        parent="account.menu_finance_legal_statement"/>
 
     	<record id="view_vat_declaration" model="ir.ui.view">
             <field name="name">Select Period</field>
@@ -13,9 +13,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Select Period">
-               	<group colspan="4" >
-					<field name="period_id" select="1" default_focus="1"/>
-              		<button colspan="1" name="create_xml" string="Create XML" type="object" icon="gtk-execute"/>
+               	<group  colspan="4" >
+					    <field name="period_id" select="1"/>
+              <field name="ask_resitution"/>
+              <field name="ask_payment"/>
+              <field name="client_nihil"/>
+              		<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1"/>
               	 </group>
               	 <separator string="XML Flie has been Created." colspan="4"/>
               	 <group colspan="4" >
@@ -44,4 +47,4 @@
 	        id="l10_be_vat_declaration"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From aca21ec2335dbe457970790ace51f5ed05dfa624 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 7 Apr 2010 09:03:45 +0200
Subject: [PATCH 233/248] [IMP] misc improvement in CRM reported by fhe

bzr revid: fp@tinyerp.com-20100407070345-cfom7eapo0ew633y
---
 addons/crm/crm.py                         |  4 +-
 addons/crm/crm_lead.py                    |  2 +-
 addons/crm/crm_opportunity.py             |  2 +-
 addons/crm/crm_opportunity_view.xml       |  4 +-
 addons/crm/crm_phonecall.py               | 10 +++-
 addons/crm/wizard/crm_send_email.py       | 48 +++++++++---------
 addons/crm/wizard/crm_send_email_view.xml | 59 ++++++++++++-----------
 7 files changed, 71 insertions(+), 58 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d7339407fd9..81b6cc79f35 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -652,13 +652,11 @@ class crm_case(osv.osv):
         return True
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
-
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         """
-
         if not part:
             return {'value': {'partner_address_id': False,
                             'email_from': False,
@@ -678,7 +676,7 @@ class crm_case(osv.osv):
 
         data = {}
         if not add:
-            return {'value': {'email_from': False, 'partner_name2': False}}
+            return {'value': {'email_from': False}}
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
         data['email_from'] = address.email
         return {'value': data}
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 8863791a28c..442471fa7b7 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -32,7 +32,7 @@ class crm_lead(osv.osv):
 
     _name = "crm.lead"
     _description = "Leads Cases"
-    _order = "priority desc, id desc"
+    _order = "priority, id desc"
     _inherit = ['res.partner.address', 'crm.case']
 
     def case_open(self, cr, uid, ids, *args):
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index a13eade4427..7d15f5968f5 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -38,7 +38,7 @@ class crm_opportunity(osv.osv):
 
     _name = "crm.opportunity"
     _description = "Opportunity Cases"
-    _order = "id desc"
+    _order = "priority,id desc"
     _inherit = 'crm.case'
 
     def case_open(self, cr, uid, ids, *args):
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index e6694215bee..f36f11dfe74 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -220,6 +220,7 @@
                 <field name="date_deadline" string="Excepted Closing"/>
                 <field name="section_id"/>
                 <field name="user_id"/>
+                <field name="priority"/>
                 <field name="state"/>
                 <button name="case_open" string="Open"
                     states="draft,pending" type="object"
@@ -302,7 +303,8 @@
                 <group expand="1" string="Group By..." colspan="16">
                     <filter string="Stage" icon="terp-crm" domain="[]"
                         context="{'group_by':'stage_id'}" />
-
+                    <filter string="Priority" icon="terp-crm" domain="[]"
+                        context="{'group_by':'priority'}" />
                     <filter string="Category" icon="terp-crm"
                         domain="[]" context="{'group_by':'categ_id'}" />
 
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 3b0d627c058..c452e1b5055 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -108,6 +108,14 @@ class crm_phonecall(osv.osv):
 
         return value
 
+    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+        res = super(crm_phonecall, self).onchange_partner_address_id(cr, uid, ids, add, email)
+        res.setdefault('value', {})
+        if add:
+            address = self.pool.get('res.partner.address').browse(cr, uid, add)
+            res['value']['partner_phone'] = address.mobile
+            res['value']['partner_mobile'] = address.phone
+        return res
 crm_phonecall()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 553053088bb..bcd8adefe43 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -29,19 +29,22 @@ from crm import crm
 class crm_send_new_email(osv.osv_memory):
     """ Sends new email for the case"""
     _name = "crm.send.mail"
-    _description = "Case Send new email"
+    _description = "Send new email"
 
     _columns = {
-                'email_to' : fields.char('To', size=64, required=True),
-                'email_from' : fields.char('From', size=64, required=True),
-                'email_cc' : fields.char('CC', size=128),
-                'subject': fields.char('Subject', size=128, required=True),
-                'text': fields.text('Message', required=True),
-                'state': fields.selection(crm.AVAILABLE_STATES, string='State'),
-                'doc1': fields.binary("Attachment1"),
-                'doc2': fields.binary("Attachment2"),
-                'doc3': fields.binary("Attachment3"),
-                }
+        'email_to' : fields.char('To', size=64, required=True),
+        'email_from' : fields.char('From', size=64, required=True),
+        'email_cc' : fields.char('CC', size=128),
+        'subject': fields.char('Subject', size=128, required=True),
+        'text': fields.text('Message', required=True),
+        'state': fields.selection(crm.AVAILABLE_STATES, string='Set New State To', required=True),
+        'doc1': fields.binary("Attachment1"),
+        'doc1_fname': fields.char("File Name", size=64),
+        'doc2': fields.binary("Attachment2"),
+        'doc2_fname': fields.char("File Name", size=64),
+        'doc3': fields.binary("Attachment3"),
+        'doc3_fname': fields.char("File Name", size=64),
+    }
 
     def action_cancel(self, cr, uid, ids, context=None):
         """ Closes Phonecall to Opportunity form
@@ -51,9 +54,9 @@ class crm_send_new_email(osv.osv_memory):
     def action_send(self, cr, uid, ids, context=None):
         """ This sends an email to ALL the addresses of the selected partners.
         """
-        
+
         hist_obj = self.pool.get('crm.case.history')
-        
+
         if not context:
             context = {}
 
@@ -79,12 +82,10 @@ class crm_send_new_email(osv.osv_memory):
             emails = filter(None, emails)
             body = data['text']
 
-            if case.user_id.signature:
-                body += '\n\n%s' % (case.user_id.signature)
             body = case_pool.format_body(body)
             email_from = data.get('email_from', False)
             case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from)
-            
+
             flag = tools.email_send(
                 email_from,
                 emails,
@@ -94,13 +95,13 @@ class crm_send_new_email(osv.osv_memory):
                 reply_to=case.section_id.reply_to,
                 openobject_id=str(case.id),
             )
-            if flag:                
+            if flag:
                 if data['state'] == 'unchanged':
                     pass
                 elif data['state'] == 'done':
                     case_pool.case_close(cr, uid, [case.id])
                 elif data['state'] == 'draft':
-                    case_pool.case_reset(cr, uid, [case.id])                
+                    case_pool.case_reset(cr, uid, [case.id])
                 elif data['state'] in ['cancel', 'open', 'pending']:
                     act = 'case_' + data['state']
                     getattr(case_pool, act)(cr, uid, [case.id])
@@ -141,11 +142,11 @@ class crm_send_new_email(osv.osv_memory):
                             (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or tools.config.get('email_from',False)})
             if 'subject' in fields:
-                res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')}) 
+                res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')})
             if 'email_cc' in fields:
                 res.update({'email_cc': case.email_cc or ''})
             if 'text' in fields:
-                res.update({'text': case.description or ''})
+                res.update({'text': '\n\n'+(case.user_id.signature or '') + '\n\n' +  (case.description or '')})
             if 'state' in fields:
                 res.update({'state': 'pending'})
         return res
@@ -168,8 +169,8 @@ class crm_send_new_email(osv.osv_memory):
                             (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or hist.email_to or tools.config.get('email_from',False)})
             if 'text' in fields:
-                header = '-------- Original Message --------'                
-                sender = 'From: %s' %(hist.email_from or '')                
+                header = '-------- Original Message --------'
+                sender = 'From: %s' %(hist.email_from or '')
                 to = 'To: %s' % (hist.email_to or '')
                 sentdate = 'Date: %s' % (hist.date)
                 desc = '\n%s'%(hist.description)
@@ -177,7 +178,7 @@ class crm_send_new_email(osv.osv_memory):
                 original = '\n'.join(original)
                 res['text']=original
             if 'subject' in fields:
-                res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')}) 
+                res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')})
             if 'state' in fields:
                 res['state']='pending'
         return res
@@ -214,4 +215,3 @@ class crm_send_new_email(osv.osv_memory):
 
 crm_send_new_email()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index 61c770289ab..7b3392ef8fa 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -3,27 +3,32 @@
     <data>
 
 <!-- Send New Mail view -->
-    
+
         <record model="ir.ui.view" id="crm_send_new_mail_view">
             <field name="name">crm.new.send.mail.form</field>
             <field name="model">crm.send.mail</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Send New Mail" col="2">
-                    <field name="email_from" />
-                	<field name="email_to" />
-                	<field name="email_cc" />
-                	<field name="subject" />                	
-                	<field name="doc1" />
-                	<field name="doc2" />
-                	<field name="doc3" />
+                <form string="Send New Mail" col="4">
+                    <field name="email_to" />
+                    <field name="email_cc"/>
+                    <field name="subject" colspan="4"/>
+                    <group colspan="4" string="Extended Options" expand="1">
+                        <field name="email_from" />
+                        <field name="doc1" filename="doc1_fname"/>
+                        <field name="doc1_fname"/>
+                        <field name="doc2" filename="doc2_fname" />
+                        <field name="doc2_fname"/>
+                        <field name="doc3" filename="doc3_fname" />
+                        <field name="doc3_fname"/>
+                    </group>
                     <separator string="" colspan="4"/>
                     <field name="text" nolabel="1" colspan="4"/>
-                	<separator colspan="4" string="Set case state to" />
-                	<field name="state" />
-                	<separator string=" " colspan="4"/>
+                    <newline/>
+                    <field name="state" />
+                    <separator string=" " colspan="4"/>
                     <group colspan="4" col="3" >
-                    	<label string=" " />
+                        <label string=" " />
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_send" type="object" string="_Send" icon="gtk-go-forward" />
                     </group>
@@ -41,10 +46,10 @@
             <field name="view_id" ref="crm_send_new_mail_view"/>
             <field name="target">new</field>
         </record>
-	
-	
-	<!-- Reply to Mail view -->
-    
+
+
+    <!-- Reply to Mail view -->
+
         <record model="ir.ui.view" id="crm_reply_mail_view">
             <field name="name">crm.mail.reply.form</field>
             <field name="model">crm.send.mail</field>
@@ -52,17 +57,17 @@
             <field name="arch" type="xml">
                 <form string="Reply to last Mail" col="2">
                     <field name="email_from" />
-                	<field name="email_to" />
-                	<field name="email_cc" />
-                	<field name="subject" />                	
-                	<field name="doc1" />
-                	<field name="doc2" />
-                	<field name="doc3" />
+                    <field name="email_to" />
+                    <field name="email_cc" />
+                    <field name="subject" />
+                    <field name="doc1" />
+                    <field name="doc2" />
+                    <field name="doc3" />
                     <separator string="" colspan="4"/>
                     <field name="text" nolabel="1" colspan="4"/>
-                	<separator string=" " colspan="4"/>
+                    <separator string=" " colspan="4"/>
                     <group colspan="4" col="3" >
-                    	<label string=" " />
+                        <label string=" " />
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_send" type="object" string="_Send Reply" icon="gtk-go-forward" />
                     </group>
@@ -80,6 +85,6 @@
             <field name="view_id" ref="crm_reply_mail_view"/>
             <field name="target">new</field>
         </record>
-	
+
     </data>
-</openerp>   
+</openerp>

From 3c31799a0d1fd00f2dfbf7322baf4fd409d29503 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 7 Apr 2010 09:04:19 +0200
Subject: [PATCH 234/248] merge

bzr revid: fp@tinyerp.com-20100407070419-4cly41c0bvrkd00v
---
 bin/addons/base/__terp__.py                  |  3 +-
 bin/addons/base/data/res.country.state.csv   | 52 ++++++++++++++++++++
 bin/addons/base/module/module_view.xml       |  8 +--
 bin/addons/base/res/partner/partner.py       |  2 +-
 bin/addons/base/res/partner/partner_view.xml |  3 +-
 bin/osv/orm.py                               |  4 +-
 6 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 bin/addons/base/data/res.country.state.csv

diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py
index 59321884666..533441816f8 100644
--- a/bin/addons/base/__terp__.py
+++ b/bin/addons/base/__terp__.py
@@ -34,7 +34,8 @@
         'security/base_security.xml',
         'res/res_security.xml',
         'res/res_config.xml',
-        'maintenance/maintenance_security.xml'
+        'maintenance/maintenance_security.xml',
+        'data/res.country.state.csv'
     ],
     'update_xml': [
         'base_update.xml',
diff --git a/bin/addons/base/data/res.country.state.csv b/bin/addons/base/data/res.country.state.csv
new file mode 100644
index 00000000000..bdcb745eb08
--- /dev/null
+++ b/bin/addons/base/data/res.country.state.csv
@@ -0,0 +1,52 @@
+"country_id:id","name","code"
+us,"Alabama","AL"
+us,"Alaska","AK"
+us,"Arizona","AZ"
+us,"Arkansas","AR"
+us,"California","CA"
+us,"Colorado","CO"
+us,"Connecticut","CT"
+us,"Delaware","DE"
+us,"District of Columbia","DC"
+us,"Florida","FL"
+us,"Georgia","GA"
+us,"Hawaii","HI"
+us,"Idaho","ID"
+us,"Illinois","IL"
+us,"Indiana","IN"
+us,"Iowa","IA"
+us,"Kansas","KS"
+us,"Kentucky","KY"
+us,"Louisiana","LA"
+us,"Maine","ME"
+us,"Montana","MT"
+us,"Nebraska","NE"
+us,"Nevada","NV"
+us,"New Hampshire","NH"
+us,"New Jersey","NJ"
+us,"New Mexico","NM"
+us,"New York","NY"
+us,"North Carolina","NC"
+us,"North Dakota","ND"
+us,"Ohio","OH"
+us,"Oklahoma","OK"
+us,"Oregon","OR"
+us,"Maryland","MD"
+us,"Massachusetts","MA"
+us,"Michigan","MI"
+us,"Minnesota","MN"
+us,"Mississippi","MS"
+us,"Missouri","MO"
+us,"Pennsylvania","PA"
+us,"Rhode Island","RI"
+us,"South Carolina","SC"
+us,"South Dakota","SD"
+us,"Tennessee","TN"
+us,"Texas","TX"
+us,"Utah","UT"
+us,"Vermont","VT"
+us,"Virginia","VA"
+us,"Washington","WA"
+us,"West Virginia","WV"
+us,"Wisconsin","WI"
+us,"Wyoming","WY"
diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index ef0cf239042..cd57b59023c 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -50,10 +50,12 @@
                         <filter icon="terp-sale" string="Uninstalled" domain="[('state', 'in', ['uninstalled', 'uninstallable'])]"/>
                         <filter icon="terp-sale" string="To be upgraded" domain="[('state','in', ['to upgrade', 'to remove', 'to install'])]"/>
                         <separator orientation="vertical"/>
-                       <field name="name" select="1"/>
-                       <field name="state" readonly="1" select="1"/>
+                        <filter icon="terp-sale" string="Certified" domain="[('certificate','&lt;&gt;', False)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="state" readonly="1" select="1"/>
 
-					</group>
+                    </group>
 
                </search>
             </field>
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index a5f76b80390..0cdf3d927d4 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -136,7 +136,7 @@ class res_partner(osv.osv):
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'),
         'ref': fields.char('Code', size=64),
         'lang': fields.selection(_lang_get, 'Language', size=5, help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
-        'user_id': fields.many2one('res.users', 'Dedicated Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
+        'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
         'website': fields.char('Website',size=64),
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 8c374acb80b..cd19557547f 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -329,7 +329,6 @@
                             <field colspan="4" name="events" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Notes">
-                            <separator string="Description" colspan="4"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
                     </notebook>
@@ -344,7 +343,7 @@
             <field name="arch" type="xml">
                 <search string="Search Partner">
                    <group col='10' colspan='4'>
-                        <filter string="My Partners" icon="terp-partner" domain="[('parent_id','!=',False)]"/>
+                        <filter string="My Partners" icon="terp-partner" domain="[('user_id','=',uid)]"/>
                         <separator orientation="vertical"/>
                         <filter string="Customers" icon="terp-partner" domain="[('customer','=',1)]" help="Customer Partners"/>
                         <filter string="Suppliers" icon="terp-partner" domain="[('supplier','=',1)]" help="Supplier Partners"
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index c1c2c86aaba..560138e9b9f 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1119,7 +1119,6 @@ class orm_template(object):
             for r in res.keys():
                 if r not in fields:
                     del res[r]
-        print 'Result from fields get', res
         return res
 
     #
@@ -2903,7 +2902,6 @@ class orm(orm_template):
         :raise UserError: if the record is default property for other records
 
         """
-                
         if not ids:
             return True
         if isinstance(ids, (int, long)):
@@ -2935,7 +2933,7 @@ class orm(orm_template):
         self.check_access_rule(cr, uid, ids, 'unlink', context=context)
         for sub_ids in cr.split_for_in_conditions(ids):
             cr.execute('delete from ' + self._table + ' ' \
-                       'where id in %s', sub_ids)
+                       'where id in ('+','.join(['%s'] * len(sub_ids))+')', sub_ids)
 
         for order, object, store_ids, fields in result_store:
             if object != self._name:

From 8199e57017762d1676cff61703228ba83860fd8e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 7 Apr 2010 09:12:05 +0200
Subject: [PATCH 235/248] [IMP] state view

bzr revid: fp@tinyerp.com-20100407071205-7k1frh2729ab1ioo
---
 bin/addons/base/res/country_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/country_view.xml b/bin/addons/base/res/country_view.xml
index 4c2ec57a1d0..485b95ed7ea 100644
--- a/bin/addons/base/res/country_view.xml
+++ b/bin/addons/base/res/country_view.xml
@@ -50,9 +50,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="State">
-                    <field name="country_id"/>
                     <field name="name"/>
                     <field name="code"/>
+                    <field name="country_id"/>
                 </tree>
             </field>
         </record>

From f10bd47d01713067247619964a8c79575ed8d326 Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Wed, 7 Apr 2010 13:08:17 +0530
Subject: [PATCH 236/248] [FIX] l10n_ch onchange_partner_id defination changed

bzr revid: hda@tinyerp.com-20100407073817-6ihpr948ediozc8h
---
 addons/l10n_ch/invoice.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 94173609a6f..0cd99338041 100755
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -152,9 +152,9 @@ class account_invoice(osv.osv):
     ## @parma date_invoice date of the invoice
     ## @parma payment_term inoice payment term
     ## @param partner_bank_id the partner linked invoice bank
-    ## @return the dict of values with the partner_bank value updated       
+    ## @return the dict of values with the partner_bank value updated
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False):
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         """ Function that is call when the partner of the invoice is changed
         it will retriev and set the good bank partner bank"""
         res = super(account_invoice, self).onchange_partner_id(

From c095986949aa58b719bb4123c41eadc5b81c8c6d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 7 Apr 2010 12:41:20 +0200
Subject: [PATCH 237/248] [IMP] Hr improvements

bzr revid: fp@tinyerp.com-20100407104120-2wn2e6sz52ipk3dm
---
 addons/hr_holidays/hr_holidays.py             | 27 ++++----
 addons/hr_holidays/hr_holidays_view.xml       | 65 +++++++++++++------
 addons/hr_recruitment/hr_recruitment_view.xml |  4 +-
 3 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index e49f6d91b63..4265400df8c 100755
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -102,7 +102,7 @@ class hr_holidays(osv.osv):
         'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True),
         'date_to' : fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
         'holiday_status_id' : fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
-        'employee_id' : fields.many2one('hr.employee', "Employee's Name", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
+        'employee_id' : fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
         'manager_id' : fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
         'notes' : fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
@@ -112,7 +112,7 @@ class hr_holidays(osv.osv):
         'allocation_type': fields.selection([('employee','Employee Request'),('company','Company Allocation')], 'Allocation Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help='This field is only for informative purposes, to depict if the leave request/allocation comes from an employee or from the company'),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
-        'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)]} ),
+        'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
     }
 
     _defaults = {
@@ -222,18 +222,19 @@ class hr_holidays(osv.osv):
         if ids2:
             vals['manager_id'] = ids2[0]
         else:
-            raise osv.except_osv(_('Warning !'),_('Either there is no Employee defined, or no User attached with it.'))
+            raise osv.except_osv(_('Warning !'),_('No user related to the selected employee.'))
         self.write(cr, uid, ids, vals)
-
-        vals= {
-               'name':record.name,
-               'date_from':record.date_from,
-               'date_to':record.date_to,
-               'calendar_id':record.employee_id.calendar_id.id,
-               'company_id':record.employee_id.company_id.id,
-               'resource_id':record.employee_id.resource_id.id
-             }
-        self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
+        for record in self.browse(cr, uid, ids):
+            if record.type=='remove':
+                vals= {
+                       'name':record.name,
+                       'date_from':record.date_from,
+                       'date_to':record.date_to,
+                       'calendar_id':record.employee_id.calendar_id.id,
+                       'company_id':record.employee_id.company_id.id,
+                       'resource_id':record.employee_id.resource_id.id
+                     }
+                self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
         return True
 
     def holidays_confirm(self, cr, uid, ids, *args):
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 18ef1833ffa..6c1c834bf7c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -10,11 +10,10 @@
                     <group col='8' colspan='4'>
                         <filter icon="terp-hr" domain="[('state','=','draft')]" string="To Confirm"/>
                         <filter icon="terp-hr" domain="[('state','=','confirm')]" string="To Validate"/>
+                        <filter icon="terp-hr" domain="[('state','=','validate')]" string="Validated"
+                            default="context.get('report', False)"/>
                         <separator orientation="vertical"/> 
-                        <filter icon="terp-hr" domain="[('type','=','remove')]" string="Leaves"/>
-                        <filter icon="terp-hr" domain="[('type','=','add')]" string="Allocations"/>
-                        <separator orientation="vertical"/> 
-                        <filter icon="terp-hr" help="My Leaves" domain="[('user_id','=',uid)]" string="My Leaves"/>  
+                        <filter icon="terp-hr" help="My Leaves" domain="[('user_id','=',uid)]" string="My Leaves" default="1"/>
                         <separator orientation="vertical"/> 
                         <field name="user_id" widget="selection" />
                         <field name="department_id" widget="selection">
@@ -22,12 +21,17 @@
                                 domain="[('department_id.manager_id','=',uid)]"
                                 />
                         </field>
-                        <field name="holiday_status_id"/>
+                        <field name="holiday_status_id" widget="selection"/>
                     </group>
                     <newline />
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/>
+                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/> 
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Type" icon="terp-sale" domain="[]" context="{'group_by':'holiday_status_id'}"
+                            default="context.get('report', False)"/>
                     </group>
                 </search>
             </field>
@@ -41,14 +45,16 @@
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Leave Request">
-                    <field name="name" select="1"/>
-                    <field name="holiday_status_id" select="1" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
-                    <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                    <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" required="1"/>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="employee_id" select="1" required="1"/>
+                        <field name="holiday_status_id" select="1" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
+                        <field name="date_from" select="1" on_change="onchange_date_from(date_to, date_from)" required="1"/>
+                        <field name="date_to" select="1" on_change="onchange_date_to(date_from, date_to)" required="1"/>
+                        <field name="number_of_days_temp"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="General">
-                            <field name="employee_id" select="1" required="1"/>
-                            <field name="number_of_days_temp"/>
                             <field name="manager_id"/>
                             <field name="department_id"/>
                             <field name="notes" colspan="4"/>
@@ -132,6 +138,27 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_holiday_simple">
+            <field name="name">hr.holidays.reprot_tree</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">tree</field>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <tree string="Holidays Report">
+                    <field name="employee_id" invisible="1"/>
+                    <field name="department_id" invisible="1"/>
+                    <field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
+                    <field name="date_from" invisible="1"/>
+                    <field name="date_to" invisible="1"/>
+                    <field name="name" invisible="1"/>
+                    <field name="holiday_status_id" invisible="1"/>
+                    <field name="type" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+
         <record model="ir.ui.view" id="view_holiday">
             <field name="name">hr.holidays.tree</field>
             <field name="model">hr.holidays</field>
@@ -159,8 +186,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="My Leaves" >
-                	<field name="employee_id"/>
-                	<field name="user_id"/>
+                    <field name="employee_id"/>
+                    <field name="user_id"/>
                     <field name="holiday_status"/>
                     <field name="max_leaves"/>
                     <field name="leaves_taken" />
@@ -176,7 +203,7 @@
             id="menu_open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
-            <field name="name">Leave Request(s)</field>
+            <field name="name">Leave Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
@@ -206,7 +233,7 @@
             action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="open_allocation_holidays">
-        	<field name="name">Allocation Request(s)</field>
+            <field name="name">Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="context">{'type':'add'}</field>
@@ -214,7 +241,7 @@
             <field name="view_id" ref="allocation_leave_new" />
         </record>
 
-	<record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
+    <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="view_holiday"/>
@@ -239,12 +266,12 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="allocation_company_new" />
-            <field name="context">{'allocation_type':'company'}</field>
+            <field name="view_id" eval="view_holiday_simple" />
+            <field name="context">{'allocation_type':'company', 'report':True}</field>
         </record>
 
         <menuitem
-            name="Leaves Management"
+            name="Leaves Summary"
             parent="menu_open_ask_holidays"
             id="menu_open_company_allocation"
             action="open_company_allocation"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 46400fa3da0..0d9fa7ec72d 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -43,10 +43,10 @@
                 <field name="partner_phone"/>
                 <field name="job_id"/>
                 <field name="stage_id"/>
-                <field name="survey" invisible="1"/>
-                <field name="response" invisible="1"/>
                 <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
                 <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
+                <field name="survey" invisible="1"/>
+                <field name="response" invisible="1"/>
                 <field name="priority"/>
                 <field name="type_id" invisible="1"/>
                 <field name="availability" invisible="1"/>

From 8ccb3ca7ca79f00ebf595f4924121dd78680e1cb Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 7 Apr 2010 16:38:20 +0530
Subject: [PATCH 238/248] [IMP] crm, project_issue: open/close days should
 calculated base on resource calendar

bzr revid: hmo@tinyerp.com-20100407110820-sxiayfzd4robc2zl
---
 addons/crm/crm_lead.py                | 58 +++++++++++---------
 addons/crm/crm_lead_view.xml          |  1 +
 addons/crm/crm_opportunity.py         | 57 ++++++++++++--------
 addons/crm/crm_view.xml               |  1 +
 addons/project_issue/project_issue.py | 77 +++++++++++++++------------
 5 files changed, 114 insertions(+), 80 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 442471fa7b7..9b034890fed 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -24,7 +24,7 @@ from datetime import datetime, timedelta
 import crm
 import math
 import time
-from mx import DateTime
+import mx.DateTime
 from tools.translate import _
 
 class crm_lead(osv.osv):
@@ -44,15 +44,9 @@ class crm_lead(osv.osv):
         @param *args: Give Tuple Value
         """
 
-        cases = self.browse(cr, uid, ids)
-        for case in cases:
-            data = {'state': 'open', 'active': True}
-            if not case.user_id:
-                data['user_id'] = uid
-            data.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
-            self.write(cr, uid, ids, data)
-        self._action(cr, uid, cases, 'open')
-        return True
+        res = super(crm_lead, self).case_open(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
 
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
@@ -61,36 +55,52 @@ class crm_lead(osv.osv):
         @param ids: List of Openday’s IDs
         @return: difference between current date and log date
         @param context: A standard dictionary for contextual values
-        """
-        log_obj = self.pool.get('crm.case.log')
-        model_obj = self.pool.get('ir.model')
-        cal_obj = self.pool.get('resource.calendar')
-
-        model_ids = model_obj.search(cr, uid, [('model', '=', self._name)])
-        model_id = False
-        if len(model_ids):
-            model_id = model_ids[0]
+        """        
+        cal_obj = self.pool.get('resource.calendar') 
+        res_obj = self.pool.get('resource.resource')     
 
         res = {}
         for lead in self.browse(cr, uid, ids , context):
             for field in fields:
                 res[lead.id] = {}
                 duration = 0
+                ans = False
                 if field == 'day_open':
                     if lead.date_open:
                         date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
                         date_open = datetime.strptime(lead.date_open, "%Y-%m-%d %H:%M:%S")
-
                         ans = date_open - date_create
-                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
-
+                        date_until = lead.date_open
                 elif field == 'day_close':
                     if lead.date_closed:
                         date_create = datetime.strptime(lead.create_date, "%Y-%m-%d %H:%M:%S")
                         date_close = datetime.strptime(lead.date_closed, "%Y-%m-%d %H:%M:%S")
-
+                        date_until = lead.date_closed
                         ans = date_close - date_create
-                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                if ans:
+                    resource_id = False
+                    if lead.user_id:
+                        resource_ids = res_obj.search(cr, uid, [('user_id','=',lead.user_id.id)])
+                        resource_id = len(resource_ids) or resource_ids[0]
+
+                    duration = float(ans.days)
+                    if lead.section_id.resource_calendar_id:
+                        duration =  float(ans.days) * 24                        
+                        new_dates = cal_obj.interval_get(cr,
+                            uid,
+                            lead.section_id.resource_calendar_id and lead.section_id.resource_calendar_id.id or False,
+                            mx.DateTime.strptime(lead.create_date, '%Y-%m-%d %H:%M:%S'),
+                            duration,
+                            resource=resource_id
+                        )
+                        no_days = []
+                        date_until = mx.DateTime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
+                        for in_time, out_time in new_dates:
+                            if in_time.date not in no_days:
+                                no_days.append(in_time.date)                            
+                            if out_time > date_until:
+                                break                            
+                        duration =  len(no_days)
                 res[lead.id][field] = abs(int(duration))
         return res
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dd8373538ba..8ecebf27ec8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -140,6 +140,7 @@
                         <field name="create_date"/>
                         <field name="write_date"/>
                         <field name="date_closed"/>
+                        <field name="date_open"/>
                     </group>
                     <group colspan="2" col="2">
                         <separator string="Statistics" colspan="2" col="2"/>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 7d15f5968f5..7150abc9de6 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -24,6 +24,7 @@ from osv import fields,osv,orm
 from tools.translate import _
 import crm
 import time
+import mx.DateTime
 
 AVAILABLE_STATES = [
     ('draft','New'),
@@ -50,15 +51,9 @@ class crm_opportunity(osv.osv):
         @param *args: Give Tuple Value
         """
 
-        cases = self.browse(cr, uid, ids)
-        for case in cases:
-            data = {'state': 'open', 'active': True}
-            if not case.user_id:
-                data['user_id'] = uid
-            data.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
-            self.write(cr, uid, ids, data)
-        self._action(cr, uid, cases, 'open')
-        return True
+        res = super(crm_opportunity, self).case_open(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
 
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
@@ -67,36 +62,52 @@ class crm_opportunity(osv.osv):
         @param ids: List of Openday’s IDs
         @return: difference between current date and log date
         @param context: A standard dictionary for contextual values
-        """
-        log_obj = self.pool.get('crm.case.log')
-        model_obj = self.pool.get('ir.model')
-        cal_obj = self.pool.get('resource.calendar')
-
-        model_ids = model_obj.search(cr, uid, [('model', '=', self._name)])
-        model_id = False
-        if len(model_ids):
-            model_id = model_ids[0]
+        """        
+        cal_obj = self.pool.get('resource.calendar') 
+        res_obj = self.pool.get('resource.resource')     
 
         res = {}
         for opportunity in self.browse(cr, uid, ids , context):
             for field in fields:
                 res[opportunity.id] = {}
                 duration = 0
+                ans = False
                 if field == 'day_open':
                     if opportunity.date_open:
                         date_create = datetime.strptime(opportunity.create_date, "%Y-%m-%d %H:%M:%S")
                         date_open = datetime.strptime(opportunity.date_open, "%Y-%m-%d %H:%M:%S")
-
                         ans = date_open - date_create
-                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
-
+                        date_until = opportunity.date_open
                 elif field == 'day_close':
                     if opportunity.date_closed:
                         date_create = datetime.strptime(opportunity.create_date, "%Y-%m-%d %H:%M:%S")
                         date_close = datetime.strptime(opportunity.date_closed, "%Y-%m-%d %H:%M:%S")
-
+                        date_until = opportunity.date_closed
                         ans = date_close - date_create
-                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                if ans:
+                    resource_id = False
+                    if opportunity.user_id:
+                        resource_ids = res_obj.search(cr, uid, [('user_id','=',opportunity.user_id.id)])
+                        resource_id = len(resource_ids) or resource_ids[0]
+
+                    duration = float(ans.days)
+                    if opportunity.section_id.resource_calendar_id:
+                        duration =  float(ans.days) * 24                        
+                        new_dates = cal_obj.interval_get(cr,
+                            uid,
+                            opportunity.section_id.resource_calendar_id and opportunity.section_id.resource_calendar_id.id or False,
+                            mx.DateTime.strptime(opportunity.create_date, '%Y-%m-%d %H:%M:%S'),
+                            duration,
+                            resource=resource_id
+                        )
+                        no_days = []
+                        date_until = mx.DateTime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
+                        for in_time, out_time in new_dates:
+                            if in_time.date not in no_days:
+                                no_days.append(in_time.date)                            
+                            if out_time > date_until:
+                                break                            
+                        duration =  len(no_days)
                 res[opportunity.id][field] = abs(int(duration))
         return res
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index f0a44c56c8c..b1e5e0d145c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -20,6 +20,7 @@
                             <field name="parent_id" select="2" widget="selection"/>
                             <field name="allow_unlink" select="2"/>
                             <field name="reply_to" select="2"/>
+                            <field name="resource_calendar_id" select="2"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f566e357dfd..1fb1c353bab 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -26,6 +26,7 @@ import time
 import time
 import tools
 from crm import crm
+import mx.DateTime
 from datetime import datetime, timedelta
 from osv import fields,osv,orm
 from osv.orm import except_orm
@@ -46,15 +47,9 @@ class project_issue(osv.osv):
         @param *args: Give Tuple Value
         """
 
-        cases = self.browse(cr, uid, ids)
-        for case in cases:
-            data = {'state': 'open', 'active': True}
-            if not case.user_id:
-                data['user_id'] = uid
-            data.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
-            self.write(cr, uid, ids, data)
-        self._action(cr, uid, cases, 'open')
-        return True
+        res = super(project_issue, self).case_open(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
 
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
@@ -63,37 +58,53 @@ class project_issue(osv.osv):
         @param ids: List of Openday’s IDs
         @return: difference between current date and log date
         @param context: A standard dictionary for contextual values
-        """
-        log_obj = self.pool.get('crm.case.log')
-        model_obj = self.pool.get('ir.model')
-        cal_obj = self.pool.get('resource.calendar')
-
-        model_ids = model_obj.search(cr, uid, [('model', '=', self._name)])
-        model_id = False
-        if len(model_ids):
-            model_id = model_ids[0]
+        """        
+        cal_obj = self.pool.get('resource.calendar') 
+        res_obj = self.pool.get('resource.resource')     
 
         res = {}
-        for project in self.browse(cr, uid, ids , context):
+        for issue in self.browse(cr, uid, ids , context):
             for field in fields:
-                res[project.id] = {}
+                res[issue.id] = {}
                 duration = 0
+                ans = False
                 if field == 'day_open':
-                    if project.date_open:
-                        date_create = datetime.strptime(project.create_date, "%Y-%m-%d %H:%M:%S")
-                        date_open = datetime.strptime(project.date_open, "%Y-%m-%d %H:%M:%S")
-
+                    if issue.date_open:
+                        date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_open = datetime.strptime(issue.date_open, "%Y-%m-%d %H:%M:%S")
                         ans = date_open - date_create
-                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
-
+                        date_until = issue.date_open
                 elif field == 'day_close':
-                    if project.date_closed:
-                        date_create = datetime.strptime(project.create_date, "%Y-%m-%d %H:%M:%S")
-                        date_close = datetime.strptime(project.date_closed, "%Y-%m-%d %H:%M:%S")
-
+                    if issue.date_closed:
+                        date_create = datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
+                        date_close = datetime.strptime(issue.date_closed, "%Y-%m-%d %H:%M:%S")
+                        date_until = issue.date_closed
                         ans = date_close - date_create
-                        duration =  float(ans.days) + (float(ans.seconds) / 86400)
-                res[project.id][field] = abs(int(duration))
+                if ans:
+                    resource_id = False
+                    if issue.user_id:
+                        resource_ids = res_obj.search(cr, uid, [('user_id','=',issue.user_id.id)])
+                        resource_id = len(resource_ids) or resource_ids[0]
+
+                    duration = float(ans.days)
+                    if issue.section_id.resource_calendar_id:
+                        duration =  float(ans.days) * 24                        
+                        new_dates = cal_obj.interval_get(cr,
+                            uid,
+                            issue.section_id.resource_calendar_id and issue.section_id.resource_calendar_id.id or False,
+                            mx.DateTime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
+                            duration,
+                            resource=resource_id
+                        )
+                        no_days = []
+                        date_until = mx.DateTime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
+                        for in_time, out_time in new_dates:
+                            if in_time.date not in no_days:
+                                no_days.append(in_time.date)                            
+                            if out_time > date_until:
+                                break                            
+                        duration =  len(no_days)
+                res[issue.id][field] = abs(int(duration))
         return res
 
     _columns = {
@@ -116,7 +127,7 @@ class project_issue(osv.osv):
                                 method=True, multi='day_open', type="integer", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 method=True, multi='day_close', type="integer", store=True),
-       'assigned_to' : fields.many2one('res.users', 'Assigned to'),
+        'assigned_to' : fields.many2one('res.users', 'Assigned to'),
         'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
         'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
                                                 domain="[('partner_id', '=', partner_id)]",

From 1cad6127507dd353e1d96a9a50d2b1159296fd67 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 7 Apr 2010 16:46:38 +0530
Subject: [PATCH 239/248] [Fix] auction,mrp_repair: Add the missing view files

bzr revid: sbh@tinyerp.com-20100407111638-q0dips37ncfzjddd
---
 .../auction/wizard/auction_lots_able_view.xml | 30 +++++++++++++
 .../wizard/auction_lots_auction_move_view.xml | 32 ++++++++++++++
 .../wizard/auction_lots_enable_view.xml       | 34 +++++++++++++++
 .../auction_lots_make_invoice_buyer_view.xml  | 36 ++++++++++++++++
 .../wizard/auction_lots_make_invoice_view.xml | 33 ++++++++++++++
 .../wizard/auction_lots_sms_send_view.xml     | 35 +++++++++++++++
 .../auction/wizard/auction_pay_buy_view.xml   | 37 ++++++++++++++++
 .../auction/wizard/auction_pay_sel_view.xml   | 35 +++++++++++++++
 .../auction/wizard/auction_payer_sel_view.xml | 43 +++++++++++++++++++
 addons/auction/wizard/auction_taken_view.xml  | 42 ++++++++++++++++++
 .../wizard/mrp_repair_cancel_view.xml         | 36 ++++++++++++++++
 .../wizard/mrp_repair_make_invoice_view.xml   | 35 +++++++++++++++
 12 files changed, 428 insertions(+)
 create mode 100644 addons/auction/wizard/auction_lots_able_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_auction_move_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_enable_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_make_invoice_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_sms_send_view.xml
 create mode 100644 addons/auction/wizard/auction_pay_buy_view.xml
 create mode 100644 addons/auction/wizard/auction_pay_sel_view.xml
 create mode 100644 addons/auction/wizard/auction_payer_sel_view.xml
 create mode 100644 addons/auction/wizard/auction_taken_view.xml
 create mode 100644 addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
 create mode 100644 addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml

diff --git a/addons/auction/wizard/auction_lots_able_view.xml b/addons/auction/wizard/auction_lots_able_view.xml
new file mode 100644
index 00000000000..96135460c72
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_able_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_able" model="ir.ui.view">
+            <field name="name">auction.lots.able.form</field>
+            <field name="model">auction.lots.able</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm">
+                	<group colspan="4" >
+                		 <separator string="Confirmation set taken away" colspan="4"/>
+              			 <newline/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-goto-last" string="Able Taken away" name="confirm_able" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+        <act_window name="Mark as taken away"		    
+		    res_model="auction.lots.able"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_able"/>       
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_auction_move_view.xml b/addons/auction/wizard/auction_lots_auction_move_view.xml
new file mode 100644
index 00000000000..dd116a8bc6c
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_auction_move_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_auction_move" model="ir.ui.view">
+            <field name="name">auction.lots.auction.move.form</field>
+            <field name="model">auction.lots.auction.move</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Change Auction Date">
+                	<group colspan="4" >
+                		 <label string="Warning, this will erase the object adjudication price and its buyer !" colspan="2"/>
+              			 <newline/>
+              			 <field name="auction_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-redo" string="Move to Auction date" name="auction_move_set" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <act_window name="Change Auction Date"		    
+		    res_model="auction.lots.auction.move"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_auction_move"/>    
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_enable_view.xml b/addons/auction/wizard/auction_lots_enable_view.xml
new file mode 100644
index 00000000000..8384524dad2
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_enable_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_enable" model="ir.ui.view">
+            <field name="name">auction.lots.enable.form</field>
+            <field name="model">auction.lots.enable</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm">
+                	<group colspan="4" >
+                		 <separator string="Confirmation enable taken away" colspan="4"/>
+              			 <newline/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-goto-last"  string="Enable Taken away" name="confirm_enable" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		
+        <act_window name="Unmark as taken away"		    
+		    res_model="auction.lots.enable"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_enable"/>    
+		      		
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
new file mode 100644
index 00000000000..ba4aac79ca6
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_make_invoice_buyer" model="ir.ui.view">
+            <field name="name">auction.lots.make.invoice.buyer.form</field>
+            <field name="model">auction.lots.make.invoice.buyer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="objects"/>
+                		 <field name="number"/>
+                		 <label string="(Keep empty for automatic number)" colspan="2"/>
+                		 <field name="buyer_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="makeInvoices" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+       <act_window name="Invoice Buyer objects"		    
+		    res_model="auction.lots.make.invoice.buyer"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_make_invoice_buyer"/>    
+		      		        
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
new file mode 100644
index 00000000000..29ef3e09348
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_make_invoice" model="ir.ui.view">
+            <field name="name">auction.lots.make.invoice.form</field>
+            <field name="model">auction.lots.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="objects"/>
+                		 <field name="number" colspan="3"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="makeInvoices" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+       <act_window name="Invoice Seller objects"		    
+		    res_model="auction.lots.make.invoice"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_make_invoice"/>            
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_sms_send_view.xml b/addons/auction/wizard/auction_lots_sms_send_view.xml
new file mode 100644
index 00000000000..22aa9d681ac
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_sms_send_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_sms_send" model="ir.ui.view">
+            <field name="name">auction.lots.sms.send.form</field>
+            <field name="model">auction.lots.sms.send</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="SMS - Gateway: clickatell','Bulk SMS send">
+                	<group colspan="4" >
+                		 <separator string="SMS - Gateway: clickatell','Bulk SMS send" colspan="4"/>
+                		 <field name="app_id"/>
+                		 <newline/>
+                		 <field name="user"/>
+                		 <field name="password"/>
+                		 <newline/>
+                		 <field name="text" colspan="3"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-go-back" string="Send SMS" name="sms_send" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+       <act_window name="SMS Send"		    
+		    res_model="auction.lots.sms.send"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_lots_sms_send"/>  
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
new file mode 100644
index 00000000000..0a9a3a6dcee
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_buy_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_pay_buy" model="ir.ui.view">
+            <field name="name">auction.pay.buy.form</field>
+            <field name="model">auction.pay.buy</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pay objects">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="statement_id1" domain="[('state','=','draft')]"/>
+                		 <field name="amount2"/>
+                		 <field name="statement_id2"  domain="[('state','=','draft')]"/>
+                		 <field name="amount3"/>
+                		 <field name="statement_id3"  domain="[('state','=','draft')]"/>
+                		 <newline/>
+                		 <field name="buyer_id"/>
+                		 <field name="total"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-yes"  string="Pay" name="pay_and_reconcile" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+       <act_window name="Pay objects of the buyer"		    
+		    res_model="auction.pay.buy"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_pay_buy"/>   
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_pay_sel_view.xml b/addons/auction/wizard/auction_pay_sel_view.xml
new file mode 100644
index 00000000000..2570b7a7a0a
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_sel_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_pay_sel" model="ir.ui.view">
+            <field name="name">auction.pay.sel.form</field>
+            <field name="model">auction.pay.sel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pay invoice">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="dest_account_id"/>
+                		 <field name="journal_id"/>
+                		 <field name="period_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-yes" string="Pay" name="pay_and_reconcile" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="action_auction_pay_sel" model="ir.actions.act_window">
+            <field name="name">Pay objects of the seller</field>
+            <field name="res_model">auction.pay.sel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_pay_sel"/> 
+           <field name="target">new</field>
+  		</record>
+
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_payer_sel_view.xml b/addons/auction/wizard/auction_payer_sel_view.xml
new file mode 100644
index 00000000000..57c43df8fe4
--- /dev/null
+++ b/addons/auction/wizard/auction_payer_sel_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_payer" model="ir.ui.view">
+            <field name="name">auction.payer.form</field>
+            <field name="model">auction.payer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Check payment for buyer">
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="2">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon = "gtk-yes"  string="Pay"   name="payer" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="view_auction_payer_sel" model="ir.ui.view">
+            <field name="name">auction.payer.sel.form</field>
+            <field name="model">auction.payer.sel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Check payment for seller">
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-yes" string="Pay" name="payer_sel" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+       <act_window name="Mark as paid for seller"		    
+		    res_model="auction.payer.sel"
+		    src_model="auction.lots"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_auction_payer_sel"/>          
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_taken_view.xml b/addons/auction/wizard/auction_taken_view.xml
new file mode 100644
index 00000000000..626caa473ad
--- /dev/null
+++ b/addons/auction/wizard/auction_taken_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_taken" model="ir.ui.view">
+            <field name="name">auction.taken.form</field>
+            <field name="model">auction.taken</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Mark Lots"> 
+                	<group colspan="4" >
+                		 <label string="Select lots which are Sold" colspan="4"/>
+                		 <field name="lot_ids" nolabel="1" colspan="4" domain="[('state','=','sold')]"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-ok"  string="OK"  name="process" type="object" />
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_taken" model="ir.actions.act_window">
+            <field name="name">Gestion emporte</field>
+            <field name="res_model">auction.taken</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_taken"/> 
+           <field name="target">new</field>
+        </record>
+        
+        <!-- <menuitem name="Tools Bar Codes"
+		id="auction_outils_menu"
+		parent="auction_menu_root" sequence="5"
+		/>
+        <menuitem name="Deliveries Management"
+		action="action_auction_taken"
+		id="menu_wizard_emporte"
+		parent="auction_outils_menu"
+		/> -->
+        
+    </data>
+</openerp>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
new file mode 100644
index 00000000000..4af2a3394b0
--- /dev/null
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Cancel Repair -->
+        
+		<record id="view_cancel_repair" model="ir.ui.view">
+            <field name="name">Cancel Repair</field>
+            <field name="model">mrp.repair.cancel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Cancel Repair Order">
+				    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?" colspan="4"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="No" />
+                		<button name="cancel_repair" string="Yes"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>         
+
+        <record id="action_cancel_repair" model="ir.actions.act_window">
+            <field name="name">Cancel Repair Order</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair.cancel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record> 
+ 		
+        
+	</data>
+</openerp>	
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
new file mode 100644
index 00000000000..f914d198d06
--- /dev/null
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Make Invoice -->
+        
+		<record id="view_make_invoice" model="ir.ui.view">
+            <field name="name">Make Invoice</field>
+            <field name="model">mrp.repair.make_invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create invoices">
+				    <separator colspan="4" string="Do you really want to create the invoices ?" />  
+				    <field name="group"/>
+				    <newline/>  
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="make_invoices" string="Create Invoice"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <act_window name="Make Invoice"		    
+		    res_model="mrp.repair.make_invoice"
+		    src_model="mrp.repair"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="act_mrp_repair_invoice"/>        
+        
+	</data>
+</openerp>	

From c51fc012869693c23bdd905dd74c8527e7b12386 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 7 Apr 2010 14:23:31 +0200
Subject: [PATCH 240/248] [IMP] HR misc

bzr revid: fp@tinyerp.com-20100407122331-9qu8o6n1yz6bvex1
---
 addons/hr/hr_view.xml                         |  2 +-
 addons/hr_expense/hr_expense_view.xml         |  1 -
 addons/hr_holidays/hr_holidays_report.xml     | 96 ++++---------------
 .../hr_holidays/report/available_holidays.py  | 33 -------
 addons/hr_recruitment/hr_recruitment_view.xml | 22 ++---
 5 files changed, 29 insertions(+), 125 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 057d049af9c..69ce433e0af 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -332,7 +332,7 @@
                             <field name="requirements" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Employee">
-                            <field name="employee_ids" colspan='4' nolabel="1"  mode="tree,form"/>
+                            <field name="employee_ids" colspan='4' nolabel="1" widget="many2many"/>
                         </page>
                     </notebook>
                     <field name="state"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 49a7d83d239..95d6ce77ae3 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -67,7 +67,6 @@
             <field name="arch" type="xml">
                 <form string="Expenses Sheet">
                     <group colspan="4" col="6">
-                        <field name="employee_id" select="1"/>
                         <field name="name" select="1"/>
                         <field name="employee_id" select="1"/>
                         <field name="ref" select="2"/>
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
index 66669bd2f51..165b54c72f0 100644
--- a/addons/hr_holidays/hr_holidays_report.xml
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -1,85 +1,23 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<report id="report_holidays_summary"
-				string="Summary Of Leaves"
-				model="hr.holidays"
-				name="holidays.summary"
-				xsl="hr_holidays/report/holidays_summary.xsl"
-				auto="False"
-				menu="False"/>
+    <data>
+        <report id="report_holidays_summary"
+                string="Summary Of Leaves"
+                model="hr.holidays"
+                name="holidays.summary"
+                xsl="hr_holidays/report/holidays_summary.xsl"
+                auto="False"
+                menu="False"/>
+
+        <menuitem
+            name="Leaves Summary"
+            parent="menu_hr_reporting_holidays"
+            id="menu_report_hr_holiday_tree"
+            action="open_company_allocation"
+            groups="hr.group_hr_manager"
+            sequence="40"/>
 
 
-
-
-<!-- available holidays report -->
-
-        <record id="view_report_hr_holiday_tree" model="ir.ui.view">
-            <field name="name">hr.holidays.report.tree</field>
-            <field name="model">hr.holidays.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-               <tree string="Available Holidays">
-                    <field name="employee_id"/>
-                    <field name="holiday_status_id"/>
-                    <field name="remaining_leave"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_report_hr_holiday_form" model="ir.ui.view">
-            <field name="name">hr.holidays.report.form</field>
-            <field name="model">hr.holidays.report</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-               <tree string="Available Holidays">
-                    <field name="employee_id" select="1"/>
-                    <field name="holiday_status_id" select="1"/>
-                    <field name="remaining_leave"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_report_hr_holiday_graph" model="ir.ui.view">
-            <field name="name">hr.holiday.report.graph</field>
-            <field name="model">hr.holidays.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Available Holidays" type="bar">
-                    <field name="holiday_status_id"/>
-                    <field name="remaining_leave" operator="+"/>
-                    <field group="True" name="employee_id"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="action_report_hr_holiday" model="ir.actions.act_window">
-            <field name="name">Available Holidays</field>
-            <field name="res_model">hr.holidays.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="view_id" ref="view_report_hr_holiday_tree"/>
-
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_hr_holiday_tree">
-                <field name="sequence" eval="1"/>
-                <field name="view_mode">tree</field>
-                <field name="view_id" ref="view_report_hr_holiday_tree"/>
-                <field name="act_window_id" ref="action_report_hr_holiday"/>
-            </record>
-
-
-        <record model="ir.actions.act_window.view" id="action_report_hr_holiday_graph">
-                <field name="sequence" eval="2"/>
-                <field name="view_mode">graph</field>
-                <field name="view_id" ref="view_report_hr_holiday_graph"/>
-                <field name="act_window_id" ref="action_report_hr_holiday"/>
-            </record>
-
-
-        <menuitem name="Available Holidays" id="menu_report_hr_holiday_tree" action="action_report_hr_holiday" parent="menu_hr_reporting_holidays"/>
-
-
-	</data>
+    </data>
 </openerp>
 
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index 259aea0dec9..e69de29bb2d 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -1,33 +0,0 @@
-from osv import fields,osv
-import tools
-
-class hr_holidays_report(osv.osv):
-    _name = "hr.holidays.report"
-    _auto = False
-    _columns = {
-        'employee_id': fields.many2one ('hr.employee', 'Employee', readonly=True),
-        'holiday_status_id': fields.many2one('hr.holidays.status', 'Leave Type', readonly=True),
- #       'max_leave': fields.float('Allocated Leaves', readonly=True),
-#        'taken_leaves': fields.float('Taken Leaves', readonly=True),
-        'remaining_leave': fields.float('Remaining Leaves',readonly=True), 
-    }
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'hr_holidays_report')
-        cr.execute("""
-            create or replace view hr_holidays_report as (
-                select
-                    min(h.id) as id,
-                    h.employee_id as employee_id,
-                    h.holiday_status_id as holiday_status_id,
-                    sum(number_of_days) as remaining_leave
-                from
-                    hr_holidays h
-                left join hr_holidays_status s on (s.id = h.holiday_status_id)
-                where h.state = 'validate'
-                and h.employee_id is not null
-                and s.active <> 'f'
-                group by h.holiday_status_id, h.employee_id
-            )""")
-hr_holidays_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 0d9fa7ec72d..83b71c05432 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -79,15 +79,15 @@
                     <button string="Schedule a Phone Call"
                         name="%(wizard_hr_job_reschedule_phone_call)d" icon="gtk-redo" type="action"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action"
-						icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}"/>
+                        icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}"/>
                     <newline/>
                     <field name="partner_name"/>
                     <field name="job_id"/>
                     <field name="department_id" widget="selection"/>
                     <button name="%(wizard_hr_job_meeting_set)d" string="Schedule Meeting" icon="terp-hr" type="action"/>
-					<button name="%(survey.survey_browse_response)d" string="Print Interview" type="action"
-						icon="gtk-print" context="{'survey_id': survey, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
-				</group>
+                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action"
+                        icon="gtk-print" context="{'survey_id': survey, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
+                </group>
                 <notebook colspan="4">
                     <page string="Job Info">
                         <group col="2" colspan="2">
@@ -158,10 +158,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(crm.action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'hr.applicant'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(crm.action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'hr.applicant'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -170,9 +170,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(crm.action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'hr.applicant'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(crm.action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'hr.applicant'}"
+                               icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>

From 5d6a55b2892fca0762fdb46df95eb326ec198b50 Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Wed, 7 Apr 2010 15:15:02 +0200
Subject: [PATCH 241/248] [FIX] Test section in assert block is not needed
 anymore.

bzr revid: jth@openerp.com-20100407131502-09eag4fx9his454i
---
 addons/account/demo/price_accuracy00.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/account/demo/price_accuracy00.yml b/addons/account/demo/price_accuracy00.yml
index 81023395141..a3cfc154ad9 100644
--- a/addons/account/demo/price_accuracy00.yml
+++ b/addons/account/demo/price_accuracy00.yml
@@ -44,7 +44,6 @@
     Then I should see an account entry linked to this invoice.
 -  
     !assert {model: account.invoice, id: invoice1}:
-      test:
         - bool(move_id)
 -  
     # This is not working, find a way to do that in YAML, *qty is not
@@ -53,14 +52,12 @@
     equal to *qty x *price x (1 + *tax)
 -  
     !assert {model: account.invoice, id: invoice1}:
-        test:
-            - abs(sum(x.credit for x in move_id.line_id) - 163.97) < 0.000001
+        - abs(sum(x.credit for x in move_id.line_id) - 163.97) < 0.000001
 -  
     And this account entry must have a credit equals to the debit
 -  
     !assert {model: account.invoice, id: invoice1}:
-        test:
-            - abs(sum(x.credit - x.debit for x in move_id.line_id)) < 0.000001
+        - abs(sum(x.credit - x.debit for x in move_id.line_id)) < 0.000001
 -  
     Then, I change the precision of numbers to 3 digits.
 -  
@@ -80,8 +77,7 @@
     Then this account entry must have a credit equals to the debit
 -  
     !assert {model: account.invoice, id: invoice2}:
-        test:
-            - abs(sum(x.credit - x.debit for x in move_id.line_id)) < 0.000001
+        - abs(sum(x.credit - x.debit for x in move_id.line_id)) < 0.000001
 -
     And this account entry must have a credit equals to 163.968€ which is
     equal to *qty x *price x (1 + *tax)

From 2f0e7a5ca8e2c9a055ad1bf42d83e01d4fe4d6d7 Mon Sep 17 00:00:00 2001
From: "RGA(OpenERP)" <>
Date: Wed, 7 Apr 2010 19:42:20 +0530
Subject: [PATCH 242/248] Improved search view by removing default values and
 shift it on actions

bzr revid: hda@tinyerp.com-20100407141220-enqywrvyecd2iaa3
---
 .../report/account_invoice_report_view.xml    | 63 ++++++++++---------
 addons/crm/crm_claims_menu.xml                |  1 +
 addons/crm/crm_claims_view.xml                | 14 ++---
 addons/crm/crm_fund_menu.xml                  |  1 +
 addons/crm/crm_fund_view.xml                  | 12 ++--
 addons/crm/crm_helpdesk_menu.xml              |  1 +
 addons/crm/crm_helpdesk_view.xml              |  9 +--
 addons/crm/crm_lead_menu.xml                  |  2 +
 addons/crm/crm_lead_view.xml                  |  7 +--
 addons/crm/crm_meeting_menu.xml               |  1 +
 addons/crm/crm_meeting_view.xml               |  7 +--
 addons/crm/crm_opportunity_menu.xml           |  1 +
 addons/crm/crm_opportunity_view.xml           |  8 +--
 addons/crm/crm_phonecall_menu.xml             |  3 +-
 addons/crm/crm_phonecall_view.xml             |  9 ++-
 addons/crm/crm_report_view.xml                |  1 -
 addons/crm/crm_view.xml                       |  6 +-
 addons/crm/report/crm_claim_report_view.xml   |  1 +
 .../report/crm_fundraising_report_view.xml    |  1 +
 .../crm/report/crm_helpdesk_report_view.xml   |  9 ++-
 addons/crm/report/crm_lead_report_view.xml    |  1 +
 .../report/crm_opportunity_report_view.xml    |  1 +
 .../crm/report/crm_phonecall_report_view.xml  |  1 +
 addons/crm/report/crm_report_view.xml         |  8 +--
 addons/hr_evaluation/hr_evaluation_view.xml   |  8 +--
 .../report/hr_evaluation_report_view.xml      |  2 +
 addons/hr_expense/hr_expense_view.xml         |  8 +--
 .../report/hr_expense_report_view.xml         | 11 ++--
 addons/hr_recruitment/hr_recruitment_menu.xml |  1 +
 addons/hr_recruitment/hr_recruitment_view.xml | 10 +--
 .../report/hr_recruitment_report_view.xml     |  4 +-
 addons/mrp/mrp_view.xml                       |  7 ++-
 .../mrp/report/mrp_production_order_view.xml  |  5 +-
 addons/project/project_view.xml               | 15 +++--
 addons/project/report/project_report_view.xml | 27 ++++----
 addons/project_issue/project_issue_menu.xml   |  5 +-
 addons/project_issue/project_issue_view.xml   | 20 +++---
 .../project_long_term_view.xml                |  5 +-
 .../report/task_report_view.xml               | 10 +--
 .../purchase/report/purchase_report_view.xml  | 17 +++--
 addons/resource/resource_view.xml             |  5 +-
 addons/sale/report/sale_report_view.xml       | 25 ++++----
 addons/sale/sale_view.xml                     | 12 ++--
 addons/scrum/scrum_view.xml                   | 16 ++---
 .../report/report_stock_picking_view.xml      | 11 ++--
 addons/stock/report/report_stock_view.xml     |  6 +-
 addons/stock/stock_view.xml                   | 23 +++----
 addons/survey/survey_view.xml                 |  4 +-
 48 files changed, 224 insertions(+), 201 deletions(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 47b6ebf3110..2f2c7239454 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -43,36 +43,37 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Invoices">
-                <filter icon="terp-account"
-                    string="This Year"
-                    domain="[('year','=',time.strftime('%%Y'))]"
-                    help="Invoices of the year"/>
-                <filter icon="terp-account"
-                    string="This Month"
-                    domain="[('month','=',time.strftime('%%m'))]"
-                    help="Invoices of this month"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-account"
-                    string="Draft"
-                    domain="[('state','=','draft')]"/>
-                <filter icon="terp-account"
-                    string="Invoices"
-                    domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
-                <filter icon="terp-account"
-                    string="Paid"
-                    domain="[('state','=','paid')]"/>
-                <separator orientation="vertical"/>
-                <field name="product_id"/>
-                <field name="user_id" widget="selection">
-                    <filter icon="terp-account"
-                        string="My Invoices"
-                        domain="[('user_id','=',uid)]"/>
-                </field>
-                <field name="partner_id"/>
-                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-
+            	<group>
+	                <filter icon="terp-account"
+	                    string="This Year"
+	                    domain="[('year','=',time.strftime('%%Y'))]"
+	                    help="Invoices of the year"/>
+	                <filter icon="terp-account"
+	                    string="This Month"
+	                    domain="[('month','=',time.strftime('%%m'))]"
+	                    help="Invoices of this month"/>
+	                <separator orientation="vertical"/>
+	                <filter icon="terp-account"
+	                    string="Draft"
+	                    domain="[('state','=','draft')]"/>
+	                <filter icon="terp-account"
+	                    string="Invoices"
+	                    domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+	                <filter icon="terp-account"
+	                    string="Paid"
+	                    domain="[('state','=','paid')]"/>
+	                <separator orientation="vertical"/>
+	                <field name="product_id"/>
+	                <field name="user_id" widget="selection">
+	                    <filter icon="terp-account"
+	                        string="My Invoices"
+	                        domain="[('user_id','=',uid)]"/>
+	                </field>
+	                <field name="partner_id"/>
+	                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
                 <newline/>
-                <group expand="1" string="Extended options..." colspan="10" col="12">
+                <group expand="1" string="Extended options..." >
                     <filter icon="terp-account"
                         string="Customer Invoices"
                         domain="[('type','=','out_invoice')]"
@@ -89,9 +90,9 @@
                         domain="[('type','=','in_refund')]"/>
                 </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By..." >
                     <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}"/>
-                    <filter string="Salesman" icon="terp-account" context="{'group_by':'user_id'}" default="1"/>
+                    <filter string="Salesman" icon="terp-account" context="{'group_by':'user_id'}" />
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
                     <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm/crm_claims_menu.xml
index 1eac8e007a3..f235c9ae637 100755
--- a/addons/crm/crm_claims_menu.xml
+++ b/addons/crm/crm_claims_menu.xml
@@ -13,6 +13,7 @@
 	        <field name="view_type">form</field>
 	        <field name="view_mode">tree,calendar,form,graph</field>
 	        <field name="view_id" ref="crm_case_claims_tree_view"/>
+            <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>	        
 	        <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
 	    </record>
 
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index f791a1b86cc..08c0bd9b528 100755
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -161,7 +161,7 @@
                             <separator string="Action Information" colspan="4"/>
                             <field name="name" colspan="4"/>
                             <field name="date"/>
-                            <field name="user_id"/>                            
+                            <field name="user_id"/>
                         </form>
                     </field>
                 </page>
@@ -245,9 +245,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
-                   <filter icon="gtk-new" string="Current"
+                   <filter icon="gtk-new" string="Current" name="current"
                        domain="[('state','in',('draft', 'open'))]"
-                       separator="1" help="Current Claims" default="1"
+                       separator="1" help="Current Claims"
                    />
                    <filter icon="gtk-execute"
                        string="In Progress"
@@ -263,16 +263,14 @@
                    <field name="name" select='1'/>
                    <field name="partner_id" select="1"/>
                    <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-partner"
-                               domain="[('user_id','=',uid)]" help="My Claims"
-                               default="1" />
+                       <filter icon="terp-partner" name="my_claims"
+                               domain="[('user_id','=',uid)]" help="My Claims"/>
                            <filter icon="terp-partner"
                                domain="[('user_id','=', False)]"
                                help="Unassigned Claims" />
                    </field>
                    <field name="section_id" select="1"
-                       widget="selection"
-                       default="context.get('section_id', False)">
+                       widget="selection">
                        <filter icon="terp-crm"
                            domain="[('section_id','=',context.get('section_id',False))]"
                            help="My section" />
diff --git a/addons/crm/crm_fund_menu.xml b/addons/crm/crm_fund_menu.xml
index babb10f291c..c0994aee5cd 100644
--- a/addons/crm/crm_fund_menu.xml
+++ b/addons/crm/crm_fund_menu.xml
@@ -12,6 +12,7 @@
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm.crm_case_tree_view_fund"/>
+        <field name="context">{"search_default_my_funds":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_fund_filter"/>
     </record>
 
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index ec4f0d49236..536da9b7c77 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -169,7 +169,7 @@
                             <separator string="Action Information" colspan="4"/>
                             <field name="name" colspan="4"/>
                             <field name="date"/>
-                            <field name="user_id"/>                            
+                            <field name="user_id"/>
                         </form>
                     </field>
                 </page>
@@ -181,8 +181,8 @@
                        <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
-                                <field name="email_to"/>                                
-                                <field name="email_from"/> 
+                                <field name="email_to"/>
+                                <field name="email_from"/>
                                 <button
                                      string="Add a CC"
                                                name="%(crm.action_view_crm_email_add_cc_wizard)d"
@@ -252,7 +252,7 @@
                 <search string="Search Funds">
                    <group col='6' colspan='4'>
                        <filter icon="terp-partner" string="My Funds"
-                           default="1" domain="[('user_id','=',uid)]"
+                          name="my_funds" domain="[('user_id','=',uid)]"
                            separator="1"
                            help="Funds Related to Current User"
                            />
@@ -277,9 +277,7 @@
                                domain="[('user_id','=', False)]"
                                help="Unassigned" />
                        </field>
-                       <field name="section_id" select="1"
-                           widget="selection"
-                           default="context.get('section_id', False)">
+                       <field name="section_id" select="1" widget="selection" string="Section">
                            <filter icon="terp-crm"
                                domain="[('section_id','=',context.get('section_id',False))]"
                                help="My section" />
diff --git a/addons/crm/crm_helpdesk_menu.xml b/addons/crm/crm_helpdesk_menu.xml
index bd3f0889bd1..b1a7dfcc428 100644
--- a/addons/crm/crm_helpdesk_menu.xml
+++ b/addons/crm/crm_helpdesk_menu.xml
@@ -11,6 +11,7 @@
         <field name="res_model">crm.helpdesk</field>
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
+        <field name="context">{"search_default_my_hd_request":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_helpdesk_filter"/>
     </record>
 
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 6bb356bacfb..803b306c1bb 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -223,13 +223,10 @@
                 <field name="name" select='1' string="Query"/>
                 <field name="partner_id" />
                 <field name="user_id" select="1" widget="selection">
-                    <filter icon="terp-partner"
-                        domain="[('user_id','=',uid)]"
-                        help="My Helpdesk Requests" default="1" />
+                    <filter icon="terp-partner" name="my_hd_request" 
+                    domain="[('user_id','=',uid)]" help="My Helpdesk Requests"/>
                 </field>
-                <field name="section_id"
-                    default="context.get('section_id', False)" select="1"
-                    widget="selection" string="Section">
+                <field name="section_id" select="1" widget="selection" string="Section">
                     <filter icon="terp-crm"
                         domain="[('section_id','=',context.get('section_id',False))]"
                         help="My section" />
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index c78d25b6738..8e34bca3118 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -7,6 +7,8 @@
         <field name="res_model">crm.lead</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
+        <field name="context">{"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id}</field>
+        <field name="context">{"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 8ecebf27ec8..8fcf34238f2 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -262,9 +262,8 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-                <filter icon="terp-project"
+                <filter icon="terp-project" name="current"
                     string="Current"
-                    default="1"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-project"
                     string="Open"
@@ -289,13 +288,13 @@
                 <field name="user_id" widget="selection">
                     <filter icon="terp-partner"
                         domain="[('user_id','=',uid)]"
-                        help="My Leads" default="1"
+                        help="My Leads" name="my_lead"
                     />
                     <filter icon="terp-partner"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
                 </field>
-                <field name="section_id" default="context.get('section_id', False)" widget="selection"
+                <field name="section_id" widget="selection"
                     context="{'invisible_section': False}">
                     <filter icon="terp-crm"
                         context="{'invisible_section': False}"
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 3f680b61f15..c4baede4ae5 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -85,6 +85,7 @@
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
+        <field name="context">{"search_default_current":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 6d6402b9fdb..9d4888329fb 100755
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -262,14 +262,13 @@
                            <filter icon="terp-crm" string="Current"
                            	domain="[('state','in',('draft', 'open'))]"
                            	default="1" help="Current Meetings" />
-                           <filter icon="terp-crm" string="Confirmed"
-                           	domain="[('state','=','done')]"
-                           	help="Confirmed Meetings" />
+                           <filter icon="terp-crm" name="current" string="Current" 
+                           domain="[('state','in',('draft', 'open'))]" 
+                           help="Current Meetings"/>                           
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
                            <field name="partner_id" select="1" />
                            <field name="section_id"
-                           	default="context.get('section_id', False)"
                            	select="1" widget="selection">
                            	<filter icon="terp-crm"
                            		domain="[('section_id','=',context.get('section_id',False))]"
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 3bcdbc7bb9f..ba01ca72be4 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -27,6 +27,7 @@
           <field name="res_model">crm.opportunity</field>
           <field name="view_mode">tree,form,graph</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
+          <field name="context">{"search_default_my_oprtnit":1,"search_default_new_oprtnit":1,"search_default_section_id":section_id}</field>          
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index f36f11dfe74..e4837e933c9 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -263,7 +263,6 @@
             <search string="Search Opportunities">
                 <filter icon="terp-project"
                     string="Current"
-                    default="1"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-project"
                     string="Open"
@@ -284,16 +283,15 @@
                 <field name="name" string="Opportunity"/>
                 <field name="partner_id"/>
                 <field name="user_id" widget="selection">
-                    <filter icon="terp-partner"
+                    <filter icon="terp-partner" name="my_oprtnit"
                         domain="[('user_id','=',uid)]"
-                        help="My Opportunities" default="1"
-                    />
+                        help="My Opportunities" />
                     <filter icon="terp-partner"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Opportunities" />
                 </field>
                 <field name="section_id"
-                    default="context.get('section_id', False)" select="1"
+                    select="1"
                     widget="selection">
                     <filter icon="terp-crm"
                         domain="[('section_id','=',context.get('section_id',False))]"
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 9f1f2f946fc..9e6678c0834 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -20,6 +20,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="context">{"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
@@ -54,7 +55,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
-        <field name="context">{'set_editable':True,'default_state':'open'}</field>
+        <field name="context">{"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ec773cf78ef..064d3569d03 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -176,16 +176,15 @@
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
                <field name="user_id" widget="selection">
-                   <filter icon="terp-partner"
-                       domain="[('user_id','=',uid)]" help="My Phonecalls"
-                       default="1" />
+                   <filter icon="terp-partner" name="my_calls" 
+                       domain="[('user_id','=',uid)]" 
+                       help="My Phonecalls"/>               
                    <filter icon="terp-partner"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
-                   default="context.get('section_id', False)" select="1"
-                   widget="selection" string="Section">
+                   select="1" widget="selection" string="Section">
                    <filter icon="terp-crm"
                        domain="[('section_id','=',context.get('section_id',False))]"
                        help="My section" />
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 7b8b08dd7c9..4746829da12 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -78,7 +78,6 @@
                    			help="Cases by Section and Type for this month" />
                    		<separator orientation="vertical"/>
                    		<field name="section_id"
-                   			default="context.get('section_id', False)"
                    			select="1" widget="selection" />
                    		<field name="category2_id" select="1"/>
                 		<field name="nbr" select="1"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b1e5e0d145c..babacff497d 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -418,7 +418,7 @@
                     <group col='6' colspan='4'>
                         <filter icon="terp-partner" string="My Cases"
                             domain="[('user_id','=',uid)]" separator="1"
-                            default="1" help="Cases Related to Current User" />
+                            help="Cases Related to Current User" />
                         <field name="state" select="1">
                             <filter icon="gtk-new"
                                 domain="[('state','in',('draft', 'open'))]"
@@ -435,8 +435,7 @@
                             widget="selection" />
                     </group>
                     <field name="section_id"
-                        default="context.get('section_id', False)" select="1"
-                        widget="selection"/>
+                        select="1" widget="selection" string="Section"/>
                 </search>
             </field>
         </record>
@@ -511,7 +510,6 @@
                        <field name="date" select="1"/>
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="section_id"
-                        default="context.get('section_id', False)"
                         select="1" widget="selection"/>
                      </group>
                 </search>
diff --git a/addons/crm/report/crm_claim_report_view.xml b/addons/crm/report/crm_claim_report_view.xml
index a00df8b03a0..465fab740a6 100644
--- a/addons/crm/report/crm_claim_report_view.xml
+++ b/addons/crm/report/crm_claim_report_view.xml
@@ -83,6 +83,7 @@
             <field name="view_type">form</field>
   			<field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_claim_tree"/>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
             <field name="search_view_id" ref="view_report_crm_claim_filter"/>
 
         </record>
diff --git a/addons/crm/report/crm_fundraising_report_view.xml b/addons/crm/report/crm_fundraising_report_view.xml
index 1eeb5871e13..fbc56e6202e 100644
--- a/addons/crm/report/crm_fundraising_report_view.xml
+++ b/addons/crm/report/crm_fundraising_report_view.xml
@@ -80,6 +80,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_fundraising_tree"/>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
             <field name="search_view_id" ref="view_report_crm_fundraising_filter"/>
         </record>
 
diff --git a/addons/crm/report/crm_helpdesk_report_view.xml b/addons/crm/report/crm_helpdesk_report_view.xml
index dc1306e3623..ba4e3be7ed2 100644
--- a/addons/crm/report/crm_helpdesk_report_view.xml
+++ b/addons/crm/report/crm_helpdesk_report_view.xml
@@ -68,11 +68,11 @@
                   <group col="16" colspan="9">
                    		<filter string="This Year" icon="terp-hr"
                    			domain="[('name','=',time.localtime()[0])]"
-                   			default="1" />
+                   			name="this_year" />
 
                    		<filter string="This Month" icon="terp-hr"
                    			domain="[('month','=',time.strftime('%%m'))]"
-                   			default="1" />
+                   			name="this_month" />
 
                    		<separator orientation="vertical" />
                    		<filter string="Current" icon="terp-hr"
@@ -89,7 +89,6 @@
 
                    		<separator orientation="vertical" />
                    		<field name="section_id"
-                   			default="context.get('section_id', False)"
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
@@ -138,8 +137,7 @@
 
                   <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}"
-                        	default="1" />
+                        	domain="[]" context="{'group_by':'user_id'}" />
 
                         <filter string="Company" icon="terp-sale"
                         	domain="[]"
@@ -177,6 +175,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>            
             <field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
         </record>
 
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 06cb2b01aa8..58d69699404 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -79,6 +79,7 @@
             <field name="res_model">crm.lead.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>            
             <field name="search_view_id" ref="view_report_crm_lead_filter"/>
 
         </record>
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
index 8763510eab1..3ee8498fb3a 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_view.xml
@@ -88,6 +88,7 @@
             <field name="res_model">crm.opportunity.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>            
             <field name="search_view_id" ref="view_report_crm_opportunity_filter"/>
         </record>
       	<record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index a41880a7ff7..a78d94977f8 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -77,6 +77,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_crm_phonecall_tree"/>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>            
             <field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
         </record>
 
diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index e5729553fa2..3cd8b518b5d 100644
--- a/addons/crm/report/crm_report_view.xml
+++ b/addons/crm/report/crm_report_view.xml
@@ -65,11 +65,11 @@
                   <group col="16" colspan="8">
                    		<filter string="This Year" icon="terp-hr"
                    			domain="[('name','=',time.localtime()[0])]"
-                   			default="1" />
+                   			name="this_year" />
 
                    		<filter string="This Month" icon="terp-hr"
                    			domain="[('month','=',time.strftime('%%m'))]"
-                   			default="1" />
+                   			name="this_month" />
 
                    		<separator orientation="vertical" />
                    		<filter string="Current" icon="terp-hr"
@@ -83,7 +83,6 @@
 
                    		<separator orientation="vertical" />
                    		<field name="section_id"
-                   			default="context.get('section_id', False)"
                    			widget="selection"
                    			context="{'invisible_section': False}">
 
@@ -108,7 +107,7 @@
                   <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" icon="terp-sale"
                         	domain="[]" context="{'group_by':'user_id'}"
-                        	default="1" />
+                        	name="by_user" />
 
                         <filter string="Company" icon="terp-sale"
                         	domain="[]"
@@ -146,6 +145,7 @@
             <field name="res_model">crm.case.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
+            <field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1}</field>            
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
 
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 4f16eb68575..fa50f944fa1 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -209,7 +209,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
-                   <group col='10' colspan='4'>
+                        <group>
                         <filter icon="terp-hr" string="Draft" domain="[('state','=','draft')]"/>
                         <filter icon="terp-crm" string="In progress" domain="[('state','=','wait')]"/>
                         <filter icon="terp-mrp" string="Final Step" domain="[('state','=','progress')]"/>
@@ -226,9 +226,9 @@
                         <separator orientation="vertical"/>
                         <field name="employee_id" widget="selection" select="1"/>
                         <field name="plan_id" widget="selection" select="1"/>
-                   </group>
-                   <newline/>
-                   <group col='8' colspan='15' expand='1' string='Group by...'>
+					    </group>
+					    <newline/>
+                        <group expand='1' string='Group by...'>
                         <filter string='Employee' icon="terp-stock" domain="[]" context="{'group_by' : 'employee_id'}" />
                         <filter string='Plan' icon="terp-stock" domain="[]" context="{'group_by' : 'plan_id'}" />
                         <filter string='State' icon="terp-stock" domain="[]" context="{'group_by' : 'state'}" />
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index fe24b7c373f..2048c8337db 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -25,6 +25,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Evaluations">
+                <group>
                 <filter icon="terp-hr"
                     string="This Year"
                     domain="[('year','=',time.strftime('%%Y'))]"
@@ -42,6 +43,7 @@
                     domain="[('closed','=',time.strftime('%%Y/%%m/%%d'))]"/>
                 <separator orientation="vertical"/>
                 <field name="employee_id"/>
+                </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 95d6ce77ae3..855f40633d0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -127,7 +127,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Expense">
-                <group col="20" colspan="4">
+                	<group>
                       <filter
                         icon="terp-hr"
                         domain="[('state','=','draft')]"
@@ -148,11 +148,10 @@
                       <field name="date" select='1'/>
                       <field name="user_id" select="1" widget="selection">
                           <filter
-                            icon="gtk-execute"
+                            icon="gtk-execute" name="my_expns"
                             help="My Expenses"
-                            default="1"
                             domain="[('user_id','=',uid)]"/>
-                        <filter icon="terp-hr"
+                          <filter icon="terp-hr"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
@@ -173,6 +172,7 @@
             <field name="name">Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
+            <field name="context">{"search_default_my_expns":1}</field>
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 9e30e6688f2..2f9a0afb29c 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -43,6 +43,7 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Expenses">
+                <group>
                 <filter icon="terp-hr"
                     string="This Year"
                     domain="[('year','=',time.strftime('%%Y'))]"
@@ -55,9 +56,8 @@
                 <filter icon="terp-hr"
                     string="Draft"
                     domain="[('state','=','draft')]"/>
-                <filter icon="terp-hr"
+                <filter icon="terp-hr" name="expenses"
                     string="Expenses"
-                    default="1"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancelled')]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
@@ -67,11 +67,11 @@
                         domain="[('user_id','=',uid)]"/>
                 </field>
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-
+               </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
                     <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}"/>
-                    <filter string="User" icon="terp-hr" context="{'group_by':'user_id'}" default="1"/>
+                    <filter string="User" name="by_user" icon="terp-hr" context="{'group_by':'user_id'}"/>
                     <filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
                     <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
@@ -90,6 +90,7 @@
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
+        <field name="context">{"search_default_expenses":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index ba3278b3c66..bbf32cf0501 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -9,6 +9,7 @@
         <field name="res_model">hr.applicant</field>
         <field name="view_mode">tree,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view_job"/>
+        <field name="context">{"search_default_current":1,"search_default_my_recrui":1}</field>
         <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
 
     </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 83b71c05432..3416ba08f24 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -199,10 +199,10 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="gtk-new" string="Current"
+               <group>
+               <filter icon="gtk-new" string="Current" name="current"
                    domain="[('state','in',('draft','open'))]"
                    help="All new and in progress jobs"
-                   default="1"
                />
                <filter icon="gtk-new" string="New"
                    domain="[('state','=','draft')]"
@@ -220,8 +220,9 @@
                <field name="partner_name"/>
                <field name="email_from"/>
                <field name="job_id" widget="selection"/>
+               <newline/>
                <field name="user_id" widget="selection">
-                    <filter domain="[('user_id','=',uid)]" help="My Recruitements" icon="gtk-execute" default="1"/>
+                    <filter domain="[('user_id','=',uid)]" name="my_recrui" help="My Recruitements" icon="gtk-execute"/>
                     <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="gtk-execute" separator="1"/>
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
@@ -229,8 +230,9 @@
                        domain="[('department_id','=',context.get('department_id',False))]"
                        help="My Department"/>
                </field>
+               </group>
                <newline/>
-                <group expand="1" string="Group By..." colspan="11" col="20">
+                <group expand="1" string="Group By..." >
                     <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Responsible" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 30f1ec3d8ed..286499e0ae8 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -56,7 +56,6 @@
                 <field name="user_id" widget="selection">
                     <filter icon="terp-sale"
                         string="My Recruitments"
-                        default="1"
                         domain="[('user_id','=',uid)]"/>
                 </field>
                 <newline/>
@@ -80,7 +79,7 @@
 
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                   <filter string="User" icon="terp-hr" domain="[]" context="{'group_by':'user_id'}" default="1" />
+                   <filter string="User" name="by_user" icon="terp-hr" domain="[]" context="{'group_by':'user_id'}" />
                    <filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}"/>
                    <filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}"/>
                    <separator orientation="vertical"/>
@@ -101,6 +100,7 @@
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
+        <field name="context">{"search_default_user_id":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
 	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 3614ebf67bb..c215ff13fb0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -618,8 +618,7 @@
                        <filter icon="terp-mrp" string="Draft"
                            domain="[('state','=','draft')]"
                            help="Non confirmed manufacturing orders"/>
-                       <filter icon="terp-mrp" string="Current"
-                           default="1"
+                       <filter icon="terp-mrp" string="Current" name="current"
                            domain="[('state','in',('confirmed','ready'))]"
                            help="Manufacturing Orders which are waiting for raw materials"/>
                        <filter icon="terp-mrp" string="Ready"
@@ -657,6 +656,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="view_id" eval="False"/>
+            <field name="context">{"search_default_current":1}</field>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
         <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
@@ -852,7 +852,7 @@
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <group col='10' colspan='4'>
-                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" default="1" help="Procurement Orders in draft or open state."/>
+                       <filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
                        <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
                        <filter icon="terp-mrp" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed'))]"
@@ -878,6 +878,7 @@
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
+            <field name="context">{"search_default_current":1}</field>
             <field name="search_view_id" ref="view_mrp_procurement_filter"/>
         </record>
         <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing"
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index abb046bd685..8a306d8e79d 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -59,8 +59,8 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" default="1" />
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
+                   		<filter string="This Year" name="this_year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
+						<filter string="This Month" name="this_month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
                         <separator orientation="vertical"/>
 						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
 						<filter string="Scheduled Date" icon="terp-hr" domain="[('scheduled_date',=,time.strftime('%%m/%%d/%%Y'))]"/>
@@ -90,6 +90,7 @@
             <field name="res_model">mrp.production.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
+            <field name="context">{"search_default_this_year":1,"search_default_this_month":1}</field>
             <field name="view_id" ref="view_report_mrp_production_order_tree"/>
             <field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 62e1ecc3c62..25b2345dfb8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -110,11 +110,11 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" default="1"/>
+                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" name="open"/>
                        <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
-                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/>
+                       <filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." name="member"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Templates" domain="[('state','=','template')]" help="Template Projects"/>
                        <separator orientation="vertical"/>
@@ -152,6 +152,7 @@
             <field name="view_type">form</field>
             <field name="domain">[]</field>
             <field name="view_id" ref="view_project"/>
+            <field name="context">{"search_default_open":1,"search_default_member":1}</field>
             <field name="search_view_id" ref="view_project_project_filter"/>
         </record>
         <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
@@ -402,18 +403,18 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" default="1"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" name="current"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
                         <separator orientation="vertical"/>
                         <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-project"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
-                        <field name="project_id" select="1" widget="selection" default="context.get('project_id', False)">
+                        <field name="project_id" select="1" widget="selection">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
-                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
+                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" name="my_task"/>
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
@@ -439,6 +440,7 @@
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
+            <field name="context">{"search_default_current":1,"search_default_my_task":1,"search_default_project_id":project_id}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
@@ -605,7 +607,7 @@
 	                   <field name="subject"/>
 	                   <field name="project_id" select="1" widget="selection"/>
 	                   <field name="user_id" select="1" widget="selection">
-	                       <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" default="1"/>
+	                       <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" name="my_msg"/>
 	                   </field>
                    </group>
                    <newline/>
@@ -624,6 +626,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_project_message_tree"/>
+            <field name="context">{"search_default_my_msg":1}</field>        
             <field name="search_view_id" ref="view_project_message_search"/>
        </record>
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index deb89d3c747..09a4374b156 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -32,19 +32,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks">
-                    <filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
-                    <filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
-                    <separator orientation="vertical"/>
-                    <filter string="In Progress" icon="terp-project" domain="[('state','=','open')]"/>
-                    <filter string="Pending" icon="terp-project" domain="[('state','=','pending')]"/>
-                    <filter string="Closed" icon="terp-project" domain="[('state','=','done')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="project_id"/>
-                    <field name="user_id" widget="selection">
-                        <filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
-                    </field>
+                    <group>
+	                    <filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
+	                    <filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
+	                    <separator orientation="vertical"/>
+	                    <filter string="In Progress" icon="terp-project" domain="[('state','=','open')]"/>
+	                    <filter string="Pending" icon="terp-project" domain="[('state','=','pending')]"/>
+	                    <filter string="Closed" icon="terp-project" domain="[('state','=','done')]"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="project_id"/>
+	                    <field name="user_id" widget="selection">
+	                        <filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" name="my_task"/>
+	                    </field>
+                    </group>                    
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="11">
+                    <group expand="1" string="Group By...">
                         <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
                         <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
                         <separator orientation="vertical"/>
@@ -62,6 +64,7 @@
             <field name="res_model">report.project.task.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
+            <field name="context">{"search_default_my_task":1}</field>            
             <field name="search_view_id" ref="view_task_project_user_search"/>
         </record>
         <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 5d6700a09ef..1fc5c3bce7d 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="1">   
-    
+<data noupdate="1">
+
 
     ######################## ISSUE TRACKING (menu) ###########################
     <!--
@@ -14,6 +14,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="project_issue_tree_view"/>
         <field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
+        <field name="context">{"search_default_my_bugs":1,"search_default_current_bugs":1,"search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 17924dc48b5..b9c0573ea57 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -190,7 +190,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
-                    <group col="3" colspan="1">
+                    <group>
                         <filter icon="gtk-home" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
@@ -204,16 +204,16 @@
 
                     </group>
                     <separator orientation="vertical"/>
-                    <group col="5" colspan="2">
+                    <group>
                         <field name="name" select='1' string="Subject"/>
                         <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" default="1"/>
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" name="my_bugs"/>
                         </field>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" default="1"/>
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
                             <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
                         </field>
-                        <field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
+                        <field name="project_id" select="1" widget="selection" string="Project">
                             <filter icon="terp-crm"
                                 domain="[('project_id','=',context.get('project_id',False))]"
                                 help="My Project"
@@ -277,7 +277,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
-                    <group col="3" colspan="1">
+                    <group>
                         <filter icon="gtk-home" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
@@ -290,16 +290,16 @@
                             />
                     </group>
                     <separator orientation="vertical"/>
-                    <group col="5" colspan="2">
+                    <group>
                         <field name="name" select='1' string="Feature description"/>
                         <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" default="1"/>
+                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" name="my_feature"/>
                         </field>
                         <field name="state" select="1">
-                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" default="1"/>
+                            <filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
-                        <field name="project_id" select="1" widget="selection" string="Project" default="context.get('project_id', False)">
+                        <field name="project_id" select="1" widget="selection" string="Project">
                             <filter icon="terp-crm"
                                 domain="[('project_id','=',context.get('project_id',False))]"
                                 help="My Project"
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index af4bc26ba88..707e1106ec7 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -196,7 +196,7 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" default="1"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" name="current"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
                         <separator orientation="vertical"/>
@@ -205,7 +205,7 @@
                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
                         </field>
                         <field name="responsible_id" widget="selection">
-                            <filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" default="1"/>
+                            <filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" name="my_phase"/>
                         </field>
                         <field name="date_start"/>
                     </group>
@@ -225,6 +225,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,gantt</field>
+            <field name="context">{"search_default_current":1,"search_default_my_phase":1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index e44e399b292..3b10af43026 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -71,7 +71,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             	<search string="Tasks by User">
-            		<group col="10" colspan="4">
+            		<group>
 	            		<filter icon="terp-project" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
 	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
 	            		<separator orientation="vertical"/>
@@ -81,7 +81,7 @@
 	            		<separator orientation="vertical"/>
 	            		<field name="project_id" select="1"/>
 	                    <field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
+	            			<filter icon="terp-project" name="my_task" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
                 		</field>
                 		<newline/>
                 		<group expand="1" string="Extended options..." colspan="10" col="12">
@@ -102,7 +102,7 @@
                     		domain="[('priority','=','4')]"/>
                 		</group>
 	                    <newline/>
-                		<group expand="1" string="Group By..." colspan="10" col="11">
+                		<group expand="1" string="Group By..." >
                     		<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
                     		<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
                     		<filter string="Company" icon="terp-project" context="{'group_by':'company_id'}" />
@@ -124,6 +124,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="domain">[]</field>
+            <field name="context">{"search_default_my_task":1}</field>
             <field name="search_view_id" ref="view_report_task_search"/>
         </record>
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
@@ -162,7 +163,7 @@
                 	</group>
                 	<newline/>
                 	<group expand="1" string="Group By..." colspan="4" col="3">
-                	    <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" default="1" />
+                	    <filter string="User" name="by_user" icon="terp-project" context="{'group_by':'user_id'}" />
                     	<filter string="Year" icon="terp-project" context="{'group_by':'year'}" />
                     	<filter string="Month" icon="terp-project" context="{'group_by':'month'}" />
                 	</group>
@@ -174,6 +175,7 @@
             <field name="res_model">report.timesheet.task.user</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
+            <field name="context">{"search_default_by_user":1}</field>
             <field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
         </record>
         <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 0810b013b23..06034528a70 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -44,14 +44,13 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
+                <group>
                 <filter icon="terp-purchase"
-                    string="This Year"
+                    string="This Year" name="this_year"
                     domain="[('name','=',time.strftime('%%Y'))]"
-                    default="1"
                     help="Purchase orders of the year"/>
                 <filter icon="terp-purchase"
-                    string="This Month"
-                    default="1"
+                    string="This Month" name="this_month"
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Purchase orders of this month"/>
                 <separator orientation="vertical"/>
@@ -59,8 +58,7 @@
                     string="Quotations"
                     domain="[('state','=','draft')]"/>
                 <filter icon="terp-purchase"
-                    string="Purchase"
-                    default="1"
+                    string="Purchase" name="purchase"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
@@ -71,12 +69,12 @@
                 </field>
                 <field name="partner_id"/>
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-
+                </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By...">
                     <filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}"/>
                     <filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
-                    <filter string="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}" default="1"/>
+                    <filter string="Responsible" name="by_user" icon="terp-purchase" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
                     <filter string="Product Category" icon="terp-purchase" context="{'group_by':'category_id'}"/>
@@ -95,6 +93,7 @@
         <field name="res_model">report.purchase.order</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
+        <field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_purchase":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_purchase_order_search"/>
     </record>
 
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 4fbcdd1c284..8617e8a8f4c 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -10,10 +10,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Resource">
-                   <group col='15' colspan='4'>
+                   <group>
                        <field name="name"/>
                        <field name="user_id" string="User" widget="selection">
-                           <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" default="1"/>
+                           <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" name="my_resources"/>
                        </field>
                        <field name="resource_type"/>
                        <field name="company_id" widget="selection"/>
@@ -98,6 +98,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="False"/>
+            <field name="context">{"search_default_my_resources":1}</field>
             <field name="search_view_id" ref="view_resource_calendar_search"/>
         </record>
 
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 2e36b7d9923..fb0ae387000 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -43,23 +43,21 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Sale Orders">
-                <filter icon="terp-sale" 
-                    string="This Year" 
-                    domain="[('year','=',time.strftime('%%Y'))]" 
-                    default="1"
+                <group>
+                <filter icon="terp-sale"
+                    string="This Year" name="this_year"
+                    domain="[('year','=',time.strftime('%%Y'))]"
                     help="Sales orders of the year"/>
                 <filter icon="terp-sale"
-                    string="This Month" 
-                    default="1"
-                    domain="[('month','=',time.strftime('%%m'))]" 
+                    string="This Month" name="this_month"
+                    domain="[('month','=',time.strftime('%%m'))]"
                     help="Sales orders of this month"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-sale"
-                    string="Quotations" 
+                    string="Quotations"
                     domain="[('state','=','draft')]"/>
                 <filter icon="terp-sale"
-                    string="Sales" 
-                    default="1"
+                    string="Sales" name="sales"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
                 <separator orientation="vertical"/>
                 <field name="user_id" widget="selection">
@@ -70,12 +68,12 @@
                 <field name="partner_id"/>
                 <field name="product_id"/>
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-
+                </group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
+                <group expand="1" string="Group By..." >
                     <filter string="Company" icon="terp-sale" context="{'group_by':'company_id'}"/>
                     <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
-                    <filter string="Salesman" icon="terp-sale" context="{'group_by':'user_id'}" default="1"/>
+                    <filter string="Salesman" name="by_user" icon="terp-sale" context="{'group_by':'user_id'}" />
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
                     <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
@@ -93,6 +91,7 @@
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
+        <field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_sales":1,"search_default_by_user":1}</field>
         <field name="search_view_id" ref="view_order_product_search"/>
     </record>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0dea85ae81b..aaf23f21ebc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -259,7 +259,7 @@
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
                     <field name="user_id" select="1" widget="selection">
-                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Sale Orders" default="1"/>
+                        <filter icon="terp-partner" name="my_sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
                     </field>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
@@ -279,6 +279,7 @@
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="context">{"search_default_my_sale":1}</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
@@ -441,19 +442,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
+                    <group>
                     <filter icon="terp-purchase" string="Shipped"
                         domain="[('state','=','done')]"
                         separator="1" />
-                    <filter icon="terp-purchase" string="Uninvoiced"
-                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"  default="1"
+                    <filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
+                        domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
                         separator="1" />
                     <separator orientation="vertical"/>
                     <field name="order_id" select="1"/>
                     <field name="order_partner_id" select="1"/>
                     <field name="product_id" select="1"/>
                     <field name="state" select="1"/>
+                    </group>
                     <newline />
-                    <group expand="1" string="Group By..." colspan="9" col="8">
+                    <group expand="1" string="Group By...">
                         <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
@@ -468,6 +471,7 @@
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
+            <field name="context">{"search_default_uninvoiced":1}</field>
             <field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
             <field name="filter" eval="True"/>
         </record>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index d0cad003216..27dcda7915f 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -100,7 +100,7 @@
             <field name="arch" type="xml">
                 <search string="Product Backlogs">
                     <group col="10" colspan="4">
-                        <filter default="1"
+                        <filter name="current"
                             icon="terp-project"
                             string="Current"
                             domain="['|','&amp;',('sprint_id.date_start','&lt;=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','&gt;=',time.strftime('%%Y-%%m-%%d')), ('state','in',['draft','open'])]"
@@ -112,10 +112,10 @@
                         <field name="name"/>
                         <field name="project_id"
                             widget="selection"
-                            default="context.get('project_id', False)"/>
+                            />
                         <field name="sprint_id"/>
                         <field name="user_id" widget="selection">
-                            <filter default="1"
+                            <filter name="my_features"
                                 icon="terp-project"
                                 string="My Features"
                                 domain="[('user_id','=',uid)]"
@@ -138,6 +138,7 @@
             <field name="name">Product Backlogs</field>
             <field name="res_model">scrum.product.backlog</field>
             <field name="view_type">form</field>
+            <field name="context">{"search_default_current":1,"search_default_my_features":1,"search_default_project_id":project_id}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
         </record>
         <menuitem
@@ -229,15 +230,14 @@
             <field name="arch" type="xml">
                 <search string="Sprints">
                     <group col="10" colspan="4">
-                        <filter default="1" icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
+                        <filter name="current" icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
                         <filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
                         <filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id" widget="selection"/>
                         <field name="scrum_master_id" widget="selection">
-                            <filter icon="gtk-execute" domain="[('scrum_master_id','=',uid)]"
-                                default="1"
+                            <filter icon="gtk-execute" name="my_sprints" domain="[('scrum_master_id','=',uid)]"
                                 help="My Sprints"/>
                         </field>
                         <field name="date_start"/>
@@ -261,6 +261,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_scrum_sprint_tree"/>
+            <field name="context">{"search_default_current":1,"search_default_my_sprints":1}</field>
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
         </record>
         <menuitem
@@ -323,7 +324,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="sprint_id">
-                            <filter icon="terp-project" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
+                            <filter icon="terp-project" name="current" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
                         </field>
                         <field name="date"/>
                     </group>
@@ -341,6 +342,7 @@
             <field name="res_model">scrum.meeting</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{"search_default_current":1}</field>
             <field name="search_view_id" ref="view_scrum_meeting_search"/>
         </record>
         <menuitem sequence="30"
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 1f2d347efdc..f8ce77cd7d0 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -56,9 +56,9 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                  <group col="16" colspan="6">
-                   		<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" default="1" />
-						<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" default="1"/>
+                  <group>
+                        <filter string="This Year" name="this_year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" />
+                        <filter string="This Month" name="this_month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" />
                         <separator orientation="vertical"/>
   						<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
   						<filter string="Order Date" icon="terp-stock" domain="[('order_date',=,time.strftime('%%Y-%%m-%%d'))]"  />
@@ -68,7 +68,7 @@
 						<field name="origin" />
                    </group>
                    <newline/>
-                   <group expand="1" string="Extended options..." colspan="4" col="5">
+                   <group expand="1" string="Extended options...">
                         <filter icon="terp-sale"
                     		string="Sending Goods"
                     		domain="[('type','=','out')]"/>
@@ -83,7 +83,7 @@
                     		domain="[('type','=','delivery')]"/>
                     </group>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="4" col="5">
+                   <group expand="1" string="Group By...">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
@@ -99,6 +99,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_report_report_stock_picking_tree"/>
+            <field name="context">{"search_default_this_year":1,"search_default_this_month":1}</field>            
             <field name="search_view_id" ref="view_report_report_stock_picking_filter"/>
         </record>
 
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 21b8a0a2f4e..acb8c3483e8 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -9,10 +9,10 @@
             <field name="arch" type="xml">
                 <search string="Search Location">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" default="1" />
+                        <filter icon="terp-stock" name="in_location" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
                         <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
                         <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
-                        
+
                         <separator orientation="vertical"/>
                         <field name="location_id" select="1" />
                         <field name="product_id" select="1" />
@@ -61,7 +61,7 @@
             <field name="res_model">stock.report.prodlots</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'full':'1'}</field>
+            <field name="context">{'full':'1',"search_default_in_location":1}</field>
             <field name="search_view_id" ref="view_stock_report_prodlots_filter" />
         </record>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index abf22dcac5f..1ac6d340334 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -264,7 +264,7 @@
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" default="1" />
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('stock_available', '&gt;', 0)]" help="Available Product Lots" />
                         <separator orientation="vertical"/>
                         <field name="prefix" select="1"/>
                         <field name="name" select="1"/>
@@ -287,7 +287,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_production_lot_tree"/>
             <field name="search_view_id" ref="search_product_lot_filter" />
-            <field name="context">{'full':'1'}</field>
+            <field name="context">{'full':'1',"search_default_available":1}</field>
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability"/>
 
@@ -699,7 +699,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Picking">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Pickings" default="1" />
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order"  />
@@ -860,7 +860,7 @@
             <field name="arch" type="xml">
                 <search string="Search Stock Delivery">
                     <group col="10" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" default="1"/>
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
@@ -886,7 +886,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','delivery')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
+            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>            
             <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
@@ -1245,7 +1245,7 @@
             <field name="arch" type="xml">
                 <search string="Input Picking List">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" default="1" />
+                        <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
                         <separator orientation="vertical"/>
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" />
                         <separator orientation="vertical"/>
@@ -1271,7 +1271,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
+            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_in_search"/>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
@@ -1301,7 +1301,7 @@
                 <search string="Internal Picking List">
                     <group col="8" colspan="4">
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
-                        <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" default="1" />
+                        <filter icon="terp-stock" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="origin" select="1"/>
@@ -1324,7 +1324,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
+            <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
         <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
@@ -1457,7 +1457,7 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="search_view_id" ref="view_stock_picking_filter"/>
             <field name="domain">[('type','=','out')]</field>
-            <field name="context">{'contact_display': 'partner'}</field>
+            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
         </record>
         <record id="action_picking_out_tree_view" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -1554,7 +1554,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" default="1" help="Stock to be received"/>
+                        <filter icon="terp-stock" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
                         <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
                         <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
@@ -1580,6 +1580,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
+            <field name="context">{"search_default_receive":1}</field>
             <field name="search_view_id" ref="view_move_search_reception_picking"/>
         </record>
 
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 29a1952c151..4d6fc536dd2 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -261,7 +261,7 @@
                         <separator orientation="vertical"/>
                         <field name="title" select="1"/>
                         <field name="type" select="1" widget="selection"/>
-                        <field name="responsible_id" select="1" widget="selection" default="1">
+                        <field name="responsible_id" select="1" widget="selection" >
                         <filter string="MY" icon="terp-partner" domain="[('responsible_id','=',uid)]"/>
                         </field>
                    </group>
@@ -1071,7 +1071,7 @@
                         <separator orientation="vertical"/>
                         <field name="survey_id" widget="selection" select="1"/>
                         <field name="email" select="1"/>
-                        <field name="user_id" select="1" widget="selection" default="1">
+                        <field name="user_id" select="1" widget="selection" >
                         <filter string="MY" icon="terp-partner" domain="[('user_id','=',uid)]"/>
                         </field>
                    </group>

From 078a714182e9c68e97a594f9b4e47b69b5e853e2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 7 Apr 2010 17:43:24 +0200
Subject: [PATCH 243/248] display sprint in tasks

bzr revid: al@openerp.com-20100407154324-rqceh9okw0jpoweh
---
 addons/scrum/scrum_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 27dcda7915f..07e839bd71c 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -426,7 +426,7 @@
             <field name="inherit_id" ref="project.view_task_tree2"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                    <field name="sprint_id" invisible="context.get('sprint_invisible',True)"/>
+                    <field name="sprint_id"/>
                     <field name="product_backlog_id" invisible="1"/>
                 </field>
             </field>

From 032b3d01046a0ce50457969c298be1dcc2889035 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 7 Apr 2010 22:16:32 +0200
Subject: [PATCH 244/248] [FIx] hr_holidays report

bzr revid: fp@tinyerp.com-20100407201632-txcdj2mhm9fi6ksi
---
 addons/hr_holidays/hr_holidays_view.xml               | 2 +-
 addons/hr_holidays/report/hr_holidays_report_view.xml | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 6c1c834bf7c..25e1d9e8f40 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -27,7 +27,7 @@
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'manager_id'}"/>
-                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
                         <separator orientation="vertical"/> 
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Type" icon="terp-sale" domain="[]" context="{'group_by':'holiday_status_id'}"
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 6a8d1461799..66094e70f5c 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -9,6 +9,7 @@
             <tree string="Leaves Statistics">
                 <field name="date"/>
                 <field name="employee_id"/>
+                <field name="user_id" invisible="1"/>
                 <field name="date_from"/>
                 <field name="date_to"/>
                 <field name="number_of_days_temp"/>
@@ -46,13 +47,6 @@
                     domain="[('month','=',time.strftime('%%m'))]"
                     help="Leaves of this month"/>
                 <separator orientation="vertical"/>
-                <filter icon="terp-hr"
-                    string="Today's Start Leave"
-                    domain="[('date_from','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                <filter icon="terp-hr"
-                    string="Today's End Leave"
-                    domain="[('date_to','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                <separator orientation="vertical"/>
                 <field name="employee_id"/>
                 <field name="user_id" widget="selection">
                     <filter icon="terp-sale"

From e14b6076d24849b9c424f4afa4bebb150668455a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 7 Apr 2010 22:22:45 +0200
Subject: [PATCH 245/248] merge

bzr revid: fp@tinyerp.com-20100407202245-361j8b32cc3zzgag
---
 addons/project/project_view.xml | 48 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 25b2345dfb8..0990bcc58c8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -49,7 +49,7 @@
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-								<button
+                                <button
                                     string="New Project Based on Template"
                                     name="duplicate_template"  type="object"
                                     states="template" icon="gtk-new"/>
@@ -440,7 +440,7 @@
             <field name="view_mode">tree,form,calendar,gantt,graph</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
-            <field name="context">{"search_default_current":1,"search_default_my_task":1,"search_default_project_id":project_id}</field>
+            <field name="context">{"search_default_current":1,"search_default_my_task":1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
@@ -535,25 +535,25 @@
 
       <!--     User Form-->
       <record id="view_project_users_form_simple" model="ir.ui.view">
-	      <field name="name">res.users.project.form1</field>
-	      <field name="model">res.users</field>
-	      <field name="type">form</field>
-	      <field name="inherit_id" ref="base.view_users_form"/>
-	      <field eval="18" name="priority"/>
-	      <field name="arch" type="xml">
-	          <field name="password" position="after">
-	           <field name="context_project_id" completion="1" widget="selection"/>
-	          </field>
-	      </field>
+          <field name="name">res.users.project.form1</field>
+          <field name="model">res.users</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="base.view_users_form"/>
+          <field eval="18" name="priority"/>
+          <field name="arch" type="xml">
+              <field name="password" position="after">
+               <field name="context_project_id" completion="1" widget="selection"/>
+              </field>
+          </field>
      </record>
 
      <record model="ir.ui.view" id="view_users_form_project_modif_inherited1">
-	     <field name="name">view.users.form.project.modif.inherited1</field>
-	     <field name="model">res.users</field>
-	     <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-	     <field name="type">form</field>
-	     <field eval="18" name="priority"/>
-	     <field name="arch" type="xml">
+         <field name="name">view.users.form.project.modif.inherited1</field>
+         <field name="model">res.users</field>
+         <field name="inherit_id" ref="base.view_users_form_simple_modif" />
+         <field name="type">form</field>
+         <field eval="18" name="priority"/>
+         <field name="arch" type="xml">
             <page string="Current Activity" position="inside">
                 <field name="context_project_id" completion="1" widget="selection" context="{'user_prefence':True}"/>
             </page>
@@ -603,12 +603,12 @@
                        <filter domain="[('date','&gt;=',time.strftime('%%Y-%%m-01'))]" icon="terp-project" string="This Month" />
                        <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-project" string="Today" />
 
-	                   <separator orientation="vertical"/>
-	                   <field name="subject"/>
-	                   <field name="project_id" select="1" widget="selection"/>
-	                   <field name="user_id" select="1" widget="selection">
-	                       <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" name="my_msg"/>
-	                   </field>
+                       <separator orientation="vertical"/>
+                       <field name="subject"/>
+                       <field name="project_id" select="1" widget="selection"/>
+                       <field name="user_id" select="1" widget="selection">
+                           <filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" name="my_msg"/>
+                       </field>
                    </group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="20">

From 265712731443dc97279848ec4c450378943db83b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Apr 2010 02:07:39 +0200
Subject: [PATCH 246/248] [FIX] Fixed incorrect psycopg2 usage for passing
 query parameters. Improves on fix by rev 2174
 fp@tinyerp.com-20100407070419-4cly41c0bvrkd00v (with bad commit message BTW)

bzr revid: odo@openerp.com-20100408000739-3f8oe65bcinfpliu
---
 bin/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index c5a36be1a84..9642d8af006 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2934,7 +2934,7 @@ class orm(orm_template):
         self.check_access_rule(cr, uid, ids, 'unlink', context=context)
         for sub_ids in cr.split_for_in_conditions(ids):
             cr.execute('delete from ' + self._table + ' ' \
-                       'where id in ('+','.join(['%s'] * len(sub_ids))+')', sub_ids)
+                       'where id in %s', (sub_ids,))
         for order, object, store_ids, fields in result_store:
             if object != self._name:
                 obj =  self.pool.get(object)

From 5b39d467871b6a78cca37677335f2c7169edc5b9 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 8 Apr 2010 08:18:32 +0100
Subject: [PATCH 247/248] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100408071832-1a2gqsvexgppmicc
---
 bin/addons/base/i18n/he.po    | 2 +-
 bin/addons/base/i18n/hr.po    | 4 ++--
 bin/addons/base/i18n/ja.po    | 4 ++--
 bin/addons/base/i18n/sv.po    | 4 ++--
 bin/addons/base/i18n/uk.po    | 4 ++--
 bin/addons/base/i18n/zh_CN.po | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po
index 1e3765b48e3..b338d1a1b6e 100644
--- a/bin/addons/base/i18n/he.po
+++ b/bin/addons/base/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-06 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 0069d26fd4f..18afb14c5c8 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-06 04:41+0000\n"
+"PO-Revision-Date: 2010-04-07 04:18+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 98ee2ba6b7b..28529214c17 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-06 04:39+0000\n"
+"PO-Revision-Date: 2010-04-07 04:14+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 26ba50df07c..15c5707d686 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-06 04:37+0000\n"
+"PO-Revision-Date: 2010-04-07 04:19+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 15eb8509852..778a6fe3e88 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-06 04:43+0000\n"
+"PO-Revision-Date: 2010-04-07 04:12+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index fa885c2f0df..5760feed6f4 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-04-06 04:37+0000\n"
+"PO-Revision-Date: 2010-04-07 04:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 27ad104c7267885ac5619fac48a6dee776f40e1b Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 8 Apr 2010 08:18:56 +0100
Subject: [PATCH 248/248] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100408071856-gn50itkf796vgoie
---
 addons/account_payment/i18n/cs.po |  44 +-
 addons/audittrail/i18n/it.po      |  18 +-
 addons/base_contact/i18n/ko.po    |   2 +-
 addons/crm/i18n/fi.po             |   2 +-
 addons/hr_timesheet/i18n/de.po    |   2 +-
 addons/olap_extract/i18n/zh_CN.po |  56 +++
 addons/report_purchase/i18n/ko.po |   2 +-
 addons/scrum/i18n/ko.po           |   2 +-
 addons/survey/i18n/zh_CN.po       | 695 ++++++++++++++++++++++++++++++
 addons/thunderbird/i18n/zh_CN.po  |  85 ++++
 10 files changed, 872 insertions(+), 36 deletions(-)
 create mode 100644 addons/olap_extract/i18n/zh_CN.po
 create mode 100644 addons/survey/i18n/zh_CN.po
 create mode 100644 addons/thunderbird/i18n/zh_CN.po

diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index efe3a9ada7d..307e7372453 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-04-07 22:24+0000\n"
+"Last-Translator: mitev.dmitry <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -46,7 +46,7 @@ msgstr ""
 #: field:payment.line,info_owner:0
 #: view:payment.order:0
 msgid "Owner Account"
-msgstr ""
+msgstr "Majitel účtu"
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
@@ -65,17 +65,17 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred date"
-msgstr ""
+msgstr "Preferované datum"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr ""
+msgstr "Volný"
 
 #. module: account_payment
 #: wizard_field:populate_payment,search,entries:0
 msgid "Entries"
-msgstr ""
+msgstr "Příspěvky"
 
 #. module: account_payment
 #: wizard_field:populate_payment,init,duedate:0
@@ -96,7 +96,7 @@ msgstr ""
 #: rml:payment.order:0
 #: view:payment.order:0
 msgid "Amount"
-msgstr ""
+msgstr "Částka"
 
 #. module: account_payment
 #: rml:payment.order:0
@@ -111,7 +111,7 @@ msgstr ""
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Zrušeno"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
@@ -123,7 +123,7 @@ msgstr ""
 #: rml:payment.order:0
 #: field:payment.order,reference:0
 msgid "Reference"
-msgstr ""
+msgstr "Odkaz"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -134,7 +134,7 @@ msgstr ""
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Directly"
-msgstr ""
+msgstr "Přímo"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_line_form
@@ -157,7 +157,7 @@ msgstr ""
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrzeno"
 
 #. module: account_payment
 #: help:payment.line,ml_date_created:0
@@ -177,12 +177,12 @@ msgstr ""
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Structured"
-msgstr ""
+msgstr "Strukturované"
 
 #. module: account_payment
 #: field:payment.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Stav"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -223,17 +223,17 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution date"
-msgstr ""
+msgstr "Datum představení"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
-msgstr ""
+msgstr "Pevné datum"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
 msgid "Destination Account"
-msgstr ""
+msgstr "Protiúčet"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -251,12 +251,12 @@ msgstr ""
 #: wizard_button:populate_payment,search,end:0
 #: wizard_button:populate_statement,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "Zrušit"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "Vytvořeno"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -281,12 +281,12 @@ msgstr ""
 #. module: account_payment
 #: field:payment.line,communication:0
 msgid "Communication"
-msgstr ""
+msgstr "Komunikace"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Due date"
-msgstr ""
+msgstr "Termín dokončení"
 
 #. module: account_payment
 #: field:account.invoice,amount_to_pay:0
@@ -307,7 +307,7 @@ msgstr ""
 #: view:payment.type:0
 #: help:payment.type,name:0
 msgid "Payment Type"
-msgstr ""
+msgstr "Typ platby"
 
 #. module: account_payment
 #: help:payment.line,amount_currency:0
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index ef0956d2e0a..7300efc8c8d 100644
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/i18n/it.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 12:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-07 08:27+0000\n"
+"Last-Translator: iTuxer <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr ""
+msgstr "Audit Trail"
 
 #. module: audittrail
 #: constraint:ir.model:0
@@ -32,22 +32,22 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "Iscritto"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value : "
-msgstr ""
+msgstr "Valore precendente : "
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Create"
-msgstr ""
+msgstr "Crea"
 
 #. module: audittrail
 #: wizard_view:audittrail.view.log,init:0
@@ -67,7 +67,7 @@ msgstr ""
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "Valore precedente"
 
 #. module: audittrail
 #: constraint:ir.actions.act_window:0
diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po
index 698c28484c7..6089514cbc6 100644
--- a/addons/base_contact/i18n/ko.po
+++ b/addons/base_contact/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index f06b2d047d3..123847c8f0e 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index acb4bc52b66..d1c900449bc 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/olap_extract/i18n/zh_CN.po b/addons/olap_extract/i18n/zh_CN.po
new file mode 100644
index 00000000000..1db74819a6a
--- /dev/null
+++ b/addons/olap_extract/i18n/zh_CN.po
@@ -0,0 +1,56 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-04-08 02:07+0000\n"
+"Last-Translator: Silence <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr "确定"
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr "Olap提取"
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid ""
+"\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr "模块名称"
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr "新的模块名"
diff --git a/addons/report_purchase/i18n/ko.po b/addons/report_purchase/i18n/ko.po
index 956f97ff5a9..acaed1974e2 100644
--- a/addons/report_purchase/i18n/ko.po
+++ b/addons/report_purchase/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
diff --git a/addons/scrum/i18n/ko.po b/addons/scrum/i18n/ko.po
index aad7e238eae..91938c8d324 100644
--- a/addons/scrum/i18n/ko.po
+++ b/addons/scrum/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
new file mode 100644
index 00000000000..e64d4c1d0b7
--- /dev/null
+++ b/addons/survey/i18n/zh_CN.po
@@ -0,0 +1,695 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:01+0000\n"
+"PO-Revision-Date: 2010-04-08 01:37+0000\n"
+"Last-Translator: Silence <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_form
+msgid "Surveys"
+msgstr "调查"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey
+msgid "Survey Analysis Report"
+msgstr "调查分析报告"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.ui.menu,name:survey.menu_survey_question_form1
+msgid "Survey Questions"
+msgstr "调查问题"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.response:0
+msgid "Set to draft"
+msgstr "设为草稿"
+
+#. module: survey
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "在动作定义使用了无效的模型名称。"
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr "开始日期"
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr "日志明细"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail:0
+msgid "Body"
+msgstr "内容"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Give Survey Response"
+msgstr "调查回答"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "All Questions"
+msgstr "所有问题"
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr "调查开展日期"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Users Details"
+msgstr "用户详细信息"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr "调查问题"
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one response per user"
+msgstr "如果你只需要每个用户回答，设为1"
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr "页面标题"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr "调查历史"
+
+#. module: survey
+#: field:survey.response,comment:0
+#: field:survey.response.answer,comment:0
+msgid "Notes"
+msgstr "备注"
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Response"
+msgstr "回答合计"
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr "你的消息"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr "允许注释字段"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Warning !"
+msgstr "警告！"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr "为现有用户发送提醒"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_question_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_question_form1
+msgid "New Survey Question"
+msgstr "新的调查问题"
+
+#. module: survey
+#: view:survey.response:0
+msgid "Skip"
+msgstr "跳过"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,partner_ids:0
+msgid "Partner"
+msgstr "伙伴"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_subject:0
+#: wizard_field:wizard.send.invitation,init,mail_subject_existing:0
+msgid "Subject"
+msgstr "主题"
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Response Limit"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_from:0
+msgid "From"
+msgstr "发件人"
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Response Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.response,question_id:0
+msgid "Question"
+msgstr ""
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,init,send:0
+msgid "Send"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Response"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_answer_ids:0
+msgid "Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Summary"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail:0
+msgid "Send mail for new user"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Skipped Question"
+msgstr ""
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,send,end:0
+msgid "_Ok"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_config
+msgid "Configuration"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.response.answer:0
+msgid "Survey Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Page :-"
+msgstr ""
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Response per User"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Started Survey :-"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Comment"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_modify:0
+msgid "Modify Date"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Answered Question"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+msgid "All Surveys"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,users:0
+msgid "Users"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Message"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr ""
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,send,note:0
+msgid "Log"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "All Survey Questions"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.response,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.response.answer,answer_id:0
+msgid "Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+msgid "All Survey Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+msgid "Status"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid ""
+"\n"
+"    This module is used for surveing. It depends on the answers or reviews "
+"of some questions by different users.\n"
+"    A survey may have multiple pages. Each page may contain multiple "
+"questions and each question may have multiple answers.\n"
+"    Different users may give different answers of question and according to "
+"that survey is done. \n"
+"    Partners are also sent mails with user name and password for the "
+"invitation of the survey\n"
+"    "
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: field:survey.response,response_id:0
+msgid "User"
+msgstr ""
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,response_ids:0
+#: view:survey.response:0
+#: field:survey.response.answer,response_id:0
+msgid "Response"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_form1
+#: model:ir.ui.menu,name:survey.menu_new_survey_form
+msgid "New Survey"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.main_menu_survey
+msgid "Survey Management"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Skiped"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: view:survey.answer:0
+msgid "Survey Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "Attention!"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey
+#: view:res.users:0
+#: view:survey:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: field:survey.page,survey_id:0
+#: field:survey.question,survey:0
+msgid "Survey"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Completed Survey :-"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Percentage"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Survey Title :-"
+msgstr ""
+
+#. module: survey
+#: view:survey.response:0
+msgid "Done"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+#: wizard_button:wizard.send.invitation,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+#: view:survey.response:0
+msgid "Survey Response"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr ""
+
+#. module: survey
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Answered"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.wizard,name:survey.wizard_send_invitation
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Send Invitation"
+msgstr ""
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "%"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response:0
+msgid "Description"
+msgstr ""
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_page_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_page_form1
+msgid "New Survey Page"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Survey Answers"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Que:"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+msgid "Page"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "User creation"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.page,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "Results :"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr ""
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Select Partner"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_create:0
+msgid "Create Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+msgid "Survey Pages"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Count"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr ""
diff --git a/addons/thunderbird/i18n/zh_CN.po b/addons/thunderbird/i18n/zh_CN.po
new file mode 100644
index 00000000000..f22f95d6e52
--- /dev/null
+++ b/addons/thunderbird/i18n/zh_CN.po
@@ -0,0 +1,85 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 06:05+0000\n"
+"PO-Revision-Date: 2010-04-08 00:41+0000\n"
+"Last-Translator: Silence <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,copy_to:0
+msgid "Copy To"
+msgstr "复制到"
+
+#. module: thunderbird
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "对象名必须是以x_开头并且不能含有特殊字符"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,description:0
+msgid "Description"
+msgstr "描述"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,reference:0
+msgid "Reference"
+msgstr "参考"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
+msgid "Thunderbid mails"
+msgstr ""
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,attachments:0
+msgid "Attached Files"
+msgstr "添加附件"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,res_user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,receiver:0
+msgid "Receiver"
+msgstr "收件人"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,title:0
+msgid "Subject"
+msgstr "主题"
+
+#. module: thunderbird
+#: code:addons/thunderbird/partner/partner.py:0
+#, python-format
+msgid "Archive"
+msgstr "存档"
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Thunderbird接口"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,sender:0
+msgid "Sender"
+msgstr "发件人"