From 9f6af7c9747d8f85e3296d3044f13b735834dc70 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 21 Feb 2012 18:04:55 +0100
Subject: [PATCH 01/83] [ADD] asynchronous javascript guide, as it'll be needed
 by the networking/RPC guide

bzr revid: xmo@openerp.com-20120221170455-rcrbyvz1ozj7mfib
---
 doc/source/async.rst | 353 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 353 insertions(+)
 create mode 100644 doc/source/async.rst

diff --git a/doc/source/async.rst b/doc/source/async.rst
new file mode 100644
index 00000000000..23b3409bd8f
--- /dev/null
+++ b/doc/source/async.rst
@@ -0,0 +1,353 @@
+Don't stop the world now: asynchronous development and Javascript
+=================================================================
+
+As a language (and runtime), javascript is fundamentally
+single-threaded. This means any blocking request or computation will
+blocks the whole page (and, in older browsers, the software itself
+even preventing users from switching to an other tab): a javascript
+environment can be seen as an event-based runloop where application
+developers have no control over the runloop itself.
+
+As a result, performing long-running synchronous network requests or
+other types of complex and expensive accesses is frowned upon and
+asynchronous APIs are used instead.
+
+Asynchronous code rarely comes naturally, especially for developers
+used to synchronous server-side code (in Python, Java or C#) where the
+code will just block until the deed is gone. This is increased further
+when asynchronous programming is not a first-class concept and is
+instead implemented on top of callbacks-based programming, which is
+the case in javascript.
+
+The goal of this guide is to provide some tools to deal with
+asynchronous systems, and warn against systematic issues or dangers.
+
+Deferreds
+---------
+
+Deferreds are a form of `promises`_. OpenERP Web currently uses
+`jQuery's deferred`_, but any `CommonJS Promises/A`_ implementation
+should work.
+
+The core idea of deferreds is that potentially asynchronous methods
+will return a :js:class:`Deferred` object instead of an arbitrary
+value or (most commonly) nothing.
+
+This object can then be used to track the end of the asynchronous
+operation by adding callbacks onto it, either success callbacks or
+error callbacks.
+
+A great advantage of deferreds over simply passing callback functions
+directly to asynchronous methods is the ability to :ref:`compose them
+<deferred-composition>`.
+
+Using deferreds
+~~~~~~~~~~~~~~~
+
+`CommonJS Promises/A`_ deferreds have only one method of importance:
+:js:func:`Deferred.then`. This method is used to attach new callbacks
+to the deferred object.
+
+* the first parameter attaches a success callback, called when the
+  deferred object is successfully resolved and provided with the
+  resolved value(s) for the asynchronous operation.
+
+* the second parameter attaches a failure callback, called when the
+  deferred object is rejected and provided with rejection values
+  (often some sort of error message).
+
+Callbacks attached to deferreds are never "lost": if a callback is
+attached to an already resolved or rejected deferred, the callback
+will be called (or ignored) immediately. A deferred is also only ever
+resolved or rejected once, and is either resolved or rejected: a given
+deferred can not call a single success callback twice, or call both a
+success and a failure callbacks.
+
+:js:func:`~Deferred.then` should be the method you'll use most often
+when interacting with deferred objects (and thus asynchronous APIs).
+
+Building deferreds
+~~~~~~~~~~~~~~~~~~
+
+After using asynchronous APIs may come the time to build them: for
+`mocks`_, to compose deferreds from multiple source in a complex
+manner, in order to let the current operations repaint the screen or
+give other events the time to unfold, ...
+
+This is easy using jQuery's deferred objects.
+
+.. note:: this section is an implementation detail of jQuery Deferred
+          objects, the creation of promises is not part of any
+          standard (even tentative) that I know of. If you are using
+          deferred objects which are not jQuery's, their API may (and
+          often will) be completely different.
+
+Deferreds are created by invoking their constructor [#]_ without any
+argument. This creates a :js:class:`Deferred` instance object with the
+following methods:
+
+:js:func:`Deferred.resolve`
+
+    As its name indicates, this method moves the deferred to the
+    "Resolved" state. It can be provided as many arguments as
+    necessary, these arguments will be provided to any pending success
+    callback.
+
+:js:func:`Deferred.reject`
+
+    Similar to :js:func:`~Deferred.resolve`, but moves the deferred to
+    the "Rejected" state and calls pending failure handlers.
+
+:js:func:`Deferred.promise`
+
+    Creates a readonly view of the deferred object. It is generally a
+    good idea to return a promise view of the deferred to prevent
+    callers from resolving or rejecting the deferred in your stead.
+
+:js:func:`~Deferred.reject` and :js:func:`~Deferred.resolve` are used
+to inform callers that the asynchronous operation has failed (or
+succeeded). These methods should simply be called when the
+asynchronous operation has ended, to notify anybody interested in its
+result(s).
+
+.. _deferred-composition:
+
+Composing deferreds
+~~~~~~~~~~~~~~~~~~~
+
+What we've seen so far is pretty nice, but mostly doable by passing
+functions to other functions (well adding functions post-facto would
+probably be a chore... still, doable).
+
+Deferreds truly shine when code needs to compose asynchronous
+operations in some way or other, as they can be used as a basis for
+such composition.
+
+There are two main forms of compositions over deferred: multiplexing
+and piping/cascading.
+
+Deferred multiplexing
+`````````````````````
+
+The most common reason for multiplexing deferred is simply performing
+2+ asynchronous operations and wanting to wait until all of them are
+done before moving on (and executing more stuff).
+
+The jQuery multiplexing function for promises is :js:func:`when`.
+
+.. note:: the multiplexing behavior of jQuery's :js:func:`when` is an
+          (incompatible, mostly) extension of the behavior defined in
+          `CommonJS Promises/B`_.
+
+This function can take any number of promises [#]_ and will return a
+promise.
+
+This returned promise will be resolved when *all* multiplexed promises
+are resolved, and will be rejected as soon as one of the multiplexed
+promises is rejected (it behaves like Python's ``all()``, but with
+promise objects instead of boolean-ish).
+
+The resolved values of the various promises multiplexed via
+:js:func:`when` are mapped to the arguments of :js:func:`when`'s
+success callback, if they are needed. The resolved values of a promise
+are at the same index in the callback's arguments as the promise in
+the :js:func:`when` call so you will have:
+
+.. code-block:: javascript
+
+    $.when(p0, p1, p2, p3).then(
+            function (results0, results1, results2, results3) {
+        // code
+    });
+
+.. warning::
+
+    in a normal mapping, each parameter to the callback would be an
+    array: each promise is conceptually resolved with an array of 0..n
+    values and these values are passed to :js:func:`when`'s
+    callback. But jQuery treats deferreds resolving a single value
+    specially, and "unwraps" that value.
+
+    For instance, in the code block above if the index of each promise
+    is the number of values it resolves (0 to 3), ``results0`` is an
+    empty array, ``results2`` is an array of 2 elements (a pair) but
+    ``results1`` is the actual value resolved by ``p1``, not an array.
+
+Deferred chaining
+`````````````````
+
+A second useful composition is starting an asynchronous operation as
+the result of an other asynchronous operation, and wanting the result
+of both: :js:func:`Deferred.then` returns the deferred on which it was
+called, so handle e.g. OpenERP's search/read sequence with this would
+require something along the lines of:
+
+.. code-block:: javascript
+
+    var result = $.Deferred();
+    Model.search(condition).then(function (ids) {
+        Model.read(ids, fields).then(function (records) {
+            result.resolve(records);
+        });
+    });
+    return result.promise();
+
+While it doesn't look too bad for trivial code, this quickly gets
+unwieldy.
+
+Instead, jQuery provides a tool to handle this kind of chains:
+:js:func:`Deferred.pipe`.
+
+:js:func:`~Deferred.pipe` has the same signature as
+:js:func:`~Deferred.then` and could be used in the same manner
+provided its return value was not used.
+
+It differs from :js:func:`~Deferred.then` in two ways: it returns a
+new promise object, not the one it was called with, and the return
+values of the callbacks is actually important to it: whichever
+callback is called,
+
+* If the callback is not set (not provided or left to null), the
+  resolution or rejection value(s) is simply forwarded to
+  :js:func:`~Deferred.pipe`'s promise (it's essentially a noop)
+
+* If the callback is set and does not return an observable object (a
+  deferred or a promise), the value it returns (``undefined`` if it
+  does not return anything) will replace the value it was given, e.g.
+
+  .. code-block:: javascript
+
+      promise.pipe(function () {
+          console.log('called');
+      });
+
+  will resolve with the sole value ``undefined``.
+
+* If the callback is set and returns an observable object, that object
+  will be the actual resolution (and result) of the pipe. This means a
+  resolved promise from the failure callback will resolve the pipe,
+  and a failure promise from the success callback will reject the
+  pipe.
+
+  This provides an easy way to chain operation successes, and the
+  previous piece of code can now be rewritten:
+
+  .. code-block:: javascript
+
+      return Model.search(condition).pipe(function (ids) {
+          return Model.read(ids, fields);
+      });
+
+  the result of the whole expression will encode failure if either
+  ``search`` or ``read`` fails (with the right rejection values), and
+  will be resolved with ``read``'s resolution values if the chain
+  executes correctly.
+
+:js:func:`~Deferred.pipe` is also useful to adapt third-party
+promise-based APIs, in order to filter their resolution value counts
+for instance (to take advantage of :js:func:`when` 's special treatment
+of single-value promises).
+
+jQuery.Deferred API
+~~~~~~~~~~~~~~~~~~~
+
+.. js:function:: when(deferreds…)
+
+    :param deferreds: deferred objects to multiplex
+    :returns: a multiplexed deferred
+    :rtype: :js:class:`Deferred`
+
+.. js:class:: Deferred
+
+    .. js:function:: Deferred.then(doneCallback[, failCallback])
+
+        Attaches new callbacks to the resolution or rejection of the
+        deferred object. Callbacks are executed in the order they are
+        attached to the deferred.
+
+        To provide only a failure callback, pass ``null`` as the
+        ``doneCallback``, to provide only a success callback the
+        second argument can just be ignored (and not passed at all).
+
+        :param doneCallback: function called when the deferred is resolved
+        :type doneCallback: Function
+        :param failCallback: function called when the deferred is rejected
+        :type failCallback: Function
+        :returns: the deferred object on which it was called
+        :rtype: :js:class:`Deferred`
+
+    .. js:function:: Deferred.done(doneCallback)
+
+        Attaches a new success callback to the deferred, shortcut for
+        ``deferred.then(doneCallback)``.
+
+        This is a jQuery extension to `CommonJS Promises/A`_ providing
+        little value over calling :js:func:`~Deferred.then` directly,
+        it should be avoided.
+
+        :param doneCallback: function called when the deferred is resolved
+        :type doneCallback: Function
+        :returns: the deferred object on which it was called
+        :rtype: :js:class:`Deferred`
+
+    .. js:function:: Deferred.fail(failCallback)
+
+        Attaches a new failure callback to the deferred, shortcut for
+        ``deferred.then(null, failCallback)``.
+
+        A second jQuery extension to `Promises/A <CommonJS
+        Promises/A>`_. Although it provides more value than
+        :js:func:`~Deferred.done`, it still is not much and should be
+        avoided as well.
+
+        :param failCallback: function called when the deferred is rejected
+        :type failCallback: Function
+        :returns: the deferred object on which it was called
+        :rtype: :js:class:`Deferred`
+
+    .. js:function:: Deferred.promise()
+
+        Returns a read-only view of the deferred object, with all
+        mutators (resolve and reject) methods removed.
+
+    .. js:function:: Deferred.resolve(value…)
+
+        Called to resolve a deferred, any value provided will be
+        passed onto the success handlers of the deferred object.
+
+        Resolving a deferred which has already been resolved or
+        rejected has no effect.
+
+    .. js:function:: Deferred.reject(value…)
+
+        Called to reject (fail) a deferred, any value provided will be
+        passed onto the failure handler of the deferred object.
+
+        Rejecting a deferred which has already been resolved or
+        rejected has no effect.
+
+    .. js:function:: Deferred.pipe(doneFilter[, failFilter])
+
+        Filters the result of a deferred, able to transform a success
+        into failure and a failure into success, or to delay
+        resolution further.
+
+.. [#] or simply calling :js:class:`Deferred` as a function, the
+       result is the same
+
+.. [#] or not-promises, the `CommonJS Promises/B`_ role of
+       :js:func:`when` is to be able to treat values and promises
+       uniformly: :js:func:`when` will pass promises through directly,
+       but non-promise values and objects will be transformed into a
+       resolved promise (resolving themselves with the value itself).
+
+       jQuery's :js:func:`when` keeps this behavior making deferreds
+       easy to build from "static" values, or allowing defensive code
+       where expected promises are wrapped in :js:func:`when` just in
+       case.
+
+.. _promises: http://en.wikipedia.org/wiki/Promise_(programming)
+.. _jQuery's deferred: http://api.jquery.com/category/deferred-object/
+.. _CommonJS Promises/A: http://wiki.commonjs.org/wiki/Promises/A
+.. _CommonJS Promises/B: http://wiki.commonjs.org/wiki/Promises/B
+.. _mocks: http://en.wikipedia.org/wiki/Mock_object

From f926427406a8fa6cd60af52476119bd1d49691dc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 23 Feb 2012 13:28:29 +0100
Subject: [PATCH 02/83] [FIX] use an array for controller classes, so they are
 iterated in the correct order (otherwise it might not be possible to override
 an extended controller)

bzr revid: xmo@openerp.com-20120223122829-mtz2w120qq8rbjrx
---
 addons/web/common/http.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 71a280f27eb..26807f65b69 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -405,14 +405,14 @@ def session_context(request, storage_path, session_cookie='sessionid'):
 #----------------------------------------------------------
 addons_module = {}
 addons_manifest = {}
-controllers_class = {}
+controllers_class = []
 controllers_object = {}
 controllers_path = {}
 
 class ControllerType(type):
     def __init__(cls, name, bases, attrs):
         super(ControllerType, cls).__init__(name, bases, attrs)
-        controllers_class["%s.%s" % (cls.__module__, cls.__name__)] = cls
+        controllers_class.append(("%s.%s" % (cls.__module__, cls.__name__), cls))
 
 class Controller(object):
     __metaclass__ = ControllerType
@@ -526,7 +526,7 @@ class Root(object):
                         addons_module[module] = m
                         addons_manifest[module] = manifest
                         statics['/%s/static' % module] = path_static
-        for k, v in controllers_class.items():
+        for k, v in controllers_class:
             if k not in controllers_object:
                 o = v()
                 controllers_object[k] = o

From b58012f32ab31b9a1b55297de915fe2257dea655 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 23 Feb 2012 13:31:51 +0100
Subject: [PATCH 03/83] [IMP] re-set session id on session reload

bzr revid: xmo@openerp.com-20120223123151-w2s4g0y38z7xjoeu
---
 addons/web/static/src/js/core.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index c4e37a8a3b1..10f3167b330 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -639,6 +639,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             // an invalid session or no session at all), refresh session data
             // (should not change, but just in case...)
             _.extend(self, {
+                session_id: result.session_id,
                 db: result.db,
                 username: result.login,
                 uid: result.uid,

From 5ac6e532bdfeef0f3bf8ad45ba8bc17183ff423c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 23 Feb 2012 13:32:13 +0100
Subject: [PATCH 04/83] [FIX] if a connector was setup in the configuration
 object, don't re-set one instead

bzr revid: xmo@openerp.com-20120223123213-aftgz7h0zxkbzsju
---
 addons/web/common/http.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 26807f65b69..9294808fda4 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -440,12 +440,12 @@ class Root(object):
         self.root = '/web/webclient/home'
         self.config = options
 
-        if self.config.backend == 'local':
-            conn = LocalConnector()
-        else:
-            conn = openerplib.get_connector(hostname=self.config.server_host,
-                   port=self.config.server_port)
-        self.config.connector = conn
+        if not hasattr(self.config, 'connector'):
+            if self.config.backend == 'local':
+                self.config.connector = LocalConnector()
+            else:
+                self.config.connector = openerplib.get_connector(
+                    hostname=self.config.server_host, port=self.config.server_port)
 
         self.session_cookie = 'sessionid'
         self.addons = {}

From 0ff97e49295c9836bebc730049bafd23b9936978 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 23 Feb 2012 13:34:16 +0100
Subject: [PATCH 05/83] [ADD] testing scaffold which does not hit the OpenERP
 server

bzr revid: xmo@openerp.com-20120223123416-2zvxy6nqbe9gdhhw
---
 addons/web/static/src/js/test_support.js   | 64 ++++++++++++++++++++++
 addons/web/static/test/fulltest.html       | 49 +++++++++++++++++
 addons/web/static/test/fulltest/dataset.js | 11 ++++
 addons/web/test_support/__init__.py        | 37 +++++++++++++
 addons/web/test_support/controllers.py     | 31 +++++++++++
 openerp-web                                | 19 +++++++
 6 files changed, 211 insertions(+)
 create mode 100644 addons/web/static/src/js/test_support.js
 create mode 100644 addons/web/static/test/fulltest.html
 create mode 100644 addons/web/static/test/fulltest/dataset.js
 create mode 100644 addons/web/test_support/__init__.py
 create mode 100644 addons/web/test_support/controllers.py

diff --git a/addons/web/static/src/js/test_support.js b/addons/web/static/src/js/test_support.js
new file mode 100644
index 00000000000..5fcfb94c6a2
--- /dev/null
+++ b/addons/web/static/src/js/test_support.js
@@ -0,0 +1,64 @@
+openerp.test_support = {
+    setup_connection: function (connection) {
+        var origin = location.protocol+"//"+location.host;
+        _.extend(connection, {
+            origin: origin,
+            prefix: origin,
+            server: origin, // keep chs happy
+            //openerp.web.qweb.default_dict['_s'] = this.origin;
+            rpc_function: connection.rpc_json,
+            session_id: false,
+            uid: false,
+            username: false,
+            user_context: {},
+            db: false,
+            openerp_entreprise: false,
+//            this.module_list = openerp._modules.slice();
+//            this.module_loaded = {};
+//            _(this.module_list).each(function (mod) {
+//                self.module_loaded[mod] = true;
+//            });
+            context: {},
+            shortcuts: [],
+            active_id: null
+        });
+        return connection.session_reload();
+    },
+    module: function (title, tested_core, fn) {
+        var conf = QUnit.config.openerp = {};
+        QUnit.module(title, {
+            setup: function () {
+                QUnit.stop();
+                var oe = conf.openerp = window.openerp.init();
+                window.openerp.web[tested_core](oe);
+                openerp.test_support.setup_connection(oe.connection)
+                    .always(QUnit.start)
+                    .then(function () {
+                        conf.openerp = oe;
+                    }, function (e) {
+                        QUnit.test(title, function () {
+                            console.error(e);
+                            QUnit.ok(false, 'Could not obtain a session:' + e.debug);
+                        });
+                    });
+            }
+        });
+    },
+    test: function (title, fn) {
+        var conf = QUnit.config.openerp;
+        QUnit.test(title, function () {
+            QUnit.stop();
+            fn(conf.openerp);
+        });
+    },
+    expect: function (promise, fn) {
+        promise.always(QUnit.start)
+               .done(function () { QUnit.ok(false, 'RPC requests should not succeed'); })
+               .fail(function (e) {
+            if (e.code !== 200) {
+                QUnit.equal(e.code, 200, 'Testing connector should raise RPC faults');
+            }
+            fn(e.data.fault_code);
+        })
+    }
+};
diff --git a/addons/web/static/test/fulltest.html b/addons/web/static/test/fulltest.html
new file mode 100644
index 00000000000..f27adfa7df9
--- /dev/null
+++ b/addons/web/static/test/fulltest.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html style="height: 100%">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <title>OpenERP</title>
+    <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
+
+    <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css">
+    <script src="/web/static/lib/qunit/qunit.js" type="text/javascript"></script>
+
+    <script src="/web/static/lib/underscore/underscore.js" type="text/javascript"></script>
+    <script src="/web/static/lib/underscore/underscore.string.js" type="text/javascript"></script>
+
+    <!-- jquery -->
+    <script src="/web/static/lib/jquery/jquery-1.6.4.js"></script>
+    <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js"></script>
+    <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script>
+    
+    <script src="/web/static/lib/datejs/globalization/en-US.js"></script>
+    <script src="/web/static/lib/datejs/core.js"></script>
+    <script src="/web/static/lib/datejs/parser.js"></script>
+    <script src="/web/static/lib/datejs/sugarpak.js"></script>
+    <script src="/web/static/lib/datejs/extras.js"></script>
+
+    <script src="/web/static/lib/qweb/qweb2.js"></script>
+
+    <script src="/web/static/lib/py.parse/lib/py.js"></script>
+
+    <script src="/web/static/src/js/boot.js"></script>
+    <script src="/web/static/src/js/core.js"></script>
+    <script src="/web/static/src/js/dates.js"></script>
+    <script src="/web/static/src/js/formats.js"></script>
+    <script src="/web/static/src/js/chrome.js"></script>
+    <script src="/web/static/src/js/data.js"></script>
+
+    <script src="/web/static/src/js/test_support.js"></script>
+</head>
+    <body id="oe" class="openerp">
+        <h1 id="qunit-header">
+            OpenERP Web Test Suite: javascript to XML-RPC (excluded)
+        </h1>
+        <h2 id="qunit-banner"></h2>
+        <div id="qunit-testrunner-toolbar"></div>
+        <h2 id="qunit-userAgent"></h2>
+        <ol id="qunit-tests"></ol>
+        <div id="qunit-fixture"></div>
+        <script type="text/javascript" src="/web/static/test/fulltest/dataset.js"></script>
+    </body>
+</html>
diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
new file mode 100644
index 00000000000..4b948261a3b
--- /dev/null
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -0,0 +1,11 @@
+$(document).ready(function () {
+    var t = window.openerp.test_support;
+
+    t.module('check', 'data');
+    t.test('check1', function (openerp) {
+        var ds = new openerp.web.DataSet({session: openerp.connection}, 'res.users', {});
+        t.expect(ds.create({name: 'foo'}), function (result) {
+            ok(false, 'ha ha ha')
+        });
+    });
+});
diff --git a/addons/web/test_support/__init__.py b/addons/web/test_support/__init__.py
new file mode 100644
index 00000000000..59f6cc67ca2
--- /dev/null
+++ b/addons/web/test_support/__init__.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+import xmlrpclib
+from ..common.openerplib.main import Connector
+
+execute_map = {}
+
+class TestConnector(Connector):
+    def db_list_lang(self):
+        return [('en_US', u'Test Language')]
+
+    def common_authenticate(self, db, login, password, environment):
+        return 87539319
+
+    def common_login(self, db, login, password):
+        return self.common_authenticate(db, login, password, {})
+
+    def object_execute_kw(self, db, uid, password, model, method, args, kwargs):
+        if model in execute_map and hasattr(execute_map[model], method):
+            return getattr(execute_map[model], method)(*args, **kwargs)
+
+        raise xmlrpclib.Fault({
+            'model': model,
+            'method': method,
+            'args': args,
+            'kwargs': kwargs
+        }, '')
+
+    def send(self, service_name, method, *args):
+        method_name = '%s_%s' % (service_name, method)
+        if hasattr(self, method_name):
+            return getattr(self, method_name)(*args)
+
+        raise xmlrpclib.Fault({
+            'service': service_name,
+            'method': method,
+            'args': args
+        }, '')
diff --git a/addons/web/test_support/controllers.py b/addons/web/test_support/controllers.py
new file mode 100644
index 00000000000..f8e3c7a0739
--- /dev/null
+++ b/addons/web/test_support/controllers.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+from ..common.http import Controller, jsonrequest
+from ..controllers.main import Session
+
+UID = 87539319
+DB = 'test_db'
+LOGIN = 'test_login'
+PASSWORD = 'test_password'
+CONTEXT = {'lang': 'en_US', 'tz': 'UTC', 'uid': UID}
+
+def bind(session):
+    session.bind(DB, UID, LOGIN, PASSWORD)
+    session.context = CONTEXT
+    session.build_connection().set_login_info(DB, LOGIN, PASSWORD, UID)
+
+class TestSession(Session):
+    _cp_path = '/web/session'
+
+    def session_info(self, req):
+        if not req.session._uid:
+            bind(req.session)
+
+        return {
+            "session_id": req.session_id,
+            "uid": req.session._uid,
+            "context": CONTEXT,
+            "db": req.session._db,
+            "login": req.session._login,
+            "openerp_entreprise": False,
+        }
diff --git a/openerp-web b/openerp-web
index ec72085db2c..3340b95646e 100755
--- a/openerp-web
+++ b/openerp-web
@@ -50,6 +50,19 @@ logging_opts.add_option("--log-config", dest="log_config", default=os.path.join(
                         help="Logging configuration file", metavar="FILE")
 optparser.add_option_group(logging_opts)
 
+testing_opts = optparse.OptionGroup(optparser, "Testing")
+testing_opts.add_option('--test-mode', dest='test_mode',
+                        action='store_true', default=False,
+                        help="Starts test mode, which provides a few"
+                             " (utterly unsafe) APIs for testing purposes and"
+                             " sets up a special connector which always raises"
+                             " errors on tentative server access. These errors"
+                             " serialize RPC query information (service,"
+                             " method, arguments list) in the fault_code"
+                             " attribute of the error object returned to the"
+                             " client. This lets javascript code assert the" \
+                             " XMLRPC consequences of its queries.")
+optparser.add_option_group(testing_opts)
 
 if __name__ == "__main__":
     (options, args) = optparser.parse_args(sys.argv[1:])
@@ -78,6 +91,12 @@ if __name__ == "__main__":
     options.backend =  'xmlrpc'
     os.environ["TZ"] = "UTC"
 
+    if options.test_mode:
+        import web.test_support
+        import web.test_support.controllers
+        options.connector = web.test_support.TestConnector()
+        logging.getLogger('werkzeug').setLevel(logging.WARNING)
+
     if sys.version_info >= (2, 7) and os.path.exists(options.log_config):
         with open(options.log_config) as file:
             dct = json.load(file)

From 27dfa4d12b2acc53176962f3cb0753e7349176ee Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 24 Feb 2012 11:57:53 +0100
Subject: [PATCH 06/83] [ADD] a bunch of tests of the dataset API (translation
 of javascript dataset calls to XMLRPC ones)

bzr revid: xmo@openerp.com-20120224105753-hqf7o9xwwkc0xcok
---
 addons/web/static/test/fulltest/dataset.js | 144 ++++++++++++++++++++-
 1 file changed, 139 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
index 4b948261a3b..21b6b80cb80 100644
--- a/addons/web/static/test/fulltest/dataset.js
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -1,11 +1,145 @@
 $(document).ready(function () {
     var t = window.openerp.test_support;
 
-    t.module('check', 'data');
-    t.test('check1', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'res.users', {});
-        t.expect(ds.create({name: 'foo'}), function (result) {
-            ok(false, 'ha ha ha')
+    t.module('Dataset shortcuts', 'data');
+    t.test('read_index', function (openerp) {
+        var ds = new openerp.web.DataSet(
+            {session: openerp.connection}, 'some.model');
+        ds.ids = [10, 20, 30, 40, 50];
+        ds.index = 2;
+        t.expect(ds.read_index(['a', 'b', 'c']), function (result) {
+            strictEqual(result.method, 'read');
+            strictEqual(result.model, 'some.model');
+
+            strictEqual(result.args.length, 3);
+            deepEqual(result.args[0], [30]);
+            deepEqual(result.args[1], ['a', 'b', 'c']);
+
+            ok(_.isEmpty(result.kwargs));
         });
     });
+    t.test('default_get', function (openerp) {
+        var ds = new openerp.web.DataSet(
+            {session: openerp.connection}, 'some.model', {foo: 'bar'});
+        t.expect(ds.default_get(['a', 'b', 'c']), function (result) {
+            strictEqual(result.method, 'default_get');
+            strictEqual(result.model, 'some.model');
+
+            strictEqual(result.args.length, 2);
+            deepEqual(result.args[0], ['a', 'b', 'c']);
+            // FIXME: args[1] is context w/ user context, where to get? Hardcode?
+            strictEqual(result.args[1].foo, 'bar');
+
+            ok(_.isEmpty(result.kwargs));
+        });
+    });
+    t.test('create', function (openerp) {
+        var ds = new openerp.web.DataSet({session: openerp.connection}, 'some.model');
+        t.expect(ds.create({foo: 1, bar: 2}), function (r) {
+            strictEqual(r.method, 'create');
+
+            strictEqual(r.args.length, 2);
+            deepEqual(r.args[0], {foo: 1, bar: 2});
+
+            ok(_.isEmpty(r.kwargs));
+        });
+    });
+    t.test('write', function (openerp) {
+        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        t.expect(ds.write(42, {foo: 1}), function (r) {
+            strictEqual(r.method, 'write');
+
+            strictEqual(r.args.length, 3);
+            deepEqual(r.args[0], [42]);
+            deepEqual(r.args[1], {foo: 1});
+
+            ok(_.isEmpty(r.kwargs));
+        });
+        // FIXME: can't run multiple sessions in the same test(), fucks everything up
+//        t.expect(ds.write(42, {foo: 1}, { context: {lang: 'bob'} }), function (r) {
+//            strictEqual(r.args.length, 3);
+//            strictEqual(r.args[2].lang, 'bob');
+//        });
+    });
+    t.test('unlink', function (openerp) {
+        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        t.expect(ds.unlink([42]), function (r) {
+            strictEqual(r.method, 'unlink');
+
+            strictEqual(r.args.length, 2);
+            deepEqual(r.args[0], [42]);
+
+            ok(_.isEmpty(r.kwargs));
+        });
+    });
+    t.test('call', function (openerp) {
+        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        t.expect(ds.call('frob', ['a', 'b', 42]), function (r) {
+            strictEqual(r.method, 'frob');
+
+            strictEqual(r.args.length, 3);
+            deepEqual(r.args, ['a', 'b', 42]);
+
+            ok(_.isEmpty(r.kwargs));
+        });
+    });
+    t.test('name_get', function (openerp) {
+        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        t.expect(ds.name_get([1, 2], null), function (r) {
+            strictEqual(r.method, 'name_get');
+
+            strictEqual(r.args.length, 2);
+            deepEqual(r.args[0], [1, 2]);
+
+            ok(_.isEmpty(r.kwargs));
+        });
+    });
+    t.test('name_search, name', function (openerp) {
+        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        t.expect(ds.name_search('bob'), function (r) {
+            strictEqual(r.method, 'name_search');
+
+            strictEqual(r.args.length, 5);
+            strictEqual(r.args[0], 'bob');
+            // domain
+            deepEqual(r.args[1], []);
+            strictEqual(r.args[2], 'ilike');
+            strictEqual(r.args[4], 0);
+
+            ok(_.isEmpty(r.kwargs));
+        });
+    });
+    t.test('name_search, domain & operator', function (openerp) {
+        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        t.expect(ds.name_search(0, [['foo', '=', 3]], 'someop'), function (r) {
+            strictEqual(r.method, 'name_search');
+
+            strictEqual(r.args.length, 5);
+            strictEqual(r.args[0], '');
+            // domain
+            deepEqual(r.args[1], [['foo', '=', 3]]);
+            strictEqual(r.args[2], 'someop');
+            // limit
+            strictEqual(r.args[4], 0);
+
+            ok(_.isEmpty(r.kwargs));
+        });
+    });
+    t.test('exec_workflow', function (openerp) {
+        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        t.expect(ds.exec_workflow(42, 'foo'), function (r) {
+            strictEqual(r['service'], 'object');
+            strictEqual(r.method, 'exec_workflow');
+
+            // db, id, password, model, method, id
+            strictEqual(r.args.length, 6);
+            strictEqual(r.args[4], 'foo');
+            strictEqual(r.args[5], 42);
+        });
+    });
+    // TODO: SearchDataSet#read_slice?
+    // TODO: non-literal domains and contexts basics
+    // TODO: call_and_eval
+    // TODO: name_search, non-literal domains
+
 });

From f67ddedd2a8e802a309ace02511795366099b776 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 24 Feb 2012 13:26:20 +0100
Subject: [PATCH 07/83] [ADD] read_slice spec tests

bzr revid: xmo@openerp.com-20120224122620-ji9h2sckpxx3kask
---
 addons/web/static/test/fulltest/dataset.js | 39 +++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
index 21b6b80cb80..d42f1b363d3 100644
--- a/addons/web/static/test/fulltest/dataset.js
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -137,7 +137,44 @@ $(document).ready(function () {
             strictEqual(r.args[5], 42);
         });
     });
-    // TODO: SearchDataSet#read_slice?
+
+    t.test('DataSetSearch#read_slice', function (openerp) {
+        var ds = new openerp.web.DataSetSearch({session: openerp.connection}, 'mod');
+        t.expect(ds.read_slice(['foo', 'bar'], {
+            domain: [['foo', '>', 42], ['qux', '=', 'grault']],
+            context: {peewee: 'herman'},
+            offset: 160,
+            limit: 80
+        }), function (r) {
+            strictEqual(r.method, 'search');
+
+            strictEqual(r.args.length, 5);
+            deepEqual(r.args[0], [['foo', '>', 42], ['qux', '=', 'grault']]);
+            strictEqual(r.args[1], 160);
+            strictEqual(r.args[2], 80);
+            strictEqual(r.args[3], false);
+            strictEqual(r.args[4].peewee, 'herman');
+
+            ok(_.isEmpty(r.kwargs));
+        });
+    });
+    t.test('DataSetSearch#read_slice sorted', function (openerp) {
+        var ds = new openerp.web.DataSetSearch({session: openerp.connection}, 'mod');
+        ds.sort('foo');
+        ds.sort('foo');
+        ds.sort('bar');
+        t.expect(ds.read_slice(['foo', 'bar'], { }), function (r) {
+            strictEqual(r.method, 'search');
+
+            strictEqual(r.args.length, 5);
+            deepEqual(r.args[0], []);
+            strictEqual(r.args[1], 0);
+            strictEqual(r.args[2], false);
+            strictEqual(r.args[3], 'bar ASC, foo DESC');
+
+            ok(_.isEmpty(r.kwargs));
+        });
+    });
     // TODO: non-literal domains and contexts basics
     // TODO: call_and_eval
     // TODO: name_search, non-literal domains

From 859991dda7922151644719416f83eb8475e7665a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 27 Feb 2012 09:51:28 +0100
Subject: [PATCH 08/83] [ADD] nonliterals in dataset tests

bzr revid: xmo@openerp.com-20120227085128-6ymxpa93pr59vjmb
---
 addons/web/static/src/js/test_support.js   | 21 +++++++++--
 addons/web/static/test/fulltest/dataset.js | 41 ++++++++++++++++++++--
 addons/web/test_support/controllers.py     | 14 +++++++-
 3 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/test_support.js b/addons/web/static/src/js/test_support.js
index 5fcfb94c6a2..d46366326b7 100644
--- a/addons/web/static/src/js/test_support.js
+++ b/addons/web/static/src/js/test_support.js
@@ -24,15 +24,26 @@ openerp.test_support = {
         });
         return connection.session_reload();
     },
-    module: function (title, tested_core, fn) {
+    module: function (title, tested_core, nonliterals) {
         var conf = QUnit.config.openerp = {};
         QUnit.module(title, {
             setup: function () {
                 QUnit.stop();
                 var oe = conf.openerp = window.openerp.init();
                 window.openerp.web[tested_core](oe);
-                openerp.test_support.setup_connection(oe.connection)
-                    .always(QUnit.start)
+                var done = openerp.test_support.setup_connection(oe.connection);
+                if (nonliterals) {
+                    done = done.pipe(function () {
+                        return oe.connection.rpc('/tests/add_nonliterals', {
+                            domains: nonliterals.domains || [],
+                            contexts: nonliterals.contexts || []
+                        }).then(function (r) {
+                            oe.domains = r.domains;
+                            oe.contexts = r.contexts;
+                        });
+                    });
+                }
+                done.always(QUnit.start)
                     .then(function () {
                         conf.openerp = oe;
                     }, function (e) {
@@ -57,6 +68,10 @@ openerp.test_support = {
                .fail(function (e) {
             if (e.code !== 200) {
                 QUnit.equal(e.code, 200, 'Testing connector should raise RPC faults');
+                if (typeof console !== 'undefined' && console.error) {
+                    console.error(e.data.debug);
+                }
+                return;
             }
             fn(e.data.fault_code);
         })
diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
index d42f1b363d3..14556e9f212 100644
--- a/addons/web/static/test/fulltest/dataset.js
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -1,5 +1,8 @@
 $(document).ready(function () {
     var t = window.openerp.test_support;
+    function context_(c) {
+        return _.extend({ lang: 'en_US', tz: 'UTC', uid: 87539319 }, c);
+    }
 
     t.module('Dataset shortcuts', 'data');
     t.test('read_index', function (openerp) {
@@ -14,6 +17,7 @@ $(document).ready(function () {
             strictEqual(result.args.length, 3);
             deepEqual(result.args[0], [30]);
             deepEqual(result.args[1], ['a', 'b', 'c']);
+            deepEqual(result.args[2], context_());
 
             ok(_.isEmpty(result.kwargs));
         });
@@ -27,8 +31,9 @@ $(document).ready(function () {
 
             strictEqual(result.args.length, 2);
             deepEqual(result.args[0], ['a', 'b', 'c']);
-            // FIXME: args[1] is context w/ user context, where to get? Hardcode?
-            strictEqual(result.args[1].foo, 'bar');
+            console.log(result.args[1]);
+            console.log(context_({foo: 'bar'}));
+            deepEqual(result.args[1], context_({foo: 'bar'}));
 
             ok(_.isEmpty(result.kwargs));
         });
@@ -40,6 +45,7 @@ $(document).ready(function () {
 
             strictEqual(r.args.length, 2);
             deepEqual(r.args[0], {foo: 1, bar: 2});
+            deepEqual(r.args[1], context_());
 
             ok(_.isEmpty(r.kwargs));
         });
@@ -52,6 +58,7 @@ $(document).ready(function () {
             strictEqual(r.args.length, 3);
             deepEqual(r.args[0], [42]);
             deepEqual(r.args[1], {foo: 1});
+            deepEqual(r.args[2], context_());
 
             ok(_.isEmpty(r.kwargs));
         });
@@ -68,6 +75,7 @@ $(document).ready(function () {
 
             strictEqual(r.args.length, 2);
             deepEqual(r.args[0], [42]);
+            deepEqual(r.args[1], context_());
 
             ok(_.isEmpty(r.kwargs));
         });
@@ -90,6 +98,7 @@ $(document).ready(function () {
 
             strictEqual(r.args.length, 2);
             deepEqual(r.args[0], [1, 2]);
+            deepEqual(r.args[1], context_());
 
             ok(_.isEmpty(r.kwargs));
         });
@@ -104,6 +113,7 @@ $(document).ready(function () {
             // domain
             deepEqual(r.args[1], []);
             strictEqual(r.args[2], 'ilike');
+            deepEqual(r.args[3], context_());
             strictEqual(r.args[4], 0);
 
             ok(_.isEmpty(r.kwargs));
@@ -119,6 +129,7 @@ $(document).ready(function () {
             // domain
             deepEqual(r.args[1], [['foo', '=', 3]]);
             strictEqual(r.args[2], 'someop');
+            deepEqual(r.args[3], context_());
             // limit
             strictEqual(r.args[4], 0);
 
@@ -171,6 +182,32 @@ $(document).ready(function () {
             strictEqual(r.args[1], 0);
             strictEqual(r.args[2], false);
             strictEqual(r.args[3], 'bar ASC, foo DESC');
+            deepEqual(r.args[4], context_());
+
+            ok(_.isEmpty(r.kwargs));
+        });
+    });
+
+    t.module('Nonliterals', 'data', {
+        domains: ['mary had a little lamb', 'bob the builder'],
+        contexts: ['{a: b > c}']
+    });
+    t.test('Dataset', function (openerp) {
+        var ds = new openerp.web.DataSetSearch(
+            {session: openerp.connection}, 'mod');
+        var c = new openerp.web.CompoundContext(
+            {a: 'foo', b: 3, c: 5}, openerp.contexts[0]);
+        t.expect(ds.read_slice(['foo', 'bar'], {
+            context: c
+        }), function (r) {
+            strictEqual(r.method, 'search');
+
+            deepEqual(r.args[4], context_({
+                foo: false,
+                a: 'foo',
+                b: 3,
+                c: 5
+            }));
 
             ok(_.isEmpty(r.kwargs));
         });
diff --git a/addons/web/test_support/controllers.py b/addons/web/test_support/controllers.py
index f8e3c7a0739..a3719070730 100644
--- a/addons/web/test_support/controllers.py
+++ b/addons/web/test_support/controllers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from ..common.http import Controller, jsonrequest
+from ..common import http, nonliterals
 from ..controllers.main import Session
 
 UID = 87539319
@@ -14,6 +14,18 @@ def bind(session):
     session.context = CONTEXT
     session.build_connection().set_login_info(DB, LOGIN, PASSWORD, UID)
 
+class TestController(http.Controller):
+    _cp_path = '/tests'
+
+    @http.jsonrequest
+    def add_nonliterals(self, req, domains, contexts):
+        return {
+            'domains': [nonliterals.Domain(req.session, domain)
+                        for domain in domains],
+            'contexts': [nonliterals.Context(req.session, context)
+                         for context in contexts]
+        }
+
 class TestSession(Session):
     _cp_path = '/web/session'
 

From 910f217da1c60b2d28854c44b5306e21741f769e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 27 Feb 2012 10:41:32 +0100
Subject: [PATCH 09/83] [IMP] update qunit to 1.3

bzr revid: xmo@openerp.com-20120227094132-dk41nad2mx854s4p
---
 addons/web/static/lib/qunit/qunit.css |  10 ++-
 addons/web/static/lib/qunit/qunit.js  | 119 +++++++++++++++++---------
 2 files changed, 85 insertions(+), 44 deletions(-)
 mode change 100755 => 100644 addons/web/static/lib/qunit/qunit.css
 mode change 100755 => 100644 addons/web/static/lib/qunit/qunit.js

diff --git a/addons/web/static/lib/qunit/qunit.css b/addons/web/static/lib/qunit/qunit.css
old mode 100755
new mode 100644
index bcecc4c0daf..58101ea34ce
--- a/addons/web/static/lib/qunit/qunit.css
+++ b/addons/web/static/lib/qunit/qunit.css
@@ -1,9 +1,9 @@
 /**
- * QUnit v1.2.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.4.0pre - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
@@ -54,6 +54,10 @@
 	color: #fff;
 }
 
+#qunit-header label {
+	display: inline-block;
+}
+
 #qunit-banner {
 	height: 5px;
 }
@@ -223,4 +227,6 @@
 	position: absolute;
 	top: -10000px;
 	left: -10000px;
+	width: 1000px;
+	height: 1000px;
 }
diff --git a/addons/web/static/lib/qunit/qunit.js b/addons/web/static/lib/qunit/qunit.js
old mode 100755
new mode 100644
index 6d2a8a7b8ab..b71381313c7
--- a/addons/web/static/lib/qunit/qunit.js
+++ b/addons/web/static/lib/qunit/qunit.js
@@ -1,9 +1,9 @@
 /**
- * QUnit v1.2.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.4.0pre - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
@@ -13,8 +13,11 @@
 var defined = {
 	setTimeout: typeof window.setTimeout !== "undefined",
 	sessionStorage: (function() {
+		var x = "qunit-test-string";
 		try {
-			return !!sessionStorage.getItem;
+			sessionStorage.setItem(x, x);
+			sessionStorage.removeItem(x);
+			return true;
 		} catch(e) {
 			return false;
 		}
@@ -25,11 +28,10 @@ var	testId = 0,
 	toString = Object.prototype.toString,
 	hasOwn = Object.prototype.hasOwnProperty;
 
-var Test = function(name, testName, expected, testEnvironmentArg, async, callback) {
+var Test = function(name, testName, expected, async, callback) {
 	this.name = name;
 	this.testName = testName;
 	this.expected = expected;
-	this.testEnvironmentArg = testEnvironmentArg;
 	this.async = async;
 	this.callback = callback;
 	this.assertions = [];
@@ -62,6 +64,10 @@ Test.prototype = {
 			runLoggingCallbacks( 'moduleStart', QUnit, {
 				name: this.module
 			} );
+		} else if (config.autorun) {
+			runLoggingCallbacks( 'moduleStart', QUnit, {
+				name: this.module
+			} );
 		}
 
 		config.current = this;
@@ -69,9 +75,6 @@ Test.prototype = {
 			setup: function() {},
 			teardown: function() {}
 		}, this.moduleTestEnvironment);
-		if (this.testEnvironmentArg) {
-			extend(this.testEnvironment, this.testEnvironmentArg);
-		}
 
 		runLoggingCallbacks( 'testStart', QUnit, {
 			name: this.testName,
@@ -274,17 +277,12 @@ var QUnit = {
 	},
 
 	test: function(testName, expected, callback, async) {
-		var name = '<span class="test-name">' + testName + '</span>', testEnvironmentArg;
+		var name = '<span class="test-name">' + escapeInnerText(testName) + '</span>';
 
 		if ( arguments.length === 2 ) {
 			callback = expected;
 			expected = null;
 		}
-		// is 2nd argument a testEnvironment?
-		if ( expected && typeof expected === 'object') {
-			testEnvironmentArg = expected;
-			expected = null;
-		}
 
 		if ( config.currentModule ) {
 			name = '<span class="module-name">' + config.currentModule + "</span>: " + name;
@@ -294,7 +292,7 @@ var QUnit = {
 			return;
 		}
 
-		var test = new Test(name, testName, expected, testEnvironmentArg, async, callback);
+		var test = new Test(name, testName, expected, async, callback);
 		test.module = config.currentModule;
 		test.moduleTestEnvironment = config.currentModuleTestEnviroment;
 		test.queue();
@@ -312,6 +310,9 @@ var QUnit = {
 	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
 	 */
 	ok: function(a, msg) {
+		if (!config.current) {
+			throw new Error("ok() assertion outside test context, was " + sourceFromStacktrace(2));
+		}
 		a = !!a;
 		var details = {
 			result: a,
@@ -447,9 +448,14 @@ var QUnit = {
 	QUnit.constructor = F;
 })();
 
-// Backwards compatibility, deprecated
-QUnit.equals = QUnit.equal;
-QUnit.same = QUnit.deepEqual;
+// deprecated; still export them to window to provide clear error messages
+// next step: remove entirely
+QUnit.equals = function() {
+	throw new Error("QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead");
+};
+QUnit.same = function() {
+	throw new Error("QUnit.same has been deprecated since 2009 (e88049a0), use QUnit.deepEqual instead");
+};
 
 // Maintain internal state
 var config = {
@@ -513,8 +519,7 @@ if ( typeof exports === "undefined" || typeof require === "undefined" ) {
 	extend(window, QUnit);
 	window.QUnit = QUnit;
 } else {
-	extend(exports, QUnit);
-	exports.QUnit = QUnit;
+	module.exports = QUnit;
 }
 
 // define these after exposing globals to keep them in these QUnit namespace only
@@ -536,6 +541,16 @@ extend(QUnit, {
 			semaphore: 0
 		});
 
+		var qunit = id( "qunit" );
+		if ( qunit ) {
+			qunit.innerHTML =
+				'<h1 id="qunit-header">' + escapeInnerText( document.title ) + '</h1>' +
+				'<h2 id="qunit-banner"></h2>' +
+				'<div id="qunit-testrunner-toolbar"></div>' +
+				'<h2 id="qunit-userAgent"></h2>' +
+				'<ol id="qunit-tests"></ol>';
+		}
+
 		var tests = id( "qunit-tests" ),
 			banner = id( "qunit-banner" ),
 			result = id( "qunit-testresult" );
@@ -564,15 +579,15 @@ extend(QUnit, {
 	/**
 	 * Resets the test setup. Useful for tests that modify the DOM.
 	 *
-	 * If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
+	 * If jQuery is available, uses jQuery's replaceWith(), otherwise use replaceChild
 	 */
 	reset: function() {
-		if ( window.jQuery ) {
-			jQuery( "#qunit-fixture" ).html( config.fixture );
-		} else {
-			var main = id( 'qunit-fixture' );
-			if ( main ) {
-				main.innerHTML = config.fixture;
+		var main = id( 'qunit-fixture' );
+		if ( main ) {
+			if ( window.jQuery ) {
+				jQuery( main ).replaceWith( config.fixture.cloneNode(true) );
+			} else {
+				main.parentNode.replaceChild(config.fixture.cloneNode(true), main);
 			}
 		}
 	},
@@ -636,6 +651,9 @@ extend(QUnit, {
 	},
 
 	push: function(result, actual, expected, message) {
+		if (!config.current) {
+			throw new Error("assertion outside test context, was " + sourceFromStacktrace());
+		}
 		var details = {
 			result: result,
 			message: message,
@@ -645,21 +663,22 @@ extend(QUnit, {
 
 		message = escapeInnerText(message) || (result ? "okay" : "failed");
 		message = '<span class="test-message">' + message + "</span>";
-		expected = escapeInnerText(QUnit.jsDump.parse(expected));
-		actual = escapeInnerText(QUnit.jsDump.parse(actual));
-		var output = message + '<table><tr class="test-expected"><th>Expected: </th><td><pre>' + expected + '</pre></td></tr>';
-		if (actual != expected) {
-			output += '<tr class="test-actual"><th>Result: </th><td><pre>' + actual + '</pre></td></tr>';
-			output += '<tr class="test-diff"><th>Diff: </th><td><pre>' + QUnit.diff(expected, actual) +'</pre></td></tr>';
-		}
+		var output = message;
 		if (!result) {
+			expected = escapeInnerText(QUnit.jsDump.parse(expected));
+			actual = escapeInnerText(QUnit.jsDump.parse(actual));
+			output += '<table><tr class="test-expected"><th>Expected: </th><td><pre>' + expected + '</pre></td></tr>';
+			if (actual != expected) {
+				output += '<tr class="test-actual"><th>Result: </th><td><pre>' + actual + '</pre></td></tr>';
+				output += '<tr class="test-diff"><th>Diff: </th><td><pre>' + QUnit.diff(expected, actual) +'</pre></td></tr>';
+			}
 			var source = sourceFromStacktrace();
 			if (source) {
 				details.source = source;
 				output += '<tr class="test-source"><th>Source: </th><td><pre>' + escapeInnerText(source) + '</pre></td></tr>';
 			}
+			output += "</table>";
 		}
-		output += "</table>";
 
 		runLoggingCallbacks( 'log', QUnit, details );
 
@@ -779,7 +798,7 @@ QUnit.load = function() {
 
 	var main = id('qunit-fixture');
 	if ( main ) {
-		config.fixture = main.innerHTML;
+		config.fixture = main.cloneNode(true);
 	}
 
 	if (config.autostart) {
@@ -847,6 +866,15 @@ function done() {
 		].join(" ");
 	}
 
+	// clear own sessionStorage items if all tests passed
+	if ( config.reorder && defined.sessionStorage && config.stats.bad === 0 ) {
+		for (var key in sessionStorage) {
+			if (sessionStorage.hasOwnProperty(key) && key.indexOf("qunit-") === 0 ) {
+				sessionStorage.removeItem(key);
+			}
+		}
+	}
+
 	runLoggingCallbacks( 'done', QUnit, {
 		failed: config.stats.bad,
 		passed: passed,
@@ -881,16 +909,21 @@ function validTest( name ) {
 
 // so far supports only Firefox, Chrome and Opera (buggy)
 // could be extended in the future to use something like https://github.com/csnover/TraceKit
-function sourceFromStacktrace() {
+function sourceFromStacktrace(offset) {
+	offset = offset || 3;
 	try {
 		throw new Error();
 	} catch ( e ) {
 		if (e.stacktrace) {
 			// Opera
-			return e.stacktrace.split("\n")[6];
+			return e.stacktrace.split("\n")[offset + 3];
 		} else if (e.stack) {
 			// Firefox, Chrome
-			return e.stack.split("\n")[4];
+			var stack = e.stack.split("\n");
+			if (/^error$/i.test(stack[0])) {
+				stack.shift();
+			}
+			return stack[offset];
 		} else if (e.sourceURL) {
 			// Safari, PhantomJS
 			// TODO sourceURL points at the 'throw new Error' line above, useless
@@ -989,6 +1022,7 @@ function fail(message, exception, callback) {
 	if ( typeof console !== "undefined" && console.error && console.warn ) {
 		console.error(message);
 		console.error(exception);
+		console.error(exception.stack);
 		console.warn(callback.toString());
 
 	} else if ( window.opera && opera.postError ) {
@@ -1368,9 +1402,9 @@ QUnit.jsDump = (function() {
 				var ret = [ ];
 				QUnit.jsDump.up();
 				for ( var key in map ) {
-				    var val = map[key];
+					var val = map[key];
 					ret.push( QUnit.jsDump.parse(key,'key') + ': ' + QUnit.jsDump.parse(val, undefined, stack));
-                }
+				}
 				QUnit.jsDump.down();
 				return join( '{', ret, '}' );
 			},
@@ -1594,4 +1628,5 @@ QUnit.diff = (function() {
 	};
 })();
 
-})(this);
+// get at whatever the global object is, like window in browsers
+})( (function() {return this}).call() );

From db670cff7aa3f946fb0fd6c1b2cdeaf16c667f55 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 27 Feb 2012 11:26:05 +0100
Subject: [PATCH 10/83] Nonliteral domains, name_search w/ nonliteral domains

bzr revid: xmo@openerp.com-20120227102605-wvn1osn1wxgbdiio
---
 addons/web/static/test/fulltest/dataset.js | 31 +++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
index 14556e9f212..4924e3b9c78 100644
--- a/addons/web/static/test/fulltest/dataset.js
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -189,7 +189,10 @@ $(document).ready(function () {
     });
 
     t.module('Nonliterals', 'data', {
-        domains: ['mary had a little lamb', 'bob the builder'],
+        domains: [
+            "[('model_id', '=', parent.model)]",
+            "[('product_id','=',product_id)]"
+        ],
         contexts: ['{a: b > c}']
     });
     t.test('Dataset', function (openerp) {
@@ -212,6 +215,32 @@ $(document).ready(function () {
             ok(_.isEmpty(r.kwargs));
         });
     });
+    t.test('name_search', function (openerp) {
+        var eval_context = {
+            active_id: 42,
+            active_ids: [42],
+            active_model: 'mod',
+            parent: {model: 'qux'}
+        };
+        var ds = new openerp.web.DataSet(
+            {session: openerp.connection}, 'mod',
+             new openerp.web.CompoundContext({})
+                 .set_eval_context(eval_context));
+        var domain = new openerp.web.CompoundDomain(openerp.domains[0])
+                .set_eval_context(eval_context);
+        t.expect(ds.name_search('foo', domain, 'ilike', 0), function (r) {
+            strictEqual(r.method, 'name_search');
+
+            strictEqual(r.args.length, 5);
+            strictEqual(r.args[0], 'foo');
+            deepEqual(r.args[1], [['model_id', '=', 'qux']]);
+            strictEqual(r.args[2], 'ilike');
+            deepEqual(r.args[3], context_());
+            strictEqual(r.args[4], 0);
+
+            ok(_.isEmpty(r.kwargs));
+        });
+    });
     // TODO: non-literal domains and contexts basics
     // TODO: call_and_eval
     // TODO: name_search, non-literal domains

From b8efd17bbb552f5516746a6edf27c509e89313e5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 27 Feb 2012 11:28:20 +0100
Subject: [PATCH 11/83] [REM] todos

bzr revid: xmo@openerp.com-20120227102820-t5hmrrsbcd5pcw61
---
 addons/web/static/test/fulltest/dataset.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
index 4924e3b9c78..e9513b00b74 100644
--- a/addons/web/static/test/fulltest/dataset.js
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -241,8 +241,4 @@ $(document).ready(function () {
             ok(_.isEmpty(r.kwargs));
         });
     });
-    // TODO: non-literal domains and contexts basics
-    // TODO: call_and_eval
-    // TODO: name_search, non-literal domains
-
 });

From e6f5d4c211e00ad8ce5f6cae24a65875c2bccf7c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 27 Feb 2012 14:56:26 +0100
Subject: [PATCH 12/83] [ADD] Model API, reimplement DataSet/DataSetSearch on
 top of it (as much as possible)

TODO: traversal state API, removing even more method (e.g. completely remove DataSet.call in the Python API)

bzr revid: xmo@openerp.com-20120227135626-yxqh0gc6jwrdkshs
---
 addons/web/controllers/main.py             |  73 +----
 addons/web/static/src/js/core.js           |   2 +-
 addons/web/static/src/js/data.js           | 349 +++++++++++++--------
 addons/web/static/test/fulltest/dataset.js | 103 +++---
 doc/source/changelog-6.2.rst               |  37 +++
 doc/source/index.rst                       |  11 +
 doc/source/rpc.rst                         | 141 +++++++++
 7 files changed, 468 insertions(+), 248 deletions(-)
 create mode 100644 doc/source/changelog-6.2.rst
 create mode 100644 doc/source/rpc.rst

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index eaf3d671874..6a143d58231 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -819,11 +819,6 @@ class Menu(openerpweb.Controller):
 class DataSet(openerpweb.Controller):
     _cp_path = "/web/dataset"
 
-    @openerpweb.jsonrequest
-    def fields(self, req, model):
-        return {'fields': req.session.model(model).fields_get(False,
-                                                              req.session.eval_context(req.context))}
-
     @openerpweb.jsonrequest
     def search_read(self, req, model, fields=False, offset=0, limit=False, domain=None, sort=None):
         return self.do_search_read(req, model, fields, offset, limit, domain, sort)
@@ -859,7 +854,6 @@ class DataSet(openerpweb.Controller):
         if fields and fields == ['id']:
             # shortcut read if we only want the ids
             return {
-                'ids': ids,
                 'length': length,
                 'records': [{'id': id} for id in ids]
             }
@@ -867,46 +861,10 @@ class DataSet(openerpweb.Controller):
         records = Model.read(ids, fields or False, context)
         records.sort(key=lambda obj: ids.index(obj['id']))
         return {
-            'ids': ids,
             'length': length,
             'records': records
         }
 
-
-    @openerpweb.jsonrequest
-    def read(self, req, model, ids, fields=False):
-        return self.do_search_read(req, model, ids, fields)
-
-    @openerpweb.jsonrequest
-    def get(self, req, model, ids, fields=False):
-        return self.do_get(req, model, ids, fields)
-
-    def do_get(self, req, model, ids, fields=False):
-        """ Fetches and returns the records of the model ``model`` whose ids
-        are in ``ids``.
-
-        The results are in the same order as the inputs, but elements may be
-        missing (if there is no record left for the id)
-
-        :param req: the JSON-RPC2 request object
-        :type req: openerpweb.JsonRequest
-        :param model: the model to read from
-        :type model: str
-        :param ids: a list of identifiers
-        :type ids: list
-        :param fields: a list of fields to fetch, ``False`` or empty to fetch
-                       all fields in the model
-        :type fields: list | False
-        :returns: a list of records, in the same order as the list of ids
-        :rtype: list
-        """
-        Model = req.session.model(model)
-        records = Model.read(ids, fields, req.session.eval_context(req.context))
-
-        record_map = dict((record['id'], record) for record in records)
-
-        return [record_map[id] for id in ids if record_map.get(id)]
-
     @openerpweb.jsonrequest
     def load(self, req, model, id, fields):
         m = req.session.model(model)
@@ -916,23 +874,6 @@ class DataSet(openerpweb.Controller):
             value = r[0]
         return {'value': value}
 
-    @openerpweb.jsonrequest
-    def create(self, req, model, data):
-        m = req.session.model(model)
-        r = m.create(data, req.session.eval_context(req.context))
-        return {'result': r}
-
-    @openerpweb.jsonrequest
-    def save(self, req, model, id, data):
-        m = req.session.model(model)
-        r = m.write([id], data, req.session.eval_context(req.context))
-        return {'result': r}
-
-    @openerpweb.jsonrequest
-    def unlink(self, req, model, ids=()):
-        Model = req.session.model(model)
-        return Model.unlink(ids, req.session.eval_context(req.context))
-
     def call_common(self, req, model, method, args, domain_id=None, context_id=None):
         has_domain = domain_id is not None and domain_id < len(args)
         has_context = context_id is not None and context_id < len(args)
@@ -1008,19 +949,7 @@ class DataSet(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def exec_workflow(self, req, model, id, signal):
-        r = req.session.exec_workflow(model, id, signal)
-        return {'result': r}
-
-    @openerpweb.jsonrequest
-    def default_get(self, req, model, fields):
-        Model = req.session.model(model)
-        return Model.default_get(fields, req.session.eval_context(req.context))
-
-    @openerpweb.jsonrequest
-    def name_search(self, req, model, search_str, domain=[], context={}):
-        m = req.session.model(model)
-        r = m.name_search(search_str+'%', domain, '=ilike', context)
-        return {'result': r}
+        return req.session.exec_workflow(model, id, signal)
 
 class DataGroup(openerpweb.Controller):
     _cp_path = "/web/group"
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 10f3167b330..b07800203b2 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -452,7 +452,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
      * setting the correct session id and session context in the parameter
      * objects
      *
-     * @param {String} url RPC endpoint
+     * @param {Object} url RPC endpoint
      * @param {Object} params call parameters
      * @param {Function} success_callback function to execute on RPC call success
      * @param {Function} error_callback function to execute on RPC call failure
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 8e200951eaa..58e491cc52c 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -9,15 +9,167 @@ openerp.web.data = function(openerp) {
  * @returns {String} SQL-like sorting string (``ORDER BY``) clause
  */
 openerp.web.serialize_sort = function (criterion) {
-    return _.map(criterion,
-        function (criteria) {
-            if (criteria[0] === '-') {
-                return criteria.slice(1) + ' DESC';
-            }
-            return criteria + ' ASC';
-        }).join(', ');
+   return _.map(criterion,
+       function (criteria) {
+           if (criteria[0] === '-') {
+               return criteria.slice(1) + ' DESC';
+           }
+           return criteria + ' ASC';
+       }).join(', ');
 };
 
+openerp.web.Query = openerp.web.Class.extend({
+    init: function (model, fields) {
+        this._model = model;
+        this._fields = fields;
+        this._filter = [];
+        this._context = {};
+        this._limit = false;
+        this._offset = 0;
+        this._order_by = [];
+    },
+    clone: function (to_set) {
+        to_set = to_set || {};
+        var q = new openerp.web.Query(this._model, this._fields);
+        q._context = this._context;
+        q._filter = this._filter;
+        q._limit = this._limit;
+        q._offset = this._offset;
+        q._order_by = this._order_by;
+
+        for(var key in to_set) {
+            if (!to_set.hasOwnProperty(key)) { continue; }
+            switch(key) {
+            case 'filter':
+                q._filter = new openerp.web.CompoundDomain(
+                        q._filter, to_set.filter);
+                break;
+            case 'context':
+                q._context = new openerp.web.CompoundContext(
+                        q._context, to_set.context);
+                break;
+            case 'limit':
+            case 'offset':
+            case 'order_by':
+                q['_' + key] = to_set[key];
+            }
+        }
+        return q;
+    },
+    _execute: function () {
+        var self = this;
+        return openerp.connection.rpc('/web/dataset/search_read', {
+            model: this._model.name,
+            fields: this._fields || false,
+            domain: this._model.domain(this._filter),
+            context: this._model.context(this._context),
+            offset: this._offset,
+            limit: this._limit,
+            sort: openerp.web.serialize_sort(this._order_by)
+        }).pipe(function (results) {
+            self._count = results.length;
+            return results.records;
+        }, null);
+    },
+    first: function () {
+        var self = this;
+        return this.clone({limit: 1})._execute().pipe(function (records) {
+            delete self._count;
+            if (records.length) { return records[0]; }
+            return null;
+        });
+    },
+    all: function () {
+        return this._execute();
+    },
+    context: function (context) {
+        if (!context) { return this; }
+        return this.clone({context: context});
+    },
+    count: function () {
+        if (this._count) { return $.when(this._count); }
+        return this.model.call(
+            'search_count', [this._filter], {
+                context: this._model.context(this._context)});
+    },
+    filter: function (domain) {
+        if (!domain) { return this; }
+        return this.clone({filter: domain});
+    },
+    limit: function (limit) {
+        return this.clone({limit: limit});
+    },
+    offset: function (offset) {
+        return this.clone({offset: offset});
+    },
+    order_by: function () {
+        if (arguments.length === 0) { return this; }
+        return this.clone({order_by: _.toArray(arguments)});
+    }
+});
+
+openerp.web.Model = openerp.web.CallbackEnabled.extend({
+    init: function (model_name, context, domain) {
+        this._super();
+        this.name = model_name;
+        this._context = context || {};
+        this._domain = domain || [];
+    },
+    /*
+     * @deprecated does not allow to specify kwargs, directly use call() instead
+     */
+    get_func: function (method_name) {
+        var self = this;
+        return function () {
+            return self.call(method_name, _.toArray(arguments));
+        };
+    },
+    call: function (method, args, kwargs) {
+        args = args || [];
+        kwargs = kwargs || {};
+        return openerp.connection.rpc('/web/dataset/call_kw', {
+            model: this.name,
+            method: method,
+            args: args,
+            kwargs: kwargs
+        });
+    },
+    exec_workflow: function (id, signal) {
+        return openerp.connection.rpc('/web/dataset/exec_workflow', {
+            model: this.name,
+            id: id,
+            signal: signal
+        });
+    },
+    query: function (fields) {
+        return new openerp.web.Query(this, fields);
+    },
+    domain: function (domain) {
+        return new openerp.web.CompoundDomain(
+            this._domain, domain || []);
+    },
+    context: function (context) {
+        return new openerp.web.CompoundContext(
+            openerp.connection.user_context, this._context, context || {});
+    },
+    /**
+     * Button action caller, needs to perform cleanup if an action is returned
+     * from the button (parsing of context and domain, and fixup of the views
+     * collection for act_window actions)
+     *
+     * FIXME: remove when evaluator integrated
+     */
+    call_button: function (method, args) {
+        return this.rpc('/web/dataset/call_button', {
+            model: this.model,
+            method: method,
+            domain_id: null,
+            context_id: args.length - 1,
+            args: args || []
+        });
+    },
+});
+
 openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.DataGroup# */{
     /**
      * Management interface between views and grouped collections of OpenERP
@@ -249,6 +401,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
         this.context = context || {};
         this.index = null;
         this._sort = [];
+        this._model = new openerp.web.Model(model, context);
     },
     previous: function () {
         this.index -= 1;
@@ -296,13 +449,10 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     read_ids: function (ids, fields, options) {
-        var options = options || {};
-        return this.rpc('/web/dataset/get', {
-            model: this.model,
-            ids: ids,
-            fields: fields,
-            context: this.get_context(options.context)
-        });
+        // TODO: reorder results to match ids list
+        return this._model.call('read',
+            [ids, fields || false],
+            {context: this._model.context(options.context)});
     },
     /**
      * Read a slice of the records represented by this DataSet, based on its
@@ -315,7 +465,14 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     read_slice: function (fields, options) {
-        return null;
+        var self = this;
+        options = options || {};
+        return this._model.query(fields)
+                .limit(options.limit || false)
+                .offset(options.offset || 0)
+                .all().then(function (records) {
+            self.ids = _(records).pluck('id');
+        });
     },
     /**
      * Reads the current dataset record (from its index)
@@ -325,18 +482,13 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     read_index: function (fields, options) {
-        var def = $.Deferred();
-        if (_.isEmpty(this.ids)) {
-            def.reject();
-        } else {
-            fields = fields || false;
-            this.read_ids([this.ids[this.index]], fields, options).then(function(records) {
-                def.resolve(records[0]);
-            }, function() {
-                def.reject.apply(def, arguments);
-            });
-        }
-        return def.promise();
+        options = options || {};
+        // not very good
+        return this._model.query(fields)
+            .offset(this.index).first().pipe(function (record) {
+                if (!record) { return $.Deferred().reject().promise(); }
+                return record;
+        });
     },
     /**
      * Reads default values for the current model
@@ -346,12 +498,9 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     default_get: function(fields, options) {
-        var options = options || {};
-        return this.rpc('/web/dataset/default_get', {
-            model: this.model,
-            fields: fields,
-            context: this.get_context(options.context)
-        });
+        options = options || {};
+        return this._model.call('default_get',
+            [fields], {context: this._model.context(options.context)});
     },
     /**
      * Creates a new record in db
@@ -362,11 +511,10 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     create: function(data, callback, error_callback) {
-        return this.rpc('/web/dataset/create', {
-            model: this.model,
-            data: data,
-            context: this.get_context()
-        }, callback, error_callback);
+        return this._model.call('create',
+            [data], {context: this._model.context()})
+                .pipe(function (r) { return {result: r}; })
+                    .then(callback, error_callback);
     },
     /**
      * Saves the provided data in an existing db record
@@ -379,12 +527,10 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      */
     write: function (id, data, options, callback, error_callback) {
         options = options || {};
-        return this.rpc('/web/dataset/save', {
-            model: this.model,
-            id: id,
-            data: data,
-            context: this.get_context(options.context)
-        }, callback, error_callback);
+        return this._model.call('write',
+            [[id], data], {context: this._model.context(options.context)})
+                .pipe(function (r) { return {result: r}})
+                    .then(callback, error_callback);
     },
     /**
      * Deletes an existing record from the database
@@ -394,9 +540,9 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @param {Function} error_callback function called in case of deletion error
      */
     unlink: function(ids, callback, error_callback) {
-        var self = this;
-        return this.call_and_eval("unlink", [ids, this.get_context()], null, 1,
-            callback, error_callback);
+        return this._model.call('unlink',
+            [ids], {context: this._model.context()})
+                .then(callback, error_callback);
     },
     /**
      * Calls an arbitrary RPC method
@@ -408,11 +554,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     call: function (method, args, callback, error_callback) {
-        return this.rpc('/web/dataset/call', {
-            model: this.model,
-            method: method,
-            args: args || []
-        }, callback, error_callback);
+        return this._model.call(method, args).then(callback, error_callback);
     },
     /**
      * Calls an arbitrary method, with more crazy
@@ -446,13 +588,8 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     call_button: function (method, args, callback, error_callback) {
-        return this.rpc('/web/dataset/call_button', {
-            model: this.model,
-            method: method,
-            domain_id: null,
-            context_id: args.length - 1,
-            args: args || []
-        }, callback, error_callback);
+        return this._model.call_button(method, args)
+            .then(callback, error_callback);
     },
     /**
      * Fetches the "readable name" for records, based on intrinsic rules
@@ -462,7 +599,9 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     name_get: function(ids, callback) {
-        return this.call_and_eval('name_get', [ids, this.get_context()], null, 1, callback);
+        return this._model.call('name_get',
+            [ids], {context: this._model.context()})
+                .then(callback);
     },
     /**
      * 
@@ -474,29 +613,30 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     name_search: function (name, domain, operator, limit, callback) {
-        return this.call_and_eval('name_search',
-            [name || '', domain || false, operator || 'ilike', this.get_context(), limit || 0],
-            1, 3, callback);
+        return this._model.call('name_search', [], {
+            name: name || '',
+            args: domain || false,
+            operator: operator || 'ilike',
+            context: this._model.context(),
+            limit: limit || 0
+        }).then(callback);
     },
     /**
      * @param name
      * @param callback
      */
     name_create: function(name, callback) {
-        return this.call_and_eval('name_create', [name, this.get_context()], null, 1, callback);
+        return this._model.call('name_create',
+            [name], {context: this._model.context()})
+                .then(callback);
     },
     exec_workflow: function (id, signal, callback) {
-        return this.rpc('/web/dataset/exec_workflow', {
-            model: this.model,
-            id: id,
-            signal: signal
-        }, callback);
+        return this._model.exec_workflow(id, signal)
+            .pipe(function (result) { return { result: result }; })
+                .then(callback);
     },
     get_context: function(request_context) {
-        if (request_context) {
-            return new openerp.web.CompoundContext(this.context, request_context);
-        }
-        return this.context;
+        return this._model.context(request_context);
     },
     /**
      * Reads or changes sort criteria on the dataset.
@@ -573,11 +713,9 @@ openerp.web.DataSetSearch =  openerp.web.DataSet.extend(/** @lends openerp.web.D
     init: function(parent, model, context, domain) {
         this._super(parent, model, context);
         this.domain = domain || [];
-        this.offset = 0;
-        this._length;
-        // subset records[offset:offset+limit]
-        // is it necessary ?
+        this._length = null;
         this.ids = [];
+        this._model = new openerp.web.Model(model, context, domain);
     },
     /**
      * Read a slice of the records represented by this DataSet, based on its
@@ -594,27 +732,20 @@ openerp.web.DataSetSearch =  openerp.web.DataSet.extend(/** @lends openerp.web.D
     read_slice: function (fields, options) {
         options = options || {};
         var self = this;
-        var offset = options.offset || 0;
-        return this.rpc('/web/dataset/search_read', {
-            model: this.model,
-            fields: fields || false,
-            domain: this.get_domain(options.domain),
-            context: this.get_context(options.context),
-            sort: this.sort(),
-            offset: offset,
-            limit: options.limit || false
-        }).pipe(function (result) {
-            self.ids = result.ids;
-            self.offset = offset;
-            self._length = result.length;
-            return result.records;
+        var q = this._model.query(fields || false)
+            .filter(options.domain)
+            .context(options.context)
+            .offset(options.offset || 0)
+            .limit(options.limit || false);
+        q = q.order_by.apply(q, this._sort);
+        return q.all().then(function (records) {
+            // FIXME: not sure about that one, *could* have discarded count
+            q.count().then(function (count) { this._length = count; });
+            self.ids = _(records).pluck('id');
         });
     },
     get_domain: function (other_domain) {
-        if (other_domain) {
-            return new openerp.web.CompoundDomain(this.domain, other_domain);
-        }
-        return this.domain;
+        this._model.domain(other_domain);
     },
     unlink: function(ids, callback, error_callback) {
         var self = this;
@@ -841,34 +972,6 @@ openerp.web.ProxyDataSet = openerp.web.DataSetSearch.extend({
     on_unlink: function(ids) {}
 });
 
-openerp.web.Model = openerp.web.CallbackEnabled.extend({
-    init: function(model_name) {
-        this._super();
-        this.model_name = model_name;
-    },
-    rpc: function() {
-        var c = openerp.connection;
-        return c.rpc.apply(c, arguments);
-    },
-    /*
-     * deprecated because it does not allow to specify kwargs, directly use call() instead
-     */
-    get_func: function(method_name) {
-        var self = this;
-        return function() {
-            return self.call(method_name, _.toArray(arguments), {});
-        };
-    },
-    call: function (method, args, kwargs) {
-        return this.rpc('/web/dataset/call_kw', {
-            model: this.model_name,
-            method: method,
-            args: args,
-            kwargs: kwargs
-        });
-    }
-});
-
 openerp.web.CompoundContext = openerp.web.Class.extend({
     init: function () {
         this.__ref = "compound_context";
diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
index e9513b00b74..1b09bb7dc79 100644
--- a/addons/web/static/test/fulltest/dataset.js
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -11,13 +11,15 @@ $(document).ready(function () {
         ds.ids = [10, 20, 30, 40, 50];
         ds.index = 2;
         t.expect(ds.read_index(['a', 'b', 'c']), function (result) {
-            strictEqual(result.method, 'read');
+            strictEqual(result.method, 'search');
             strictEqual(result.model, 'some.model');
 
-            strictEqual(result.args.length, 3);
-            deepEqual(result.args[0], [30]);
-            deepEqual(result.args[1], ['a', 'b', 'c']);
-            deepEqual(result.args[2], context_());
+            strictEqual(result.args.length, 5);
+            deepEqual(result.args[0], []);
+            strictEqual(result.args[1], 2);
+            strictEqual(result.args[2], 1);
+            strictEqual(result.args[3], false);
+            deepEqual(result.args[4], context_());
 
             ok(_.isEmpty(result.kwargs));
         });
@@ -29,13 +31,12 @@ $(document).ready(function () {
             strictEqual(result.method, 'default_get');
             strictEqual(result.model, 'some.model');
 
-            strictEqual(result.args.length, 2);
+            strictEqual(result.args.length, 1);
             deepEqual(result.args[0], ['a', 'b', 'c']);
-            console.log(result.args[1]);
-            console.log(context_({foo: 'bar'}));
-            deepEqual(result.args[1], context_({foo: 'bar'}));
 
-            ok(_.isEmpty(result.kwargs));
+            deepEqual(result.kwargs, {
+                context: context_({foo: 'bar'})
+            });
         });
     });
     t.test('create', function (openerp) {
@@ -43,11 +44,12 @@ $(document).ready(function () {
         t.expect(ds.create({foo: 1, bar: 2}), function (r) {
             strictEqual(r.method, 'create');
 
-            strictEqual(r.args.length, 2);
+            strictEqual(r.args.length, 1);
             deepEqual(r.args[0], {foo: 1, bar: 2});
-            deepEqual(r.args[1], context_());
 
-            ok(_.isEmpty(r.kwargs));
+            deepEqual(r.kwargs, {
+                context: context_()
+            });
         });
     });
     t.test('write', function (openerp) {
@@ -55,12 +57,12 @@ $(document).ready(function () {
         t.expect(ds.write(42, {foo: 1}), function (r) {
             strictEqual(r.method, 'write');
 
-            strictEqual(r.args.length, 3);
+            strictEqual(r.args.length, 2);
             deepEqual(r.args[0], [42]);
             deepEqual(r.args[1], {foo: 1});
-            deepEqual(r.args[2], context_());
-
-            ok(_.isEmpty(r.kwargs));
+            deepEqual(r.kwargs, {
+                context: context_()
+            });
         });
         // FIXME: can't run multiple sessions in the same test(), fucks everything up
 //        t.expect(ds.write(42, {foo: 1}, { context: {lang: 'bob'} }), function (r) {
@@ -73,11 +75,11 @@ $(document).ready(function () {
         t.expect(ds.unlink([42]), function (r) {
             strictEqual(r.method, 'unlink');
 
-            strictEqual(r.args.length, 2);
+            strictEqual(r.args.length, 1);
             deepEqual(r.args[0], [42]);
-            deepEqual(r.args[1], context_());
-
-            ok(_.isEmpty(r.kwargs));
+            deepEqual(r.kwargs, {
+                context: context_()
+            });
         });
     });
     t.test('call', function (openerp) {
@@ -96,11 +98,11 @@ $(document).ready(function () {
         t.expect(ds.name_get([1, 2], null), function (r) {
             strictEqual(r.method, 'name_get');
 
-            strictEqual(r.args.length, 2);
+            strictEqual(r.args.length, 1);
             deepEqual(r.args[0], [1, 2]);
-            deepEqual(r.args[1], context_());
-
-            ok(_.isEmpty(r.kwargs));
+            deepEqual(r.kwargs, {
+                context: context_()
+            });
         });
     });
     t.test('name_search, name', function (openerp) {
@@ -108,15 +110,14 @@ $(document).ready(function () {
         t.expect(ds.name_search('bob'), function (r) {
             strictEqual(r.method, 'name_search');
 
-            strictEqual(r.args.length, 5);
-            strictEqual(r.args[0], 'bob');
-            // domain
-            deepEqual(r.args[1], []);
-            strictEqual(r.args[2], 'ilike');
-            deepEqual(r.args[3], context_());
-            strictEqual(r.args[4], 0);
-
-            ok(_.isEmpty(r.kwargs));
+            strictEqual(r.args.length, 0);
+            deepEqual(r.kwargs, {
+                name: 'bob',
+                args: false,
+                operator: 'ilike',
+                context: context_(),
+                limit: 0
+            });
         });
     });
     t.test('name_search, domain & operator', function (openerp) {
@@ -124,16 +125,14 @@ $(document).ready(function () {
         t.expect(ds.name_search(0, [['foo', '=', 3]], 'someop'), function (r) {
             strictEqual(r.method, 'name_search');
 
-            strictEqual(r.args.length, 5);
-            strictEqual(r.args[0], '');
-            // domain
-            deepEqual(r.args[1], [['foo', '=', 3]]);
-            strictEqual(r.args[2], 'someop');
-            deepEqual(r.args[3], context_());
-            // limit
-            strictEqual(r.args[4], 0);
-
-            ok(_.isEmpty(r.kwargs));
+            strictEqual(r.args.length, 0);
+            deepEqual(r.kwargs, {
+                name: '',
+                args: [['foo', '=', 3]],
+                operator: 'someop',
+                context: context_(),
+                limit: 0
+            });
         });
     });
     t.test('exec_workflow', function (openerp) {
@@ -231,14 +230,14 @@ $(document).ready(function () {
         t.expect(ds.name_search('foo', domain, 'ilike', 0), function (r) {
             strictEqual(r.method, 'name_search');
 
-            strictEqual(r.args.length, 5);
-            strictEqual(r.args[0], 'foo');
-            deepEqual(r.args[1], [['model_id', '=', 'qux']]);
-            strictEqual(r.args[2], 'ilike');
-            deepEqual(r.args[3], context_());
-            strictEqual(r.args[4], 0);
-
-            ok(_.isEmpty(r.kwargs));
+            strictEqual(r.args.length, 0);
+            deepEqual(r.kwargs, {
+                name: 'foo',
+                args: [['model_id', '=', 'qux']],
+                operator: 'ilike',
+                context: context_(),
+                limit: 0
+            });
         });
     });
 });
diff --git a/doc/source/changelog-6.2.rst b/doc/source/changelog-6.2.rst
new file mode 100644
index 00000000000..2b492472f0f
--- /dev/null
+++ b/doc/source/changelog-6.2.rst
@@ -0,0 +1,37 @@
+API changes from OpenERP Web 6.1 to 6.2
+=======================================
+
+DataSet -> Model
+----------------
+
+The 6.1 ``DataSet`` API has been deprecated in favor of the smaller
+and more orthogonal :doc:`Model </rpc>` API, which more closely
+matches the API in OpenERP Web's Python side and in OpenObject addons
+and removes most stateful behavior of DataSet.
+
+Migration guide
+~~~~~~~~~~~~~~~
+
+Rationale
+~~~~~~~~~
+
+Renaming
+
+    The name *DataSet* exists in the CS community consciousness, and
+    (as its name implies) it's a set of data (often fetched from a
+    database, maybe lazily). OpenERP Web's dataset behaves very
+    differently as it does not store (much) data (only a bunch of ids
+    and just enough state to break things). The name "Model" matches
+    the one used on the Python side for the task of building an RPC
+    proxy to OpenERP objects.
+
+API simplification
+
+    ``DataSet`` has a number of methods which serve as little more
+    than shortcuts, or are there due to domain and context evaluation
+    issues in 6.1.
+
+    The shortcuts really add little value, and OpenERP Web embeds a
+    restricted Python evaluator (in javascript) meaning most of the
+    context and domain parsing & evaluation can be moved to the
+    javascript code and does not require cooperative RPC bridging.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index efa4d1ce812..99756633b43 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -8,6 +8,17 @@ Welcome to OpenERP Web's documentation!
 
 Contents:
 
+.. toctree::
+    :maxdepth: 1
+
+    changelog-6.2
+
+    async
+    rpc
+
+Older stuff
+-----------
+
 .. toctree::
    :maxdepth: 2
 
diff --git a/doc/source/rpc.rst b/doc/source/rpc.rst
new file mode 100644
index 00000000000..8ed72e8520b
--- /dev/null
+++ b/doc/source/rpc.rst
@@ -0,0 +1,141 @@
+Outside the box: network interactions
+=====================================
+
+Building static displays is all nice and good and allows for neat
+effects (and sometimes you're given data to display from third parties
+so you don't have to make any effort), but a point generally comes
+where you'll want to talk to the world and make some network requests.
+
+OpenERP Web provides two primary APIs to handle this, a low-level
+JSON-RPC based API communicating with the Python section of OpenERP
+Web (and of your addon, if you have a Python part) and a high-level
+API above that allowing your code to talk directly to the OpenERP
+server, using familiar-looking calls.
+
+All networking APIs are :doc:`asynchronous </async>`. As a result, all
+of them will return :js:class:`Deferred` objects (whether they resolve
+those with values or not). Understanding how those work before before
+moving on is probably necessary.
+
+High-level API: calling into OpenERP models
+-------------------------------------------
+
+Access to OpenERP object methods (made available through XML-RPC from
+the server) is done via the :js:class:`openerp.web.Model` class. This
+class maps ontwo the OpenERP server objects via two primary methods,
+:js:func:`~openerp.web.Model.call` and
+:js:func:`~openerp.web.Model.query`.
+
+:js:func:`~openerp.web.Model.call` is a direct mapping to the
+corresponding method of the OpenERP server object.
+
+:js:func:`~openerp.web.Model.query` is a shortcut for a builder-style
+iterface to searches (``search`` + ``read`` in OpenERP RPC terms). It
+returns a :js:class:`~openerp.web.Query` object which is immutable but
+allows building new :js:class:`~openerp.web.Query` instances from the
+first one, adding new properties or modifiying the parent object's.
+
+The query is only actually performed when calling one of the query
+serialization methods, :js:func:`~openerp.web.Query.all` and
+:js:func:`~openerp.web.Query.first`. These methods will perform a new
+RPC query every time they are called.
+
+.. js:class:: openerp.web.Model(name)
+
+    .. js:attribute:: openerp.web.Model.name
+
+        name of the OpenERP model this object is bound to
+
+    .. js:function:: openerp.web.Model.call(method, args, kwargs)
+
+         Calls the ``method`` method of the current model, with the
+         provided positional and keyword arguments.
+
+         :param String method: method to call over rpc on the
+                               :js:attr:`~openerp.web.Model.name`
+         :param Array<> args: positional arguments to pass to the
+                              method, optional
+         :param Object<> kwargs: keyword arguments to pass to the
+                                 method, optional
+         :rtype: Deferred<>         
+
+    .. js:function:: openerp.web.Model.query(fields)
+
+         :param Array<String> fields: list of fields to fetch during
+                                      the search
+         :returns: a :js:class:`~openerp.web.Query` object
+                   representing the search to perform
+
+.. js:class:: openerp.web.Query(fields)
+
+    The first set of methods is the "fetching" methods. They perform
+    RPC queries using the internal data of the object they're called
+    on.
+
+    .. js:function:: openerp.web.Query.all()
+
+        Fetches the result of the current
+        :js:class:`~openerp.web.Query` object's search.
+
+        :rtype: Deferred<Array<>>
+
+    .. js:function:: openerp.web.Query.first()
+
+       Fetches the **first** result of the current
+       :js:class:`~openerp.web.Query`, or ``null`` if the current
+       :js:class:`~openerp.web.Query` does have any result.
+
+       :rtype: Deferred<Object | null>
+
+    .. js:function:: openerp.web.Query.count()
+
+       Fetches the number of records the current
+       :js:class:`~openerp.web.Query` would retrieve.
+
+       :rtype: Deferred<Number>
+
+    The second set of methods is the "mutator" methods, they create a
+    **new** :js:class:`~openerp.web.Query` object with the relevant
+    (internal) attribute either augmented or replaced.
+
+    .. js:function:: openerp.web.Query.context(ctx)
+
+       Adds the provided ``ctx`` to the query, on top of any existing
+       context
+
+    .. js:function:: openerp.web.Query.filter(domain)
+
+       Adds the provided domain to the query, this domain is
+       ``AND``-ed to the existing query domain.
+
+    .. js:function:: opeenrp.web.Query.offset(offset)
+
+       Sets the provided offset on the query. The new offset
+       *replaces* the old one.
+
+    .. js:function:: openerp.web.Query.limit(limit)
+
+       Sets the provided limit on the query. The new limit *replaces*
+       the old one.
+
+    .. js:function:: openerp.web.Query.order_by(fields…)
+
+       Overrides the model's natural order with the provided field
+       specifications. Behaves much like Django's `QuerySet.order_by
+       <https://docs.djangoproject.com/en/dev/ref/models/querysets/#order-by>`_:
+
+       * Takes 1..n field names, in order of most to least importance
+         (the first field is the first sorting key). Fields are
+         provided as strings.
+
+       * A field specifies an ascending order, unless it is prefixed
+         with the minus sign "``-``" in which case the field is used
+         in the descending order
+
+       Divergences from Django's sorting include a lack of random sort
+       (``?`` field) and the inability to "drill down" into relations
+       for sorting.
+
+Low-level API: RPC calls to Python side
+---------------------------------------
+

From f26eff28a9a0af862eadcea90bf97bfae6c108f2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Feb 2012 14:03:21 +0100
Subject: [PATCH 13/83] [FIX] typos

bzr revid: xmo@openerp.com-20120228130321-rzxy8axbqtnjr1ze
---
 addons/web/static/src/js/data.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 58e491cc52c..aa760e7df44 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -88,7 +88,7 @@ openerp.web.Query = openerp.web.Class.extend({
     },
     count: function () {
         if (this._count) { return $.when(this._count); }
-        return this.model.call(
+        return this._model.call(
             'search_count', [this._filter], {
                 context: this._model.context(this._context)});
     },
@@ -449,6 +449,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     read_ids: function (ids, fields, options) {
+        options = options || {};
         // TODO: reorder results to match ids list
         return this._model.call('read',
             [ids, fields || false],
@@ -485,6 +486,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
         options = options || {};
         // not very good
         return this._model.query(fields)
+            .context(options.context)
             .offset(this.index).first().pipe(function (record) {
                 if (!record) { return $.Deferred().reject().promise(); }
                 return record;
@@ -738,9 +740,10 @@ openerp.web.DataSetSearch =  openerp.web.DataSet.extend(/** @lends openerp.web.D
             .offset(options.offset || 0)
             .limit(options.limit || false);
         q = q.order_by.apply(q, this._sort);
+
         return q.all().then(function (records) {
             // FIXME: not sure about that one, *could* have discarded count
-            q.count().then(function (count) { this._length = count; });
+            q.count().then(function (count) { self._length = count; });
             self.ids = _(records).pluck('id');
         });
     },

From 739d1c73637ce9afe8bb732422ed88066568dc38 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 28 Feb 2012 14:28:32 +0100
Subject: [PATCH 14/83] [ADD] basic docstrings to Query and Model

bzr revid: xmo@openerp.com-20120228132832-pf16do6611fcwrj1
---
 addons/web/static/src/js/data.js | 113 ++++++++++++++++++++++++++++---
 1 file changed, 102 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index aa760e7df44..969f3542908 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -71,6 +71,11 @@ openerp.web.Query = openerp.web.Class.extend({
             return results.records;
         }, null);
     },
+    /**
+     * Fetches the first record matching the query, or null
+     *
+     * @returns {jQuery.Deferred<Object|null>}
+     */
     first: function () {
         var self = this;
         return this.clone({limit: 1})._execute().pipe(function (records) {
@@ -79,43 +84,95 @@ openerp.web.Query = openerp.web.Class.extend({
             return null;
         });
     },
+    /**
+     * Fetches all records matching the query
+     *
+     * @returns {jQuery.Deferred<Array<>>}
+     */
     all: function () {
         return this._execute();
     },
-    context: function (context) {
-        if (!context) { return this; }
-        return this.clone({context: context});
-    },
+    /**
+     * Fetches the number of records matching the query in the database
+     *
+     * @returns {jQuery.Deferred<Number>}
+     */
     count: function () {
         if (this._count) { return $.when(this._count); }
         return this._model.call(
             'search_count', [this._filter], {
                 context: this._model.context(this._context)});
     },
+    /**
+     * Creates a new query with the union of the current query's context and
+     * the new context.
+     *
+     * @param context context data to add to the query
+     * @returns {openerp.web.Query}
+     */
+    context: function (context) {
+        if (!context) { return this; }
+        return this.clone({context: context});
+    },
+    /**
+     * Creates a new query with the union of the current query's filter and
+     * the new domain.
+     *
+     * @param domain domain data to AND with the current query filter
+     * @returns {openerp.web.Query}
+     */
     filter: function (domain) {
         if (!domain) { return this; }
         return this.clone({filter: domain});
     },
+    /**
+     * Creates a new query with the provided limit replacing the current
+     * query's own limit
+     *
+     * @param {Number} limit maximum number of records the query should retrieve
+     * @returns {openerp.web.Query}
+     */
     limit: function (limit) {
         return this.clone({limit: limit});
     },
+    /**
+     * Creates a new query with the provided offset replacing the current
+     * query's own offset
+     *
+     * @param {Number} offset number of records the query should skip before starting its retrieval
+     * @returns {openerp.web.Query}
+     */
     offset: function (offset) {
         return this.clone({offset: offset});
     },
+    /**
+     * Creates a new query with the provided ordering parameters replacing
+     * those of the current query
+     *
+     * @param {String...} fields ordering clauses
+     * @returns {openerp.web.Query}
+     */
     order_by: function () {
         if (arguments.length === 0) { return this; }
         return this.clone({order_by: _.toArray(arguments)});
     }
 });
 
-openerp.web.Model = openerp.web.CallbackEnabled.extend({
+openerp.web.Model = openerp.web.Class.extend(/** @lends openerp.web.Model# */{
+    /**
+     * @constructs openerp.web.Model
+     * @extends openerp.web.Class
+     *
+     * @param {String} model_name name of the OpenERP model this object is bound to
+     * @param {Object} [context]
+     * @param {Array} [domain]
+     */
     init: function (model_name, context, domain) {
-        this._super();
         this.name = model_name;
         this._context = context || {};
         this._domain = domain || [];
     },
-    /*
+    /**
      * @deprecated does not allow to specify kwargs, directly use call() instead
      */
     get_func: function (method_name) {
@@ -124,6 +181,14 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({
             return self.call(method_name, _.toArray(arguments));
         };
     },
+    /**
+     * Call a method (over RPC) on the bound OpenERP model.
+     *
+     * @param {String} method name of the method to call
+     * @param {Array} [args] positional arguments
+     * @param {Object} [kwargs] keyword arguments
+     * @returns {jQuery.Deferred<>} call result
+     */
     call: function (method, args, kwargs) {
         args = args || [];
         kwargs = kwargs || {};
@@ -134,6 +199,21 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({
             kwargs: kwargs
         });
     },
+    /**
+     * Fetches a Query instance bound to this model, for searching
+     *
+     * @param {Array<String>} [fields] fields to ultimately fetch during the search
+     * @returns {openerp.web.Query}
+     */
+    query: function (fields) {
+        return new openerp.web.Query(this, fields);
+    },
+    /**
+     * Executes a signal on the designated workflow, on the bound OpenERP model
+     *
+     * @param {Number} id workflow identifier
+     * @param {String} signal signal to trigger on the workflow
+     */
     exec_workflow: function (id, signal) {
         return openerp.connection.rpc('/web/dataset/exec_workflow', {
             model: this.name,
@@ -141,13 +221,24 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({
             signal: signal
         });
     },
-    query: function (fields) {
-        return new openerp.web.Query(this, fields);
-    },
+    /**
+     * Fetches the model's domain, combined with the provided domain if any
+     *
+     * @param {Array} [domain] to combine with the model's internal domain
+     * @returns The model's internal domain, or the AND-ed union of the model's internal domain and the provided domain
+     */
     domain: function (domain) {
+        if (!domain) { return this._domain; }
         return new openerp.web.CompoundDomain(
-            this._domain, domain || []);
+            this._domain, domain);
     },
+    /**
+     * Fetches the combination of the user's context and the domain context,
+     * combined with the provided context if any
+     *
+     * @param {Object} [context] to combine with the model's internal context
+     * @returns The union of the user's context and the model's internal context, as well as the provided context if any. In that order.
+     */
     context: function (context) {
         return new openerp.web.CompoundContext(
             openerp.connection.user_context, this._context, context || {});

From 923e947917c7082b9e583633a45e179af84cb1d2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 29 Feb 2012 15:17:54 +0100
Subject: [PATCH 15/83] [ADD] small Model examples

bzr revid: xmo@openerp.com-20120229141754-2mr8b6sm6es2j4wb
---
 doc/source/changelog-6.2.rst |  4 ++--
 doc/source/rpc.rst           | 38 ++++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/doc/source/changelog-6.2.rst b/doc/source/changelog-6.2.rst
index 2b492472f0f..5facb47ac14 100644
--- a/doc/source/changelog-6.2.rst
+++ b/doc/source/changelog-6.2.rst
@@ -31,7 +31,7 @@ API simplification
     than shortcuts, or are there due to domain and context evaluation
     issues in 6.1.
 
-    The shortcuts really add little value, and OpenERP Web embeds a
-    restricted Python evaluator (in javascript) meaning most of the
+    The shortcuts really add little value, and OpenERP Web 6.2 embeds
+    a restricted Python evaluator (in javascript) meaning most of the
     context and domain parsing & evaluation can be moved to the
     javascript code and does not require cooperative RPC bridging.
diff --git a/doc/source/rpc.rst b/doc/source/rpc.rst
index 8ed72e8520b..ea426916932 100644
--- a/doc/source/rpc.rst
+++ b/doc/source/rpc.rst
@@ -27,19 +27,53 @@ class maps ontwo the OpenERP server objects via two primary methods,
 :js:func:`~openerp.web.Model.query`.
 
 :js:func:`~openerp.web.Model.call` is a direct mapping to the
-corresponding method of the OpenERP server object.
+corresponding method of the OpenERP server object. Its usage is
+similar to that of the OpenERP Model API, with three differences:
+
+* The interface is :doc:`asynchronous </async>`, so instead of
+  returning results directly RPC method calls will return
+  :js:class:`Deferred` instances, which will themselves resolve to the
+  result of the matching RPC call.
+
+* Because ECMAScript 3/Javascript 1.5 doesnt feature any equivalent to
+  ``__getattr__`` or ``method_missing``, there needs to be an explicit
+  method to dispatch RPC methods.
+
+* No notion of pooler, the model proxy is instantiated where needed,
+  not fetched from an other (somewhat global) object
+
+.. code-block:: javascript
+
+    var Users = new Model('res.users');
+
+    Users.call('change_password', ['oldpassword', 'newpassword'],
+                      {context: some_context}).then(function (result) {
+        // do something with change_password result
+    });
 
 :js:func:`~openerp.web.Model.query` is a shortcut for a builder-style
 iterface to searches (``search`` + ``read`` in OpenERP RPC terms). It
 returns a :js:class:`~openerp.web.Query` object which is immutable but
 allows building new :js:class:`~openerp.web.Query` instances from the
-first one, adding new properties or modifiying the parent object's.
+first one, adding new properties or modifiying the parent object's:
+
+.. code-block:: javascript
+
+    Users.query(['name', 'login', 'user_email', 'signature'])
+         .filter([['active', '=', true], ['company_id', '=', main_company]])
+         .limit(15)
+         .all().then(function (users) {
+        // do work with users records
+    });
 
 The query is only actually performed when calling one of the query
 serialization methods, :js:func:`~openerp.web.Query.all` and
 :js:func:`~openerp.web.Query.first`. These methods will perform a new
 RPC query every time they are called.
 
+For that reason, it's actually possible to keep "intermediate" queries
+around and use them differently/add new specifications on them.
+
 .. js:class:: openerp.web.Model(name)
 
     .. js:attribute:: openerp.web.Model.name

From 9022aae8cb1122df0c9a108b2905e37949bd73b1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 1 Mar 2012 11:21:17 +0100
Subject: [PATCH 16/83] [ADD] core Traverser API

There are still questions over how it'll work, and if it can work at all

bzr revid: xmo@openerp.com-20120301102117-zxd89ffcvo2n32nw
---
 addons/web/static/src/js/data.js | 79 ++++++++++++++++++++++++++++++++
 doc/source/rpc.rst               | 69 ++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 969f3542908..27d4562aafb 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -261,6 +261,85 @@ openerp.web.Model = openerp.web.Class.extend(/** @lends openerp.web.Model# */{
     },
 });
 
+openerp.web.Traverser = openerp.web.Class.extend(/** @lends openerp.web.Traverser# */{
+    /**
+     * @constructs openerp.web.Traverser
+     * @extends openerp.web.Class
+     *
+     * @param {openerp.web.Model} model instance this traverser is bound to
+     */
+    init: function (model) {
+        this._model = model;
+        this._index = 0;
+    },
+
+    /**
+     * Gets and sets the current index
+     *
+     * @param {Number} [idx]
+     * @returns {Number} current index
+     */
+    index: function (idx) {
+        if (idx) { this._index = idx; }
+        return this._index;
+    },
+    /**
+     * Returns the model this traverser is currently bound to
+     *
+     * @returns {openerp.web.Model}
+     */
+    model: function () {
+        return this._model;
+    },
+    /**
+     * Fetches the size of the backing model's match
+     *
+     * @returns {Deferred<Number>} deferred count
+     */
+    size: function () {
+        return this._model.query().count();
+    },
+
+    /**
+     * Record at the current index for the collection, fails if there is no
+     * record at the current index.
+     *
+     * @returns {Deferred<>}
+     */
+    current: function (fields) {
+        return this._model.query(fields).first().pipe(function (record) {
+            if (record == null) {
+                return $.Deferred()
+                    .reject('No record at index' + this._index)
+                    .promise();
+            }
+            return record;
+        });
+    },
+    next: function (fields) {
+        var self = this;
+        this._index++;
+        return this.size().pipe(function (s) {
+            if (self._index >= s) {
+                self._index = 0;
+            }
+            return self.current(fields);
+        });
+    },
+    previous: function (fields) {
+        var self = this;
+        this._index--;
+        if (this._index < 0) {
+            return this.size().pipe(function (s) {
+                self._index = s-1;
+                return self.current(fields);
+            });
+        }
+        return this.current(fields);
+    }
+
+});
+
 openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.DataGroup# */{
     /**
      * Management interface between views and grouped collections of OpenERP
diff --git a/doc/source/rpc.rst b/doc/source/rpc.rst
index ea426916932..1192b28971f 100644
--- a/doc/source/rpc.rst
+++ b/doc/source/rpc.rst
@@ -170,6 +170,75 @@ around and use them differently/add new specifications on them.
        (``?`` field) and the inability to "drill down" into relations
        for sorting.
 
+Synchronizing views (provisional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note:: this API may not be final, and may not even remain
+
+While the high-level RPC API is mostly stateless, some objects in
+OpenERP Web need to share state information. One of those is OpenERP
+views, especially between "collection-based" views (lists, graphs) and
+"record-based" views (forms, diagrams), which gets its very own API
+for traversing collections of records, the aptly-named
+:js:class:`~openerp.web.Traverser`.
+
+A :js:class:`~openerp.web.Traverser` is linked to a
+:js:class:`~openerp.web.Model` and is used to iterate over it
+asynchronously (and using indexes).
+
+.. js:class:: openerp.web.Traverser(model)
+
+    .. js:function:: openerp.web.Traverser.model()
+
+        :returns: the :js:class:`~openerp.web.Model` this traverser
+                  instance is bound to
+
+    .. js:function:: openerp.web.Traverser.index([idx])
+
+        If provided with an index parameter, sets that as the new
+        index for the traverser.
+
+        :param Number idx: the new index for the traverser
+        :returns: the current index for the traverser
+
+    .. js:function:: openerp.web.Traverser.current([fields])
+
+        Fetches the traverser's "current" record (that is, the record
+        at the current index of the traverser)
+
+        :param Array<String> fields: fields to return in the record
+        :rtype: Deferred<>
+
+    .. js:function:: openerp.web.Traverser.next([fields])
+
+        Increases the traverser's internal index by one, the fetches
+        the corresponding record. Roughly equivalent to:
+
+        .. code-block:: javascript
+
+            var idx = traverser.index();
+            traverser.index(idx+1);
+            traverser.current();
+
+        :param Array<String> fields: fields to return in the record
+        :rtype: Deferred<>
+
+    .. js:function:: openerp.web.Traverser.previous([fields])
+
+        Similar to :js:func:`~openerp.web.Traverser.next` but iterates
+        the traverser backwards rather than forward.
+
+        :param Array<String> fields: fields to return in the record
+        :rtype: Deferred<>
+
+    .. js:function:: openerp.web.Traverser.size()
+
+        Shortcut to checking the size of the backing model, calling
+        ``traverser.size()`` is equivalent to calling
+        ``traverser.model().query([]).count()``
+
+        :rtype: Deferred<Number>
+
 Low-level API: RPC calls to Python side
 ---------------------------------------
 

From 8225ef6c995ae302b61020d27c14e7bfbb11109d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 1 Mar 2012 11:30:49 +0100
Subject: [PATCH 17/83] [ADD] small doc for Connection#rpc

bzr revid: xmo@openerp.com-20120301103049-u2b208awbv6e67xb
---
 doc/source/rpc.rst | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/doc/source/rpc.rst b/doc/source/rpc.rst
index 1192b28971f..672173f6469 100644
--- a/doc/source/rpc.rst
+++ b/doc/source/rpc.rst
@@ -242,3 +242,31 @@ asynchronously (and using indexes).
 Low-level API: RPC calls to Python side
 ---------------------------------------
 
+While the previous section is great for calling core OpenERP code
+(models code), it does not work if you want to call the Python side of
+openerp-web.
+
+For this. a lower-level API is available on
+:js:class:`openerp.web.Connection` objects (usually available through
+``openerp.connection``): the ``rpc`` method.
+
+This method simply takes an absolute path (which is the combination of
+the Python controller's ``_cp_path`` attribute and the name of the
+method yo want to call) and a mapping of attributes to values (applied
+as keyword arguments on the Python method [#]_). This function fetches
+the return value of the Python methods, converted to JSON.
+
+For instance, to call the ``eval_domain_and_context`` of the
+:class:`~web.controllers.main.Session` controller:
+
+.. code-block:: javascript
+
+    openerp.connection.rpc('/web/session/eval_domain_and_context', {
+        domains: ds,
+        contexts: cs
+    }).then(function (result) {
+        // handle result
+    });
+
+.. [#] except for ``context``, which is extracted and stored in the
+       request object itself.

From 190eb339faeed6755de7b77b3f0152a5e3c39c8e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 1 Mar 2012 16:23:15 +0100
Subject: [PATCH 18/83] [ADD] replacement for current aborter/abort_last hack:
 UDP-style handler of mis-ordered requests

* By default, ignores (refuses to resolve) mis-ordered request when they come back
* Optionally, fails them

bzr revid: xmo@openerp.com-20120301152315-67kbkdwpy7cdh25y
---
 addons/web/static/src/js/data.js |  40 ++++++++++
 addons/web/static/test/rpc.js    | 130 +++++++++++++++++++++++++++++++
 addons/web/static/test/test.html |   1 +
 3 files changed, 171 insertions(+)
 create mode 100644 addons/web/static/test/rpc.js

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 27d4562aafb..55e200a205f 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -1190,6 +1190,46 @@ openerp.web.CompoundDomain = openerp.web.Class.extend({
         return this.__eval_context;
     }
 });
+
+openerp.web.DropMisordered = openerp.web.Class.extend(/** @lends openerp.web.DropMisordered# */{
+    /**
+     * @constructs openerp.web.DropMisordered
+     * @extends openerp.web.Class
+     *
+     * @param {Boolean} [failMisordered=false] whether mis-ordered responses should be failed or just ignored
+     */
+    init: function (failMisordered) {
+        // local sequence number, for requests sent
+        this.lsn = 0;
+        // remote sequence number, seqnum of last received request
+        this.rsn = -1;
+        this.failMisordered = failMisordered || false;
+    },
+    /**
+     * Adds a deferred (usually an async request) to the sequencer
+     *
+     * @param {$.Deferred} deferred to ensure add
+     * @returns {$.Deferred}
+     */
+    add: function (deferred) {
+        var res = $.Deferred();
+
+        var self = this, seq = this.lsn++;
+        deferred.then(function () {
+            if (seq > self.rsn) {
+                self.rsn = seq;
+                res.resolve.apply(res, arguments);
+            } else if (self.failMisordered) {
+                res.reject();
+            }
+        }, function () {
+            res.reject.apply(res, arguments);
+        });
+
+        return res.promise();
+    }
+});
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web/static/test/rpc.js b/addons/web/static/test/rpc.js
new file mode 100644
index 00000000000..7dbd3239abd
--- /dev/null
+++ b/addons/web/static/test/rpc.js
@@ -0,0 +1,130 @@
+$(document).ready(function () {
+    var openerp;
+
+    module('Misordered resolution management', {
+        setup: function () {
+            openerp = window.openerp.init();
+            window.openerp.web.core(openerp);
+            window.openerp.web.data(openerp);
+        }
+    });
+    test('Resolve all correctly ordered, sync', function () {
+        var dm = new openerp.web.DropMisordered(), flag = false;
+
+        var d1 = $.Deferred(), d2 = $.Deferred(),
+            r1 = dm.add(d1), r2 = dm.add(d2);
+
+        $.when(r1, r2).done(function () {
+            flag = true;
+        });
+        d1.resolve();
+        d2.resolve();
+
+        ok(flag);
+    });
+    test("Don't resolve mis-ordered, sync", function () {
+        var dm = new openerp.web.DropMisordered(),
+            done1 = false, done2 = false,
+            fail1 = false, fail2 = false;
+
+        var d1 = $.Deferred(), d2 = $.Deferred();
+        dm.add(d1).then(function () { done1 = true; },
+                        function () { fail1 = true; });
+        dm.add(d2).then(function () { done2 = true; },
+                        function () { fail2 = true; });
+
+        d2.resolve();
+        d1.resolve();
+
+        // d1 is in limbo
+        ok(!done1);
+        ok(!fail1);
+        // d2 is resolved
+        ok(done2);
+        ok(!fail2);
+    });
+    test('Fail mis-ordered flag, sync', function () {
+        var dm = new openerp.web.DropMisordered(true),
+            done1 = false, done2 = false,
+            fail1 = false, fail2 = false;
+
+        var d1 = $.Deferred(), d2 = $.Deferred();
+        dm.add(d1).then(function () { done1 = true; },
+                        function () { fail1 = true; });
+        dm.add(d2).then(function () { done2 = true; },
+                        function () { fail2 = true; });
+
+        d2.resolve();
+        d1.resolve();
+
+        // d1 is failed
+        ok(!done1);
+        ok(fail1);
+        // d2 is resolved
+        ok(done2);
+        ok(!fail2);
+    });
+
+    asyncTest('Resolve all correctly ordered, sync', 1, function () {
+        var dm = new openerp.web.DropMisordered();
+
+        var d1 = $.Deferred(), d2 = $.Deferred(),
+            r1 = dm.add(d1), r2 = dm.add(d2);
+
+        setTimeout(function () { d1.resolve(); }, 100);
+        setTimeout(function () { d2.resolve(); }, 200);
+
+        $.when(r1, r2).done(function () {
+            start();
+            ok(true);
+        });
+    });
+    asyncTest("Don't resolve mis-ordered, sync", 4, function () {
+        var dm = new openerp.web.DropMisordered(),
+            done1 = false, done2 = false,
+            fail1 = false, fail2 = false;
+
+        var d1 = $.Deferred(), d2 = $.Deferred();
+        dm.add(d1).then(function () { done1 = true; },
+                        function () { fail1 = true; });
+        dm.add(d2).then(function () { done2 = true; },
+                        function () { fail2 = true; });
+
+        setTimeout(function () { d1.resolve(); }, 200);
+        setTimeout(function () { d2.resolve(); }, 100);
+
+        setTimeout(function () {
+            start();
+            // d1 is in limbo
+            ok(!done1);
+            ok(!fail1);
+            // d2 is resolved
+            ok(done2);
+            ok(!fail2);
+        }, 400);
+    });
+    asyncTest('Fail mis-ordered flag, sync', 4, function () {
+        var dm = new openerp.web.DropMisordered(true),
+            done1 = false, done2 = false,
+            fail1 = false, fail2 = false;
+
+        var d1 = $.Deferred(), d2 = $.Deferred();
+        dm.add(d1).then(function () { done1 = true; },
+                        function () { fail1 = true; });
+        dm.add(d2).then(function () { done2 = true; },
+                        function () { fail2 = true; });
+
+        setTimeout(function () { d1.resolve(); }, 200);
+        setTimeout(function () { d2.resolve(); }, 100);
+
+        setTimeout(function () {
+            start();
+            // d1 is failed
+            ok(!done1);
+            ok(fail1);
+            // d2 is resolved
+            ok(done2);
+            ok(!fail2);
+        }, 400);
+    });
+});
diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html
index 10c2a2c0ed2..004ba0479e1 100644
--- a/addons/web/static/test/test.html
+++ b/addons/web/static/test/test.html
@@ -51,4 +51,5 @@
     <script type="text/javascript" src="/web/static/test/list-utils.js"></script>
     <script type="text/javascript" src="/web/static/test/formats.js"></script>
     <script type="text/javascript" src="/web/static/test/onchange.js"></script>
+    <script type="text/javascript" src="/web/static/test/rpc.js"></script>
 </html>

From aa7a8ed36a1b923cd1df09a01c43e22c57549572 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 1 Mar 2012 17:04:52 +0100
Subject: [PATCH 19/83] [REN] pointless usages of DataSetStatic (which is all
 of them) to using DataSet

bzr revid: xmo@openerp.com-20120301160452-epmjxma3pslo38ek
---
 addons/web/static/src/js/view_form.js       | 34 ++++++++++-----------
 addons/web/static/src/js/view_page.js       |  2 +-
 addons/web_process/static/src/js/process.js |  4 +--
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 640fff67293..5e9e311bb2d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1901,7 +1901,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
 
         // context menu
         var init_context_menu_def = $.Deferred().then(function(e) {
-            var rdataset = new openerp.web.DataSetStatic(self, "ir.values", self.build_context());
+            var rdataset = new openerp.web.DataSet(self, "ir.values", self.build_context());
             rdataset.call("get", ['action', 'client_action_relate',
                 [[self.field.relation, false]], false, rdataset.get_context()], false, 0)
                 .then(function(result) {
@@ -2036,7 +2036,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
             this.abort_last();
             delete this.abort_last;
         }
-        var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.build_context());
+        var dataset = new openerp.web.DataSet(this, this.field.relation, self.build_context());
 
         dataset.name_search(search_val, self.build_domain(), 'ilike',
                 this.limit + 1, function(data) {
@@ -2089,13 +2089,13 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
             self._search_create_popup("form", undefined, {"default_name": name});
         };
         if (self.get_definition_options().quick_create === undefined || self.get_definition_options().quick_create) {
-            var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.build_context());
-            dataset.name_create(name, function(data) {
-                self._change_int_ext_value(data);
-            }).fail(function(error, event) {
-                event.preventDefault();
-                slow_create();
-            });
+            new openerp.web.DataSet(this, this.field.relation, self.build_context())
+                .name_create(name, function(data) {
+                    self._change_int_ext_value(data);
+                }).fail(function(error, event) {
+                    event.preventDefault();
+                    slow_create();
+                });
         } else
             slow_create();
     },
@@ -2115,10 +2115,10 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
             new openerp.web.CompoundContext(self.build_context(), context || {})
         );
         pop.on_select_elements.add(function(element_ids) {
-            var dataset = new openerp.web.DataSetStatic(self, self.field.relation, self.build_context());
-            dataset.name_get([element_ids[0]], function(data) {
-                self._change_int_ext_value(data[0]);
-            });
+            new openerp.web.DataSet(self, self.field.relation, self.build_context())
+                .name_get([element_ids[0]], function(data) {
+                    self._change_int_ext_value(data[0]);
+                });
         });
     },
     _change_int_ext_value: function(value) {
@@ -2154,10 +2154,10 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
         };
         if (value && !(value instanceof Array)) {
             // name_get in a m2o does not use the context of the field
-            var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.view.dataset.get_context());
-            dataset.name_get([value], function(data) {
-                real_set_value(data[0]);
-            }).fail(function() {self.tmp_value = undefined;});
+            new openerp.web.DataSet(this, this.field.relation, self.view.dataset.get_context())
+                .name_get([value], function(data) {
+                    real_set_value(data[0]);
+                }).fail(function() {self.tmp_value = undefined;});
         } else {
             $.async_when().then(function() {real_set_value(value);});
         }
diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js
index 3b436841579..33eabc63b3c 100644
--- a/addons/web/static/src/js/view_page.js
+++ b/addons/web/static/src/js/view_page.js
@@ -168,7 +168,7 @@ openerp.web.page = function (openerp) {
                      });
             };
             if (value && !(value instanceof Array)) {
-                new openerp.web.DataSetStatic(
+                new openerp.web.DataSet(
                         this, this.field.relation, self.build_context())
                     .name_get([value], function(data) {
                         real_set_value(data[0]);
diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js
index cd30dad1f13..923f9e664f7 100644
--- a/addons/web_process/static/src/js/process.js
+++ b/addons/web_process/static/src/js/process.js
@@ -107,7 +107,7 @@ openerp.web_process = function (openerp) {
             if(this.process_id)
                 return def.resolve().promise();
 
-            this.process_dataset = new openerp.web.DataSetStatic(this, "process.process", this.session.context);
+            this.process_dataset = new openerp.web.DataSet(this, "process.process", this.session.context);
             this.process_dataset
             .call("search_by_model", [self.process_model,self.session.context])
             .done(function(res) {
@@ -237,7 +237,7 @@ openerp.web_process = function (openerp) {
         },
         jump_to_view: function(model, id) {
             var self = this;
-            var dataset = new openerp.web.DataSetStatic(this, 'ir.values', this.session.context);
+            var dataset = new openerp.web.DataSet(this, 'ir.values', this.session.context);
             dataset.call('get',
                 ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
                 function(res) {

From 1aed1963c0f62c9308d9ad0161f619cd96389bc9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 2 Mar 2012 09:39:41 +0100
Subject: [PATCH 20/83] [REM] horrible hack of a query-aborting API, use
 DropMisordered instead

DropMisordered does not abort late requests, but provides a better and simpler API if 'late' requests
(resolved after those following them) should just be ignored

bzr revid: xmo@openerp.com-20120302083941-pm43lag22bfac8g4
---
 addons/web/static/src/js/core.js      | 14 +-------------
 addons/web/static/src/js/data.js      |  4 +---
 addons/web/static/src/js/search.js    | 28 +++++++++++++--------------
 addons/web/static/src/js/view_form.js | 10 +++-------
 4 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index b07800203b2..a1d2d04f697 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -476,9 +476,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         };
         var deferred = $.Deferred();
         this.on_rpc_request();
-        var aborter = params.aborter;
-        delete params.aborter;
-        var request = this.rpc_function(url, payload).then(
+        this.rpc_function(url, payload).then(
             function (response, textStatus, jqXHR) {
                 self.on_rpc_response();
                 if (!response.error) {
@@ -504,16 +502,6 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                 };
                 deferred.reject(error, $.Event());
             });
-        if (aborter) {
-            aborter.abort_last = function () {
-                if (!(request.isResolved() || request.isRejected())) {
-                    deferred.fail(function (error, event) {
-                        event.preventDefault();
-                    });
-                    request.abort();
-                }
-            };
-        }
         // Allow deferred user to disable on_rpc_error in fail
         deferred.fail(function() {
             deferred.fail(function(error, event) {
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 55e200a205f..2c91d6e4e19 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -745,9 +745,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
             method: method,
             domain_id: domain_index == undefined ? null : domain_index,
             context_id: context_index == undefined ? null : context_index,
-            args: args || [],
-            // FIXME: API which does not suck for aborting requests in-flight
-            aborter: this
+            args: args || []
         }, callback, error_callback);
     },
     /**
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 74ae65785f9..4871e9d95bb 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1005,8 +1005,9 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
         this.got_name = $.Deferred().then(function () {
             self.$element.val(self.name);
         });
-        this.dataset = new openerp.web.DataSet(
-                this.view, this.attrs['relation']);
+        this.model = new openerp.web.Model(this.attrs['relation']);
+
+        this.orderer = new openerp.web.DropMisordered();
     },
     start: function () {
         this._super();
@@ -1020,23 +1021,21 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
         var self = this;
         this.$element.autocomplete({
             source: function (req, resp) {
-                if (self.abort_last) {
-                    self.abort_last();
-                    delete self.abort_last;
-                }
-                self.dataset.name_search(
-                    req.term, self.attrs.domain, 'ilike', 8, function (data) {
-                        resp(_.map(data, function (result) {
-                            return {id: result[0], label: result[1]}
-                        }));
+                self.orderer.add(self.model.call('name_search', null, {
+                    name: req.term,
+                    args: self.attrs.domain,
+                    limit: 8
+                })).then(function (data) {
+                    resp(_.map(data, function (result) {
+                        return {id: result[0], label: result[1]}
+                    }));
                 });
-                self.abort_last = self.dataset.abort_last;
             },
             select: function (event, ui) {
                 self.id = ui.item.id;
                 self.name = ui.item.label;
             },
-            delay: 0
+            delay: 100
         })
     },
     on_name_get: function (name_get) {
@@ -1055,7 +1054,8 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
                 this.id = this.id[0];
             // TODO: maybe this should not be completely removed
             delete defaults[this.attrs.name];
-            this.dataset.name_get([this.id], $.proxy(this, 'on_name_get'));
+            this.model.call('name_get', [[this.id]]).then(
+                this.proxy('name_get'));
         } else {
             this.got_name.reject();
         }
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5e9e311bb2d..2a678bee393 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1891,6 +1891,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
         this.cm_id = _.uniqueId('m2o_cm_');
         this.last_search = [];
         this.tmp_value = undefined;
+        this.orderer = new openerp.web.DropMisordered();
     },
     start: function() {
         this._super();
@@ -2032,14 +2033,10 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
         var search_val = request.term;
         var self = this;
 
-        if (this.abort_last) {
-            this.abort_last();
-            delete this.abort_last;
-        }
         var dataset = new openerp.web.DataSet(this, this.field.relation, self.build_context());
 
-        dataset.name_search(search_val, self.build_domain(), 'ilike',
-                this.limit + 1, function(data) {
+        this.orderer.add(dataset.name_search(
+                search_val, self.build_domain(), 'ilike', this.limit + 1)).then(function(data) {
             self.last_search = data;
             // possible selections for the m2o
             var values = _.map(data, function(x) {
@@ -2080,7 +2077,6 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
 
             response(values);
         });
-        this.abort_last = dataset.abort_last;
     },
     _quick_create: function(name) {
         var self = this;

From 2c2df2b325020098d5173ec38114096d35aa588b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 2 Mar 2012 11:07:42 +0100
Subject: [PATCH 21/83] [FIX] Model#call not working correctly if the second
 argument (after method) is the kwargs

bzr revid: xmo@openerp.com-20120302100742-p1wrg44ght8d3cdy
---
 addons/web/static/src/js/data.js | 7 ++++++-
 doc/source/rpc.rst               | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 2c91d6e4e19..544469c3f9c 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -192,6 +192,11 @@ openerp.web.Model = openerp.web.Class.extend(/** @lends openerp.web.Model# */{
     call: function (method, args, kwargs) {
         args = args || [];
         kwargs = kwargs || {};
+        if (!_.isArray(args)) {
+            // call(method, kwargs)
+            kwargs = args;
+            args = [];
+        }
         return openerp.connection.rpc('/web/dataset/call_kw', {
             model: this.name,
             method: method,
@@ -783,7 +788,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      * @returns {$.Deferred}
      */
     name_search: function (name, domain, operator, limit, callback) {
-        return this._model.call('name_search', [], {
+        return this._model.call('name_search', {
             name: name || '',
             args: domain || false,
             operator: operator || 'ilike',
diff --git a/doc/source/rpc.rst b/doc/source/rpc.rst
index 672173f6469..5dea140c798 100644
--- a/doc/source/rpc.rst
+++ b/doc/source/rpc.rst
@@ -80,7 +80,7 @@ around and use them differently/add new specifications on them.
 
         name of the OpenERP model this object is bound to
 
-    .. js:function:: openerp.web.Model.call(method, args, kwargs)
+    .. js:function:: openerp.web.Model.call(method[, args][, kwargs])
 
          Calls the ``method`` method of the current model, with the
          provided positional and keyword arguments.

From 9b0cc92b66189ed5c21e12c830dae89e29e8f51e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 2 Mar 2012 16:47:59 +0100
Subject: [PATCH 22/83] [ADD] grouping to the Model/Query API, but filtering
 looks completely broken

bzr revid: xmo@openerp.com-20120302154759-8ihi5p1ffygiyhw3
---
 addons/web/static/src/js/data.js | 303 ++++++++++++++-----------------
 doc/source/changelog-6.2.rst     |  71 ++++++++
 doc/source/rpc.rst               |  73 ++++++++
 3 files changed, 277 insertions(+), 170 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 544469c3f9c..cfe5a312c03 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -9,13 +9,13 @@ openerp.web.data = function(openerp) {
  * @returns {String} SQL-like sorting string (``ORDER BY``) clause
  */
 openerp.web.serialize_sort = function (criterion) {
-   return _.map(criterion,
-       function (criteria) {
-           if (criteria[0] === '-') {
-               return criteria.slice(1) + ' DESC';
-           }
-           return criteria + ' ASC';
-       }).join(', ');
+    return _.map(criterion,
+        function (criteria) {
+            if (criteria[0] === '-') {
+                return criteria.slice(1) + ' DESC';
+            }
+            return criteria + ' ASC';
+        }).join(', ');
 };
 
 openerp.web.Query = openerp.web.Class.extend({
@@ -103,6 +103,38 @@ openerp.web.Query = openerp.web.Class.extend({
             'search_count', [this._filter], {
                 context: this._model.context(this._context)});
     },
+    /**
+     * Performs a groups read according to the provided grouping criterion
+     *
+     * @param {String|Array<String>} grouping
+     * @returns {jQuery.Deferred<Array<openerp.web.data.Group>> | null}
+     */
+    group_by: function (grouping) {
+        if (grouping === undefined) {
+            return null;
+        }
+
+        if (!(grouping instanceof Array)) {
+            grouping = _.toArray(arguments);
+        }
+        if (_.isEmpty(grouping)) { return null; }
+
+        var self = this;
+        return this._model.call('read_group', {
+            groupby: grouping,
+            fields: _.uniq(grouping.concat(this._fields || [])),
+            domain: this._model.domain(this._filter),
+            context: this._model.context(this._context),
+            offset: this._offset,
+            limit: this._limit,
+            orderby: openerp.web.serialize_sort(this._order_by) || false
+        }).pipe(function (results) {
+            return _(results).map(function (result) {
+                return new openerp.web.data.Group(
+                    self._model.name, grouping[0], result);
+            });
+        });
+    },
     /**
      * Creates a new query with the union of the current query's context and
      * the new context.
@@ -152,9 +184,12 @@ openerp.web.Query = openerp.web.Class.extend({
      * @param {String...} fields ordering clauses
      * @returns {openerp.web.Query}
      */
-    order_by: function () {
-        if (arguments.length === 0) { return this; }
-        return this.clone({order_by: _.toArray(arguments)});
+    order_by: function (fields) {
+        if (!fields instanceof Array) {
+            fields = _.toArray(arguments);
+        }
+        if (_.isEmpty(fields)) { return this; }
+        return this.clone({order_by: fields});
     }
 });
 
@@ -345,6 +380,64 @@ openerp.web.Traverser = openerp.web.Class.extend(/** @lends openerp.web.Traverse
 
 });
 
+/**
+ * Utility objects, should never need to be instantiated from outside of this
+ * module
+ *
+ * @namespace
+ */
+openerp.web.data = {
+    Group: openerp.web.Class.extend(/** @lends openerp.web.data.Group# */{
+        /**
+         * @constructs openerp.web.data.Group
+         * @extends openerp.web.Class
+         */
+        init: function (model, grouping_field, read_group_group) {
+            // In cases where group_by_no_leaf and no group_by, the result of
+            // read_group has aggregate fields but no __context or __domain.
+            // Create default (empty) values for those so that things don't break
+            var fixed_group = _.extend(
+                {__context: {group_by: []}, __domain: []},
+                read_group_group);
+
+            var aggregates = {};
+            _(fixed_group).each(function (value, key) {
+                if (key.indexOf('__') === 0
+                        || key === grouping_field
+                        || key === grouping_field + '_count') {
+                    return;
+                }
+                aggregates[key] = value || 0;
+            });
+
+            this.model = new openerp.web.Model(
+                model, fixed_group.__context, fixed_group.__domain);
+
+            var group_size = fixed_group[grouping_field + '_count'] || fixed_group.__count || 0;
+            var leaf_group = fixed_group.__context.group_by.length === 0;
+            this.attributes = {
+                grouped_on: grouping_field,
+                // if terminal group (or no group) and group_by_no_leaf => use group.__count
+                length: group_size,
+                value: fixed_group[grouping_field],
+                // A group is open-able if it's not a leaf in group_by_no_leaf mode
+                has_children: !(leaf_group && fixed_group.__context['group_by_no_leaf']),
+
+                aggregates: aggregates
+            };
+        },
+        get: function (key) {
+            return this.attributes[key];
+        },
+        subgroups: function () {
+            return this.model.query().group_by(this.model.context().group_by);
+        },
+        query: function () {
+            return this.model.query.apply(this.model, arguments);
+        }
+    })
+};
+
 openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.DataGroup# */{
     /**
      * Management interface between views and grouped collections of OpenERP
@@ -368,181 +461,51 @@ openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.Da
      */
     init: function(parent, model, domain, context, group_by, level) {
         this._super(parent, null);
-        if (group_by) {
-            if (group_by.length || context['group_by_no_leaf']) {
-                return new openerp.web.ContainerDataGroup( this, model, domain, context, group_by, level);
-            } else {
-                return new openerp.web.GrouplessDataGroup( this, model, domain, context, level);
-            }
-        }
-
-        this.model = model;
+        this.model = new openerp.web.Model(model, context, domain);
+        this.group_by = group_by;
         this.context = context;
         this.domain = domain;
 
         this.level = level || 0;
     },
-    cls: 'DataGroup'
-});
-openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends openerp.web.ContainerDataGroup# */ {
-    /**
-     *
-     * @constructs openerp.web.ContainerDataGroup
-     * @extends openerp.web.DataGroup
-     *
-     * @param session
-     * @param model
-     * @param domain
-     * @param context
-     * @param group_by
-     * @param level
-     */
-    init: function (parent, model, domain, context, group_by, level) {
-        this._super(parent, model, domain, context, null, level);
-
-        this.group_by = group_by;
-    },
-    /**
-     * The format returned by ``read_group`` is absolutely dreadful:
-     *
-     * * A ``__context`` key provides future grouping levels
-     * * A ``__domain`` key provides the domain for the next search
-     * * The current grouping value is provided through the name of the
-     *   current grouping name e.g. if currently grouping on ``user_id``, then
-     *   the ``user_id`` value for this group will be provided through the
-     *   ``user_id`` key.
-     * * Similarly, the number of items in the group (not necessarily direct)
-     *   is provided via ``${current_field}_count``
-     * * Other aggregate fields are just dumped there
-     *
-     * This function slightly improves the grouping records by:
-     *
-     * * Adding a ``grouped_on`` property providing the current grouping field
-     * * Adding a ``value`` and a ``length`` properties which replace the
-     *   ``$current_field`` and ``${current_field}_count`` ones
-     * * Moving aggregate values into an ``aggregates`` property object
-     *
-     * Context and domain keys remain as-is, they should not be used externally
-     * but in case they're needed...
-     *
-     * @param {Object} group ``read_group`` record
-     */
-    transform_group: function (group) {
-        var field_name = this.group_by[0];
-        // In cases where group_by_no_leaf and no group_by, the result of
-        // read_group has aggregate fields but no __context or __domain.
-        // Create default (empty) values for those so that things don't break
-        var fixed_group = _.extend(
-                {__context: {group_by: []}, __domain: []},
-                group);
-
-        var aggregates = {};
-        _(fixed_group).each(function (value, key) {
-            if (key.indexOf('__') === 0
-                    || key === field_name
-                    || key === field_name + '_count') {
-                return;
-            }
-            aggregates[key] = value || 0;
-        });
-
-        var group_size = fixed_group[field_name + '_count'] || fixed_group.__count || 0;
-        var leaf_group = fixed_group.__context.group_by.length === 0;
-        return {
-            __context: fixed_group.__context,
-            __domain: fixed_group.__domain,
-
-            grouped_on: field_name,
-            // if terminal group (or no group) and group_by_no_leaf => use group.__count
-            length: group_size,
-            value: fixed_group[field_name],
-            // A group is openable if it's not a leaf in group_by_no_leaf mode
-            openable: !(leaf_group && this.context['group_by_no_leaf']),
-
-            aggregates: aggregates
-        };
-    },
-    fetch: function (fields) {
-        // internal method
-        var d = new $.Deferred();
-        var self = this;
-
-        this.rpc('/web/group/read', {
-            model: this.model,
-            context: this.context,
-            domain: this.domain,
-            fields: _.uniq(this.group_by.concat(fields)),
-            group_by_fields: this.group_by,
-            sort: openerp.web.serialize_sort(this.sort)
-        }, function () { }).then(function (response) {
-            var data_groups = _(response).map(
-                    _.bind(self.transform_group, self));
-            self.groups = data_groups;
-            d.resolveWith(self, [data_groups]);
-        }, function () {
-            d.rejectWith.apply(d, [self, arguments]);
-        });
-        return d.promise();
-    },
-    /**
-     * The items of a list have the following properties:
-     *
-     * ``length``
-     *     the number of records contained in the group (and all of its
-     *     sub-groups). This does *not* provide the size of the "next level"
-     *     of the group, unless the group is terminal (no more groups within
-     *     it).
-     * ``grouped_on``
-     *     the name of the field this level was grouped on, this is mostly
-     *     used for display purposes, in order to know the name of the current
-     *     level of grouping. The ``grouped_on`` should be the same for all
-     *     objects of the list.
-     * ``value``
-     *     the value which led to this group (this is the value all contained
-     *     records have for the current ``grouped_on`` field name).
-     * ``aggregates``
-     *     a mapping of other aggregation fields provided by ``read_group``
-     *
-     * @param {Array} fields the list of fields to aggregate in each group, can be empty
-     * @param {Function} ifGroups function executed if any group is found (DataGroup.group_by is non-null and non-empty), called with a (potentially empty) list of groups as parameters.
-     * @param {Function} ifRecords function executed if there is no grouping left to perform, called with a DataSet instance as parameter
-     */
     list: function (fields, ifGroups, ifRecords) {
         var self = this;
-        this.fetch(fields).then(function (group_records) {
-            ifGroups(_(group_records).map(function (group) {
-                var child_context = _.extend({}, self.context, group.__context);
+        $.when(this.model.query(fields)
+                    .order_by(this.sort)
+                    .group_by(this.group_by)).then(function (groups) {
+            if (!groups) {
+                console.log(self.domain);
+                console.log(self.model.domain());
+                ifRecords(_.extend(
+                    new openerp.web.DataSetSearch(self, self.model.name),
+                    {domain: self.model.domain(), context: self.model.context(),
+                     _sort: self.sort}));
+                return;
+            }
+            ifGroups(_(groups).map(function (group) {
+                var child_context = _.extend(
+                    {}, self.model.context(), group.model.context());
                 return _.extend(
                     new openerp.web.DataGroup(
-                        self, self.model, group.__domain,
+                        self, self.model.name, group.model.domain(),
                         child_context, child_context.group_by,
                         self.level + 1),
-                    group, {sort: self.sort});
+                    {
+                        __context: child_context,
+                        __domain: group.model.domain(),
+                        grouped_on: group.get('grouped_on'),
+                        length: group.get('length'),
+                        value: group.get('value'),
+                        openable: group.get('has_children'),
+                        aggregates: group.get('aggregates')
+                    }, {sort: self.sort});
             }));
         });
     }
 });
-openerp.web.GrouplessDataGroup = openerp.web.DataGroup.extend( /** @lends openerp.web.GrouplessDataGroup# */ {
-    /**
-     *
-     * @constructs openerp.web.GrouplessDataGroup
-     * @extends openerp.web.DataGroup
-     *
-     * @param session
-     * @param model
-     * @param domain
-     * @param context
-     * @param level
-     */
-    init: function (parent, model, domain, context, level) {
-        this._super(parent, model, domain, context, null, level);
-    },
-    list: function (fields, ifGroups, ifRecords) {
-        ifRecords(_.extend(
-            new openerp.web.DataSetSearch(this, this.model),
-            {domain: this.domain, context: this.context, _sort: this.sort}));
-    }
-});
+openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend({ });
+openerp.web.GrouplessDataGroup = openerp.web.DataGroup.extend({ });
+
 openerp.web.StaticDataGroup = openerp.web.GrouplessDataGroup.extend( /** @lends openerp.web.StaticDataGroup# */ {
     /**
      * A specialization of groupless data groups, relying on a single static
diff --git a/doc/source/changelog-6.2.rst b/doc/source/changelog-6.2.rst
index 5facb47ac14..48d79bf6398 100644
--- a/doc/source/changelog-6.2.rst
+++ b/doc/source/changelog-6.2.rst
@@ -12,6 +12,51 @@ and removes most stateful behavior of DataSet.
 Migration guide
 ~~~~~~~~~~~~~~~
 
+* Actual arbitrary RPC calls can just be remapped on a
+  :js:class:`~openerp.web.Model` instance:
+
+  .. code-block:: javascript
+
+      dataset.call(method, args)
+
+  or
+
+  .. code-block:: javascript
+
+      dataset.call_and_eval(method, args)
+
+  can be replaced by calls to :js:func:`openerp.web.Model.call`:
+
+  .. code-block:: javascript
+
+      model.call(method, args)
+
+  If callbacks are passed directly to the older methods, they need to
+  be added to the new one via ``.then()``.
+
+  .. note::
+
+      The ``context_index`` and ``domain_index`` features were not
+      ported, context and domain now need to be passed in "in full",
+      they won't be automatically filled with the user's current
+      context.
+
+* Shorcut methods (``name_get``, ``name_search``, ``unlink``,
+  ``write``, ...) should be ported to
+  :js:func:`openerp.web.Model.call`, using the server's original
+  signature. On the other hand, the non-shortcut equivalents can now
+  use keyword arguments (see :js:func:`~openerp.web.Model.call`'s
+  signature for details)
+
+* ``read_slice``, which allowed a single round-trip to perform a
+  search and a read, should be reimplemented via
+  :js:class:`~openerp.web.Query` objects (see:
+  :js:func:`~openerp.web.Model.query`) for clearer and simpler
+  code. ``read_index`` should be replaced by a
+  :js:class:`~openerp.web.Query` as well, combining
+  :js:func:`~openerp.web.Query.offset` and
+  :js:func:`~openerp.web.Query.first`.
+
 Rationale
 ~~~~~~~~~
 
@@ -35,3 +80,29 @@ API simplification
     a restricted Python evaluator (in javascript) meaning most of the
     context and domain parsing & evaluation can be moved to the
     javascript code and does not require cooperative RPC bridging.
+
+DataGroup -> also Model
+-----------------------
+
+Alongside the deprecation of ``DataSet`` for
+:js:class:`~openerp.web.Model`, OpenERP Web 6.2 also deprecates
+``DataGroup`` and its subtypes in favor of a single method on
+:js:class:`~openerp.web.Query`:
+:js:func:`~openerp.web.Query.group_by`.
+
+Migration guide
+~~~~~~~~~~~~~~~
+
+Rationale
+~~~~~~~~~
+
+While the ``DataGroup`` API worked (mostly), it is quite odd and
+alien-looking, a bit too Smalltalk-inspired (behaves like a
+self-contained flow-control structure for reasons which may or may not
+have been good).
+
+Because it is heavily related to ``DataSet`` (as it *yields*
+``DataSet`` objects), deprecating ``DataSet`` automatically deprecates
+``DataGroup`` (if we want to stay consistent), which is a good time to
+make the API more imperative and look more like what most developers
+are used to.
diff --git a/doc/source/rpc.rst b/doc/source/rpc.rst
index 5dea140c798..9f8f4424ce6 100644
--- a/doc/source/rpc.rst
+++ b/doc/source/rpc.rst
@@ -128,6 +128,17 @@ around and use them differently/add new specifications on them.
 
        :rtype: Deferred<Number>
 
+    .. js:function:: openerp.web.Query.group_by(grouping...)
+
+       Fetches the groups for the query, using the first specified
+       grouping parameter
+
+       :param Array<String> grouping: Lists the levels of grouping
+                                      asked of the server. Grouping
+                                      can actually be an array or
+                                      varargs.
+       :rtype: Deferred<Array<openerp.web.Group>> | null
+
     The second set of methods is the "mutator" methods, they create a
     **new** :js:class:`~openerp.web.Query` object with the relevant
     (internal) attribute either augmented or replaced.
@@ -170,6 +181,65 @@ around and use them differently/add new specifications on them.
        (``?`` field) and the inability to "drill down" into relations
        for sorting.
 
+Aggregation (grouping)
+~~~~~~~~~~~~~~~~~~~~~~
+
+OpenERP has powerful grouping capacities, but they are kind-of strange
+in that they're recursive, and level n+1 relies on data provided
+directly by the grouping at level n. As a result, while ``read_group``
+works it's not a very intuitive API.
+
+OpenERP Web 6.2 eschews direct calls to ``read_group`` in favor of
+calling a method of :js:class:`~openerp.web.Query`, `much in the way
+it is one in SQLAlchemy
+<http://docs.sqlalchemy.org/en/latest/orm/query.html#sqlalchemy.orm.query.Query.group_by>`_ [#]_:
+
+.. code-block:: javascript
+
+    some_query.group_by(['field1', 'field2']).then(function (groups) {
+        // do things with the fetched groups
+    });
+
+This method is asynchronous when provided with 1..n fields (to group
+on) as argument, but it can also be called without any field (empty
+fields collection or nothing at all). In this case, instead of
+returning a Deferred object it will return ``null``.
+
+When grouping criterion come from a third-party and may or may not
+list fields (e.g. could be an empty list), this provides two ways to
+test the presence of actual subgroups (versus the need to perform a
+regular query for records):
+
+* A check on ``group_by``'s result and two completely separate code
+  paths
+
+  .. code-block:: javascript
+
+      var groups;
+      if (groups = some_query.group_by(gby)) {
+          groups.then(function (gs) {
+              // groups
+          });
+      }
+      // no groups
+
+* Or a more coherent code path using :js:func:`when`'s ability to
+  coerce values into deferreds:
+
+  .. code-block:: javascript
+
+      $.when(some_query.group_by(gby)).then(function (groups) {
+          if (!groups) {
+              // No grouping
+          } else {
+              // grouping, even if there are no groups (groups
+              // itself could be an empty array)
+          }
+      });
+
+The result of a (successful) :js:func:`~openerp.web.Query.group_by` is
+an array of :js:class:`~openerp.web.data.Group`.
+
 Synchronizing views (provisional)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -268,5 +338,8 @@ For instance, to call the ``eval_domain_and_context`` of the
         // handle result
     });
 
+.. [#] with a small twist: SQLAlchemy's ``orm.query.Query.group_by``
+       is not terminal, it returns a query which can still be altered.
+
 .. [#] except for ``context``, which is extracted and stored in the
        request object itself.

From c1ec7b1938fbd1a6b09d0172752d97197031bae1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 2 Mar 2012 16:53:24 +0100
Subject: [PATCH 23/83] [REM] debug logging

bzr revid: xmo@openerp.com-20120302155324-v3ju1lcioiw2s9el
---
 addons/web/static/src/js/data.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index cfe5a312c03..783eb979013 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -474,8 +474,6 @@ openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.Da
                     .order_by(this.sort)
                     .group_by(this.group_by)).then(function (groups) {
             if (!groups) {
-                console.log(self.domain);
-                console.log(self.model.domain());
                 ifRecords(_.extend(
                     new openerp.web.DataSetSearch(self, self.model.name),
                     {domain: self.model.domain(), context: self.model.context(),

From 79f79deec19fabba3400b64161b6e49c6548c14e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 6 Mar 2012 15:50:29 +0100
Subject: [PATCH 24/83] [FIX] "bzr cdiff" operator binds tighter than
 "instanceof", remember to parenthesize "instanceof" calls before negating
 them

bzr revid: xmo@openerp.com-20120306145029-pckye3yoig2xlhh8
---
 addons/web/static/src/js/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 783eb979013..0c99e05717f 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -185,7 +185,7 @@ openerp.web.Query = openerp.web.Class.extend({
      * @returns {openerp.web.Query}
      */
     order_by: function (fields) {
-        if (!fields instanceof Array) {
+        if (!(fields instanceof Array)) {
             fields = _.toArray(arguments);
         }
         if (_.isEmpty(fields)) { return this; }

From 14657305314d964df4f96b28b9dd806f4c4681c2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 6 Mar 2012 15:57:41 +0100
Subject: [PATCH 25/83] [FIX] call_button implementation in model

bzr revid: xmo@openerp.com-20120306145741-wi9xk2c4e18fab2z
---
 addons/web/static/src/js/data.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 0c99e05717f..ac8f5fc5665 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -291,8 +291,8 @@ openerp.web.Model = openerp.web.Class.extend(/** @lends openerp.web.Model# */{
      * FIXME: remove when evaluator integrated
      */
     call_button: function (method, args) {
-        return this.rpc('/web/dataset/call_button', {
-            model: this.model,
+        return openerp.connection.rpc('/web/dataset/call_button', {
+            model: this.name,
             method: method,
             domain_id: null,
             context_id: args.length - 1,

From b48fddcc8114b01cd1950d02e599c5db0892809b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 6 Mar 2012 16:09:45 +0100
Subject: [PATCH 26/83] [IMP] make Query#order_by more resilient to somebody
 passing 'undefined'

bzr revid: xmo@openerp.com-20120306150945-86358u7atgyevb52
---
 addons/web/static/src/js/data.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index ac8f5fc5665..4cb4a8b6d4b 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -185,6 +185,7 @@ openerp.web.Query = openerp.web.Class.extend({
      * @returns {openerp.web.Query}
      */
     order_by: function (fields) {
+        if (fields === undefined) { return this; }
         if (!(fields instanceof Array)) {
             fields = _.toArray(arguments);
         }

From 2864ffb5ae23fb3adaf4a24f04f4bf17f21cbc7c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 6 Mar 2012 16:55:50 +0100
Subject: [PATCH 27/83] [FIX] DataSet created in/from datagroups

bzr revid: xmo@openerp.com-20120306155550-be04x4q21pt58t5h
---
 addons/web/static/src/js/data.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 4cb4a8b6d4b..0b57ac26440 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -476,9 +476,11 @@ openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.Da
                     .group_by(this.group_by)).then(function (groups) {
             if (!groups) {
                 ifRecords(_.extend(
-                    new openerp.web.DataSetSearch(self, self.model.name),
-                    {domain: self.model.domain(), context: self.model.context(),
-                     _sort: self.sort}));
+                    new openerp.web.DataSetSearch(
+                            self, self.model.name,
+                            self.model.context(),
+                            self.model.domain()),
+                    {_sort: self.sort}));
                 return;
             }
             ifGroups(_(groups).map(function (group) {

From 075ac184f8989c4abcdd36851fe89881e92508cc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 6 Mar 2012 17:05:58 +0100
Subject: [PATCH 28/83] [FIX] recursive grouping

bzr revid: xmo@openerp.com-20120306160558-sq5r7a4d7ks4g33b
---
 addons/web/static/src/js/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 0b57ac26440..8e9ea1d3088 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -489,7 +489,7 @@ openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.Da
                 return _.extend(
                     new openerp.web.DataGroup(
                         self, self.model.name, group.model.domain(),
-                        child_context, child_context.group_by,
+                        child_context, group.model._context.group_by,
                         self.level + 1),
                     {
                         __context: child_context,

From 8b13a999675d053d6bb902ab0880eec05bbc9a8d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 6 Mar 2012 17:13:58 +0100
Subject: [PATCH 29/83] [FIX] handling of _count in queries: it can be 0, which
 is valid but falsy

bzr revid: xmo@openerp.com-20120306161358-py6zz2bts9b3cb1x
---
 addons/web/static/src/js/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 8e9ea1d3088..c517dd53394 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -98,7 +98,7 @@ openerp.web.Query = openerp.web.Class.extend({
      * @returns {jQuery.Deferred<Number>}
      */
     count: function () {
-        if (this._count) { return $.when(this._count); }
+        if (this._count != undefined) { return $.when(this._count); }
         return this._model.call(
             'search_count', [this._filter], {
                 context: this._model.context(this._context)});

From d05add0c7dc467e56b7fc7b6f8001a1b1f5e0676 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 6 Mar 2012 17:38:41 +0100
Subject: [PATCH 30/83] [FIX] length management in dataset when items are
 removed from list view

bzr revid: xmo@openerp.com-20120306163841-4ko7el1t54xwguxr
---
 addons/web/static/src/js/data.js      | 5 ++++-
 addons/web/static/src/js/view_list.js | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index c517dd53394..0dc60c0e031 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -890,7 +890,10 @@ openerp.web.DataSetSearch =  openerp.web.DataSet.extend(/** @lends openerp.web.D
     unlink: function(ids, callback, error_callback) {
         var self = this;
         return this._super(ids, function(result) {
-            self.ids = _.without.apply(_, [self.ids].concat(ids));
+            self.ids = _(self.ids).difference(ids);
+            if (self._length) {
+                self._length -= 1;
+            }
             if (this.index !== null) {
                 self.index = self.index <= self.ids.length - 1 ?
                     self.index : (self.ids.length > 0 ? self.ids.length -1 : 0);
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index eb13bbd927b..8d8e342370e 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -291,6 +291,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      */
     configure_pager: function (dataset) {
         this.dataset.ids = dataset.ids;
+        this.dataset._length = dataset._length;
 
         var limit = this.limit(),
             total = dataset.size(),

From 83221bd1f1be436fa5cddaac6edf4e3ebfa64dfa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 6 Mar 2012 17:49:28 +0100
Subject: [PATCH 31/83] [FIX] typo in search view's m2o field

bzr revid: xmo@openerp.com-20120306164928-j50gshmmui6fn01t
---
 addons/web/static/src/js/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 4871e9d95bb..b1ee33c4125 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1055,7 +1055,7 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
             // TODO: maybe this should not be completely removed
             delete defaults[this.attrs.name];
             this.model.call('name_get', [[this.id]]).then(
-                this.proxy('name_get'));
+                this.proxy('on_name_get'));
         } else {
             this.got_name.reject();
         }

From 514c63288c7d5d88d764b44696c5e3a5fc148dfb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 22 Mar 2012 15:25:40 +0100
Subject: [PATCH 32/83] [FIX] change dataset.read_index to be implemented in
 terms of dataset.read_ids, not in terms of model.first() as not all model
 data is kept/transferred (filters are not bubbled?)

bzr revid: xmo@openerp.com-20120322142540-x3j9p7kub2px6p6v
---
 addons/web/static/src/js/data.js           |  9 +++------
 addons/web/static/test/fulltest/dataset.js | 14 ++++++--------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 0dc60c0e031..b3ed5b08280 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -623,12 +623,9 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      */
     read_index: function (fields, options) {
         options = options || {};
-        // not very good
-        return this._model.query(fields)
-            .context(options.context)
-            .offset(this.index).first().pipe(function (record) {
-                if (!record) { return $.Deferred().reject().promise(); }
-                return record;
+        return this.read_ids([this.ids[this.index]], fields, options).pipe(function (records) {
+            if (_.isEmpty(records)) { return $.Deferred().reject().promise(); }
+            return records[0];
         });
     },
     /**
diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
index 1b09bb7dc79..9f7ab101869 100644
--- a/addons/web/static/test/fulltest/dataset.js
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -11,17 +11,15 @@ $(document).ready(function () {
         ds.ids = [10, 20, 30, 40, 50];
         ds.index = 2;
         t.expect(ds.read_index(['a', 'b', 'c']), function (result) {
-            strictEqual(result.method, 'search');
+            strictEqual(result.method, 'read');
             strictEqual(result.model, 'some.model');
 
-            strictEqual(result.args.length, 5);
-            deepEqual(result.args[0], []);
-            strictEqual(result.args[1], 2);
-            strictEqual(result.args[2], 1);
-            strictEqual(result.args[3], false);
-            deepEqual(result.args[4], context_());
+            strictEqual(result.args.length, 2);
+            deepEqual(result.args[0], [30]);
 
-            ok(_.isEmpty(result.kwargs));
+            deepEqual(result.kwargs, {
+                context: context_()
+            });
         });
     });
     t.test('default_get', function (openerp) {

From e9f4fc98cc98dab4ca1fdab2f6d9697485934beb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 3 Apr 2012 16:15:53 +0200
Subject: [PATCH 33/83] [ADD] display unhelpful message when a list view search
 yields no result

bzr revid: xmo@openerp.com-20120403141553-hrv006vdkv70zyfu
---
 addons/web/static/src/css/base.css             |   9 +++++++++
 addons/web/static/src/css/base.sass            |  14 ++++++++++++++
 addons/web/static/src/img/empty-list-arrow.png | Bin 0 -> 2308 bytes
 addons/web/static/src/js/view_list.js          |  15 +++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 100644 addons/web/static/src/img/empty-list-arrow.png

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b0a2b7945b9..d4a1d743d35 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -344,3 +344,12 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
+.openerp2 .oe-listview .oe_listview_nocontent > img {
+  float: left;
+  margin-right: 1.5em;
+}
+.openerp2 .oe-listview .oe_listview_nocontent > div {
+  overflow: hidden;
+  font-size: 150%;
+  width: 60ex;
+}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c31f501c499..ecc45f5f538 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -337,6 +337,20 @@ $colour4: #8a89ba
                         @include box-shadow(none)
     // }}}
 
+
+    // ListView {{{
+    .oe-listview
+        .oe_listview_nocontent
+            > img
+                float: left
+                margin-right: 1.5em
+            > div
+                // don't encroach on my arrow
+                overflow: hidden
+                font-size: 150%
+                width: 60ex
+    // }}}
+
 .openerp
     // Transitional overrides for old styles {{{
     // }}}
diff --git a/addons/web/static/src/img/empty-list-arrow.png b/addons/web/static/src/img/empty-list-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0b1372adfd3fc393ecc1dac3934c423822970cd
GIT binary patch
literal 2308
zcmV+f3H$bmP)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$000QfNkl<Zc-rk;
zdx#Wu9B)f|Ns(kmFX)9m=#Qu{qS7oVdqR)|6$KelR8&ww*&i!~b?)rU&dl!K?df%B
z{?n1Ao!-sNp01sFsg+0}1tIhRdyp9lhVEnfe1ALNnwGoUyWh^9JMIKuX0CB}fAjf$
zAD{1I<^<PuBWXa|9)JkI2*3!yx`O{=5rC0I0EQ00zP`Sb=$JHYT`}`_(Rn;xm=*yz
z0b!sNW8mt}l_M@d9QLloA^;}@VEjZ+`v%jwVb|>X)YT08QE{zMm=*yzjy#>qO{b%(
zI}c{Mx03c9H98A){3#yqKb--N032OnY{IHxe`j=U0dQ71X*fr_-rMdfhO?Be=W<_8
zj{qD+a-Q}nrt_NceY#zQ=DCovmL8(x;bg|Xh=WW7;Q#!dE6lRP7`PA`cgO>*0&zVl
zW>;>57TRm70J;%?W6+jWT|J)*-v@DPq@u$gCQSQwHuVTV9}uaueWRY;EWlDthqccq
zRtZs=&cEQ#VimEr2atn@VpxUD3W~h!`$m-_`A0=}o?^e*)&Md9s%|~v(U#IU;EAZL
zX9cbK)i4Im3^T0>O!E>6dj<gc5&lg8G%kP;rZq{^PVgqQC4ih&AhN#IDFTPXfuo*O
zR5M@I*7U|XVWl;JL|skWaH*nON7Qt_hPKp|Vs^!6u4-6o+ZsUCa6ahl8S&AU$%s{^
zJUL-l_lA+yG)!BPy0w4+V9k?|l9{8=J9~(Thpl4MaEV?u?d|FA;d->Cen5f$R7~r|
zu;s~((H7HQoPiGm0Mg*G8K<h`d;hZZ(Ak_89+v<zU(05<&Lke^WgRuNMP3VWOoz!A
z%2%3oE9K938x|8j)O1`GqGg<G!xEL{XiFx473H}QU+@S-ie4r&7?$irs$2!1wVujS
zOqv6h5(Om?^M}G<%9GAGl4<82s;02tYX*R#if!6^ktd(Rv?kO5`pZqwjBkjyalxP|
z!g;c8FKKmJGb!4VH1f|1?KADa$zQPq1ZJ7&4EIl}{?$3K%osSQl>^Fz{hq2?ms8*%
z%^*ilIV?CJj@#Tc{%#aN;(<oz7T1LN(k4+=r+3Y67ir>JUPmYaT(pSG^!dl39mAj+
zAHlTx(Q*3(n%EEd80VWP8sl0cAnt>FPbnRKXBP^yBiOJ4zH_629t%h1&;d9RC$4GM
zdBg{~8Y9C2sTIKPVw}`5{5+5}l7*dnGCed$7C>?f=-yFDYc6XUgGT4A&IJQ$V=gxa
zE&~`xBsH*%sRi<NceYhI%dahoPJ1?hIFQP0lHrFX3Px(mUfgy7vTsz?k<;M#e=x@B
zht%uPArLKZI{^Iz8$j%qA=q5j$8jCIg%ATMZ^ob<8(@kOg;lgTy~(Y_YI{c5E7J0%
zeY7WGiV^@)B(9EoXr^;BNBgz{kgL;GQ?yFbC4IwsBWyk5zy^vGJ%5Xc!lqPxkmhAb
z6TfQVd6^h-)22-(WV0J)0=!>RSt%+bfTuE+Y7ES8wP@^LOD%{2&qG@l3Jp?zkm(G~
z4z>b-Y+dY5;=P4a<Cx>A1u@VaLXjcPfkd_^Lg!lAy6#wj$jU&!>t_PGZeN3SZKfv<
zxWLjR0IdZSO$8Y8JrUBvJm1U|6%t}}54F)>(e3N8rXGlJFN$ejS<4cF9W3wLb27AO
zuVhBTQW9=Jcb=<)*mrVsG|d&7=GSs=*8;dFsFX%U4zeh32#T6$Hv|u0tri+~mza~$
zrTic-)TM~7r0jY0ozxo%!Zb0HEqq#Sg@*_{Qpx+V=J)aYzf;4^OA5GcTc-6aH>_Km
z4`9l^4;mz^fh;As0y5=4*lg&=Y2g!1G5s1gT4s|<4V?>D^Dx%Ain1V@?;+p-6m!|4
z&lQP*P^{%{zSpLW`1T@NRSOGS0s#>u`!GGQ<ByE&ud3pTzgfo0r8_#-pFvy|oAM?k
z4{-j%Mhnm|UBPQD)>1GJ#3Hpa63|i!0A-$!bCx2rXs~bW2oOmls+(bVccccdm}nF1
z9c}PpH8Zr3m;p8FA^T`Uur6Vq9_cTQ1{#a^|4aA`k^CHgzbuWJR0E1TYitJcVwLGT
z;8(>BBi&n#K=qiCw&!W-!J9NQe;fXO02S@$DIdqbUx&|q3pot46o65R>CI%5TPW56
zjRoL3;`2O)>`5R*x_%SNv_FJ-@Pge&g*Sx2U=2c)6y^t@s5?jzQ(Ob(z_q*pU(p$`
z$+#1Tp6#RWCcpQB->*ufa&oybk>UURh*Jq_0Ezq1zGqM>Y--%6_DoaeH!B1lHlEIZ
zLz`i~@1A1v#RU1xWTntTrZlZBMKamypu9Dt<O;JUQW<LMlj^2vUqZu|ny=Z^f+8j%
z5RnC8MgSBgHUCJ71c1Rt<Qymf&k?qYkP9HoNM(lHuIl=B@LVEpAjV2?%mDQJ44A~u
z>iCD#Dj*7%;`zFRa5b;^r_d&oe>c63#sisT!W<comBulBp-ApMirYg|6{FStS^+@b
zQO=Q{1jS%qIF%q)6raX<k7Nw0#-_P`Unkqhn$n6c682ZY)mRIg3L<A2Tv4GTbq=ZI
z#_QtLFBGqS;)UYI-p=*z@U#6OfnzRM!I&KTxI^G`tEsl<ugnD1`J3XVj2rWU%1c^i
zh;!T{4QQh%0C-u7D0))L=RJDyHS*V&J51;N+8SV(U;Xs2CQ=U=zUk-g-kl;X^G&)|
z#>hY_tYNHW)WAYO5cw(<3g|5%FjIx<i2j;iZM8YH0M?ESYg*wfXwSR2=|4$xFdD+q
zvFro1%mr3lCx0e{OcdAlgMv6oGrxp3gtbe;$4N^|v<m6*E&%a5^@SDPI!LC?RbiYn
zp!)&#E*w`WFin*F?@*NfS^OQf+E$0lg&#n6=1g-~RJH#CRks$>duIUVGc-3yU9m*M
zo;{XZ@Kvj0ZT0#)3Fj^}i~yq}Z9w$?z%jsNVUy$*XY>Nb=mm_CL;ywrMgT?tMiK!S
e0T=;z9LPV+S$p2eoZCSF0000<MNUMnLSTYX5=@Z*

literal 0
HcmV?d00001

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index e8fff450c6e..c9a65ac6c4b 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -747,6 +747,18 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
                     .attr('colspan', this.previous_colspan);
             this.previous_colspan = null;
         }
+    },
+    no_result: function () {
+        var help = this.options.action.help;
+        if (this.groups.group_by || !help) {
+            return;
+        }
+        this.$element.children('table').replaceWith(
+            $('<div class="oe_listview_nocontent">')
+                .append($('<img>', {
+                    src: '/web/static/src/img/empty-list-arrow.png',
+                    alt: _t("This list is empty")}))
+                .append($('<div>').html(help)));
     }
 });
 openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.ListView.List# */{
@@ -1344,6 +1356,9 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
             self.records.add(records, {silent: true});
             list.render();
             d.resolve(list);
+            if (_.isEmpty(records)) {
+                view.no_result();
+            }
         });});
         return d.promise();
     },

From da864266c0c374abecad3295f74a57b0d7a394b8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 3 Apr 2012 16:17:26 +0200
Subject: [PATCH 34/83] [FIX] o2m/m2m lists: only display help when there's
 help on the action... or an action at all

bzr revid: xmo@openerp.com-20120403141726-a6o4sfvifzzjy9r4
---
 addons/web/static/src/js/view_list.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index c9a65ac6c4b..85943732c68 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -749,8 +749,9 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         }
     },
     no_result: function () {
-        var help = this.options.action.help;
-        if (this.groups.group_by || !help) {
+        if (this.groups.group_by
+            || !this.options.action
+            || !this.options.action.help) {
             return;
         }
         this.$element.children('table').replaceWith(
@@ -758,7 +759,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
                 .append($('<img>', {
                     src: '/web/static/src/img/empty-list-arrow.png',
                     alt: _t("This list is empty")}))
-                .append($('<div>').html(help)));
+                .append($('<div>').html(this.options.action.help)));
     }
 });
 openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.ListView.List# */{

From 522de0125cd5764220957637ee8f647dc910ef8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 10:47:37 +0200
Subject: [PATCH 35/83] [REVIEW] needaction: remove unnecessary

bzr revid: tde@openerp.com-20120418084737-jxvoe5jf02xalq8r
---
 openerp/addons/base/ir/ir_needaction.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 3fcd56affae..6dd0b73e82c 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -49,15 +49,11 @@ class ir_needaction_users(osv.osv):
     
     def _get_users(self, cr, uid, res_ids, res_model, context=None):
         """Given res_ids of res_model, get user_ids present in table"""
-        if context is None:
-            context = {}
         needact_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
         return map(itemgetter('res_id'), self.read(cr, uid, needact_ids, context=context))
     
     def create_users(self, cr, uid, res_ids, res_model, user_ids, context=None):
         """Given res_ids of res_model, add user_ids to the relationship table"""
-        if context is None:
-            context = {}
         for res_id in res_ids:
             for user_id in user_ids:
                 self.create(cr, uid, {'res_model': res_model, 'res_id': res_id, 'user_id': user_id}, context=context)
@@ -65,8 +61,6 @@ class ir_needaction_users(osv.osv):
     
     def unlink_users(self, cr, uid, res_ids, res_model, context=None):
         """Given res_ids of res_model, delete all entries in the relationship table"""
-        if context is None:
-            context = {}
         to_del_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
         return self.unlink(cr, uid, to_del_ids, context=context)
     
@@ -131,8 +125,6 @@ class ir_needaction_mixin(osv.osv):
         return dict.fromkeys(ids, [])
     
     def create(self, cr, uid, values, context=None):
-        if context is None:
-            context = {}
         needact_table_obj = self.pool.get('ir.needaction_users')
         # perform create
         obj_id = super(ir_needaction_mixin, self).create(cr, uid, values, context=context)
@@ -142,8 +134,6 @@ class ir_needaction_mixin(osv.osv):
         return obj_id
     
     def write(self, cr, uid, ids, values, context=None):
-        if context is None:
-            context = {}
         needact_table_obj = self.pool.get('ir.needaction_users')
         # perform write
         write_res = super(ir_needaction_mixin, self).write(cr, uid, ids, values, context=context)
@@ -154,8 +144,6 @@ class ir_needaction_mixin(osv.osv):
         return write_res
     
     def unlink(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         # unlink user_ids
         needact_table_obj = self.pool.get('ir.needaction_users')
         needact_table_obj.unlink_users(cr, uid, ids, self._name, context=context)
@@ -169,8 +157,6 @@ class ir_needaction_mixin(osv.osv):
     def needaction_get_record_ids(self, cr, uid, user_id, limit=80, context=None):
         """Given the current model and a user_id
            get the number of actions it has to perform"""
-        if context is None:
-            context = {}
         needact_table_obj = self.pool.get('ir.needaction_users')
         needact_table_ids = needact_table_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
         return map(itemgetter('res_id'), needact_table_obj.read(cr, uid, needact_table_ids, context=context))
@@ -178,8 +164,6 @@ class ir_needaction_mixin(osv.osv):
     def needaction_get_action_count(self, cr, uid, user_id, limit=80, context=None):
         """Given the current model and a user_id
            get the number of actions it has to perform"""
-        if context is None:
-            context = {}
         needact_table_obj = self.pool.get('ir.needaction_users')
         return needact_table_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
     
@@ -188,8 +172,6 @@ class ir_needaction_mixin(osv.osv):
            perform an action. Records are given as references, a list of
            tuples (model_name, record_id).
            This method is trans-model."""
-        if context is None:
-            context = {}
         needact_table_obj = self.pool.get('ir.needaction_users')
         needact_table_ids = needact_table_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
         needact_records = needact_table_obj.read(cr, uid, needact_table_ids, context=context)

From 3930d41621dddd023f62ad0695528367a9773127 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Apr 2012 10:47:42 +0200
Subject: [PATCH 36/83] [IMP] hr.config.settings: small fix in view

bzr revid: rco@openerp.com-20120418084742-ruboxpqeggpzu2sh
---
 addons/hr/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 3377ad20c37..a34783772c9 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -42,7 +42,7 @@
         </record>
 
         <record id="action_human_resources_configuration" model="ir.actions.act_window">
-            <field name="name">Configure Human Resources Application</field>
+            <field name="name">Configure Human Resources</field>
             <field name="res_model">hr.config.settings</field>
             <field name="view_id" ref="view_human_resources_configuration"/>
             <field name="view_mode">form</field>

From 7ef99096b0b84b0eb338ba55fcce14b3f9b5142c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 10:59:45 +0200
Subject: [PATCH 37/83] [RFEVIEW] Cleaned code, based on ODO/VMT review.

bzr revid: tde@openerp.com-20120418085945-jlr7hbzrpju3yv2m
---
 openerp/addons/base/ir/ir_needaction.py       | 52 +++++++++----------
 .../addons/base/security/ir.model.access.csv  |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 6dd0b73e82c..7f246dc282a 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -24,17 +24,18 @@ from operator import itemgetter
 from osv import osv, fields
 from tools.translate import _
 
-class ir_needaction_users(osv.osv):
+class ir_needaction_users_rel(osv.osv):
     '''
-    ir_needaction_users holds data related to the needaction
-    mechanism inside OpenERP. A needaction is characterized by:
+    ir_needaction_users_rel holds data related to the needaction
+    mechanism inside OpenERP. A row in this model is characterized by:
     - res_model: model of the record requiring an action
     - res_id: ID of the record requiring an action
     - user_id: foreign key to the res.users table, to the user that
       has to perform the action
-    '''
+    This model can be seen as a many2many, linking (res_model, res_id) to 
+    users (those whose attention is required on the record).'''
     
-    _name = 'ir.needaction_users'
+    _name = 'ir.ir_needaction_users_rel'
     _description = 'Needaction relationship table'
     _rec_name = 'id'
     _order = 'id desc'
@@ -49,8 +50,8 @@ class ir_needaction_users(osv.osv):
     
     def _get_users(self, cr, uid, res_ids, res_model, context=None):
         """Given res_ids of res_model, get user_ids present in table"""
-        needact_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
-        return map(itemgetter('res_id'), self.read(cr, uid, needact_ids, context=context))
+        rel_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
+        return map(itemgetter('res_id'), self.read(cr, uid, rel_ids, context=context))
     
     def create_users(self, cr, uid, res_ids, res_model, user_ids, context=None):
         """Given res_ids of res_model, add user_ids to the relationship table"""
@@ -88,11 +89,11 @@ class ir_needaction_mixin(osv.osv):
     
     This class wraps a class (ir.needaction_users) that behaves
     like a many2many field. However, no field is added to the model
-    inheriting from base.needaction. The mixin class manages the low-level
+    inheriting from this mixin class. This class handles the low-level
     considerations of updating relationships. Every change made on the
     record calls a method that updates the relationships.
     
-    Objects using the need_action feature should override the
+    Objects using the 'need_action' feature should override the
     ``get_needaction_user_ids`` method. This methods returns a dictionary
     whose keys are record ids, and values a list of user ids, like
     in a many2many relationship. Therefore by defining only one method,
@@ -112,7 +113,7 @@ class ir_needaction_mixin(osv.osv):
       are given as references, a list of tuples (model_name, record_id)
     '''
     _name = 'ir.needaction_mixin'
-    _description = 'Need action of users on records API'
+    _description = '"Need action" mixin'
     
     #------------------------------------------------------
     # Addon API
@@ -125,56 +126,55 @@ class ir_needaction_mixin(osv.osv):
         return dict.fromkeys(ids, [])
     
     def create(self, cr, uid, values, context=None):
-        needact_table_obj = self.pool.get('ir.needaction_users')
+        rel_obj = self.pool.get('ir.needaction_users')
         # perform create
         obj_id = super(ir_needaction_mixin, self).create(cr, uid, values, context=context)
         # link user_ids
         needaction_user_ids = self.get_needaction_user_ids(cr, uid, [obj_id], context=context)
-        needact_table_obj.create_users(cr, uid, [obj_id], self._name, needaction_user_ids[obj_id], context=context)
+        rel_obj.create_users(cr, uid, [obj_id], self._name, needaction_user_ids[obj_id], context=context)
         return obj_id
     
     def write(self, cr, uid, ids, values, context=None):
-        needact_table_obj = self.pool.get('ir.needaction_users')
+        rel_obj = self.pool.get('ir.needaction_users')
         # perform write
         write_res = super(ir_needaction_mixin, self).write(cr, uid, ids, values, context=context)
         # get and update user_ids
         needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
         for id in ids:
-            needact_table_obj.update_users(cr, uid, [id], self._name, needaction_user_ids[id], context=context)
+            rel_obj.update_users(cr, uid, [id], self._name, needaction_user_ids[id], context=context)
         return write_res
     
     def unlink(self, cr, uid, ids, context=None):
         # unlink user_ids
-        needact_table_obj = self.pool.get('ir.needaction_users')
-        needact_table_obj.unlink_users(cr, uid, ids, self._name, context=context)
+        rel_obj = self.pool.get('ir.needaction_users')
+        rel_obj.unlink_users(cr, uid, ids, self._name, context=context)
         # perform unlink
         return super(ir_needaction_mixin, self).unlink(cr, uid, ids, context=context)
     
     #------------------------------------------------------
-    # Need action API
+    # "Need action" API
     #------------------------------------------------------
     
     def needaction_get_record_ids(self, cr, uid, user_id, limit=80, context=None):
         """Given the current model and a user_id
            get the number of actions it has to perform"""
-        needact_table_obj = self.pool.get('ir.needaction_users')
-        needact_table_ids = needact_table_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
-        return map(itemgetter('res_id'), needact_table_obj.read(cr, uid, needact_table_ids, context=context))
+        rel_obj = self.pool.get('ir.needaction_users')
+        needact_table_ids = rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
+        return map(itemgetter('res_id'), rel_obj.read(cr, uid, needact_table_ids, context=context))
     
     def needaction_get_action_count(self, cr, uid, user_id, limit=80, context=None):
         """Given the current model and a user_id
            get the number of actions it has to perform"""
-        needact_table_obj = self.pool.get('ir.needaction_users')
-        return needact_table_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
+        rel_obj = self.pool.get('ir.needaction_users')
+        return rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
     
     def needaction_get_record_references(self, cr, uid, user_id, offset=None, limit=None, order=None, context=None):
         """For a given user_id, get all the records that asks this user to
            perform an action. Records are given as references, a list of
            tuples (model_name, record_id).
            This method is trans-model."""
-        needact_table_obj = self.pool.get('ir.needaction_users')
-        needact_table_ids = needact_table_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
-        needact_records = needact_table_obj.read(cr, uid, needact_table_ids, context=context)
-        return map(itemgetter('res_model', 'id'), needact_records)
+        rel_obj = self.pool.get('ir.needaction_users')
+        needact_table_ids = rel_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
+        return map(itemgetter('res_model', 'id'), rel_obj.read(cr, uid, needact_table_ids, context=context))
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index ac05b726341..8b906ba48a5 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -121,6 +121,6 @@
 "access_ir_mail_server_all","ir_mail_server","model_ir_mail_server",,1,0,0,0
 "access_ir_actions_todo_category","ir_actions_todo_category","model_ir_actions_todo_category","group_system",1,1,1,1
 "access_ir_actions_client","ir_actions_client all","model_ir_actions_client",,1,0,0,0
-"access_ir_needaction_users","ir_needaction_users","model_ir_needaction_users",,1,1,1,1
+"access_ir_needaction_users_rel","ir_needaction_users_rel","model_ir_needaction_users_rel",,1,1,1,1
 "access_ir_needaction_mixin","ir_needaction_mixin","model_ir_needaction_mixin",,1,1,1,1
 

From 94210b26a27cb32c0a00bcb578b44bca138eeec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 11:01:41 +0200
Subject: [PATCH 38/83] [REVIEW] [DOC] Updated documentation.

bzr revid: tde@openerp.com-20120418090141-ho1205rt0omyxo4k
---
 doc/api/need_action_specs.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/api/need_action_specs.rst b/doc/api/need_action_specs.rst
index c9f32dd60c4..88787ae4c44 100644
--- a/doc/api/need_action_specs.rst
+++ b/doc/api/need_action_specs.rst
@@ -1,14 +1,14 @@
 Need action mechanism
 =====================
 
-ir.needaction mixin class
-++++++++++++++++++++++++++
+ir.needaction_mixin mixin class
++++++++++++++++++++++++++++++++
 
 This revision adds a mixin class for objects using the need action feature.
 
 Need action feature can be used by objects willing to be able to signal that an action is required on a particular record. If in the business logic an action must be performed by somebody, for instance validation by a manager, this mechanism allows to set a list of users asked to perform an action.
 
-This class wraps a class (ir.needaction_users) that behaves like a many2many field. However, no field is added to the model inheriting from base.needaction. The mixin class manages the low-level considerations of updating relationships. Every change made on the record calls a method that updates the relationships.
+This class wraps a class (ir.needaction_users) that behaves like a many2many field. However, no field is added to the model inheriting from ir.needaction_mixin. The mixin class manages the low-level considerations of updating relationships. Every change made on the record calls a method that updates the relationships.
 
 Objects using the need_action feature should override the ``get_needaction_user_ids`` method. This methods returns a dictionary whose keys are record ids, and values a list of user ids, like in a many2many relationship. Therefore by defining only one method, you can specify if an action is required by defining the users that have to do it, in every possible situation.
 
@@ -30,12 +30,12 @@ Those fields are functional, because they depend on the user and must therefore
 Addon implementation example
 ++++++++++++++++++++++++++++
 
-In your ``foo`` module, you want to specify that when it is in state ``confirmed``, it has to be validated by a manager, given by the field ``manager_id``. After making ``foo`` inheriting from ``base.needaction``, you override the ``get_needaction_user_ids`` method:
+In your ``foo`` module, you want to specify that when it is in state ``confirmed``, it has to be validated by a manager, given by the field ``manager_id``. After making ``foo`` inheriting from ``ir.needaction_mixin``, you override the ``get_needaction_user_ids`` method:
 
 ::
 
   [...]
-  _inherit = [base.needaction]
+  _inherit = [`ir.needaction_mixin]
   [...]
   def get_needaction_user_ids(self, cr, uid, ids, context=None):
     result = dict.fromkeys(ids)

From c1a4f1f8db6e3161ae61a8358e023c281dc3fed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 11:07:35 +0200
Subject: [PATCH 39/83] [IMP] Updated code (see odo/vmt review). Also removed
 record_ids storage in menus, to avoid passing too much data to the client.

bzr revid: tde@openerp.com-20120418090735-e5ewk3wcf7bp0bvu
---
 openerp/addons/base/ir/ir_needaction.py | 15 ++++++++-------
 openerp/addons/base/ir/ir_ui_menu.py    |  8 +++-----
 openerp/osv/orm.py                      | 10 ++++++----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 7f246dc282a..c408c189939 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -51,7 +51,7 @@ class ir_needaction_users_rel(osv.osv):
     def _get_users(self, cr, uid, res_ids, res_model, context=None):
         """Given res_ids of res_model, get user_ids present in table"""
         rel_ids = self.search(cr, uid, [('res_model', '=', res_model), ('res_id', 'in', res_ids)], context=context)
-        return map(itemgetter('res_id'), self.read(cr, uid, rel_ids, context=context))
+        return list(set(map(itemgetter('user_id'), self.read(cr, uid, rel_ids, ['user_id'], context=context))))
     
     def create_users(self, cr, uid, res_ids, res_model, user_ids, context=None):
         """Given res_ids of res_model, add user_ids to the relationship table"""
@@ -69,7 +69,7 @@ class ir_needaction_users_rel(osv.osv):
         """Given res_ids of res_model, update their entries in the relationship table to user_ids"""
         # read current records
         cur_users = self._get_users(cr, uid, res_ids, res_model, context=context)
-        if len(cur_users) == len(user_ids) and all([cur_user in user_ids for cur_user in cur_users]):
+        if len(cur_users) == len(user_ids) and all(cur_user in user_ids for cur_user in cur_users):
             return True
         # unlink old records
         self.unlink_users(cr, uid, res_ids, res_model, context=context)
@@ -157,10 +157,11 @@ class ir_needaction_mixin(osv.osv):
     
     def needaction_get_record_ids(self, cr, uid, user_id, limit=80, context=None):
         """Given the current model and a user_id
-           get the number of actions it has to perform"""
+           return the record ids that require the user to perform an
+           action"""
         rel_obj = self.pool.get('ir.needaction_users')
-        needact_table_ids = rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
-        return map(itemgetter('res_id'), rel_obj.read(cr, uid, needact_table_ids, context=context))
+        rel_ids = rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
+        return map(itemgetter('res_id'), rel_obj.read(cr, uid, rel_ids, ['res_id'], context=context))
     
     def needaction_get_action_count(self, cr, uid, user_id, limit=80, context=None):
         """Given the current model and a user_id
@@ -174,7 +175,7 @@ class ir_needaction_mixin(osv.osv):
            tuples (model_name, record_id).
            This method is trans-model."""
         rel_obj = self.pool.get('ir.needaction_users')
-        needact_table_ids = rel_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
-        return map(itemgetter('res_model', 'id'), rel_obj.read(cr, uid, needact_table_ids, context=context))
+        rel_ids = rel_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
+        return map(itemgetter('res_model', 'res_id'), rel_obj.read(cr, uid, rel_ids, ['res_model', 'res_id'], context=context))
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 1f3f2e0f181..0de4ff74c11 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -258,19 +258,17 @@ class ir_ui_menu(osv.osv):
     def _get_needaction(self, cr, uid, ids, field_names, args, context=None):
         if context is None:
             context = {}
-        res = dict.fromkeys(ids)
+        res = {}
         for menu in self.browse(cr, uid, ids, context=context):
             res[menu.id] = {}
             if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
-                menu_needaction_res = self.pool.get(menu.action.res_model).get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
+                menu_needaction_res = self.pool.get(menu.action.res_model)._get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
                 # TODO: find the addon that causes a bug on runbot, not on local
                 if not isinstance(menu_needaction_res[1], (int, long)): menu_needaction_res[1] = 0
             else:
-                menu_needaction_res = [False, 0, ()]
+                menu_needaction_res = [False, 0]
             res[menu.id]['needaction_enabled'] = menu_needaction_res[0]
             res[menu.id]['needaction_counter'] = menu_needaction_res[1]
-            # not used currently, therefore set to a void list
-            res[menu.id]['needaction_record_ids'] = []
         return res
         
     _columns = {
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 313c96a9fb4..bdf78fd3567 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -4866,7 +4866,7 @@ class BaseModel(object):
     get_xml_id = get_external_id
     _get_xml_ids = _get_external_ids
     
-    def get_needaction_info(self, cr, uid, user_id, limit=None, order=None, domain=False, context=None):
+    def _get_needaction_info(self, cr, uid, user_id, limit=None, order=None, domain=False, context=None):
         """Base method for needaction mechanism
            - see ir.needaction for actual implementation
            - if the model uses the need action mechanism
@@ -4883,16 +4883,18 @@ class BaseModel(object):
            :return: [uses_needaction=True/False, needaction_uid_ctr=%d]
         """
         if hasattr(self, 'needaction_get_record_ids'):
+            # Arbitrary limit, but still much lower thant infinity, to avoid
+            # getting too much data.
             ids = self.needaction_get_record_ids(cr, uid, user_id, limit=8192, context=context)
             if not ids:
-                return [True, 0, []]
+                return [True, 0]
             if domain:
                 new_domain = eval(domain, locals_dict={'uid': user_id}) + [('id', 'in', ids)]
             else:
                 new_domain = [('id', 'in', ids)]
-            return [True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True, context=context), ids]
+            return [True, self.search(cr, uid, new_domain, limit=limit, order=order, count=True, context=context)]
         else:
-            return [False, 0, []]
+            return [False, 0]
             
     # Transience
     def is_transient(self):

From aca2b4874639b5adbe13e6471b8d9a0d5f59651d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 11:12:59 +0200
Subject: [PATCH 40/83] [FIX] Propagated name change from ir_needaction_users
 to ir_needaction_users_rel.

bzr revid: tde@openerp.com-20120418091259-cnhae6rsc8dqlmkw
---
 openerp/addons/base/ir/ir_needaction.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index c408c189939..2ea81870c68 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -87,7 +87,7 @@ class ir_needaction_mixin(osv.osv):
     validation by a manager, this mechanism allows to set a list of
     users asked to perform an action.
     
-    This class wraps a class (ir.needaction_users) that behaves
+    This class wraps a class (ir.ir_needaction_users_rel) that behaves
     like a many2many field. However, no field is added to the model
     inheriting from this mixin class. This class handles the low-level
     considerations of updating relationships. Every change made on the
@@ -126,7 +126,7 @@ class ir_needaction_mixin(osv.osv):
         return dict.fromkeys(ids, [])
     
     def create(self, cr, uid, values, context=None):
-        rel_obj = self.pool.get('ir.needaction_users')
+        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
         # perform create
         obj_id = super(ir_needaction_mixin, self).create(cr, uid, values, context=context)
         # link user_ids
@@ -135,7 +135,7 @@ class ir_needaction_mixin(osv.osv):
         return obj_id
     
     def write(self, cr, uid, ids, values, context=None):
-        rel_obj = self.pool.get('ir.needaction_users')
+        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
         # perform write
         write_res = super(ir_needaction_mixin, self).write(cr, uid, ids, values, context=context)
         # get and update user_ids
@@ -146,7 +146,7 @@ class ir_needaction_mixin(osv.osv):
     
     def unlink(self, cr, uid, ids, context=None):
         # unlink user_ids
-        rel_obj = self.pool.get('ir.needaction_users')
+        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
         rel_obj.unlink_users(cr, uid, ids, self._name, context=context)
         # perform unlink
         return super(ir_needaction_mixin, self).unlink(cr, uid, ids, context=context)
@@ -159,14 +159,14 @@ class ir_needaction_mixin(osv.osv):
         """Given the current model and a user_id
            return the record ids that require the user to perform an
            action"""
-        rel_obj = self.pool.get('ir.needaction_users')
+        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
         rel_ids = rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
         return map(itemgetter('res_id'), rel_obj.read(cr, uid, rel_ids, ['res_id'], context=context))
     
     def needaction_get_action_count(self, cr, uid, user_id, limit=80, context=None):
         """Given the current model and a user_id
            get the number of actions it has to perform"""
-        rel_obj = self.pool.get('ir.needaction_users')
+        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
         return rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
     
     def needaction_get_record_references(self, cr, uid, user_id, offset=None, limit=None, order=None, context=None):
@@ -174,7 +174,7 @@ class ir_needaction_mixin(osv.osv):
            perform an action. Records are given as references, a list of
            tuples (model_name, record_id).
            This method is trans-model."""
-        rel_obj = self.pool.get('ir.needaction_users')
+        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
         rel_ids = rel_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
         return map(itemgetter('res_model', 'res_id'), rel_obj.read(cr, uid, rel_ids, ['res_model', 'res_id'], context=context))
 

From 7b073bd3861d83fee01e987b151eeef88c8dd314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 11:13:57 +0200
Subject: [PATCH 41/83] [FIX] Propagated name change from ir_needaction_users
 to ir_needaction_users_rel.

bzr revid: tde@openerp.com-20120418091357-w3364qw5e0fyfjkj
---
 openerp/addons/base/ir/ir.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index ccec381f1d1..e66182bae39 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -662,9 +662,9 @@
         <menuitem action="ir_action_wizard" id="menu_ir_action_wizard" parent="base.next_id_6"/>
 
         <!-- Needaction mechanism -->
-        <record model="ir.ui.view" id="view_ir_needaction_users_tree">
-            <field name="name">ir.needaction_users.tree</field>
-            <field name="model">ir.needaction_users</field>
+        <record model="ir.ui.view" id="view_ir_needaction_users_rel_tree">
+            <field name="name">ir.needaction_users_rel.tree</field>
+            <field name="model">ir.needaction_users_rel</field>
             <field name="type">tree</field>
             <field name="sequence">10</field>
             <field name="arch" type="xml">
@@ -676,14 +676,14 @@
             </field>
         </record>
 
-        <record id="action_view_needaction_users" model="ir.actions.act_window">
+        <record id="action_view_needaction_users_rel" model="ir.actions.act_window">
             <field name="name">Need action relationships</field>
-            <field name="res_model">ir.needaction_users</field>
+            <field name="res_model">ir.needaction_users_rel</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="menu_needaction_users" name="Need actions" parent="base.menu_users" sequence="20" action="action_view_needaction_users" groups="base.group_no_one"/>
+        <menuitem id="menu_needaction_users_rel" name="Need actions" parent="base.menu_users" sequence="20" action="action_view_needaction_users_rel" groups="base.group_no_one"/>
         
         <!-- Companies -->
         <menuitem id="menu_res_company_global"

From ea3f6f17f5d0b0465f7e8cd77fb78b6b2740547d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 11:16:13 +0200
Subject: [PATCH 42/83] [imp] removed validate & invalid in form view

bzr revid: nicolas.vanhoren@openerp.com-20120418091613-c0gpu6eo3yqndq6l
---
 addons/web/static/src/js/view_form.js         | 65 +++++++------------
 addons/web_calendar/static/src/js/calendar.js |  1 -
 2 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3f9ef8301fd..2ca19687cec 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -250,9 +250,6 @@ instance.web.FormView = instance.web.View.extend({
             field.reset();
             var result = field.set_value(self.datarecord[f] || false);
             set_values.push(result);
-            $.when(result).then(function() {
-                field.validate();
-            });
         });
         return $.when.apply(null, set_values).pipe(function() {
             if (!record.id) {
@@ -285,9 +282,6 @@ instance.web.FormView = instance.web.View.extend({
     on_form_changed: function() {
         this.trigger("view_content_has_changed");
         _.each(this.get_widgets(), function(w) {
-            if (w.field) {
-                w.validate();
-            }
             w.update_dom();
         });
     },
@@ -1265,7 +1259,7 @@ instance.web.form.compute_domain = function(expr, fields) {
                 _t("Unknown field %s in domain %s"),
                 ex[0], JSON.stringify(expr)));
         }
-        var field_value = field.get_value();
+        var field_value = field.get_value ? field.get_value() : field.value;
         var op = ex[1];
         var val = ex[2];
 
@@ -1655,7 +1649,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this.set({'value': false});
         this.field = this.field_manager.get_field(this.name);
         this.set({required: this.modifiers['required'] === true});
-        this.invalid = this.dirty = false;
+        this.dirty = false;
         
         // some events to make the property "effective_readonly" sync automatically with "readonly" and
         // "force_readonly"
@@ -1695,7 +1689,6 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this._inhibit_on_change = true;
         this.set({'value': value_});
         this._inhibit_on_change = false;
-        this.invalid = false;
         this.update_dom();
     },
     on_translate: function() {
@@ -1705,7 +1698,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         return this.get('value');
     },
     is_valid: function() {
-        return !this.invalid;
+        return true;
     },
     is_dirty: function() {
         return this.dirty && !this.get("effective_readonly");
@@ -1723,7 +1716,6 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     },
     _on_ui_change: function() {
         this.dirty = true;
-        this.validate();
         if (this.is_valid()) {
             this.view.do_onchange(this);
             this.view.on_form_changed(true);
@@ -1732,9 +1724,6 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
             this.update_dom(true);
         }
     },
-    validate: function() {
-        this.invalid = false;
-    },
     focus: function($element) {
         if ($element) {
             setTimeout(function() {
@@ -1821,16 +1810,16 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
             this.$element.text(show_value);
         }
     },
-    validate: function() {
-        this.invalid = false;
+    is_valid: function() {
         if (!this.get("effective_readonly")) {
             try {
                 var value_ = instance.web.parse_value(this.$element.find('input').val(), this, '');
-                this.invalid = this.get("required") && value_ === '';
+                return (! this.get("required")) || value_ !== '';
             } catch(e) {
-                this.invalid = true;
+                return false;
             }
         }
+        return true;
     },
     focus: function($element) {
         this._super($element || this.$element.find('input:first'));
@@ -2031,11 +2020,11 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
             this.$element.text(instance.web.format_value(this.get('value'), this, ''));
         }
     },
-    validate: function() {
-        this.invalid = false;
+    is_valid: function() {
         if (!this.get("effective_readonly")) {
-            this.invalid = !this.datewidget.is_valid() || (this.get("required") && !this.datewidget.get_value());
+            return this.datewidget.is_valid() && (!this.get("required") || this.datewidget.get_value());
         }
+        return true;
     },
     focus: function($element) {
         this._super($element || (this.datewidget && this.datewidget.$input));
@@ -2076,16 +2065,16 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
             this.$element.text(show_value);
         }
     },
-    validate: function() {
-        this.invalid = false;
+    is_valid: function() {
         if (!this.get("effective_readonly")) {
             try {
                 var value_ = instance.web.parse_value(this.$textarea.val(), this, '');
-                this.invalid = this.get("required") && value_ === '';
+                return !this.get("required") || value_ !== '';
             } catch(e) {
-                this.invalid = true;
+                return false;
             }
         }
+        return true;
     },
     focus: function($element) {
         this._super($element || this.$textarea);
@@ -2220,13 +2209,13 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
             this.$element.text(option ? option[1] : this.values[0][1]);
         }
     },
-    validate: function() {
+    is_valid: function() {
         if (this.get("effective_readonly")) {
-            this.invalid = false;
-            return;
+            return true;
         }
         var value_ = this.values[this.$element.find('select')[0].selectedIndex];
-        this.invalid = !(value_ && !(this.get("required") && value_[0] === false));
+        var invalid_ = !(value_ && !(this.get("required") && value_[0] === false));
+        return ! invalid_;
     },
     focus: function($element) {
         this._super($element || this.$element.find('select:first'));
@@ -2570,8 +2559,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.exten
         this._super(value_);
         this.inhibit_on_change = false;
     },
-    validate: function() {
-        this.invalid = this.get("required") && ! this.get("value");
+    is_valid: function() {
+        return !this.get("required") || !! this.get("value");
     },
     focus: function ($element) {
         this._super($element || this.$input);
@@ -2876,23 +2865,18 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
 	    }, this));
     },
     is_valid: function() {
-        this.validate();
-        return this._super();
-    },
-    validate: function() {
-        this.invalid = false;
         if (!this.viewmanager.views[this.viewmanager.active_view])
-            return;
+            return true;
         var view = this.viewmanager.views[this.viewmanager.active_view].controller;
         if (this.viewmanager.active_view === "form") {
             for (var f in view.fields) {
                 f = view.fields[f];
                 if (!f.is_valid()) {
-                    this.invalid = true;
-                    return;
+                    return false;
                 }
             }
         }
+        return true;
     },
     is_dirty: function() {
         this.save_any_view();
@@ -3066,9 +3050,6 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
         self.reload_content();
         this.is_setted.resolve();
     },
-    validate: function() {
-        this.invalid = false;
-    },
     load_view: function() {
         var self = this;
         this.list_view = new instance.web.form.Many2ManyListView(this, this.dataset, false, {
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index fe261ba6fec..d92aac4304e 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -291,7 +291,6 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
                     var ffield = form.fields[field_name];
                     ffield.reset();
                     $.when(ffield.set_value(data[field_name])).then(function() {
-                        ffield.validate();
                         ffield.dirty = true;
                         form.do_onchange(ffield);
                     });

From 79a4e461a7f666cf71b597d3a733c85d03e8647d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 11:23:15 +0200
Subject: [PATCH 43/83] [FIX] Fixed wrong model name.

bzr revid: tde@openerp.com-20120418092315-c35p0dtazgkgd9ae
---
 openerp/addons/base/ir/ir_needaction.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 2ea81870c68..6dd9cdfdc54 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -35,7 +35,7 @@ class ir_needaction_users_rel(osv.osv):
     This model can be seen as a many2many, linking (res_model, res_id) to 
     users (those whose attention is required on the record).'''
     
-    _name = 'ir.ir_needaction_users_rel'
+    _name = 'ir.needaction_users_rel'
     _description = 'Needaction relationship table'
     _rec_name = 'id'
     _order = 'id desc'
@@ -126,7 +126,7 @@ class ir_needaction_mixin(osv.osv):
         return dict.fromkeys(ids, [])
     
     def create(self, cr, uid, values, context=None):
-        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
+        rel_obj = self.pool.get('ir.needaction_users_rel')
         # perform create
         obj_id = super(ir_needaction_mixin, self).create(cr, uid, values, context=context)
         # link user_ids
@@ -135,7 +135,7 @@ class ir_needaction_mixin(osv.osv):
         return obj_id
     
     def write(self, cr, uid, ids, values, context=None):
-        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
+        rel_obj = self.pool.get('ir.needaction_users_rel')
         # perform write
         write_res = super(ir_needaction_mixin, self).write(cr, uid, ids, values, context=context)
         # get and update user_ids
@@ -146,7 +146,7 @@ class ir_needaction_mixin(osv.osv):
     
     def unlink(self, cr, uid, ids, context=None):
         # unlink user_ids
-        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
+        rel_obj = self.pool.get('ir.needaction_users_rel')
         rel_obj.unlink_users(cr, uid, ids, self._name, context=context)
         # perform unlink
         return super(ir_needaction_mixin, self).unlink(cr, uid, ids, context=context)
@@ -159,14 +159,14 @@ class ir_needaction_mixin(osv.osv):
         """Given the current model and a user_id
            return the record ids that require the user to perform an
            action"""
-        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
+        rel_obj = self.pool.get('ir.needaction_users_rel')
         rel_ids = rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, context=context)
         return map(itemgetter('res_id'), rel_obj.read(cr, uid, rel_ids, ['res_id'], context=context))
     
     def needaction_get_action_count(self, cr, uid, user_id, limit=80, context=None):
         """Given the current model and a user_id
            get the number of actions it has to perform"""
-        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
+        rel_obj = self.pool.get('ir.needaction_users_rel')
         return rel_obj.search(cr, uid, [('res_model', '=', self._name), ('user_id', '=', user_id)], limit=limit, count=True, context=context)
     
     def needaction_get_record_references(self, cr, uid, user_id, offset=None, limit=None, order=None, context=None):
@@ -174,7 +174,7 @@ class ir_needaction_mixin(osv.osv):
            perform an action. Records are given as references, a list of
            tuples (model_name, record_id).
            This method is trans-model."""
-        rel_obj = self.pool.get('ir.ir_needaction_users_rel')
+        rel_obj = self.pool.get('ir.needaction_users_rel')
         rel_ids = rel_obj.search(cr, uid, [('user_id', '=', user_id)], offset=offset, limit=limit, order=order, context=context)
         return map(itemgetter('res_model', 'res_id'), rel_obj.read(cr, uid, rel_ids, ['res_model', 'res_id'], context=context))
 

From 22adea444c6614243ce280a795931ce91460ddc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 11:41:01 +0200
Subject: [PATCH 44/83] [ADD] Added a 'needaction_pending' field: this states
 whether the record has an action pending.

bzr revid: tde@openerp.com-20120418094101-o0a9lcpux8b6d75u
---
 openerp/addons/base/ir/ir_needaction.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 6dd9cdfdc54..7270eb2ce54 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -115,6 +115,21 @@ class ir_needaction_mixin(osv.osv):
     _name = 'ir.needaction_mixin'
     _description = '"Need action" mixin'
     
+    def get_needaction_pending(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        rel_obj = self.pool.get('ir.needaction_users_rel')
+        for id in ids:
+            res[id] = rel_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', id), ('user_id', '=', uid)], limit=1, count=True, context=context) > 0
+        return res
+    
+    _columns = {
+        'needaction_pending': fields.function(get_needaction_pending, type='boolean',
+                        string='Need action pending',
+                        help='If True, this field states that users have to perform an action. \
+                                This field comes from the needaction mechanism. Please refer \
+                                to the ir.needaction_mixin class.'),
+    }
+    
     #------------------------------------------------------
     # Addon API
     #------------------------------------------------------

From 9012e82d774ce96d0fafaa41b56e39dd3b4ab6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 11:45:54 +0200
Subject: [PATCH 45/83] [IMP] 'needaction_pending' field: not necessary to read
 a table as the information is already available in object.

bzr revid: tde@openerp.com-20120418094554-n5p2wf599tbmhizi
---
 openerp/addons/base/ir/ir_needaction.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 7270eb2ce54..7ed9762f8db 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -117,9 +117,9 @@ class ir_needaction_mixin(osv.osv):
     
     def get_needaction_pending(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        rel_obj = self.pool.get('ir.needaction_users_rel')
+        needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
         for id in ids:
-            res[id] = rel_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', id), ('user_id', '=', uid)], limit=1, count=True, context=context) > 0
+            res[id] = uid in needaction_user_ids[id]
         return res
     
     _columns = {

From 84dadd0e27e1c6f7686ac97e3cfbdd53d74ef757 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 11:50:43 +0200
Subject: [PATCH 46/83] [imp] separated syntax validity from required validity
 in form view

bzr revid: nicolas.vanhoren@openerp.com-20120418095043-6b3pgd89d984f6o0
---
 addons/web/static/src/js/view_form.js | 50 +++++++++++++++++----------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2ca19687cec..976c844c3db 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1698,8 +1698,14 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         return this.get('value');
     },
     is_valid: function() {
+        return this.is_syntax_valid() && (! this.get('required') || ! this.is_false());
+    },
+    is_syntax_valid: function() {
         return true;
     },
+    is_false: function() {
+        return this.get('value') === false;
+    },
     is_dirty: function() {
         return this.dirty && !this.get("effective_readonly");
     },
@@ -1716,7 +1722,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     },
     _on_ui_change: function() {
         this.dirty = true;
-        if (this.is_valid()) {
+        if (this.is_syntax_valid()) {
             this.view.do_onchange(this);
             this.view.on_form_changed(true);
             this.view.do_notify_change();
@@ -1810,17 +1816,20 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
             this.$element.text(show_value);
         }
     },
-    is_valid: function() {
+    is_syntax_valid: function() {
         if (!this.get("effective_readonly")) {
             try {
                 var value_ = instance.web.parse_value(this.$element.find('input').val(), this, '');
-                return (! this.get("required")) || value_ !== '';
+                return true;
             } catch(e) {
                 return false;
             }
         }
         return true;
     },
+    is_false: function() {
+        return this.get('value') === '';
+    },
     focus: function($element) {
         this._super($element || this.$element.find('input:first'));
     }
@@ -1846,7 +1855,7 @@ instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({
         }
     },
     on_button_clicked: function() {
-        if (!this.get('value') || !this.is_valid()) {
+        if (!this.get('value') || !this.is_syntax_valid()) {
             this.do_warn("E-mail error", "Can't send email to invalid e-mail address");
         } else {
             location.href = 'mailto:' + this.get('value');
@@ -1958,7 +1967,7 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
         this.$input.prop('readonly', this.readonly);
         this.$element.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', readonly);
     },
-    is_valid: function() {
+    is_valid_: function() {
         var value_ = this.$input.val();
         if (value_ === "") {
             return true;
@@ -1978,7 +1987,7 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
         return instance.web.format_value(v, {"widget": this.type_of_date});
     },
     on_change: function() {
-        if (this.is_valid()) {
+        if (this.is_valid_()) {
             this.set_value_from_ui_();
         }
     }
@@ -2020,12 +2029,15 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
             this.$element.text(instance.web.format_value(this.get('value'), this, ''));
         }
     },
-    is_valid: function() {
+    is_syntax_valid: function() {
         if (!this.get("effective_readonly")) {
-            return this.datewidget.is_valid() && (!this.get("required") || this.datewidget.get_value());
+            return this.datewidget.is_valid_();
         }
         return true;
     },
+    is_false: function() {
+        return this.get('value') === '';
+    },
     focus: function($element) {
         this._super($element || (this.datewidget && this.datewidget.$input));
     }
@@ -2065,17 +2077,20 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
             this.$element.text(show_value);
         }
     },
-    is_valid: function() {
+    is_syntax_valid: function() {
         if (!this.get("effective_readonly")) {
             try {
                 var value_ = instance.web.parse_value(this.$textarea.val(), this, '');
-                return !this.get("required") || value_ !== '';
+                return true;
             } catch(e) {
                 return false;
             }
         }
         return true;
     },
+    is_false: function() {
+        return this.get('value') === '';
+    },
     focus: function($element) {
         this._super($element || this.$textarea);
     },
@@ -2209,13 +2224,12 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
             this.$element.text(option ? option[1] : this.values[0][1]);
         }
     },
-    is_valid: function() {
+    is_syntax_valid: function() {
         if (this.get("effective_readonly")) {
             return true;
         }
         var value_ = this.values[this.$element.find('select')[0].selectedIndex];
-        var invalid_ = !(value_ && !(this.get("required") && value_[0] === false));
-        return ! invalid_;
+        return !! value_;
     },
     focus: function($element) {
         this._super($element || this.$element.find('select:first'));
@@ -2559,8 +2573,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.exten
         this._super(value_);
         this.inhibit_on_change = false;
     },
-    is_valid: function() {
-        return !this.get("required") || !! this.get("value");
+    is_false: function() {
+        return ! this.get("value");
     },
     focus: function ($element) {
         this._super($element || this.$input);
@@ -2864,7 +2878,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
 	        return false;
 	    }, this));
     },
-    is_valid: function() {
+    is_syntax_valid: function() {
         if (!this.viewmanager.views[this.viewmanager.active_view])
             return true;
         var view = this.viewmanager.views[this.viewmanager.active_view].controller;
@@ -3510,8 +3524,8 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
         this.m2o.renderElement();
         this.m2o.start();
     },
-    is_valid: function() {
-        return this.get("required") === false || typeof(this.get_value()) === 'string';
+    is_false: function() {
+        return typeof(this.get_value()) !== 'string';
     },
     is_dirty: function() {
         return this.selection.is_dirty() || this.m2o.is_dirty();

From e4063efdf27324d91ad2d1a33f042e0c2b192af8 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 11:57:58 +0200
Subject: [PATCH 47/83] [imp] changed the way on_changes are received by the
 form view

bzr revid: nicolas.vanhoren@openerp.com-20120418095758-x7du906934jbkp90
---
 addons/web/static/src/js/view_form.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 976c844c3db..3cda7bf1b4c 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -853,6 +853,11 @@ instance.web.FormView = instance.web.View.extend({
         if (this.get_field(name).translate) {
             this.translatable_fields.push(field);
         }
+        field.on('changed_value', this, function() {
+            this.do_onchange(field);
+            this.on_form_changed(true);
+            this.do_notify_change();
+        });
     },
     get_field: function(field_name) {
         return this.fields_view.fields[field_name];
@@ -1574,7 +1579,7 @@ instance.web.form.FieldManagerInterface = {
  *     - force_readonly: boolean, When it is true, the field should always appear
  *      in read only mode, no matter what the value of the "readonly" property can be.
  * Events:
- *     - ...
+ *     - changed_value: called to trigger a on_change in the view
  * 
  */
 instance.web.form.FieldInterface = {
@@ -1662,14 +1667,12 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         _.bind(test_effective_readonly, this)();
         
         this.on("change:value", this, function() {
-            if (this._field_is_started && ! this._inhibit_on_change)
+            if (! this._inhibit_on_change)
                 this._on_ui_change();
         });
     },
     start: function() {
         this._super.apply(this, arguments);
-        // quick hack, will change later
-        this._field_is_started = true;
         if (this.field.translate) {
             this.$element.addClass('oe_form_field_translatable');
             this.$element.find('.oe_field_translate').click(this.on_translate);
@@ -1723,9 +1726,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     _on_ui_change: function() {
         this.dirty = true;
         if (this.is_syntax_valid()) {
-            this.view.do_onchange(this);
-            this.view.on_form_changed(true);
-            this.view.do_notify_change();
+            this.trigger('changed_value');
         } else {
             this.update_dom(true);
         }

From 49f785c74ec6e6aa5df27439e8bf8860e23df58d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 11:58:54 +0200
Subject: [PATCH 48/83] [DOC] Improved doc, adding reference to the
 needaction_pending field.

bzr revid: tde@openerp.com-20120418095854-29o6qupaoi741imr
---
 doc/api/need_action_specs.rst | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/doc/api/need_action_specs.rst b/doc/api/need_action_specs.rst
index 88787ae4c44..de1b75a5fb1 100644
--- a/doc/api/need_action_specs.rst
+++ b/doc/api/need_action_specs.rst
@@ -1,6 +1,8 @@
 Need action mechanism
 =====================
 
+.. versionadded:: openobject-server.4124
+
 ir.needaction_mixin mixin class
 +++++++++++++++++++++++++++++++
 
@@ -15,15 +17,37 @@ Objects using the need_action feature should override the ``get_needaction_user_
 This class also offers several global services,:
  - ``needaction_get_record_ids``: for the current model and uid, get all record ids that ask this user to perform an action. This mechanism is used for instance to display the number of pending actions in menus, such as Leads (12)
  - ``needaction_get_action_count``: as ``needaction_get_record_ids`` but returns only the number of action, not the ids (performs a search with count=True)
- - ``needaction_get_user_record_references``: for a given uid, get all the records that ask this user to perform an action. Records are given as references, a list of tuples (model_name, record_id)
+ - ``needaction_get_user_record_references``: for a given uid, get all the records that ask this user to perform an action. Records are given as references, a list of tuples (model_name, record_id).
+
+.. versionadded:: openobject-server.XXXX
+
+This revision of the needaction_mixin mechanism slighty modifies the class behavior. The ``ir_needaction_mixin`` class now adds a function field on model inheriting from the class. This field allows to state whether a given record has a needaction for the current user. This is usefull if you want to customize views according to the needaction feature. For example, you may want to set records in bold in a list view if the current user has an action to perform on the record. This makes the class not a pure abstract class, but allows to easily use the action information. The field definition is::
+
+
+    def get_needaction_pending(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        needaction_user_ids = self.get_needaction_user_ids(cr, uid, ids, context=context)
+        for id in ids:
+            res[id] = uid in needaction_user_ids[id]
+        return res
+    
+    _columns = {
+        'needaction_pending': fields.function(get_needaction_pending, type='boolean',
+                        string='Need action pending',
+                        help='If True, this field states that users have to perform an action. \
+                                This field comes from the needaction mechanism. Please refer \
+                                to the ir.needaction_mixin class.'),
+    }
 
 Menu modification
 +++++++++++++++++
 
+.. versionchanged:: openobject-server.XXXX
+
 This revision adds three functional fields to ``ir.ui.menu`` model :
  - ``uses_needaction``: boolean field. If the menu entry action is an act_window action, and if this action is related to a model that uses the need_action mechanism, this field is set to true. Otherwise, it is false.
  - ``needaction_uid_ctr``: integer field. If the target model uses the need action mechanism, this field gives the number of actions the current user has to perform.
- - ``needaction_record_ids``: many2many field. If the target model uses the need action mechanism, this field holds the ids of the record requesting the user to perform an action.
+ - ``needaction_record_ids``: many2many field. If the target model uses the need action mechanism, this field holds the ids of the record requesting the user to perform an action. **This field has been removed on version XXXX**.
 
 Those fields are functional, because they depend on the user and must therefore be computed at every refresh, each time menus are displayed. The use of the need action mechanism is done by taking into account the action domain in order to display accurate results. When computing the value of the functional fields, the ids of records asking the user to perform an action is concatenated to the action domain. A counting search is then performed on the model, giving back the number of action the users has to perform, limited to the domain of the action.
 

From a787430ba943af3a7e7e71b3ddcb0c76d00d5d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 13:10:16 +0200
Subject: [PATCH 49/83] [DOC] Small doc update.

bzr revid: tde@openerp.com-20120418111016-fgmvnq85esyhvw87
---
 doc/api/need_action_specs.rst | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/doc/api/need_action_specs.rst b/doc/api/need_action_specs.rst
index de1b75a5fb1..111c156ac79 100644
--- a/doc/api/need_action_specs.rst
+++ b/doc/api/need_action_specs.rst
@@ -1,16 +1,18 @@
 Need action mechanism
 =====================
 
-.. versionadded:: openobject-server.4124
+.. versionadded:: 7.0
 
-ir.needaction_mixin mixin class
-+++++++++++++++++++++++++++++++
+ir.needaction_mixin class
++++++++++++++++++++++++++
+
+.. versionadded:: openobject-server.4124
 
 This revision adds a mixin class for objects using the need action feature.
 
 Need action feature can be used by objects willing to be able to signal that an action is required on a particular record. If in the business logic an action must be performed by somebody, for instance validation by a manager, this mechanism allows to set a list of users asked to perform an action.
 
-This class wraps a class (ir.needaction_users) that behaves like a many2many field. However, no field is added to the model inheriting from ir.needaction_mixin. The mixin class manages the low-level considerations of updating relationships. Every change made on the record calls a method that updates the relationships.
+This class wraps a class (ir.ir_needaction_users_rel) that behaves like a many2many field. However, no field is added to the model inheriting from ir.needaction_mixin. The mixin class manages the low-level considerations of updating relationships. Every change made on the record calls a method that updates the relationships.
 
 Objects using the need_action feature should override the ``get_needaction_user_ids`` method. This methods returns a dictionary whose keys are record ids, and values a list of user ids, like in a many2many relationship. Therefore by defining only one method, you can specify if an action is required by defining the users that have to do it, in every possible situation.
 
@@ -39,6 +41,23 @@ This revision of the needaction_mixin mechanism slighty modifies the class behav
                                 to the ir.needaction_mixin class.'),
     }
 
+ir.needaction_users_rel class
++++++++++++++++++++++++++++++
+
+.. versionadded:: openobject-server.4124
+
+This class essentially wraps a database table that behaves like a many2many.
+It holds data related to the needaction mechanism inside OpenERP. A row 
+in this model is characterized by:
+
+  - ``res_model``: model of the record requiring an action
+  - ``res_id``: ID of the record requiring an action
+  - ``user_id``: foreign key to the res.users table, to the user that
+    has to perform the action
+
+This model can be seen as a many2many, linking (res_model, res_id) to  
+users (those whose attention is required on the record)
+
 Menu modification
 +++++++++++++++++
 

From 8d858cf0b02e4e9a053ac3c4dd1438afe1c6278a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 13:12:12 +0200
Subject: [PATCH 50/83] [TMP] Uncommit temp fix.

bzr revid: tde@openerp.com-20120418111212-j035lajdu2g045kf
---
 openerp/addons/base/ir/ir_ui_menu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 0de4ff74c11..e861f8231ca 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -264,7 +264,7 @@ class ir_ui_menu(osv.osv):
             if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
                 menu_needaction_res = self.pool.get(menu.action.res_model)._get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
                 # TODO: find the addon that causes a bug on runbot, not on local
-                if not isinstance(menu_needaction_res[1], (int, long)): menu_needaction_res[1] = 0
+                #if not isinstance(menu_needaction_res[1], (int, long)): menu_needaction_res[1] = 0
             else:
                 menu_needaction_res = [False, 0]
             res[menu.id]['needaction_enabled'] = menu_needaction_res[0]

From 78883771bdb16b9d2c4c926162fc1d5dfab0e068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 13:25:43 +0200
Subject: [PATCH 51/83] [DOC] Added comments in code.

bzr revid: tde@openerp.com-20120418112543-g5jbcn2h5mgrbxtc
---
 openerp/addons/base/ir/ir_needaction.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_needaction.py b/openerp/addons/base/ir/ir_needaction.py
index 7ed9762f8db..cb6d29d1715 100644
--- a/openerp/addons/base/ir/ir_needaction.py
+++ b/openerp/addons/base/ir/ir_needaction.py
@@ -111,7 +111,15 @@ class ir_needaction_mixin(osv.osv):
     - ``needaction_get_user_record_references``: for a given uid, get all
       the records that ask this user to perform an action. Records
       are given as references, a list of tuples (model_name, record_id)
-    '''
+
+    The ``ir_needaction_mixin`` class adds a function field on model inheriting 
+    from the class. This field allows to state whether a given record has 
+    a needaction for the current user. This is usefull if you want to customize 
+    views according to the needaction feature. For example, you may want to 
+    set records in bold in a list view if the current user has an action to 
+    perform on the record. This makes the class not a pure abstract class, 
+    but allows to easily use the action information.'''
+    
     _name = 'ir.needaction_mixin'
     _description = '"Need action" mixin'
     

From 3da67c851fa3333215dfa9afb8faa2be032dac11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 13:37:06 +0200
Subject: [PATCH 52/83] [REM] Removed unused field in menus. BTW it solves a
 GTk client crash.

bzr revid: tde@openerp.com-20120418113706-raesdy1tak5dwkwo
---
 openerp/addons/base/ir/ir_ui_menu.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index e861f8231ca..f73496cb230 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -289,7 +289,6 @@ class ir_ui_menu(osv.osv):
         'web_icon_hover_data':fields.function(_get_image_icon, string='Web Icon Image (hover)', type='binary', readonly=True, store=True, multi='icon'),
         'needaction_enabled': fields.function(_get_needaction, string='Target model uses the need action mechanism', type='boolean', help='If the menu entry action is an act_window action, and if this action is related to a model that uses the need_action mechanism, this field is set to true. Otherwise, it is false.', multi='_get_needaction'),
         'needaction_counter': fields.function(_get_needaction, string='Number of actions the user has to perform', type='integer', help='If the target model uses the need action mechanism, this field gives the number of actions the current user has to perform.', multi='_get_needaction'),
-        'needaction_record_ids': fields.function(_get_needaction, string='Ids of records requesting an action from the user', type='many2many', help='If the target model uses the need action mechanism, this field holds the ids of the record requesting the user to perform an action.', multi='_get_needaction'),
         'action': fields.function(_action, fnct_inv=_action_inv,
             type='reference', string='Action',
             selection=[

From d029e2734c65624083eeb593a9684e35d31e7b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 13:37:48 +0200
Subject: [PATCH 53/83] [DOC] Small doc update.

bzr revid: tde@openerp.com-20120418113748-vsdtsype2l94wbl5
---
 doc/api/need_action_specs.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/need_action_specs.rst b/doc/api/need_action_specs.rst
index 111c156ac79..a3a8ba04bf0 100644
--- a/doc/api/need_action_specs.rst
+++ b/doc/api/need_action_specs.rst
@@ -66,7 +66,7 @@ Menu modification
 This revision adds three functional fields to ``ir.ui.menu`` model :
  - ``uses_needaction``: boolean field. If the menu entry action is an act_window action, and if this action is related to a model that uses the need_action mechanism, this field is set to true. Otherwise, it is false.
  - ``needaction_uid_ctr``: integer field. If the target model uses the need action mechanism, this field gives the number of actions the current user has to perform.
- - ``needaction_record_ids``: many2many field. If the target model uses the need action mechanism, this field holds the ids of the record requesting the user to perform an action. **This field has been removed on version XXXX**.
+ - **REMOVED** ``needaction_record_ids``: many2many field. If the target model uses the need action mechanism, this field holds the ids of the record requesting the user to perform an action. **This field has been removed on version XXXX**.
 
 Those fields are functional, because they depend on the user and must therefore be computed at every refresh, each time menus are displayed. The use of the need action mechanism is done by taking into account the action domain in order to display accurate results. When computing the value of the functional fields, the ids of records asking the user to perform an action is concatenated to the action domain. A counting search is then performed on the model, giving back the number of action the users has to perform, limited to the domain of the action.
 

From 29d48867ab89e6067fb34b97522095c334040766 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 13:50:04 +0200
Subject: [PATCH 54/83] [imp] changed the way validity is tested

bzr revid: nicolas.vanhoren@openerp.com-20120418115004-otz3xocucky9u5gl
---
 addons/web/static/src/js/view_form.js | 47 ++++++++++-----------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3cda7bf1b4c..fedc602b4b1 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -247,7 +247,7 @@ instance.web.FormView = instance.web.View.extend({
         }
 
         _(this.fields).each(function (field, f) {
-            field.reset();
+            field._dirty_flag = false;
             var result = field.set_value(self.datarecord[f] || false);
             set_values.push(result);
         });
@@ -258,7 +258,7 @@ instance.web.FormView = instance.web.View.extend({
                 _.each(self.fields_order, function(field_name) {
                     if (record[field_name] !== undefined) {
                         var field = self.fields[field_name];
-                        field.dirty = true;
+                        field._dirty_flag = true;
                         self.do_onchange(field);
                     }
                 });
@@ -469,7 +469,7 @@ instance.web.FormView = instance.web.View.extend({
                     var value_ = result.value[f];
                     if (field.get_value() != value_) {
                         field.set_value(value_);
-                        field.dirty = true;
+                        field._dirty_flag = true;
                         if (!_.contains(processed, field.name)) {
                             this.do_onchange(field, processed);
                         }
@@ -615,7 +615,7 @@ instance.web.FormView = instance.web.View.extend({
                     if (!first_invalid_field) {
                         first_invalid_field = f;
                     }
-                } else if (f.name !== 'id' && !f.get("readonly") && (!self.datarecord.id || f.is_dirty())) {
+                } else if (f.name !== 'id' && !f.get("readonly") && (!self.datarecord.id || f._dirty_flag)) {
                     // Special case 'id' field, do not save this field
                     // on 'create' : save all non readonly fields
                     // on 'edit' : save non readonly modified fields
@@ -754,7 +754,7 @@ instance.web.FormView = instance.web.View.extend({
     },
     is_dirty: function() {
         return _.any(this.fields, function (value_) {
-            return value_.is_dirty();
+            return value_._dirty_flag;
         });
     },
     is_interactible_record: function() {
@@ -854,9 +854,11 @@ instance.web.FormView = instance.web.View.extend({
             this.translatable_fields.push(field);
         }
         field.on('changed_value', this, function() {
-            this.do_onchange(field);
-            this.on_form_changed(true);
-            this.do_notify_change();
+            if (field.is_syntax_valid()) {
+                this.do_onchange(field);
+                this.on_form_changed(true);
+                this.do_notify_change();
+            }
         });
     },
     get_field: function(field_name) {
@@ -1628,7 +1630,11 @@ instance.web.form.FieldInterface = {
      * Inform the current object of the id it should use to match a html <label> that exists somewhere in the
      * view.
      */
-    set_input_id: function(id) {}
+    set_input_id: function(id) {},
+    
+    is_valid: function() {},
+    is_syntax_valid: function() {},
+    is_false: function() {},
 };
 
 /**
@@ -1654,7 +1660,6 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this.set({'value': false});
         this.field = this.field_manager.get_field(this.name);
         this.set({required: this.modifiers['required'] === true});
-        this.dirty = false;
         
         // some events to make the property "effective_readonly" sync automatically with "readonly" and
         // "force_readonly"
@@ -1709,9 +1714,6 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     is_false: function() {
         return this.get('value') === false;
     },
-    is_dirty: function() {
-        return this.dirty && !this.get("effective_readonly");
-    },
     update_dom: function(show_invalid) {
         this._super.apply(this, arguments);
         if (this.field.translate) {
@@ -1724,10 +1726,8 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         }
     },
     _on_ui_change: function() {
-        this.dirty = true;
-        if (this.is_syntax_valid()) {
-            this.trigger('changed_value');
-        } else {
+        this.trigger('changed_value');
+        if (! this.is_syntax_valid()) {
             this.update_dom(true);
         }
     },
@@ -1738,9 +1738,6 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
             }, 50);
         }
     },
-    reset: function() {
-        this.dirty = false;
-    },
     get_definition_options: function() {
         if (!this.definition_options) {
             var str = this.node.attrs.options || '{}';
@@ -2115,9 +2112,6 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
         $div.remove();
         $input.height(new_height);
     },
-    reset: function() {
-        this.resized = false;
-    }
 }));
 
 instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
@@ -2893,10 +2887,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
         }
         return true;
     },
-    is_dirty: function() {
-        this.save_any_view();
-        return this._super();
-    }
 });
 
 instance.web.form.One2ManyDataSet = instance.web.BufferedDataSet.extend({
@@ -3528,9 +3518,6 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
     is_false: function() {
         return typeof(this.get_value()) !== 'string';
     },
-    is_dirty: function() {
-        return this.selection.is_dirty() || this.m2o.is_dirty();
-    },
     set_value: function(value_) {
         this._super(value_);
         this.render_value();

From 110fbacb2a085fe26ec3032b5e1e0edf93ebc8e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 13:50:50 +0200
Subject: [PATCH 55/83] [REM] Removed comment and now unnecessary code.

bzr revid: tde@openerp.com-20120418115050-jwtyqg9iahakyu13
---
 openerp/addons/base/ir/ir_ui_menu.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index f73496cb230..15d250a7489 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -263,8 +263,6 @@ class ir_ui_menu(osv.osv):
             res[menu.id] = {}
             if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
                 menu_needaction_res = self.pool.get(menu.action.res_model)._get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
-                # TODO: find the addon that causes a bug on runbot, not on local
-                #if not isinstance(menu_needaction_res[1], (int, long)): menu_needaction_res[1] = 0
             else:
                 menu_needaction_res = [False, 0]
             res[menu.id]['needaction_enabled'] = menu_needaction_res[0]

From 1f2b45304e549ba3111abae8185187891601ccad Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 14:20:39 +0200
Subject: [PATCH 56/83] [imp] removed update_dom

bzr revid: nicolas.vanhoren@openerp.com-20120418122039-086kmrnz1em88sx2
---
 addons/web/static/src/js/view_form.js | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index fedc602b4b1..a851f19a2bd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -281,9 +281,6 @@ instance.web.FormView = instance.web.View.extend({
     },
     on_form_changed: function() {
         this.trigger("view_content_has_changed");
-        _.each(this.get_widgets(), function(w) {
-            w.update_dom();
-        });
     },
     do_notify_change: function() {
         this.$element.addClass('oe_form_dirty');
@@ -611,7 +608,6 @@ instance.web.FormView = instance.web.View.extend({
                 f = self.fields[f];
                 if (!f.is_valid()) {
                     form_invalid = true;
-                    f.update_dom(true);
                     if (!first_invalid_field) {
                         first_invalid_field = f;
                     }
@@ -623,10 +619,12 @@ instance.web.FormView = instance.web.View.extend({
                 }
             }
             if (form_invalid) {
+                self.set({'display_invalid_fields': true});
                 first_invalid_field.focus();
                 self.on_invalid();
                 return $.Deferred().reject();
             } else {
+                self.set({'display_invalid_fields': false});
                 var save_deferral;
                 if (!self.datarecord.id) {
                     //console.log("FormView(", self, ") : About to create", values);
@@ -1387,8 +1385,6 @@ instance.web.form.Widget = instance.web.Widget.extend(_.extend({}, instance.web.
         }
         this.set(to_set);
     },
-    update_dom: function() {
-    },
     do_attach_tooltip: function(widget, trigger, options) {
         widget = widget || this;
         trigger = trigger || this.$element;
@@ -1471,6 +1467,7 @@ instance.web.form.WidgetButton = instance.web.form.Widget.extend({
             // TODO fme: provide enter key binding to widgets
             this.view.default_focus_button = this;
         }
+        this.view.on('view_content_has_changed', this, this.check_disable);
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -1537,10 +1534,6 @@ instance.web.form.WidgetButton = instance.web.form.Widget.extend({
                 self.view.reload();
             });
     },
-    update_dom: function() {
-        this._super.apply(this, arguments);
-        this.check_disable();
-    },
     check_disable: function() {
         var disabled = (this.force_disabled || !this.view.is_interactible_record());
         this.$element.prop('disabled', disabled);
@@ -1553,7 +1546,7 @@ instance.web.form.WidgetButton = instance.web.form.Widget.extend({
  * able to provide the features necessary for the fields to work.
  * 
  * Properties:
- *     - ...
+ *     - display_invalid_fields
  * Events:
  *     - view_content_has_changed : when the values of the fields have changed. When
  *     this event is triggered all fields should reprocess their modifiers.
@@ -1675,6 +1668,9 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
             if (! this._inhibit_on_change)
                 this._on_ui_change();
         });
+        this.on('changed_value', this, function() {
+            this.check_css_flags();
+        });
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -1697,7 +1693,6 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this._inhibit_on_change = true;
         this.set({'value': value_});
         this._inhibit_on_change = false;
-        this.update_dom();
     },
     on_translate: function() {
         this.field_manager.open_translate_dialog(this);
@@ -1714,22 +1709,18 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     is_false: function() {
         return this.get('value') === false;
     },
-    update_dom: function(show_invalid) {
-        this._super.apply(this, arguments);
+    check_css_flags: function(show_invalid) {
         if (this.field.translate) {
             this.$element.find('.oe_field_translate').toggle(!this.field_manager.is_create_mode());
         }
         if (!this.disable_utility_classes) {
-            if (show_invalid) {
+            if (this.field_manager.get('display_invalid_fields')) {
                 this.$element.toggleClass('oe_form_invalid', !this.is_valid());
             }
         }
     },
     _on_ui_change: function() {
         this.trigger('changed_value');
-        if (! this.is_syntax_valid()) {
-            this.update_dom(true);
-        }
     },
     focus: function($element) {
         if ($element) {

From a2ac0de1f2869e0bf6ad591b5263924bf1715559 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 14:23:41 +0200
Subject: [PATCH 57/83] [imp] removed some more useless methods in fields

bzr revid: nicolas.vanhoren@openerp.com-20120418122341-7c9bue6ed3v1pidb
---
 addons/web/static/src/js/view_form.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a851f19a2bd..2daec2ee8bf 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1666,10 +1666,8 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         
         this.on("change:value", this, function() {
             if (! this._inhibit_on_change)
-                this._on_ui_change();
-        });
-        this.on('changed_value', this, function() {
-            this.check_css_flags();
+                this.trigger('changed_value');
+            this._check_css_flags();
         });
     },
     start: function() {
@@ -1709,7 +1707,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     is_false: function() {
         return this.get('value') === false;
     },
-    check_css_flags: function(show_invalid) {
+    _check_css_flags: function(show_invalid) {
         if (this.field.translate) {
             this.$element.find('.oe_field_translate').toggle(!this.field_manager.is_create_mode());
         }
@@ -1719,9 +1717,6 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
             }
         }
     },
-    _on_ui_change: function() {
-        this.trigger('changed_value');
-    },
     focus: function($element) {
         if ($element) {
             setTimeout(function() {
@@ -2655,7 +2650,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
     trigger_on_change: function() {
         var tmp = this.doing_on_change;
         this.doing_on_change = true;
-        this._on_ui_change();
+        this.trigger('changed_value');
         this.doing_on_change = tmp;
     },
     load_views: function() {

From c0bdcbc77802d703fd76fce3fff77ef00eeb86aa Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 14:37:04 +0200
Subject: [PATCH 58/83] [imp] removed some more methods in abstract field

bzr revid: nicolas.vanhoren@openerp.com-20120418123704-gze8svdr76x9g1l7
---
 addons/web/static/src/js/view_form.js | 49 +++++++++++++++------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2daec2ee8bf..f6199fc2b38 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1628,6 +1628,7 @@ instance.web.form.FieldInterface = {
     is_valid: function() {},
     is_syntax_valid: function() {},
     is_false: function() {},
+    focus: function() {},
 };
 
 /**
@@ -1674,7 +1675,9 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this._super.apply(this, arguments);
         if (this.field.translate) {
             this.$element.addClass('oe_form_field_translatable');
-            this.$element.find('.oe_field_translate').click(this.on_translate);
+            this.$element.find('.oe_field_translate').click(_.bind(function() {
+                this.field_manager.open_translate_dialog(this);
+            }, this));
         }
         if (instance.connection.debug) {
             this.do_attach_tooltip(this, this.$element);
@@ -1692,9 +1695,6 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this.set({'value': value_});
         this._inhibit_on_change = false;
     },
-    on_translate: function() {
-        this.field_manager.open_translate_dialog(this);
-    },
     get_value: function() {
         return this.get('value');
     },
@@ -1717,13 +1717,19 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
             }
         }
     },
-    focus: function($element) {
-        if ($element) {
-            setTimeout(function() {
-                $element.focus();
-            }, 50);
-        }
+    focus: function() {
     },
+    /**
+     * Utility method to focus an element, but only after a small amount of time.
+     */
+    delay_focus: function($elem) {
+        setTimeout(function() {
+            $elem.focus();
+        }, 50);
+    },
+    /**
+     * Utility method to get the widget options defined in the field xml description.
+     */
     get_definition_options: function() {
         if (!this.definition_options) {
             var str = this.node.attrs.options || '{}';
@@ -1814,8 +1820,8 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
     is_false: function() {
         return this.get('value') === '';
     },
-    focus: function($element) {
-        this._super($element || this.$element.find('input:first'));
+    focus: function() {
+        this.delay_focus(this.$element.find('input:first'));
     }
 }));
 
@@ -2022,8 +2028,9 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
     is_false: function() {
         return this.get('value') === '';
     },
-    focus: function($element) {
-        this._super($element || (this.datewidget && this.datewidget.$input));
+    focus: function() {
+        if (this.datewidget && this.datewidget.$input)
+            this.delay_focus(this.datewidget.$input);
     }
 }));
 
@@ -2076,7 +2083,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
         return this.get('value') === '';
     },
     focus: function($element) {
-        this._super($element || this.$textarea);
+        this.delay_focus(this.$textarea);
     },
     do_resize: function(max_height) {
         max_height = parseInt(max_height, 10);
@@ -2118,8 +2125,8 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
         this._super.apply(this, arguments);
         this.$checkbox[0].checked = value_;
     },
-    focus: function($element) {
-        this._super($element || this.$checkbox);
+    focus: function() {
+        this.delay_focus(this.$checkbox);
     }
 });
 
@@ -2212,8 +2219,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
         var value_ = this.values[this.$element.find('select')[0].selectedIndex];
         return !! value_;
     },
-    focus: function($element) {
-        this._super($element || this.$element.find('select:first'));
+    focus: function() {
+        this.delay_focus(this.$element.find('select:first'));
     }
 }));
 
@@ -2557,8 +2564,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.exten
     is_false: function() {
         return ! this.get("value");
     },
-    focus: function ($element) {
-        this._super($element || this.$input);
+    focus: function () {
+        this.delay_focus(this.$input);
     }
 }));
 

From 5dfffbd820adc3adf719af5af5c28df42b7f628e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 14:45:20 +0200
Subject: [PATCH 59/83] [imp] some more cosmetic improvements

bzr revid: nicolas.vanhoren@openerp.com-20120418124520-f3hbmwn6bk50pfrt
---
 addons/web/static/src/js/view_form.js | 38 +++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f6199fc2b38..dbdd0965e50 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1781,8 +1781,8 @@ instance.web.form.ReinitializeFieldMixin =  {
 
 instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldChar',
-    init: function (view, node) {
-        this._super(view, node);
+    init: function (field_manager, node) {
+        this._super(field_manager, node);
         this.password = this.node.attrs.password === 'True' || this.node.attrs.password === '1';
     },
     initialize_content: function() {
@@ -1885,8 +1885,8 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({
 
 instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
     is_field_number: true,
-    init: function (view, node) {
-        this._super(view, node);
+    init: function (field_manager, node) {
+        this._super(field_manager, node);
         this.set({'value': 0});
         if (this.node.attrs.digits) {
             this.digits = py.eval(node.attrs.digits);
@@ -2156,9 +2156,9 @@ instance.web.form.FieldTextXml = instance.web.form.AbstractField.extend({
 
 instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldSelection',
-    init: function(view, node) {
+    init: function(field_manager, node) {
         var self = this;
-        this._super(view, node);
+        this._super(field_manager, node);
         this.values = _.clone(this.field.selection);
         _.each(this.values, function(v, i) {
             if (v[0] === false && v[1] === '') {
@@ -2268,8 +2268,8 @@ instance.web.form.dialog = function(content, options) {
 
 instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: "FieldMany2One",
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(field_manager, node) {
+        this._super(field_manager, node);
         this.limit = 7;
         this.set({'value': false});
         this.display_value = {};
@@ -2617,8 +2617,8 @@ var commands = {
 instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
     multi_selection: false,
     disable_utility_classes: true,
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(field_manager, node) {
+        this._super(field_manager, node);
         lazy_build_o2m_kanban_view();
         this.is_loaded = $.Deferred();
         this.initial_is_loaded = this.is_loaded;
@@ -3006,8 +3006,8 @@ instance.web.form.One2ManyKanbanView = instance.web_kanban.KanbanView.extend({
 instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
     multi_selection: false,
     disable_utility_classes: true,
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(field_manager, node) {
+        this._super(field_manager, node);
         this.is_loaded = $.Deferred();
         this.initial_is_loaded = this.is_loaded;
         this.is_setted = $.Deferred();
@@ -3446,20 +3446,20 @@ instance.web.form.FormOpenDataset = instance.web.ProxyDataSet.extend({
 
 instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldReference',
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(field_manager, node) {
+        this._super(field_manager, node);
         this.fields_view = {
             fields: {
                 selection: {
-                    selection: view.fields_view.fields[this.name].selection
+                    selection: this.view.fields_view.fields[this.name].selection
                 },
                 m2o: {
                     relation: null
                 }
             }
         };
-        this.get_fields_values = view.get_fields_values;
-        this.get_selected_ids = view.get_selected_ids;
+        this.get_fields_values = this.view.get_fields_values;
+        this.get_selected_ids = this.view.get_selected_ids;
         this.do_onchange = this.on_form_changed = this.do_notify_change = this.on_nop;
         this.dataset = this.view.dataset;
         this.view_id = 'reference_' + _.uniqueId();
@@ -3543,8 +3543,8 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
 }));
 
 instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(field_manager, node) {
+        this._super(field_manager, node);
         this.iframe = this.element_id + '_iframe';
         this.binary_value = false;
     },

From a448616a94b87c348aae4b817fefe13d8f11972c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 15:05:40 +0200
Subject: [PATCH 60/83] [imp] added documentation

bzr revid: nicolas.vanhoren@openerp.com-20120418130540-nku5lao8l2jl10o3
---
 addons/web/static/src/js/view_form.js | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index dbdd0965e50..9bae2a75c7d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1546,7 +1546,8 @@ instance.web.form.WidgetButton = instance.web.form.Widget.extend({
  * able to provide the features necessary for the fields to work.
  * 
  * Properties:
- *     - display_invalid_fields
+ *     - display_invalid_fields : if true, all fields where is_valid() return true should
+ *     be displayed as invalid.
  * Events:
  *     - view_content_has_changed : when the values of the fields have changed. When
  *     this event is triggered all fields should reprocess their modifiers.
@@ -1574,7 +1575,7 @@ instance.web.form.FieldManagerInterface = {
  *     - force_readonly: boolean, When it is true, the field should always appear
  *      in read only mode, no matter what the value of the "readonly" property can be.
  * Events:
- *     - changed_value: called to trigger a on_change in the view
+ *     - changed_value: triggered to inform the view to check on_changes
  * 
  */
 instance.web.form.FieldInterface = {
@@ -1624,10 +1625,19 @@ instance.web.form.FieldInterface = {
      * view.
      */
     set_input_id: function(id) {},
-    
+    /**
+     * Returns true if is_syntax_valid() returns true and the value is semantically
+     * valid too according to the semantic restrictions applied to the field.
+     */
     is_valid: function() {},
+    /**
+     * Returns true if the field holds a value which is syntaxically correct, ignoring
+     * the potential semantic restrictions applied to the field.
+     */
     is_syntax_valid: function() {},
-    is_false: function() {},
+    /**
+     * Must set the focus on the field.
+     */
     focus: function() {},
 };
 
@@ -1637,6 +1647,9 @@ instance.web.form.FieldInterface = {
  * Properties:
  *     - effective_readonly: when it is true, the widget is displayed as readonly. Vary depending
  *      the values of the "readonly" property and the "force_readonly" property on the field manager.
+ *     - value: useful property to hold the value of the field. By default, set_value() and get_value()
+ *     set and retrieve the value property. Changing the value property also triggers automatically
+ *     a 'changed_value' event that inform the view to trigger on_changes.
  * 
  */
 instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends instance.web.form.AbstractField# */{
@@ -1704,6 +1717,10 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     is_syntax_valid: function() {
         return true;
     },
+    /**
+     * Method useful to implement to ease validity testing. Must return true if the current
+     * value is similar to false in OpenERP.
+     */
     is_false: function() {
         return this.get('value') === false;
     },

From 0a781447414d0316d956aeaa0dc011e0df053675 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 15:12:02 +0200
Subject: [PATCH 61/83] [fix] problem in search view, seems like a typo

bzr revid: nicolas.vanhoren@openerp.com-20120418131202-uxbwgb4if01t3pzo
---
 addons/web/static/src/js/search.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 18ac6b78de5..c2df866b5c6 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1403,7 +1403,6 @@ instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/*
         var type = field.type;
         var obj = instance.web.search.custom_filters.get_object(type);
         if(obj === null) {
-            console.log('Unknow field type ' + e.key);
             obj = instance.web.search.custom_filters.get_object("char");
         }
         this.value = new (obj) (this);

From be9f69c8a7014a9e5afe5d130c2b5bfef0c79e82 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 15:31:37 +0200
Subject: [PATCH 62/83] [fix] problem in form views, data was not saved any
 more

bzr revid: nicolas.vanhoren@openerp.com-20120418133137-w2xn6z2u3z6tpc76
---
 addons/web/static/src/js/view_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 9bae2a75c7d..6d3b1b3c883 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -852,6 +852,7 @@ instance.web.FormView = instance.web.View.extend({
             this.translatable_fields.push(field);
         }
         field.on('changed_value', this, function() {
+            field._dirty_flag = true;
             if (field.is_syntax_valid()) {
                 this.do_onchange(field);
                 this.on_form_changed(true);

From b861606f84873fac1d5779725b4936420a1ef598 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 16:24:39 +0200
Subject: [PATCH 63/83] [fix] problem with sidebar, removed all references to
 this.options.sidebar

bzr revid: nicolas.vanhoren@openerp.com-20120418142439-p63hdsfpgmmvayx5
---
 addons/web/static/src/js/view_form.js         | 6 ++----
 addons/web/static/src/js/view_list.js         | 4 ++--
 addons/web/static/src/js/views.js             | 4 +---
 addons/web_calendar/static/src/js/calendar.js | 9 ++++-----
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6d3b1b3c883..f98ba2e0a59 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -24,7 +24,6 @@ instance.web.FormView = instance.web.View.extend({
      * @param {instance.web.DataSet} dataset the dataset this view will work with
      * @param {String} view_id the identifier of the OpenERP view object
      * @param {Object} options
-     *                  - sidebar : [true|false]
      *                  - resize_textareas : [true|false|max_height]
      *
      * @property {instance.web.Registry} registry=instance.web.form.widgets widgets registry for this form view instance
@@ -109,7 +108,7 @@ instance.web.FormView = instance.web.View.extend({
             self.on_pager_action(action);
         });
 
-        if (!this.sidebar && this.options.sidebar) {
+        if (!this.sidebar && this.options.$sidebar) {
             this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.$sidebar);
             if(this.fields_view.toolbar) {
@@ -1215,7 +1214,6 @@ instance.web.form.FormDialog = instance.web.Dialog.extend({
     start: function() {
         this._super();
         this.form = new instance.web.FormView(this, this.dataset, this.view_id, {
-            sidebar: false,
             pager: false
         });
         this.form.appendTo(this.$element);
@@ -2688,7 +2686,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             var view = {
                 view_id: false,
                 view_type: mode == "tree" ? "list" : mode,
-                options: { sidebar : false }
+                options: {}
             };
             if (self.field.views && self.field.views[mode]) {
                 view.embedded_view = self.field.views[mode];
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index d149ef28840..1aa5847ec7d 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -301,7 +301,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         }
 
         // Sidebar
-        if (!this.sidebar && this.options.sidebar && this.options.$sidebar) {
+        if (!this.sidebar && this.options.$sidebar) {
             this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.options.$sidebar);
             this.sidebar.add_toolbar(this.fields_view.toolbar);
@@ -464,7 +464,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
                 view_id: this.view_id,
                 view_type: "tree",
                 context: this.dataset.get_context(context),
-                toolbar: this.options.sidebar
+                toolbar: !!this.options.$sidebar
             }, callback);
         }
     },
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 3e4d2056c93..f36ccf43923 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1055,7 +1055,7 @@ instance.web.View = instance.web.Widget.extend({
                 "model": this.dataset.model,
                 "view_id": this.view_id,
                 "view_type": this.view_type,
-                toolbar: this.options.sidebar,
+                toolbar: !!this.options.$sidebar,
                 context: context
                 }).pipe(this.on_loaded);
         }
@@ -1072,7 +1072,6 @@ instance.web.View = instance.web.Widget.extend({
             // All possible views options should be defaulted here
             $sidebar: null,
             sidebar_id: null,
-            sidebar: true,
             action: null,
             action_views_ids: {}
         });
@@ -1163,7 +1162,6 @@ instance.web.View = instance.web.Widget.extend({
      */
     set_embedded_view: function(embedded_view) {
         this.embedded_view = embedded_view;
-        this.options.sidebar = false;
     },
     do_show: function () {
         this.$element.show();
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index d92aac4304e..8bd83c0bb30 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -102,9 +102,9 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
 
         this.init_scheduler();
 
-        if (this.options.sidebar) {
+        if (! this.sidebar && this.options.$sidebar) {
             this.sidebar = new instance.web_calendar.Sidebar(this);
-            this.has_been_loaded.pipe(this.sidebar.appendTo(this.$element));
+            this.has_been_loaded.pipe(this.sidebar.appendTo(this.options.$sidebar));
         }
 
         return this.has_been_loaded.resolve();
@@ -158,7 +158,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
         scheduler.setCurrentView(scheduler._date);
     },
     refresh_minical: function() {
-        if (this.options.sidebar) {
+        if (this.sidebar) {
             scheduler.updateCalendar(this.sidebar.mini_calendar);
         }
     },
@@ -217,7 +217,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
         scheduler.parse(res_events, 'json');
         this.refresh_scheduler();
         this.refresh_minical();
-        if (!no_filter_reload && this.options.sidebar) {
+        if (!no_filter_reload && this.sidebar) {
             this.sidebar.filter.on_events_loaded(sidebar_items);
         }
     },
@@ -412,7 +412,6 @@ instance.web_calendar.CalendarFormDialog = instance.web.Dialog.extend({
         var self = this;
         this._super();
         this.form = new instance.web.FormView(this, this.dataset, this.view_id, {
-            sidebar: false,
             pager: false
         });
         this.form.appendTo(this.$element);

From ce0ea2fb9fd33d9c49d71a600cc00ea885cf0962 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 16:27:14 +0200
Subject: [PATCH 64/83] [fix] removed sidebar in o2m

bzr revid: nicolas.vanhoren@openerp.com-20120418142714-gfq4f3lhjayo2qg9
---
 addons/web/static/src/js/view_form.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f98ba2e0a59..27724a7ff00 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2708,7 +2708,9 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
         });
         this.views = views;
 
-        this.viewmanager = new instance.web.ViewManager(this, this.dataset, views, {});
+        this.viewmanager = new instance.web.ViewManager(this, this.dataset, views, {
+            $sidebar: false,
+        });
         this.viewmanager.template = 'One2Many.viewmanager';
         this.viewmanager.registry = instance.web.views.extend({
             list: 'instance.web.form.One2ManyListView',

From 09b2ab75836d0d1bf5b5fe46c8615d8c6b74e808 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 16:50:03 +0200
Subject: [PATCH 65/83] [fix] problem with format and parse

bzr revid: nicolas.vanhoren@openerp.com-20120418145003-vk8kkfgyp0y94hzm
---
 addons/web/static/src/js/formats.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 107a923b625..640ba4d5a93 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -111,7 +111,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
             return value_if_empty === undefined ?  '' : value_if_empty;
     }
     var l10n = _t.database.parameters;
-    switch (descriptor.widget || descriptor.type) {
+    switch (descriptor.type || (descriptor.field && descriptor.field.type)) {
         case 'id':
             return value.toString();
         case 'integer':
@@ -171,7 +171,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
         case "":
             return value_if_empty === undefined ?  false : value_if_empty;
     }
-    switch (descriptor.widget || descriptor.type) {
+    switch (descriptor.type || (descriptor.field && descriptor.field.type)) {
         case 'integer':
             var tmp;
             do {

From 9ce87931f887fd7a1e8d5d6f3c14fe807cb00735 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 18 Apr 2012 17:17:05 +0200
Subject: [PATCH 66/83] [FIX] Fixed m2o. (Sales/Customers form view could not
 open)

bzr revid: fme@openerp.com-20120418151705-1nmy4hey8v4bngnp
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/js/views.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 27724a7ff00..390bfced806 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2976,7 +2976,7 @@ instance.web.form.One2ManyFormView = instance.web.FormView.extend({
     on_loaded: function(data) {
         this._super(data);
         var self = this;
-        this.$form_header.find('button.oe_form_button_create').click(function() {
+        this.$buttons.find('button.oe_form_button_create').click(function() {
             self.do_save().then(self.on_button_new);
         });
     },
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index f36ccf43923..8e8d3d43ce9 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -283,7 +283,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
             // Lazy loading of views
             var controllerclass = this.registry.get_object(view_type);
             var options = _.clone(view.options);
-            if (view_type === "form") {
+            if (view_type === "form" && this.action) {
                 switch (this.action.target) {
                     case 'new':
                     case 'inline':

From 52848d03dda72c44b5f8c539ff33730c4f9221c1 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 17:18:44 +0200
Subject: [PATCH 67/83] [fix] rare problem with o2m & buttons

lp bug: https://launchpad.net/bugs/965326 fixed

bzr revid: nicolas.vanhoren@openerp.com-20120418151844-6jlaggjrmz9sc05q
---
 addons/web/static/src/js/view_form.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 390bfced806..65d5b0c0193 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -630,10 +630,11 @@ instance.web.FormView = instance.web.View.extend({
                     save_deferral = self.dataset.create(values).pipe(function(r) {
                         return self.on_created(r, undefined, prepend_on_create);
                     }, null);
-                } else if (_.isEmpty(values)) {
+                } else if (_.isEmpty(values) && ! self.force_dirty) {
                     //console.log("FormView(", self, ") : Nothing to save");
                     save_deferral = $.Deferred().resolve({}).promise();
                 } else {
+                    self.force_dirty = false;
                     //console.log("FormView(", self, ") : About to save", values);
                     save_deferral = self.dataset.write(self.datarecord.id, values, {}).pipe(function(r) {
                         return self.on_saved(r);
@@ -1513,6 +1514,7 @@ instance.web.form.WidgetButton = instance.web.form.Widget.extend({
             }
         };
         if (!this.node.attrs.special) {
+            this.view.force_dirty = true;
             return this.view.recursive_save().pipe(exec_action);
         } else {
             return exec_action();

From c7e392f18e59f88b0e510f67b8b0189338251bbf Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 17:58:31 +0200
Subject: [PATCH 68/83] [fix] problem sometimes when we delete a record

lp bug: https://launchpad.net/bugs/973627 fixed

bzr revid: nicolas.vanhoren@openerp.com-20120418155831-ps8erb3fqxgf0cix
---
 addons/web/static/src/js/views.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 8e8d3d43ce9..36e3c2b802b 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -353,6 +353,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
      * @returns {$.Deferred} switching end signal
      */
     on_prev_view: function (options) {
+        options = options || {};
         var current_view = this.views_history.pop();
         var previous_view = this.views_history[this.views_history.length - 1] || options['default'];
         if (options.created && current_view === 'form' && previous_view === 'list') {

From 70a48b74c93e89532c8a554f97a1c92304bf7984 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 18 Apr 2012 18:10:39 +0200
Subject: [PATCH 69/83] [IMP] Improved layout outline debugging feature

bzr revid: fme@openerp.com-20120418161039-wztsy1ss7espeo8v
---
 addons/web/static/src/css/base.css    | 17 ++---------------
 addons/web/static/src/css/base.sass   | 14 ++------------
 addons/web/static/src/js/view_form.js |  6 +++---
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index fc384fd9fbf..f45649dfeb1 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1777,23 +1777,10 @@
   font-weight: bold;
 }
 .openerp .oe_layout_debugging .oe_form_group {
-  border: 2px dashed red;
+  outline: 2px dashed red;
 }
 .openerp .oe_layout_debugging .oe_form_group_cell {
-  border: 1px solid blue;
-  padding-bottom: 1em;
-}
-.openerp .oe_layout_debugging .oe_layout_debug_cell {
-  color: white;
-  background: #669966;
-  font-size: 80%;
-  text-align: center;
-}
-.openerp .oe_layout_debugging .oe_layout_debug_cell {
-  display: block;
-}
-.openerp .oe_layout_debug_cell {
-  display: none;
+  outline: 1px solid blue;
 }
 .openerp .oe_debug_view {
   float: left;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b2373c7782b..f95d843b689 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1484,19 +1484,9 @@ $colour4: #8a89ba
     // Debugging stuff {{{
     .oe_layout_debugging
         .oe_form_group
-            border: 2px dashed red
+            outline: 2px dashed red
         .oe_form_group_cell
-            border: 1px solid blue
-            padding-bottom: 1em
-        .oe_layout_debug_cell
-            color: white
-            background: #696
-            font-size: 80%
-            text-align: center
-        .oe_layout_debug_cell
-            display: block
-    .oe_layout_debug_cell
-        display: none
+            outline: 1px solid blue
 
     .oe_debug_view
         float: left
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 65d5b0c0193..7cd5b8b01b2 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -953,10 +953,10 @@ instance.web.form.FormRenderingEngine = instance.web.Class.extend({
     },
     toggle_layout_debugging: function() {
         if (!this.$target.has('.oe_layout_debug_cell:first').length) {
+            this.$target.find('[title]').removeAttr('title');
             this.$target.find('.oe_form_group_cell').each(function() {
-                var text = 'W:' + ($(this).attr('width') || '') + ' - C:' + $(this).attr('colspan'),
-                    $span = $('<span class="oe_layout_debug_cell"/>').text(text);
-                $span.prependTo($(this));
+                var text = 'W:' + ($(this).attr('width') || '') + ' - C:' + $(this).attr('colspan');
+                $(this).attr('title', text);
             });
         }
         this.$target.toggleClass('oe_layout_debugging');

From 93682f99dbe6e8e67e519bca83230ae7bb05a104 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 18:10:47 +0200
Subject: [PATCH 70/83] [fix] problem with text fields

lp bug: https://launchpad.net/bugs/979764 fixed

bzr revid: nicolas.vanhoren@openerp.com-20120418161047-8yzmvsiluszc0g78
---
 addons/web/static/src/js/view_form.js | 19 ++++++++-----------
 addons/web/static/src/xml/base.xml    | 20 ++++++++++----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 7cd5b8b01b2..98291f187ac 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2061,13 +2061,14 @@ instance.web.form.FieldDate = instance.web.form.FieldDatetime.extend({
 instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldText',
     initialize_content: function() {
-        this.$textarea = undefined;
+        this.$textarea = this.$element.find('textarea');
+        this.resized = false;
         if (!this.get("effective_readonly")) {
-            this.$textarea = this.$element.find('textarea');
             this.$textarea.change(_.bind(function() {
                 this.set({'value': instance.web.parse_value(this.$textarea.val(), this)});
             }, this));
-            this.resized = false;
+        } else {
+            this.$textarea.attr('disabled', 'disabled');
         }
     },
     set_value: function(value_) {
@@ -2076,14 +2077,10 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
     },
     render_value: function() {
         var show_value = instance.web.format_value(this.get('value'), this, '');
-        if (!this.get("effective_readonly")) {
-            this.$textarea.val(show_value);
-            if (!this.resized && this.view.options.resize_textareas) {
-                this.do_resize(this.view.options.resize_textareas);
-                this.resized = true;
-            }
-        } else {
-            this.$element.text(show_value);
+        this.$textarea.val(show_value);
+        if (!this.resized && this.view.options.resize_textareas) {
+            this.do_resize(this.view.options.resize_textareas);
+            this.resized = true;
         }
     },
     is_syntax_valid: function() {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f365abf8856..918231cf46c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -972,16 +972,16 @@
     </t>
 </t>
 <t t-name="FieldText">
-    <t t-if="!widget.get('effective_readonly')">
-        <div class="oe_form_field_text">
-            <textarea rows="6"
-                t-att-name="widget.name"
-                class="field_text"
-                t-att-tabindex="widget.node.attrs.tabindex"
-                t-att-autofocus="widget.node.attrs.autofocus"
-            ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
-        </div>
-    </t>
+    <div class="oe_form_field_text">
+        <textarea rows="6"
+            t-att-name="widget.name"
+            class="field_text"
+            t-att-tabindex="widget.node.attrs.tabindex"
+            t-att-autofocus="widget.node.attrs.autofocus"
+        ></textarea>
+        <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate"
+            t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
+    </div>
 </t>
 <t t-name="web.datetimepicker">
     <div class="oe_datepicker_root oe_form_field_datetime">

From ebe86e63a4fe1357a1c79f5a4c5c3dd2ff868d8c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 18 Apr 2012 18:34:36 +0200
Subject: [PATCH 71/83] [fix] small bug with m2o

bzr revid: nicolas.vanhoren@openerp.com-20120418163436-bhb1ueqdkzgtfl79
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 98291f187ac..4dd6191fcf0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3421,7 +3421,7 @@ instance.web.form.FormOpenPopup = instance.web.OldWidget.extend(/** @lends insta
     setup_form_view: function() {
         var self = this;
         var FormClass = instance.web.views.get_object('form');
-        var options = _.clone(self.options.form_view_options);
+        var options = _.clone(self.options.form_view_options) || {};
         options.initial_mode = this.options.readonly ? "view" : "edit";
         this.view_form = new FormClass(this, this.dataset, false, options);
         if (this.options.alternative_form_view) {

From a4be0624201dfcad27f0a2f23561ffde6b8ec27e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 18 Apr 2012 23:05:08 +0200
Subject: [PATCH 72/83] [IMP] crm.lead proof of concept for empty lists. Leads
 empty list example.

bzr revid: al@openerp.com-20120418210508-613nm7wpm3qkhp2c
---
 addons/crm/crm_lead_menu.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index f7db0357ed8..b7ed60623a4 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -10,7 +10,20 @@
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
         <field name="context">{'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'}</field>
-        <field name="help">Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services. A lead is usually the first step in your sales cycle. Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities. You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads. Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect.</field>
+        <field name="help">
+            &lt;img src="http://www.thaicrmsoftware.com/wp-content/uploads/2011/11/lead-conversion.jpg" align="right" style="padding: 6px" width="306" height="223"&gt;
+            &lt;h2&gt;Create your first OpenERP Lead &lt;/h2&gt;
+            &lt;p&gt;
+            Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services.
+            &lt;p&gt;
+            A lead is usually the first step in your sales cycle.
+            &lt;p&gt;
+            Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities.
+            &lt;p&gt;
+            You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads.
+            &lt;p&gt;
+            Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect.
+        </field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">

From f5c37eabe94a04ca62d08f46c1cf3a084fa77f19 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 18 Apr 2012 23:35:41 +0200
Subject: [PATCH 73/83] [IMP] open in a new tab on menuitems

bzr revid: al@openerp.com-20120418213541-c88pw8hm81rht4rw
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 918231cf46c..0e1edb89969 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -324,7 +324,7 @@
     </ul>
 </t>
 <t t-name="Menu.secondary.link">
-    <a href="#"
+    <a t-attf-href="#menu_id=#{menu.id}&amp;action_id=#{menu.action ? menu.action.split(',')[1] : ''}"
         t-att-class="menu.children.length ? 'oe_menu_toggler' : 'oe_menu_leaf'"
         t-att-data-menu="menu.id"
         t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''"

From e73f094c02dd8a11fdec644ad6ecb64478ac7b69 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 00:01:27 +0200
Subject: [PATCH 74/83] [FIX] crm dashboard look

bzr revid: al@openerp.com-20120418220127-32gqjgm3ymall0wi
---
 addons/crm/board_crm_statistical_view.xml | 25 ++++++++---------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml
index b1b9ec93784..14b0afdc6bb 100644
--- a/addons/crm/board_crm_statistical_view.xml
+++ b/addons/crm/board_crm_statistical_view.xml
@@ -77,21 +77,14 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Statistics Dashboard">
+                <form string="Statistics Dashboard" layout="manual">
                     <board style="1-1">
                         <column>
-                            <action string="Opportunities by Categories"
-                                name="%(act_oppor_categ)d"/>
-
-                            <action string="Opportunities by Stage"
-                                name="%(act_opportunity_stage)d"/>
-
+                            <action string="Opportunities by Categories" name="%(act_oppor_categ)d"/>
+                            <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
                         </column>
                         <column>
-
-                            <action string="Planned Revenue by Stage and User"
-                                name="%(act_oppor_stage_user)d"/>
-
+                            <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
                         </column>
                     </board>
                 </form>
@@ -107,14 +100,14 @@
             <field name="view_id" ref="board_crm_statistical_form"/>
         </record>
 
-	    <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
+        <menuitem id="board.menu_sales_dashboard" name="Sales" sequence="1" parent="base.menu_reporting_dashboard"/>
 
         <menuitem
-            name="CRM Dashboard" parent="board.menu_sales_dashboard"
-            action="open_board_statistical_dash"
-            sequence="0"
             id="menu_board_statistics_dash"
-            icon="terp-graph"
+            name="CRM Dashboard"
+            sequence="0"
+            parent="board.menu_sales_dashboard"
+            action="open_board_statistical_dash"
             groups="base.group_sale_manager"/>
 
     </data>

From f2e684a4dec3010d6ac28fb81f02a85044bc7f86 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 00:19:07 +0200
Subject: [PATCH 75/83] [IMP] auditrail cleanup menu definition

bzr revid: al@openerp.com-20120418221907-tmx66nhnzxz7roc9
---
 addons/audittrail/audittrail_view.xml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index debe4d54c1a..1cad5883023 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -2,7 +2,9 @@
 <openerp>
     <data>
 
-    <!-- Audittrail Rule form -->
+        <menuitem id="menu_audit" name="Audit" parent="base.menu_reporting" sequence="50" groups="base.group_system"/>
+
+        <!-- Audittrail Rule -->
 
         <record model="ir.ui.view" id="view_audittrail_rule_form">
             <field name="name">audittrail.rule.form</field>
@@ -50,7 +52,8 @@
                 </tree>
             </field>
         </record>
-       <record id="view_audittrail_rule_search" model="ir.ui.view">
+
+        <record id="view_audittrail_rule_search" model="ir.ui.view">
             <field name="name">audittrail.rule.search</field>
             <field name="model">audittrail.rule</field>
             <field name="type">search</field>
@@ -70,7 +73,6 @@
                 </search>
             </field>
         </record>
-    <!-- Action for audittrail rule -->
 
         <record model="ir.actions.act_window" id="action_audittrail_rule_tree">
             <field name="name">Audit Rules</field>
@@ -82,9 +84,9 @@
             <field name="search_view_id" ref="view_audittrail_rule_search"/>
         </record>
 
-        <menuitem id="menu_action_audittrail_rule_tree"
-            action="action_audittrail_rule_tree" parent="base.menu_audit" />
-        <!-- AuditTrail Log form -->
+        <menuitem id="menu_action_audittrail_rule_tree"  parent="base.menu_audit" action="action_audittrail_rule_tree"/>
+
+        <!-- AuditTrail Log -->
 
         <record model="ir.ui.view" id="view_audittrail_log_form">
             <field name="name">audittrail.log.form</field>
@@ -151,7 +153,7 @@
                 </tree>
             </field>
         </record>
-        
+
        <record id="view_audittrail_log_search" model="ir.ui.view">
             <field name="name">audittrail.log.search</field>
             <field name="model">audittrail.log</field>
@@ -166,14 +168,13 @@
                 <newline/>
                   <group expand="0" string="Group By..." groups="base.group_extended">
                     <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-   					<separator orientation="vertical"/>                    
+                    <separator orientation="vertical"/>
                     <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'object_id'}"/>
-					<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
+                    <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'timestamp'}"/>
                 </group>
                 </search>
             </field>
         </record>
-<!--  Action for Audittrail Log  -->
 
         <record model="ir.actions.act_window" id="action_audittrail_log_tree">
             <field name="name">Audit Logs</field>
@@ -181,8 +182,8 @@
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_audittrail_log_search"/>
         </record>
-        <menuitem name="Audit Logs" id="menu_action_audittrail_log_tree"
-            action="action_audittrail_log_tree" parent="base.menu_audit" />
+
+        <menuitem id="menu_audit_logs" name="Audit Logs" parent="base.menu_audit" action="action_audittrail_log_tree" />
 
     </data>
 </openerp>

From 2199a94c8230f2ca0180f30542eff4b55a2625a5 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 00:37:59 +0200
Subject: [PATCH 76/83] [FIX] auditrail will soon remove menu audit from server

bzr revid: al@openerp.com-20120418223759-h1r3ge8moilsyqi0
---
 addons/audittrail/audittrail_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 1cad5883023..a9f81973df3 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -84,7 +84,7 @@
             <field name="search_view_id" ref="view_audittrail_rule_search"/>
         </record>
 
-        <menuitem id="menu_action_audittrail_rule_tree"  parent="base.menu_audit" action="action_audittrail_rule_tree"/>
+        <menuitem id="menu_action_audittrail_rule_tree" parent="menu_audit" action="action_audittrail_rule_tree"/>
 
         <!-- AuditTrail Log -->
 
@@ -183,7 +183,7 @@
             <field name="search_view_id" ref="view_audittrail_log_search"/>
         </record>
 
-        <menuitem id="menu_audit_logs" name="Audit Logs" parent="base.menu_audit" action="action_audittrail_log_tree" />
+        <menuitem id="menu_audit_logs" name="Audit Logs" parent="menu_audit" action="action_audittrail_log_tree" />
 
     </data>
 </openerp>

From f3f1699be70d6e62f29b27201e54ead2cad31862 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 01:26:50 +0200
Subject: [PATCH 77/83] [IMP] settings menu reorg

bzr revid: al@openerp.com-20120418232650-amyi9cs68nqa5xhj
---
 openerp/addons/base/base_menu.xml             | 47 +++++++------------
 openerp/addons/base/base_update.xml           | 13 +----
 openerp/addons/base/ir/ir.xml                 | 35 +++++++-------
 .../publisher_warranty_view.xml               | 14 ++----
 openerp/addons/base/res/ir_property_view.xml  |  4 +-
 5 files changed, 38 insertions(+), 75 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index d8cde2700ba..9711228ce6e 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -1,36 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-administration" id="menu_administration"
-                  name="Settings" sequence="50"
-                  web_icon="data/administration.png"
-                  web_icon_hover="data/administration-hover.png"/>
-
-        <menuitem icon="terp-administration" id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
-        <menuitem id="menu_custom" name="Customization"
-            parent="base.menu_administration" sequence="6"
-            groups="base.group_extended"/>
-        <menuitem id="next_id_4" name="Low Level Objects"
-            parent="base.menu_custom" sequence="30"/>
-        <menuitem id="menu_low_workflow" name="Workflows" parent="base.next_id_4"/>
-        <menuitem id="menu_custom_action" name="Actions" parent="base.menu_custom" groups="base.group_extended" sequence="20"/>
-        <menuitem id="menu_config" name="Configuration" parent="base.menu_administration" sequence="1"/>
-        <menuitem id="menu_translation" name="Translations" parent="base.menu_administration" sequence="6"/>
-        <menuitem id="menu_translation_app" name="Application Terms" parent="base.menu_translation" sequence="4" groups="base.group_extended"/>
-        <menuitem id="menu_translation_export" name="Import / Export"
-            groups="base.group_extended" parent="base.menu_translation" sequence="3"/>
-        <menuitem id="menu_users" name="Users" parent="base.menu_administration" sequence="4"/>
-        <menuitem id="menu_security" name="Security" parent="base.menu_administration" sequence="5"
-            groups="base.group_extended"/>
-        <menuitem id="menu_management" name="Modules" parent="base.menu_administration" sequence="0"/>
-        <menuitem id="reporting_menu"
-            parent="base.menu_custom" name="Reporting" sequence="30"
-             />
-
-        <menuitem id="base.menu_reporting" name="Reporting" sequence="45"/>
-        <menuitem id="base.menu_reporting_dashboard" name="Dashboards" sequence="0" parent="base.menu_reporting" groups="base.group_extended"/>
-        <menuitem id="menu_audit" name="Audit" parent="base.menu_reporting" sequence="50" groups="base.group_system"/>
-        <menuitem id="base.menu_reporting_config" name="Configuration" parent="base.menu_reporting" sequence="100" groups="base.group_system"/>
-
+        <menuitem id="menu_reporting" name="Reporting" sequence="90"/>
+            <menuitem id="menu_reporting_dashboard" name="Dashboards" parent="menu_reporting" sequence="0" groups="group_extended"/>
+            <menuitem id="menu_reporting_config" name="Configuration" parent="menu_reporting" sequence="100" groups="group_system"/>
+        <menuitem id="menu_administration" name="Settings" sequence="100" icon="terp-administration"/>
+            <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
+            <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
+                <menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="8" groups="group_extended"/>
+                    <menuitem id="next_id_2" name="User Interface" parent="menu_custom" groups="base.group_extended"/>
+                    <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
+                    <menuitem id="next_id_4" name="Low Level Objects" parent="menu_custom" sequence="30"/>
+                        <menuitem id="menu_low_workflow" name="Workflows" parent="next_id_4"/>
+            <menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
+            <menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4"/>
+            <menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
+                <menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="group_extended"/>
+                <menuitem id="menu_translation_export" name="Import / Export" groups="group_extended" parent="menu_translation" sequence="3"/>
     </data>
 </openerp>
diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 8a46c985dad..597fa824a59 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!--
-    ======================
-    Languages
-    ======================
-    -->
-        <menuitem id="next_id_2" name="User Interface" parent="base.menu_custom" groups="base.group_extended"/>
-
-        <!--
-    ======================
-    Groups
-    ======================
-    -->
+        <!-- res.groups -->
         <record id="view_groups_form" model="ir.ui.view">
             <field name="name">res.groups.form</field>
             <field name="model">res.groups</field>
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index e66182bae39..4907eae09e5 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -893,7 +893,7 @@
             <field name="res_model">ir.ui.view.custom</field>
             <field name="help">Customized views are used when users reorganize the content of their dashboard views (via web client)</field>
         </record>
-        <menuitem action="action_ui_view_custom" id="menu_action_ui_view_custom" parent="base.next_id_4"/>
+        <menuitem id="menu_action_ui_view_custom" action="action_ui_view_custom" parent="base.next_id_2"/>
 
 
         <!-- Attachment -->
@@ -1479,11 +1479,8 @@
         </record>
         <menuitem action="grant_menu_access" id="menu_grant_menu_access" parent="base.next_id_2" sequence="1"/>
 
-        <!--
-    =============================================================
-    Cron Jobs
-    =============================================================
-    -->
+        <!-- ir.cron -->
+
         <record id="ir_cron_view_tree" model="ir.ui.view">
             <field name="name">ir.cron.tree</field>
             <field name="model">ir.cron</field>
@@ -1574,9 +1571,10 @@
             <field name="view_id" ref="ir_cron_view_tree"/>
         </record>
 
-        <menuitem id="next_id_10" name="Scheduler" parent="base.menu_config"  groups="base.group_extended" sequence="23"/>
-        <menuitem action="ir_cron_act" id="menu_ir_cron_act" parent="next_id_10"/>
+        <menuitem id="menu_ir_cron" name="Scheduler" parent="menu_custom"  groups="base.group_extended" sequence="23"/>
+        <menuitem id="menu_ir_cron_act" action="ir_cron_act" parent="menu_ir_cron"/>
 
+        <!-- ir.model.access -->
 
         <record id="ir_access_view_tree" model="ir.ui.view">
             <field name="name">ir.model.access.tree</field>
@@ -1878,6 +1876,8 @@
         </record>
         <menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/>
 
+        <!-- ir.actions.todo -->
+
         <record id="ir_actions_todo_tree" model="ir.ui.view">
             <field name="model">ir.actions.todo</field>
             <field name="name">Config Wizard Steps</field>
@@ -1950,13 +1950,8 @@
             <field name="view_type">form</field>
             <field name="help">The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.</field>
         </record>
-        <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="20"
-            groups="base.group_extended"/>
-
-        <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
-                parent="next_id_11" sequence="20"/>
-
-
+        <menuitem id="menu_ir_actions_todo" name="Configuration Wizards" parent="menu_custom" sequence="20" groups="base.group_extended"/> 
+        <menuitem id="menu_ir_actions_todo_form" action="act_ir_actions_todo_form" parent="menu_ir_actions_todo"/>
 
         <record model="ir.cron" id="cronjob_osv_memory_autovacuum">
             <field name='name'>AutoVacuum osv_memory objects</field>
@@ -1969,7 +1964,9 @@
             <field name="function">power_on</field>
             <field name="args">()</field>
         </record>
-        
+
+        <!-- ir.actions.todo category -->
+
         <record id="ir_actions_todo_category_form" model="ir.ui.view">
             <field name="name">ir.actions.todo.category.form</field>
             <field name="model">ir.actions.todo.category</field>
@@ -1982,7 +1979,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="ir_actions_todo_category_tree" model="ir.ui.view">
             <field name="name">ir.actions.todo.category.tree</field>
             <field name="model">ir.actions.todo.category</field>
@@ -1998,12 +1995,12 @@
         <record id="category_sales_management_config" model="ir.actions.todo.category">
             <field name="name">Sales Management</field>
             <field name="sequence">5</field>
-        </record>         
+        </record>
 
         <record id="category_tools_customization_config" model="ir.actions.todo.category">
             <field name="name">Tools / Customization</field>
             <field name="sequence">5</field>
-        </record>         
+        </record>
 
         <!-- ir.mail.server -->
         <record model="ir.ui.view" id="ir_mail_server_form">
diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index 8c40d0a1c6b..4b15ff8f8c0 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <menuitem id="menu_publisher_warranty" name="OpenERP Entreprise" parent="base.menu_administration" sequence="5"/>
 
         <record id="publisher_warranty_contract_tree_view" model="ir.ui.view">
             <field name="name">publisher_warranty.contract.tree</field>
@@ -81,12 +82,7 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="search_view_id" ref="publisher_warranty_contract_search_view"/>
         </record>
-
-        <menuitem name="Publisher Warranty" id="publisher_warranty"
-            parent="base.menu_administration"/>
-
-        <menuitem action="action_publisher_warranty_contract_form" id="menu_publisher_warranty_contract"
-            parent="publisher_warranty" sequence="2"/>
+        <menuitem id="menu_publisher_warranty_contract" parent="menu_publisher_warranty" action="action_publisher_warranty_contract_form" sequence="2"/>
 
 
         <record id="publisher_warranty_contract_add_wizard" model="ir.ui.view">
@@ -139,11 +135,7 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
-        <menuitem
-            action="action_publisher_warranty_contract_add_wizard"
-            id="menu_publisher_warranty_contract_add"
-            parent="publisher_warranty" sequence="1"/>
+        <menuitem id="menu_publisher_warranty_contract_add" action="action_publisher_warranty_contract_add_wizard" parent="menu_publisher_warranty" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index d0292576199..87835cafffc 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -75,7 +75,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="ir_property_view_tree"/>
         </record>
-        <menuitem id="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" sequence="24"/>
-        <menuitem action="ir_property_form" id="menu_ir_property_form_all" parent="base.next_id_15"/>
+        <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" groups="group_extended" sequence="24"/>
+        <menuitem id="menu_ir_property_form_all" parent="menu_ir_property" action="ir_property_form"/>
     </data>
 </openerp>

From 76361a7acb8c3880c4075be75e5db7f0320fc2b9 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 01:33:11 +0200
Subject: [PATCH 78/83] [IMP] settings menu reorg fix email

bzr revid: al@openerp.com-20120418233311-sj7ti2uy50ke5e9y
---
 openerp/addons/base/base_menu.xml | 1 +
 openerp/addons/base/ir/ir.xml     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 9711228ce6e..efc6844d383 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -9,6 +9,7 @@
             <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
                 <menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="8" groups="group_extended"/>
                     <menuitem id="next_id_2" name="User Interface" parent="menu_custom" groups="base.group_extended"/>
+                    <menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
                     <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
                     <menuitem id="next_id_4" name="Low Level Objects" parent="menu_custom" sequence="30"/>
                         <menuitem id="menu_low_workflow" name="Workflows" parent="next_id_4"/>
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 4907eae09e5..bf970a9b4d1 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -2067,8 +2067,6 @@
             <field name="view_id" ref="ir_mail_server_list" />
             <field name="search_view_id" ref="view_ir_mail_server_search"/>
         </record>
-
-        <menuitem id="menu_email" name="Email" parent="base.menu_config" sequence="22"/>
         <menuitem id="menu_mail_servers" parent="menu_email" action="action_ir_mail_server_list" sequence="15" groups="base.group_no_one"/>
 
     </data>

From 0b367fea814007334e9a823d124f90a567caf1f4 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 01:41:34 +0200
Subject: [PATCH 79/83] [IMP] board move admin dashboard menuitem

bzr revid: al@openerp.com-20120418234134-4qjfl4n0b5bhs1zr
---
 addons/board/board_data_admin.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index 58e04a22c09..1942aa7c066 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -54,12 +54,11 @@
         </record>
 
         <!-- bind adminitration dashboard to the root administration -->
-        <menuitem id="base.menu_administration" icon="terp-administration"  name="Settings" sequence="50" action="open_board_administration_form"/>
+        <menuitem id="base.menu_administration" name="Settings" action="open_board_administration_form"/>
 
         <!-- add a menu item in adminitration/reporting/dashboards -->
-        <menuitem id="base.menu_reporting_board" name="Reporting" parent="base.menu_administration" sequence="11" groups="base.group_extended"/>
-        <menuitem id="base.menu_dashboard" name="Dashboards" parent="base.menu_reporting_board" sequence="0"/>
-        <menuitem id="base.menu_dashboard_admin" action="open_board_administration_form" parent="base.menu_dashboard" icon="terp-graph"/>
+        <menuitem id="base.menu_reporting_admin" name="Administration" parent="base.menu_reporting_dashboard" groups="base.group_system"/>
+        <menuitem id="base.menu_reporting_admin_dashboard" parent="base.menu_reporting_admin" action="open_board_administration_form"/>
 
     </data>
 </openerp>

From 0dc41c79b892a7b591b1f869afc1af00e4fef0e3 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 19 Apr 2012 04:37:38 +0000
Subject: [PATCH 80/83] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120419043738-37uiz1v9drktero8
---
 openerp/addons/base/i18n/ja.po | 58 +++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index b2433098807..8fb6a885e43 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/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: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-04-18 02:23+0000\n"
+"PO-Revision-Date: 2012-04-19 04:33+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\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: 2012-04-18 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:37+0000\n"
 "X-Generator: Launchpad (build 15108)\n"
 
 #. module: base
@@ -596,7 +596,7 @@ msgstr "スペイン語（ベネズエラ）/ Español (VE)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
 msgid "Invoice on Timesheets"
-msgstr "タイムシートによる請求書"
+msgstr "勤務表による請求書"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -1203,13 +1203,13 @@ msgstr ""
 "==============================================\n"
 "\n"
 "このモジュールは分析的な会計を基本として、以下の機能が統合されています。\n"
-"　・ タイムシートの割り当て\n"
+"　・ 勤務表の割り当て\n"
 "　・ 休日管理\n"
 "　・ プロジェクト管理\n"
 "\n"
 "各部門のマネジャは、チームの誰かが計画上妥当性を考慮中の未割り当ての時間があるか、タスクの割り当てを必要としている誰かがいるのかを知ることができます。\n"
 "\n"
-"月末に計画マネジャは、割り当てられたタイムシートがそれぞれの分析会計を尊重した計画であるかをチェックすることもできます。\n"
+"月末に計画マネジャは、割り当てられた勤務表がそれぞれの分析会計を尊重した計画であるかをチェックすることもできます。\n"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -2371,7 +2371,7 @@ msgstr ""
 "    ・ 従業員へ請求書に基づく支払い\n"
 "\n"
 "このモジュールは分析会計も使うとともに、プロジェクトによる作業の場合は、顧客の出費の\n"
-"再請求書を自動的に作成するタイムシート上の請求書と互換性があります。\n"
+"再請求書を自動的に作成する勤務表上の請求書と互換性があります。\n"
 "    "
 
 #. module: base
@@ -3632,7 +3632,7 @@ msgstr ""
 "------------------\n"
 "    ・ オーダー時に請求（発送前または発送後）\n"
 "    ・ 配達時に請求\n"
-"    ・ タイムシートによる請求\n"
+"    ・ 勤務表による請求\n"
 "    ・ 前請求\n"
 "\n"
 "パートナの選択：\n"
@@ -3650,7 +3650,7 @@ msgstr ""
 "    ・ 複数の小包\n"
 "    ・ 配送コスト\n"
 "\n"
-"セールス管理のダッシュボードに含むもの：\n"
+"受注管理のダッシュボードに含むもの：\n"
 "------------------------------------------\n"
 "    ・ 見積り\n"
 "    ・ 月別受注\n"
@@ -5598,7 +5598,7 @@ msgid ""
 "revenue\n"
 "reports, etc."
 msgstr ""
-"経費、タイムシート入力などから請求書を作成します。\n"
+"経費、勤務表入力などから請求書を作成します。\n"
 "コスト（人的資源、経費など）に基づく請求書を作成するためのモジュールです。========================================"
 "====================================\n"
 "\n"
@@ -6180,23 +6180,23 @@ msgstr ""
 "    ・ 全てのトランザクションコード、構造化された形式の通信の解析とロギング\n"
 "    ・ CODA構成パラメータを通した自動金融仕訳帳割り当て\n"
 "    ・ 銀行口座番号ごとの複数仕訳帳のサポート\n"
-"    ・ １つのCODAファイル中の異なった銀行口座の複数の口座明細をサポート\n"
+"    ・ １つのCODAファイル中の異なった銀行口座の複数の口座取引明細書をサポート\n"
 "    ・ CODA銀行口座の構文解析のみをサポート（CODA銀行口座設定でtype='info'と定義された）\n"
 "    ・ 多言語CODA解析、イギリス、オランダ、フランスのために与えられた解析設定データ\n"
 "\n"
-"    機械で読み込み可能なCODAファイルはCODA銀行明細の中に人間が読むことのできる形式に解析され保存されます。\n"
-"    また、銀行明細はCODA情報のサブセットを含むように生成されます（これらのトランザクション行は金融会計レコード\n"
+"    機械で読み込み可能なCODAファイルはCODA銀行取引明細書の中に人間が読むことのできる形式に解析され保存されます。\n"
+"    また、銀行取引明細書はCODA情報のサブセットを含むように生成されます（これらのトランザクション行は金融会計レコード\n"
 "    生成のためだけに要求されます）。\n"
-"    CODA銀行明細は読み込み専用オブジェクトです。銀行明細が会計ビジネス処理の要求によって\n"
+"    CODA銀行取引明細書は読み込み専用オブジェクトです。銀行取引明細書が会計ビジネス処理の要求によって\n"
 "    更新されるのに対して、オリジナルのCODAファイルは信頼できるものとして残されます。\n"
 "\n"
-"    タイプが'Info'として設定されたCODA銀行口座は、CODA銀行明細を作るだけです。\n"
+"    タイプが'Info'として設定されたCODA銀行口座は、CODA銀行取引明細書を作るだけです。\n"
 "\n"
 "    CODA処理の中の１つのオブジェクトの除去は結果として関連付けられたオブジェクトを除去します。\n"
-"    複数銀行明細を含むCODAファイルの除去は同じくそれらの関連する明細を除去します。\n"
+"    複数銀行取引明細書を含むCODAファイルの除去は同じくそれらの関連する取引明細書を除去します。\n"
 "\n"
 "    次の調停のロジックはCODA処理の中に実装されています:\n"
-"    1) CODA明細の会社の銀行口座番号は、会社のCODA銀行口座設定レコード（銀行口座のタイプ\n"
+"    1) CODA取引明細書の会社の銀行口座番号は、会社のCODA銀行口座設定レコード（銀行口座のタイプ\n"
 "        が’info’と定義された設定レコードは無視されます）の銀行口座番号項目を基準に判断されます。\n"
 "        '内部転送'トランザクションはCODAファイルインポートウィザードの’内部転送口座’項目を使って生成されます。\n"
 "    2) 第２ステップとしてCODAトランザクション行の’構造化通信’項目は内部あるいは外部への請求書\n"
@@ -6206,7 +6206,7 @@ msgstr ""
 "    4) 上記のステップが成功しないケースは、さらに手作業による処理を行うために、CODAファイルインポート\n"
 "        ウィザードの’認識できない移動のためのデフォルト口座’項目を使ってトランザクションは生成されます。\n"
 "\n"
-"    生成された銀行明細の手作業による調整の代わりに、不十分な自動的な認識情報であったOpenERPデータ\n"
+"    生成された銀行取引明細書の手作業による調整の代わりに、不十分な自動的な認識情報であったOpenERPデータ\n"
 "    ベースを更新した後のCODAを再度インポートすることもできます。\n"
 "\n"
 "    CODA V1 サポートの注意事項:\n"
@@ -7029,7 +7029,7 @@ msgstr ""
 "============================================================================="
 "=======================\n"
 "\n"
-"ユーザが自身のタイムシートをエンコードするときに主に利用されます： \n"
+"ユーザが自身の勤務表をエンコードするときに主に利用されます： \n"
 "値が引き出され、それらの項目は自動的に埋められます。しかし、変更の可能性のためにそれらの値は利用可能です。\n"
 "\n"
 "明確に現在のアカウントに何も記録されていない場合は、このモジュールは古い設定と完全に互換性を持つために、\n"
@@ -7384,7 +7384,7 @@ msgstr "ソース用語"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
 msgid "Timesheets Validation"
-msgstr "タイムシートの検証"
+msgstr "勤務表の検証"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_main_pm
@@ -10536,25 +10536,25 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"このモジュールはタイムシートと出勤のエンコードと検証を同じビューの中で簡易にできるように手助けします。\n"
+"このモジュールは勤務表と出勤のエンコードと検証を同じビューの中で簡易にできるように手助けします。\n"
 "============================================================================="
 "======================\n"
 "\n"
 "ビューの上部は出勤と追跡（Sign In / Sign Out）イベントのためにあります。\n"
-"ビューの下部はタイムシートのためにあります。\n"
+"ビューの下部は勤務表のためにあります。\n"
 "\n"
 "その他のタブはあなたの時間やあなたのチームの時間を分析を手助けする統計的なビューが含まれています：\n"
 "・ 日別の勤務時間（出勤を含む）\n"
 "・ プロジェクト別の勤務時間\n"
 "\n"
-"このモジュールは完全なタイムシートの検証プロセスも実装されています：\n"
+"このモジュールは完全な勤務表の検証プロセスも実装されています：\n"
 "・ ドラフトシート\n"
 "・ 従業員による期間の終わりの確認\n"
 "・ プロジェクトマネジャによる検証\n"
 "\n"
 "検証は会社に対して構成されます：\n"
 "・ 期間のサイズ（日、週、月、年）\n"
-"・ タイムシートと出勤の間の最大の相違\n"
+"・ 勤務表と出勤の間の最大の相違\n"
 "    "
 
 #. module: base
@@ -11153,7 +11153,7 @@ msgstr ""
 "税金管理\n"
 "予算\n"
 "顧客と仕入先請求書\n"
-"銀行明細書\n"
+"銀行取引明細書\n"
 "パートナによる調整処理\n"
 "\n"
 "会計士のための次のものを含むダッシュボードを作成して下さい：\n"
@@ -11501,7 +11501,7 @@ msgstr ""
 "============================================================================="
 "=================================\n"
 "\n"
-"これは主にユーザが自身のタイムシートをエンコードする時に使用されています：\n"
+"これは主にユーザが自身の勤務表をエンコードする時に使用されています：\n"
 "値は取り出され、そして項目は自動的に埋められます。しかし、これらの値の変更は可能です。\n"
 "\n"
 "現在のアカウントに何のデータも記録されていないことが明らかな場合は、このモジュールは古い構成と完全に互換性があるためアカウントデータによるデフォルト値がい"
@@ -12230,7 +12230,7 @@ msgstr ""
 "============================================================================="
 "========================================\n"
 "\n"
-"１つの明細書のIBAN口座から正確に表現されたローカル口座を抜き抜く能力\n"
+"１つの取引明細書のIBAN口座から正確に表現されたローカル口座を抜き抜く能力\n"
 "    "
 
 #. module: base
@@ -14597,7 +14597,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_project_management_time_tracking
 msgid "Time Tracking"
-msgstr "追跡時間"
+msgstr "時間記録"
 
 #. module: base
 #: view:res.partner.category:0
@@ -15185,7 +15185,7 @@ msgstr ""
 "・ 多数の支払いタイプのためにDTAの作成\n"
 "・ BVR管理（番号生成、レポート他）\n"
 "・ 銀行ファイルからインポート口座の移動（v11 他）\n"
-"・ 調和のために銀行明細書を扱う方法の簡素化\n"
+"・ 調和のために銀行取引明細書を扱う方法の簡素化\n"
 "\n"
 "次のZIPと銀行の不足項目の追加ができます：\n"
 "・ l10n_ch_zip\n"
@@ -17108,7 +17108,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"このモジュールはタイムシートシステムを実装します。\n"
+"このモジュールは勤務表システムを実装します。\n"
 "==========================================\n"
 "\n"
 "それぞれの従業員は異なったプロジェクトに費やした時間のエンコードと追跡ができます。\n"

From 75daaf4123769babf800722f4bd6fc3faed27d77 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 19 Apr 2012 04:38:35 +0000
Subject: [PATCH 81/83] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120419043835-l1vrldcmgh9o6s0c
---
 addons/account/i18n/ja.po                   | 332 +++----
 addons/account/i18n/ru.po                   |  10 +-
 addons/account_analytic_analysis/i18n/ja.po |  10 +-
 addons/account_asset/i18n/ro.po             | 793 +++++++++++++++++
 addons/account_chart/i18n/gu.po             |  28 +
 addons/analytic_user_function/i18n/gu.po    |  79 ++
 addons/base_contact/i18n/ja.po              |  32 +-
 addons/claim_from_delivery/i18n/gu.po       |  23 +
 addons/crm_caldav/i18n/gu.po                |  33 +
 addons/crm_todo/i18n/gu.po                  |  95 ++
 addons/decimal_precision/i18n/gu.po         |  49 ++
 addons/google_base_account/i18n/ja.po       | 121 +++
 addons/hr_attendance/i18n/ja.po             | 563 ++++++++++++
 addons/hr_contract/i18n/ja.po               | 270 ++++++
 addons/hr_evaluation/i18n/ja.po             | 903 ++++++++++++++++++++
 addons/hr_holidays/i18n/ja.po               | 143 ++--
 addons/hr_payroll/i18n/ja.po                |   8 +-
 addons/hr_payroll_account/i18n/ja.po        |   6 +-
 addons/hr_timesheet/i18n/ja.po              |   6 +-
 addons/hr_timesheet_invoice/i18n/ja.po      |   6 +-
 addons/hr_timesheet_sheet/i18n/ja.po        |   6 +-
 addons/html_view/i18n/ja.po                 |   2 +-
 addons/idea/i18n/ja.po                      | 713 ++++++++++++++++
 addons/import_sugarcrm/i18n/ja.po           | 404 +++++++++
 addons/stock_invoice_directly/i18n/ru.po    |  10 +-
 25 files changed, 4370 insertions(+), 275 deletions(-)
 create mode 100644 addons/account_asset/i18n/ro.po
 create mode 100644 addons/account_chart/i18n/gu.po
 create mode 100644 addons/analytic_user_function/i18n/gu.po
 create mode 100644 addons/claim_from_delivery/i18n/gu.po
 create mode 100644 addons/crm_caldav/i18n/gu.po
 create mode 100644 addons/crm_todo/i18n/gu.po
 create mode 100644 addons/decimal_precision/i18n/gu.po
 create mode 100644 addons/google_base_account/i18n/ja.po
 create mode 100644 addons/hr_attendance/i18n/ja.po
 create mode 100644 addons/hr_contract/i18n/ja.po
 create mode 100644 addons/hr_evaluation/i18n/ja.po
 create mode 100644 addons/idea/i18n/ja.po
 create mode 100644 addons/import_sugarcrm/i18n/ja.po

diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index cdebfa4c93d..4147fc86b2c 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-17 21:27+0000\n"
+"PO-Revision-Date: 2012-04-19 03:58+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\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: 2012-04-18 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:37+0000\n"
 "X-Generator: Launchpad (build 15108)\n"
 
 #. module: account
@@ -43,7 +43,7 @@ msgstr "会計 \\ レポート \\ 一般的なレポート \\ 税金 \\ 税金
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "仕訳帳エントリーの照合"
+msgstr "仕訳帳エントリーの調整"
 
 #. module: account
 #: view:account.account:0
@@ -109,7 +109,7 @@ msgstr "借方合計"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
-msgstr "取引を照合しない場合、それらが無効にされないためには、それら取引にリンクされた全てのアクションを検証しなければなりません。"
+msgstr "取引を調整しない場合、それらが無効にされないためには、それら取引にリンクされた全てのアクションを検証しなければなりません。"
 
 #. module: account
 #: constraint:account.journal:0
@@ -131,7 +131,7 @@ msgstr "起点"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "照合"
+msgstr "調整"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -218,7 +218,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "照合選択行の移動"
+msgstr "調整選択行の移動"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -237,7 +237,7 @@ msgstr "請求書 %s は部分的に支払われます：%s%s / %s%s（%s%s 残
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "会計エントリーは照合の入力です。"
+msgstr "会計エントリーは調整の入力です。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -327,7 +327,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr "照合なしアカウント"
+msgstr "調整なしアカウント"
 
 #. module: account
 #: view:product.product:0
@@ -357,7 +357,7 @@ msgstr "設定"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr "６月"
+msgstr "6月"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -393,7 +393,7 @@ msgstr "作成日"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "購入の払い戻し"
+msgstr "購入返金"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -430,7 +430,7 @@ msgstr "貸方合計"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open For Unreconciliation"
-msgstr "照合なしのために開く"
+msgstr "不一致を開く"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -541,7 +541,7 @@ msgstr "会社名は固有でなければいけません。"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "請求書払い戻し"
+msgstr "請求書返金"
 
 #. module: account
 #: report:account.overdue:0
@@ -551,7 +551,7 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "照合なし取引"
+msgstr "調整なし取引"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -601,7 +601,7 @@ msgstr "３ヶ月毎"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
-msgstr "取引を照合しない場合、それらが無効にされないためにそれらの取引にリンクされる全てのアクションを検査しなければなりません。"
+msgstr "取引を調整しない場合、それらが無効にされないためにそれらの取引にリンクされる全てのアクションを検査しなければなりません。"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -677,7 +677,7 @@ msgstr "仕訳帳期間"
 #: code:addons/account/account_move_line.py:803
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
-msgstr "エントリーを照合するために、会社は全てのエントリーに対して同じであるべきです。"
+msgstr "エントリーを調整するために、会社は全てのエントリーに対して同じであるべきです。"
 
 #. module: account
 #: view:account.account:0
@@ -726,46 +726,46 @@ msgstr ""
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this year"
-msgstr ""
+msgstr "今年の販売仕訳帳"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr ""
+msgstr "階層とともに子を表示"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr ""
+msgstr "パーセント"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr ""
+msgstr "チャート"
 
 #. module: account
 #: code:addons/account/project/wizard/project_account_analytic_line.py:47
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr ""
+msgstr "行ごとの分析エントリー"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "返金方法"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr ""
+msgstr "ドラフト請求書に対しては通貨のみ変更できます。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
-msgstr ""
+msgstr "財務レポート"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -780,7 +780,7 @@ msgstr ""
 #: field:account.move.reconcile,type:0
 #: field:report.invoice.created,type:0
 msgid "Type"
-msgstr ""
+msgstr "タイプ"
 
 #. module: account
 #: code:addons/account/account_invoice.py:738
@@ -789,21 +789,23 @@ msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
 msgstr ""
+"税金が見つかりません。\n"
+"計算ボタンをクリックして下さい。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "アカウントサブスクリプション行"
 
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "請求書のパートナ参照"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr "仕入先請求書と払い戻し"
+msgstr "仕入先請求書と返金"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -811,22 +813,22 @@ msgstr "仕入先請求書と払い戻し"
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr ""
+msgstr "不一致"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
+msgstr "14日間で２パーセント、月末の30日間で残量"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr ""
+msgstr "アカウント分析仕訳帳"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr ""
+msgstr "自動調整"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -841,6 +843,8 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
+"多通貨取引を行う場合は、為替レートによっていくらかの損失や利益が生じることがあります。それらの取引が本日終了する場合、このメニューは実際に得るであろうその"
+"利益や損失の予測を提供します。ただし、第２通貨の設定を持つアカウントのみです。"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -849,18 +853,18 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr ""
+msgstr "日数"
 
 #. module: account
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr ""
+msgstr "これをチェックした場合、アカウントの新しいチャートはデフォルトではこれを含みません。"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:110
@@ -868,50 +872,50 @@ msgstr ""
 msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
-msgstr "既に調整済みの %s は請求できません。請求書は未調整であるべきです。この請求書は払い戻しのみできます。"
+msgstr "請求書 %s は既に調整済みのためできません。請求書は最初に未調整であるべきです。この請求書の返金のみができます。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 msgid "New Subscription"
-msgstr ""
+msgstr "新しいサブスクリプション"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr ""
+msgstr "計算"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr "キャンセル：請求書と調整の払い戻し"
+msgstr "キャンセル：請求書と調整の返金"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "値"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "平均支払遅延"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr ""
+msgstr "税金チャート"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr ""
+msgstr "3ヶ月期間の作成"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Due"
-msgstr ""
+msgstr "期日"
 
 #. module: account
 #: code:addons/account/account.py:1345
@@ -919,7 +923,7 @@ msgstr ""
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
-msgstr ""
+msgstr "アカウント %s は勘定科目表 %s に属していないため、この仕訳帳エントリーを検証することはできません。"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -927,7 +931,7 @@ msgstr ""
 msgid ""
 "This account does not allow reconciliation! You should update the account "
 "definition to change this."
-msgstr ""
+msgstr "このアカウントは調整を許されていません。これを変更するにはアカウントの定義を更新する必要があります。"
 
 #. module: account
 #: view:account.invoice:0
@@ -935,53 +939,53 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr ""
+msgstr "承認"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.move:0
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "合計金額"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "統合"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_liability
 #: model:account.financial.report,name:account.account_financial_report_liability0
 #: model:account.financial.report,name:account.account_financial_report_liabilitysum0
 msgid "Liability"
-msgstr ""
+msgstr "負債"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "仕訳帳の一元化"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr "販売払い戻し"
+msgstr "販売返金"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "銀行明細書"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr ""
+msgstr "移動行"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -990,22 +994,24 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
+"税金アカウントが税金コードアカウントであるなら、この項目は税込みの金額です。税金アカウントが税金コードを基にしたものであるなら、この項目は税抜きの金額です"
+"。"
 
 #. module: account
 #: code:addons/account/account.py:2596
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr ""
+msgstr "テンプレートアカウントのための親コードが見つかりません。"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "発注"
 
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr ""
+msgstr "モデルエントリー"
 
 #. module: account
 #: field:account.account,code:0
@@ -1022,7 +1028,7 @@ msgstr ""
 #: report:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr ""
+msgstr "コード"
 
 #. module: account
 #: code:addons/account/account.py:2268
@@ -1032,7 +1038,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "分析仕訳帳がありません。"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1041,28 +1047,28 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
 msgid "Partner Balance"
-msgstr ""
+msgstr "パートナ残高"
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr ""
+msgstr "アカウント名"
 
 #. module: account
 #: field:account.chart.template,property_reserve_and_surplus_account:0
 #: field:res.company,property_reserve_and_surplus_account:0
 msgid "Reserve and Profit/Loss Account"
-msgstr ""
+msgstr "引当金と利益 / 損失アカウント"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "年の通算週"
 
 #. module: account
 #: field:account.report.general.ledger,landscape:0
 msgid "Landscape Mode"
-msgstr ""
+msgstr "横向きモード"
 
 #. module: account
 #: code:addons/account/account.py:645
@@ -1070,47 +1076,47 @@ msgstr ""
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
-msgstr ""
+msgstr "それは仕訳帳項目を含むため、アカウントタイプを %s から %s へ変更することはできません。"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
-msgstr ""
+msgstr "並べ替え順"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "閉じる会計年度を選択して下さい。"
 
 #. module: account
 #: help:account.account.template,user_type:0
 msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
-msgstr ""
+msgstr "これらのタイプはあなたの国に従って定義されています。タイプはアカウントとその特殊性についての多くの情報を含んでいます。"
 
 #. module: account
 #: code:addons/account/account_move_line.py:842
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
-msgstr ""
+msgstr "償却 / 為替差エントリーのためのアカウントを提供しなければなりません。"
 
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "適用オプション"
 
 #. module: account
 #: report:account.partner.balance:0
 msgid "In dispute"
-msgstr ""
+msgstr "係争中"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr ""
+msgstr "キャッシュレジスタ"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -1123,17 +1129,17 @@ msgstr ""
 #: view:account.analytic.account:0
 #: model:res.groups,name:account.group_account_manager
 msgid "Manager"
-msgstr ""
+msgstr "マネジャ"
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr ""
+msgstr "前にエントリーを生成："
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "不均衡状態の仕訳帳項目"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1141,40 +1147,40 @@ msgstr ""
 #: code:addons/account/account.py:3003
 #, python-format
 msgid "Bank"
-msgstr ""
+msgstr "銀行"
 
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr ""
+msgstr "期間の開始"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "明細書の確認"
 
 #. module: account
 #: help:account.account,foreign_balance:0
 msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
-msgstr ""
+msgstr "このアカウントに対する第２の通貨で行われた取引の総額（第２の通貨）。"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr ""
+msgstr "税金の置き換え"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr ""
+msgstr "クレジットの集中化"
 
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
-msgstr ""
+msgstr "タイプ別全月の販売"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1184,27 +1190,29 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+"仕入先の請求書で、仕入先によって発行された請求書の入力と管理ができます。OpenERPは発注オーダーや領収書から自動的にドラフト請求書の作成もできます。こ"
+"の方法は、仕入先に発注したあるいは受け取ったものに応じて請求書の管理ができます。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr ""
+msgstr "税金コードテンプレート"
 
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "請求書のキャンセル"
 
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "コードはレポート上に表示されます。"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "購入時にかかる税金"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1212,22 +1220,22 @@ msgstr ""
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr ""
+msgstr "税金コード"
 
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr ""
+msgstr "仕向為替レート"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
 msgid "Situation"
-msgstr ""
+msgstr "事態"
 
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr ""
+msgstr "このエントリー行を移動します。"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1302
@@ -1235,12 +1243,12 @@ msgstr ""
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
-msgstr ""
+msgstr "この仕訳帳にはこの一般的なアカウントを使うことができません。関連する仕訳帳上の入力コントロールタブをチェックして下さい。"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr ""
+msgstr "取引番号"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -1248,30 +1256,30 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr ""
+msgstr "エントリーラベル"
 
 #. module: account
 #: code:addons/account/account.py:1129
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
-msgstr ""
+msgstr "この期間の仕訳帳エントリーの変更や削除はできません。"
 
 #. module: account
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr ""
+msgstr "この請求書が生成されたドキュメントへの参照"
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:account.journal:0
 msgid "Others"
-msgstr ""
+msgstr "その他"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "ドラフトサブスクリプション"
 
 #. module: account
 #: view:account.account:0
@@ -1300,25 +1308,25 @@ msgstr ""
 #: model:ir.model,name:account.model_account_account
 #: field:report.account.sales,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "アカウント"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "基本金額に含む"
 
 #. module: account
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr ""
+msgstr "エントリー分析"
 
 #. module: account
 #: field:account.account,level:0
 #: field:account.financial.report,level:0
 msgid "Level"
-msgstr ""
+msgstr "レベル"
 
 #. module: account
 #: report:account.invoice:0
@@ -1333,74 +1341,74 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr ""
+msgstr "税金"
 
 #. module: account
 #: code:addons/account/wizard/account_financial_report.py:69
 #: code:addons/account/wizard/account_report_common.py:144
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "開始、終了期間を選択"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 msgid "Profit and Loss"
-msgstr ""
+msgstr "損益"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr ""
+msgstr "アカウントのテンプレート"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "税金テンプレート検索"
 
 #. module: account
 #: view:account.move.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_reconcile_select
 #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
 msgid "Reconcile Entries"
-msgstr ""
+msgstr "エントリーの調整"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "期限超過の支払い"
 
 #. module: account
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "期首残高"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "ドラフトにリセット"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Bank Information"
-msgstr ""
+msgstr "銀行情報"
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr ""
+msgstr "レポートオプション"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "仕訳帳項目分析"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr ""
+msgstr "パートナ"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1409,17 +1417,17 @@ msgstr ""
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr ""
+msgstr "銀行明細"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr ""
+msgstr "売掛金"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "中心となる仕訳帳"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1427,54 +1435,54 @@ msgstr ""
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "残高が0ではありません。"
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "税金検索"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr ""
+msgstr "アカウント分析原価元帳"
 
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr ""
+msgstr "エントリー作成"
 
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr ""
+msgstr "項目番号"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr ""
+msgstr "最大償却額"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr ""
+msgstr "税金計算"
 
 #. module: account
 #: field:account.chart.template,code_digits:0
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr ""
+msgstr "桁数"
 
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "手作業入力のため、ドラフト状態をスキップして下さい。"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "税抜き合計"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1485,30 +1493,30 @@ msgid ""
 "statements, etc."
 msgstr ""
 "仕訳帳エントリーは幾つかの仕訳帳項目を含んでいます。それぞれは借方あるいは貸方取引の何れかです。OpenERPは会計ドキュメントごとにひとつの仕訳帳エント"
-"リーを自動的に作成します：請求書、払い戻し、仕入先支払い、銀行明細など"
+"リーを自動的に作成します：請求書、返金、仕入先支払い、銀行明細など"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "エントリー番号 "
 
 #. module: account
 #: help:account.fiscal.position,active:0
 msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
-msgstr ""
+msgstr "アクティブ項目のチェックを外すことで、それを消すことなく財政見解を隠すことができます。"
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "ダッシュボードビューのために使われる一時的なテーブル"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "仕入先払い戻し"
+msgstr "仕入先返金"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1519,7 +1527,7 @@ msgstr "仕入先払い戻し"
 #: selection:account.fiscalyear,state:0
 #: selection:account.period,state:0
 msgid "Closed"
-msgstr ""
+msgstr "閉じた"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1529,17 +1537,17 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr ""
+msgstr "財政見解のためのテンプレート"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr ""
+msgstr "調整済取引"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr ""
+msgstr "カラム"
 
 #. module: account
 #: report:account.overdue:0
@@ -1587,7 +1595,7 @@ msgstr ""
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "払い戻し税金アカウント"
+msgstr "返金税金アカウント"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1664,7 +1672,7 @@ msgstr ""
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
-msgstr "請求書のキャンセル：現在の請求書をキャンセルするために払い戻し請求書を作成し、検証し、調整して下さい。"
+msgstr "請求書のキャンセル：現在の請求書をキャンセルするために返金請求書を作成し、検証し、調整して下さい。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -2620,7 +2628,7 @@ msgstr ""
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "ベースコードの払い戻し"
+msgstr "ベースコードの返金"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2832,7 +2840,7 @@ msgstr ""
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
 "refund it instead."
-msgstr "開いているか支払済みの請求書は削除できません。その代わりに払い戻しをすることをお勧めします。"
+msgstr "開いているか支払済みの請求書は削除できません。その代わりに返金をすることをお勧めします。"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -3656,7 +3664,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr "払い戻しのドラフトを作成"
+msgstr "返金のドラフトを作成"
 
 #. module: account
 #: view:account.state.open:0
@@ -4454,13 +4462,13 @@ msgstr ""
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "不一致取引"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr "税金コードの払い戻し"
+msgstr "税金コードの返金"
 
 #. module: account
 #: view:validate.account.move:0
@@ -4557,7 +4565,7 @@ msgid ""
 "Bank Account Number to which the invoice will be paid. A Company bank "
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
-msgstr "請求書が支払われる先の銀行口座番号です。顧客請求書や仕入れ先払い戻しであれば会社の銀行口座、さもなくばパートナの銀行口座番号です。"
+msgstr "請求書が支払われる先の銀行口座番号です。顧客請求書や仕入先返金であれば会社の銀行口座、さもなくばパートナの銀行口座番号です。"
 
 #. module: account
 #: view:account.state.open:0
@@ -5190,7 +5198,7 @@ msgstr ""
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "顧客払い戻し"
+msgstr "顧客返金"
 
 #. module: account
 #: constraint:account.move:0
@@ -5299,7 +5307,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr "顧客請求書と払い戻し"
+msgstr "顧客請求書と返金"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -5355,7 +5363,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr "払い戻し請求書オプション"
+msgstr "返金請求書オプション"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5594,7 +5602,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr "払い戻し請求書"
+msgstr "返金請求書"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
@@ -5764,7 +5772,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr ""
+msgstr "顧客返金"
 
 #. module: account
 #: field:account.account,foreign_balance:0
@@ -6218,7 +6226,7 @@ msgstr ""
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "仕入先返金"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_dashboard_acc
@@ -6922,7 +6930,7 @@ msgstr ""
 msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
-msgstr ""
+msgstr "返金請求書と期間のための請求日付として使用される日付は適宜選択されます。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -7215,7 +7223,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "顧客と仕入先返金"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7917,7 +7925,7 @@ msgstr ""
 #: code:addons/account/account.py:3111
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "購入返金仕訳帳"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -8047,6 +8055,8 @@ msgid ""
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
 msgstr ""
+"顧客返金とともに顧客のためのクレジットメモを管理することができます。返金は全部あるいは部分的な請求書のクレジットのドキュメントです。請求書フォームから簡単"
+"に返金を生成したり、それを直接調整することができます。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -8203,7 +8213,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "仕訳帳の返金"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8275,7 +8285,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
-msgstr ""
+msgstr "請求書の返金：編集のために準備した請求書の返金を作成します。"
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
@@ -8692,7 +8702,7 @@ msgstr ""
 #: code:addons/account/account.py:3110
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "販売返金仕訳帳"
 
 #. module: account
 #: view:account.move:0
@@ -8882,6 +8892,8 @@ msgid ""
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
+"仕入先返金とともに仕入先から受け取ったクレジットメモを管理することができます。返金は全部あるいは部分的な請求書のクレジットのドキュメントです。請求書フォー"
+"ムから簡単に返金を生成したり、それを直接調整することができます。"
 
 #. module: account
 #: view:account.account.template:0
@@ -9363,7 +9375,7 @@ msgid ""
 "You can select here the journal to use for the refund invoice that will be "
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
-msgstr ""
+msgstr "あなたは作成される返金請求書のために使う仕訳帳をここで選択できます。もしその項目が空であれば、現在の請求書と同じ仕訳帳が使われます。"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -9486,7 +9498,7 @@ msgstr ""
 msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
-msgstr ""
+msgstr "このタイプを基にした返金請求書。既に調整された請求書は変更やキャンセルができません。"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -10130,7 +10142,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
-msgstr ""
+msgstr "変更：返金請求書、調整、新しいドラフト請求書の作成"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -10160,7 +10172,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr ""
+msgstr "返金"
 
 #. module: account
 #: model:email.template,body_text:account.email_template_edi_invoice
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 2de3304f3d9..c88612a301d 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-01-13 06:54+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2012-04-18 08:09+0000\n"
+"Last-Translator: Michael Otcheskih <otma@mail.ru>\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: 2012-02-09 06:22+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9321,7 +9321,7 @@ msgstr "Общий отчет"
 #: view:account.account:0
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr ""
+msgstr "Субсчета"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:87
diff --git a/addons/account_analytic_analysis/i18n/ja.po b/addons/account_analytic_analysis/i18n/ja.po
index 9ed8acf0a61..f0fe84ed1d0 100644
--- a/addons/account_analytic_analysis/i18n/ja.po
+++ b/addons/account_analytic_analysis/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-16 17:38+0000\n"
+"PO-Revision-Date: 2012-04-18 05:50+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\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: 2012-04-17 04:51+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
@@ -86,7 +86,7 @@ msgstr "式を使った計算：理論的な収入 - 総コスト"
 msgid ""
 "Number of time you spent on the analytic account (from timesheet). It "
 "computes quantities on all journal of type 'general'."
-msgstr "分析アカウントに費やされた時間数（タイムチャートから）です。タイプが\"一般\"の全ての仕訳帳の数量を計算します。"
+msgstr "分析アカウントに費やされた時間数（勤務表から）です。タイプが\"一般\"の全ての仕訳帳の数量を計算します。"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -352,7 +352,7 @@ msgstr "合計時間"
 msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
-msgstr "アカウントのコストの合計。これには実際のコスト（請求書から）とタイムシートの上で費やされた時間といった間接コストも含まれます。"
+msgstr "アカウントのコストの合計。これには実際のコスト（請求書から）と勤務表上で費やされた時間といった間接コストも含まれます。"
 
 #, python-format
 #~ msgid "AccessError"
diff --git a/addons/account_asset/i18n/ro.po b/addons/account_asset/i18n/ro.po
new file mode 100644
index 00000000000..efd9130d43c
--- /dev/null
+++ b/addons/account_asset/i18n/ro.po
@@ -0,0 +1,793 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-04-18 07:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset durations to modify"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/account_chart/i18n/gu.po b/addons/account_chart/i18n/gu.po
new file mode 100644
index 00000000000..58df15332dd
--- /dev/null
+++ b/addons/account_chart/i18n/gu.po
@@ -0,0 +1,28 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-04-18 10:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "ન્યૂનતમ એકાઉન્ટ ચાર્ટ દૂર કરો"
+
+#. module: account_chart
+#: model:ir.module.module,shortdesc:account_chart.module_meta_information
+msgid "Charts of Accounts"
+msgstr ""
diff --git a/addons/analytic_user_function/i18n/gu.po b/addons/analytic_user_function/i18n/gu.po
new file mode 100644
index 00000000000..41eb92e938f
--- /dev/null
+++ b/addons/analytic_user_function/i18n/gu.po
@@ -0,0 +1,79 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-04-18 12:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Product"
+msgstr "વસ્તુ"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr ""
+
+#. module: analytic_user_function
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "વિશ્લેષણાત્મક ખાતું"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "વપરાશકર્તા"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "ભૂલ!"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "ત્રુટિ! તમે અંદરોઅંદર વિશ્લેષણાત્મક ખાતાઓ ન બનાવી શકો."
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "આ વિશ્લેષક ખાતા માટે વપરાશકર્તા ઉત્પાદન"
diff --git a/addons/base_contact/i18n/ja.po b/addons/base_contact/i18n/ja.po
index 89af47fb6ac..1c9ada83c46 100644
--- a/addons/base_contact/i18n/ja.po
+++ b/addons/base_contact/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-14 00:01+0000\n"
+"PO-Revision-Date: 2012-04-18 06:10+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\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: 2012-04-15 04:42+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:37+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: base_contact
 #: field:res.partner.location,city:0
@@ -39,7 +39,7 @@ msgstr "連絡先"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Professional Info"
-msgstr ""
+msgstr "資格情報"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
@@ -54,14 +54,14 @@ msgstr "場所"
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "パートナの送り先"
 
 #. module: base_contact
 #: help:res.partner.contact,active:0
 msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
-msgstr ""
+msgstr "アクティブ項目がFalseに設定されている場合、パートナ連絡先を削除せずに非表示に設定できます。"
 
 #. module: base_contact
 #: field:res.partner.contact,website:0
@@ -76,7 +76,7 @@ msgstr "郵便番号"
 #. module: base_contact
 #: field:res.partner.location,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "都道府県"
 
 #. module: base_contact
 #: field:res.partner.location,company_id:0
@@ -96,12 +96,12 @@ msgstr "主なパートナ"
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact"
-msgstr ""
+msgstr "主な連絡先"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
 msgid "E-Mail"
-msgstr "メール"
+msgstr "Eメール"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
@@ -127,7 +127,7 @@ msgstr "主な役割"
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
 msgid "Define partners and their addresses."
-msgstr ""
+msgstr "パートナとパートナの住所を明示する。"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
@@ -169,7 +169,7 @@ msgstr "その他の情報"
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr ""
+msgstr "機能と住所"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
@@ -180,17 +180,17 @@ msgstr "連絡先"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_location
 msgid "res.partner.location"
-msgstr ""
+msgstr "res.partner.location"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr "同僚"
+msgstr "取引先"
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "直属の雇用者"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -226,7 +226,7 @@ msgstr "場所"
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: base_contact
 #: field:res.partner.location,street:0
@@ -241,7 +241,7 @@ msgstr "パートナ"
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr "取引先"
+msgstr "パートナ"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
diff --git a/addons/claim_from_delivery/i18n/gu.po b/addons/claim_from_delivery/i18n/gu.po
new file mode 100644
index 00000000000..9ffab1ca1e3
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/gu.po
@@ -0,0 +1,23 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-18 11:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "દાવો"
diff --git a/addons/crm_caldav/i18n/gu.po b/addons/crm_caldav/i18n/gu.po
new file mode 100644
index 00000000000..653a0757f7c
--- /dev/null
+++ b/addons/crm_caldav/i18n/gu.po
@@ -0,0 +1,33 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-18 11:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: crm_caldav
+#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
+msgid "Synchronize This Calendar"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "સભા"
diff --git a/addons/crm_todo/i18n/gu.po b/addons/crm_todo/i18n/gu.po
new file mode 100644
index 00000000000..ebb1c8873b0
--- /dev/null
+++ b/addons/crm_todo/i18n/gu.po
@@ -0,0 +1,95 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-18 11:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "કાર્ય"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr ""
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "ભૂલ! કાર્ય અંતિમ તારીખ શરૂઆતની તારીખ કાર્ય કરતાં મોટી હોવી જ જોઈએ"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "આગળ"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "મારા કાર્યો"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "કાર્યો"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "થઈ ગયું"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "ભૂલ! તમે પાસાના ક્રિયાઓ બનાવી શકો નહિ."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "વિશેષ માહિતી"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "પહેલાનું"
diff --git a/addons/decimal_precision/i18n/gu.po b/addons/decimal_precision/i18n/gu.po
new file mode 100644
index 00000000000..4f2e5ef72a4
--- /dev/null
+++ b/addons/decimal_precision/i18n/gu.po
@@ -0,0 +1,49 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-18 11:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "આંકડા"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy"
+msgstr "અપૂર્ણાંક ચોક્સાઇ"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "વપરાશ"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr ""
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "અપૂર્ણાંક શુદ્ધતા"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "અપૂર્ણાંક.શુદ્ધતા"
diff --git a/addons/google_base_account/i18n/ja.po b/addons/google_base_account/i18n/ja.po
new file mode 100644
index 00000000000..6fce529f781
--- /dev/null
+++ b/addons/google_base_account/i18n/ja.po
@@ -0,0 +1,121 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-18 06:48+0000\n"
+"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "ユーザ名"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Google ログイン"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Googleの連絡先のインポートエラー。"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " 同期する "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同一のログインに２つのユーザを指定することはできません。"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Google ログイン"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Google パスワード"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "キャンセル"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Google アカウント"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Google ユーザ名"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"http://code.google.com/p/gdata-python-client/downloads/list から gdata-python-"
+"client をインストールしてください。"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Google 連絡先"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "_ログイン"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "パスワード"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "ユーザ名とパスワードが認証できませんでした。"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "例： user@gmail.com"
diff --git a/addons/hr_attendance/i18n/ja.po b/addons/hr_attendance/i18n/ja.po
new file mode 100644
index 00000000000..818bb5a827b
--- /dev/null
+++ b/addons/hr_attendance/i18n/ja.po
@@ -0,0 +1,563 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-18 20:48+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
+msgid "Time Tracking"
+msgstr "時間記録"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Today"
+msgstr "今日"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign out the last time. Please enter the date and time you "
+"signed out."
+msgstr "前回、サインアウトしていませんでした。サインアウトした日時を入力して下さい。"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Total period:"
+msgstr "全期間"
+
+#. module: hr_attendance
+#: field:hr.action.reason,name:0
+msgid "Reason"
+msgstr "理由"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Print Attendance Report Error"
+msgstr "出勤報告書エラーの印刷"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:161
+#, python-format
+msgid "The sign-out date must be in the past"
+msgstr "サインアウトした日付は過去のものでなければいけません。"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "署名した日付"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"The Time Tracking functionality aims to manage employee attendances from "
+"Sign in/Sign out actions. You can also link this feature to an attendance "
+"device using OpenERP's web service features."
+msgstr ""
+"時間記録の機能は、サインイン/サインアウトを基に従業員の出勤を管理するためのものです。OpenERPのWebサービス機能を使って、この機能を出勤デバイスと"
+"連動することができます。"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Attendance reasons"
+msgstr "出勤理由"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Present"
+msgstr "現在"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
+msgid "Ask for Sign In Out"
+msgstr "サインアウトを依頼"
+
+#. module: hr_attendance
+#: field:hr.attendance,action_desc:0
+#: model:ir.model,name:hr_attendance.model_hr_action_reason
+msgid "Action Reason"
+msgstr "活動理由"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Ok"
+msgstr "OK"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Define attendance reason"
+msgstr "出勤理由を定義して下さい。"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/report/attendance_by_month.py:184
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
+#, python-format
+msgid "Attendances By Month"
+msgstr "月別の出勤"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,name:0
+#: field:hr.sign.in.out.ask,name:0
+msgid "Employees name"
+msgstr "従業員名"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
+msgid "Attendance Reasons"
+msgstr "勤怠理由"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:161
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:167
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:179
+#, python-format
+msgid "UserError"
+msgstr "ユーザエラー"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,end_date:0
+#: field:hr.attendance.week,end_date:0
+msgid "Ending Date"
+msgstr "終了日"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:140
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "The Sign-in date must be in the past"
+msgstr "サインインの日付は過去のものでなければいけません。"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:167
+#, python-format
+msgid "A sign-in must be right after a sign-out !"
+msgstr "サインインは、サインアウトの前でなければいけません。"
+
+#. module: hr_attendance
+#: field:hr.employee,state:0
+#: model:ir.model,name:hr_attendance.model_hr_attendance
+msgid "Attendance"
+msgstr "勤怠"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,max_delay:0
+msgid "Max. Delay (Min)"
+msgstr "最大の遅れ（分）"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.attendance.week:0
+msgid "Print"
+msgstr "印刷"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Hr Attendance Search"
+msgstr "勤怠の検索"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_week
+msgid "Attendances By Week"
+msgstr "週ごとの勤怠"
+
+#. module: hr_attendance
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr "エラー：サインイン（サインアウト）はサインアウト（サインイン）の後でなければいけません。"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
+#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
+msgid "Attendance Error Report"
+msgstr "勤怠エラー報告書"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,init_date:0
+#: field:hr.attendance.week,init_date:0
+msgid "Starting Date"
+msgstr "開始日"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Min Delay"
+msgstr "最小遅れ"
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign In"
+msgstr "サインイン"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Operation"
+msgstr "運用"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No Data Available"
+msgstr "データがありません。"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: hr_attendance
+#: field:hr.action.reason,action_type:0
+msgid "Action Type"
+msgstr "活動タイプ"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr "(*) 遅れがマイナスであることは，従業員は記録した以上の時間を働いたことになります。"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "My Attendance"
+msgstr "私の勤怠"
+
+#. module: hr_attendance
+#: help:hr.attendance,action_desc:0
+msgid ""
+"Specifies the reason for Signing In/Signing Out in case of extra hours."
+msgstr "サインイン / サインアウトよりも超過した時間の理由を入力して下さい。"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_month
+msgid "Print Monthly Attendance Report"
+msgstr "月次勤怠報告書を印刷"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out
+msgid "Sign In Sign Out"
+msgstr "サインイン、サインアウト"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:105
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:129
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:146
+#: view:hr.sign.in.out:0
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
+#, python-format
+msgid "Sign in / Sign out"
+msgstr "サインイン / サインアウト"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
+msgstr "hr.sign.out.ask"
+
+#. module: hr_attendance
+#: view:hr.attendance.week:0
+msgid "Print Attendance Report Weekly"
+msgstr "週間勤怠報告書を印刷"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:179
+#, python-format
+msgid "A sign-out must be right after a sign-in !"
+msgstr "サインアウトはサインインの後でなければいけません。"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_error
+msgid "Print Error Attendance Report"
+msgstr "エラー勤怠報告書を印刷"
+
+#. module: hr_attendance
+#: field:hr.attendance,name:0
+msgid "Date"
+msgstr "日付"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "エラー：従業員の反復した階層構造を作ることはできません。"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "サインイン"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Analysis Information"
+msgstr "分析情報"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Sign-Out Entry must follow Sign-In."
+msgstr "サインアウトはサインインの後でなければいけません。"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Attendance Errors"
+msgstr "勤怠エラー"
+
+#. module: hr_attendance
+#: field:hr.attendance,action:0
+#: selection:hr.attendance,action:0
+msgid "Action"
+msgstr "活動"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
+msgstr ""
+"従業員が出勤時にサインインして、終業時のサインアウトするようにすれば、このツールを使って出退勤を管理することができます。従業員がシステムユーザある場合には"
+"、活動ボタンを時間を記録することができます。"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_week
+msgid "Print Week Attendance Report"
+msgstr "週間勤怠報告書を印刷する。"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+#: field:hr.sign.in.out.ask,emp_id:0
+msgid "Empoyee ID"
+msgstr "従業員ID"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.attendance.week:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: hr_attendance
+#: help:hr.action.reason,name:0
+msgid "Specifies the reason for Signing In/Signing Out."
+msgstr "サインイン / サインンアウトの理由を入力して下さい。"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A positive delay means that the employee worked less than recorded."
+msgstr "(*) 遅れが正数であるのは、従業員の勤務時間が記録した時間よりも少ないことを意味します。"
+
+#. module: hr_attendance
+#: view:hr.attendance.month:0
+msgid "Print Attendance Report Monthly"
+msgstr "月間勤怠報告書を印刷"
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign out"
+msgstr "サインアウト"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Delay"
+msgstr "遅延"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: model:ir.model,name:hr_attendance.model_hr_employee
+msgid "Employee"
+msgstr "従業員"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:140
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+"他の活動の前に %s を指定しようとしましたね。\n"
+"勤怠を修正するためにアドミニストレータに依頼して下さい。"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+#: field:hr.sign.in.out.ask,last_time:0
+msgid "Your last sign out"
+msgstr "前回のサインアウト"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Recorded"
+msgstr "記録した日付"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
+msgid "Attendances"
+msgstr "勤怠"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "Your last sign in"
+msgstr "前回のサインイン"
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign Out"
+msgstr "サインアウト"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+"サインイン / "
+"サインアウト。会社によっては、出勤したときにサインインして、退勤するときにサインアウトする規則があります。従業員がシステムユーザである場合には，本人がこの"
+"活動ボタンで時間を記録することができます。"
+
+#. module: hr_attendance
+#: field:hr.attendance,employee_id:0
+msgid "Employee's Name"
+msgstr "従業員名"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Absent"
+msgstr "欠勤"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendances"
+msgstr "従業員の勤怠"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,state:0
+msgid "Current state"
+msgstr "現在の状態"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Bellow this delay, the error is considered to be voluntary"
+msgstr "この遅れ以内です。エラーは自発的なものと考えられます。"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No records found for your selection!"
+msgstr "指定したレコードはありません。"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign in the last time. Please enter the date and time you signed "
+"in."
+msgstr "前回、サインインしませんでした。サインインの日時を入力して下さい。"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.in.out.ask"
+msgstr "hr.sign.in.out.ask"
diff --git a/addons/hr_contract/i18n/ja.po b/addons/hr_contract/i18n/ja.po
new file mode 100644
index 00000000000..7c7118cb4c9
--- /dev/null
+++ b/addons/hr_contract/i18n/ja.po
@@ -0,0 +1,270 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-18 21:02+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "賃金"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Information"
+msgstr "情報"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period"
+msgstr "仮採用期間"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "仮採用の開始日"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "健康診断"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "社用車"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "その他"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "現在"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "部門"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "期限切れ"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,employee_id:0
+#: model:ir.model,name:hr_contract.model_hr_employee
+msgid "Employee"
+msgstr "従業員"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr "契約を検索"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts in progress"
+msgstr "進行中の契約"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
+msgstr "自宅 - 勤務地の距離"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_ids:0
+#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
+msgid "Contracts"
+msgstr "契約"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Personal Info"
+msgstr "個人情報"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts whose end date already passed"
+msgstr "契約期限を過ぎた契約"
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr "従業員の最近の契約"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "職務"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr "利点"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Valid for"
+msgstr "有効"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "労働許可"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "子供の人数"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
+msgid "Contract Types"
+msgstr "契約タイプ"
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "エラー：従業員の反復した階層構造を作ることはできません。"
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "終了日"
+
+#. module: hr_contract
+#: help:hr.contract,wage:0
+msgid "Basic Salary of the employee"
+msgstr "従業員の基本給"
+
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "契約の参照"
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr "キロメートル"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: hr_contract
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr "労働許可番号"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_id:0
+#: model:ir.model,name:hr_contract.model_hr_contract
+#: model:ir.ui.menu,name:hr_contract.next_id_56
+msgid "Contract"
+msgstr "契約"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,type_id:0
+#: view:hr.contract.type:0
+#: field:hr.contract.type,name:0
+#: model:ir.model,name:hr_contract.model_hr_contract_type
+msgid "Contract Type"
+msgstr "契約タイプ"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "作業予定"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Job Info"
+msgstr "仕事情報"
+
+#. module: hr_contract
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "ビザの有効期限"
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr "役職"
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr "マネジャ"
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr "開始日"
+
+#. module: hr_contract
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr "エラー：契約開始日は契約終了日の前でなければいけません。"
+
+#. module: hr_contract
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr "ビザ番号"
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr "出生地"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr "期間"
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr "健康診断の日付"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr "試用終了日"
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr "契約タイプを検索"
diff --git a/addons/hr_evaluation/i18n/ja.po b/addons/hr_evaluation/i18n/ja.po
new file mode 100644
index 00000000000..f1b5d2989ef
--- /dev/null
+++ b/addons/hr_evaluation/i18n/ja.po
@@ -0,0 +1,903 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-04-19 00:13+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Send an anonymous summary to the manager"
+msgstr "マネジャに匿名の要約を送る。"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Start Appraisal"
+msgstr "査定を始める。"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0 view:hr.evaluation.report:0
+#: view:hr_evaluation.plan:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Appraisal that overpassed the deadline"
+msgstr "締切を過ぎた査定"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,request_id:0
+#: field:hr.evaluation.report,request_id:0
+msgid "Request_id"
+msgstr "要求ID"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,progress_bar:0
+#: field:hr_evaluation.evaluation,progress:0
+msgid "Progress"
+msgstr "進捗状況"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,delay_date:0
+msgid "Delay to Start"
+msgstr "開始遅れ"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Appraisal that are in waiting appreciation state"
+msgstr "評価を待っている査定"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:244
+#: code:addons/hr_evaluation/hr_evaluation.py:317
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0 field:hr_evaluation.plan,company_id:0
+#: field:hr_evaluation.plan.phase,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,evaluation_id:0
+#: field:hr_evaluation.plan.phase,survey_id:0
+msgid "Appraisal Form"
+msgstr "査定票"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0 field:hr.evaluation.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan:0 field:hr_evaluation.plan,phase_ids:0
+msgid "Appraisal Phases"
+msgstr "査定段階"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_first:0
+msgid ""
+"This number of months will be used to schedule the first evaluation date of "
+"the employee when selecting an evaluation plan. "
+msgstr "この月数が従業員の最初の評価計画の期間になります。 "
+
+#. module: hr_evaluation
+#: view:hr.employee:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(eval_name)s:Appraisal Name"
+msgstr "(eval_name)s：査定の名称"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
+msgid ""
+"Each employee may be assigned an Appraisal Plan. Such a plan defines the "
+"frequency and the way you manage your periodic personnel evaluation. You "
+"will be able to define steps and attach interviews to each step. OpenERP "
+"manages all kind of evaluations: bottom-up, top-down, self-evaluation and "
+"final evaluation by the manager."
+msgstr ""
+"各従業員に評価計画が割り当てられます。評価計画では、人事評価を管理する頻度と方法を定義します。評価の手順とそのときの面接内容を添付することができます。ボト"
+"ム・アップ、トップ・ダウン、自己評価、マネジャの評価など多種類の評価を管理できます。"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Body"
+msgstr "Eメールの本文"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,wait:0
+msgid "Wait Previous Phases"
+msgstr "前段階の終了待ち"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Appraisal"
+msgstr "従業員の査定"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Cancelled"
+msgstr "キャンセルされました。"
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Did not meet expectations"
+msgstr "期待に達しなかった。"
+
+#. module: hr_evaluation
+#: view:hr.employee:0 view:hr_evaluation.evaluation:0
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
+msgid "Appraisal"
+msgstr "査定"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Managers"
+msgstr "マネジャに送る。"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date_close:0
+msgid "Ending Date"
+msgstr "終了日"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,note_action:0
+msgid ""
+"If the evaluation does not meet the expectations, you can proposean action "
+"plan"
+msgstr "評価が期待に達しなかった場合には、アクション計画を提案できます。"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Send to Employees"
+msgstr "従業員に送る。"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:82
+#, python-format
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(employee_name)s,\n"
+"\n"
+"I am doing an evaluation regarding %(eval_name)s.\n"
+"\n"
+"Kindly submit your response.\n"
+"\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
+msgstr ""
+"\n"
+"日付： %(date)s\n"
+"\n"
+"%(employee_name)s 様\n"
+"\n"
+"%(eval_name)s について評価をしています。\n"
+"\n"
+"あなたから返信してください。\n"
+"\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Appraisal that are in Plan In Progress state"
+msgstr "計画された進行中の査定"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Reset to Draft"
+msgstr "草稿に再設定する。"
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,deadline:0
+msgid "Deadline"
+msgstr "期限"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid " Month "
+msgstr " 月 "
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "In progress Evaluations"
+msgstr "進行中の評価"
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_survey_request
+msgid "survey.request"
+msgstr "survey.request"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(date)s: Current Date"
+msgstr "(date)s：今日の日付"
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_anonymous_employee:0
+msgid "Send an anonymous summary to the employee"
+msgstr "従業員に匿名の要約を送る。"
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:81
+#, python-format
+msgid "Regarding "
+msgstr "次に関して "
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0 view:hr.evaluation.report:0
+#: field:hr.evaluation.report,state:0 view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0 field:hr.evaluation.report,employee_id:0
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,employee_id:0
+#: model:ir.model,name:hr_evaluation.model_hr_employee
+msgid "Employee"
+msgstr "従業員"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_body:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Exceeds expectations"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,mail_feature:0
+msgid ""
+"Check this box if you want to send mail to employees coming under this phase"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Evaluation done in last month"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_manager:0
+msgid "Send all answers to the manager"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Plan In Progress"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Public Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Send Reminder Email"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0 field:hr_evaluation.evaluation,rating:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
+msgid "Print Interview"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Pending"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,closed:0
+msgid "closed"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Meet expectations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0 field:hr.evaluation.report,nbr:0
+msgid "# of Requests"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer
+msgid "Review Appraisal Plans"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Action to Perform"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_action:0
+msgid "Action Plan"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
+msgid "Periodic Appraisal"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Appraisal to close within the next 7 days"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Ending Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly exceeds expectations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid ""
+"Interview Requests are generated automatically by OpenERP according to an "
+"employee's Appraisal Plan. Each user receives automatic emails and requests "
+"to evaluate their colleagues periodically."
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "In progress"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Interview Request"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,send_answer_employee:0
+#: field:hr_evaluation.plan.phase,send_answer_manager:0
+msgid "All Answers"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Evaluation done in current year"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0 field:hr.evaluation.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Group by..."
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Mail Settings"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.evaluation_reminders
+msgid "Appraisal Reminders"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
+msgid "Interview Question"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,wait:0
+msgid ""
+"Check this box if you want to wait that all preceding phases are finished "
+"before launching this phase."
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Legend"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_first:0
+msgid "First Appraisal in (months)"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,send_anonymous_employee:0
+#: field:hr_evaluation.plan.phase,send_anonymous_manager:0
+msgid "Anonymous Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "7 Days"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_plan_id:0 view:hr_evaluation.plan:0
+#: field:hr_evaluation.plan,name:0 field:hr_evaluation.plan.phase,plan_id:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
+msgid "Appraisal Plan"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Print Survey"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,rating:0
+#: selection:hr_evaluation.evaluation,rating:0
+msgid "Significantly bellow expectations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid " (employee_name)s: Partner name"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0 field:hr.evaluation.report,plan_id:0
+#: view:hr_evaluation.evaluation:0 field:hr_evaluation.evaluation,plan_id:0
+msgid "Plan"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_evaluation
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
+msgid "Appraisal Plan Phase"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
+msgid "Appraisal Interviews"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Survey"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.evaluation,rating:0
+msgid "This is the appreciation on that summarize the evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,action:0
+msgid "Action"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0 selection:hr.evaluation.report,state:0
+msgid "Final Validation"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Waiting Appreciation"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+#: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
+#: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
+msgid "Appraisal Analysis"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Appraisal Deadline"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,rating:0
+msgid "Overall Rating"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,email_subject:0
+msgid "char"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
+msgid "Interviewer"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
+msgid "Evaluations Statistics"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "Deadline Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/wizard/mail_compose_message.py:45
+#, python-format
+msgid ""
+"Hello %s, \n"
+"\n"
+" Kindly post your response for '%s' survey interview. \n"
+"\n"
+" Thanks,"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Top-Down Appraisal Requests"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_evaluation_plans_installer
+msgid ""
+"You can define appraisal plans (ex: first interview after 6 months, then "
+"every year). Then, each employee can be linked to an appraisal plan so that "
+"OpenERP can automatically generate interview requests to managers and/or "
+"subordinates."
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "General"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan.phase,send_answer_employee:0
+msgid "Send all answers to the employee"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Appraisal Data"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0 selection:hr.evaluation.report,state:0
+#: view:hr_evaluation.evaluation:0 selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
+msgid "Appraisal Plans"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
+msgid "Appraisal Interview"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/wizard/mail_compose_message.py:49
+#, python-format
+msgid "Reminder to fill up Survey"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "To Do"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Final Validation Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,mail_feature:0
+msgid "Send mail for this phase"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
+msgid "Late"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr.employee,evaluation_date:0
+msgid ""
+"The date of the next appraisal is computed by the appraisal plan's dates "
+"(first appraisal + periodicity)."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,overpass_delay:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_next:0
+msgid ""
+"The number of month that depicts the delay between each evaluation of this "
+"plan (after the first one)."
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_next:0
+msgid "Periodicity of Appraisal (months)"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Self Appraisal Requests"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,survey_request_ids:0
+msgid "Appraisal Forms"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Final Interview"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,name:0
+msgid "Phase"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.plan.phase,action:0
+msgid "Bottom-Up Appraisal Requests"
+msgstr ""
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:244
+#, python-format
+msgid ""
+"You cannot change state, because some appraisal in waiting answer or draft "
+"state"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
+msgid "Interview Appraisal"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:survey.request,is_evaluation:0
+msgid "Is Appraisal?"
+msgstr ""
+
+#. module: hr_evaluation
+#: code:addons/hr_evaluation/hr_evaluation.py:317
+#, python-format
+msgid "You cannot start evaluation without Appraisal."
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0
+msgid "Evaluation done in current month"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,user_to_review_id:0
+msgid "Employee to Interview"
+msgstr ""
+
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "Appraisal Plan Phases"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Validate Appraisal"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
+msgid "Search Appraisal"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.plan.phase,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.plan.phase:0
+msgid "(user_signature)s: User name"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_board
+#: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_hr_evaluation_interview_requests
+msgid "Interview Requests"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.evaluation.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr.evaluation.report:0 field:hr.evaluation.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_summary:0
+msgid "Appraisal Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_date:0
+msgid "Next Appraisal Date"
+msgstr ""
diff --git a/addons/hr_holidays/i18n/ja.po b/addons/hr_holidays/i18n/ja.po
index b7f627c4a75..7f135b153c5 100644
--- a/addons/hr_holidays/i18n/ja.po
+++ b/addons/hr_holidays/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-18 04:38+0000\n"
+"PO-Revision-Date: 2012-04-18 23:32+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\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: 2012-04-18 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
 "X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_holidays
@@ -25,7 +25,7 @@ msgstr "青"
 #. module: hr_holidays
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
-msgstr "割振りタイプ"
+msgstr "割当てタイプ"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -127,6 +127,8 @@ msgid ""
 "the employee. You can define several allowance types (paid holidays, "
 "sickness, etc.) and manage allowances per type."
 msgstr ""
+"従業員が休暇申請を記録して、マネジャが承認します。休暇が承認されると、それは自動的に従業員の予定に表示されます。休暇タイプ（有給休暇、病欠など）をいくつか"
+"定義して、タイプごとに休暇を管理できます。"
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
@@ -166,6 +168,10 @@ msgid ""
 "  \n"
 "The state is 'Approved', when holiday request is approved by manager."
 msgstr ""
+"休暇の申請が作られると、それは「草案」状態に設定されます。　　　　　　　　\n"
+"ユーザが休暇申請を確認すると、それは「承認待ち」状態になります。　　　　\n"
+"マネジャが休暇申請を拒否すると、それは「拒否」状態になります。\n"
+"マネジャが休暇申請を承認すると、それは「承認」状態になります。"
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -188,7 +194,7 @@ msgstr "休暇申請の承認"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
-msgstr "部門ごとの休暇"
+msgstr "部門別の休暇"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
@@ -231,7 +237,7 @@ msgstr "報告書の色"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr "従業員ごとの休暇要約報告書"
+msgstr "従業員別の休暇要約報告書"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
@@ -303,7 +309,7 @@ msgstr "状態"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr "タイプごとの休暇日数"
+msgstr "タイプ別の休暇日数"
 
 #. module: hr_holidays
 #: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
@@ -330,7 +336,7 @@ msgstr "赤色"
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr "タイプごとの休暇"
+msgstr "タイプ別の休暇"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -345,7 +351,7 @@ msgstr "小麦色"
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr "エラー。休暇開始日は休暇終了日の前でなければいけません。"
+msgstr "エラー：休暇開始日は休暇終了日の前でなければいけません。"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:382
@@ -371,6 +377,9 @@ msgid ""
 "Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
 "the employees if the configuration does not allow to use this field."
 msgstr ""
+"「法定休暇の残り」の機能は、休暇タイプが１つだけであり、「限度を無効にする」が指定されていない場合(%s "
+"がある)にだけ、使うことができます。さもないと、どの休暇タイプを更新したのか不明になります。\n"
+"もし、従業員の休暇を管理するためにこの項目を使うことができないならば、人材/休暇にある以前のメニュー「休暇申請」と「割当て要求」を使ってください。"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -470,7 +479,7 @@ msgstr "サンゴ色"
 #: view:hr.holidays.summary.dept:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
 msgid "Holidays by Department"
-msgstr "部門ごとの休暇"
+msgstr "部門別の休暇"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -532,313 +541,313 @@ msgstr "承認すべき休暇"
 #. module: hr_holidays
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "エラー：従業員の反復した階層構造を作ることはできません。"
 
 #. module: hr_holidays
 #: view:hr.employee:0 field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
-msgstr ""
+msgstr "法定休暇の残り日数"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "First Approval"
-msgstr ""
+msgstr "最初の承認"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr ""
+msgstr "未払い"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr ""
+msgstr "休暇の要約"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Holidays during last month"
-msgstr ""
+msgstr "先月の休暇"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "エラー"
 
 #. module: hr_holidays
 #: view:hr.employee:0
 msgid "Assign Leaves"
-msgstr ""
+msgstr "休暇を割当てます。"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
-msgstr ""
+msgstr "薄青色"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "My Department Leaves"
-msgstr ""
+msgstr "私の部門の休暇"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
 msgid "Current Leave Status"
-msgstr ""
+msgstr "現在の休暇の状態"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
 msgid "Request Type"
-msgstr ""
+msgstr "申請タイプ"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
 msgid ""
 "If the active field is set to false, it will allow you to hide the leave "
 "type without removing it."
-msgstr ""
+msgstr "この項目が正しくないとしても、休暇タイプをそのままにして、それを隠すことができます。"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Misc"
-msgstr ""
+msgstr "その他"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
 msgid "Compensatory Days"
-msgstr ""
+msgstr "振替休日"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,notes:0
 msgid "Reasons"
-msgstr ""
+msgstr "理由"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr ""
+msgstr "休暇分析"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,color_name:0
 msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Departement"
-msgstr ""
+msgstr "部門別休暇報告書の休暇ようやくに、この色が使われます。"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Validated"
-msgstr ""
+msgstr "承諾済み"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
 msgid "Allocation Request"
-msgstr ""
+msgstr "割当て申請"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
-msgstr ""
+msgstr "休暇の詳細"
 
 #. module: hr_holidays
 #: field:hr.holidays,double_validation:0
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr ""
+msgstr "二重承認を適用する。"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
 msgid "Print"
-msgstr ""
+msgstr "印刷"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Details"
-msgstr ""
+msgstr "詳細"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "My Leaves"
-msgstr ""
+msgstr "私の休暇"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr ""
+msgstr "従業員カテゴリー別"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 selection:hr.holidays,type:0
 msgid "Leave Request"
-msgstr ""
+msgstr "休暇申請"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
-msgstr ""
+msgstr "詳細"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves"
-msgstr ""
+msgstr "法定休暇"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0 !"
-msgstr ""
+msgstr "日数は0 より大きくなければいけません。"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
 msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
-msgstr ""
+msgstr "従業員別：従業員への割当て/申請，従業員カテゴリ：カテゴリ内の従業員グループへの割当て/申請"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
 #, python-format
 msgid "You cannot delete a leave which is not in draft state !"
-msgstr ""
+msgstr "草稿状態でない休暇を削除することはできません。"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr ""
+msgstr "休暇を検索"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "祭日タイプを選んで下さい。"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr ""
+msgstr "休暇の残り"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
 msgid "Department(s)"
-msgstr ""
+msgstr "部門"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id2:0
 msgid "Second Approval"
-msgstr ""
+msgstr "第2の承認"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "終了日"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
 msgid "Sick Leaves"
-msgstr ""
+msgstr "病欠"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid ""
 "If you tick this checkbox, the system will allow, for this section, the "
 "employees to take more leaves than the available ones."
-msgstr ""
+msgstr "このボックスをチェックすると、従業員はこの部分について有効な休暇よりも多くの休暇を取ることができます。"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
 msgid ""
 "This value is given by the sum of all holidays requests with a negative "
 "value."
-msgstr ""
+msgstr "休暇申請の総計が負数になっています。"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Violet"
-msgstr ""
+msgstr "スミレ色"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
 msgid ""
 "You can assign remaining Legal Leaves for each employee, OpenERP will "
 "automatically create and validate allocation requests."
-msgstr ""
+msgstr "残りの法定休暇を各従業員に割り当てることができます。OpenERPが自動的に割当て要求を作成します。"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
 msgid "Maximum Allowed"
-msgstr ""
+msgstr "最大許容数"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
 msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
-msgstr ""
+msgstr "この部分は、休暇を承認をする第２レベルのユーザによって自動的に入力されます（休暇タイプが第２レベルんの承認が必要な場合）。"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Mode"
-msgstr ""
+msgstr "モード"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr ""
+msgstr "部門別の休暇要約報告書"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Approve"
-msgstr ""
+msgstr "承認"
 
 #. module: hr_holidays
 #: view:hr.holidays:0 field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "開始日"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr ""
+msgstr "割当て申請"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Yellow"
-msgstr ""
+msgstr "薄黄色"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Pink"
-msgstr ""
+msgstr "薄桃色"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Manager"
-msgstr ""
+msgstr "マネジャ"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Approve"
-msgstr ""
+msgstr "承認する"
diff --git a/addons/hr_payroll/i18n/ja.po b/addons/hr_payroll/i18n/ja.po
index c2dafc55d82..953668363b4 100644
--- a/addons/hr_payroll/i18n/ja.po
+++ b/addons/hr_payroll/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-17 18:29+0000\n"
+"PO-Revision-Date: 2012-04-18 19:11+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\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: 2012-04-18 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
 "X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_payroll
@@ -524,7 +524,7 @@ msgstr "給与明細"
 #. module: hr_payroll
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
-msgstr "エラー。契約開始日は契約終了日の前でなければいけません。"
+msgstr "エラー：契約開始日は契約終了日の前でなければいけません。"
 
 #. module: hr_payroll
 #: view:hr.contract:0
@@ -674,7 +674,7 @@ msgstr "子のクラスのルール"
 #. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "エラー。従業員の反復した階層構造を作ることはできません。"
+msgstr "エラー：従業員の反復した階層構造を作ることはできません。"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
diff --git a/addons/hr_payroll_account/i18n/ja.po b/addons/hr_payroll_account/i18n/ja.po
index 69aa0531675..da2f8307a99 100644
--- a/addons/hr_payroll_account/i18n/ja.po
+++ b/addons/hr_payroll_account/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-17 18:31+0000\n"
+"PO-Revision-Date: 2012-04-18 19:11+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\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: 2012-04-18 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
 "X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_payroll_account
@@ -109,7 +109,7 @@ msgstr "契約"
 #. module: hr_payroll_account
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
-msgstr "エラー。契約開始日は契約終了日の前でなければいけません。"
+msgstr "エラー：契約開始日は契約終了日の前でなければいけません。"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,period_id:0
diff --git a/addons/hr_timesheet/i18n/ja.po b/addons/hr_timesheet/i18n/ja.po
index 2757a826a06..deadd132a84 100644
--- a/addons/hr_timesheet/i18n/ja.po
+++ b/addons/hr_timesheet/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-17 22:36+0000\n"
+"PO-Revision-Date: 2012-04-18 19:10+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\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: 2012-04-18 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
 "X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_timesheet
@@ -406,7 +406,7 @@ msgstr "11 月"
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "エラー。従業員の反復した階層構造を定義することはできません。"
+msgstr "エラー：従業員の反復した階層構造を定義することはできません。"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
diff --git a/addons/hr_timesheet_invoice/i18n/ja.po b/addons/hr_timesheet_invoice/i18n/ja.po
index c3c8afffa9e..f753a78ec32 100644
--- a/addons/hr_timesheet_invoice/i18n/ja.po
+++ b/addons/hr_timesheet_invoice/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-17 22:35+0000\n"
+"PO-Revision-Date: 2012-04-18 19:09+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\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: 2012-04-18 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
 "X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_timesheet_invoice
@@ -260,7 +260,7 @@ msgstr "パートナ"
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr "エラー。反復した分析アカウントを作ることはできません"
+msgstr "エラー：反復した分析アカウントを作ることはできません"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,time:0
diff --git a/addons/hr_timesheet_sheet/i18n/ja.po b/addons/hr_timesheet_sheet/i18n/ja.po
index 7e2d71bba64..0a4c608c839 100644
--- a/addons/hr_timesheet_sheet/i18n/ja.po
+++ b/addons/hr_timesheet_sheet/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-18 01:34+0000\n"
+"PO-Revision-Date: 2012-04-18 19:08+0000\n"
 "Last-Translator: Masaki Yamaya <Unknown>\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: 2012-04-18 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
 "X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_timesheet_sheet
@@ -289,7 +289,7 @@ msgstr "勤務表の行"
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "エラー。再帰的な会社を作ることはできません。"
+msgstr "エラー：再帰的な会社を作ることはできません。"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0 view:timesheet.report:0
diff --git a/addons/html_view/i18n/ja.po b/addons/html_view/i18n/ja.po
index 8820fdd9f33..63bfe0de587 100644
--- a/addons/html_view/i18n/ja.po
+++ b/addons/html_view/i18n/ja.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: 2012-04-18 04:42+0000\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
 "X-Generator: Launchpad (build 15108)\n"
 
 #. module: html_view
diff --git a/addons/idea/i18n/ja.po b/addons/idea/i18n/ja.po
new file mode 100644
index 00000000000..5b918629054
--- /dev/null
+++ b/addons/idea/i18n/ja.po
@@ -0,0 +1,713 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-18 19:07+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: idea
+#: help:idea.category,visibility:0
+msgid "If True creator of the idea will be visible to others"
+msgstr "正しければ、アイデアの創案者は他にも見えるでしょう。"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "By States"
+msgstr "状態別"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_select
+msgid "Idea select"
+msgstr "アイデアの選択"
+
+#. module: idea
+#: view:idea.idea:0
+#: view:idea.vote:0
+#: model:ir.ui.menu,name:idea.menu_idea_vote
+msgid "Votes"
+msgstr "得票数"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,comment_ids:0
+msgid "Comments"
+msgstr "コメント"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Submit Vote"
+msgstr "投票する。"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_report_vote_all
+#: model:ir.ui.menu,name:idea.menu_report_vote_all
+msgid "Ideas Analysis"
+msgstr "アイデア分析"
+
+#. module: idea
+#: view:idea.category:0
+#: view:idea.idea:0
+#: view:idea.vote:0
+#: view:report.vote:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Accepted Ideas"
+msgstr "受理されたアイデア"
+
+#. module: idea
+#: code:addons/idea/wizard/idea_post_vote.py:94
+#, python-format
+msgid "Idea must be in 'Open' state before vote for that idea."
+msgstr "アイデアに投票する前に、そのアイデアはオープン状態になければなりません。"
+
+#. module: idea
+#: view:report.vote:0
+msgid "Open Date"
+msgstr "オープンした日付"
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Refuse"
+msgstr "拒否"
+
+#. module: idea
+#: field:idea.idea,count_votes:0
+msgid "Count of votes"
+msgstr "投票数"
+
+#. module: idea
+#: model:ir.model,name:idea.model_report_vote
+msgid "Idea Vote Statistics"
+msgstr "アイデェアの投票統計"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Bad"
+msgstr "無効"
+
+#. module: idea
+#: selection:report.vote,idea_state:0
+msgid "Cancelled"
+msgstr "キャンセルされました。"
+
+#. module: idea
+#: view:idea.category:0
+msgid "Category of ideas"
+msgstr "アイデアのカテゴリー"
+
+#. module: idea
+#: code:addons/idea/idea.py:274
+#: code:addons/idea/wizard/idea_post_vote.py:91
+#: code:addons/idea/wizard/idea_post_vote.py:94
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Your comment"
+msgstr "あなたのコメント"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_vote
+msgid "Idea Vote"
+msgstr "アイデア投票"
+
+#. module: idea
+#: field:idea.category,parent_id:0
+msgid "Parent Categories"
+msgstr "上位カテゴリー"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Very Bad"
+msgstr "無効"
+
+#. module: idea
+#: view:idea.vote:0
+msgid "Ideas vote"
+msgstr "アイデア投票"
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,nbr:0
+msgid "# of Lines"
+msgstr "行数"
+
+#. module: idea
+#: code:addons/idea/wizard/idea_post_vote.py:91
+#, python-format
+msgid "You can not give Vote for this idea more than %s times"
+msgstr "このアイデアに %s 回以上、投票することはできません。"
+
+#. module: idea
+#: view:idea.category:0
+msgid "Ideas Categories"
+msgstr "アイデアカテゴリー"
+
+#. module: idea
+#: help:idea.idea,description:0
+msgid "Content of the idea"
+msgstr "アイデアの内容"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_category
+msgid "Idea Category"
+msgstr "アイデアカテゴリー"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,stat_vote_ids:0
+msgid "Statistics"
+msgstr "統計情報"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Not Voted"
+msgstr "投票されていません。"
+
+#. module: idea
+#: sql_constraint:idea.category:0
+msgid "The name of the category must be unique"
+msgstr "カテゴリーの名称はユニークでなければなりません。"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_select
+msgid "select idea"
+msgstr "アイデアを選んで下さい。"
+
+#. module: idea
+#: view:idea.stat:0
+msgid "stat"
+msgstr "統計"
+
+#. module: idea
+#: field:idea.category,child_ids:0
+msgid "Child Categories"
+msgstr "下位カテゴリー"
+
+#. module: idea
+#: view:idea.select:0
+msgid "Next"
+msgstr "次へ"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,state:0
+#: view:report.vote:0
+#: field:report.vote,idea_state:0
+msgid "State"
+msgstr "状態"
+
+#. module: idea
+#: view:idea.idea:0
+#: selection:idea.idea,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Good"
+msgstr "良"
+
+#. module: idea
+#: help:idea.idea,open_date:0
+msgid "Date when an idea opened"
+msgstr "アイデアがオープンになった日付"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Idea Detail"
+msgstr "アイデアの詳細"
+
+#. module: idea
+#: help:idea.idea,state:0
+msgid ""
+"When the Idea is created the state is 'Draft'.\n"
+" It is             opened by the user, the state is 'Opened'.            \n"
+"If the idea is accepted, the state is 'Accepted'."
+msgstr ""
+"アイデアを提案すると、それは「草案」状態になります。\n"
+"ユーザがそれを開くと、「オープン」状態になります。\n"
+"アイデアが受理されると、「受理」状態になります。"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "New Ideas"
+msgstr "新しいアイデア"
+
+#. module: idea
+#: view:report.vote:0
+msgid "Idea Vote created last month"
+msgstr "アイデアの投票は先月、作られました。"
+
+#. module: idea
+#: field:idea.category,visibility:0
+#: field:idea.idea,visibility:0
+msgid "Open Idea?"
+msgstr "アイデアを開きますか？"
+
+#. module: idea
+#: view:report.vote:0
+msgid "Idea Vote created in current month"
+msgstr "今月、提案されたアイデア"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: idea
+#: view:idea.idea:0
+#: selection:idea.idea,state:0
+#: view:report.vote:0
+#: selection:report.vote,idea_state:0
+msgid "Accepted"
+msgstr "受理済み"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_category
+#: model:ir.ui.menu,name:idea.menu_idea_category
+msgid "Categories"
+msgstr "カテゴリー"
+
+#. module: idea
+#: view:idea.category:0
+msgid "Parent Category"
+msgstr "上位カテゴリー"
+
+#. module: idea
+#: field:idea.idea,open_date:0
+msgid "Open date"
+msgstr "オープンの日付"
+
+#. module: idea
+#: field:idea.idea,vote_ids:0
+#: model:ir.actions.act_window,name:idea.action_idea_post_vote
+msgid "Vote"
+msgstr "投票"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_vote_stat
+#: model:ir.ui.menu,name:idea.menu_idea_vote_stat
+msgid "Vote Statistics"
+msgstr "投票統計"
+
+#. module: idea
+#: field:idea.idea,vote_limit:0
+msgid "Maximum Vote per User"
+msgstr "ユーザ別の最大投票数"
+
+#. module: idea
+#: view:idea.vote.stat:0
+msgid "vote_stat of ideas"
+msgstr "アイデアの投票統計"
+
+#. module: idea
+#: field:idea.comment,content:0
+#: view:idea.idea:0
+#: view:idea.post.vote:0
+#: field:idea.vote,comment:0
+#: model:ir.model,name:idea.model_idea_comment
+msgid "Comment"
+msgstr "コメント"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: idea
+#: view:idea.idea:0
+#: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
+#: model:ir.actions.act_window,name:idea.action_idea_idea_open
+msgid "Open Ideas"
+msgstr "アイデアを開く"
+
+#. module: idea
+#: view:idea.category:0
+#: field:idea.category,name:0
+#: view:idea.idea:0
+#: field:idea.idea,category_id:0
+#: view:report.vote:0
+#: field:report.vote,category_id:0
+msgid "Category"
+msgstr "カテゴリー"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Very Good"
+msgstr "とても良い"
+
+#. module: idea
+#: selection:idea.idea,state:0
+#: selection:report.vote,idea_state:0
+msgid "Opened"
+msgstr "開かれた"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_vote
+msgid "Idea's Votes"
+msgstr "アイデアの投票"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "By Idea Category"
+msgstr "アイデアのカテゴリー別"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "New Idea"
+msgstr "新しいアイデア"
+
+#. module: idea
+#: model:ir.actions.act_window,name:idea.action_idea_category_tree
+#: model:ir.ui.menu,name:idea.menu_idea_category_tree
+msgid "Ideas by Categories"
+msgstr "カテゴリー別のアイデア"
+
+#. module: idea
+#: selection:report.vote,idea_state:0
+msgid "Draft"
+msgstr "草案"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: idea
+#: selection:idea.idea,my_vote:0
+#: selection:idea.post.vote,vote:0
+#: selection:idea.vote,score:0
+#: selection:idea.vote.stat,score:0
+msgid "Normal"
+msgstr "通常"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: idea
+#: field:report.vote,creater_id:0
+#: field:report.vote,user_id:0
+msgid "User Name"
+msgstr "ユーザ名"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_vote_stat
+msgid "Idea Votes Statistics"
+msgstr "アイデア投票の統計"
+
+#. module: idea
+#: field:idea.comment,user_id:0
+#: view:idea.vote:0
+#: field:idea.vote,user_id:0
+#: view:report.vote:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: idea
+#: field:idea.vote,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: idea
+#: field:idea.idea,my_vote:0
+msgid "My Vote"
+msgstr "私の投票"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: idea
+#: field:idea.comment,create_date:0
+#: field:idea.idea,created_date:0
+msgid "Creation date"
+msgstr "作成日"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_idea
+msgid "idea.idea"
+msgstr "idea.idea"
+
+#. module: idea
+#: field:idea.category,summary:0
+msgid "Summary"
+msgstr "要約"
+
+#. module: idea
+#: field:idea.idea,name:0
+msgid "Idea Summary"
+msgstr "アイデアの要約"
+
+#. module: idea
+#: view:idea.post.vote:0
+msgid "Post"
+msgstr "投稿"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "History"
+msgstr "履歴"
+
+#. module: idea
+#: field:report.vote,date:0
+msgid "Date Order"
+msgstr "日付順"
+
+#. module: idea
+#: view:idea.idea:0
+#: field:idea.idea,user_id:0
+#: view:report.vote:0
+msgid "Creator"
+msgstr "作成者"
+
+#. module: idea
+#: view:idea.post.vote:0
+#: model:ir.ui.menu,name:idea.menu_give_vote
+msgid "Give Vote"
+msgstr "投票する"
+
+#. module: idea
+#: help:idea.idea,vote_limit:0
+msgid "Set to one if  you require only one Vote per user"
+msgstr "ユーザ当り1票とするのであれば 1 を設定して下さい。"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "By Creators"
+msgstr "作成者別"
+
+#. module: idea
+#: view:idea.post.vote:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: idea
+#: view:idea.select:0
+msgid "Close"
+msgstr "締める"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Open"
+msgstr "開く"
+
+#. module: idea
+#: view:idea.idea:0
+#: view:report.vote:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: idea
+#: view:report.vote:0
+msgid "Idea Vote Analysis"
+msgstr "アイデアの投票分析"
+
+#. module: idea
+#: view:idea.idea:0
+#: model:ir.actions.act_window,name:idea.action_idea_idea
+#: model:ir.ui.menu,name:idea.menu_idea_idea
+#: model:ir.ui.menu,name:idea.menu_ideas
+#: model:ir.ui.menu,name:idea.menu_ideas1
+msgid "Ideas"
+msgstr "アイデア"
+
+#. module: idea
+#: model:ir.model,name:idea.model_idea_post_vote
+msgid "Post vote"
+msgstr "投票する"
+
+#. module: idea
+#: field:idea.vote.stat,score:0
+#: field:report.vote,score:0
+msgid "Score"
+msgstr "スコア"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Votes Statistics"
+msgstr "投票統計"
+
+#. module: idea
+#: view:idea.vote:0
+msgid "Comments:"
+msgstr "コメント:"
+
+#. module: idea
+#: view:idea.category:0
+#: field:idea.idea,description:0
+#: field:idea.post.vote,note:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: idea
+#: selection:idea.idea,state:0
+#: view:report.vote:0
+msgid "Refused"
+msgstr "不採用"
+
+#. module: idea
+#: view:idea.vote:0
+msgid "Vote date"
+msgstr "投票日"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: idea
+#: field:idea.category,complete_name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: idea
+#: field:idea.vote.stat,nbr:0
+msgid "Number of Votes"
+msgstr "投票数"
+
+#. module: idea
+#: view:report.vote:0
+msgid "Month-1"
+msgstr "月-1"
+
+#. module: idea
+#: selection:report.vote,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: idea
+#: field:idea.idea,count_comments:0
+msgid "Count of comments"
+msgstr "コメントの数"
+
+#. module: idea
+#: field:idea.vote,score:0
+msgid "Vote Status"
+msgstr "投票状況"
+
+#. module: idea
+#: view:report.vote:0
+msgid "Idea Vote created in current year"
+msgstr "今年のアイデア投票"
+
+#. module: idea
+#: field:idea.idea,vote_avg:0
+msgid "Average Score"
+msgstr "平均スコア"
+
+#. module: idea
+#: constraint:idea.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr "エラー：再帰カテゴリーを作成することはできません。"
+
+#. module: idea
+#: field:idea.comment,idea_id:0
+#: field:idea.select,idea_id:0
+#: view:idea.vote:0
+#: field:idea.vote,idea_id:0
+#: field:idea.vote.stat,idea_id:0
+#: model:ir.ui.menu,name:idea.menu_idea_reporting
+#: view:report.vote:0
+#: field:report.vote,idea_id:0
+msgid "Idea"
+msgstr "アイデア"
+
+#. module: idea
+#: view:idea.idea:0
+msgid "Accept"
+msgstr "受理"
+
+#. module: idea
+#: field:idea.post.vote,vote:0
+msgid "Post Vote"
+msgstr "投票する。"
+
+#. module: idea
+#: view:report.vote:0
+#: field:report.vote,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: idea
+#: code:addons/idea/idea.py:274
+#, python-format
+msgid "You can not vote on a Draft/Accepted/Cancelled ideas."
+msgstr "草案 / 受理済み / キャンセルされたアイデアに投票することはできません。"
+
+#. module: idea
+#: view:idea.select:0
+msgid "Select Idea for Vote"
+msgstr "投票するアイデアを選んで下さい。"
diff --git a/addons/import_sugarcrm/i18n/ja.po b/addons/import_sugarcrm/i18n/ja.po
new file mode 100644
index 00000000000..d6eaa969d96
--- /dev/null
+++ b/addons/import_sugarcrm/i18n/ja.po
@@ -0,0 +1,404 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-18 07:31+0000\n"
+"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\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: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "Error !!"
+msgstr "エラー"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "(Coming Soon)"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,document:0
+msgid "Documents"
+msgstr "ドキュメント"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import your data from SugarCRM :"
+msgstr "データをSugarCRMからインポートする。"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Choose data you want to import. Click 'Import' to get data manually or "
+"'Schedule Reccurent Imports' to get recurrently and automatically data."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,contact:0
+msgid "Contacts"
+msgstr "連絡先"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "HR"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,bug:0
+msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,instance_name:0
+msgid "Instance's Name"
+msgstr "事例の名前"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project_task:0
+msgid "Project Tasks"
+msgstr "プロジェクトのタスク"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_from:0
+msgid "Notify End Of Import To:"
+msgstr "へインポートの終了を通知する。"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,user:0
+msgid ""
+"Check this box to import sugarCRM Users into OpenERP users, warning if a "
+"user with the same login exist in OpenERP, user information will be erase by "
+"sugarCRM user information"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#, python-format
+msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr "python SOAPをインストールしてください。"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Schedule Recurrent Imports"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"Do not forget the email address to be notified of the success of the import."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,call:0
+msgid "Check this box to import sugarCRM Calls into OpenERP calls"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid ""
+"If you make recurrent or ponctual import, data already  in OpenERP will be "
+"updated by SugarCRM data."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,employee:0
+msgid "Employee"
+msgstr "従業員"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Document"
+msgstr "ドキュメント"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,document:0
+msgid "Check this box to import sugarCRM Documents into OpenERP documents"
+msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックしてください。"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import Data From SugarCRM"
+msgstr "SugarCRMからデータをインポートする。"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "CRM"
+msgstr "CRM"
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid ""
+"Data are importing, the process is running in the background, an email will "
+"be sent to the given email address if it was defined."
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,call:0
+msgid "Calls"
+msgstr "通話"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Multi Instance Management"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.message:0
+msgid "_Ok"
+msgstr "_OK"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,opportunity:0
+msgid ""
+"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
+"and Opportunities"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,email_history:0
+msgid "Email and Note"
+msgstr "Ｅメールと備考"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,url:0
+msgid ""
+"Webservice's url where to get the data.                      example : "
+"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
+"application "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
+msgstr ""
+
+#. module: import_sugarcrm
+#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
+#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
+msgid "Import SugarCRM"
+msgstr "SugarCRMをインポート"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Import"
+msgstr "インポート(_I)"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,user:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
+#, python-format
+msgid "%s data required %s Module to be installed, Please install %s module"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,claim:0
+msgid "Cases"
+msgstr "お問合せ"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,meeting:0
+msgid ""
+"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,email_history:0
+msgid ""
+"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
+"Messages and Attachments"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,project:0
+msgid "Projects"
+msgstr "プロジェクト"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid ""
+"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
+"http://pypi.python.org/pypi/ZSI/"
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project:0
+msgid "Check this box to import sugarCRM Projects into OpenERP projects"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Select Module to Import."
+msgstr "インポートするモジュールを選択"
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,meeting:0
+msgid "Meetings"
+msgstr "ミーティング"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,employee:0
+msgid "Check this box to import sugarCRM Employees into OpenERP employees"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,url:0
+msgid "SugarSoap Api url:"
+msgstr "SugarSoap Api url:"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Address Book"
+msgstr "アドレス帳"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,bug:0
+msgid "Bugs"
+msgstr "バグ"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,project_task:0
+msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,opportunity:0
+msgid "Leads & Opp"
+msgstr "見込み客 ＆ 商談"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#, python-format
+msgid ""
+"Authentication error !\n"
+"Bad Username or Password or bad SugarSoap Api url !"
+msgstr ""
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:79
+#: code:addons/import_sugarcrm/sugar.py:60
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
+#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,instance_name:0
+msgid ""
+"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
+"from different server."
+msgstr ""
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,contact:0
+msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,password:0
+msgid "Password"
+msgstr "パスワード"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Login Information"
+msgstr "ログイン情報"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,claim:0
+msgid "Check this box to import sugarCRM Cases into OpenERP claims"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Notification When Import is finished"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,username:0
+msgid "User Name"
+msgstr "ユーザ名"
+
+#. module: import_sugarcrm
+#: view:import.message:0
+#: model:ir.model,name:import_sugarcrm.model_import_message
+msgid "Import Message"
+msgstr "メッセージをインポートする。"
+
+#. module: import_sugarcrm
+#: help:import.sugarcrm,account:0
+msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Online documentation:"
+msgstr ""
+
+#. module: import_sugarcrm
+#: field:import.sugarcrm,account:0
+msgid "Accounts"
+msgstr "顧客情報"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#. module: import_sugarcrm
+#: code:addons/import_sugarcrm/sugarsoap_services.py:23
+#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
+#, python-format
+msgid "ZSI Import Error!"
+msgstr "ZSI のインポートエラー"
+
+#. module: import_sugarcrm
+#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
+msgid "Import SugarCRM DATA"
+msgstr "SugarCRMのデータをインポート"
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Address to Notify"
+msgstr ""
diff --git a/addons/stock_invoice_directly/i18n/ru.po b/addons/stock_invoice_directly/i18n/ru.po
index 7a03c6bc958..3bd0d77507a 100644
--- a/addons/stock_invoice_directly/i18n/ru.po
+++ b/addons/stock_invoice_directly/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-20 08:47+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2012-04-18 08:08+0000\n"
+"Last-Translator: Ivan Baz <freeExec@mail.ru>\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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Запуск мастера частичного комплектования"
 
 #~ msgid "Invoice Picking Directly"
 #~ msgstr "Напрямую выставляемый счет"

From ff16b9c9888a51855d54c4203ecdabbe49c46713 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 10:28:15 +0200
Subject: [PATCH 82/83] [FIX] pad

bzr revid: al@openerp.com-20120419082815-3rkd76h0bztnb3p1
---
 addons/pad/static/src/js/pad.js   | 17 +++++++----------
 addons/pad/static/src/xml/pad.xml |  8 --------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index acc91f2273e..9f5ab3876b3 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -1,6 +1,10 @@
 openerp.pad = function(instance) {
 
-instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.extend({
+instance.web.Sidebar = instance.web.Sidebar.extend({
+    init: function(parent) {
+        this._super(parent);
+        this.add_items('other',[{ label: "Pad", callback: this.on_add_pad }]);
+    },
     on_attachments_loaded: function(attachments) {
         this._super(attachments);
         var self = this;
@@ -8,18 +12,11 @@ instance.web.form.SidebarAttachments = instance.web.form.SidebarAttachments.exte
         var is_pad = function(a) {
             return a.type == 'url' && a.name == 'Pad';
         };
-        if (_.any(attachments, is_pad)) {
-            $padbtn.hide();
-        } else {
-            $padbtn.show().click(self.on_add_pad);
-        }
     },
     on_add_pad: function() {
         var self = this;
-        var $padbtn = this.$element.find('button.pad');
-        $padbtn.attr('disabled', 'true').find('img, span').toggle();
-        this.view.dataset.call_button('pad_get', [[this.view.datarecord.id], this.view.dataset.get_context()], function(r) {
-            $padbtn.hide();
+        var view = this.getParent();
+        view.dataset.call_button('pad_get', [[view.datarecord.id], view.dataset.get_context()], function(r) {
             self.do_update();
             self.do_action(r.result);
         });
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index c17464e6646..e922294d03d 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -2,12 +2,4 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-    <t t-extend="FormView.sidebar.attachments">
-        <t t-jquery="div.oe-binary-file-set" t-operation="append">
-                <button class="button pad" type="button">
-                    <img src="/web/static/src/img/throbber.gif" width="16" height="16" style="display: none"/>
-                    <span>Add Pad</span>
-                </button>
-        </t>
-    </t>
 </templates>

From 08901b13930e79bc39833a0f6445969ce669fd8e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 10:46:50 +0200
Subject: [PATCH 83/83] [FIX] pad action

bzr revid: al@openerp.com-20120419084650-clu7oke9rz6me6pi
---
 addons/pad/static/src/js/pad.js | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 9f5ab3876b3..2e5f8820ac4 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -5,20 +5,12 @@ instance.web.Sidebar = instance.web.Sidebar.extend({
         this._super(parent);
         this.add_items('other',[{ label: "Pad", callback: this.on_add_pad }]);
     },
-    on_attachments_loaded: function(attachments) {
-        this._super(attachments);
-        var self = this;
-        var $padbtn = self.$element.find('button.pad');
-        var is_pad = function(a) {
-            return a.type == 'url' && a.name == 'Pad';
-        };
-    },
     on_add_pad: function() {
         var self = this;
         var view = this.getParent();
-        view.dataset.call_button('pad_get', [[view.datarecord.id], view.dataset.get_context()], function(r) {
-            self.do_update();
-            self.do_action(r.result);
+        var model = new instance.web.Model('ir.attachment');
+        model.call('pad_get', [view.model ,view.datarecord.id],{}).then(function(r) {
+            self.do_action({ type: "ir.actions.act_url", url: r });
         });
     }
 });